Author: khornicek
Date: Mon Feb 20 10:10:37 2017
New Revision: 73855
URL:
http://svn.reactos.org/svn/reactos?rev=73855&view=rev
Log:
[WIN32K]
- Don't try to delete the pattern bitmap in UserInitialize.
- Set the correct owner before deleting the update region in co_UserFreeWindow.
- Fixes some "Trying to delete global object" debug prints.
Modified:
trunk/reactos/win32ss/user/ntuser/ntuser.c
trunk/reactos/win32ss/user/ntuser/window.c
Modified: trunk/reactos/win32ss/user/ntuser/ntuser.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/ntuser…
==============================================================================
--- trunk/reactos/win32ss/user/ntuser/ntuser.c [iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/ntuser/ntuser.c [iso-8859-1] Mon Feb 20 10:10:37 2017
@@ -154,9 +154,8 @@
if (hPattern55AABitmap == NULL)
return STATUS_INSUFFICIENT_RESOURCES;
- //NT_VERIFY(GreSetBitmapOwner(hPattern55AABitmap, GDI_OBJ_HMGR_PUBLIC));
gpsi->hbrGray = IntGdiCreatePatternBrush(hPattern55AABitmap);
- GreDeleteObject(hPattern55AABitmap);
+
if (gpsi->hbrGray == NULL)
return STATUS_INSUFFICIENT_RESOURCES;
}
Modified: trunk/reactos/win32ss/user/ntuser/window.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/window…
==============================================================================
--- trunk/reactos/win32ss/user/ntuser/window.c [iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/ntuser/window.c [iso-8859-1] Mon Feb 20 10:10:37 2017
@@ -602,6 +602,7 @@
MsqDecPaintCountQueue(Window->head.pti);
if (Window->hrgnUpdate > HRGN_WINDOW &&
GreIsHandleValid(Window->hrgnUpdate))
{
+ IntGdiSetRegionOwner(Window->hrgnUpdate, GDI_OBJ_HMGR_POWNED);
GreDeleteObject(Window->hrgnUpdate);
}
Window->hrgnUpdate = NULL;