KolibriOS/kolibrios
12
4
Fork 12
Code Issues 78 Pull Requests 5 Projects Releases Activity

Fix previous kernel revision for debugging with MTDBG.

Browse Source 
git-svn-id: svn://kolibrios.org@2452 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Marat Zakiyanov (Mario79) 2012-03-12 11:16:00 +00:00
parent 145124ff4e
commit c039e0039c
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
kernel/trunk/kernel.asm
View File

@ -1949,6 +1949,7 @@ sys_end:
call delay_hs call delay_hs
jmp waitterm jmp waitterm
;------------------------------------------------------------------------------ ;------------------------------------------------------------------------------
align 4
restore_default_cursor_before_killing: restore_default_cursor_before_killing:
mov eax, [def_cursor] mov eax, [def_cursor]
mov [ecx+APPDATA.cursor], eax mov [ecx+APPDATA.cursor], eax
@ -1964,9 +1965,14 @@ restore_default_cursor_before_killing:
movzx edx, byte [ebx+eax] movzx edx, byte [ebx+eax]
shl edx, 8 shl edx, 8
mov esi, [edx+SLOT_BASE+APPDATA.cursor] mov esi, [edx+SLOT_BASE+APPDATA.cursor]
cmp esi, [current_cursor]
je @f
push esi push esi
call [_display.select_cursor] call [_display.select_cursor]
mov [current_cursor], esi mov [current_cursor], esi
@@:
mov [redrawmouse_unconditional], 1 mov [redrawmouse_unconditional], 1
call [draw_pointer] call [draw_pointer]
ret ret
@ -2041,15 +2047,19 @@ sysfn_terminate: ; 18.2 = TERMINATE
jz noprocessterminate jz noprocessterminate
;-------------------------------------- ;--------------------------------------
cmp [_display.select_cursor], 0 cmp [_display.select_cursor], 0
je @f je .restore_end
; restore default cursor before killing ; restore default cursor before killing
pusha pusha
mov ecx, [esp+32] mov ecx, [esp+32]
shl ecx, 8 shl ecx, 8
add ecx, SLOT_BASE add ecx, SLOT_BASE
mov eax, [def_cursor]
cmp [ecx+APPDATA.cursor], eax
je @f
call restore_default_cursor_before_killing call restore_default_cursor_before_killing
popa
@@: @@:
popa
.restore_end:
add esp, 4 add esp, 4
;-------------------------------------- ;--------------------------------------
;call MEM_Heap_Lock ;guarantee that process isn't working with heap ;call MEM_Heap_Lock ;guarantee that process isn't working with heap