hasherezade/hollows_hunter
1
0
Fork 0
mirror of https://github.com/hasherezade/hollows_hunter.git synced 2026-10-11 21:49:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

[BUGFIX] Fixed UTF8/WCHAR conversion: do not throw exceptions

Browse Source
This commit is contained in:
hasherezade
2026-05-31 18:40:12 +02:00
parent e8cac60268
commit 9167880409
1 changed files with 24 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
term_util.cpp
+24 -14
View File
@@ -44,7 +44,7 @@ std::string hh::util::wstring_to_utf8(const std::wstring& wstr)
int size = WideCharToMultiByte(
CP_UTF8,
MB_ERR_INVALID_CHARS,
0,
wstr.data(),
static_cast<int>(wstr.size()),
nullptr,
@@ -52,14 +52,18 @@ std::string hh::util::wstring_to_utf8(const std::wstring& wstr)
nullptr,
nullptr);
if (size == 0)
throw std::runtime_error("WideCharToMultiByte failed");
if (size == 0) {
//throw std::runtime_error("WideCharToMultiByte failed");
std::wcerr << "WideCharToMultiByte failed for: " << wstr << std::endl;
return {};
}
std::string result(size, '\0');
int converted = WideCharToMultiByte(
CP_UTF8,
MB_ERR_INVALID_CHARS,
0,
wstr.data(),
static_cast<int>(wstr.size()),
result.data(),
@@ -67,9 +71,11 @@ std::string hh::util::wstring_to_utf8(const std::wstring& wstr)
nullptr,
nullptr);
if (converted == 0)
throw std::runtime_error("WideCharToMultiByte failed");
if (converted == 0) {
//throw std::runtime_error("WideCharToMultiByte failed");
std::wcerr << "WideCharToMultiByte failed for: " << wstr << std::endl;
return {};
}
return result;
}
@@ -81,27 +87,31 @@ std::wstring hh::util::utf8_to_wstring(const std::string& utf8)
int size = MultiByteToWideChar(
CP_UTF8,
MB_ERR_INVALID_CHARS,
0,
utf8.data(),
static_cast<int>(utf8.size()),
nullptr,
0);
if (size == 0)
throw std::runtime_error("MultiByteToWideChar failed");
if (size == 0) {
//throw std::runtime_error("MultiByteToWideChar failed");
std::cerr << "MultiByteToWideChar failed for: " << utf8 << std::endl;
return {};
}
std::wstring result(size, L'\0');
int converted = MultiByteToWideChar(
CP_UTF8,
MB_ERR_INVALID_CHARS,
0,
utf8.data(),
static_cast<int>(utf8.size()),
result.data(),
size);
if (converted == 0)
throw std::runtime_error("MultiByteToWideChar failed");
if (converted == 0) {
std::cerr << "MultiByteToWideChar failed for: " << utf8 << std::endl;
return {};
}
return result;
}