[PATCH 0/1] MR1926: winex11.drv: Obtain icon info for icons passed to fetch_icon_data().

[Gabriel Ivăncescu]

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/1926

[PATCH 1/1] winex11.drv: Obtain icon info for icons passed to fetch_icon_data().

[Gabriel Ivăncescu]

From: Gabriel Ivăncescu <gabrielopcode(a)gmail.com>

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 <gabrielopcode(a)gmail.com>
---
 dlls/winex11.drv/window.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c
index 603314ff3bb..8e7c28b82a9 100644
--- a/dlls/winex11.drv/window.c
+++ b/dlls/winex11.drv/window.c
@@ -637,12 +637,17 @@ static void fetch_icon_data( HWND hwnd, HICON icon_big, HICON icon_small )
             icon_big = get_icon_info( icon_big, &ii );
         }
     }
+    else
+        icon_big = get_icon_info( icon_big, &ii );
+
     if (!icon_small)
     {
         icon_small = get_icon_info( (HICON)send_message( hwnd, WM_GETICON, ICON_SMALL, 0 ), &ii_small );
         if (!icon_small)
             icon_small = get_icon_info( (HICON)NtUserGetClassLongPtrW( hwnd, GCLP_HICONSM ), &ii_small );
     }
+    else
+        icon_small = get_icon_info( icon_small, &ii_small );
 
     if (!icon_big) return;
 
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/1926