shell32: Fix getting parent shell folder when it's the desktop folder.

BindToObject fails in this case.

shell32: Fix getting parent shell folder when it's the desktop folder.
8657547d · Vincent Povirk · Alexandre Julliard · 642b2fe7 · 8657547d
Commit 8657547d authored Aug 14, 2015 by Vincent Povirk Committed by Alexandre Julliard Aug 17, 2015
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 2 deletions

shellitem.c dlls/shell32/shellitem.c +9 -2

No files found.
--- a/dlls/shell32/shellitem.c
+++ b/dlls/shell32/shellitem.c
@@ -143,8 +143,15 @@ static HRESULT ShellItem_get_parent_shellfolder(ShellItem *This, IShellFolder **
        ret = SHGetDesktopFolder(&desktop);
        if (SUCCEEDED(ret))
        {
-            ret = IShellFolder_BindToObject(desktop, parent_pidl, NULL, &IID_IShellFolder, (void**)ppsf);
-            IShellFolder_Release(desktop);
+            if (_ILIsDesktop(parent_pidl))
+            {
+                *ppsf = desktop;
+            }
+            else
+            {
+                ret = IShellFolder_BindToObject(desktop, parent_pidl, NULL, &IID_IShellFolder, (void**)ppsf);
+                IShellFolder_Release(desktop);
+            }
        }
        ILFree(parent_pidl);
    }