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

Timestamp:

Nov 21, 2000, 12:36:09 PM (25 years ago)

Author:

sandervl

Message:

Updates for TEB changes

File:

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

trunk/src/user32/HOOK.CPP

@@ -1 @@
-/* $Id: HOOK.CPP,v 1.15 2000-10-05 13:47:06 sandervl Exp $ */
+/* $Id: HOOK.CPP,v 1.16 2000-11-21 11:36:07 sandervl Exp $ */
 
 /*
@@ -240 +240 @@
   MESSAGEQUEUE *queue;
   HANDLE hook = 0;
-  THDB *thdb;
-
-    thdb = GetTHDBFromThreadId(threadId);
-    if(thdb) {
-        hook = thdb->hooks[id - WH_MINHOOK];
+  TEB *teb;
+
+    teb = GetTEBFromThreadId(threadId);
+    if(teb) {
+        hook = teb->o.odin.hooks[id - WH_MINHOOK];
     }
     if (!hook) hook = HOOK_systemHooks[id - WH_MINHOOK];
@@ -261 +261 @@
 {
   HOOKDATA *data;
-  THDB     *thdb;
+  TEB      *teb;
 
     if ((id < WH_MINHOOK) || (id > WH_MAXHOOK) || !proc )
@@ -301 +301 @@
     if(dwThreadId)
     {
-        thdb = GetTHDBFromThreadId(dwThreadId);
-        if(!thdb) {
+        teb = GetTEBFromThreadId(dwThreadId);
+        if(!teb) {
                 dprintf(("HOOK_SetHook: can't find thread database for thread %x", dwThreadId));
                 return 0;
         }
         threadHookMutex.enter();
-        data->next = thdb->hooks[id - WH_MINHOOK];
-        thdb->hooks[id - WH_MINHOOK] = (DWORD)data;
+        data->next = teb->o.odin.hooks[id - WH_MINHOOK];
+        teb->o.odin.hooks[id - WH_MINHOOK] = (DWORD)data;
         threadHookMutex.leave();
     }
@@ -331 +331 @@
 {
   HOOKDATA **prevHook;
-  THDB     *thdb;
+  TEB       *teb;
 
     dprintf(("Removing hook %08x\n", data));
@@ -351 +351 @@
     if (data->ownerThread)
     {
-        thdb = GetTHDBFromThreadId(data->ownerThread);
-        if(!thdb) {
+        teb = GetTEBFromThreadId(data->ownerThread);
+        if(!teb) {
                 dprintf(("HOOK_RemoveHook: can't find thread database for thread %x", data->ownerThread));
                 return FALSE;
         }
         threadHookMutex.enter();
-        prevHook = (HOOKDATA **)&thdb->hooks[data->id - WH_MINHOOK];
+        prevHook = (HOOKDATA **)&teb->o.odin.hooks[data->id - WH_MINHOOK];
     }
     else {