[PATCH v8 2/4] shell32: Fix error handling in SHBindToParent.

[Mohamad Al-Jaf]

From: Mohamad Al-Jaf

Signed-off-by: Mohamad Al-Jaf 
---
 dlls/shell32/pidl.c            | 9 +++++----
 dlls/shell32/tests/shlfolder.c | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/dlls/shell32/pidl.c b/dlls/shell32/pidl.c
index f9c91a79132..4294f24c736 100644
--- a/dlls/shell32/pidl.c
+++ b/dlls/shell32/pidl.c
@@ -1295,13 +1295,14 @@ HRESULT WINAPI SHBindToParent(LPCITEMIDLIST pidl, REFIID riid, LPVOID *ppv, LPCI

TRACE_(shell)("pidl=%p\n", pidl);
     pdump(pidl);
-    
+
+    if (ppidlLast)
+        *ppidlLast = NULL;
+
     if (!pidl || !ppv)
         return E_INVALIDARG;
-    
+
     *ppv = NULL;
-    if (ppidlLast)
-        *ppidlLast = NULL;

hr = SHGetDesktopFolder(&psfDesktop);
     if (FAILED(hr))
diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c
index 1d24827b8a4..2dbe7ec323a 100644
--- a/dlls/shell32/tests/shlfolder.c
+++ b/dlls/shell32/tests/shlfolder.c
@@ -777,7 +777,7 @@ static void test_GetDisplayName(void)
     hr = SHBindToParent(NULL, &IID_IShellFolder, (void **)&psfPersonal, &pidlLast);
     ok (hr == E_INVALIDARG || broken(hr == E_OUTOFMEMORY) /* XP */,
         "SHBindToParent(NULL) should fail! hr = %08lx\n", hr);
-    todo_wine ok(pidlLast == NULL, "got %p\n", pidlLast);
+    ok(pidlLast == NULL, "got %p\n", pidlLast);

/* But it succeeds with an empty PIDL. */
     hr = SHBindToParent(pidlEmpty, &IID_IShellFolder, (void **)&psfPersonal, &pidlLast);