end: -1 sector

git-svn-id: svn://kolibrios.org@9540 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Kirill Lipatov (Leency) 2021-12-31 19:59:28 +00:00
parent 182c486f2a
commit 89cd2db0bd
2 changed files with 14 additions and 30 deletions

View File

@ -55,22 +55,13 @@ asettings db 'settings',0
aautosave db 'autosave',0 aautosave db 'autosave',0
ini_file db '/sys/settings/rdsave.ini',0 ini_file db '/sys/settings/rdsave.ini',0
;--------------------------------------------------------------------- ;---------------------------------------------------------------------
;Lib_DATA importLib:
system_dir_libini db '/sys/lib/libini.obj',0 library \
;--------------------------------------------------------------------- libini, 'libini.obj'
l_libs_start:
library02 l_libs system_dir_libini+9, library_path, system_dir_libini, libini_import import libini, \
end_l_libs: ini_set_int ,'ini_set_int', \
;--------------------------------------------------------------------- ini_get_int ,'ini_get_int'
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
;--------------------------------------------------------------------- ;---------------------------------------------------------------------
checkbox_sharedname db 'CHECKBOX',0 checkbox_sharedname db 'CHECKBOX',0
checkbox_img dd ? checkbox_img dd ?

View File

@ -18,23 +18,17 @@ include '../../../macros.inc'
include '../../../proc32.inc' include '../../../proc32.inc'
include '../../../dll.inc' include '../../../dll.inc'
include '../../../KOSfuncs.inc' include '../../../KOSfuncs.inc'
include '../../../load_lib.mac'
include '../../../gui_patterns.inc' include '../../../gui_patterns.inc'
include '../../../string.inc' include '../../../string.inc'
@use_library
START: START:
mcall SF_SYS_MISC, SSF_HEAP_INIT mcall SF_SYS_MISC, SSF_HEAP_INIT
mcall SF_SYS_MISC, SSF_MEM_OPEN, checkbox_sharedname mcall SF_SYS_MISC, SSF_MEM_OPEN, checkbox_sharedname
mov [checkbox_img], eax mov [checkbox_img], eax
load_libraries l_libs_start,end_l_libs stdcall dll.Load,importLib
inc eax or eax, eax
test eax,eax jnz redraw
jz close
stdcall dll.Init,[init_lib]
invoke ini_get_int,ini_file,asettings,aautosave,0 invoke ini_get_int,ini_file,asettings,aautosave,0
mov [autosave],eax mov [autosave],eax
@ -157,9 +151,9 @@ draw_window:
mcall SF_DRAW_TEXT, <55,86>, 0x90FFFfff, TEXT_RDSAVE2 mcall SF_DRAW_TEXT, <55,86>, 0x90FFFfff, TEXT_RDSAVE2
mcall SF_DRAW_TEXT, <WIN_W-23,5>, 0x81FFFfff, TEXT_CANCEL 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, <WIN_W-35,32>, <2,22>, CANCEL_BUTTON_ID
mcall SF_DEFINE_BUTTON, <32,14>, <70,14>, CHECKBOX_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, <47,WIN_W-47>, <68,34>, CHECKBOX_BUTTON_ID+BT_NOFRAME
DrawRectangle3D 32, 70, 14, 14, 0x606060, 0xAFAFAF DrawRectangle3D 32, 70, 14, 14, 0x606060, 0xAFAFAF
call draw_checkbox_flag call draw_checkbox_flag
@ -208,8 +202,7 @@ draw_checkbox_flag:
mcall SF_DRAW_RECT, <34,11>, <72,11>, 0x58C33C mcall SF_DRAW_RECT, <34,11>, <72,11>, 0x58C33C
ret ret
.flag_unset: .flag_unset:
DrawRectangle3D 33, 71, 12, 12, 0xDDDddd, 0xffffff mcall SF_DRAW_RECT, <33,13>, <71,13>, 0xFFFfff
mcall SF_DRAW_RECT, <34,12>, <72,12>, 0xFFFfff
ret ret
;--------------------------------------------------------------------- ;---------------------------------------------------------------------
include 'data.inc' include 'data.inc'