Huw Davies : gdi32/tests: Korean and Chinese machines may use MS Shell Dlg as their default GUI font.
Alexandre Julliard
julliard at winehq.org
Mon Jan 14 16:21:49 CST 2019
Module: wine
Branch: master
Commit: 870db3b25a1c73044d583bd37f64392ea66abc5d
URL: https://source.winehq.org/git/wine.git/?a=commit;h=870db3b25a1c73044d583bd37f64392ea66abc5d
Author: Huw Davies <huw at codeweavers.com>
Date: Mon Jan 14 15:02:26 2019 +0000
gdi32/tests: Korean and Chinese machines may use MS Shell Dlg as their default GUI font.
This is an extension of commit c81ff0f8cfc1a7b6fa7546d8ffb656e290ef5e7e.
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=35573
Signed-off-by: Huw Davies <huw at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/gdi32/tests/font.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c
index 7569694..67e8941 100644
--- a/dlls/gdi32/tests/font.c
+++ b/dlls/gdi32/tests/font.c
@@ -6340,7 +6340,7 @@ static void test_stock_fonts(void)
int charset, weight, height, height_pixels, dpi;
const char face_name[LF_FACESIZE];
WORD lang_id;
- } td[][12] =
+ } td[][17] =
{
{ /* ANSI_FIXED_FONT */
{ ANSI_CHARSET, FW_NORMAL, 12, 12, 96, "Courier", LANG_ARABIC },
@@ -6374,10 +6374,15 @@ static void test_stock_fonts(void)
},
{ /* DEFAULT_GUI_FONT */
{ SHIFTJIS_CHARSET, FW_NORMAL, -11, 13, 96, "MS Shell Dlg" },
+ { SHIFTJIS_CHARSET, FW_NORMAL, -13, 16, 120, "MS Shell Dlg" },
{ SHIFTJIS_CHARSET, FW_NORMAL, -12, 15, 96, "?MS UI Gothic" },
{ SHIFTJIS_CHARSET, FW_NORMAL, -15, 18, 120, "?MS UI Gothic" },
+ { HANGEUL_CHARSET, FW_NORMAL, -11, 13, 96, "MS Shell Dlg" },
+ { HANGEUL_CHARSET, FW_NORMAL, -13, 16, 120, "MS Shell Dlg" },
{ HANGEUL_CHARSET, FW_NORMAL, -12, 15, 96, "?Gulim" },
{ HANGEUL_CHARSET, FW_NORMAL, -15, 18, 120, "?Gulim" },
+ { GB2312_CHARSET, FW_NORMAL, -11, 13, 96, "MS Shell Dlg" },
+ { GB2312_CHARSET, FW_NORMAL, -13, 16, 120, "MS Shell Dlg" },
{ GB2312_CHARSET, FW_NORMAL, -12, 15, 96, "?SimHei" },
{ GB2312_CHARSET, FW_NORMAL, -15, 18, 120, "?SimHei" },
{ CHINESEBIG5_CHARSET, FW_NORMAL, -12, 15, 96, "?MingLiU" },
More information about the wine-cvs
mailing list