Windows: Fix console using OEMCP instead of the resource string table…

…'s codepage
legacyclonk · Aug 28, 2024 · 358c184 · 358c184
1 parent c03c177
commit 358c184
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 0 deletions.
diff --git a/src/C4Language.cpp b/src/C4Language.cpp
@@ -429,6 +429,10 @@ bool C4Language::LoadStringTable(C4Group &hGroup, const char *strCode)
 	// Set the internal charset
 	SCopy(LoadResStr(C4ResStrTableKey::IDS_LANG_CHARSET), Config.General.LanguageCharset);
 
+#ifdef _WIN32
+	Application.LogSystem.SetConsoleCharset(C4Config::GetCharsetCodePage(Config.General.LanguageCharset));
+#endif
+
 #ifdef HAVE_ICONV_AND_LANGINFO_H
 	const char *const to_set = nl_langinfo(CODESET);
 	if (local_to_host == iconv_t(-1))

diff --git a/src/C4Log.cpp b/src/C4Log.cpp
@@ -382,6 +382,17 @@ void C4LogSystem::ClearRingbuffer()
 	ringbufferSink->Clear();
 }
 
+#ifdef _WIN32
+
+void C4LogSystem::SetConsoleCharset(const std::int32_t charset)
+{
+	SetConsoleCP(charset);
+	SetConsoleOutputCP(charset);
+}
+
+#endif
+
+
 void LogNTr(const spdlog::level::level_enum level, const std::string_view message)
 {
 	Application.LogSystem.GetLogger()->log(level, message);

diff --git a/src/C4Log.h b/src/C4Log.h
@@ -126,6 +126,10 @@ class C4LogSystem
 	void EnableDebugLog(bool enable);
 	void SetVerbose(bool verbose);
 
+#ifdef _WIN32
+	void SetConsoleCharset(std::int32_t charset);
+#endif
+
 private:
 	std::shared_ptr<spdlog::logger> logger;
 	std::shared_ptr<spdlog::logger> loggerSilent;