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

Alexandre Julliard julliard at winehq.org
Tue Oct 3 15:39:52 CDT 2017


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

Author: Nikolay Sivov <nsivov at codeweavers.com>
Date:   Tue Oct  3 11:41:10 2017 +0300

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

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

---

 dlls/shell32/shelldispatch.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/shell32/shelldispatch.c b/dlls/shell32/shelldispatch.c
index 0baab6b..11890f1 100644
--- 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);




More information about the wine-cvs mailing list