Changeset 6558 for trunk/src

Timestamp:

Aug 18, 2001, 5:50:32 AM (24 years ago)

Author:

phaller

Message:

Restructured DeleteObject (looking for crash in WinImage

File:

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

trunk/src/gdi32/objhandle.cpp

@@ -1 @@
-/* $Id: objhandle.cpp,v 1.16 2001-07-09 07:57:38 sandervl Exp $ */
+/* $Id: objhandle.cpp,v 1.17 2001-08-18 03:50:32 phaller Exp $ */
 /*
  * Win32 Handle Management Code for OS/2
@@ -343 +343 @@
 BOOL WIN32API DeleteObject(HANDLE hObj)
 {
- DWORD type;
-
     dprintf(("GDI32: DeleteObject %x", hObj));
 
     //TODO: must use 16 bits gdi object handles
-    if(HIWORD(hObj) == 0) {
+    if(HIWORD(hObj) == 0)
+    {
         hObj |= GDIOBJ_PREFIX;
     }
+
     //System objects can't be deleted (TODO: any others?? (fonts?))!!!!)
-    type = GetObjectType(hObj);
-    if(type == OBJ_PEN && IsSystemPen(hObj)) {
-        SetLastError(ERROR_SUCCESS);
-        return TRUE;
-    }
-    if(type == OBJ_BRUSH && IsSystemBrush(hObj)) {
-        SetLastError(ERROR_SUCCESS);
-        return TRUE;
-    }
-
-    if(ObjGetHandleType(hObj) == GDIOBJ_REGION) {
+    switch (GetObjectType(hObj))
+    {
+        case OBJ_PEN:
+            if(IsSystemPen(hObj))
+            {
+                SetLastError(ERROR_SUCCESS);
+                return TRUE;
+            }
+            else
+                break;
+
+        case OBJ_BRUSH:
+            if(IsSystemBrush(hObj))
+            {
+                SetLastError(ERROR_SUCCESS);
+                return TRUE;
+            }
+            else
+                break;
+
+        // add more system-type objects as required ...
+    }
+
+    if(ObjGetHandleType(hObj) == GDIOBJ_REGION)
+    {
         OSLibDeleteRegion(ObjGetHandleData(hObj, GDIOBJ_REGION));
         ObjFreeHandle(hObj);
@@ -368 +382 @@
         return TRUE;
     }
+
     DIBSection::deleteSection((DWORD)hObj);
     return O32_DeleteObject(hObj);