user32: Make the hotspot ICON_HOTSPOT when loading icons.

Based on patches by Henri Verbeet.

user32: Make the hotspot ICON_HOTSPOT when loading icons.
9726a711 · Andrew Riedi · Alexandre Julliard · 75b9c050 · 9726a711
Commit 9726a711 authored Nov 23, 2008 by Andrew Riedi Committed by Alexandre Julliard Nov 26, 2008
Hide whitespace changes
Inline Side-by-side

Showing with 11 additions and 2 deletions

cursoricon.c dlls/user32/cursoricon.c +11 -2

No files found.
--- a/dlls/user32/cursoricon.c
+++ b/dlls/user32/cursoricon.c
@@ -1124,8 +1124,17 @@ static HICON CURSORICON_LoadFromFile( LPCWSTR filename,
    if ( entry->dwDIBOffset + entry->dwDIBSize > filesize )
        goto end;

-    hotspot.x = entry->xHotspot;
-    hotspot.y = entry->yHotspot;
+    /* Set the actual hotspot for cursors and ICON_HOTSPOT for icons. */
+    if ( fCursor )
+    {
+        hotspot.x = entry->xHotspot;
+        hotspot.y = entry->yHotspot;
+    }
+    else
+    {
+        hotspot.x = ICON_HOTSPOT;
+        hotspot.y = ICON_HOTSPOT;
+    }
    hIcon = CURSORICON_CreateIconFromBMI( (BITMAPINFO *)&bits[entry->dwDIBOffset],
 					  hotspot, !fCursor, 0x00030000,
 					  width, height, loadflags );