comdlg32: Expand initial directory path for file open dialog.

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

comdlg32: Expand initial directory path for file open dialog.
aef84332 · Nikolay Sivov · Alexandre Julliard · b7cc4409 · aef84332
Commit aef84332 authored Feb 21, 2017 by Nikolay Sivov Committed by Alexandre Julliard Feb 21, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 5 deletions

filedlg.c dlls/comdlg32/filedlg.c +7 -5

No files found.
--- a/dlls/comdlg32/filedlg.c
+++ b/dlls/comdlg32/filedlg.c
@@ -504,15 +504,17 @@ static BOOL GetFileDialog95W(LPOPENFILENAMEW ofn,UINT iDlgType)
  else
    fodInfos.filename = NULL;
+  fodInfos.initdir = NULL;
  if(ofn->lpstrInitialDir)
  {
    /* fodInfos.initdir = strdupW(ofn->lpstrInitialDir); */
-    DWORD len = lstrlenW(ofn->lpstrInitialDir)+1;
+    DWORD len = ExpandEnvironmentStringsW(ofn->lpstrInitialDir, NULL, 0);
-    fodInfos.initdir = MemAlloc(len*sizeof(WCHAR));
+    if (len)
-    memcpy(fodInfos.initdir,ofn->lpstrInitialDir,len*sizeof(WCHAR));
+    {
+      fodInfos.initdir = MemAlloc(len * sizeof(WCHAR));
+      ExpandEnvironmentStringsW(ofn->lpstrInitialDir, fodInfos.initdir, len);
+    }
  }
-  else
-    fodInfos.initdir = NULL;
  /* save current directory */
  if (ofn->Flags & OFN_NOCHANGEDIR)