- Change DPRINT1 to DPRINT in NtUserCreateDesktop.

- Make the pattern brush bitmap objects global to prevent ownership problems.

svn path=/trunk/; revision=11935
This commit is contained in:
Filip Navara
2004-12-05 00:20:41 +00:00
parent 70a0c8d832
commit 326cdb4ba6
2 changed files with 7 additions and 3 deletions
+2 -2
View File
@@ -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,
+5 -1
View File
@@ -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;
}