alternative fix for r.1474

git-svn-id: svn://kolibrios.org@2233 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Marat Zakiyanov (Mario79) 2011-09-23 02:33:18 +00:00
parent e3963ea7c1
commit 132b516d92

View File

@ -1163,7 +1163,7 @@ sys_window_end_moving_handler: ;///////////////////////////////////////////////
;> esi = process slot ;> esi = process slot
;------------------------------------------------------------------------------ ;------------------------------------------------------------------------------
mov edi, ebx mov edi, ebx
call window._.draw_negative_box call window._.end_moving__box
mov edi, esi mov edi, esi
shl edi, 5 shl edi, 5
@ -1306,18 +1306,7 @@ end if
mov ecx, 4 mov ecx, 4
repz cmpsd repz cmpsd
pop edi pop edi
jnz @f jz .exit
mov edi,eax
mov eax, [edi + BOX.left - 2]
mov ax, word[edi + BOX.left]
add ax, word[edi + BOX.width]
mov ebx, [edi + BOX.top - 2]
mov bx, word[edi + BOX.top]
add bx, word[edi + BOX.height]
xor esi,esi
call draw_rectangle.forced
jmp .exit
@@: @@:
add esp, -BOX.sizeof add esp, -BOX.sizeof
@ -2084,13 +2073,24 @@ window._.draw_negative_box: ;//////////////////////////////////////////////////
;> edi = pointer to BOX struct ;> edi = pointer to BOX struct
;------------------------------------------------------------------------------ ;------------------------------------------------------------------------------
push eax ebx esi push eax ebx esi
mov esi, 0x01000000
.1:
mov eax, [edi + BOX.left - 2] mov eax, [edi + BOX.left - 2]
mov ax, word[edi + BOX.left] mov ax, word[edi + BOX.left]
add ax, word[edi + BOX.width] add ax, word[edi + BOX.width]
mov ebx, [edi + BOX.top - 2] mov ebx, [edi + BOX.top - 2]
mov bx, word[edi + BOX.top] mov bx, word[edi + BOX.top]
add bx, word[edi + BOX.height] add bx, word[edi + BOX.height]
mov esi, 0x01000000
call draw_rectangle.forced call draw_rectangle.forced
pop esi ebx eax pop esi ebx eax
ret ret
;------------------------------------------------------------------------------
window._.end_moving__box: ;//////////////////////////////////////////////////
;------------------------------------------------------------------------------
;? Draw positive box
;------------------------------------------------------------------------------
;> edi = pointer to BOX struct
;------------------------------------------------------------------------------
push eax ebx esi
xor esi,esi
jmp window._.draw_negative_box.1