KolibriOS/kolibrios
13
5
Fork 11
Code Issues 76 Pull Requests 3 Projects 1 Releases Activity

oops: bug in event.inc#line=295

Browse Source 
git-svn-id: svn://kolibrios.org@1061 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Galkov 2009-04-11 14:58:29 +00:00
parent a54ad6a85f
commit 1ed35470d7
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -73,14 +73,15 @@ set_event: ;; INTERNAL use !!! don't use
; eax - event (=0 => fail) ; eax - event (=0 => fail)
; edx - uid ; edx - uid
;scratched: ebx,ecx,esi,edi ;scratched: ebx,ecx,esi,edi
mov eax,[event_start] mov eax,FreeEvents
cmp eax,FreeEvents cmp eax,[eax+EVENT.fd]
jne @f ; not empty ??? jne @f ; not empty ???
pushad pushad
call init_events call init_events
popad popad
jz RemoveEventTo.break ; POPF+RET jz RemoveEventTo.break ; POPF+RET
@@: mov [eax+EVENT.magic],'EVNT' @@: mov eax,[eax+EVENT.fd]
mov [eax+EVENT.magic],'EVNT'
mov [eax+EVENT.destroy],destroy_event.internal mov [eax+EVENT.destroy],destroy_event.internal
mov [eax+EVENT.state],ecx mov [eax+EVENT.state],ecx
mov [eax+EVENT.pid],edx mov [eax+EVENT.pid],edx
@ -121,7 +122,7 @@ NotDummyTest: ;; INTERNAL use (not returned
pop edi pop edi
pushfd pushfd
cli cli
call pid_to_slot ; seved all registers (eax - retval) call pid_to_slot ; saved all registers (eax - retval)
shl eax,8 shl eax,8
jz RemoveEventTo.break ; POPF+RET jz RemoveEventTo.break ; POPF+RET
jmp edi ; øòàòíûé âîçâðàò jmp edi ; øòàòíûé âîçâðàò
@ -263,7 +264,7 @@ wait_event: ;; EXPORT use
;scratched: ecx,edx,esi ;scratched: ecx,edx,esi
call DummyTest call DummyTest
mov ecx,eax ; wait_param mov ecx,eax ; wait_param
mov edx, get_event_alone mov edx, get_event_alone ; wait_test
call Wait_events ; timeout ignored call Wait_events ; timeout ignored
jmp wait_finish jmp wait_finish
@ -281,7 +282,7 @@ get_event_ex: ;; f68:14
;retval: ;retval:
; eax - ñîáñòâåííî EVENT (áóäåì íàçûâàòü ýòî åãî õýíäëîì) ; eax - ñîáñòâåííî EVENT (áóäåì íàçûâàòü ýòî åãî õýíäëîì)
;scratched: ebx,ecx,edx,esi,edi ;scratched: ebx,ecx,edx,esi,edi
mov edx, get_event_queue mov edx, get_event_queue ; wait_test
call Wait_events ; timeout ignored call Wait_events ; timeout ignored
lea esi,[eax+EVENT.code] lea esi,[eax+EVENT.code]
mov ecx,EVENT.codesize/4 mov ecx,EVENT.codesize/4
@ -291,7 +292,7 @@ get_event_ex: ;; f68:14
wait_finish: wait_finish:
test byte[eax+EVENT.state+3], MANUAL_RESET shr 24 test byte[eax+EVENT.state+3], MANUAL_RESET shr 24
jnz get_event_queue.ret ; RET jnz get_event_queue.ret ; RET
and byte[ebx+EVENT.state+3], not((EVENT_SIGNALED+EVENT_WATCHED)shr 24) and byte[eax+EVENT.state+3], not((EVENT_SIGNALED+EVENT_WATCHED)shr 24)
test byte[eax+EVENT.state+3], MANUAL_DESTROY shr 24 test byte[eax+EVENT.state+3], MANUAL_DESTROY shr 24
jz destroy_event.internal jz destroy_event.internal
mov ebx,[current_slot] mov ebx,[current_slot]
@ -399,8 +400,8 @@ align 4
sys_waitforevent: ;; f10 sys_waitforevent: ;; f10
or ebx,-1 ; infinite timeout or ebx,-1 ; infinite timeout
sys_wait_event_timeout: ;; f23 sys_wait_event_timeout: ;; f23
mov edx,get_event_for_app mov edx,get_event_for_app ; wait_test
call Wait_events_ex call Wait_events_ex ; ebx - timeout
mov [esp+32],eax mov [esp+32],eax
ret ret