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

Timestamp:

Jul 22, 2002, 1:06:44 PM (23 years ago)

Author:

sandervl

Message:

Check delete flag in DeleteObject. WGSS doesn't do it for us.

File:

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

trunk/src/gdi32/objhandle.cpp

@@ -1 @@
-/* $Id: objhandle.cpp,v 1.24 2002-07-15 14:32:46 sandervl Exp $ */
+/* $Id: objhandle.cpp,v 1.25 2002-07-22 11:06:44 sandervl Exp $ */
 /*
  * Win32 Handle Management Code for OS/2
@@ -481 +481 @@
 BOOL WIN32API DeleteObject(HANDLE hObj)
 {
-    DWORD objtype;
+    DWORD objtype, objflags;
 
     dprintf(("GDI32: DeleteObject %x", hObj));
-
+    objflags = ObjQueryHandleFlags(hObj);
+    if(objflags == HANDLE_INVALID_DATA) {
+        dprintf(("!ERROR!: Invalid handle!!"));
+        return FALSE;
+    }
+    if(objflags & OBJHANDLE_FLAG_NODELETE) {
+        dprintf(("!WARNING!: Can't delete system object"));
+        return TRUE;
+    }   
     STATS_DeleteObject(hObj, objtype);