reactos/subsys/win32k/ntuser
diff -u -r1.3 -r1.3.2.1
--- cursoricon.c 18 Dec 2004 23:55:26 -0000 1.3
+++ cursoricon.c 20 Dec 2004 21:40:55 -0000 1.3.2.1
@@ -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.3.2.1 2004/12/20 21:40:55 gvg Exp $ */
#include <w32k.h>
PCURICON_OBJECT FASTCALL
@@ -419,7 +419,7 @@
{
return (HANDLE)0;
}
-
+
CurIconObject = IntCreateCurIconHandle(WinStaObject);
if(CurIconObject)
{
@@ -443,16 +443,13 @@
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