Module: wine Branch: master Commit: 5083f2a589930b8a67a396cbf03a266cf39b08cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=5083f2a589930b8a67a396cbf0...
Author: Ziqing Hui zhui@codeweavers.com Date: Thu Nov 30 12:23:52 2017 +0800
mlang: Fix font name of code page families.
Signed-off-by: Ziqing Hui zhui@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/mlang/mlang.c | 24 ++++++++++++------------ dlls/mlang/tests/mlang.c | 18 ++++++------------ 2 files changed, 18 insertions(+), 24 deletions(-)
diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index aa644e2..bada104 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -495,35 +495,35 @@ static const struct mlang_data } mlang_data[] = { { "Arabic",1256,sizeof(arabic_cp)/sizeof(arabic_cp[0]),arabic_cp, - "Courier","Arial", sidArabic }, /* FIXME */ + "Simplified Arabic Fixed","Simplified Arabic", sidArabic }, { "Baltic",1257,sizeof(baltic_cp)/sizeof(baltic_cp[0]),baltic_cp, - "Courier","Arial", sidAsciiLatin }, /* FIXME */ + "Courier New","Arial", sidAsciiLatin }, { "Chinese Simplified",936,sizeof(chinese_simplified_cp)/sizeof(chinese_simplified_cp[0]),chinese_simplified_cp, "Simsun","Simsun", sidHan }, { "Chinese Traditional",950,sizeof(chinese_traditional_cp)/sizeof(chinese_traditional_cp[0]),chinese_traditional_cp, "MingLiu","New MingLiu", sidBopomofo }, { "Central European",1250,sizeof(central_european_cp)/sizeof(central_european_cp[0]),central_european_cp, - "Courier","Arial", sidAsciiLatin }, /* FIXME */ + "Courier New","Arial", sidAsciiLatin }, { "Cyrillic",1251,sizeof(cyrillic_cp)/sizeof(cyrillic_cp[0]),cyrillic_cp, - "Courier","Arial", sidCyrillic }, /* FIXME */ + "Courier New","Arial", sidCyrillic }, { "Greek",1253,sizeof(greek_cp)/sizeof(greek_cp[0]),greek_cp, - "Courier","Arial", sidGreek }, /* FIXME */ + "Courier New","Arial", sidGreek }, { "Hebrew",1255,sizeof(hebrew_cp)/sizeof(hebrew_cp[0]),hebrew_cp, - "Courier","Arial", sidHebrew }, /* FIXME */ + "Miriam Fixed","David", sidHebrew }, { "Japanese",932,sizeof(japanese_cp)/sizeof(japanese_cp[0]),japanese_cp, "MS Gothic","MS PGothic", sidKana }, { "Korean",949,sizeof(korean_cp)/sizeof(korean_cp[0]),korean_cp, - "Courier","Arial", sidHangul }, /* FIXME */ + "GulimChe","Gulim", sidHangul }, { "Thai",874,sizeof(thai_cp)/sizeof(thai_cp[0]),thai_cp, - "Courier","Arial", sidThai }, /* FIXME */ + "Tahoma","Tahoma", sidThai }, { "Turkish",1254,sizeof(turkish_cp)/sizeof(turkish_cp[0]),turkish_cp, - "Courier","Arial", sidAsciiLatin }, /* FIXME */ + "Courier New","Arial", sidAsciiLatin }, { "Vietnamese",1258,sizeof(vietnamese_cp)/sizeof(vietnamese_cp[0]),vietnamese_cp, - "Courier","Arial", sidAsciiLatin }, /* FIXME */ + "Courier New","Arial", sidAsciiLatin }, { "Western European",1252,sizeof(western_cp)/sizeof(western_cp[0]),western_cp, - "Courier","Arial", sidAsciiLatin }, /* FIXME */ + "Courier New","Arial", sidAsciiLatin }, { "Unicode",CP_UNICODE,sizeof(unicode_cp)/sizeof(unicode_cp[0]),unicode_cp, - "Courier","Arial" } /* FIXME */ + "Courier New","Arial" } };
struct font_list diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c index 5100870..2e3b36b 100644 --- a/dlls/mlang/tests/mlang.c +++ b/dlls/mlang/tests/mlang.c @@ -362,7 +362,6 @@ const static struct cpinfo_test_data iml2_cpinfo_data[] = {'S','i','m','p','l','i','f','i','e','d',' ','A','r','a','b','i','c',' ','F','i','x','e','d',0}, {'S','i','m','p','l','i','f','i','e','d',' ','A','r','a','b','i','c',0}, 178 }, - FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE, TRUE }, /* 9. Baltic (Windows) */ { @@ -377,7 +376,6 @@ const static struct cpinfo_test_data iml2_cpinfo_data[] = {'C','o','u','r','i','e','r',' ','N','e','w',0}, {'A','r','i','a','l',0}, 186 }, - FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE }, /* 10. Central European (Windows) */ { @@ -392,7 +390,7 @@ const static struct cpinfo_test_data iml2_cpinfo_data[] = {'C','o','u','r','i','e','r',' ','N','e','w',0}, {'A','r','i','a','l',0}, 238 }, - FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE, TRUE + FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE }, /* 11. Cyrillic (Windows) */ { @@ -407,7 +405,7 @@ const static struct cpinfo_test_data iml2_cpinfo_data[] = {'C','o','u','r','i','e','r',' ','N','e','w',0}, {'A','r','i','a','l',0}, 204 }, - FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE, TRUE + FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE }, /* 12. Greek (Windows) */ { @@ -422,7 +420,7 @@ const static struct cpinfo_test_data iml2_cpinfo_data[] = {'C','o','u','r','i','e','r',' ','N','e','w',0}, {'A','r','i','a','l',0}, 161 }, - FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE, TRUE + FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE }, /* 13. Hebrew (Windows) */ { @@ -437,7 +435,6 @@ const static struct cpinfo_test_data iml2_cpinfo_data[] = {'M','i','r','i','a','m',' ','F','i','x','e','d',0}, {'D','a','v','i','d',0}, 177 }, - FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE, TRUE }, /* 14. Japanese (Shift-JIS) */ { @@ -466,7 +463,6 @@ const static struct cpinfo_test_data iml2_cpinfo_data[] = {'G','u','l','i','m','C','h','e',0}, {'G','u','l','i','m',0}, 129 }, - FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE, TRUE }, /* 16. Thai (Windows) */ { @@ -481,7 +477,7 @@ const static struct cpinfo_test_data iml2_cpinfo_data[] = {'T','a','h','o','m','a',0}, {'T','a','h','o','m','a',0}, 222 }, - FALSE, TRUE, FALSE, FALSE, TRUE, TRUE, TRUE, TRUE, TRUE + FALSE, TRUE, FALSE, FALSE, TRUE, TRUE, TRUE }, /* 17. Turkish (Windows) */ { @@ -496,7 +492,7 @@ const static struct cpinfo_test_data iml2_cpinfo_data[] = {'C','o','u','r','i','e','r',' ','N','e','w',0}, {'A','r','i','a','l',0}, 162 }, - FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE, TRUE + FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE }, /* 18. Vietnamese (Windows) */ { @@ -511,7 +507,6 @@ const static struct cpinfo_test_data iml2_cpinfo_data[] = {'C','o','u','r','i','e','r',' ','N','e','w',0}, {'A','r','i','a','l',0}, 163 }, - FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE }, /* 19. Western European (Windows) */ { @@ -526,7 +521,7 @@ const static struct cpinfo_test_data iml2_cpinfo_data[] = {'C','o','u','r','i','e','r',' ','N','e','w',0}, {'A','r','i','a','l',0}, 0 }, - FALSE, FALSE, FALSE, FALSE, TRUE, TRUE, FALSE, TRUE + FALSE, FALSE, FALSE, FALSE, TRUE, TRUE }, /* 20. Unicode */ { @@ -540,7 +535,6 @@ const static struct cpinfo_test_data iml2_cpinfo_data[] = {'C','o','u','r','i','e','r',' ','N','e','w',0}, {'A','r','i','a','l',0}, 1 }, - FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE } };
-
Alexandre Julliard