From 68ed94281df7e384e7fe89c4804c9853141be984 Mon Sep 17 00:00:00 2001 From: Giannis Adamopoulos Date: Sat, 20 Aug 2016 09:53:55 +0000 Subject: [PATCH] [SHELL32] - Use ExpandEnvironmentStringsW instead of PathUnExpandEnvStringsW in the pick icon dialog. - Patch by Jared Smudde. CORE-10962 svn path=/trunk/; revision=72399 --- reactos/dll/win32/shell32/dialogs/dialogs.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/reactos/dll/win32/shell32/dialogs/dialogs.cpp b/reactos/dll/win32/shell32/dialogs/dialogs.cpp index 557e4bce3d1..d23ff0d461c 100644 --- a/reactos/dll/win32/shell32/dialogs/dialogs.cpp +++ b/reactos/dll/win32/shell32/dialogs/dialogs.cpp @@ -117,7 +117,7 @@ INT_PTR CALLBACK PickIconProc(HWND hwndDlg, 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 @@ INT_PTR CALLBACK PickIconProc(HWND hwndDlg, 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);