WIN32: Add DialogManager with system file browser support

3 files changed, 29 insertions, 7 deletions

diff --git a/backends/platform/sdl/win32/win32.cpp b/backends/platform/sdl/win32/win32.cpp
index 936662e7fe..b94c6bb742 100644
--- a/backends/platform/sdl/win32/win32.cpp
+++ b/backends/platform/sdl/win32/win32.cpp
@@ -47,6 +47,7 @@
 #include "backends/fs/windows/windows-fs-factory.h"
 #include "backends/taskbar/win32/win32-taskbar.h"
 #include "backends/updates/win32/win32-updates.h"
+#include "backends/dialogs/win32/win32-dialogs.h"
 
 #include "common/memstream.h"
 
@@ -64,6 +65,11 @@ void OSystem_Win32::init() {
 	_taskbarManager = new Win32TaskbarManager((SdlWindow_Win32*)_window);
 #endif
 
+#if defined(USE_SYSDIALOGS)
+	// Initialize dialog manager
+	_dialogManager = new Win32DialogManager((SdlWindow_Win32*)_window);
+#endif
+
 	// Invoke parent implementation of this method
 	OSystem_SDL::init();
 }
diff --git a/backends/platform/sdl/win32/win32_wrapper.cpp b/backends/platform/sdl/win32/win32_wrapper.cpp
index 3ff00b6f2d..d199ce8994 100644
--- a/backends/platform/sdl/win32/win32_wrapper.cpp
+++ b/backends/platform/sdl/win32/win32_wrapper.cpp
@@ -20,16 +20,10 @@
  *
  */
 
-// Disable symbol overrides so that we can use system headers.
-#define FORBIDDEN_SYMBOL_ALLOW_ALL
-
 #include "common/scummsys.h"
 // We need certain functions that are excluded by default
 #undef NONLS
 #include <windows.h>
-#if defined(ARRAYSIZE)
-#undef ARRAYSIZE
-#endif
 
 #include "backends/platform/sdl/win32/win32_wrapper.h"
 
@@ -72,7 +66,7 @@ bool confirmWindowsVersion(int majorVersion, int minorVersion) {
 	return VerifyVersionInfoFunc(&versionInfo, VER_MAJORVERSION | VER_MINORVERSION, conditionMask);
 }
 
-LPWSTR ansiToUnicode(const char *s) {
+wchar_t *ansiToUnicode(const char *s) {
 	DWORD size = MultiByteToWideChar(0, 0, s, -1, NULL, 0);
 
 	if (size > 0) {
@@ -84,4 +78,16 @@ LPWSTR ansiToUnicode(const char *s) {
 	return NULL;
 }
 
+char *unicodeToAnsi(const wchar_t *s) {
+	DWORD size = WideCharToMultiByte(0, 0, s, -1, NULL, 0, 0, 0);
+
+	if (size > 0) {
+		char *result = new char[size];
+		if (WideCharToMultiByte(0, 0, s, -1, result, size, 0, 0) != 0)
+			return result;
+	}
+
+	return NULL;
+}
+
 }
diff --git a/backends/platform/sdl/win32/win32_wrapper.h b/backends/platform/sdl/win32/win32_wrapper.h
index 5722d8844f..91cbe3a891 100644
--- a/backends/platform/sdl/win32/win32_wrapper.h
+++ b/backends/platform/sdl/win32/win32_wrapper.h
@@ -44,6 +44,16 @@ bool confirmWindowsVersion(int majorVersion, int minorVersion);
  * @note Return value must be freed by the caller.
  */
 wchar_t *ansiToUnicode(const char *s);
+/**
+ * Converts a Windows wide-character string into a C string.
+ * Used to interact with Win32 Unicode APIs with no ANSI fallback.
+ *
+ * @param s Source string
+ * @return Converted string
+ *
+ * @note Return value must be freed by the caller.
+ */
+char *unicodeToAnsi(const wchar_t *s);
 
 }