The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-06-16 12:58:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Android: Use correct encoding when converting strings

Browse Source 
The functions with "UTF" in the name use "modified UTF-8" rather
than the standard UTF-8 which Dolphin uses, at least according
to Oracle's documentation, so it is incorrect for us to use them.
This change fixes the problem by converting between UTF-8 and
UTF-16 manually instead of letting JNI do it for us.
This commit is contained in:
JosJuice
2020-06-28 19:16:23 +02:00
parent 38791eec18
commit f5da6e07d7
3 changed files with 27 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Source/Core/Common/StringUtil.cpp
View File

@ -5,6 +5,7 @@
#include "Common/StringUtil.h"
#include <algorithm>
#include <codecvt>
#include <cstdarg>
#include <cstddef>
#include <cstdio>
@ -33,7 +34,6 @@
constexpr u32 CODEPAGE_SHIFT_JIS = 932;
constexpr u32 CODEPAGE_WINDOWS_1252 = 1252;
#else
#include <codecvt>
#include <errno.h>
#include <iconv.h>
#include <locale.h>
@ -590,6 +590,18 @@ std::string UTF16BEToUTF8(const char16_t* str, size_t max_size)
#endif
std::string UTF16ToUTF8(std::u16string_view input)
{
std::wstring_convert<std::codecvt_utf8_utf16<char16_t>, char16_t> converter;
return converter.to_bytes(input.data(), input.data() + input.size());
}
std::u16string UTF8ToUTF16(std::string_view input)
{
std::wstring_convert<std::codecvt_utf8_utf16<char16_t>, char16_t> converter;
return converter.from_bytes(input.data(), input.data() + input.size());
}
#ifdef HAS_STD_FILESYSTEM
// This is a replacement for path::u8path, which is deprecated starting with C++20.
std::filesystem::path StringToPath(std::string_view path)