7 files changed, 275 insertions, 201 deletions
diff --git a/src/Common/Dlgcode.c b/src/Common/Dlgcode.c
index c9c9752a..2c9b3599 100644
--- a/src/Common/Dlgcode.c
+++ b/src/Common/Dlgcode.c
@@ -4964,144 +4964,139 @@ void ResetCurrentDirectory ()
 }
 
 
-BOOL BrowseFiles (HWND hwndDlg, char *stringId, wchar_t *lpszFileName, BOOL keepHistory, BOOL saveMode, wchar_t *browseFilter)
+BOOL BrowseFiles (HWND hwndDlg, char *stringId, wchar_t *lpszFileName, BOOL keepHistory, BOOL saveMode)
 {
-	return BrowseFilesInDir (hwndDlg, stringId, NULL, lpszFileName, keepHistory, saveMode, browseFilter);
+	return BrowseFilesInDir (hwndDlg, stringId, NULL, lpszFileName, keepHistory, saveMode, NULL);
 }
 
-
-BOOL BrowseFilesInDir (HWND hwndDlg, char *stringId, wchar_t *initialDir, wchar_t *lpszFileName, BOOL keepHistory, BOOL saveMode, wchar_t *browseFilter, const wchar_t *initialFileName, const wchar_t *defaultExtension)
+BOOL BrowseFilesInDir(HWND hwndDlg, char *stringId, wchar_t *initialDir, wchar_t *lpszFileName, BOOL keepHistory, BOOL saveMode, wchar_t *browseFilter, const wchar_t *initialFileName, const wchar_t *defaultExtension)
 {
-	OPENFILENAMEW ofn;
-	wchar_t file[TC_MAX_PATH] = { 0 };
+	IFileDialog *pfd = NULL;
+	HRESULT hr;
 	wchar_t filter[1024];
 	BOOL status = FALSE;
 
-	CoInitialize (NULL);
-
-	ZeroMemory (&ofn, sizeof (ofn));
-	*lpszFileName = 0;
-
-	if (initialDir)
+	hr = CoInitializeEx(NULL, COINIT_APARTMENTTHREADED | COINIT_DISABLE_OLE1DDE);
+	if (FAILED(hr))
 	{
-		ofn.lpstrInitialDir			= initialDir;
+		return FALSE;
 	}
 
-	if (initialFileName)
-		StringCchCopyW (file, array_capacity (file), initialFileName);
-
-	ofn.lStructSize				= sizeof (ofn);
-	ofn.hwndOwner				= hwndDlg;
-
-	StringCbPrintfW (filter, sizeof(filter), L"%ls (*.*)%c*.*%c%ls (*.hc)%c*.hc%c%c",
-		GetString ("ALL_FILES"), 0, 0, GetString ("TC_VOLUMES"), 0, 0, 0);
-	ofn.lpstrFilter				= browseFilter ? browseFilter : filter;
-	ofn.nFilterIndex			= 1;
-	ofn.lpstrFile				= file;
-	ofn.nMaxFile				= sizeof (file) / sizeof (file[0]);
-	ofn.lpstrTitle				= GetString (stringId);
-	ofn.lpstrDefExt				= defaultExtension;
-	ofn.Flags					= OFN_HIDEREADONLY
-		| OFN_PATHMUSTEXIST
-		| (keepHistory ? 0 : OFN_DONTADDTORECENT)
-		| (saveMode ? OFN_OVERWRITEPROMPT : 0);
-
-	if (!keepHistory)
-		CleanLastVisitedMRU ();
-
-	SystemFileSelectorCallerThreadId = GetCurrentThreadId();
-	SystemFileSelectorCallPending = TRUE;
-
-	if (!saveMode)
+	// Choose between the File Open or File Save dialog depending on the saveMode.
+	if (saveMode)
 	{
-		if (!GetOpenFileNameW (&ofn))
-			goto ret;
+		hr = CoCreateInstance(CLSID_FileSaveDialog, NULL, CLSCTX_INPROC_SERVER, IID_PPV_ARGS(&pfd));
 	}
 	else
 	{
-		if (!GetSaveFileNameW (&ofn))
-			goto ret;
+		hr = CoCreateInstance(CLSID_FileOpenDialog, NULL, CLSCTX_INPROC_SERVER, IID_PPV_ARGS(&pfd));
 	}
 
-	SystemFileSelectorCallPending = FALSE;
+	if (SUCCEEDED(hr))
+	{
+		// Set the options for the dialog.
+		DWORD dwFlags;
+		hr = pfd->GetOptions(&dwFlags);
+		if (SUCCEEDED(hr))
+		{
+			dwFlags |= FOS_NOCHANGEDIR | FOS_FILEMUSTEXIST | FOS_PATHMUSTEXIST | FOS_FORCEFILESYSTEM | FOS_NOVALIDATE;
+			if (!keepHistory)
+				dwFlags |= FOS_DONTADDTORECENT;
+			if (saveMode)
+				dwFlags |= FOS_NOTESTFILECREATE | FOS_OVERWRITEPROMPT | FOS_DEFAULTNOMINIMODE;
+			hr = pfd->SetOptions(dwFlags);
+		}
 
-	StringCchCopyW (lpszFileName, MAX_PATH, file);
+		// Set the initial directory, if provided.
+		if (initialDir)
+		{
+			IShellItem *psi;
+			hr = SHCreateItemFromParsingName(initialDir, NULL, IID_PPV_ARGS(&psi));
+			if (SUCCEEDED(hr))
+			{
+				pfd->SetFolder(psi);
+				psi->Release();
+			}
+		}
 
-	if (!keepHistory)
-		CleanLastVisitedMRU ();
+		// Set the initial file name, if provided.
+		if (initialFileName)
+		{
+			pfd->SetFileName(initialFileName);
+		}
 
-	status = TRUE;
+		// Set the title.
+		pfd->SetTitle(GetString(stringId));
 
-ret:
-	SystemFileSelectorCallPending = FALSE;
-	ResetCurrentDirectory();
-	CoUninitialize();
+		// Set the default extension.
+		if (defaultExtension)
+		{
+			pfd->SetDefaultExtension(defaultExtension);
+		}
 
-	return status;
-}
+		// Prepare the filter
+		COMDLG_FILTERSPEC filterSpec[5];
+		UINT cfilterSpec = 0;
 
+		if (!browseFilter)
+		{
+			StringCbPrintfW(filter, sizeof(filter), L"%ls (*.*)%c*.*%c%ls (*.hc)%c*.hc%c%c",
+							GetString("ALL_FILES"), 0, 0, GetString("TC_VOLUMES"), 0, 0, 0);
+			browseFilter = filter;
+		}
 
-static wchar_t SelectMultipleFilesPath[131072];
-static int SelectMultipleFilesOffset;
+		// Assume browseFilter is a formatted wide string like L"Text Files (*.txt)\0*.txt\0"
+		// loop over all the filters in the string and add them to filterSpec array
+		while (*browseFilter)
+		{
+			filterSpec[cfilterSpec].pszName = browseFilter;
+			browseFilter += wcslen(browseFilter) + 1;
+			filterSpec[cfilterSpec].pszSpec = browseFilter;
+			browseFilter += wcslen(browseFilter) + 1;
+			cfilterSpec++;
 
-BOOL SelectMultipleFiles (HWND hwndDlg, const char *stringId, wchar_t *lpszFileName, size_t cbFileName,BOOL keepHistory)
-{
-	OPENFILENAMEW ofn;
-	wchar_t filter[1024];
-	BOOL status = FALSE;
+			if (cfilterSpec >= ARRAYSIZE(filterSpec))
+				break;
+		}
 
-	CoInitialize (NULL);
+		// Set the file types filter.
+		hr = pfd->SetFileTypes(cfilterSpec, filterSpec);
+		hr = pfd->SetFileTypeIndex(1);
 
-	ZeroMemory (&ofn, sizeof (ofn));
-
-	SelectMultipleFilesPath[0] = 0;
-	*lpszFileName = 0;
-	ofn.lStructSize				= sizeof (ofn);
-	ofn.hwndOwner				= hwndDlg;
-	StringCbPrintfW (filter, sizeof(filter), L"%ls (*.*)%c*.*%c%ls (*.hc)%c*.hc%c%c",
-		GetString ("ALL_FILES"), 0, 0, GetString ("TC_VOLUMES"), 0, 0, 0);
-	ofn.lpstrFilter				= filter;
-	ofn.nFilterIndex			= 1;
-	ofn.lpstrFile				= SelectMultipleFilesPath;
-	ofn.nMaxFile				= 0xffff * 2; // The size must not exceed 0xffff*2 due to a bug in Windows 2000 and XP SP1
-	ofn.lpstrTitle				= GetString (stringId);
-	ofn.Flags					= OFN_HIDEREADONLY
-		| OFN_EXPLORER
-		| OFN_PATHMUSTEXIST
-		| OFN_ALLOWMULTISELECT
-		| (keepHistory ? 0 : OFN_DONTADDTORECENT);
-	
-	if (!keepHistory)
-		CleanLastVisitedMRU ();
+		if (!keepHistory)
+			CleanLastVisitedMRU();
 
-	SystemFileSelectorCallerThreadId = GetCurrentThreadId();
-	SystemFileSelectorCallPending = TRUE;
+		SystemFileSelectorCallerThreadId = GetCurrentThreadId();
+		SystemFileSelectorCallPending = TRUE;
 
-	if (!GetOpenFileNameW (&ofn))
-		goto ret;
+		// Show the dialog.
+		hr = pfd->Show(hwndDlg);
 
-	SystemFileSelectorCallPending = FALSE;
+		// Obtain the result if the user clicked the "OK" button.
+		if (SUCCEEDED(hr))
+		{
+			IShellItem *pItem;
+			hr = pfd->GetResult(&pItem);
+			if (SUCCEEDED(hr))
+			{
+				PWSTR pszFilePath;
+				hr = pItem->GetDisplayName(SIGDN_FILESYSPATH, &pszFilePath);
+				if (SUCCEEDED(hr))
+				{
+					StringCchCopyW(lpszFileName, MAX_PATH, pszFilePath);
+					CoTaskMemFree(pszFilePath);
+					status = TRUE;
+				}
+				pItem->Release();
+			}
+		}
 
-	if (SelectMultipleFilesPath[ofn.nFileOffset - 1] != 0)
-	{
-		// Single file selected
-		StringCbCopyW (lpszFileName, cbFileName, SelectMultipleFilesPath);
-		SelectMultipleFilesOffset = 0;
-		SecureZeroMemory (SelectMultipleFilesPath, sizeof (SelectMultipleFilesPath));
-	}
-	else
-	{
-		// Multiple files selected
-		SelectMultipleFilesOffset = ofn.nFileOffset;
-		SelectMultipleFilesNext (lpszFileName, cbFileName);
-	}
+		pfd->Release();
 
-	if (!keepHistory)
-		CleanLastVisitedMRU ();
+		if (!keepHistory)
+			CleanLastVisitedMRU();
+	}
 
-	status = TRUE;
-	
-ret:
 	SystemFileSelectorCallPending = FALSE;
 	ResetCurrentDirectory();
 	CoUninitialize();
@@ -5109,101 +5104,173 @@ ret:
 	return status;
 }
 
