Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-15 23:20:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Utils: Fix Unicode handling

Browse Source 
(cherry picked from commit 6d6077e36f)
This commit is contained in:
Treeston
2018-12-25 01:47:24 +01:00
committed by Shauren
parent 4177030dcf
commit 4f8fd56903
2 changed files with 37 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/common/Utilities/Util.cpp
View File

@@ -17,6 +17,7 @@
#include "Util.h"
#include "Common.h"
#include "Containers.h"
#include "IpAddress.h"
#include "StringFormat.h"
#include <utf8.h>
@@ -250,18 +251,10 @@ bool Utf8toWStr(char const* utf8str, size_t csize, wchar_t* wstr, size_t& wsize)
{
try
{
size_t len = utf8::distance(utf8str, utf8str+csize);
if (len > wsize)
{
if (wsize > 0)
wstr[0] = L'\0';
wsize = 0;
return false;
}
wsize = len;
utf8::utf8to16(utf8str, utf8str+csize, wstr);
wstr[len] = L'\0';
Trinity::BufferWriteGuard<wchar_t> guard(wstr, wsize);
guard = utf8::utf8to16(utf8str, utf8str+csize, guard);
wsize -= guard.size(); // remaining unused space
wstr[wsize] = L'\0';
}
catch (std::exception const&)
{
@@ -276,13 +269,10 @@ bool Utf8toWStr(char const* utf8str, size_t csize, wchar_t* wstr, size_t& wsize)
bool Utf8toWStr(const std::string& utf8str, std::wstring& wstr)
{
wstr.clear();
try
{
if (size_t len = utf8::distance(utf8str.c_str(), utf8str.c_str()+utf8str.size()))
{
wstr.resize(len);
utf8::utf8to16(utf8str.c_str(), utf8str.c_str()+utf8str.size(), &wstr[0]);
}
utf8::utf8to16(utf8str.c_str(), utf8str.c_str()+utf8str.size(), std::back_inserter(wstr));
}
catch (std::exception const&)
{