Module: wine Branch: master Commit: 1f88a35a90ae2199ab14cab732f191982c5f2e24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f88a35a90ae2199ab14cab732...
Author: Ziqing Hui zhui@codeweavers.com Date: Thu Nov 9 21:17:35 2017 +0800
mlang: Fix font name of Chinese code pages.
Signed-off-by: Ziqing Hui zhui@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/mlang/mlang.c | 4 ++-- dlls/mlang/tests/mlang.c | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index d9a167a..9c76c11 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -470,9 +470,9 @@ static const struct mlang_data { "Baltic",1257,sizeof(baltic_cp)/sizeof(baltic_cp[0]),baltic_cp, "Courier","Arial", sidAsciiLatin }, /* FIXME */ { "Chinese Simplified",936,sizeof(chinese_simplified_cp)/sizeof(chinese_simplified_cp[0]),chinese_simplified_cp, - "Courier","Arial", sidHan }, /* FIXME */ + "Simsun","Simsun", sidHan }, { "Chinese Traditional",950,sizeof(chinese_traditional_cp)/sizeof(chinese_traditional_cp[0]),chinese_traditional_cp, - "Courier","Arial", sidBopomofo }, /* FIXME */ + "MingLiu","New MingLiu", sidBopomofo }, { "Central European",1250,sizeof(central_european_cp)/sizeof(central_european_cp[0]),central_european_cp, "Courier","Arial", sidAsciiLatin }, /* FIXME */ { "Cyrillic",1251,sizeof(cyrillic_cp)/sizeof(cyrillic_cp[0]),cyrillic_cp, diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c index 80dcd75..ffa422c 100644 --- a/dlls/mlang/tests/mlang.c +++ b/dlls/mlang/tests/mlang.c @@ -269,7 +269,6 @@ const static struct cpinfo_test_data iml2_cpinfo_data[] = {'S','i','m','s','u','n',0}, {'S','i','m','s','u','n',0}, 134 }, - FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE, TRUE }, /* 2. Chinese Simplified (GB2312-80) */ { @@ -341,7 +340,6 @@ const static struct cpinfo_test_data iml2_cpinfo_data[] = {'M','i','n','g','L','i','u',0}, {'N','e','w',' ','M','i','n','g','L','i','u',0}, 136 }, - FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE, TRUE }, /* 7. Chinese Traditional (CNS) */ {