Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-09-29 05:54:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

[SHELL32]: Modify EnumPickIconResourceProc so that it indeed uses its hModule parameter, and as a last simplification, just gives hDlgCtrl to EnumResourceNamesW.

Browse source 
svn path=/trunk/; revision=70999
This commit is contained in:
Hermès Bélusca-Maïto 2016-03-12 23:51:57 +00:00
parent fba8d14251
commit aac6a3218e
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -58,22 +58,21 @@ BOOL CALLBACK EnumPickIconResourceProc(HMODULE hModule,
{
WCHAR szName[100];
int index;
HICON hIcon;
PPICK_ICON_CONTEXT pIconContext = (PPICK_ICON_CONTEXT)lParam;
HICON hIcon;
HWND hDlgCtrl = (HWND)lParam;
if (IS_INTRESOURCE(lpszName))
swprintf(szName, L"%u", (DWORD)lpszName);
else
wcscpy(szName, (WCHAR*)lpszName);
hIcon = LoadIconW(pIconContext->hLibrary, (LPCWSTR)lpszName);
hIcon = LoadIconW(hModule, lpszName);
if (hIcon == NULL)
return TRUE;
index = SendMessageW(pIconContext->hDlgCtrl, LB_ADDSTRING, 0, (LPARAM)szName);
index = SendMessageW(hDlgCtrl, LB_ADDSTRING, 0, (LPARAM)szName);
if (index != LB_ERR)
SendMessageW(pIconContext->hDlgCtrl, LB_SETITEMDATA, index, (LPARAM)hIcon);
SendMessageW(hDlgCtrl, LB_SETITEMDATA, index, (LPARAM)hIcon);
return TRUE;
}
@ -117,7 +116,7 @@ INT_PTR CALLBACK PickIconProc(HWND hwndDlg,
SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG)pIconContext);
pIconContext->hDlgCtrl = GetDlgItem(hwndDlg, IDC_PICKICON_LIST);
SendMessageW(pIconContext->hDlgCtrl, LB_SETCOLUMNWIDTH, 32, 0);
EnumResourceNamesW(pIconContext->hLibrary, RT_ICON, EnumPickIconResourceProc, (LPARAM)pIconContext);
EnumResourceNamesW(pIconContext->hLibrary, RT_ICON, EnumPickIconResourceProc, (LPARAM)pIconContext->hDlgCtrl);
if (PathUnExpandEnvStringsW(pIconContext->szName, szText, MAX_PATH))
SetDlgItemTextW(hwndDlg, IDC_EDIT_PATH, szText);
else
@ -177,7 +176,7 @@ INT_PTR CALLBACK PickIconProc(HWND hwndDlg,
FreeLibrary(pIconContext->hLibrary);
pIconContext->hLibrary = hLibrary;
wcscpy(pIconContext->szName, szText);
EnumResourceNamesW(pIconContext->hLibrary, RT_ICON, EnumPickIconResourceProc, (LPARAM)pIconContext);
EnumResourceNamesW(pIconContext->hLibrary, RT_ICON, EnumPickIconResourceProc, (LPARAM)pIconContext->hDlgCtrl);
if (PathUnExpandEnvStringsW(pIconContext->szName, szText, MAX_PATH))
SetDlgItemTextW(hwndDlg, IDC_EDIT_PATH, szText);
else