Changeset 9251 for trunk/src/gdi32/objhandle.cpp

Timestamp:

Sep 16, 2002, 3:58:25 PM (23 years ago)

Author:

sandervl

Message:

Statistics fixes & print leaked gdi handles when unloaded; don't recycle gdi handles too soon

File:

• trunk/src/gdi32/objhandle.cpp (modified) (6 diffs)

trunk/src/gdi32/objhandle.cpp

@@ -1 @@
-/* $Id: objhandle.cpp,v 1.27 2002-08-13 14:45:37 sandervl Exp $ */
+/* $Id: objhandle.cpp,v 1.28 2002-09-16 13:58:25 sandervl Exp $ */
 /*
  * Win32 Handle Management Code for OS/2
@@ -52 +52 @@
 BOOL WIN32API ObjAllocateHandle(HANDLE *hObject, DWORD dwUserData, DWORD dwType)
 {
+    DWORD oldlowestidx;
+
     objTableMutex.enter();
     if(objHandleTable == NULL) {
@@ -79 +81 @@
     objHandleTable[lowestFreeIndex].dwGDI32Data = 0;
     objHandleTable[lowestFreeIndex].dwFlags     = 0;
+
+    oldlowestidx = lowestFreeIndex+1;
+
     lowestFreeIndex = -1;
 
     //find next free handle
-    for(int i=0;i<MAX_OBJECT_HANDLES;i++) {
+findhandle:
+    for(int i=oldlowestidx;i<MAX_OBJECT_HANDLES;i++) {
         if(objHandleTable[i].dwUserData == 0) {
             lowestFreeIndex = i;
@@ -88 +94 @@
         }
     }
+    if(lowestFreeIndex == -1) {
+        oldlowestidx = 0; //search from the start
+        goto findhandle;
+    }
     objTableMutex.leave();
     return TRUE;
@@ -102 +112 @@
             objHandleTable[hObject].dwUserData = 0;
             objHandleTable[hObject].dwType     = HNDL_NONE;
-            if(lowestFreeIndex == -1 || hObject < lowestFreeIndex)
+////            if(lowestFreeIndex == -1 || hObject < lowestFreeIndex)
+            if(lowestFreeIndex == -1)
                 lowestFreeIndex = hObject;
         }
@@ -489 +500 @@
         return TRUE;
     }   
-    STATS_DeleteObject(hObj, objtype);
+    STATS_DeleteObject(hObj, GetObjectType(hObj));
 
     if(ObjQueryHandleType(hObj) == HNDL_REGION)