From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Fri, 25 Jan 2019 12:17:07 +0000 (+0100)
Subject: [COMDLG32] Sync with Wine Staging 4.0. CORE-15682
X-Git-Tag: 0.4.13-dev~625
X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=90f41ebb2898e72e5d4c142d7ccfb5cade8af641

[COMDLG32] Sync with Wine Staging 4.0. CORE-15682
---

diff --git a/dll/win32/comdlg32/filedlg.c b/dll/win32/comdlg32/filedlg.c
index 33cbd5e4368..e3d6c284e20 100644
--- a/dll/win32/comdlg32/filedlg.c
+++ b/dll/win32/comdlg32/filedlg.c
@@ -661,7 +661,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))
diff --git a/dll/win32/comdlg32/itemdlg.c b/dll/win32/comdlg32/itemdlg.c
index f306aaf8d89..09f5be5d501 100644
--- a/dll/win32/comdlg32/itemdlg.c
+++ b/dll/win32/comdlg32/itemdlg.c
@@ -426,7 +426,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;
diff --git a/dll/win32/comdlg32/printdlg.c b/dll/win32/comdlg32/printdlg.c
index 429903b84d8..69e9aeb08da 100644
--- a/dll/win32/comdlg32/printdlg.c
+++ b/dll/win32/comdlg32/printdlg.c
@@ -2618,9 +2618,9 @@ static WCHAR get_decimal_sep(void)
 
 static void size2str(const pagesetup_data *data, DWORD size, LPWSTR strout)
 {
-    WCHAR integer_fmt[] = {'%','d',0};
-    WCHAR hundredths_fmt[] = {'%','d','%','c','%','0','2','d',0};
-    WCHAR thousandths_fmt[] = {'%','d','%','c','%','0','3','d',0};
+    static const WCHAR integer_fmt[] = {'%','d',0};
+    static const WCHAR hundredths_fmt[] = {'%','d','%','c','%','0','2','d',0};
+    static const WCHAR thousandths_fmt[] = {'%','d','%','c','%','0','3','d',0};
 
     /* FIXME use LOCALE_SDECIMAL when the edit parsing code can cope */
 
diff --git a/media/doc/README.WINE b/media/doc/README.WINE
index e17ef7cf848..577d4748c23 100644
--- a/media/doc/README.WINE
+++ b/media/doc/README.WINE
@@ -55,7 +55,7 @@ reactos/dll/win32/cabinet             # Synced to WineStaging-3.3
 reactos/dll/win32/clusapi             # Synced to WineStaging-3.3
 reactos/dll/win32/comcat              # Synced to WineStaging-3.3
 reactos/dll/win32/comctl32            # Synced to Wine-3.0
-reactos/dll/win32/comdlg32            # Synced to WineStaging-3.17
+reactos/dll/win32/comdlg32            # Synced to WineStaging-4.0
 reactos/dll/win32/compstui            # Synced to WineStaging-3.3
 reactos/dll/win32/credui              # Synced to WineStaging-3.17
 reactos/dll/win32/crypt32             # Synced to WineStaging-3.17