Fix UWP build in non-UNICODE mode
diff --git a/src/audio/wasapi/SDL_wasapi_winrt.cpp b/src/audio/wasapi/SDL_wasapi_winrt.cpp
index 26f4838..eec367f 100644
--- a/src/audio/wasapi/SDL_wasapi_winrt.cpp
+++ b/src/audio/wasapi/SDL_wasapi_winrt.cpp
@@ -145,7 +145,7 @@
void SDL_WasapiDeviceEventHandler::OnDeviceAdded(DeviceWatcher ^ sender, DeviceInformation ^ info)
{
SDL_assert(sender == this->watcher);
- char *utf8dev = WIN_StringToUTF8(info->Name->Data());
+ char *utf8dev = WIN_StringToUTF8W(info->Name->Data());
if (utf8dev) {
WAVEFORMATEXTENSIBLE fmt;
Platform::Object ^ obj = info->Properties->Lookup(SDL_PKEY_AudioEngine_DeviceFormat);
diff --git a/src/core/windows/SDL_windows.c b/src/core/windows/SDL_windows.c
index 1da9418..7002e58 100644
--- a/src/core/windows/SDL_windows.c
+++ b/src/core/windows/SDL_windows.c
@@ -250,7 +250,7 @@
char *WIN_LookupAudioDeviceName(const WCHAR *name, const GUID *guid)
{
#if defined(__WINRT__) || defined(__XBOXONE__) || defined(__XBOXSERIES__)
- return WIN_StringToUTF8(name); /* No registry access on WinRT/UWP and Xbox, go with what we've got. */
+ return WIN_StringToUTF8W(name); /* No registry access on WinRT/UWP and Xbox, go with what we've got. */
#else
static const GUID nullguid = { 0 };
const unsigned char *ptr;
diff --git a/src/filesystem/winrt/SDL_sysfilesystem.cpp b/src/filesystem/winrt/SDL_sysfilesystem.cpp
index 85cfd19..1643bd4 100644
--- a/src/filesystem/winrt/SDL_sysfilesystem.cpp
+++ b/src/filesystem/winrt/SDL_sysfilesystem.cpp
@@ -115,7 +115,7 @@
return NULL;
}
- char *utf8Path = WIN_StringToUTF8(ucs2Path);
+ char *utf8Path = WIN_StringToUTF8W(ucs2Path);
utf8Paths[pathType] = utf8Path;
SDL_free(utf8Path);
return utf8Paths[pathType].c_str();
@@ -181,13 +181,13 @@
}
SDL_wcslcpy(path, srcPath, SDL_arraysize(path));
- worg = WIN_UTF8ToString(org);
+ worg = WIN_UTF8ToStringW(org);
if (!worg) {
SDL_OutOfMemory();
return NULL;
}
- wapp = WIN_UTF8ToString(app);
+ wapp = WIN_UTF8ToStringW(app);
if (!wapp) {
SDL_free(worg);
SDL_OutOfMemory();
@@ -232,7 +232,7 @@
SDL_wcslcat(path, L"\\", new_wpath_len + 1);
- retval = WIN_StringToUTF8(path);
+ retval = WIN_StringToUTF8W(path);
return retval;
}
diff --git a/src/loadso/windows/SDL_sysloadso.c b/src/loadso/windows/SDL_sysloadso.c
index 1fcee3d..0172ffe 100644
--- a/src/loadso/windows/SDL_sysloadso.c
+++ b/src/loadso/windows/SDL_sysloadso.c
@@ -32,23 +32,23 @@
void *SDL_LoadObject(const char *sofile)
{
void *handle;
- LPTSTR tstr;
+ LPWSTR wstr;
if (!sofile) {
SDL_InvalidParamError("sofile");
return NULL;
}
- tstr = WIN_UTF8ToString(sofile);
+ wstr = WIN_UTF8ToStringW(sofile);
#ifdef __WINRT__
/* WinRT only publicly supports LoadPackagedLibrary() for loading .dll
files. LoadLibrary() is a private API, and not available for apps
(that can be published to MS' Windows Store.)
*/
- handle = (void *)LoadPackagedLibrary(tstr, 0);
+ handle = (void *)LoadPackagedLibrary(wstr, 0);
#else
- handle = (void *)LoadLibrary(tstr);
+ handle = (void *)LoadLibraryW(wstr);
#endif
- SDL_free(tstr);
+ SDL_free(wstr);
/* Generate an error message if all loads failed */
if (!handle) {
diff --git a/src/video/winrt/SDL_winrtmessagebox.cpp b/src/video/winrt/SDL_winrtmessagebox.cpp
index a2d66a3..8a05c77 100644
--- a/src/video/winrt/SDL_winrtmessagebox.cpp
+++ b/src/video/winrt/SDL_winrtmessagebox.cpp
@@ -35,7 +35,7 @@
using namespace Windows::UI::Popups;
static String ^ WINRT_UTF8ToPlatformString(const char *str) {
- wchar_t *wstr = WIN_UTF8ToString(str);
+ wchar_t *wstr = WIN_UTF8ToStringW(str);
String ^ rtstr = ref new String(wstr);
SDL_free(wstr);
return rtstr;
diff --git a/src/video/winrt/SDL_winrtvideo.cpp b/src/video/winrt/SDL_winrtvideo.cpp
index 9160bbb..8d3982c 100644
--- a/src/video/winrt/SDL_winrtvideo.cpp
+++ b/src/video/winrt/SDL_winrtvideo.cpp
@@ -321,7 +321,7 @@
WIN_SetErrorFromHRESULT(__FUNCTION__ ", IDXGIOutput::FindClosestMatchingMode failed", hr);
goto done;
} else {
- displayName = WIN_StringToUTF8(dxgiOutputDesc.DeviceName);
+ displayName = WIN_StringToUTF8W(dxgiOutputDesc.DeviceName);
display.name = displayName;
WINRT_DXGIModeToSDLDisplayMode(&closestMatch, &display.desktop_mode);
display.current_mode = display.desktop_mode;
