winex11.drv: Obtain icon info for icons passed to fetch_icon_data().

SetWindowIcon can pass an icon as a parameter, but in that case NtUserGetIconInfo is never called, so the icon info is never filled. Fixes a regression introduced by 3eb944c0. Signed-off-by: Gabriel Ivăncescu <gabrielopcode@gmail.com>

winex11.drv: Obtain icon info for icons passed to fetch_icon_data().
95b96a4a · Gabriel Ivăncescu · Alexandre Julliard · ee5cdea9 · 95b96a4a
Commit 95b96a4a authored Jan 09, 2023 by Gabriel Ivăncescu Committed by Alexandre Julliard Jan 09, 2023
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

window.c dlls/winex11.drv/window.c +3 -0

No files found.
--- a/dlls/winex11.drv/window.c
+++ b/dlls/winex11.drv/window.c
@@ -625,6 +625,7 @@ static void fetch_icon_data( HWND hwnd, HICON icon_big, HICON icon_small )
    unsigned long *bits;
    Pixmap icon_pixmap, mask_pixmap;

+    icon_big = get_icon_info( icon_big, &ii );
    if (!icon_big)
    {
        icon_big = get_icon_info( (HICON)send_message( hwnd, WM_GETICON, ICON_BIG, 0 ), &ii );
@@ -637,6 +638,8 @@ static void fetch_icon_data( HWND hwnd, HICON icon_big, HICON icon_small )
            icon_big = get_icon_info( icon_big, &ii );
        }
    }
+
+    icon_small = get_icon_info( icon_small, &ii_small );
    if (!icon_small)
    {
        icon_small = get_icon_info( (HICON)send_message( hwnd, WM_GETICON, ICON_SMALL, 0 ), &ii_small );