[gadamopoulos] 72399: [SHELL32] - Use ExpandEnvironmentStringsW instead of PathUnExpandEnvStringsW in the pick icon dialog. - Patch by Jared Smudde. CORE-10962

Author: gadamopoulos
Date: Sat Aug 20 09:53:55 2016
New Revision: 72399

URL: http://svn.reactos.org/svn/reactos?rev=72399&view=rev
Log:
[SHELL32]
- Use ExpandEnvironmentStringsW instead of PathUnExpandEnvStringsW in the pick icon
dialog.
- Patch by Jared Smudde.
CORE-10962

Modified:
    trunk/reactos/dll/win32/shell32/dialogs/dialogs.cpp

Modified: trunk/reactos/dll/win32/shell32/dialogs/dialogs.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/dialogs/…
==============================================================================
--- trunk/reactos/dll/win32/shell32/dialogs/dialogs.cpp	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/dialogs/dialogs.cpp	[iso-8859-1] Sat Aug 20 09:53:55
2016
@@ -117,7 +117,7 @@
         pIconContext->hDlgCtrl = GetDlgItem(hwndDlg, IDC_PICKICON_LIST);
         SendMessageW(pIconContext->hDlgCtrl, LB_SETCOLUMNWIDTH, 32, 0);
         EnumResourceNamesW(pIconContext->hLibrary, RT_ICON, EnumPickIconResourceProc,
(LPARAM)pIconContext->hDlgCtrl);
-        if (PathUnExpandEnvStringsW(pIconContext->szName, szText, MAX_PATH))
+        if (ExpandEnvironmentStringsW(pIconContext->szName, szText, MAX_PATH))
             SetDlgItemTextW(hwndDlg, IDC_EDIT_PATH, szText);
         else
             SetDlgItemTextW(hwndDlg, IDC_EDIT_PATH, pIconContext->szName);
@@ -177,7 +177,7 @@
                 pIconContext->hLibrary = hLibrary;
                 wcscpy(pIconContext->szName, szText);
                 EnumResourceNamesW(pIconContext->hLibrary, RT_ICON,
EnumPickIconResourceProc, (LPARAM)pIconContext->hDlgCtrl);
-                if (PathUnExpandEnvStringsW(pIconContext->szName, szText, MAX_PATH))
+                if (ExpandEnvironmentStringsW(pIconContext->szName, szText,
MAX_PATH))
                     SetDlgItemTextW(hwndDlg, IDC_EDIT_PATH, szText);
                 else
                     SetDlgItemTextW(hwndDlg, IDC_EDIT_PATH, pIconContext->szName);