From b41e30eb6d3c865b23d04820983dcedb2dc9188b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A9=20van=20Geldorp?= Date: Mon, 20 Dec 2004 21:34:23 +0000 Subject: [PATCH] Set ownership to NULL for both cursor and mask bitmaps svn path=/trunk/; revision=12258 --- reactos/subsys/win32k/ntuser/cursoricon.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/reactos/subsys/win32k/ntuser/cursoricon.c b/reactos/subsys/win32k/ntuser/cursoricon.c index 00d01857967..2d3131c23cc 100644 --- a/reactos/subsys/win32k/ntuser/cursoricon.c +++ b/reactos/subsys/win32k/ntuser/cursoricon.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: cursoricon.c,v 1.3 2004/12/18 23:55:26 royce Exp $ */ +/* $Id: cursoricon.c,v 1.4 2004/12/20 21:34:23 gvg Exp $ */ #include PCURICON_OBJECT FASTCALL @@ -419,7 +419,7 @@ NtUserCreateCursorIconHandle(PICONINFO IconInfo, BOOL Indirect) { return (HANDLE)0; } - + CurIconObject = IntCreateCurIconHandle(WinStaObject); if(CurIconObject) { @@ -443,16 +443,13 @@ NtUserCreateCursorIconHandle(PICONINFO IconInfo, BOOL Indirect) BITMAPOBJ_UnlockBitmap(CurIconObject->IconInfo.hbmColor); GDIOBJ_SetOwnership(CurIconObject->IconInfo.hbmColor, NULL); } - else + if(CurIconObject->IconInfo.hbmMask && + (bmp = BITMAPOBJ_LockBitmap(CurIconObject->IconInfo.hbmMask))) { - if(CurIconObject->IconInfo.hbmMask && - (bmp = BITMAPOBJ_LockBitmap(CurIconObject->IconInfo.hbmMask))) - { - CurIconObject->Size.cx = bmp->SurfObj.sizlBitmap.cx; - CurIconObject->Size.cy = bmp->SurfObj.sizlBitmap.cy / 2; - BITMAPOBJ_UnlockBitmap(CurIconObject->IconInfo.hbmMask); - GDIOBJ_SetOwnership(CurIconObject->IconInfo.hbmMask, NULL); - } + CurIconObject->Size.cx = bmp->SurfObj.sizlBitmap.cx; + CurIconObject->Size.cy = bmp->SurfObj.sizlBitmap.cy / 2; + BITMAPOBJ_UnlockBitmap(CurIconObject->IconInfo.hbmMask); + GDIOBJ_SetOwnership(CurIconObject->IconInfo.hbmMask, NULL); } } else