Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove ben's win/nsIconChannel.cpp dependency on IE allowing it to work on W95/NT4 again also fixing mingw builds p=lorenzo@colitti.com r=me sr=mscott

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@158585 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
neil%parkwaycc.co.uk
2004-06-29 20:16:00 +00:00
parent 51be7e015f
commit 8bf6255b7e
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
mozilla/modules/libpr0n/decoders/icon/win/nsIconChannel.cpp
View File

@@ -249,14 +249,14 @@ static DWORD GetSpecialFolderIcon(nsIFile* aFile, int aFolder, SHFILEINFO* aSFI,
aFile->GetNativePath(fileNativePathStr);
::GetShortPathName(fileNativePathStr.get(), fileNativePath, sizeof(fileNativePath));
char specialNativePath[MAX_PATH];
::SHGetSpecialFolderPath(NULL, specialNativePath, aFolder, FALSE);
::GetShortPathName(specialNativePath, specialNativePath, sizeof(specialNativePath));
LPITEMIDLIST idList;
HRESULT hr = ::SHGetSpecialFolderLocation(NULL, aFolder, &idList);
if (SUCCEEDED(hr)) {
char specialNativePath[MAX_PATH];
::SHGetPathFromIDList(idList, specialNativePath);
::GetShortPathName(specialNativePath, specialNativePath, sizeof(specialNativePath));
if (nsDependentCString(fileNativePath).EqualsIgnoreCase(specialNativePath)) {
LPITEMIDLIST idList;
HRESULT hr = ::SHGetSpecialFolderLocation(NULL, aFolder, &idList);
if (SUCCEEDED(hr)) {
if (nsDependentCString(fileNativePath).EqualsIgnoreCase(specialNativePath)) {
aInfoFlags |= (SHGFI_PIDL | SHGFI_SYSICONINDEX);
shellResult = ::SHGetFileInfo((LPCTSTR)(LPCITEMIDLIST)idList, 0, aSFI,
sizeof(SHFILEINFO), aInfoFlags);