From 89cd2db0bd0bbedaa7ab0c8ce609cd2809c8507a Mon Sep 17 00:00:00 2001
From: "Kirill Lipatov (Leency)" <lipatov.kiril@gmail.com>
Date: Fri, 31 Dec 2021 19:59:28 +0000
Subject: [PATCH] end: -1 sector

git-svn-id: svn://kolibrios.org@9540 a494cfbc-eb01-0410-851d-a64ba20cac60
---
 programs/system/end/light/data.inc | 23 +++++++----------------
 programs/system/end/light/end.asm  | 21 +++++++--------------
 2 files changed, 14 insertions(+), 30 deletions(-)

diff --git a/programs/system/end/light/data.inc b/programs/system/end/light/data.inc
index 7ebf0ec65e..ed6b30c9bd 100644
--- a/programs/system/end/light/data.inc
+++ b/programs/system/end/light/data.inc
@@ -55,22 +55,13 @@ asettings   db 'settings',0
 aautosave   db 'autosave',0
 ini_file db  '/sys/settings/rdsave.ini',0
 ;---------------------------------------------------------------------
-;Lib_DATA
-system_dir_libini       db '/sys/lib/libini.obj',0
-;---------------------------------------------------------------------
-l_libs_start:
-library02  l_libs system_dir_libini+9, library_path, system_dir_libini, libini_import
-end_l_libs:
-;---------------------------------------------------------------------
-align 4
-libini_import:
-init_lib     dd a_init
-ini_get_int  dd aini_get_int
-ini_set_int  dd aini_set_int
-             dd 0,0
-a_init       db 'lib_init',0
-aini_get_int db 'ini_get_int',0
-aini_set_int db 'ini_set_int',0
+importLib:          
+library                                                 \          
+        libini, 'libini.obj'          
+          
+import  libini, \          
+        ini_set_int  ,'ini_set_int', \          
+        ini_get_int  ,'ini_get_int'   
 ;---------------------------------------------------------------------
 checkbox_sharedname db 'CHECKBOX',0
 checkbox_img dd ?
diff --git a/programs/system/end/light/end.asm b/programs/system/end/light/end.asm
index 037bc3c140..e949e658b5 100644
--- a/programs/system/end/light/end.asm
+++ b/programs/system/end/light/end.asm
@@ -18,23 +18,17 @@ include '../../../macros.inc'
 include '../../../proc32.inc'
 include '../../../dll.inc'
 include '../../../KOSfuncs.inc'
-include '../../../load_lib.mac'
 include '../../../gui_patterns.inc'
 include '../../../string.inc'
 
-@use_library
-
 START:
     mcall SF_SYS_MISC, SSF_HEAP_INIT 
     mcall SF_SYS_MISC, SSF_MEM_OPEN, checkbox_sharedname
     mov [checkbox_img], eax
 
-    load_libraries l_libs_start,end_l_libs
-    inc   eax
-    test  eax,eax
-    jz    close
-
-    stdcall dll.Init,[init_lib]
+    stdcall dll.Load,importLib
+    or      eax, eax
+    jnz     redraw
 
     invoke ini_get_int,ini_file,asettings,aautosave,0
     mov   [autosave],eax
@@ -157,9 +151,9 @@ draw_window:
     mcall SF_DRAW_TEXT, <55,86>, 0x90FFFfff, TEXT_RDSAVE2
     mcall SF_DRAW_TEXT, <WIN_W-23,5>, 0x81FFFfff, TEXT_CANCEL
     
-	mcall SF_DEFINE_BUTTON, <WIN_W-35,32>, <2,22>, CANCEL_BUTTON_ID
-	mcall SF_DEFINE_BUTTON, <32,14>, <70,14>, CHECKBOX_BUTTON_ID
-	mcall SF_DEFINE_BUTTON, <47,WIN_W-47>, <68,34>, CHECKBOX_BUTTON_ID+BT_NOFRAME
+    mcall SF_DEFINE_BUTTON, <WIN_W-35,32>, <2,22>, CANCEL_BUTTON_ID
+    mcall SF_DEFINE_BUTTON, <32,14>, <70,14>, CHECKBOX_BUTTON_ID
+    mcall SF_DEFINE_BUTTON, <47,WIN_W-47>, <68,34>, CHECKBOX_BUTTON_ID+BT_NOFRAME
     DrawRectangle3D 32, 70, 14, 14, 0x606060, 0xAFAFAF
     call draw_checkbox_flag
 
@@ -208,8 +202,7 @@ draw_checkbox_flag:
     mcall SF_DRAW_RECT, <34,11>, <72,11>, 0x58C33C
     ret
 .flag_unset:
-    DrawRectangle3D 33, 71, 12, 12, 0xDDDddd, 0xffffff
-    mcall SF_DRAW_RECT, <34,12>, <72,12>, 0xFFFfff
+    mcall SF_DRAW_RECT, <33,13>, <71,13>, 0xFFFfff
     ret
 ;---------------------------------------------------------------------
 include 'data.inc'