[PATCH 1/2] user32: Use window class small icon if the window does not have its own.

Alex Henrie alexhenrie24 at gmail.com
Wed May 13 00:36:54 CDT 2015


We were already doing this for ICON_SMALL2, which is supposed to be
almost identical to ICON_SMALL:
https://source.winehq.org/git/wine.git/blob/5f35f1a8dbbc9dc3fa629a7f123e045e3320f562:/dlls/user32/defwnd.c#l628
https://msdn.microsoft.com/en-us/library/windows/desktop/ms632625%28v=vs.85%29.aspx

This patch is part 1 of the fix for
https://bugs.winehq.org/show_bug.cgi?id=29337
---
 dlls/user32/defwnd.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dlls/user32/defwnd.c b/dlls/user32/defwnd.c
index bcd6f91..935134d 100644
--- a/dlls/user32/defwnd.c
+++ b/dlls/user32/defwnd.c
@@ -634,6 +634,7 @@ static LRESULT DEFWND_DefWinProc( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa
             {
             case ICON_SMALL:
                 ret = wndPtr->hIconSmall;
+                if (!ret) ret = (HICON)GetClassLongPtrW( hwnd, GCLP_HICONSM );
                 break;
             case ICON_BIG:
                 ret = wndPtr->hIcon;
-- 
2.4.0




More information about the wine-patches mailing list