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

[Sebastian Lackner]

On 13.05.2015 07:36, Alex Henrie wrote:
> 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/5f35f1a8dbbc9dc3fa629a7f123e045e...
> https://msdn.microsoft.com/en-us/library/windows/desktop/ms632625%28v=vs.85%...
>
> 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;

The patch breaks existing tests (user32/win):

win.c:2009: Test failed: wrong small icon 0x3b0058/0