Huw Davies : gdi32/tests: Japanese Win 7 uses MS Shell Dlg as its default GUI font.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: c81ff0f8cfc1a7b6fa7546d8ffb656e290ef5e7e
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=c81ff0f8cfc1a7b6fa7546d8ffb656e290ef5e7e

Author: Huw Davies <huw at codeweavers.com>
Date:   Fri Jun 19 09:24:23 2015 +0100

gdi32/tests: Japanese Win 7 uses MS Shell Dlg as its default GUI font.

---

 dlls/gdi32/tests/font.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c
index a590ce8..f26c227 100644
--- a/dlls/gdi32/tests/font.c
+++ b/dlls/gdi32/tests/font.c
@@ -5705,7 +5705,7 @@ static void test_stock_fonts(void)
         int charset, weight, height, height_pixels, dpi;
         const char face_name[LF_FACESIZE];
         WORD lang_id;
-    } td[][11] =
+    } td[][12] =
     {
         { /* ANSI_FIXED_FONT */
             { ANSI_CHARSET, FW_NORMAL, 12, 12, 96, "Courier", LANG_ARABIC },
@@ -5737,6 +5737,7 @@ static void test_stock_fonts(void)
             { 0 }
         },
         { /* DEFAULT_GUI_FONT */
+            { SHIFTJIS_CHARSET, FW_NORMAL, -11, 13, 96, "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, -12, 15, 96, "?Gulim" },
@@ -5772,7 +5773,8 @@ static void test_stock_fonts(void)
         for (j = 0; td[i][j].face_name[0] != 0; j++)
         {
             if ((lf.lfCharSet != td[i][j].charset && td[i][j].charset != DEFAULT_CHARSET) ||
-                (system_lang_id != td[i][j].lang_id && td[i][j].lang_id != LANG_NEUTRAL))
+                (system_lang_id != td[i][j].lang_id && td[i][j].lang_id != LANG_NEUTRAL) ||
+                (td[i][j].face_name[0] != '?' && strcmp(lf.lfFaceName, td[i][j].face_name)))
             {
                 continue;
             }