Changeset 3207 for trunk/src/user32/win32wndhandle.cpp

Timestamp:

Mar 23, 2000, 8:24:26 PM (25 years ago)

Author:

sandervl

Message:

shared mutex fixes

File:

• trunk/src/user32/win32wndhandle.cpp (modified) (5 diffs)

trunk/src/user32/win32wndhandle.cpp

@@ -1 @@
-/* $Id: win32wndhandle.cpp,v 1.6 2000-03-16 19:19:11 sandervl Exp $ */
+/* $Id: win32wndhandle.cpp,v 1.7 2000-03-23 19:24:26 sandervl Exp $ */
 /*
  * Win32 Handle Management Code for OS/2
@@ -25 +25 @@
 //******************************************************************************
 
+//NOTE: This must be in the local data segment -> if a shared semaphore was
+//      created by a different process, the handle returned by DosOpenMutexSem
+//      will be returned in hGlobalTableMutex
+HMTX hGlobalTableMutex = 0;
+
 //Global DLL Data
 #pragma data_seg(_GLOBALDATA)
 ULONG  WindowHandleTable[MAX_WINDOW_HANDLES] = {0};
-VMutex tableMutex(TRUE);
+VMutex tableMutex(VMUTEX_SHARED, &hGlobalTableMutex);
 ULONG  lowestFreeIndex = 0;
 #pragma data_seg()
@@ -36 +41 @@
 BOOL HwAllocateWindowHandle(HWND *hwnd, DWORD dwUserData)
 {
-  tableMutex.enter();
+  tableMutex.enter(VMUTEX_WAIT_FOREVER, &hGlobalTableMutex);
   if(lowestFreeIndex == -1) {
         //oops, out of handles
         dprintf(("USER32: HwAllocateWindowHandle OUT OF WINDOW HANDLES!!"));
-        tableMutex.leave();
+        tableMutex.leave(&hGlobalTableMutex);
         DebugInt3();
         return FALSE;
@@ -57 +62 @@
         }
   }
-  tableMutex.leave();
+  tableMutex.leave(&hGlobalTableMutex);
   return TRUE;
 }
@@ -66 +71 @@
   hwnd &= WNDHANDLE_MAGIC_MASK;
   if(hwnd < MAX_WINDOW_HANDLES) {
-        tableMutex.enter();
+        tableMutex.enter(VMUTEX_WAIT_FOREVER, &hGlobalTableMutex);
         WindowHandleTable[hwnd] = 0;
         if(lowestFreeIndex == -1 || hwnd < lowestFreeIndex) 
                 lowestFreeIndex = hwnd;
 
-        tableMutex.leave();
+        tableMutex.leave(&hGlobalTableMutex);
   }
 }