Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-06 05:34:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

[REACTOS] Revert commit 32bdd85b7f (incorrectly formatted)

Browse source
This commit is contained in:
Stanislav Motylkov 2023-11-20 20:50:06 +03:00
parent 32bdd85b7f
commit 4add3fd482
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
base/applications/rapps/appview.cpp
View file

@ -1289,13 +1289,14 @@ CAppsListView::AddApplication(CAppInfo *AppInfo, BOOL InitialCheckState)
/* Load icon from registry */ /* Load icon from registry */
HICON hIcon = NULL; HICON hIcon = NULL;
CStringW szIconPath; CStringW szIconPath;
int IconIndex;
if (AppInfo->RetrieveIcon(szIconPath)) if (AppInfo->RetrieveIcon(szIconPath))
{ {
IconIndex = PathParseIconLocationW(szIconPath.GetBuffer()); PathParseIconLocationW((LPWSTR)szIconPath.GetString());
szIconPath.ReleaseBuffer();
ExtractIconExW(szIconPath.GetString(), IconIndex, &hIcon, NULL, 1); /* Load only the 1st icon from the application executable,
* because all apps provide the executables which have the main icon
* as 1st in the index , so we don't need other icons here */
hIcon = ExtractIconW(hInst, szIconPath.GetString(), 0);
} }
/* Use the default icon if none were found in the file, or if it is not supported (returned 1) */ /* Use the default icon if none were found in the file, or if it is not supported (returned 1) */
@ -1305,7 +1306,7 @@ CAppsListView::AddApplication(CAppInfo *AppInfo, BOOL InitialCheckState)
hIcon = LoadIconW(hInst, MAKEINTRESOURCEW(IDI_MAIN)); hIcon = LoadIconW(hInst, MAKEINTRESOURCEW(IDI_MAIN));
} }
IconIndex = ImageList_AddIcon(m_hImageListView, hIcon); int IconIndex = ImageList_AddIcon(m_hImageListView, hIcon);
DestroyIcon(hIcon); DestroyIcon(hIcon);
int Index = AddItem(ItemCount, IconIndex, AppInfo->szDisplayName, (LPARAM)AppInfo); int Index = AddItem(ItemCount, IconIndex, AppInfo->szDisplayName, (LPARAM)AppInfo);