handle any Encoding in Console.Beep (#105094)

dotnet · Jul 22, 2024 · fdef8db · fdef8db
1 parent 13c75cd
commit fdef8db
Showing 1 changed file with 12 additions and 1 deletion.
diff --git a/src/libraries/System.Console/src/System/ConsolePal.Windows.cs b/src/libraries/System.Console/src/System/ConsolePal.Windows.cs
@@ -687,7 +687,18 @@ public static void Beep()
         {
             if (!Console.IsOutputRedirected)
             {
-                ReadOnlySpan<byte> bell = "\u0007"u8; // Windows doesn't use terminfo, so the codepoint is hardcoded.
+                const string BellString = "\u0007"; // Windows doesn't use terminfo, so the codepoint is hardcoded.
+
+                Span<byte> bell = stackalloc byte[10];
+                if (Console.OutputEncoding.TryGetBytes(BellString, bell, out int bytesWritten))
+                {
+                    bell = bell.Slice(0, bytesWritten);
+                }
+                else
+                {
+                    bell = Console.OutputEncoding.GetBytes(BellString);
+                }
+
                 int errorCode = WindowsConsoleStream.WriteFileNative(OutputHandle, bell, useFileAPIs: Console.OutputEncoding.CodePage != UnicodeCodePage);
                 if (errorCode == Interop.Errors.ERROR_SUCCESS)
                 {