mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2026-01-31 17:48:26 +00:00
Code Issues Releases Wiki Activity

Merge branch 'wide-debug-string' into 'master'

Browse source 
Fix DebugOutput

Closes #8944

See merge request OpenMW/openmw!5131
This commit is contained in:
Alexei Kotov 2026-01-28 02:51:31 +03:00
commit fd91d03e48
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
components/debug/debugging.cpp
View file

@ -185,10 +185,16 @@ namespace Debug
public:
std::streamsize writeImpl(const char* str, std::streamsize size, Level debugLevel)
{
// Make a copy for null termination
std::string tmp(str, static_cast<unsigned int>(size));
if (size > std::numeric_limits<int>::max())
OutputDebugStringW(L"Next line truncated...");
auto wideSize = MultiByteToWideChar(CP_UTF8, 0, str,
static_cast<int>(std::min<std::streamsize>(size, std::numeric_limits<int>::max())), nullptr, 0);
std::wstring wide(wideSize, L'\0');
MultiByteToWideChar(CP_UTF8, 0, str,
static_cast<int>(std::min<std::streamsize>(size, std::numeric_limits<int>::max())), wide.data(),
wideSize);
// Write string to Visual Studio Debug output
OutputDebugString(tmp.c_str());
OutputDebugStringW(wide.c_str());
return size;
}
@ -426,6 +432,7 @@ namespace Debug
{
#if defined _WIN32
(void)attachParentConsole();
SetConsoleOutputCP(CP_UTF8);
#endif
rawStdout = std::make_unique<std::ostream>(std::cout.rdbuf());
rawStderr = std::make_unique<std::ostream>(std::cerr.rdbuf());