[SHELL32]

- Fix a regression in SHELL32_GetFSItemAttributes found by our tests.

svn path=/trunk/; revision=68738
This commit is contained in:
Giannis Adamopoulos 2015-08-17 13:34:38 +00:00
parent 37a0743c4c
commit db8269be53

View file

@ -572,6 +572,13 @@ HRESULT SHELL32_GetFSItemAttributes(IShellFolder * psf, LPCITEMIDLIST pidl, LPDW
{
DWORD dwAttributes;
if (!_ILIsFolder(pidl) && !_ILIsValue(pidl))
{
ERR("Got wrong type of pidl!\n");
*pdwAttributes &= SFGAO_CANLINK;
return S_OK;
}
if (*pdwAttributes & ~dwSupportedAttr)
{
WARN ("attributes 0x%08x not implemented\n", (*pdwAttributes & ~dwSupportedAttr));
@ -579,12 +586,6 @@ HRESULT SHELL32_GetFSItemAttributes(IShellFolder * psf, LPCITEMIDLIST pidl, LPDW
}
dwAttributes = _ILGetFileAttributes(pidl, NULL, 0);
if (!dwAttributes)
{
ERR("Got 0 attrs!\n");
*pdwAttributes &= SFGAO_CANLINK;
return S_OK;
}
/* Set common attributes */
*pdwAttributes |= SFGAO_FILESYSTEM | SFGAO_DROPTARGET | SFGAO_HASPROPSHEET | SFGAO_CANDELETE |