--- trunk/reactos/lib/shell32/shlfolder.c 2005-10-31 20:43:06 UTC (rev 18919)
+++ trunk/reactos/lib/shell32/shlfolder.c 2005-11-01 01:39:45 UTC (rev 18920)
@@ -411,14 +411,13 @@
*pdwAttributes &= dwSupportedAttr;
}
+ dwAttributes = *pdwAttributes;
+
if (_ILIsDrive (pidl)) {
*pdwAttributes &= SFGAO_HASSUBFOLDER|SFGAO_FILESYSTEM|SFGAO_FOLDER|SFGAO_FILESYSANCESTOR|
SFGAO_DROPTARGET|SFGAO_HASPROPSHEET|SFGAO_CANLINK;
- } else if (_ILGetGUIDPointer (pidl)) {
- if (!HCR_GetFolderAttributes (pidl, pdwAttributes)) {
- *pdwAttributes &= SFGAO_HASSUBFOLDER|SFGAO_FOLDER|SFGAO_FILESYSANCESTOR|
- SFGAO_DROPTARGET|SFGAO_HASPROPSHEET|SFGAO_CANRENAME|SFGAO_CANLINK;
- }
+ } else if (_ILGetGUIDPointer (pidl) && HCR_GetFolderAttributes(pidl, &dwAttributes)) {
+ *pdwAttributes = dwAttributes;
} else if (_ILGetDataPointer (pidl)) {
dwAttributes = _ILGetFileAttributes (pidl, NULL, 0);