[PATCH v3 4/4] shell32: Reimplement SHBindToParent.

[Mohamad Al-Jaf]

From: Mohamad Al-Jaf

---
 dlls/shell32/pidl.c            | 38 +---------------------------------
 dlls/shell32/tests/shlfolder.c |  2 +-
 2 files changed, 2 insertions(+), 38 deletions(-)

diff --git a/dlls/shell32/pidl.c b/dlls/shell32/pidl.c
index aedce020e06..73141c50a0b 100644
--- a/dlls/shell32/pidl.c
+++ b/dlls/shell32/pidl.c
@@ -1340,43 +1340,7 @@ HRESULT WINAPI SHBindToFolderIDListParent(IShellFolder *psf, LPCITEMIDLIST pidl,
  */
 HRESULT WINAPI SHBindToParent(LPCITEMIDLIST pidl, REFIID riid, LPVOID *ppv, LPCITEMIDLIST *ppidlLast)
 {
-    IShellFolder    * psfDesktop;
-    HRESULT         hr=E_FAIL;
-
-    TRACE_(shell)("pidl=%p\n", pidl);
-    pdump(pidl);
-    
-    if (!pidl || !ppv)
-        return E_INVALIDARG;
-    
-    *ppv = NULL;
-    if (ppidlLast)
-        *ppidlLast = NULL;
-
-    hr = SHGetDesktopFolder(&psfDesktop);
-    if (FAILED(hr))
-        return hr;
-
-    if (_ILIsPidlSimple(pidl))
-    {
-        /* we are on desktop level */
-        hr = IShellFolder_QueryInterface(psfDesktop, riid, ppv);
-    }
-    else
-    {
-        LPITEMIDLIST pidlParent = ILClone(pidl);
-        ILRemoveLastID(pidlParent);
-        hr = IShellFolder_BindToObject(psfDesktop, pidlParent, NULL, riid, ppv);
-        SHFree (pidlParent);
-    }
-
-    IShellFolder_Release(psfDesktop);
-
-    if (SUCCEEDED(hr) && ppidlLast)
-        *ppidlLast = ILFindLastID(pidl);
-
-    TRACE_(shell)("-- psf=%p pidl=%p ret=0x%08lx\n", *ppv, (ppidlLast)?*ppidlLast:NULL, hr);
-    return hr;
+    return SHBindToFolderIDListParent(NULL, pidl, riid, ppv, ppidlLast);
 }

HRESULT WINAPI SHBindToObject(IShellFolder *psf, LPCITEMIDLIST pidl, IBindCtx *pbc, REFIID riid, void **ppv)
diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c
index 306909cc6a0..c9e79aa9b36 100644
--- a/dlls/shell32/tests/shlfolder.c
+++ b/dlls/shell32/tests/shlfolder.c
@@ -779,7 +779,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);