piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-21 05:09:34 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8905 from JosJuice/jni-encoding

Browse Source 
Android: Use correct encoding when converting strings
This commit is contained in:
LC
2020-07-18 22:13:14 -04:00
committed by GitHub
parent 5c2b6d0626 f5da6e07d7
commit 487cd7abd9
15 changed files with 63 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Source/Core/Common/StringUtil.h
View File

@ -172,22 +172,24 @@ size_t StringUTF8CodePointCount(const std::string& str);
std::string CP1252ToUTF8(std::string_view str);
std::string SHIFTJISToUTF8(std::string_view str);
std::string UTF8ToSHIFTJIS(std::string_view str);
std::string UTF16ToUTF8(std::wstring_view str);
std::string WStringToUTF8(std::wstring_view str);
std::string UTF16BEToUTF8(const char16_t* str, size_t max_size); // Stops at \0
std::string UTF16ToUTF8(std::u16string_view str);
std::u16string UTF8ToUTF16(std::string_view str);
#ifdef _WIN32
std::wstring UTF8ToUTF16(std::string_view str);
std::wstring UTF8ToWString(std::string_view str);
#ifdef _UNICODE
inline std::string TStrToUTF8(std::wstring_view str)
{
return UTF16ToUTF8(str);
return WStringToUTF8(str);
}
inline std::wstring UTF8ToTStr(std::string_view str)
{
return UTF8ToUTF16(str);
return UTF8ToWString(str);
}
#else
inline std::string TStrToUTF8(std::string_view str)
@ -221,7 +223,7 @@ std::string ThousandSeparate(I value, int spaces = 0)
stream << std::setw(spaces) << value;
#ifdef _WIN32
return UTF16ToUTF8(stream.str());
return WStringToUTF8(stream.str());
#else
return stream.str();
#endif