Changeset 7875 for trunk/src/user32/HOOK.CPP

Timestamp:

Feb 11, 2002, 5:08:15 PM (24 years ago)

Author:

sandervl

Message:

logging updates

File:

• trunk/src/user32/HOOK.CPP (modified) (9 diffs)

trunk/src/user32/HOOK.CPP

@@ -1 @@
-/* $Id: HOOK.CPP,v 1.34 2001-12-11 17:34:52 sandervl Exp $ */
+/* $Id: HOOK.CPP,v 1.35 2002-02-11 16:05:58 sandervl Exp $ */
 
 /*
@@ -639 +639 @@
  *           SetWindowsHook32A   (USER32.525)
  */
-ODINFUNCTION2(HHOOK, SetWindowsHookA,
-              INT, id, 
-              HOOKPROC, proc )
+HHOOK WIN32API SetWindowsHookA(INT id, HOOKPROC proc )
 {
     return SetWindowsHookExA( id, proc, 0, GetCurrentThreadId() );
@@ -649 +647 @@
  *           SetWindowsHook32W   (USER32.528)
  */
-ODINFUNCTION2(HHOOK, SetWindowsHookW,
-              INT, id, 
-              HOOKPROC, proc)
+HHOOK WIN32API SetWindowsHookW(INT id, HOOKPROC proc)
 {
     return SetWindowsHookExW( id, proc, 0, GetCurrentThreadId() );
@@ -659 +655 @@
  *           SetWindowsHookEx32A   (USER32.526)
  */
-ODINFUNCTION4(HHOOK, SetWindowsHookExA,
-              INT, id, 
-              HOOKPROC, proc, 
-              HINSTANCE, hInst,
-              DWORD, dwThreadId )
+HHOOK WIN32API SetWindowsHookExA(INT id,  HOOKPROC proc, 
+                                 HINSTANCE hInst, DWORD dwThreadId )
 {
     return HOOK_SetHook( id, proc, HOOK_WIN32A, hInst, dwThreadId );
@@ -671 +664 @@
  *           SetWindowsHookEx32W   (USER32.527)
  */
-ODINFUNCTION4(HHOOK, SetWindowsHookExW,
-              INT, id, 
-              HOOKPROC, proc, 
-              HINSTANCE, hInst,
-              DWORD, dwThreadId )
+HHOOK WIN32API SetWindowsHookExW(INT id, HOOKPROC proc, HINSTANCE hInst,
+                                 DWORD dwThreadId )
 {
     return HOOK_SetHook( id, proc, HOOK_WIN32W, hInst, dwThreadId );
@@ -683 +673 @@
  *           UnhookWindowsHook32   (USER32.557)
  */
-ODINFUNCTION2(BOOL, UnhookWindowsHook,
-              INT, id, 
-              HOOKPROC, proc )
+BOOL WIN32API UnhookWindowsHook(INT id, HOOKPROC proc )
 {
     HANDLE hook = HOOK_GetHook( id, GetCurrentThreadId() );
-
-    dprintf(("UnhookWindowsHook: %d %08lx\n", id, (DWORD)proc ));
 
     while (hook)
@@ -705 +691 @@
  *           UnhookWindowHookEx32   (USER32.558)
  */
-ODINFUNCTION1(BOOL, UnhookWindowsHookEx,
-              HHOOK, hhook )
+BOOL WIN32API UnhookWindowsHookEx(HHOOK hhook )
 {
     if (CHECK_MAGIC(hhook) == FALSE) {
@@ -749 +734 @@
  * version, plus USER (the 16bit one) has a CallMsgFilter32 function.
  */
-ODINFUNCTION2(BOOL, CallMsgFilterA,
-              LPMSG, msg, 
-              INT, code )
+BOOL WIN32API CallMsgFilterA(LPMSG msg, INT code )
 {
 #if 0 //CB: not a Win32 API and unimplemented
@@ -765 +748 @@
  *           CallMsgFilter32W   (USER32.16)
  */
-ODINFUNCTION2(BOOL, CallMsgFilterW,
-              LPMSG, msg, 
-              INT, code )
+BOOL WIN32API CallMsgFilterW(LPMSG msg, INT code )
 {
 #if 0 //CB: not a Win32 API and unimplemented