Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-06-30 18:01:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

[SHELL32]

Browse source 
- CFSFolder: Explicitly check for the supported pidl types. A CFSFolder can be created by a drive pidl. Handle this case and return the appropriate attributes in GetAttributesOf.
CORE-9458

svn path=/trunk/; revision=67017
This commit is contained in:
Giannis Adamopoulos 2015-04-03 11:44:30 +00:00
parent a4ed2e1992
commit c1904b1628
1 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
reactos/dll/win32/shell32/folders/CFSFolder.cpp
View file

@ -369,6 +369,9 @@ HRESULT WINAPI CFSFolder::GetAttributesOf(UINT cidl,
PCUITEMID_CHILD_ARRAY apidl, DWORD * rgfInOut)
{
HRESULT hr = S_OK;
static const DWORD dwDriveAttributes =
SFGAO_HASSUBFOLDER | SFGAO_FILESYSTEM | SFGAO_FOLDER | SFGAO_FILESYSANCESTOR |
SFGAO_DROPTARGET | SFGAO_HASPROPSHEET | SFGAO_CANRENAME | SFGAO_CANLINK;
TRACE("(%p)->(cidl=%d apidl=%p mask=%p (0x%08x))\n", this, cidl, apidl,
rgfInOut, rgfInOut ? *rgfInOut : 0);
@ -389,7 +392,13 @@ HRESULT WINAPI CFSFolder::GetAttributesOf(UINT cidl,
hr = SHBindToParent(pidlRoot, IID_PPV_ARG(IShellFolder, &psfParent), &rpidl);
if(SUCCEEDED(hr))
{
SHELL32_GetItemAttributes (psfParent, rpidl, rgfInOut);
if (_ILIsDrive(rpidl))
*rgfInOut &= dwDriveAttributes;
if (_ILIsFolder(rpidl) || _ILIsValue(rpidl))
SHELL32_GetItemAttributes(this, rpidl, rgfInOut);
else
ERR("Got an unknown type of pidl!!!\n");
psfParent->Release();
}
}
@ -398,7 +407,10 @@ HRESULT WINAPI CFSFolder::GetAttributesOf(UINT cidl,
while (cidl > 0 && *apidl)
{
pdump(*apidl);
SHELL32_GetItemAttributes(this, *apidl, rgfInOut);
if(_ILIsFolder(*apidl) || _ILIsValue(*apidl))
SHELL32_GetItemAttributes(this, *apidl, rgfInOut);
else
ERR("Got an unknown type of pidl!!!\n");
apidl++;
cidl--;
}