From 326cdb4ba6e1acc16dfd19c9bbec53cc8c14f8c0 Mon Sep 17 00:00:00 2001
From: Filip Navara <filip.navara@gmail.com>
Date: Sun, 5 Dec 2004 00:20:41 +0000
Subject: [PATCH] - Change DPRINT1 to DPRINT in NtUserCreateDesktop. - Make the
 pattern brush bitmap objects global to prevent ownership problems.

svn path=/trunk/; revision=11935
---
 reactos/subsys/win32k/ntuser/desktop.c | 4 ++--
 reactos/subsys/win32k/objects/brush.c  | 6 +++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/reactos/subsys/win32k/ntuser/desktop.c b/reactos/subsys/win32k/ntuser/desktop.c
index fb849980764..5d5f294382e 100644
--- a/reactos/subsys/win32k/ntuser/desktop.c
+++ b/reactos/subsys/win32k/ntuser/desktop.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- *  $Id: desktop.c,v 1.24 2004/11/20 16:46:06 weiden Exp $
+ *  $Id: desktop.c,v 1.25 2004/12/05 00:20:41 navaraf Exp $
  *
  *  COPYRIGHT:        See COPYING in the top level directory
  *  PROJECT:          ReactOS kernel
@@ -496,7 +496,7 @@ NtUserCreateDesktop(
   CSRSS_API_REQUEST Request;
   CSRSS_API_REPLY Reply;
   
-  DPRINT1("CreateDesktop: %wZ\n", lpszDesktopName);
+  DPRINT("CreateDesktop: %wZ\n", lpszDesktopName);
 
   Status = IntValidateWindowStationHandle(
     hWindowStation,
diff --git a/reactos/subsys/win32k/objects/brush.c b/reactos/subsys/win32k/objects/brush.c
index 77ee6f142c8..29671b98cd7 100644
--- a/reactos/subsys/win32k/objects/brush.c
+++ b/reactos/subsys/win32k/objects/brush.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id: brush.c,v 1.40 2004/07/14 20:48:57 navaraf Exp $
+ * $Id: brush.c,v 1.41 2004/12/05 00:20:41 navaraf Exp $
  */
 #include <w32k.h>
 
@@ -39,6 +39,7 @@ Brush_InternalDelete( PGDIBRUSHOBJ pBrush )
   if(pBrush->flAttrs & (GDIBRUSH_IS_HATCH | GDIBRUSH_IS_BITMAP))
   {
     ASSERT(pBrush->hbmPattern);
+    GDIOBJ_SetOwnership(pBrush->hbmPattern, PsGetCurrentProcess());
     NtGdiDeleteObject(pBrush->hbmPattern);
   }
   
@@ -161,6 +162,9 @@ IntGdiCreateBrushIndirect(PLOGBRUSH LogBrush)
          UNIMPLEMENTED;
    }
 
+   if (hPattern != 0)
+      GDIOBJ_SetOwnership(hPattern, NULL);
+   
    BRUSHOBJ_UnlockBrush(hBrush);
    return hBrush;
 }