sync with trunk head (34904)

[reactos.git] / reactos / subsystems / win32 / win32k / ntuser / hook.c

diff --git a/reactos/subsystems/win32/win32k/ntuser/hook.c b/reactos/subsystems/win32/win32k/ntuser/hook.c
index 6c73f67..8250467 100644 (file)
--- a/reactos/subsystems/win32/win32k/ntuser/hook.c
+++ b/reactos/subsystems/win32/win32k/ntuser/hook.c
@@ -274,7 +274,7 @@ IntCallLowLevelHook(INT HookId, INT Code, WPARAM wParam, LPARAM lParam, PHOOK Ho
 
    /* FIXME should get timeout from
     * HKEY_CURRENT_USER\Control Panel\Desktop\LowLevelHooksTimeout */
-   Status = co_MsqSendMessage(((PW32THREAD)Hook->Thread->Tcb.Win32Thread)->MessageQueue, (HWND) Code, HookId,
+   Status = co_MsqSendMessage(((PW32THREAD)Hook->Thread->Tcb.Win32Thread)->MessageQueue, (HWND)(INT_PTR) Code, HookId,
                               wParam, lParam, 5000, TRUE, TRUE, &uResult);
 
    return NT_SUCCESS(Status) ? uResult : 0;
@@ -913,10 +913,6 @@ NtUserCallNextHookEx(
    
    NextObj = IntGetNextHook(HookObj);
    ClientInfo->phkCurrent = NextObj; // Preset next hook from list.
-   if (HookObj->HookId == WH_GETMESSAGE)
-   {
-     DPRINT1(" WH_GETMESSAGE, Hook %x NextHook %x \n", HookObj, NextObj);
-   }
    UserCallNextHookEx( HookObj, Code, wParam, lParam, Ansi);
    UserDereferenceObject(HookObj);
 
@@ -931,7 +927,7 @@ CLEANUP:
 HHOOK
 STDCALL
 NtUserSetWindowsHookAW(
-   int idHook, 
+   int idHook,
    HOOKPROC lpfn,
    BOOL Ansi)
 {
@@ -985,7 +981,7 @@ NtUserSetWindowsHookEx(
       }
       Mod = NULL;
       Global = FALSE;
-      if (! NT_SUCCESS(PsLookupThreadByThreadId((HANDLE) ThreadId, &Thread)))
+      if (! NT_SUCCESS(PsLookupThreadByThreadId((HANDLE)(DWORD_PTR)ThreadId, &Thread)))
       {
          DPRINT1("Invalid thread id 0x%x\n", ThreadId);
          SetLastWin32Error(ERROR_INVALID_PARAMETER);
@@ -1199,5 +1195,5 @@ CLEANUP:
    UserLeave();
    END_CLEANUP;
 }
- 
+
 /* EOF */