Set console output code page to UTF-8

cold11 · Dec 25, 2020 · 7b23c94 · 7b23c94
1 parent 9328075
commit 7b23c94
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/src/WinSW.Core/Native/ConsoleApis.cs b/src/WinSW.Core/Native/ConsoleApis.cs
@@ -8,6 +8,8 @@ internal static class ConsoleApis
     {
         internal const int ATTACH_PARENT_PROCESS = -1;
 
+        internal const uint CP_UTF8 = 65001;
+
         [DllImport(Libraries.Kernel32, SetLastError = true)]
         internal static extern bool AllocConsole();
 
@@ -23,6 +25,9 @@ internal static class ConsoleApis
         [DllImport(Libraries.Kernel32)]
         internal static extern bool SetConsoleCtrlHandler(ConsoleCtrlHandlerRoutine? handlerRoutine, bool add);
 
+        [DllImport(Libraries.Kernel32)]
+        internal static extern bool SetConsoleOutputCP(uint codePageID);
+
         internal delegate bool ConsoleCtrlHandlerRoutine(CtrlEvents ctrlType);
 
         internal enum CtrlEvents : uint

diff --git a/src/WinSW/WrapperService.cs b/src/WinSW/WrapperService.cs
@@ -568,6 +568,8 @@ private Process StartProcess(string executable, string? arguments, LogHandler? l
             Debug.Assert(succeeded);
             succeeded = ConsoleApis.SetConsoleCtrlHandler(null, false); // inherited
             Debug.Assert(succeeded);
+            succeeded = ConsoleApis.SetConsoleOutputCP(ConsoleApis.CP_UTF8);
+            Debug.Assert(succeeded);
 
             Process process;
             try