mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Improve Windows implementation of ToUpper

This commit is contained in:
Ted John 2018-05-14 23:50:19 +01:00 committed by Aaron van Geffen
parent 085d85585a
commit 6109a9bf17
1 changed files with 34 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
src/openrct2/core/String.cpp
View File

@ -667,49 +667,44 @@ namespace String
{
#ifdef _WIN32
auto srcW = ToUtf16(src);
// Measure how long the destination needs to be
auto requiredSize = LCMapStringEx(
LOCALE_NAME_INVARIANT,
LCMAP_UPPERCASE | LCMAP_LINGUISTIC_CASING,
srcW.c_str(),
(int)srcW.length(),
nullptr,
0,
nullptr,
nullptr,
0);
auto dstW = std::wstring();
dstW.resize(requiredSize);
// Keep doubling the buffer size until transformed string fits (max 10 times)
size_t bufferLength = src.size();
for (size_t i = 0; i < 10; i++)
// Transform the string
auto result = LCMapStringEx(
LOCALE_NAME_INVARIANT,
LCMAP_UPPERCASE | LCMAP_LINGUISTIC_CASING,
srcW.c_str(),
(int)srcW.length(),
dstW.data(),
(int)dstW.length(),
nullptr,
nullptr,
0);
if (result == 0)
{
// Double buffer size
bufferLength *= 2;
dstW.resize(bufferLength);
// Transform the string
auto result = LCMapStringEx(
LOCALE_NAME_USER_DEFAULT,
LCMAP_UPPERCASE | LCMAP_LINGUISTIC_CASING,
srcW.c_str(),
(int)srcW.length(),
dstW.data(),
(int)dstW.capacity(),
nullptr,
nullptr,
0);
if (result == 0)
{
// Check the error
auto error = GetLastError();
if (error == ERROR_INSUFFICIENT_BUFFER)
{
continue;
}
else
{
log_warning("LCMapStringEx failed with %d", error);
return std::string(src);
}
}
else
{
dstW.resize(result);
return String::ToUtf8(dstW);
}
// Check the error
auto error = GetLastError();
log_warning("LCMapStringEx failed with %d", error);
return std::string(src);
}
else
{
return String::ToUtf8(dstW);
}
log_warning("LCMapStringEx loop exceeded");
return std::string(src);
#else
icu::UnicodeString str = icu::UnicodeString::fromUTF8(std::string(src));
str.toUpper();