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

Timestamp:

May 12, 2000, 8:09:42 PM (25 years ago)

Author:

sandervl

Message:

hook, syscolor & message bugfixes

File:

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

trunk/src/user32/HOOK.CPP

@@ -1 @@
-/* $Id: HOOK.CPP,v 1.13 2000-03-23 19:24:25 sandervl Exp $ */
+/* $Id: HOOK.CPP,v 1.14 2000-05-12 18:09:39 sandervl Exp $ */
 
 /*
@@ -333 +333 @@
   HOOKDATA **prevHook;
   THDB     *thdb;
-  VMutex   *hookMutex;
 
     dprintf(("Removing hook %08x\n", data));
@@ -358 +357 @@
                 return FALSE;
         }
-        hookMutex = &threadHookMutex;
-        hookMutex->enter();
+        threadHookMutex.enter();
         prevHook = (HOOKDATA **)&thdb->hooks[data->id - WH_MINHOOK];
     }
     else {
-        hookMutex = &systemHookMutex;
-        hookMutex->enter();
+        systemHookMutex.enter(VMUTEX_WAIT_FOREVER, &hGlobalHookMutex);
         prevHook = (HOOKDATA **)&HOOK_systemHooks[data->id - WH_MINHOOK];
     }
@@ -371 +368 @@
 
     if (!prevHook) {
-        hookMutex->leave();
+        if (data->ownerThread) {
+                threadHookMutex.leave();
+        }
+        else    systemHookMutex.leave(&hGlobalHookMutex);
+
         return FALSE;
     }
     *prevHook = (HOOKDATA *)data->next;
-    hookMutex->leave();
+
+    if (data->ownerThread) {
+         threadHookMutex.leave();
+    }
+    else systemHookMutex.leave(&hGlobalHookMutex);
 
     HeapFree(GetProcessHeap(), 0, (LPVOID)data );