-
-BOOL SelectMultipleFilesNext (wchar_t *lpszFileName, size_t cbFileName)
+BOOL SelectMultipleFiles(HWND hwndDlg, const char *stringId, BOOL keepHistory, std::vector<std::wstring> &filesList)
 {
-	if (SelectMultipleFilesOffset == 0)
+	IFileOpenDialog *pfd = NULL;
+	HRESULT hr;
+	BOOL status = FALSE;
+
+	filesList.clear();
+
+	hr = CoInitializeEx(NULL, COINIT_APARTMENTTHREADED | COINIT_DISABLE_OLE1DDE);
+	if (FAILED(hr))
+	{
 		return FALSE;
+	}
 
-	StringCbCopyW (lpszFileName, cbFileName,SelectMultipleFilesPath);
-	lpszFileName[TC_MAX_PATH - 1] = 0;
+	// Create the File Open Dialog object.
+	hr = CoCreateInstance(CLSID_FileOpenDialog, NULL, CLSCTX_INPROC_SERVER, IID_PPV_ARGS(&pfd));
+	if (SUCCEEDED(hr))
+	{
+		DWORD dwFlags;
+		hr = pfd->GetOptions(&dwFlags);
+		if (SUCCEEDED(hr))
+		{
+			dwFlags |= FOS_ALLOWMULTISELECT | FOS_NOCHANGEDIR | FOS_FILEMUSTEXIST | FOS_PATHMUSTEXIST | FOS_FORCEFILESYSTEM | FOS_NOVALIDATE;
+			if (!keepHistory)
+				dwFlags |= FOS_DONTADDTORECENT;
 
-	if (lpszFileName[wcslen (lpszFileName) - 1] != L'\\')
-		StringCbCatW (lpszFileName, cbFileName,L"\\");
+			hr = pfd->SetOptions(dwFlags);
+		}
 
-	StringCbCatW (lpszFileName, cbFileName,SelectMultipleFilesPath + SelectMultipleFilesOffset);
+		// Set the title and filter
+		pfd->SetTitle(GetString(stringId));
 
-	SelectMultipleFilesOffset += (int) wcslen (SelectMultipleFilesPath + SelectMultipleFilesOffset) + 1;
-	if (SelectMultipleFilesPath[SelectMultipleFilesOffset] == 0)
-	{
-		SelectMultipleFilesOffset = 0;
-		SecureZeroMemory (SelectMultipleFilesPath, sizeof (SelectMultipleFilesPath));
-	}
+		wchar_t allFilesfilter[512];
+		wchar_t volumesfilter[512];
 
-	return TRUE;
-}
+		StringCbPrintfW(allFilesfilter, sizeof(allFilesfilter), L"%ls (*.*)", GetString("ALL_FILES"));
+		StringCbPrintfW(volumesfilter, sizeof(volumesfilter), L"%ls (*.hc)", GetString("TC_VOLUMES"));
 
+		COMDLG_FILTERSPEC rgSpec[] =
+			{
+				{allFilesfilter, L"*.*"},
+				{volumesfilter, L"*.hc"}};
+		hr = pfd->SetFileTypes(ARRAYSIZE(rgSpec), rgSpec);
 
-static int CALLBACK BrowseCallbackProc(HWND hwnd,UINT uMsg,LPARAM lp, LPARAM pData) 
-{
-	switch(uMsg) {
-	case BFFM_INITIALIZED: 
-	{
-	  /* WParam is TRUE since we are passing a path.
-	   It would be FALSE if we were passing a pidl. */
-	   SendMessageW (hwnd,BFFM_SETSELECTION,TRUE,(LPARAM)pData);
-	   break;
-	}
+		if (!keepHistory)
+			CleanLastVisitedMRU();
 
-	case BFFM_SELCHANGED: 
-	{
-		wchar_t szDir[TC_MAX_PATH];
+		// Show the dialog
+		hr = pfd->Show(hwndDlg);
+		if (SUCCEEDED(hr))
+		{
+			IShellItemArray *psiaResults;
+			hr = pfd->GetResults(&psiaResults);
+			if (SUCCEEDED(hr))
+			{
+				DWORD count;
+				hr = psiaResults->GetCount(&count);
+				if (SUCCEEDED(hr))
+				{
+					for (DWORD i = 0; i < count; ++i)
+					{
+						IShellItem *psi;
+						hr = psiaResults->GetItemAt(i, &psi);
+						if (SUCCEEDED(hr))
+						{
+							PWSTR pszFilePath;
+							hr = psi->GetDisplayName(SIGDN_FILESYSPATH, &pszFilePath);
+							if (SUCCEEDED(hr))
+							{
+								filesList.push_back(pszFilePath);
+								CoTaskMemFree(pszFilePath);
+							}
+							psi->Release();
+						}
+					}
 
-	   /* Set the status window to the currently selected path. */
-	   if (SHGetPathFromIDList((LPITEMIDLIST) lp ,szDir)) 
-	   {
-		  SendMessage (hwnd,BFFM_SETSTATUSTEXT,0,(LPARAM)szDir);
-	   }
-	   break;
-	}
+					status = TRUE;
+				}
+				psiaResults->Release();
+			}
+		}
 
-	default:
-	   break;
+		if (!keepHistory)
+			CleanLastVisitedMRU();
+
+		pfd->Release();
 	}
 
-	return 0;
+	CoUninitialize();
+	return status;
 }
 
-
-BOOL BrowseDirectories (HWND hwndDlg, char *lpszTitle, wchar_t *dirName)
+BOOL BrowseDirectories(HWND hwndDlg, char *lpszTitle, wchar_t *dirName, const wchar_t *initialDir)
 {
-	BROWSEINFOW bi;
-	LPITEMIDLIST pidl;
-	LPMALLOC pMalloc;
-	BOOL bOK  = FALSE;
+	IFileDialog *pfd = NULL;
+	HRESULT hr;
+	BOOL bOK = FALSE;
 
-	CoInitialize (NULL);
+	hr = CoInitializeEx(NULL, COINIT_APARTMENTTHREADED | COINIT_DISABLE_OLE1DDE);
+	if (FAILED(hr))
+	{
+		return FALSE;
+	}
 
-	if (SUCCEEDED (SHGetMalloc (&pMalloc))) 
+	hr = CoCreateInstance(CLSID_FileOpenDialog, NULL, CLSCTX_INPROC_SERVER, IID_PPV_ARGS(&pfd));
+	if (SUCCEEDED(hr))
 	{
-		ZeroMemory (&bi, sizeof(bi));
-		bi.hwndOwner = hwndDlg;
-		bi.pszDisplayName = 0;
-		bi.lpszTitle = GetString (lpszTitle);
-		bi.pidlRoot = 0;
-		bi.ulFlags = BIF_RETURNONLYFSDIRS | BIF_STATUSTEXT;
-		bi.lpfn = BrowseCallbackProc;
-		bi.lParam = (LPARAM)dirName;
+		// Set the options on the dialog.
+		DWORD dwFlags;
+		hr = pfd->GetOptions(&dwFlags);
+		if (SUCCEEDED(hr))
+		{
+			dwFlags |= FOS_PICKFOLDERS | FOS_FORCEFILESYSTEM | FOS_NOCHANGEDIR; // Important to enable folder-picking mode
+			hr = pfd->SetOptions(dwFlags);
+		}
+
+		// Set the title.
+		if (lpszTitle)
+		{
+			pfd->SetTitle(GetString(lpszTitle));
+		}
 
-		pidl = SHBrowseForFolderW (&bi);
-		if (pidl != NULL) 
+		IShellItem *psi;
+		if (initialDir)
 		{
-			if (SHGetPathFromIDList(pidl, dirName)) 
+			// Set the initial directory, if provided.
+			hr = SHCreateItemFromParsingName(initialDir, NULL, IID_PPV_ARGS(&psi));
+		}
+		else
+		{
+			// set folder to "This PC" shel item
+			hr = SHCreateItemInKnownFolder(FOLDERID_ComputerFolder, 0, NULL, IID_PPV_ARGS(&psi));
+		}
+		if (SUCCEEDED(hr))
+		{
+			pfd->SetFolder(psi);
+			psi->Release();
+		}
+
+		// Show the dialog.
+		hr = pfd->Show(hwndDlg);
+		if (SUCCEEDED(hr))
+		{
+			// Obtain the result when the user clicks the "OK" button.
+			// The result is an IShellItem object.
+			IShellItem *pItem;
+			hr = pfd->GetResult(&pItem);
+			if (SUCCEEDED(hr))
 			{
-				bOK = TRUE;
+				PWSTR pszFolderPath;
+				hr = pItem->GetDisplayName(SIGDN_FILESYSPATH, &pszFolderPath);
+				if (SUCCEEDED(hr))
+				{
+					StringCchCopyW(dirName, MAX_PATH, pszFolderPath);
+					CoTaskMemFree(pszFolderPath);
+					bOK = TRUE;
+				}
+				pItem->Release();
 			}
-
-			pMalloc->Free (pidl);
-			pMalloc->Release();
 		}
+		pfd->Release();
 	}
 
 	CoUninitialize();
-
 	return bOK;
 }
 
-
 std::wstring GetWrongPasswordErrorMessage (HWND hwndDlg)
 {
 	WCHAR szTmp[8192];
@@ -6891,7 +6958,7 @@ BOOL CALLBACK KeyfileGeneratorDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LP
 			fileExtensionPtr = wcsrchr(szFileBaseName, L'.');
 
 			/* Select directory */
-			if (!BrowseDirectories (hwndDlg, "SELECT_KEYFILE_GENERATION_DIRECTORY", szDirName))
+			if (!BrowseDirectories (hwndDlg, "SELECT_KEYFILE_GENERATION_DIRECTORY", szDirName, NULL))
 				return 1;
 
 			if (szDirName[wcslen(szDirName) - 1] != L'\\' && szDirName[wcslen(szDirName) - 1] != L'/')
@@ -11899,7 +11966,7 @@ BOOL CALLBACK SecurityTokenKeyfileDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam
 				{
 					wchar_t keyfilePath[TC_MAX_PATH];
 
-					if (BrowseFiles (hwndDlg, "SELECT_KEYFILE", keyfilePath, bHistory, FALSE, NULL))
+					if (BrowseFiles (hwndDlg, "SELECT_KEYFILE", keyfilePath, bHistory, FALSE))
 					{
 						DWORD keyfileSize;
 						byte *keyfileData = (byte *) LoadFile (keyfilePath, &keyfileSize);
@@ -11962,7 +12029,7 @@ BOOL CALLBACK SecurityTokenKeyfileDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam
 						{
 							wchar_t keyfilePath[TC_MAX_PATH];
 
-							if (!BrowseFiles (hwndDlg, "OPEN_TITLE", keyfilePath, bHistory, TRUE, NULL))
+							if (!BrowseFiles (hwndDlg, "OPEN_TITLE", keyfilePath, bHistory, TRUE))
 								break;
 
 							{
diff --git a/src/Common/Dlgcode.h b/src/Common/Dlgcode.h
index 904dd888..12957232 100644
--- a/src/Common/Dlgcode.h
+++ b/src/Common/Dlgcode.h
@@ -376,8 +376,8 @@ int DriverAttach ( void );
 BOOL CALLBACK CipherTestDialogProc ( HWND hwndDlg , UINT uMsg , WPARAM wParam , LPARAM lParam );
 void ResetCipherTest ( HWND hwndDlg , int idTestCipher );
 void ResetCurrentDirectory ();
-BOOL BrowseFiles (HWND hwndDlg, char *stringId, wchar_t *lpszFileName, BOOL keepHistory, BOOL saveMode, wchar_t *browseFilter);
-BOOL BrowseDirectories (HWND hWnd, char *lpszTitle, wchar_t *dirName);
+BOOL BrowseFiles (HWND hwndDlg, char *stringId, wchar_t *lpszFileName, BOOL keepHistory, BOOL saveMode);
+BOOL BrowseDirectories(HWND hwndDlg, char *lpszTitle, wchar_t *dirName, const wchar_t *initialDir);
 void handleError ( HWND hwndDlg , int code, const char* srcPos );
 BOOL CheckFileStreamWriteErrors (HWND hwndDlg, FILE *file, const wchar_t *fileName);
 void LocalizeDialog ( HWND hwnd, char *stringId );
@@ -512,8 +512,6 @@ BOOL CALLBACK FindTCWindowEnum (HWND hwnd, LPARAM lParam);
 BYTE *MapResource (wchar_t *resourceType, int resourceId, PDWORD size);
 void InconsistencyResolved (char *msg);
 void ReportUnexpectedState (const char *techInfo);
-BOOL SelectMultipleFiles (HWND hwndDlg, const char *stringId, wchar_t *lpszFileName, size_t cbFileName, BOOL keepHistory);
-BOOL SelectMultipleFilesNext (wchar_t *lpszFileName, size_t cbFileName);
 void OpenOnlineHelp ();
 BOOL GetPartitionInfo (const wchar_t *deviceName, PPARTITION_INFORMATION rpartInfo);
 BOOL GetDeviceInfo (const wchar_t *deviceName, DISK_PARTITION_INFO_STRUCT *info);
@@ -692,6 +690,7 @@ struct RawDevicesDlgParam
 	wchar_t *pszFileName;
 };
 
+BOOL SelectMultipleFiles (HWND hwndDlg, const char *stringId, BOOL keepHistory, std::vector<std::wstring>& filesList);
 BOOL BrowseFilesInDir (HWND hwndDlg, char *stringId, wchar_t *initialDir, wchar_t *lpszFileName, BOOL keepHistory, BOOL saveMode, wchar_t *browseFilter, const wchar_t *initialFileName = NULL, const wchar_t *defaultExtension = NULL);
 std::wstring SingleStringToWide (const std::string &singleString);
 std::wstring Utf8StringToWide (const std::string &utf8String);
diff --git a/src/Common/Keyfiles.c b/src/Common/Keyfiles.c
index 058fa975..be32b98d 100644
--- a/src/Common/Keyfiles.c
+++ b/src/Common/Keyfiles.c
@@ -494,11 +494,15 @@ BOOL CALLBACK KeyFilesDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPa
 			KeyFile *kf = (KeyFile *) malloc (sizeof (KeyFile));
 			if (kf)
 			{
-				if (SelectMultipleFiles (hwndDlg, "SELECT_KEYFILE", kf->FileName, sizeof(kf->FileName),bHistory))
+				std::vector<std::wstring> filesList;
+				if (SelectMultipleFiles (hwndDlg, "SELECT_KEYFILE", bHistory, filesList))
 				{
 					bool containerFileSkipped = false;
-					do
+					for	(std::vector<std::wstring>::const_iterator it = filesList.begin();
+							it != filesList.end();
+							++it)
 					{
+						StringCbCopyW (kf->FileName, sizeof (kf->FileName), it->c_str());
 						CorrectFileName (kf->FileName);
 						if (_wcsicmp (param->VolumeFileName, kf->FileName) == 0)
 							containerFileSkipped = true;
@@ -508,13 +512,13 @@ BOOL CALLBACK KeyFilesDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPa
 							LoadKeyList (hwndDlg, param->FirstKeyFile);
 
 							kf = (KeyFile *) malloc (sizeof (KeyFile));
-                            if (!kf)
-                            {
-                                Warning ("ERR_MEM_ALLOC", hwndDlg);
-                                break;
-                            }
+							if (!kf)
+							{
+								Warning ("ERR_MEM_ALLOC", hwndDlg);
+								break;
+							}
 						}
-					} while (SelectMultipleFilesNext (kf->FileName, sizeof(kf->FileName)));
+					}
 
 					if (containerFileSkipped)
 					{
@@ -533,7 +537,7 @@ BOOL CALLBACK KeyFilesDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPa
 			KeyFile *kf = (KeyFile *) malloc (sizeof (KeyFile));
             if (kf)
             {
-			    if (BrowseDirectories (hwndDlg,"SELECT_KEYFILE_PATH", kf->FileName))
+			    if (BrowseDirectories (hwndDlg,"SELECT_KEYFILE_PATH", kf->FileName, NULL))
 			    {
 				    param->FirstKeyFile = KeyFileAdd (param->FirstKeyFile, kf);
 				    LoadKeyList (hwndDlg, param->FirstKeyFile);
@@ -711,10 +715,14 @@ BOOL KeyfilesPopupMenu (HWND hwndDlg, POINT popupPosition, KeyFilesDlgParam *par
 			KeyFile *kf = (KeyFile *) malloc (sizeof (KeyFile));
 			if (kf)
 			{
-				if (SelectMultipleFiles (hwndDlg, "SELECT_KEYFILE", kf->FileName, sizeof(kf->FileName),bHistory))
+				std::vector<std::wstring> filesList;
+				if (SelectMultipleFiles (hwndDlg, "SELECT_KEYFILE", bHistory, filesList))
 				{
-					do
+					for	(std::vector<std::wstring>::const_iterator it = filesList.begin();
+							it != filesList.end();
+							++it)
 					{
+						StringCbCopyW (kf->FileName, sizeof (kf->FileName), it->c_str());
 						param->FirstKeyFile = KeyFileAdd (param->FirstKeyFile, kf);
 						kf = (KeyFile *) malloc (sizeof (KeyFile));
                         if (!kf)
@@ -722,7 +730,7 @@ BOOL KeyfilesPopupMenu (HWND hwndDlg, POINT popupPosition, KeyFilesDlgParam *par
                             Warning ("ERR_MEM_ALLOC", hwndDlg);
                             break;
                         }
-					} while (SelectMultipleFilesNext (kf->FileName, sizeof(kf->FileName)));
+					}
 
 					param->EnableKeyFiles = TRUE;
 					status = TRUE;
@@ -739,7 +747,7 @@ BOOL KeyfilesPopupMenu (HWND hwndDlg, POINT popupPosition, KeyFilesDlgParam *par
 			KeyFile *kf = (KeyFile *) malloc (sizeof (KeyFile));
 			if (kf)
 			{
-				if (BrowseDirectories (hwndDlg,"SELECT_KEYFILE_PATH", kf->FileName))
+				if (BrowseDirectories (hwndDlg,"SELECT_KEYFILE_PATH", kf->FileName, NULL))
 				{
 					param->FirstKeyFile = KeyFileAdd (param->FirstKeyFile, kf);
 					param->EnableKeyFiles = TRUE;
diff --git a/src/ExpandVolume/WinMain.cpp b/src/ExpandVolume/WinMain.cpp
index c2387d9e..0dbc41ba 100644
--- a/src/ExpandVolume/WinMain.cpp
+++ b/src/ExpandVolume/WinMain.cpp
@@ -836,7 +836,7 @@ int ExtcvAskVolumePassword (HWND hwndDlg, const wchar_t* fileName, Password *pas
 
 static BOOL SelectContainer (HWND hwndDlg)
 {
-	if (BrowseFiles (hwndDlg, "OPEN_VOL_TITLE", szFileName, bHistory, FALSE, NULL) == FALSE)
+	if (BrowseFiles (hwndDlg, "OPEN_VOL_TITLE", szFileName, bHistory, FALSE) == FALSE)
 		return FALSE;
 
 	AddComboItem (GetDlgItem (hwndDlg, IDC_VOLUME), szFileName, bHistory);
diff --git a/src/Format/Tcformat.c b/src/Format/Tcformat.c
index f8b466af..ce289910 100644
--- a/src/Format/Tcformat.c
+++ b/src/Format/Tcformat.c
@@ -5903,7 +5903,7 @@ BOOL CALLBACK PageDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa
 			{
 				// Select file
 
-				if (BrowseFiles (hwndDlg, "OPEN_TITLE", szFileName, bHistory, !bHiddenVolDirect, NULL) == FALSE)
+				if (BrowseFiles (hwndDlg, "OPEN_TITLE", szFileName, bHistory, !bHiddenVolDirect) == FALSE)
 					return 1;
 
 				AddComboItem (GetDlgItem (hwndDlg, IDC_COMBO_BOX), szFileName, bHistory);
@@ -6094,7 +6094,7 @@ BOOL CALLBACK PageDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa
 			{
 				wchar_t tmpszRescueDiskISO [TC_MAX_PATH+1];
 
-				if (!BrowseFiles (hwndDlg, "OPEN_TITLE", tmpszRescueDiskISO, FALSE, TRUE, NULL))
+				if (!BrowseFiles (hwndDlg, "OPEN_TITLE", tmpszRescueDiskISO, FALSE, TRUE))
 					return 1;
 
 				StringCbCopyW (szRescueDiskISO, sizeof(szRescueDiskISO), tmpszRescueDiskISO);
diff --git a/src/Mount/Mount.c b/src/Mount/Mount.c
index a5ef45de..e41d9a08 100644
--- a/src/Mount/Mount.c
+++ b/src/Mount/Mount.c
@@ -4514,7 +4514,7 @@ BOOL CALLBACK TravelerDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPa
 			wchar_t dstPath[MAX_PATH * 2];
 			GetDlgItemText (hwndDlg, IDC_DIRECTORY, dstPath, ARRAYSIZE (dstPath));
 
-			if (BrowseDirectories (hwndDlg, "SELECT_DEST_DIR", dstPath))
+			if (BrowseDirectories (hwndDlg, "SELECT_DEST_DIR", dstPath, dstPath))
 				SetDlgItemText (hwndDlg, IDC_DIRECTORY, dstPath);
 
 			return 1;
@@ -6567,7 +6567,7 @@ static void ResumeInterruptedNonSysInplaceEncProcess (BOOL bDecrypt)
 
 BOOL SelectContainer (HWND hwndDlg)
 {
-	if (BrowseFiles (hwndDlg, "OPEN_VOL_TITLE", szFileName, bHistory, FALSE, NULL) == FALSE)
+	if (BrowseFiles (hwndDlg, "OPEN_VOL_TITLE", szFileName, bHistory, FALSE) == FALSE)
 		return FALSE;
 
 	AddComboItem (GetDlgItem (hwndDlg, IDC_VOLUME), szFileName, bHistory);
@@ -10957,7 +10957,7 @@ noHidden:
 		goto ret;
 
 	/* Select backup file */
-	if (!BrowseFiles (hwndDlg, "OPEN_TITLE", szFileName, bHistory, TRUE, NULL))
+	if (!BrowseFiles (hwndDlg, "OPEN_TITLE", szFileName, bHistory, TRUE))
 		goto ret;
 
 	/* Conceive the backup file */
@@ -11240,7 +11240,7 @@ int RestoreVolumeHeader (HWND hwndDlg, const wchar_t *lpszVolume)
 		}
 
 		/* Select backup file */
-		if (!BrowseFiles (hwndDlg, "OPEN_TITLE", szFileName, bHistory, FALSE, NULL))
+		if (!BrowseFiles (hwndDlg, "OPEN_TITLE", szFileName, bHistory, FALSE))
 		{
 			nStatus = ERR_SUCCESS;
 			goto ret;
diff --git a/src/Setup/Wizard.c b/src/Setup/Wizard.c
index 7de3ef0c..78616abe 100644
--- a/src/Setup/Wizard.c
+++ b/src/Setup/Wizard.c
@@ -45,8 +45,8 @@ enum wizard_pages
 
 HWND hCurPage = NULL;		/* Handle to current wizard page */
 int nCurPageNo = -1;		/* The current wizard page */
-wchar_t WizardDestInstallPath [TC_MAX_PATH];
-wchar_t WizardDestExtractPath [TC_MAX_PATH];
+wchar_t WizardDestInstallPath [TC_MAX_PATH] = { 0 };
+wchar_t WizardDestExtractPath [TC_MAX_PATH] = { 0 };
 wchar_t SelfFile [TC_MAX_PATH];
 
 HBITMAP hbmWizardBitmapRescaled = NULL;
@@ -646,7 +646,7 @@ BOOL CALLBACK PageDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa
 			switch (lw)
 			{
 			case IDC_BROWSE:
-				if (BrowseDirectories (hwndDlg, "SELECT_DEST_DIR", WizardDestExtractPath))
+				if (BrowseDirectories (hwndDlg, "SELECT_DEST_DIR", WizardDestExtractPath, WizardDestExtractPath))
 				{
 					if (WizardDestExtractPath [wcslen(WizardDestExtractPath)-1] != L'\\')
 					{
@@ -667,7 +667,7 @@ BOOL CALLBACK PageDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa
 			switch (lw)
 			{
 			case IDC_BROWSE:
-				if (BrowseDirectories (hwndDlg, "SELECT_DEST_DIR", WizardDestInstallPath))
+				if (BrowseDirectories (hwndDlg, "SELECT_DEST_DIR", WizardDestInstallPath, WizardDestInstallPath))
 				{
 					if (WizardDestInstallPath [wcslen(WizardDestInstallPath)-1] != L'\\')
 					{