From: Kamil Hornicek <kamil.hornicek@reactos.org>
Date: Mon, 9 Mar 2009 19:01:11 +0000 (+0000)
Subject: - fix logic, global mouse and keyboard hooks are supported, dinput now works again
X-Git-Tag: backups/danny-web@40415~24^2~199
X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=599cdf24ddb0547abc410fd4b5c09d9732b033e3

- fix logic, global mouse and keyboard hooks are supported, dinput now works again

svn path=/trunk/; revision=39919
---

diff --git a/reactos/subsystems/win32/win32k/ntuser/hook.c b/reactos/subsystems/win32/win32k/ntuser/hook.c
index 230875716f6..c4b0f86fddf 100644
--- a/reactos/subsystems/win32/win32k/ntuser/hook.c
+++ b/reactos/subsystems/win32/win32k/ntuser/hook.c
@@ -1051,7 +1051,7 @@ NtUserSetWindowsHookEx(
       Global = TRUE;
    }
 
-   if ( ( Global && (HookId != WH_KEYBOARD_LL || HookId != WH_MOUSE_LL) ) ||
+   if ( ( Global && (HookId != WH_KEYBOARD_LL && HookId != WH_MOUSE_LL) ) ||
         WH_DEBUG == HookId ||
         WH_JOURNALPLAYBACK == HookId ||
         WH_JOURNALRECORD == HookId)