Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-05-23 19:14:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

[SHELL32]

Browse source 
- Use ExpandEnvironmentStringsW instead of PathUnExpandEnvStringsW in the pick icon dialog.
- Patch by Jared Smudde.
CORE-10962

svn path=/trunk/; revision=72399
This commit is contained in:
Giannis Adamopoulos 2016-08-20 09:53:55 +00:00
parent 8f70f4395e
commit 68ed94281d
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
reactos/dll/win32/shell32/dialogs/dialogs.cpp
View file

@ -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);