https://git.reactos.org/?p=reactos.git;a=commitdiff;h=90f41ebb2898e72e5d4c142d7ccfb5cade8af641
commit 90f41ebb2898e72e5d4c142d7ccfb5cade8af641 Author: Amine Khaldi <[email protected]> AuthorDate: Fri Jan 25 13:17:07 2019 +0100 Commit: Amine Khaldi <[email protected]> CommitDate: Fri Jan 25 13:17:07 2019 +0100 [COMDLG32] Sync with Wine Staging 4.0. CORE-15682 --- dll/win32/comdlg32/filedlg.c | 2 +- dll/win32/comdlg32/itemdlg.c | 2 +- dll/win32/comdlg32/printdlg.c | 6 +++--- media/doc/README.WINE | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dll/win32/comdlg32/filedlg.c b/dll/win32/comdlg32/filedlg.c index 33cbd5e436..e3d6c284e2 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 f306aaf8d8..09f5be5d50 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 429903b84d..69e9aeb08d 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 e17ef7cf84..577d4748c2 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
