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

[Huw Davies]

This is an extension of commit c81ff0f8cfc1a7b6fa7546d8ffb656e290ef5e7e.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=35573
Signed-off-by: Huw Davies <huw(a)codeweavers.com>
---
 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 75696946b2..67e8941b5e 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" },
-- 
2.18.0

[Marvin]

Hi,

While running your changed tests on Windows, I think I found new failures.
Being a bot and all I'm not very good at pattern recognition, so I might be
wrong, but could you please double-check?

Full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=46315

Your paranoid android.


=== debian9 (32 bit Chinese:China report) ===

gdi32:
font.c:6437: Test failed: 4(8): expected height 13, got 16
font.c:6440: Test failed: 4(8): expected lfHeight -11, got -12