From 007f32a22335963ce81979339ed788c1a4fdb0b8 Mon Sep 17 00:00:00 2001
From: Katayama Hirofumi MZ <katayama.hirofumi.mz@gmail.com>
Date: Fri, 6 Dec 2019 22:18:51 +0900
Subject: [PATCH] [WIN32SS][WINSRV] Do CJK font choose workaround (#2134)

Don't choose Asian charset font if there is no preferred font for CJK. CORE-12451
---
 win32ss/user/winsrv/concfg/font.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/win32ss/user/winsrv/concfg/font.c b/win32ss/user/winsrv/concfg/font.c
index 6aa75b074e0..1c3cbb4f191 100644
--- a/win32ss/user/winsrv/concfg/font.c
+++ b/win32ss/user/winsrv/concfg/font.c
@@ -69,7 +69,13 @@ CreateConsoleFontEx(
                                  ~(VARIABLE_PITCH | FF_DECORATIVE | FF_ROMAN | FF_SCRIPT | FF_SWISS));
 
     if (!IsValidConsoleFont(FaceName, CodePage))
+    {
         StringCchCopyW(FaceName, LF_FACESIZE, L"Terminal");
+        if (IsCJKCodePage(CodePage))
+        {
+            lf.lfCharSet = ANSI_CHARSET;
+        }
+    }
 
     StringCchCopyNW(lf.lfFaceName, ARRAYSIZE(lf.lfFaceName),
                     FaceName, LF_FACESIZE);