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

Fixes to skin drawing code, in case default.skn wasn't loaded on OS startup

Browse Source 
git-svn-id: svn://kolibrios.org@53 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Mihail Semenyako (mike.dld) 2006-03-04 12:58:59 +00:00
parent 9b4ba85ac2
commit 2a183233b4
2 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
kernel/trunk/gui/skincode.inc
View File

@ -53,8 +53,10 @@ ends
load_skin: load_skin:
pushad pushad
mov [_skinh],22
mov eax,_skin_file mov eax,_skin_file
mov edx,skin_data mov edx,skin_data
mov [ebp+SKIN_HEADER.ident],'????'
call load_skin_file call load_skin_file
call parse_skin_data call parse_skin_data
popad popad
@ -176,6 +178,12 @@ parse_skin_data:
.exit: .exit:
ret ret
sys_putimage_with_check:
or ebx,ebx
jz @f
call sys_putimage
@@: ret
drawwindow_IV: drawwindow_IV:
;param1 - aw_yes ;param1 - aw_yes
@ -234,7 +242,7 @@ drawwindow_IV:
add ecx,[_skinh] add ecx,[_skinh]
mov ebx, [ebp+SKIN_DATA.left.data] mov ebx, [ebp+SKIN_DATA.left.data]
call sys_putimage call sys_putimage_with_check
mov esi,[esp] mov esi,[esp]
mov eax,[esi+8] mov eax,[esi+8]
@ -243,8 +251,9 @@ drawwindow_IV:
cmp eax,[ebp+SKIN_DATA.base.left] cmp eax,[ebp+SKIN_DATA.base.left]
jng non_base jng non_base
xor edx,edx xor edx,edx
mov ebx,[ebp+SKIN_DATA.base.width] mov ecx,[ebp+SKIN_DATA.base.width]
div ebx jecxz non_base
div ecx
inc eax inc eax
@ -261,7 +270,7 @@ drawwindow_IV:
shl edx,16 shl edx,16
push eax ebx ecx edx push eax ebx ecx edx
call sys_putimage call sys_putimage_with_check
pop edx ecx ebx eax pop edx ecx ebx eax
dec eax dec eax
@ -278,7 +287,7 @@ drawwindow_IV:
mov ecx,[ebp+SKIN_DATA.oper.width] mov ecx,[ebp+SKIN_DATA.oper.width]
shl ecx,16 shl ecx,16
add ecx,[_skinh] add ecx,[_skinh]
call sys_putimage call sys_putimage_with_check
mov esi,[esp] mov esi,[esp]

9
kernel/trunk/kernel.asm
View File

@ -3901,6 +3901,15 @@ drawbackground:
sys_putimage: sys_putimage:
test ecx,0x80008000
jnz .exit
test ecx,0x0000FFFF
jz .exit
test ecx,0xFFFF0000
jnz @f
.exit:
ret
@@:
; inc [mouse_pause] ; inc [mouse_pause]
cmp [0xfe0c],word 0x12 cmp [0xfe0c],word 0x12
jne spiv20 jne spiv20