Gabriel Ivăncescu : winex11.drv: Obtain icon info for icons passed to fetch_icon_data().

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 95b96a4a84c9038e788a2fd888b0a669ebb4a3a1
URL:    https://gitlab.winehq.org/wine/wine/-/commit/95b96a4a84c9038e788a2fd888b0a66...

Author: Gabriel Ivăncescu 
Date:   Mon Jan  9 17:22:16 2023 +0200

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 3eb944c0a7a1b4857cb0b74d04a8450b636c98de.

Signed-off-by: Gabriel Ivăncescu

---

dlls/winex11.drv/window.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c
index 603314ff3bb..98b0b23e103 100644
--- 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 );