}
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))
(!(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;
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 */
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