commit 14d9eec51a16c9f2fd73c5bb16785577a0d9f3f3
author Michael Jung <mjung@iss.tu-darmstadt.de> Mon Nov 07 20:11:27 2005 +0000
committer Alexandre Julliard <julliard@winehq.org> Mon Nov 07 20:11:27 2005 +0000
tree df3d99c697e8268347d5a44942532dd8a455aaa0
parent 6c0fc4205ce9a12467a3f4b860f598710c6e6e83

More robust code for querying ShellFolder attributes (some
ShellFolders ignore the flag mask in GetAttributesOf).

dlls/shell32/brsfolder.c

diff --git a/dlls/shell32/brsfolder.c b/dlls/shell32/brsfolder.c
index 7be1e32..9bd7261 100644
--- a/dlls/shell32/brsfolder.c
+++ b/dlls/shell32/brsfolder.c
@@ -388,7 +388,7 @@
         dwAttributes = SFGAO_FILESYSANCESTOR | SFGAO_FILESYSTEM;
         r = IShellFolder_GetAttributesOf(lptvid->lpsfParent, 1,
                                 (LPCITEMIDLIST*)&lptvid->lpi, &dwAttributes);
-        if (FAILED(r) || !dwAttributes)
+        if (FAILED(r) || !(dwAttributes & (SFGAO_FILESYSANCESTOR|SFGAO_FILESYSTEM)))
             bEnabled = FALSE;
     }
     if (lpBrowseInfo->ulFlags & BIF_RETURNONLYFSDIRS)
@@ -396,8 +396,11 @@
         dwAttributes = SFGAO_FOLDER | SFGAO_FILESYSTEM;
         r = IShellFolder_GetAttributesOf(lptvid->lpsfParent, 1,
                                 (LPCITEMIDLIST*)&lptvid->lpi, &dwAttributes);
-        if (FAILED(r) || (dwAttributes != (SFGAO_FOLDER | SFGAO_FILESYSTEM)))
+        if (FAILED(r) || 
+            ((dwAttributes & (SFGAO_FOLDER|SFGAO_FILESYSTEM)) != (SFGAO_FOLDER|SFGAO_FILESYSTEM)))
+        {
             bEnabled = FALSE;
+        }
     }
     SendMessageW(info->hWnd, BFFM_ENABLEOK, 0, (LPARAM)bEnabled);
 }