kiss-lang/lime
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improve handling of Windows system paths

Browse Source
This commit is contained in:
Joshua Granick
2015-04-10 09:11:46 -07:00
parent 61d15a6ff6
commit 342c64293f
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
project/src/backend/sdl/SDLSystem.cpp
View File

@@ -17,6 +17,13 @@
#define SHGFP_TYPE_CURRENT 0 #define SHGFP_TYPE_CURRENT 0
#endif #endif
#endif #endif
#if UNICODE
#define WIN_StringToUTF8(S) SDL_iconv_string("UTF-8", "UTF-16LE", (char *)(S), (SDL_wcslen(S)+1)*sizeof(WCHAR))
#define WIN_UTF8ToString(S) (WCHAR *)SDL_iconv_string("UTF-16LE", "UTF-8", (char *)(S), SDL_strlen(S)+1)
#else
#define WIN_StringToUTF8(S) SDL_iconv_string("UTF-8", "ASCII", (char *)(S), (SDL_strlen(S)+1))
#define WIN_UTF8ToString(S) SDL_iconv_string("ASCII", "UTF-8", (char *)(S), SDL_strlen(S)+1)
#endif
#endif #endif
#include <SDL_filesystem.h> #include <SDL_filesystem.h>
@@ -55,7 +62,7 @@ namespace lime {
char result[MAX_PATH] = ""; char result[MAX_PATH] = "";
SHGetFolderPath (NULL, CSIDL_DESKTOPDIRECTORY, NULL, SHGFP_TYPE_CURRENT, result); SHGetFolderPath (NULL, CSIDL_DESKTOPDIRECTORY, NULL, SHGFP_TYPE_CURRENT, result);
return std::string (result).c_str (); return WIN_StringToUTF8 (result);
#else #else
@@ -80,7 +87,7 @@ namespace lime {
char result[MAX_PATH] = ""; char result[MAX_PATH] = "";
SHGetFolderPath (NULL, CSIDL_MYDOCUMENTS, NULL, SHGFP_TYPE_CURRENT, result); SHGetFolderPath (NULL, CSIDL_MYDOCUMENTS, NULL, SHGFP_TYPE_CURRENT, result);
return std::string (result).c_str (); return WIN_StringToUTF8 (result);
#else #else
@@ -102,7 +109,7 @@ namespace lime {
char result[MAX_PATH] = ""; char result[MAX_PATH] = "";
SHGetFolderPath (NULL, CSIDL_FONTS, NULL, SHGFP_TYPE_CURRENT, result); SHGetFolderPath (NULL, CSIDL_FONTS, NULL, SHGFP_TYPE_CURRENT, result);
return std::string (result).c_str (); return WIN_StringToUTF8 (result);
#elif defined (HX_MACOS) #elif defined (HX_MACOS)
@@ -142,7 +149,7 @@ namespace lime {
char result[MAX_PATH] = ""; char result[MAX_PATH] = "";
SHGetFolderPath (NULL, CSIDL_PROFILE, NULL, SHGFP_TYPE_CURRENT, result); SHGetFolderPath (NULL, CSIDL_PROFILE, NULL, SHGFP_TYPE_CURRENT, result);
return std::string (result).c_str (); return WIN_StringToUTF8 (result);
#else #else