diff --git a/programs/system/desktop/trunk/desktop.asm b/programs/system/desktop/trunk/desktop.asm index d54bb33c9c..20a0c69de1 100644 --- a/programs/system/desktop/trunk/desktop.asm +++ b/programs/system/desktop/trunk/desktop.asm @@ -19,7 +19,7 @@ dd 0,0 ; parameters, reserved include 'lang.inc' - include '..\..\..\macros.inc' + include '..\..\macros.inc' include 'kglobals.inc' include 'unpacker.inc' ;****************************************************************************** @@ -79,8 +79,6 @@ START: ; start of execution mov edi,fname mov ecx,default_skn.size rep movsb - mov [skin_info.fname],0 - mov [skin_info.workarea],0x10000 call load_skin_file ; mov esi, default_dtp @@ -176,7 +174,7 @@ doapply: jne no_apply_skin cmp [skin_info.fname],0 je no_apply_skin - mcall 48,8,skin_info + mcall 48,8,skin_info.fname call draw_window jmp still no_apply_skin: @@ -1063,11 +1061,6 @@ virtual at read_info end virtual skin_info: - .mode dd ? - .start_block dd ? - .blocks dd ? - .address dd ? - .workarea dd ? .fname rb 256+1 app_colours: diff --git a/programs/system/skinsel/skinsel.asm b/programs/system/skinsel/skinsel.asm index bd7a1e2d25..205ff30d86 100644 --- a/programs/system/skinsel/skinsel.asm +++ b/programs/system/skinsel/skinsel.asm @@ -79,8 +79,7 @@ newline2: jns scan2l1 mov byte [esi-1], 0 ; set eax (-> ASCIIZ string) as skin - mov [eax-4], esi - lea ecx, [eax-20] + mov ecx, eax push 48 pop eax mov bl, 8