shell32: Make sure BrowseForFolder doesn't return NULL for the Desktop folder as…

shell32: Make sure BrowseForFolder doesn't return NULL for the Desktop folder as this means a cancel.

shell32: Make sure BrowseForFolder doesn't return NULL for the Desktop folder as…
474bf4fc · Mikołaj Zalewski · Alexandre Julliard · fa97fbdc · 474bf4fc
Commit 474bf4fc authored Feb 09, 2007 by Mikołaj Zalewski Committed by Alexandre Julliard Feb 12, 2007
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

brsfolder.c dlls/shell32/brsfolder.c +4 -1

No files found.
--- a/dlls/shell32/brsfolder.c
+++ b/dlls/shell32/brsfolder.c
@@ -524,7 +524,10 @@ static BOOL BrsFolder_OnCommand( browse_info *info, UINT id )
    switch (id)
    {
    case IDOK:
-        info->pidlRet = ILClone(info->pidlRet); /* The original pidl will be free'd. */
+        /* The original pidl is owned by the treeview and will be free'd. */
+        info->pidlRet = ILClone(info->pidlRet);
+        if (info->pidlRet == NULL) /* A null pidl would mean a cancel */
+            info->pidlRet = _ILCreateDesktop();
        pdump( info->pidlRet );
        if (lpBrowseInfo->pszDisplayName)
            SHGetPathFromIDListW( info->pidlRet, lpBrowseInfo->pszDisplayName );