Changeset 6012 for trunk/src

Timestamp:

Jun 14, 2001, 4:49:19 PM (24 years ago)

Author:

sandervl

Message:

temporary workaround added for opera crash

Location:

trunk/src/user32

Files:

• HOOK.CPP (modified) (4 diffs)
• win32wbase.cpp (modified) (5 diffs)
• windowmsg.cpp (modified) (3 diffs)

trunk/src/user32/HOOK.CPP

@@ -1 @@
-/* $Id: HOOK.CPP,v 1.21 2001-06-12 17:02:33 sandervl Exp $ */
+/* $Id: HOOK.CPP,v 1.22 2001-06-14 14:49:16 sandervl Exp $ */
 
 /*
@@ -99 +99 @@
 static HANDLE HOOK_threadHooks[WH_NB_HOOKS] = { 0 };
 static CRITICAL_SECTION threadCritSect = {0};
+static BOOL fInitHook = FALSE;
 
 #ifdef GLOBAL_HOOKS
 #define SYSTEMHOOK_LOCK()       systemHookMutex.enter(VMUTEX_WAIT_FOREVER, &hGlobalHookMutex);
 #define SYSTEMHOOK_UNLOCK()     systemHookMutex.leave(&hGlobalHookMutex);
+#define INIT_SYSTEMHOOK()       aldkjfslfjsdlkfj
 #else
 #define SYSTEMHOOK_LOCK()       EnterCriticalSection(&systemCritSect);
 #define SYSTEMHOOK_UNLOCK()     LeaveCriticalSection(&systemCritSect);
+#define INIT_SYSTEMHOOK()       InitializeCriticalSection(&systemCritSect);
 #endif
 
@@ -300 +303 @@
         SetLastError(ERROR_INVALID_PARAMETER);
         return 0;
+    }
+
+    if(!fInitHook) {
+        InitializeCriticalSection(&threadCritSect);
+        INIT_SYSTEMHOOK();
+        fInitHook = TRUE;
     }
 
@@ -367 +376 @@
 
     dprintf(("Removing hook %08x\n", data));
+
+    if(!fInitHook) {
+        InitializeCriticalSection(&threadCritSect);
+        INIT_SYSTEMHOOK();
+        fInitHook = TRUE;
+    }
 
     if (data->flags & HOOK_INUSE)

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.269 2001-06-14 11:30:56 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.270 2001-06-14 14:49:17 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -2994 +2994 @@
 HWND Win32BaseWindow::FindWindowById(int id)
 {
+    HWND hwnd;
+
     lock();
     for (Win32BaseWindow *child = (Win32BaseWindow *)getFirstChild(); child; child = (Win32BaseWindow *)child->getNextChild())
@@ -2999 +3001 @@
         if (child->getWindowId() == id)
         {
+            hwnd = child->getWindowHandle();
             unlock();
-            return child->getWindowHandle();
+            return hwnd;
         }
     }
@@ -3702 +3705 @@
  Win32BaseWindow *window;
 
-    lock(&critsect);
+////    lock(&critsect);
     if(HwGetWindowHandleData(hwnd, (DWORD *)&window) == TRUE) {
          if(window) {
@@ -3708 +3711 @@
              window->addRef();
          }
-         unlock(&critsect);
+////         unlock(&critsect);
          return window;
     }
-    unlock(&critsect);
+////    unlock(&critsect);
 //    dprintf2(("Win32BaseWindow::GetWindowFromHandle: not a win32 window %x", hwnd));
     return NULL;

trunk/src/user32/windowmsg.cpp

@@ -1 @@
-/* $Id: windowmsg.cpp,v 1.26 2001-06-09 14:50:26 sandervl Exp $ */
+/* $Id: windowmsg.cpp,v 1.27 2001-06-14 14:49:19 sandervl Exp $ */
 /*
  * Win32 window message APIs for OS/2
@@ -204 +204 @@
     if(!window) {
         dprintf(("PostMessageA, window %x not found", hwnd));
-        return 0;
+        return FALSE;
     }
     hwndOS2 = window->getOS2WindowHandle();
@@ -230 +230 @@
     if(!window) {
         dprintf(("PostMessageW, window %x not found", hwnd));
-        return 0;
+        return FALSE;
     }
     hwndOS2 = window->getOS2WindowHandle();