[gschneider] 40530: More monochrome icon handling fixes in CreateIcon and CreateCursorIconHandle, fixes two cursoricon winetests

Author: gschneider
Date: Wed Apr 15 20:00:22 2009
New Revision: 40530

URL: http://svn.reactos.org/svn/reactos?rev=40530&view=rev
Log:
More monochrome icon handling fixes in CreateIcon and CreateCursorIconHandle, fixes two cursoricon winetests

Modified:
    trunk/reactos/dll/win32/user32/windows/icon.c
    trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c

Modified: trunk/reactos/dll/win32/user32/windows/icon.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/ic...
==============================================================================
--- trunk/reactos/dll/win32/user32/windows/icon.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/user32/windows/icon.c [iso-8859-1] Wed Apr 15 20:00:22 2009
@@ -197,6 +197,11 @@
   IconInfo.fIcon = TRUE;
   IconInfo.xHotspot = nWidth / 2;
   IconInfo.yHotspot = nHeight / 2;
+  
+  if (cBitsPixel == 1)
+  {
+    nHeight <<= 1;
+  }
   IconInfo.hbmMask = CreateBitmap(nWidth, nHeight, 1, 1, ANDbits);
   if(!IconInfo.hbmMask)
   {

Modified: trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ntu...
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c [iso-8859-1] Wed Apr 15 20:00:22 2009
@@ -561,7 +561,7 @@
             if (CurIcon->IconInfo.hbmColor == NULL)
             {
                CurIcon->Size.cx = psurfBmp->SurfObj.sizlBitmap.cx;
-               CurIcon->Size.cy = psurfBmp->SurfObj.sizlBitmap.cy;
+               CurIcon->Size.cy = psurfBmp->SurfObj.sizlBitmap.cy >> 1;
             }
             SURFACE_UnlockSurface(psurfBmp);
             GDIOBJ_SetOwnership(CurIcon->IconInfo.hbmMask, NULL);