mirror of
https://github.com/libsdl-org/SDL.git
synced 2025-11-11 04:55:23 +00:00
Fix UWP build in non-UNICODE mode
This commit is contained in:
committed by
Anonymous Maarten
parent
c59771d7fc
commit
ccebbb6c6e
@@ -53,7 +53,7 @@ int SDL_SYS_EnumerateDirectory(const char *path, const char *dirname, SDL_Enumer
|
||||
// also prevent any wildcards inserted by the app from being respected.
|
||||
SDL_snprintf(pattern, patternlen, "%s\\*", path);
|
||||
|
||||
WCHAR *wpattern = WIN_UTF8ToString(pattern);
|
||||
WCHAR *wpattern = WIN_UTF8ToStringW(pattern);
|
||||
SDL_free(pattern);
|
||||
if (!wpattern) {
|
||||
return -1;
|
||||
@@ -75,7 +75,7 @@ int SDL_SYS_EnumerateDirectory(const char *path, const char *dirname, SDL_Enumer
|
||||
}
|
||||
}
|
||||
|
||||
char *utf8fn = WIN_StringToUTF8(fn);
|
||||
char *utf8fn = WIN_StringToUTF8W(fn);
|
||||
if (!utf8fn) {
|
||||
retval = -1;
|
||||
} else {
|
||||
@@ -92,7 +92,7 @@ int SDL_SYS_EnumerateDirectory(const char *path, const char *dirname, SDL_Enumer
|
||||
|
||||
int SDL_SYS_RemovePath(const char *path)
|
||||
{
|
||||
WCHAR *wpath = WIN_UTF8ToString(path);
|
||||
WCHAR *wpath = WIN_UTF8ToStringW(path);
|
||||
if (!wpath) {
|
||||
return -1;
|
||||
}
|
||||
@@ -114,12 +114,12 @@ int SDL_SYS_RemovePath(const char *path)
|
||||
|
||||
int SDL_SYS_RenamePath(const char *oldpath, const char *newpath)
|
||||
{
|
||||
WCHAR *woldpath = WIN_UTF8ToString(oldpath);
|
||||
WCHAR *woldpath = WIN_UTF8ToStringW(oldpath);
|
||||
if (!woldpath) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
WCHAR *wnewpath = WIN_UTF8ToString(newpath);
|
||||
WCHAR *wnewpath = WIN_UTF8ToStringW(newpath);
|
||||
if (!wnewpath) {
|
||||
SDL_free(woldpath);
|
||||
return -1;
|
||||
@@ -133,7 +133,7 @@ int SDL_SYS_RenamePath(const char *oldpath, const char *newpath)
|
||||
|
||||
int SDL_SYS_CreateDirectory(const char *path)
|
||||
{
|
||||
WCHAR *wpath = WIN_UTF8ToString(path);
|
||||
WCHAR *wpath = WIN_UTF8ToStringW(path);
|
||||
if (!wpath) {
|
||||
return -1;
|
||||
}
|
||||
@@ -145,7 +145,7 @@ int SDL_SYS_CreateDirectory(const char *path)
|
||||
|
||||
int SDL_SYS_GetPathInfo(const char *path, SDL_PathInfo *info)
|
||||
{
|
||||
WCHAR *wpath = WIN_UTF8ToString(path);
|
||||
WCHAR *wpath = WIN_UTF8ToStringW(path);
|
||||
if (!wpath) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user