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

Timestamp:

Jun 12, 2001, 7:02:42 PM (24 years ago)

Author:

sandervl

Message:

FillRect & CS_CLASSDC fixes; use critical secions for hooks

File:

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

trunk/src/user32/HOOK.CPP

@@ -1 @@
-/* $Id: HOOK.CPP,v 1.20 2001-06-09 14:50:15 sandervl Exp $ */
+/* $Id: HOOK.CPP,v 1.21 2001-06-12 17:02:33 sandervl Exp $ */
 
 /*
@@ -86 +86 @@
 //Global DLL Data
 //SvL: Disabled global system hooks for now
-////#pragma data_seg(_GLOBALDATA)
+//#define GLOBAL_HOOKS
+#ifdef GLOBAL_HOOKS
+#pragma data_seg(_GLOBALDATA)
+#endif
 static HANDLE HOOK_systemHooks[WH_NB_HOOKS] = { 0 };
+#ifdef GLOBAL_HOOKS
 static VMutex systemHookMutex(VMUTEX_SHARED, &hGlobalHookMutex);
-////#pragma data_seg()
+#pragma data_seg()
+#else
+static CRITICAL_SECTION systemCritSect = {0};
+#endif
 static HANDLE HOOK_threadHooks[WH_NB_HOOKS] = { 0 };
-static VMutex threadHookMutex;
+static CRITICAL_SECTION threadCritSect = {0};
+
+#ifdef GLOBAL_HOOKS
+#define SYSTEMHOOK_LOCK()       systemHookMutex.enter(VMUTEX_WAIT_FOREVER, &hGlobalHookMutex);
+#define SYSTEMHOOK_UNLOCK()     systemHookMutex.leave(&hGlobalHookMutex);
+#else
+#define SYSTEMHOOK_LOCK()       EnterCriticalSection(&systemCritSect);
+#define SYSTEMHOOK_UNLOCK()     LeaveCriticalSection(&systemCritSect);
+#endif
 
 typedef VOID (*HOOK_MapFunc)(INT, INT, WPARAM *, LPARAM *);
@@ -324 +339 @@
                 return 0;
         }
-        threadHookMutex.enter();
+        EnterCriticalSection(&threadCritSect);
         data->next = teb->o.odin.hooks[id - WH_MINHOOK];
         teb->o.odin.hooks[id - WH_MINHOOK] = (DWORD)data;
-        threadHookMutex.leave();
+        LeaveCriticalSection(&threadCritSect);
     }
     else
     {
-        systemHookMutex.enter(VMUTEX_WAIT_FOREVER, &hGlobalHookMutex);
+        SYSTEMHOOK_LOCK();
         data->next = HOOK_systemHooks[id - WH_MINHOOK];
         HOOK_systemHooks[id - WH_MINHOOK] = (HANDLE)data;
-        systemHookMutex.leave(&hGlobalHookMutex);
+        SYSTEMHOOK_UNLOCK();
     }
 
@@ -374 +389 @@
                 return FALSE;
         }
-        threadHookMutex.enter();
+        EnterCriticalSection(&threadCritSect);
         prevHook = (HOOKDATA **)&teb->o.odin.hooks[data->id - WH_MINHOOK];
     }
     else {
-        systemHookMutex.enter(VMUTEX_WAIT_FOREVER, &hGlobalHookMutex);
+        SYSTEMHOOK_LOCK();
         prevHook = (HOOKDATA **)&HOOK_systemHooks[data->id - WH_MINHOOK];
     }
@@ -386 +401 @@
     if (!prevHook) {
         if (data->ownerThread) {
-                threadHookMutex.leave();
+                LeaveCriticalSection(&threadCritSect);
         }
-        else    systemHookMutex.leave(&hGlobalHookMutex);
+        else    SYSTEMHOOK_UNLOCK();
 
         return FALSE;
@@ -395 +410 @@
 
     if (data->ownerThread) {
-         threadHookMutex.leave();
-    }
-    else systemHookMutex.leave(&hGlobalHookMutex);
+         LeaveCriticalSection(&threadCritSect);
+    }
+    else SYSTEMHOOK_UNLOCK();
 
     HeapFree(GetProcessHeap(), 0, (LPVOID)data );