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

[SHELL32] Enable custom CD/DVD icons (#639)

Browse source 
Properly show the custom icon specified in "autorun.inf" file in CDs/DVDs.
CORE-14766
This commit is contained in:
Katayama Hirofumi MZ 2018-06-28 06:06:54 +09:00 committed by Hermès BÉLUSCA - MAÏTO
parent 893a3c9d03
commit c74bd5d662
1 changed files with 52 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
dll/win32/shell32/folders/CDrivesFolder.cpp
View file

@ -4,7 +4,7 @@
* Copyright 1997 Marcus Meissner * Copyright 1997 Marcus Meissner
* Copyright 1998, 1999, 2002 Juergen Schmied * Copyright 1998, 1999, 2002 Juergen Schmied
* Copyright 2009 Andrew Hill * Copyright 2009 Andrew Hill
* Copyright 2017 Katayama Hirofumi MZ * Copyright 2017-2018 Katayama Hirofumi MZ
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public * modify it under the terms of the GNU Lesser General Public
@ -297,6 +297,51 @@ HRESULT CDrivesContextMenu_CreateInstance(PCIDLIST_ABSOLUTE pidlFolder,
return CDefFolderMenu_Create2(pidlFolder, hwnd, cidl, apidl, psf, DrivesContextMenuCallback, cKeys, hKeys, ppcm); return CDefFolderMenu_Create2(pidlFolder, hwnd, cidl, apidl, psf, DrivesContextMenuCallback, cKeys, hKeys, ppcm);
} }
static HRESULT
getIconLocationForDrive(IShellFolder *psf, PCITEMID_CHILD pidl, UINT uFlags,
LPWSTR szIconFile, UINT cchMax, int *piIndex, UINT *pwFlags)
{
WCHAR wszPath[MAX_PATH];
WCHAR wszAutoRunInfPath[MAX_PATH];
WCHAR wszValue[MAX_PATH], wszTemp[MAX_PATH];
static const WCHAR wszAutoRunInf[] = { 'a','u','t','o','r','u','n','.','i','n','f',0 };
static const WCHAR wszAutoRun[] = { 'a','u','t','o','r','u','n',0 };
// get path
if (!ILGetDisplayNameExW(psf, pidl, wszPath, 0))
return E_FAIL;
if (!PathIsDirectoryW(wszPath))
return E_FAIL;
// build the full path of autorun.inf
StringCchCopyW(wszAutoRunInfPath, _countof(wszAutoRunInfPath), wszPath);
PathAppendW(wszAutoRunInfPath, wszAutoRunInf);
// autorun.inf --> wszValue
if (GetPrivateProfileStringW(wszAutoRun, L"icon", NULL, wszValue, _countof(wszValue),
wszAutoRunInfPath) && wszValue[0] != 0)
{
// wszValue --> wszTemp
ExpandEnvironmentStringsW(wszValue, wszTemp, _countof(wszTemp));
// parse the icon location
*piIndex = PathParseIconLocationW(wszTemp);
// wszPath + wszTemp --> wszPath
if (PathIsRelativeW(wszTemp))
PathAppendW(wszPath, wszTemp);
else
StringCchCopyW(wszPath, _countof(wszPath), wszTemp);
// wszPath --> szIconFile
GetFullPathNameW(wszPath, cchMax, szIconFile, NULL);
return S_OK;
}
return E_FAIL;
}
HRESULT CDrivesExtractIcon_CreateInstance(IShellFolder * psf, LPCITEMIDLIST pidl, REFIID riid, LPVOID * ppvOut) HRESULT CDrivesExtractIcon_CreateInstance(IShellFolder * psf, LPCITEMIDLIST pidl, REFIID riid, LPVOID * ppvOut)
{ {
CComPtr<IDefaultExtractIconInit> initIcon; CComPtr<IDefaultExtractIconInit> initIcon;
@ -311,11 +356,17 @@ HRESULT CDrivesExtractIcon_CreateInstance(IShellFolder * psf, LPCITEMIDLIST pidl
WCHAR wTemp[MAX_PATH]; WCHAR wTemp[MAX_PATH];
int icon_idx; int icon_idx;
UINT flags = 0;
if ((DriveType == DRIVE_FIXED || DriveType == DRIVE_UNKNOWN) && if ((DriveType == DRIVE_FIXED || DriveType == DRIVE_UNKNOWN) &&
(HCR_GetIconW(L"Drive", wTemp, NULL, MAX_PATH, &icon_idx))) (HCR_GetIconW(L"Drive", wTemp, NULL, MAX_PATH, &icon_idx)))
{ {
initIcon->SetNormalIcon(wTemp, icon_idx); initIcon->SetNormalIcon(wTemp, icon_idx);
} }
else if (SUCCEEDED(getIconLocationForDrive(psf, pidl, 0, wTemp, _countof(wTemp),
&icon_idx, &flags)))
{
initIcon->SetNormalIcon(wTemp, icon_idx);
}
else else
{ {
icon_idx = iDriveIconIds[DriveType]; icon_idx = iDriveIconIds[DriveType];