Changeset 4857 for trunk/src

Timestamp:

Dec 30, 2000, 2:28:32 PM (25 years ago)

Author:

sandervl

Message:

DeleteObject fix: check for system brushes & pens and don't delete those objects

File:

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

trunk/src/gdi32/objhandle.cpp

@@ -1 @@
-/* $Id: objhandle.cpp,v 1.9 2000-12-09 15:00:35 sandervl Exp $ */
+/* $Id: objhandle.cpp,v 1.10 2000-12-30 13:28:32 sandervl Exp $ */
 /*
  * Win32 Handle Management Code for OS/2
@@ -297 +297 @@
 }
 //******************************************************************************
+//TODO: System objects can't be deleted (TODO: any others?? (fonts?))!!!!)
 //******************************************************************************
 BOOL WIN32API DeleteObject(HANDLE hObj)
 {
+ DWORD type;
+
     dprintf(("GDI32: DeleteObject %x", hObj));
+
+    //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) {
         OSLibDeleteRegion(ObjGetHandleData(hObj, GDIOBJ_REGION));
         ObjFreeHandle(hObj);
         SetLastError(ERROR_SUCCESS);
-        return OBJ_REGION;
+        return TRUE;
     }
     DIBSection::deleteSection((DWORD)hObj);