shell32: Use return value from IShellFolder_GetAttributesOf.

642b2fe7 · Vincent Povirk · Alexandre Julliard · b206287c · 642b2fe7
Commit 642b2fe7 authored Aug 14, 2015 by Vincent Povirk Committed by Alexandre Julliard Aug 17, 2015
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 4 deletions

shellitem.c dlls/shell32/shellitem.c +7 -4

No files found.
--- a/dlls/shell32/shellitem.c
+++ b/dlls/shell32/shellitem.c
@@ -271,10 +271,13 @@ static HRESULT WINAPI ShellItem_GetAttributes(IShellItem2 *iface, SFGAOF sfgaoMa
        *psfgaoAttribs &= sfgaoMask;
        IShellFolder_Release(parent_folder);

-        if(sfgaoMask == *psfgaoAttribs)
-            return S_OK;
-        else
-            return S_FALSE;
+        if (SUCCEEDED(ret))
+        {
+            if(sfgaoMask == *psfgaoAttribs)
+                return S_OK;
+            else
+                return S_FALSE;
+        }
    }

    return ret;