Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-02-17 04:39:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add wchar conversion on non-Windows.

Browse Source
This commit is contained in:
Unknown W. Brackets 2014-12-07 15:22:52 -08:00
parent 82bf2dc136
commit c178af7b8b
2 changed files with 52 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
util/text/utf8.cpp
View File

@ -28,6 +28,7 @@
#include "base/basictypes.h"
#include "utf8.h"
#include "utf16.h"
// is start of UTF sequence
inline bool isutf(char c) {
@ -460,4 +461,51 @@ std::wstring ConvertUTF8ToWString(const std::string &source) {
return str;
}
#else
static size_t ConvertUTF8ToWStringInternal(wchar_t *dest, size_t destSize, const std::string &source) {
const wchar_t *const orig = dest;
const wchar_t *const destEnd = dest + destSize;
UTF8 utf(source.c_str());
if (sizeof(wchar_t) == 2) {
uint16_t *destw = (uint16_t *)dest;
const uint16_t *const destwEnd = destw + destSize;
while (uint32_t c = utf.next()) {
if (destw + UTF16LE::encodeUnits(c) >= destwEnd) {
break;
}
destw += UTF16LE::encode(destw, c);
}
} else {
while (uint32_t c = utf.next()) {
if (dest + 1 >= destEnd) {
break;
}
*dest++ = c;
}
}
// No ++ to not count the terminal in length.
if (dest < destEnd) {
*dest = 0;
}
return dest - orig;
}
void ConvertUTF8ToWString(wchar_t *dest, size_t destSize, const std::string &source) {
ConvertUTF8ToWStringInternal(dest, destSize, source);
}
std::wstring ConvertUTF8ToWString(const std::string &source) {
std::wstring dst;
// utf-8 won't be less bytes than there are characters. But need +1 for terminator.
dst.resize(source.size() + 1, 0);
size_t realLen = ConvertUTF8ToWStringInternal(&dst[0], source.size() + 1, source);
dst.resize(realLen);
return dst;
}
#endif

6
util/text/utf8.h
View File

@ -82,7 +82,9 @@ bool UTF8StringHasNonASCII(const char *utf8string);
std::string ConvertWStringToUTF8(const std::wstring &wstr);
std::string ConvertWStringToUTF8(const wchar_t *wstr);
void ConvertUTF8ToWString(wchar_t *dest, size_t destSize, const std::string &source);
std::wstring ConvertUTF8ToWString(const std::string &source);
#endif
// Dest size in units, not bytes.
void ConvertUTF8ToWString(wchar_t *dest, size_t destSize, const std::string &source);
std::wstring ConvertUTF8ToWString(const std::string &source);