[RAPPS] Fix the fact that the rapps download dialog uses the 32pixel icon for the...

svn path=/trunk/; revision=68096

diff --git a/reactos/base/applications/rapps/loaddlg.c b/reactos/base/applications/rapps/loaddlg.c
index 3afa7ac..4a1a96b 100644 (file)
--- a/reactos/base/applications/rapps/loaddlg.c
+++ b/reactos/base/applications/rapps/loaddlg.c
@@ -30,7 +30,6 @@
 #include <shellapi.h>
 
 static PAPPLICATION_INFO AppInfo;
-static HICON hIcon = NULL;
 
 typedef struct _IBindStatusCallbackImpl
 {
@@ -378,12 +377,15 @@ DownloadDlgProc(HWND Dlg, UINT Msg, WPARAM wParam, LPARAM lParam)
     switch (Msg)
     {
         case WM_INITDIALOG:
+            HICON hIconSm = NULL, hIconBg = NULL;
 
-            hIcon = LoadIconW(hInst, MAKEINTRESOURCEW(IDI_MAIN));
-            if (hIcon)
+            hIconBg = (HICON)GetClassLongPtr(hMainWnd, GCLP_HICON);
+            hIconSm = (HICON)GetClassLongPtr(hMainWnd, GCLP_HICONSM);
+
+            if (hIconBg && hIconSm)
             {
-                SendMessageW(Dlg, WM_SETICON, ICON_BIG, (LPARAM) hIcon);
-                SendMessageW(Dlg, WM_SETICON, ICON_SMALL, (LPARAM) hIcon);
+                SendMessageW(Dlg, WM_SETICON, ICON_BIG, (LPARAM) hIconBg);
+                SendMessageW(Dlg, WM_SETICON, ICON_SMALL, (LPARAM) hIconSm);
             }
 
             SetWindowLongPtrW(Dlg, GWLP_USERDATA, 0);
@@ -408,7 +410,6 @@ DownloadDlgProc(HWND Dlg, UINT Msg, WPARAM wParam, LPARAM lParam)
             return FALSE;
 
         case WM_CLOSE:
-            if (hIcon) DestroyIcon(hIcon);
             EndDialog(Dlg, 0);
             return TRUE;