Correct IShellFolder::GetAttributesOf() for the case *rgfInOut=0.

diff --git a/dlls/shell32/cpanelfolder.c b/dlls/shell32/cpanelfolder.c
index 99a3674..334c2da 100644 (file)
--- a/dlls/shell32/cpanelfolder.c
+++ b/dlls/shell32/cpanelfolder.c
@@ -556,6 +556,9 @@ ISF_ControlPanel_fnGetAttributesOf(IShellFolder2 * iface, UINT cidl, LPCITEMIDLI
     if ((!cidl) ||(!apidl) ||(!rgfInOut))
        return E_INVALIDARG;
 
+    if (*rgfInOut == 0)
+       *rgfInOut = ~0;
+
     while(cidl > 0 && *apidl) {
        pdump(*apidl);
        SHELL32_GetItemAttributes(_IShellFolder_(This), *apidl, rgfInOut);

diff --git a/dlls/shell32/shfldr_desktop.c b/dlls/shell32/shfldr_desktop.c
index 4559912..21cbee1 100644 (file)
--- a/dlls/shell32/shfldr_desktop.c
+++ b/dlls/shell32/shfldr_desktop.c
@@ -425,6 +425,9 @@ static HRESULT WINAPI ISF_Desktop_fnGetAttributesOf (IShellFolder2 * iface,
     if ((!cidl) || (!apidl) || (!rgfInOut))
        return E_INVALIDARG;
 
+    if (*rgfInOut == 0)
+       *rgfInOut = ~0;
+
     while (cidl > 0 && *apidl) {
        pdump (*apidl);
        SHELL32_GetItemAttributes (_IShellFolder_ (This), *apidl, rgfInOut);

diff --git a/dlls/shell32/shfldr_fs.c b/dlls/shell32/shfldr_fs.c
index 451df21..a383258 100644 (file)
--- a/dlls/shell32/shfldr_fs.c
+++ b/dlls/shell32/shfldr_fs.c
@@ -509,6 +509,9 @@ IShellFolder_fnGetAttributesOf (IShellFolder2 * iface, UINT cidl, LPCITEMIDLIST
     if ((!cidl) || (!apidl) || (!rgfInOut))
        return E_INVALIDARG;
 
+    if (*rgfInOut == 0)
+       *rgfInOut = ~0;
+
     while (cidl > 0 && *apidl) {
        pdump (*apidl);
        SHELL32_GetItemAttributes (_IShellFolder_ (This), *apidl, rgfInOut);

diff --git a/dlls/shell32/shfldr_mycomp.c b/dlls/shell32/shfldr_mycomp.c
index bc6bf16..a9bb194 100644 (file)
--- a/dlls/shell32/shfldr_mycomp.c
+++ b/dlls/shell32/shfldr_mycomp.c
@@ -407,6 +407,9 @@ ISF_MyComputer_fnGetAttributesOf (IShellFolder2 * iface, UINT cidl, LPCITEMIDLIS
     if ((!cidl) || (!apidl) || (!rgfInOut))
        return E_INVALIDARG;
 
+    if (*rgfInOut == 0)
+       *rgfInOut = ~0;
+
     while (cidl > 0 && *apidl) {
        pdump (*apidl);
        SHELL32_GetItemAttributes (_IShellFolder_ (This), *apidl, rgfInOut);