Merge pull request #19921 from hrydgard/misc-ui

Windows: Set WINVER properly in CommonWindows.h, switch to new folder selector

Common/CommonWindows.h

@@ -1,5 +1,17 @@
 #pragma once
 
+#if defined(_MSC_VER) && _MSC_VER < 1700
+#error You need a newer version of Visual Studio
+#else
+#undef _WIN32_WINNT
+#define _WIN32_WINNT 0x601 // Compile for Win7 on Visual Studio 2012 and above
+#undef WINVER
+#define WINVER 0x601
+#endif
+
+#undef _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES
+#define _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES 1
+
 #ifdef _WIN32
 #pragma warning(disable:4091)
 

UI/GameSettingsScreen.cpp

@@ -1025,7 +1025,7 @@ void GameSettingsScreen::CreateToolsSettings(UI::ViewGroup *tools) {
 
 	tools->Add(new ItemHeader(ms->T("Tools")));
 
-	const bool showRetroAchievements = true; // System_GetPropertyInt(SYSPROP_DEVICE_TYPE) != DEVICE_TYPE_VR;
+	const bool showRetroAchievements = System_GetPropertyInt(SYSPROP_DEVICE_TYPE) != DEVICE_TYPE_VR;
 	if (showRetroAchievements) {
 		auto retro = tools->Add(new Choice(sy->T("RetroAchievements")));
 		retro->OnClick.Add([=](UI::EventParams &) -> UI::EventReturn {

Windows/W32Util/ShellUtil.cpp

@@ -10,15 +10,65 @@
 #include "Common/Data/Format/PNGLoad.h"
 #include "ShellUtil.h"
 
+#include <shobjidl.h>  // For IFileDialog and related interfaces
 #include <shlobj.h>
 #include <commdlg.h>
 #include <cderr.h>
 
 namespace W32Util {
-	std::string BrowseForFolder(HWND parent, std::string_view title, std::string_view initialPath) {
-		std::wstring titleString = ConvertUTF8ToWString(title);
-		return BrowseForFolder(parent, titleString.c_str(), initialPath);
+
+std::string BrowseForFolder2(HWND parent, std::string_view title, std::string_view initialPath) {
+	const std::wstring wtitle = ConvertUTF8ToWString(title);
+	const std::wstring initialDir = ConvertUTF8ToWString(initialPath);
+
+	std::wstring selectedFolder;
+
+	// Create the FileOpenDialog object
+	IFileDialog* pFileDialog = nullptr;
+	HRESULT hr = CoCreateInstance(CLSID_FileOpenDialog, nullptr, CLSCTX_INPROC_SERVER, IID_PPV_ARGS(&pFileDialog));
+	if (!SUCCEEDED(hr)) {
+		return "";
 	}
+	// Set the options to select folders instead of files
+	DWORD dwOptions;
+	hr = pFileDialog->GetOptions(&dwOptions);
+	if (SUCCEEDED(hr)) {
+		hr = pFileDialog->SetOptions(dwOptions | FOS_PICKFOLDERS);
+	} else {
+		return "";
+	}
+
+	// Set the initial directory
+	if (!initialDir.empty()) {
+		IShellItem* pShellItem = nullptr;
+		hr = SHCreateItemFromParsingName(initialDir.c_str(), nullptr, IID_PPV_ARGS(&pShellItem));
+		if (SUCCEEDED(hr)) {
+			hr = pFileDialog->SetFolder(pShellItem);
+			pShellItem->Release();
+		}
+	}
+	pFileDialog->SetTitle(wtitle.c_str());
+
+	// Show the dialog
+	hr = pFileDialog->Show(parent);
+	if (SUCCEEDED(hr)) {
+		// Get the selected folder
+		IShellItem* pShellItem = nullptr;
+		hr = pFileDialog->GetResult(&pShellItem);
+		if (SUCCEEDED(hr)) {
+			PWSTR pszFilePath = nullptr;
+			hr = pShellItem->GetDisplayName(SIGDN_FILESYSPATH, &pszFilePath);
+			if (SUCCEEDED(hr)) {
+				selectedFolder = pszFilePath;
+				CoTaskMemFree(pszFilePath);
+			}
+			pShellItem->Release();
+		}
+	}
+
+	pFileDialog->Release();
+	return ConvertWStringToUTF8(selectedFolder);
+}
 
 	static int CALLBACK BrowseFolderCallback(HWND hwnd, UINT uMsg, LPARAM lParam, LPARAM lpData) {
 		if (uMsg == BFFM_INITIALIZED) {
@@ -72,6 +122,12 @@ namespace W32Util {
 		return result;
 	}
 
+	std::string BrowseForFolder(HWND parent, std::string_view title, std::string_view initialPath) {
+		std::wstring titleString = ConvertUTF8ToWString(title);
+		return BrowseForFolder(parent, titleString.c_str(), initialPath);
+	}
+
+
 	bool BrowseForFileName(bool _bLoad, HWND _hParent, const wchar_t *_pTitle,
 		const wchar_t *_pInitialFolder, const wchar_t *_pFilter, const wchar_t *_pExtension,
 		std::string &_strFileName) {
@@ -333,4 +389,4 @@ bool CreateICOFromPNGData(const uint8_t *imageData, size_t imageDataSize, const
 	return true;
 }
 
-}  // namespace
+}  // namespace W32Util

Windows/W32Util/ShellUtil.h

@@ -7,11 +7,14 @@
 
 class Path;
 
-namespace W32Util
-{
+namespace W32Util {
+
 // Can't make initialPath a string_view, need the null so might as well require it.
 std::string BrowseForFolder(HWND parent, std::string_view title, std::string_view initialPath);
 std::string BrowseForFolder(HWND parent, const wchar_t *title, std::string_view initialPath);
+// Modern dialog
+std::string BrowseForFolder2(HWND parent, std::string_view title, std::string_view initialPath);
+
 bool BrowseForFileName(bool _bLoad, HWND _hParent, const wchar_t*_pTitle,
 	const wchar_t *_pInitialFolder, const wchar_t *_pFilter, const wchar_t*_pExtension,
 	std::string& _strFileName);

Windows/main.cpp

@@ -626,7 +626,7 @@ bool System_MakeRequest(SystemRequestType type, int requestId, const std::string
 	case SystemRequestType::BROWSE_FOR_FOLDER:
 	{
 		std::thread([=] {
-			std::string folder = W32Util::BrowseForFolder(MainWindow::GetHWND(), param1, param2);
+			std::string folder = W32Util::BrowseForFolder2(MainWindow::GetHWND(), param1, param2);
 			if (folder.size()) {
 				g_requestManager.PostSystemSuccess(requestId, folder.c_str());
 			} else {
@@ -843,7 +843,11 @@ static void InitMemstickDirectory() {
 }
 
 static void WinMainInit() {
-	CoInitializeEx(NULL, COINIT_MULTITHREADED);
+	HRESULT hr = CoInitializeEx(nullptr, COINIT_MULTITHREADED);
+	if (FAILED(hr)) {
+		_dbg_assert_(false);
+	}
+
 	net::Init();  // This needs to happen before we load the config. So on Windows we also run it in Main. It's fine to call multiple times.
 
 	// Windows, API init stuff
@@ -859,11 +863,6 @@ static void WinMainInit() {
 #endif
 	PROFILE_INIT();
 
-#if PPSSPP_ARCH(AMD64) && defined(_MSC_VER) && _MSC_VER < 1900
-	// FMA3 support in the 2013 CRT is broken on Vista and Windows 7 RTM (fixed in SP1). Just disable it.
-	_set_FMA3_enable(0);
-#endif
-
 	InitDarkMode();
 }
 

Windows/stdafx.h

@@ -17,23 +17,6 @@
 
 #pragma once
 
-#undef _WIN32_WINNT
-
-#if defined(_MSC_VER) && _MSC_VER < 1700
-#error You need a newer version of Visual Studio
-#else
-#define _WIN32_WINNT 0x601 // Compile for Win7 on Visual Studio 2012 and above
-#endif
-
-#undef WINVER
-#define WINVER _WIN32_WINNT
-#ifndef _WIN32_IE
-#define _WIN32_IE 0x0600       // Default value is 0x0400
-#endif
-
-#undef _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES
-#define _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES 1
-
 #ifndef __clang__
 #if defined _M_IX86
 #pragma comment(linker,"/manifestdependency:\"type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='x86' publicKeyToken='6595b64144ccf1df' language='*'\"")