From 6a8943cf42435106b17f0875621c715e0adc8683 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Tue, 9 Jun 2015 22:49:12 +0000 Subject: [PATCH] [RAPPS] Fix the fact that the rapps download dialog uses the 32pixel icon for the download window. By Ismael Ferreras Morezuelas (IRC name swyter). CORE-9750 svn path=/trunk/; revision=68096 --- reactos/base/applications/rapps/loaddlg.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/reactos/base/applications/rapps/loaddlg.c b/reactos/base/applications/rapps/loaddlg.c index 3afa7acd591..4a1a96b9f39 100644 --- a/reactos/base/applications/rapps/loaddlg.c +++ b/reactos/base/applications/rapps/loaddlg.c @@ -30,7 +30,6 @@ #include 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; -- 2.17.1