Commit 870db3b2 authored by Huw Davies's avatar Huw Davies Committed by Alexandre Julliard

gdi32/tests: Korean and Chinese machines may use MS Shell Dlg as their default GUI font.

This is an extension of commit c81ff0f8. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=35573Signed-off-by: 's avatarHuw Davies <huw@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 77f40d05
...@@ -6340,7 +6340,7 @@ static void test_stock_fonts(void) ...@@ -6340,7 +6340,7 @@ static void test_stock_fonts(void)
int charset, weight, height, height_pixels, dpi; int charset, weight, height, height_pixels, dpi;
const char face_name[LF_FACESIZE]; const char face_name[LF_FACESIZE];
WORD lang_id; WORD lang_id;
} td[][12] = } td[][17] =
{ {
{ /* ANSI_FIXED_FONT */ { /* ANSI_FIXED_FONT */
{ ANSI_CHARSET, FW_NORMAL, 12, 12, 96, "Courier", LANG_ARABIC }, { ANSI_CHARSET, FW_NORMAL, 12, 12, 96, "Courier", LANG_ARABIC },
...@@ -6374,10 +6374,15 @@ static void test_stock_fonts(void) ...@@ -6374,10 +6374,15 @@ static void test_stock_fonts(void)
}, },
{ /* DEFAULT_GUI_FONT */ { /* DEFAULT_GUI_FONT */
{ SHIFTJIS_CHARSET, FW_NORMAL, -11, 13, 96, "MS Shell Dlg" }, { 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, -12, 15, 96, "?MS UI Gothic" },
{ SHIFTJIS_CHARSET, FW_NORMAL, -15, 18, 120, "?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, -12, 15, 96, "?Gulim" },
{ HANGEUL_CHARSET, FW_NORMAL, -15, 18, 120, "?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, -12, 15, 96, "?SimHei" },
{ GB2312_CHARSET, FW_NORMAL, -15, 18, 120, "?SimHei" }, { GB2312_CHARSET, FW_NORMAL, -15, 18, 120, "?SimHei" },
{ CHINESEBIG5_CHARSET, FW_NORMAL, -12, 15, 96, "?MingLiU" }, { CHINESEBIG5_CHARSET, FW_NORMAL, -12, 15, 96, "?MingLiU" },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment