diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c
index 768911a5a47..c16793d82b9 100644
--- a/dlls/gdi32/bitmap.c
+++ b/dlls/gdi32/bitmap.c
@@ -489,7 +489,8 @@ static BOOL BITMAP_DeleteObject( HGDIOBJ handle )
 
     if (!bmp) return FALSE;
     HeapFree( GetProcessHeap(), 0, bmp->dib.dsBm.bmBits );
-    return HeapFree( GetProcessHeap(), 0, bmp );
+    HeapFree( GetProcessHeap(), 0, bmp );
+    return TRUE;
 }
 
 
diff --git a/dlls/gdi32/brush.c b/dlls/gdi32/brush.c
index 3c112439fe7..7d13649305d 100644
--- a/dlls/gdi32/brush.c
+++ b/dlls/gdi32/brush.c
@@ -467,7 +467,8 @@ static BOOL BRUSH_DeleteObject( HGDIOBJ handle )
 
     if (!brush) return FALSE;
     free_brush_pattern( &brush->pattern );
-    return HeapFree( GetProcessHeap(), 0, brush );
+    HeapFree( GetProcessHeap(), 0, brush );
+    return TRUE;
 }
 
 
diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c
index 2eb0e91aa37..c7dcdb122c2 100644
--- a/dlls/gdi32/dib.c
+++ b/dlls/gdi32/dib.c
@@ -1831,5 +1831,6 @@ static BOOL DIB_DeleteObject( HGDIOBJ handle )
     else VirtualFree( bmp->dib.dsBm.bmBits, 0, MEM_RELEASE );
 
     HeapFree(GetProcessHeap(), 0, bmp->color_table);
-    return HeapFree( GetProcessHeap(), 0, bmp );
+    HeapFree( GetProcessHeap(), 0, bmp );
+    return TRUE;
 }
diff --git a/dlls/gdi32/dibdrv/opengl.c b/dlls/gdi32/dibdrv/opengl.c
index 20cfc023980..dba5db03565 100644
--- a/dlls/gdi32/dibdrv/opengl.c
+++ b/dlls/gdi32/dibdrv/opengl.c
@@ -217,7 +217,8 @@ static struct wgl_context *dibdrv_wglCreateContext( HDC hdc )
 static BOOL dibdrv_wglDeleteContext( struct wgl_context *context )
 {
     pOSMesaDestroyContext( context->context );
-    return HeapFree( GetProcessHeap(), 0, context );
+    HeapFree( GetProcessHeap(), 0, context );
+    return TRUE;
 }
 
 /***********************************************************************
diff --git a/dlls/gdi32/enhmetafile.c b/dlls/gdi32/enhmetafile.c
index 111fa436bdd..37edc231a37 100644
--- a/dlls/gdi32/enhmetafile.c
+++ b/dlls/gdi32/enhmetafile.c
@@ -287,7 +287,8 @@ static BOOL EMF_Delete_HENHMETAFILE( HENHMETAFILE hmf )
         UnmapViewOfFile( metaObj->emh );
     else
         HeapFree( GetProcessHeap(), 0, metaObj->emh );
-    return HeapFree( GetProcessHeap(), 0, metaObj );
+    HeapFree( GetProcessHeap(), 0, metaObj );
+    return TRUE;
 }
 
 /******************************************************************
diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c
index d059f97c241..17b160d2dc3 100644
--- a/dlls/gdi32/font.c
+++ b/dlls/gdi32/font.c
@@ -811,7 +811,8 @@ static BOOL FONT_DeleteObject( HGDIOBJ handle )
     FONTOBJ *obj;
 
     if (!(obj = free_gdi_handle( handle ))) return FALSE;
-    return HeapFree( GetProcessHeap(), 0, obj );
+    HeapFree( GetProcessHeap(), 0, obj );
+    return TRUE;
 }
 
 
diff --git a/dlls/gdi32/metafile.c b/dlls/gdi32/metafile.c
index c7e25a7fa8e..28ad53cf57b 100644
--- a/dlls/gdi32/metafile.c
+++ b/dlls/gdi32/metafile.c
@@ -135,8 +135,10 @@ static POINT *convert_points( UINT count, const POINTS *pts )
 BOOL WINAPI DeleteMetaFile( HMETAFILE hmf )
 {
     METAHEADER *mh = free_gdi_handle( hmf );
+
     if (!mh) return FALSE;
-    return HeapFree( GetProcessHeap(), 0, mh );
+    HeapFree( GetProcessHeap(), 0, mh );
+    return TRUE;
 }
 
 /******************************************************************
diff --git a/dlls/gdi32/palette.c b/dlls/gdi32/palette.c
index a8135d5a376..52bd0d30bb9 100644
--- a/dlls/gdi32/palette.c
+++ b/dlls/gdi32/palette.c
@@ -610,7 +610,8 @@ static BOOL PALETTE_DeleteObject( HGDIOBJ handle )
     PALETTE_UnrealizeObject( handle );
     if (!(obj = free_gdi_handle( handle ))) return FALSE;
     HeapFree( GetProcessHeap(), 0, obj->entries );
-    return HeapFree( GetProcessHeap(), 0, obj );
+    HeapFree( GetProcessHeap(), 0, obj );
+    return TRUE;
 }
 
 
diff --git a/dlls/gdi32/pen.c b/dlls/gdi32/pen.c
index d6c1dc45762..fa789e4cf91 100644
--- a/dlls/gdi32/pen.c
+++ b/dlls/gdi32/pen.c
@@ -279,7 +279,8 @@ static BOOL PEN_DeleteObject( HGDIOBJ handle )
 
     if (!pen) return FALSE;
     free_brush_pattern( &pen->pattern );
-    return HeapFree( GetProcessHeap(), 0, pen );
+    HeapFree( GetProcessHeap(), 0, pen );
+    return TRUE;
 }