shell32: Improve error handling in ParseName() (Coverity).

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

shell32: Improve error handling in ParseName() (Coverity).
4c160b6f · Nikolay Sivov · Alexandre Julliard · 5773203a · 4c160b6f
Commit 4c160b6f authored Oct 03, 2017 by Nikolay Sivov Committed by Alexandre Julliard Oct 03, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

shelldispatch.c dlls/shell32/shelldispatch.c +2 -2

No files found.
--- a/dlls/shell32/shelldispatch.c
+++ b/dlls/shell32/shelldispatch.c
@@ -1536,10 +1536,10 @@ static HRESULT WINAPI FolderImpl_ParseName(Folder3 *iface, BSTR name, FolderItem
        return S_FALSE;

    if ((hr = IShellFolder2_GetDisplayNameOf(This->folder, pidl, SHGDN_FORPARSING, &strret)) == S_OK)
-        StrRetToBSTR(&strret, pidl, &path);
+        hr = StrRetToBSTR(&strret, pidl, &path);

    ILFree(pidl);
-    if (FAILED(hr))
+    if (hr != S_OK)
        return S_FALSE;

    hr = FolderItem_Constructor(This, path, item);