Merge ebdf3a3 into 7566280

Author: ge0rdi

Src/Lib/Settings.cpp

@@ -1670,7 +1670,7 @@ LRESULT CSettingsDlg::OnBackup( WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL&
 		ofn.lpstrTitle=title;
 		ofn.lpstrDefExt=L".xml";
 		ofn.Flags=OFN_DONTADDTORECENT|OFN_ENABLESIZING|OFN_EXPLORER|OFN_PATHMUSTEXIST|OFN_OVERWRITEPROMPT|OFN_HIDEREADONLY|OFN_NOCHANGEDIR;
-		if (GetSaveFileName(&ofn))
+		if (GetSaveFileNameSafe(&ofn))
 		{
 			CString err=g_SettingsManager.SaveSettingsXml(path);
 			if (!err.IsEmpty())
@@ -1699,7 +1699,7 @@ LRESULT CSettingsDlg::OnBackup( WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL&
 		CString title=LoadStringEx(IDS_XML_TITLE_LOAD);
 		ofn.lpstrTitle=title;
 		ofn.Flags=OFN_DONTADDTORECENT|OFN_ENABLESIZING|OFN_EXPLORER|OFN_FILEMUSTEXIST|OFN_HIDEREADONLY|OFN_NOCHANGEDIR;
-		if (GetOpenFileName(&ofn))
+		if (GetOpenFileNameSafe(&ofn))
 		{
 			SetCurTab(m_Index,true); // reload tab once to force-close any active edit boxes
 			CString error=g_SettingsManager.LoadSettingsXml(path);

Src/Lib/SettingsUIHelper.cpp

@@ -15,6 +15,7 @@
 #include <uxtheme.h>
 #include <map>
 #include <algorithm>
+#include <thread>
 
 const KNOWNFOLDERID FOLDERID_DesktopRoot={'DESK', 'TO', 'P', {'D', 'E', 'S', 'K', 'T', 'O', 'P', 0x00}};
 
@@ -1193,7 +1194,7 @@ bool BrowseCommandHelper( HWND parent, wchar_t *text )
 	ofn.lpstrFile=text;
 	ofn.nMaxFile=_MAX_PATH;
 	ofn.Flags=OFN_DONTADDTORECENT|OFN_ENABLESIZING|OFN_EXPLORER|OFN_FILEMUSTEXIST|OFN_HIDEREADONLY|OFN_NOCHANGEDIR|OFN_NODEREFERENCELINKS;
-	if (GetOpenFileName(&ofn))
+	if (GetOpenFileNameSafe(&ofn))
 	{
 		wchar_t buf[_MAX_PATH];
 		UnExpandEnvStrings(text,buf,_countof(buf));
@@ -2011,7 +2012,7 @@ LRESULT CBrowseForIconDlg::OnBrowse( WORD wNotifyCode, WORD wID, HWND hWndCtl, B
 	CString title=LoadStringEx(IDS_ICON_TITLE);
 	ofn.lpstrTitle=title;
 	ofn.Flags=OFN_DONTADDTORECENT|OFN_ENABLESIZING|OFN_EXPLORER|OFN_FILEMUSTEXIST|OFN_HIDEREADONLY|OFN_NOCHANGEDIR;
-	if (GetOpenFileName(&ofn))
+	if (GetOpenFileNameSafe(&ofn))
 	{
 		wchar_t buf[_MAX_PATH];
 		UnExpandEnvStrings(path,buf,_countof(buf));
@@ -2210,7 +2211,7 @@ bool BrowseForBitmap( HWND hWndParent, wchar_t *path, bool bAllowJpeg )
 	CString title=LoadStringEx(IDS_BMP_TITLE);
 	ofn.lpstrTitle=title;
 	ofn.Flags=OFN_DONTADDTORECENT|OFN_ENABLESIZING|OFN_EXPLORER|OFN_FILEMUSTEXIST|OFN_HIDEREADONLY|OFN_NOCHANGEDIR;
-	if (GetOpenFileName(&ofn))
+	if (GetOpenFileNameSafe(&ofn))
 	{
 		wchar_t buf[_MAX_PATH];
 		UnExpandEnvStrings(path,buf,_countof(buf));
@@ -2242,7 +2243,7 @@ bool BrowseForSound( HWND hWndParent, wchar_t *path )
 	CString title=LoadStringEx(IDS_WAV_TITLE);
 	ofn.lpstrTitle=title;
 	ofn.Flags=OFN_DONTADDTORECENT|OFN_ENABLESIZING|OFN_EXPLORER|OFN_FILEMUSTEXIST|OFN_HIDEREADONLY|OFN_NOCHANGEDIR;
-	if (GetOpenFileName(&ofn))
+	if (GetOpenFileNameSafe(&ofn))
 	{
 		wchar_t buf[_MAX_PATH];
 		UnExpandEnvStrings(path,buf,_countof(buf));
@@ -3630,3 +3631,49 @@ DWORD ParseColor(const wchar_t* str)
 	wchar_t* end;
 	return wcstoul(str, &end, 16) & 0xFFFFFF;
 }
+
+// Run GetOpenFileName/GetSaveFileName on a separate STA thread and pump messages on the caller
+template <typename auto Fnc>
+static BOOL GetFileNameSafe(OPENFILENAME* pOfn)
+{
+	BOOL result = FALSE;
+
+	std::thread worker([&pOfn, &result]() mutable {
+		CoInitializeEx(NULL, COINIT_APARTMENTTHREADED);
+		result = Fnc(pOfn);
+		CoUninitialize();
+		});
+
+	// Pump messages while waiting for the worker (dialog) to finish
+	while (true)
+	{
+		HANDLE hWorker = worker.native_handle();
+		if (MsgWaitForMultipleObjects(1, &hWorker, FALSE, INFINITE, QS_ALLINPUT) == WAIT_OBJECT_0)
+			break;
+
+		MSG msg;
+		while (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE))
+		{
+			if (msg.message == WM_QUIT)
+			{
+				PostQuitMessage((int)msg.wParam);
+				break;
+			}
+			TranslateMessage(&msg);
+			DispatchMessage(&msg);
+		}
+	}
+	worker.join();
+
+	return result;
+}
+
+BOOL GetOpenFileNameSafe(OPENFILENAME* pOfn)
+{
+	return GetFileNameSafe<GetOpenFileNameW>(pOfn);
+}
+
+BOOL GetSaveFileNameSafe(OPENFILENAME* pOfn)
+{
+	return GetFileNameSafe<GetSaveFileNameW>(pOfn);
+}

Src/Lib/SettingsUIHelper.h

@@ -395,3 +395,7 @@ DWORD BgrToRgb(DWORD val);
 
 // parse color from hexadecimal string
 DWORD ParseColor(const wchar_t* str);
+
+// safe versions of GetOpenFileName/GetSaveFileName (run API on a separate STA thread and pump messages on the caller)
+BOOL GetOpenFileNameSafe(OPENFILENAME* pOfn);
+BOOL GetSaveFileNameSafe(OPENFILENAME* pOfn);