Alex Henrie : user32: Use the window class icon if the MDI child doesn' t have its own.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 5579967c537255bb17c0e0630da9e902675dfedb
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=5579967c537255bb17c0e0630d...

Author: Alex Henrie <alexhenrie24(a)gmail.com>
Date:   Wed May 13 00:33:12 2015 -0600

user32: Use the window class icon if the MDI child doesn't have its own.

---

 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)