When creating black & white cursor icon, handle special case where

hbmColor is null and hbmMask specify a bitmap having twice the height and formatted so the upper half is the icon AND bitmask and the lower one is the OR bitmask.

When creating black & white cursor icon, handle special case where
93047e27 · Christian Costa · Alexandre Julliard · 8a4c4ef2 · 93047e27
Commit 93047e27 authored Nov 07, 2005 by Christian Costa Committed by Alexandre Julliard Nov 07, 2005
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 9 deletions

cursoricon.c dlls/user/cursoricon.c +9 -9

No files found.
--- a/dlls/user/cursoricon.c
+++ b/dlls/user/cursoricon.c
@@ -1807,10 +1807,10 @@ HICON WINAPI CreateIconIndirect(PICONINFO iconinfo)
    HICON16 hObj;
    int	sizeXor,sizeAnd;

-    GetObjectA( iconinfo->hbmColor, sizeof(bmpXor), &bmpXor );
+    if (iconinfo->hbmColor) GetObjectA( iconinfo->hbmColor, sizeof(bmpXor), &bmpXor );
    GetObjectA( iconinfo->hbmMask, sizeof(bmpAnd), &bmpAnd );

-    sizeXor = bmpXor.bmHeight * bmpXor.bmWidthBytes;
+    sizeXor = iconinfo->hbmColor ? (bmpXor.bmHeight * bmpXor.bmWidthBytes) : 0;
    sizeAnd = bmpAnd.bmHeight * bmpAnd.bmWidthBytes;

    hObj = GlobalAlloc16( GMEM_MOVEABLE,
@@ -1833,16 +1833,16 @@ HICON WINAPI CreateIconIndirect(PICONINFO iconinfo)
          info->ptHotSpot.y   = iconinfo->yHotspot;
        }

-        info->nWidth        = bmpXor.bmWidth;
-        info->nHeight       = bmpXor.bmHeight;
-        info->nWidthBytes   = bmpXor.bmWidthBytes;
-        info->bPlanes       = bmpXor.bmPlanes;
-        info->bBitsPerPixel = bmpXor.bmBitsPixel;
+        info->nWidth        = bmpAnd.bmWidth;
+        info->nHeight       = iconinfo->hbmColor ? bmpAnd.bmHeight : (bmpAnd.bmHeight / 2);
+        info->nWidthBytes   = bmpAnd.bmWidthBytes;
+        info->bPlanes       = bmpAnd.bmPlanes;
+        info->bBitsPerPixel = bmpAnd.bmBitsPixel;

        /* Transfer the bitmap bits to the CURSORICONINFO structure */

-        GetBitmapBits( iconinfo->hbmMask ,sizeAnd,(char*)(info + 1) );
-        GetBitmapBits( iconinfo->hbmColor,sizeXor,(char*)(info + 1) +sizeAnd);
+        GetBitmapBits( iconinfo->hbmMask, sizeAnd, (char*)(info + 1) );
+        if (iconinfo->hbmColor) GetBitmapBits( iconinfo->hbmColor, sizeXor, (char*)(info + 1) + sizeAnd );
        GlobalUnlock16( hObj );
    }
    return HICON_32(hObj);