DeleteObject() can fail if the object is a DC, however we've already

called GDI_ReleaseObj() so don't call it again.

DeleteObject() can fail if the object is a DC, however we've already
6b5aaa11 · Huw D M Davies · Alexandre Julliard · 66e31830 · 6b5aaa11
Commit 6b5aaa11 authored Aug 15, 2002 by Huw D M Davies Committed by Alexandre Julliard Aug 15, 2002
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 4 deletions

gdiobj.c objects/gdiobj.c +2 -4

No files found.
--- a/objects/gdiobj.c
+++ b/objects/gdiobj.c
@@ -877,10 +877,8 @@ BOOL WINAPI DeleteObject( HGDIOBJ obj )
      /* Delete object */
-    if (header->funcs &&
+    if (header->funcs && header->funcs->pDeleteObject)
-        header->funcs->pDeleteObject &&
+        return header->funcs->pDeleteObject( obj, header );
-        header->funcs->pDeleteObject( obj, header ))
-        return TRUE;
    GDI_ReleaseObj( obj );
    return FALSE;