comdlg32: When FOS_PICKFOLDERS is specified item selection box should contain full path name.

Otherwise when selecting a folder using IFileOpenDialog interface the caller instead of C:\Temp receives C:\Temp\Temp. This matches both an old GetOpenFileName behaviour and what IFileOpenDialog returns under Windows. Signed-off-by: Dmitry Timoshkov <dmitry@baikal.ru> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

comdlg32: When FOS_PICKFOLDERS is specified item selection box should contain full path name.
5a622342 · Dmitry Timoshkov · Alexandre Julliard · d4029a1a · 5a622342 · 5a622342
Commit 5a622342 authored Dec 20, 2018 by Dmitry Timoshkov Committed by Alexandre Julliard Dec 20, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

filedlg.c dlls/comdlg32/filedlg.c +1 -1

itemdlg.c dlls/comdlg32/itemdlg.c +1 -1

No files found.
--- a/dlls/comdlg32/filedlg.c
+++ b/dlls/comdlg32/filedlg.c
@@ -639,7 +639,7 @@ void COMDLG32_GetCanonicalPath(PCIDLIST_ABSOLUTE pidlAbsCurrent,
  }
  PathAddBackslashW(lpstrPathAndFile);
-  TRACE("current directory=%s\n", debugstr_w(lpstrPathAndFile));
+  TRACE("current directory=%s, file=%s\n", debugstr_w(lpstrPathAndFile), debugstr_w(lpstrFile));
  /* if the user specified a fully qualified path use it */
  if(PathIsRelativeW(lpstrFile))

--- a/dlls/comdlg32/itemdlg.c
+++ b/dlls/comdlg32/itemdlg.c
@@ -424,7 +424,7 @@ static void fill_filename_from_selection(FileDialogImpl *This)
                (!(This->options & FOS_PICKFOLDERS) &&  (attr & SFGAO_FOLDER))))
                continue;
-            hr = IShellItem_GetDisplayName(psi, SIGDN_PARENTRELATIVEPARSING, &names[valid_count]);
+            hr = IShellItem_GetDisplayName(psi, (This->options & FOS_PICKFOLDERS) ? SIGDN_FILESYSPATH : SIGDN_PARENTRELATIVEPARSING, &names[valid_count]);
            if(SUCCEEDED(hr))
            {
                len_total += lstrlenW(names[valid_count]) + 3;