Dmitry Timoshkov : gdi32: Skip the SYMBOL_CHARSET test if Symbol or Wingdings is not installed.

[Alexandre Julliard]

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

Author: Dmitry Timoshkov <dmitry(a)codeweavers.com>
Date:   Thu Feb 15 23:14:01 2007 +0800

gdi32: Skip the SYMBOL_CHARSET test if Symbol or Wingdings is not installed.

---

 dlls/gdi32/tests/font.c |   40 +++++++++++++++++++++++++++++++++++-----
 1 files changed, 35 insertions(+), 5 deletions(-)

diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c
index 2d19c8c..ada2c7f 100644
--- a/dlls/gdi32/tests/font.c
+++ b/dlls/gdi32/tests/font.c
@@ -827,8 +827,10 @@ static BOOL get_glyph_indices(INT charset, UINT code_page, WORD *idx, UINT count
     LOGFONTA lf;
     HFONT hfont, hfont_old;
     CHARSETINFO csi;
+    FONTSIGNATURE fs;
     INT cs;
     DWORD i, ret;
+    char name[64];
 
     assert(count <= 128);
 
@@ -844,9 +846,24 @@ static BOOL get_glyph_indices(INT charset, UINT code_page, WORD *idx, UINT count
     hdc = GetDC(0);
     hfont_old = SelectObject(hdc, hfont);
 
-    cs = GetTextCharset(hdc);
+    cs = GetTextCharsetInfo(hdc, &fs, 0);
     ok(cs == charset, "expected %d, got %d\n", charset, cs);
 
+    SetLastError(0xdeadbeef);
+    ret = GetTextFace(hdc, sizeof(name), name);
+    ok(ret, "GetTextFace error %u\n", GetLastError());
+
+    if (charset == SYMBOL_CHARSET)
+    {
+        ok(strcmp("Arial", name), "face name should NOT be Arial\n");
+        ok(fs.fsCsb[0] & (1 << 31), "symbol encoding should be available\n");
+    }
+    else
+    {
+        ok(!strcmp("Arial", name), "face name should be Arial, not %s\n", name);
+        ok(!(fs.fsCsb[0] & (1 << 31)), "symbol encoding should NOT be available\n");
+    }
+
     if (!TranslateCharsetInfo((DWORD *)cs, &csi, TCI_SRCCHARSET))
     {
         trace("Can't find codepage for charset %d\n", cs);
@@ -1020,8 +1037,8 @@ static void test_font_charset(void)
     } cd[] =
     {
         { ANSI_CHARSET, 1252 },
-        { SYMBOL_CHARSET, CP_SYMBOL },
-        { RUSSIAN_CHARSET, 1251 }
+        { RUSSIAN_CHARSET, 1251 },
+        { SYMBOL_CHARSET, CP_SYMBOL } /* keep it as the last one */
     };
     int i;
 
@@ -1042,14 +1059,27 @@ static void test_font_charset(void)
 
     for (i = 0; i < sizeof(cd)/sizeof(cd[0]); i++)
     {
+        if (cd[i].charset == SYMBOL_CHARSET)
+        {
+            if (!is_font_installed("Symbol") && !is_font_installed("Wingdings"))
+            {
+                skip("Symbol or Wingdings is not installed\n");
+                break;
+            }
+        }
         get_glyph_indices(cd[i].charset, cd[i].code_page, cd[i].font_idxA, 128, FALSE);
         get_glyph_indices(cd[i].charset, cd[i].code_page, cd[i].font_idxW, 128, TRUE);
         ok(!memcmp(cd[i].font_idxA, cd[i].font_idxW, 128*sizeof(WORD)), "%d: indices don't match\n", i);
     }
 
     ok(memcmp(cd[0].font_idxW, cd[1].font_idxW, 128*sizeof(WORD)), "0 vs 1: indices shouldn't match\n");
-    ok(memcmp(cd[0].font_idxW, cd[2].font_idxW, 128*sizeof(WORD)), "0 vs 2: indices shouldn't match\n");
-    ok(memcmp(cd[1].font_idxW, cd[2].font_idxW, 128*sizeof(WORD)), "1 vs 2: indices shouldn't match\n");
+    if (i > 2)
+    {
+        ok(memcmp(cd[0].font_idxW, cd[2].font_idxW, 128*sizeof(WORD)), "0 vs 2: indices shouldn't match\n");
+        ok(memcmp(cd[1].font_idxW, cd[2].font_idxW, 128*sizeof(WORD)), "1 vs 2: indices shouldn't match\n");
+    }
+    else
+        skip("Symbol or Wingdings is not installed\n");
 }
 
 START_TEST(font)