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

[SHELL32] Follow-up of #2076 (#2091)

Browse source 
Fix EXE and SCR file icons. CORE-16533
This commit is contained in:
Katayama Hirofumi MZ 2019-11-26 21:45:58 +09:00 committed by GitHub
parent bd25333e24
commit cfdbccf937
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
dll/win32/shell32/CExtractIcon.cpp
View file

@ -138,21 +138,6 @@ HRESULT STDMETHODCALLTYPE CExtractIcon::SetNormalIcon(
{
TRACE("(%p, %s, %d)\n", this, debugstr_w(pszFile), iIcon);
if (lstrcmpiW(PathFindExtensionW(pszFile), L".exe") == 0)
{
if (!PrivateExtractIconExW(pszFile, 0, NULL, NULL, 1))
{
WCHAR szPath[MAX_PATH];
GetModuleFileNameW(shell32_hInstance, szPath, _countof(szPath));
DuplicateString(szPath, &normalIcon.file);
if (!normalIcon.file)
return E_OUTOFMEMORY;
normalIcon.index = -IDI_SHELL_EXE;
return S_OK;
}
}
DuplicateString(pszFile, &normalIcon.file);
if (!normalIcon.file)
return E_OUTOFMEMORY;

7
dll/win32/shell32/folders/CFSFolder.cpp
View file

@ -312,6 +312,13 @@ HRESULT CFSExtractIcon_CreateInstance(IShellFolder * psf, LPCITEMIDLIST pidl, RE
{
ILGetDisplayNameExW(psf, pidl, wTemp, ILGDN_FORPARSING);
icon_idx = 0;
INT ret = ExtractIconExW(wTemp, -1, NULL, NULL, 0);
if (ret <= 0)
{
StringCbCopyW(wTemp, sizeof(wTemp), swShell32Name);
icon_idx = -IDI_SHELL_EXE;
}
}
initIcon->SetNormalIcon(wTemp, icon_idx);