Index: include/windef.h
===================================================================
RCS file: /home/wine/wine/include/windef.h,v
retrieving revision 1.65
diff -u -r1.65 windef.h
--- include/windef.h	19 Jul 2002 00:28:13 -0000	1.65
+++ include/windef.h	23 Jul 2002 21:40:35 -0000
@@ -79,7 +79,7 @@
 DECLARE_HANDLE(HDESK);
 DECLARE_OLD_HANDLE(HENHMETAFILE);
 DECLARE_OLD_HANDLE(HFONT);
-DECLARE_OLD_HANDLE(HHOOK);
+DECLARE_HANDLE(HHOOK);
 DECLARE_OLD_HANDLE(HICON);
 DECLARE_OLD_HANDLE(HINSTANCE);
 DECLARE_OLD_HANDLE(HKEY);
Index: windows/hook.c
===================================================================
RCS file: /home/wine/wine/windows/hook.c,v
retrieving revision 1.35
diff -u -r1.35 hook.c
--- windows/hook.c	10 Jul 2002 23:20:49 -0000	1.35
+++ windows/hook.c	23 Jul 2002 21:40:35 -0000
@@ -841,7 +841,7 @@
  /* remove all system hooks registered by this module */
 
   HOOKDATA*     hptr;
-  HHOOK         hook, next;
+  HANDLE16      hook, next;
   int           id;
 
   for( id = WH_MINHOOK; id <= WH_MAXHOOK; id++ )
@@ -870,7 +870,7 @@
   /* remove all hooks registered by the current queue */
 
   HOOKDATA*	hptr = NULL;
-  HHOOK 	hook, next;
+  HANDLE16 	hook, next;
   int 		id;
 
   for( id = WH_MINHOOK; id <= WH_MAXHOOK; id++ )
@@ -1057,7 +1057,8 @@
     MESSAGEQUEUE *queue;
 
     if (!(queue = QUEUE_Current())) return 0;
-    return CallNextHookEx16( queue->hCurHook, code, wParam, lParam );
+    return CallNextHookEx16( (HHOOK)MAKELONG(queue->hCurHook, HOOK_MAGIC),
+			    code, wParam, lParam );
 }
 
 
Index: dlls/shell32/shell.c
===================================================================
RCS file: /home/wine/wine/dlls/shell32/shell.c,v
retrieving revision 1.41
diff -u -r1.41 shell.c
--- dlls/shell32/shell.c	21 Jun 2002 20:08:50 -0000	1.41
+++ dlls/shell32/shell.c	23 Jul 2002 21:40:35 -0000
@@ -45,6 +45,8 @@
 WINE_DECLARE_DEBUG_CHANNEL(exec);
 
 
+#define HOOK_MAGIC  ((int)'H' | (int)'K' << 8)  /* 'HK' */
+
 typedef struct {     /* structure for dropped files */
  WORD     wSize;
  POINT16  ptMousePos;
@@ -494,7 +496,8 @@
         }
 	PostMessageA( SHELL_hWnd, uMsg, wParam, 0 );
     }
-    return CallNextHookEx16( WH_SHELL, code, wParam, lParam );
+    return CallNextHookEx16( (HHOOK)MAKELONG(WH_SHELL, HOOK_MAGIC), code,
+			    wParam, lParam );
 }
 
 /*************************************************************************