commit 1babe5b23c88542e90b4329c358dd9cc30b266b4
author Ulrich Weigand <weigand@informatik.uni-erlangen.de> Thu Dec 24 15:16:08 1998 +0000
committer Alexandre Julliard <julliard@winehq.org> Thu Dec 24 15:16:08 1998 +0000
tree 9cac20d2d2a00838be787b8f29386e8404943513
parent 89b93bf26bbeea2ff62563d07ffdecb3cac722f7

Queue handling adapted to new queue routines.

windows/hook.c

diff --git a/windows/hook.c b/windows/hook.c
index 0ea8604..e7b5302 100644
--- a/windows/hook.c
+++ b/windows/hook.c
@@ -17,6 +17,7 @@
 #include "windows.h"
 #include "hook.h"
 #include "queue.h"
+#include "task.h"
 #include "user.h"
 #include "heap.h"
 #include "struct32.h"
@@ -976,7 +977,7 @@
 
     /* Now call it */
 
-    if (!(queue = (MESSAGEQUEUE *)GlobalLock16( GetTaskQueue(0) ))) return 0;
+    if (!(queue = (MESSAGEQUEUE *)GlobalLock16( GetThreadQueue(0) ))) return 0;
     prevHook = queue->hCurHook;
     queue->hCurHook = hook;
     data->flags |= HOOK_INUSE;
@@ -1025,7 +1026,7 @@
  */
 BOOL32 HOOK_IsHooked( INT16 id )
 {
-    return HOOK_GetHook( id, GetTaskQueue(0) ) != 0;
+    return HOOK_GetHook( id, GetThreadQueue(0) ) != 0;
 }
 
 
@@ -1039,7 +1040,7 @@
 {
     HANDLE16 hook; 
 
-    if (!(hook = HOOK_GetHook( id , GetTaskQueue(0) ))) return 0;
+    if (!(hook = HOOK_GetHook( id , GetThreadQueue(0) ))) return 0;
     if (!(hook = HOOK_FindValidHook(hook))) return 0;
     return HOOK_CallHook( hook, HOOK_WIN16, code, wParam, lParam );
 }
@@ -1054,7 +1055,7 @@
 {
     HANDLE16 hook; 
 
-    if (!(hook = HOOK_GetHook( id , GetTaskQueue(0) ))) return 0;
+    if (!(hook = HOOK_GetHook( id , GetThreadQueue(0) ))) return 0;
     if (!(hook = HOOK_FindValidHook(hook))) return 0;
     return HOOK_CallHook( hook, HOOK_WIN32A, code, wParam, lParam );
 }
@@ -1069,7 +1070,7 @@
 {
     HANDLE16 hook; 
 
-    if (!(hook = HOOK_GetHook( id , GetTaskQueue(0) ))) return 0;
+    if (!(hook = HOOK_GetHook( id , GetThreadQueue(0) ))) return 0;
     if (!(hook = HOOK_FindValidHook(hook))) return 0;
     return HOOK_CallHook( hook, HOOK_WIN32W, code, wParam,
 			  lParam );
@@ -1268,7 +1269,7 @@
  */
 BOOL16 WINAPI UnhookWindowsHook16( INT16 id, HOOKPROC16 proc )
 {
-    HANDLE16 hook = HOOK_GetHook( id , GetTaskQueue(0) );
+    HANDLE16 hook = HOOK_GetHook( id, GetThreadQueue(0) );
 
     TRACE(hook, "%d %08lx\n", id, (DWORD)proc );
 
@@ -1288,7 +1289,7 @@
  */
 BOOL32 WINAPI UnhookWindowsHook32( INT32 id, HOOKPROC32 proc )
 {
-    HANDLE16 hook = HOOK_GetHook( id , GetTaskQueue(0) );
+    HANDLE16 hook = HOOK_GetHook( id, GetThreadQueue(0) );
 
     TRACE(hook, "%d %08lx\n", id, (DWORD)proc );
 
@@ -1375,7 +1376,7 @@
      * current hook value from the task queue to find the next hook. */
     MESSAGEQUEUE *queue;
 
-    if (!(queue = (MESSAGEQUEUE *)GlobalLock16( GetTaskQueue(0) ))) return 0;
+    if (!(queue = (MESSAGEQUEUE *)GlobalLock16( GetThreadQueue(0) ))) return 0;
     return CallNextHookEx16( queue->hCurHook, code, wParam, lParam );
 }