[PATCH (try 2) 2/3] user32: Use the window class icon if the MDI child doesn't have its own.
Alex Henrie
alexhenrie24 at gmail.com
Wed May 13 01:33:12 CDT 2015
This patch is part 1 of the fix for
https://bugs.winehq.org/show_bug.cgi?id=29337
---
dlls/user32/mdi.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/dlls/user32/mdi.c b/dlls/user32/mdi.c
index 11d5679..41b5077 100644
--- a/dlls/user32/mdi.c
+++ b/dlls/user32/mdi.c
@@ -864,8 +864,12 @@ static BOOL MDI_AugmentFrameMenu( HWND frame, HWND hChild )
/* The system menu is replaced by the child icon */
hIcon = (HICON)SendMessageW(hChild, WM_GETICON, ICON_SMALL, 0);
if (!hIcon)
+ hIcon = (HICON)GetClassLongPtrW(hChild, GCLP_HICONSM);
+ if (!hIcon)
hIcon = (HICON)SendMessageW(hChild, WM_GETICON, ICON_BIG, 0);
if (!hIcon)
+ hIcon = (HICON)GetClassLongPtrW(hChild, GCLP_HICON);
+ if (!hIcon)
hIcon = LoadImageW(0, (LPWSTR)IDI_WINLOGO, IMAGE_ICON, GetSystemMetrics(SM_CXSMICON),
GetSystemMetrics(SM_CYSMICON), LR_DEFAULTCOLOR);
if (hIcon)
--
2.4.0
More information about the wine-patches
mailing list