Mikołaj Zalewski : shell32: RunFileDlg: Allow custom icons.

[Alexandre Julliard]

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

Author: Mikołaj Zalewski <mikolaj at zalewski.pl>
Date:   Tue Jul  8 16:05:50 2008 +0200

shell32: RunFileDlg: Allow custom icons.

---

 dlls/shell32/dialogs.c |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/dlls/shell32/dialogs.c b/dlls/shell32/dialogs.c
index 0e858b8..b64d306 100644
--- a/dlls/shell32/dialogs.c
+++ b/dlls/shell32/dialogs.c
@@ -139,9 +139,12 @@ static INT_PTR CALLBACK RunDlgProc (HWND hwnd, UINT message, WPARAM wParam, LPAR
             if (prfdp->uFlags & RFF_CALCDIRECTORY)
                 FIXME("RFF_CALCDIRECTORY not supported\n");
 
-            SetClassLongPtrW (hwnd, GCLP_HICON, (LPARAM)prfdp->hIcon) ;
-            SendMessageW (GetDlgItem (hwnd, IDC_RUNDLG_ICON), STM_SETICON,
-                          (WPARAM)LoadIconW (NULL, (LPCWSTR)IDI_WINLOGO), 0);
+            if (prfdp->hIcon == NULL)
+                prfdp->hIcon = LoadIconW(NULL, (LPCWSTR)IDI_WINLOGO);
+            SendMessageW(hwnd, WM_SETICON, ICON_BIG, (LPARAM)prfdp->hIcon);
+            SendMessageW(hwnd, WM_SETICON, ICON_SMALL, (LPARAM)prfdp->hIcon);
+            SendMessageW(GetDlgItem(hwnd, IDC_RUNDLG_ICON), STM_SETICON, (WPARAM)prfdp->hIcon, 0);
+
             FillList (GetDlgItem (hwnd, IDC_RUNDLG_EDITPATH), NULL, (prfdp->uFlags & RFF_NODEFAULT) == 0) ;
             SetFocus (GetDlgItem (hwnd, IDC_RUNDLG_EDITPATH)) ;
             return TRUE ;