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

Timestamp:

Jan 2, 2001, 7:14:59 PM (25 years ago)

Author:

sandervl

Message:

more logging, rewrote window handle management, don't export odin external functions by name

File:

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

trunk/src/user32/win32wndhandle.cpp

@@ -1 @@
-/* $Id: win32wndhandle.cpp,v 1.7 2000-03-23 19:24:26 sandervl Exp $ */
+/* $Id: win32wndhandle.cpp,v 1.8 2001-01-02 18:14:59 sandervl Exp $ */
 /*
  * Win32 Handle Management Code for OS/2
@@ -34 +34 @@
 ULONG  WindowHandleTable[MAX_WINDOW_HANDLES] = {0};
 VMutex tableMutex(VMUTEX_SHARED, &hGlobalTableMutex);
-ULONG  lowestFreeIndex = 0;
+ULONG  lastIndex = 0;
 #pragma data_seg()
 
@@ -42 +42 @@
 {
   tableMutex.enter(VMUTEX_WAIT_FOREVER, &hGlobalTableMutex);
-  if(lowestFreeIndex == -1) {
+
+  //find next free handle
+  if(lastIndex >= MAX_WINDOW_HANDLES-1) {
+        lastIndex = 0;
+  }
+  for(int i=lastIndex;i<MAX_WINDOW_HANDLES;i++) {
+        if(WindowHandleTable[i] == 0) {
+                lastIndex = i;
+                break;
+        }
+  }
+  if(i == MAX_WINDOW_HANDLES) {
         //oops, out of handles
-        dprintf(("USER32: HwAllocateWindowHandle OUT OF WINDOW HANDLES!!"));
         tableMutex.leave(&hGlobalTableMutex);
+        dprintf(("ERROR: USER32: HwAllocateWindowHandle OUT OF WINDOW HANDLES!!"));
         DebugInt3();
         return FALSE;
   }
-  *hwnd           = lowestFreeIndex;
-  *hwnd          |= WNDHANDLE_MAGIC_HIGHWORD;
-  WindowHandleTable[lowestFreeIndex] = dwUserData;
+  *hwnd  = lastIndex;
+  *hwnd |= WNDHANDLE_MAGIC_HIGHWORD;
+  WindowHandleTable[lastIndex] = dwUserData;
 
-  lowestFreeIndex = -1;
-
-  //find next free handle
-  for(int i=0;i<MAX_WINDOW_HANDLES;i++) {
-        if(WindowHandleTable[i] == 0) {
-                lowestFreeIndex = i;
-                break;
-        }
-  }
   tableMutex.leave(&hGlobalTableMutex);
   return TRUE;
@@ -73 +75 @@
         tableMutex.enter(VMUTEX_WAIT_FOREVER, &hGlobalTableMutex);
         WindowHandleTable[hwnd] = 0;
-        if(lowestFreeIndex == -1 || hwnd < lowestFreeIndex) 
-                lowestFreeIndex = hwnd;
-
         tableMutex.leave(&hGlobalTableMutex);
   }