Only initialize shell folders via the IPersistFolder3 interface in

SHELL32_CoCreateInitSF if the pidl which specifies the child is of type 'Folder'. Otherwise fall back to IPersistFolder.

Only initialize shell folders via the IPersistFolder3 interface in
47c09063 · Michael Jung · Alexandre Julliard · 68709f1c · 47c09063
Commit 47c09063 authored Jul 20, 2005 by Michael Jung Committed by Alexandre Julliard Jul 20, 2005
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

shlfolder.c dlls/shell32/shlfolder.c +3 -1

No files found.
--- a/dlls/shell32/shlfolder.c
+++ b/dlls/shell32/shlfolder.c
@@ -204,7 +204,9 @@ HRESULT SHELL32_CoCreateInitSF (LPCITEMIDLIST pidlRoot,	LPCSTR pathRoot,
 	IPersistFolder *pPF;
 	IPersistFolder3 *ppf;

-	if (SUCCEEDED (IUnknown_QueryInterface ((IUnknown *) * ppvOut, &IID_IPersistFolder3, (LPVOID *) & ppf))) {
+        if (_ILIsFolder(pidlChild) &&
+            SUCCEEDED (IUnknown_QueryInterface ((IUnknown *) * ppvOut, &IID_IPersistFolder3, (LPVOID *) & ppf))) 
+        {
 	    PERSIST_FOLDER_TARGET_INFO ppfti;
 	    char szDestPath[MAX_PATH];