From: Kamil Hornicek <kamil.hornicek@reactos.org>
Date: Fri, 17 Feb 2017 13:13:36 +0000 (+0000)
Subject: [WIN32K]
X-Git-Tag: ReactOS-0.4.4-CLT2017~278
X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=7db2f3af0f8e6023f96b1e0121cc95c12b1db525;ds=sidebyside

[WIN32K]
- The pattern bitmap can get deleted during the GDI cleanup for process before the brush itself.
- Gets rid of some of those pesky "GreDeleteObject: Trying to delete invalid object" debug prints.

svn path=/trunk/; revision=73812
---

diff --git a/reactos/win32ss/gdi/ntgdi/brush.cpp b/reactos/win32ss/gdi/ntgdi/brush.cpp
index 210297693c0..5671324bbe5 100644
--- a/reactos/win32ss/gdi/ntgdi/brush.cpp
+++ b/reactos/win32ss/gdi/ntgdi/brush.cpp
@@ -62,8 +62,8 @@ BRUSH::~BRUSH(
         GdiPoolFree(GetBrushAttrPool(), this->pBrushAttr);
     }
 
-    /* Delete the pattern bitmap */
-    if (this->hbmPattern != NULL)
+    /* Delete the pattern bitmap (may have already been deleted during gdi cleanup) */
+    if (this->hbmPattern != NULL && GreIsHandleValid(this->hbmPattern))
     {
         GreSetBitmapOwner(this->hbmPattern, BASEOBJECT::OWNER::POWNED);
         GreDeleteObject(this->hbmPattern);