Skip to content

W
wine-winehq
Commit 24a3ae06 authored by Christian Costa's avatar Christian Costa Committed by Alexandre Julliard
Browse files
Options

If a color bitmap is provided, store bitmap information from it

instead of the mask bitmap one.
parent 68b8a4ab
Hide whitespace changes
Inline Side-by-side
Showing with 20 additions and 9 deletions
dlls/user/cursoricon.c
View file @ 24a3ae06
......@@ -1831,20 +1831,31 @@ HICON WINAPI CreateIconIndirect(PICONINFO iconinfo)
/* If we are creating an icon, the hotspot is unused */
if (iconinfo->fIcon)
{
info->ptHotSpot.x = ICON_HOTSPOT;
info->ptHotSpot.y = ICON_HOTSPOT;
info->ptHotSpot.x = ICON_HOTSPOT;
info->ptHotSpot.y = ICON_HOTSPOT;
}
else
{
info->ptHotSpot.x = iconinfo->xHotspot;
info->ptHotSpot.y = iconinfo->yHotspot;
info->ptHotSpot.x = iconinfo->xHotspot;
info->ptHotSpot.y = iconinfo->yHotspot;
}
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;
if (iconinfo->hbmColor)
{
info->nWidth = bmpXor.bmWidth;
info->nHeight = bmpXor.bmHeight;
info->nWidthBytes = bmpXor.bmWidthBytes;
info->bPlanes = bmpXor.bmPlanes;
info->bBitsPerPixel = bmpXor.bmBitsPixel;
}
else
{
info->nWidth = bmpAnd.bmWidth;
info->nHeight = bmpAnd.bmHeight / 2;
info->nWidthBytes = bmpAnd.bmWidthBytes;
info->bPlanes = bmpAnd.bmPlanes;
info->bBitsPerPixel = bmpAnd.bmBitsPixel;
}
/* Transfer the bitmap bits to the CURSORICONINFO structure */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment