Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-10-14 21:25:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

-fix crash in shell32 caused by clamwin installer (patch by w3seek)

Browse source 
svn path=/trunk/; revision=27887
This commit is contained in:
Christoph von Wittich 2007-07-26 21:43:22 +00:00
parent da22f48dfd
commit ea206e8a12
1 changed files with 49 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
reactos/dll/win32/shell32/shell32_main.c
View file

@ -509,23 +509,59 @@ DWORD_PTR WINAPI SHGetFileInfoW(LPCWSTR path,DWORD dwFileAttributes,
/* get the iconlocation */
if (SUCCEEDED(hr) && (flags & SHGFI_ICONLOCATION ))
{
UINT uDummy,uFlags;
hr = IShellFolder_GetUIObjectOf(psfParent, 0, 1,
(LPCITEMIDLIST*)&pidlLast, &IID_IExtractIconA,
&uDummy, (LPVOID*)&pei);
if (SUCCEEDED(hr))
if (!(flags & SHGFI_USEFILEATTRIBUTES))
{
hr = IExtractIconW_GetIconLocation(pei, uGilFlags,
szLocation, MAX_PATH, &iIndex, &uFlags);
psfi->iIcon = iIndex;
UINT uDummy,uFlags;
if (!(uFlags & GIL_NOTFILENAME))
lstrcpyW (psfi->szDisplayName, szLocation);
hr = IShellFolder_GetUIObjectOf(psfParent, 0, 1,
(LPCITEMIDLIST*)&pidlLast, &IID_IExtractIconA,
&uDummy, (LPVOID*)&pei);
if (SUCCEEDED(hr))
{
hr = IExtractIconW_GetIconLocation(pei, uGilFlags,
szLocation, MAX_PATH, &iIndex, &uFlags);
psfi->iIcon = iIndex;
if (!(uFlags & GIL_NOTFILENAME))
lstrcpyW (psfi->szDisplayName, szLocation);
else
ret = FALSE;
IExtractIconA_Release(pei);
}
}
else
{
if (dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)
{
strcpyW(psfi->szDisplayName, swShell32Name);
psfi->iIcon = SIC_GetIconIndex(swShell32Name, -IDI_SHELL_FOLDER, 0);
}
else
ret = FALSE;
{
WCHAR sTemp [MAX_PATH];
WCHAR * szExt;
DWORD dwNr=0;
static const WCHAR p1W[] = {'%','1',0};
IExtractIconA_Release(pei);
lstrcpynW(sTemp, szFullPath, MAX_PATH);
psfi->iIcon = 0;
szExt = (LPWSTR) PathFindExtensionW(sTemp);
if ( szExt &&
HCR_MapTypeToValueW(szExt, sTemp, MAX_PATH, TRUE) &&
HCR_GetDefaultIconW(sTemp, sTemp, MAX_PATH, &dwNr))
{
if (!lstrcmpW(p1W,sTemp)) /* icon is in the file */
strcpyW(psfi->szDisplayName, szFullPath);
else
strcpyW(psfi->szDisplayName, sTemp);
psfi->iIcon = SIC_GetIconIndex(psfi->szDisplayName, dwNr, 0);
if (psfi->iIcon == -1)
psfi->iIcon = 0;
}
}
}
}