sdongles/kolibrios
1
0
Fork 0
forked from KolibriOS/kolibrios
Code Pull Requests Activity

Small fix for r.2478

Browse Source 
git-svn-id: svn://kolibrios.org@2481 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Marat Zakiyanov (Mario79) 2012-03-19 21:17:27 +00:00
parent 4ba4f03104
commit 677e27838b
1 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
programs/system/setup/trunk/setup.asm
View File

@ -3,7 +3,11 @@
;; DEVICE SETUP ;; ;; DEVICE SETUP ;;
;; ;; ;; ;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
; version: 1.14
; last update: 20/03/2012
; changed by: Marat Zakiyanov aka Mario79, aka Mario
; changes: optimisations and code refactoring
;---------------------------------------------------------------------
; Authors: Ville - original version ; Authors: Ville - original version
; A. Ivushkin - autostart (w launcher) ; A. Ivushkin - autostart (w launcher)
; M. Lisovin - added many feauters (apply all, save all, set time...) ; M. Lisovin - added many feauters (apply all, save all, set time...)
@ -90,13 +94,14 @@ get_setup_values:
ret ret
;------------------------------------------------------------------------------- ;-------------------------------------------------------------------------------
START: START:
cmp [I_PARAM],'SLAN' mov eax,I_PARAM
cmp [eax],dword 'SLAN'
je set_syslanguage_and_exit je set_syslanguage_and_exit
cmp [I_PARAM],'LANG' cmp [eax],dword 'LANG'
je set_language_and_exit je set_language_and_exit
cmp [I_PARAM],'BOOT' cmp [eax],dword 'BOOT'
je apply_all_and_exit je apply_all_and_exit
call get_setup_values call get_setup_values
@ -421,6 +426,12 @@ draw_window:
xor esi,esi xor esi,esi
mcall ,<40,(355+BBB)>,<40,(12*15)>,0xB4111199,,title mcall ,<40,(355+BBB)>,<40,(12*15)>,0xB4111199,,title
mcall 9,procinfo,-1
mov eax,[ebx+70] ;status of window
test eax,100b
jne .end
mcall 8,<(350-85),100>,<(5+14*8),12>,100,0x005588dd ; APPLY ALL mcall 8,<(350-85),100>,<(5+14*8),12>,100,0x005588dd ; APPLY ALL
add ecx,16*65536 ; SAVE ALL add ecx,16*65536 ; SAVE ALL
@ -454,7 +465,7 @@ draw_window:
call draw_buttons call draw_buttons
call draw_infotext call draw_infotext
.end:
mcall 12,2 mcall 12,2
popa popa
ret ret
@ -724,8 +735,6 @@ save_fileinfo:
dd keyboard dd keyboard
file_name: db '/sys/setup.dat',0 file_name: db '/sys/setup.dat',0
;------------------------------------------------------------------------------- ;-------------------------------------------------------------------------------
I_PARAM dd 0
;-----------------------------------------------------------------------------
; Note to SVN revision 2299 - some parameters has not used, ; Note to SVN revision 2299 - some parameters has not used,
; but keep the order of the parameter has always needed! ; but keep the order of the parameter has always needed!
keyboard dd 0x0 keyboard dd 0x0
@ -747,10 +756,14 @@ align 4
text00: text00:
rb LLL*(text1_strings + text2_strings) rb LLL*(text1_strings + text2_strings)
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
align 4
I_PARAM:
procinfo:
rb 1024
;-----------------------------------------------------------------------------
align 4 align 4
rb 0x1000 rb 0x1000
stack_area: stack_area:
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
;table_area:
I_END: I_END:
;------------------------------------------------------------------------------- ;-------------------------------------------------------------------------------