More hook removal and cleanup.

svn path=/trunk/; revision=32932

reactos/dll/win32/user32/user32.def

@@ -693,7 +693,7 @@ TranslateMessage@4
 TranslateMessageEx@8
 UnhookWinEvent@4=NtUserUnhookWinEvent@4
 UnhookWindowsHook@8
-UnhookWindowsHookEx@4
+UnhookWindowsHookEx@4=NtUserUnhookWindowsHookEx@4
 UnionRect@12
 UnloadKeyboardLayout@4=NtUserUnloadKeyboardLayout@4
 UnlockWindowStation@4

reactos/dll/win32/user32/windows/hook.c

@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id$
+/*
  *
  * PROJECT:         ReactOS user32.dll
  * FILE:            lib/user32/windows/input.c
@@ -72,18 +72,38 @@ GetMaskFromEvent(DWORD Event)
   return Ret;
 }
 
+static
+HHOOK
+FASTCALL
+IntSetWindowsHook(
+    int idHook,
+    HOOKPROC lpfn,
+    HINSTANCE hMod,
+    DWORD dwThreadId,
+    BOOL bAnsi)
+{
+  WCHAR ModuleName[MAX_PATH];
+  UNICODE_STRING USModuleName;
+
+  if (NULL != hMod)
+    {
+      if (0 == GetModuleFileNameW(hMod, ModuleName, MAX_PATH))
+        {
+          return NULL;
+        }
+      RtlInitUnicodeString(&USModuleName, ModuleName);
+    }
+  else
+    {
+      RtlInitUnicodeString(&USModuleName, NULL);
+    }
+
+  return NtUserSetWindowsHookEx(hMod, &USModuleName, dwThreadId, idHook, lpfn, bAnsi);
+}
+
+
 /* FUNCTIONS *****************************************************************/
 
-/*
- * @implemented
- */
-BOOL
-STDCALL
-UnhookWindowsHookEx(
-  HHOOK Hook)
-{
-  return NtUserUnhookWindowsHookEx(Hook);
-}
 #if 0
 BOOL
 STDCALL
@@ -96,7 +116,6 @@ CallMsgFilter(
 }
 #endif
 
-
 /*
  * @implemented
  */
@@ -179,35 +198,6 @@ CallNextHookEx(
   return NtUserCallNextHookEx(Hook, Code, wParam, lParam);
 }
 
-static
-HHOOK
-FASTCALL
-IntSetWindowsHook(
-    int idHook,
-    HOOKPROC lpfn,
-    HINSTANCE hMod,
-    DWORD dwThreadId,
-    BOOL bAnsi)
-{
-  WCHAR ModuleName[MAX_PATH];
-  UNICODE_STRING USModuleName;
-
-  if (NULL != hMod)
-    {
-      if (0 == GetModuleFileNameW(hMod, ModuleName, MAX_PATH))
-        {
-          return NULL;
-        }
-      RtlInitUnicodeString(&USModuleName, ModuleName);
-    }
-  else
-    {
-      RtlInitUnicodeString(&USModuleName, NULL);
-    }
-
-  return NtUserSetWindowsHookEx(hMod, &USModuleName, dwThreadId, idHook, lpfn, bAnsi);
-}
-
 /*
  * @unimplemented
  */