- More 64-bit fixes

svn path=/trunk/; revision=36912

diff --git a/reactos/subsystems/win32/win32k/include/hook.h b/reactos/subsystems/win32/win32k/include/hook.h
index f471362..d24a57d 100644 (file)
--- a/reactos/subsystems/win32/win32k/include/hook.h
+++ b/reactos/subsystems/win32/win32k/include/hook.h
@@ -48,7 +48,7 @@ typedef struct tagEVENTTABLE
 } EVENTTABLE, *PEVENTTABLE;
 
 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);
 PHOOK FASTCALL IntGetHookObject(HHOOK);
 PHOOK FASTCALL IntGetNextHook(PHOOK Hook);

diff --git a/reactos/subsystems/win32/win32k/ntuser/event.c b/reactos/subsystems/win32/win32k/ntuser/event.c
index 43dc053..20a9b97 100644 (file)
--- a/reactos/subsystems/win32/win32k/ntuser/event.c
+++ b/reactos/subsystems/win32/win32k/ntuser/event.c
@@ -141,8 +141,8 @@ LRESULT
 FASTCALL
 co_EVENT_CallEvents( DWORD event,
                        HWND hwnd, 
-                   LONG idObject,
-                    LONG idChild)
+                    UINT_PTR idObject,
+                    LONG_PTR idChild)
 {
    PEVENTHOOK pEH;
    LRESULT Result;
@@ -185,14 +185,14 @@ IntNotifyWinEvent(
         if ((pEH->Thread != PsGetCurrentThread()) && (pEH->Thread != NULL))
         { // if all process || all thread || other thread same process
            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);
            }
         }// if ^skip own thread && ((Pid && CPid == Pid && ^skip own process) || all process)
         else if ( !(pEH->Flags & WINEVENT_SKIPOWNTHREAD) &&
                    ( ((pEH->idProcess &&
-              (DWORD)(NtCurrentTeb()->ClientId).UniqueProcess == pEH->idProcess) &&
+                     NtCurrentTeb()->ClientId.UniqueProcess == (PVOID)pEH->idProcess) &&
                      !(pEH->Flags & WINEVENT_SKIPOWNPROCESS)) ||
                      !pEH->idProcess ) )
         {
@@ -201,7 +201,7 @@ IntNotifyWinEvent(
                                      Window->hSelf,
                                           idObject,
                                            idChild,
-    (DWORD)(NtCurrentTeb()->ClientId).UniqueThread,
+             PtrToUint(NtCurrentTeb()->ClientId.UniqueThread),
                           (DWORD)EngGetTickCount(),
                                          pEH->Proc);
         }

diff --git a/reactos/subsystems/win32/win32k/ntuser/msgqueue.c b/reactos/subsystems/win32/win32k/ntuser/msgqueue.c
index d12b9c0..1b3b577 100644 (file)
--- a/reactos/subsystems/win32/win32k/ntuser/msgqueue.c
+++ b/reactos/subsystems/win32/win32k/ntuser/msgqueue.c
@@ -942,8 +942,8 @@ co_MsqDispatchOneSentMessage(PUSER_MESSAGE_QUEUE MessageQueue)
    {
       Result = co_EVENT_CallEvents( Message->Msg.message,
                                     Message->Msg.hwnd,
-                             (LONG) Message->Msg.wParam,
-                             (LONG) Message->Msg.lParam);                                  
+                                    Message->Msg.wParam,
+                                    Message->Msg.lParam);                                  
    }
    else
    {