Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-05-07 10:46:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

- More 64-bit fixes

Browse source 
svn path=/trunk/; revision=36912
This commit is contained in:
Stefan Ginsberg 2008-10-23 17:05:40 +00:00
parent 63516132ef
commit 922bd47d8d
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
reactos/subsystems/win32/win32k/include/hook.h
View file

@ -48,7 +48,7 @@ typedef struct tagEVENTTABLE
} EVENTTABLE, *PEVENTTABLE; } EVENTTABLE, *PEVENTTABLE;
LRESULT FASTCALL co_HOOK_CallHooks(INT HookId, INT Code, WPARAM wParam, LPARAM lParam); LRESULT FASTCALL co_HOOK_CallHooks(INT HookId, INT Code, WPARAM wParam, LPARAM lParam);
LRESULT FASTCALL co_EVENT_CallEvents(DWORD, HWND, LONG, LONG); LRESULT FASTCALL co_EVENT_CallEvents(DWORD, HWND, UINT_PTR, LONG_PTR);
VOID FASTCALL HOOK_DestroyThreadHooks(PETHREAD Thread); VOID FASTCALL HOOK_DestroyThreadHooks(PETHREAD Thread);
PHOOK FASTCALL IntGetHookObject(HHOOK); PHOOK FASTCALL IntGetHookObject(HHOOK);
PHOOK FASTCALL IntGetNextHook(PHOOK Hook); PHOOK FASTCALL IntGetNextHook(PHOOK Hook);

10
reactos/subsystems/win32/win32k/ntuser/event.c
View file

@ -141,8 +141,8 @@ LRESULT
FASTCALL FASTCALL
co_EVENT_CallEvents( DWORD event, co_EVENT_CallEvents( DWORD event,
HWND hwnd, HWND hwnd,
LONG idObject, UINT_PTR idObject,
LONG idChild) LONG_PTR idChild)
{ {
PEVENTHOOK pEH; PEVENTHOOK pEH;
LRESULT Result; LRESULT Result;
@ -185,14 +185,14 @@ IntNotifyWinEvent(
if ((pEH->Thread != PsGetCurrentThread()) && (pEH->Thread != NULL)) if ((pEH->Thread != PsGetCurrentThread()) && (pEH->Thread != NULL))
{ // if all process || all thread || other thread same process { // if all process || all thread || other thread same process
if (!(pEH->idProcess) || !(pEH->idThread) || if (!(pEH->idProcess) || !(pEH->idThread) ||
((DWORD)(NtCurrentTeb()->ClientId).UniqueProcess == pEH->idProcess)) (NtCurrentTeb()->ClientId.UniqueProcess == (PVOID)pEH->idProcess))
{ {
Result = IntCallLowLevelEvent(pEH, Event, Window->hSelf, idObject, idChild); Result = IntCallLowLevelEvent(pEH, Event, Window->hSelf, idObject, idChild);
} }
}// if ^skip own thread && ((Pid && CPid == Pid && ^skip own process) || all process) }// if ^skip own thread && ((Pid && CPid == Pid && ^skip own process) || all process)
else if ( !(pEH->Flags & WINEVENT_SKIPOWNTHREAD) && else if ( !(pEH->Flags & WINEVENT_SKIPOWNTHREAD) &&
( ((pEH->idProcess && ( ((pEH->idProcess &&
(DWORD)(NtCurrentTeb()->ClientId).UniqueProcess == pEH->idProcess) && NtCurrentTeb()->ClientId.UniqueProcess == (PVOID)pEH->idProcess) &&
!(pEH->Flags & WINEVENT_SKIPOWNPROCESS)) || !(pEH->Flags & WINEVENT_SKIPOWNPROCESS)) ||
!pEH->idProcess ) ) !pEH->idProcess ) )
{ {
@ -201,7 +201,7 @@ IntNotifyWinEvent(
Window->hSelf, Window->hSelf,
idObject, idObject,
idChild, idChild,
(DWORD)(NtCurrentTeb()->ClientId).UniqueThread, PtrToUint(NtCurrentTeb()->ClientId.UniqueThread),
(DWORD)EngGetTickCount(), (DWORD)EngGetTickCount(),
pEH->Proc); pEH->Proc);
} }

4
reactos/subsystems/win32/win32k/ntuser/msgqueue.c
View file

@ -942,8 +942,8 @@ co_MsqDispatchOneSentMessage(PUSER_MESSAGE_QUEUE MessageQueue)
{ {
Result = co_EVENT_CallEvents( Message->Msg.message, Result = co_EVENT_CallEvents( Message->Msg.message,
Message->Msg.hwnd, Message->Msg.hwnd,
(LONG) Message->Msg.wParam, Message->Msg.wParam,
(LONG) Message->Msg.lParam); Message->Msg.lParam);
} }
else else
{ {