Changeset 2097 for trunk/src

Timestamp:

Dec 17, 1999, 5:56:54 PM (26 years ago)

Author:

sandervl

Message:

hook removal bugfix

File:

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

trunk/src/user32/HOOK.CPP

@@ -1 @@
-/* $Id: HOOK.CPP,v 1.6 1999-12-16 00:11:44 sandervl Exp $ */
+/* $Id: HOOK.CPP,v 1.7 1999-12-17 16:56:54 sandervl Exp $ */
 
 /*
@@ -324 +324 @@
 static BOOL HOOK_RemoveHook( HOOKDATA *data )
 {
-  HOOKDATA *prevHook;
+  HOOKDATA **prevHook;
   THDB     *thdb;
   VMutex   *hookMutex;
@@ -353 +353 @@
         hookMutex = &threadHookMutex;
         hookMutex->enter();
-        prevHook = (HOOKDATA *)thdb->hooks[data->id - WH_MINHOOK];
+        prevHook = (HOOKDATA **)&thdb->hooks[data->id - WH_MINHOOK];
     }
     else {
         hookMutex = &systemHookMutex;
         hookMutex->enter();
-        prevHook = (HOOKDATA *)HOOK_systemHooks[data->id - WH_MINHOOK];
-    }
-    while (prevHook && prevHook != data)
-        prevHook = (HOOKDATA *)prevHook->next;
+        prevHook = (HOOKDATA **)&HOOK_systemHooks[data->id - WH_MINHOOK];
+    }
+    while (*prevHook && *prevHook != data)
+        prevHook = (HOOKDATA **)&(*prevHook)->next;
 
     if (!prevHook) {
@@ -367 +367 @@
         return FALSE;
     }
-    prevHook = (HOOKDATA *)data->next;
+    *prevHook = (HOOKDATA *)data->next;
     hookMutex->leave();