Vincent Povirk : shell32: Use return value from IShellFolder_GetAttributesOf.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 642b2fe789942d1632f3aa9f1394435fd7e89e63
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=642b2fe789942d1632f3aa9f13...

Author: Vincent Povirk 
Date:   Fri Aug 14 11:41:55 2015 -0500

shell32: Use return value from IShellFolder_GetAttributesOf.

---

dlls/shell32/shellitem.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/dlls/shell32/shellitem.c b/dlls/shell32/shellitem.c
index a410381..853325c 100644
--- 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;