user32: Don't put a default icon on modal dialogs.

Signed-off-by: Alex Henrie <alexhenrie24@gmail.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

user32: Don't put a default icon on modal dialogs.
9a28e350 · Alex Henrie · Alexandre Julliard · 4d1192ad · 9a28e350
Commit 9a28e350 authored Mar 13, 2016 by Alex Henrie Committed by Alexandre Julliard Mar 15, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

nonclient.c dlls/user32/nonclient.c +2 -2

No files found.
--- a/dlls/user32/nonclient.c
+++ b/dlls/user32/nonclient.c
@@ -168,10 +168,10 @@ static HICON NC_IconForWindow( HWND hwnd )
    if (!hIcon) hIcon = (HICON) GetClassLongPtrW( hwnd, GCLP_HICONSM );
    if (!hIcon) hIcon = (HICON) GetClassLongPtrW( hwnd, GCLP_HICON );

-    /* If there is no hIcon specified and this is a modal dialog,
+    /* If there is no icon specified and this is not a modal dialog,
     * get the default one.
     */
-    if (!hIcon && (GetWindowLongW( hwnd, GWL_STYLE ) & DS_MODALFRAME))
+    if (!hIcon && !(GetWindowLongW( hwnd, GWL_EXSTYLE ) & WS_EX_DLGMODALFRAME))
        hIcon = LoadImageW(0, (LPCWSTR)IDI_WINLOGO, IMAGE_ICON, GetSystemMetrics(SM_CXSMICON),
                           GetSystemMetrics(SM_CYSMICON), LR_DEFAULTCOLOR);
    return hIcon;