From 3ccdac9acaf19ec4d147d2f063300fba614c5925 Mon Sep 17 00:00:00 2001 From: Ziliang Guo Date: Thu, 24 Mar 2016 23:03:35 +0000 Subject: [PATCH] Sync rapps_new with rapps. Porting done by Mark Jensen. Original code from Ismael Ferreras Morezuelas. CORE-10986 svn path=/trunk/; revision=71043 --- reactos/base/applications/rapps_new/loaddlg.cpp | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/reactos/base/applications/rapps_new/loaddlg.cpp b/reactos/base/applications/rapps_new/loaddlg.cpp index e8bc0825ac7..3ce0aef7833 100644 --- a/reactos/base/applications/rapps_new/loaddlg.cpp +++ b/reactos/base/applications/rapps_new/loaddlg.cpp @@ -36,7 +36,6 @@ #include static PAPPLICATION_INFO AppInfo; -static HICON hIcon = NULL; class CDownloadDialog : public CComObjectRootEx, @@ -359,12 +358,16 @@ 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); @@ -379,7 +382,7 @@ DownloadDlgProc(HWND Dlg, UINT Msg, WPARAM wParam, LPARAM lParam) if (!Thread) return FALSE; CloseHandle(Thread); return TRUE; - + } case WM_COMMAND: if (wParam == IDCANCEL) { @@ -389,7 +392,6 @@ DownloadDlgProc(HWND Dlg, UINT Msg, WPARAM wParam, LPARAM lParam) return FALSE; case WM_CLOSE: - if (hIcon) DestroyIcon(hIcon); EndDialog(Dlg, 0); return TRUE;