commit 876dc3d8fd0880fa895c78121f90c0aa85a4c27c
author Nikolay Sivov <nsivov@codeweavers.com> Wed Sep 27 11:13:46 2017 +0300
committer Alexandre Julliard <julliard@winehq.org> Wed Sep 27 10:20:16 2017 +0200
tree 2442167083f33329b0ae094111d72dfd2470b1e7
parent c14c2ebfb70ae9e6d0d807cdb93ec2a025217278

shell32: Simplify Verbs() method.

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

dlls/shell32/shelldispatch.c

diff --git a/dlls/shell32/shelldispatch.c b/dlls/shell32/shelldispatch.c
index 148c45f..3ff9ff0 100644
--- a/dlls/shell32/shelldispatch.c
+++ b/dlls/shell32/shelldispatch.c
@@ -577,6 +577,8 @@
     LPITEMIDLIST pidl;
     HRESULT hr;
 
+    *verbs = NULL;
+
     This = HeapAlloc(GetProcessHeap(), 0, sizeof(FolderItemVerbsImpl));
     if (!This)
         return E_OUTOFMEMORY;
@@ -865,23 +867,14 @@
 
 static HRESULT WINAPI FolderItemImpl_Verbs(FolderItem2 *iface, FolderItemVerbs **verbs)
 {
-    HRESULT hr;
-    BSTR path;
+    FolderItemImpl *This = impl_from_FolderItem(iface);
 
     TRACE("(%p, %p)\n", iface, verbs);
 
     if (!verbs)
         return E_INVALIDARG;
 
-    *verbs = NULL;
-
-    hr = FolderItem2_get_Path(iface, &path);
-    if (FAILED(hr))
-        return hr;
-
-    hr = FolderItemVerbs_Constructor(path, verbs);
-    SysFreeString(path);
-    return hr;
+    return FolderItemVerbs_Constructor(This->path ? This->path : This->folder->path, verbs);
 }
 
 static HRESULT WINAPI FolderItemImpl_InvokeVerb(FolderItem2 *iface,