Commit a9aafec2 authored by Austin Lund's avatar Austin Lund Committed by Alexandre Julliard

gdi32/tests: Skip GetGlyphIndices tests for non-ANSI codepages.

parent 37cf8dc5
...@@ -1017,7 +1017,15 @@ static void test_GetGlyphIndices(void) ...@@ -1017,7 +1017,15 @@ static void test_GetGlyphIndices(void)
hdc = GetDC(0); hdc = GetDC(0);
memset(&lf, 0, sizeof(lf));
strcpy(lf.lfFaceName, "System");
lf.lfHeight = 16;
lf.lfCharSet = ANSI_CHARSET;
hfont = CreateFontIndirectA(&lf);
ok(GetTextMetrics(hdc, &textm), "GetTextMetric failed\n"); ok(GetTextMetrics(hdc, &textm), "GetTextMetric failed\n");
if (textm.tmCharSet == ANSI_CHARSET)
{
flags |= GGI_MARK_NONEXISTING_GLYPHS; flags |= GGI_MARK_NONEXISTING_GLYPHS;
charcount = pGetGlyphIndicesW(hdc, testtext, (sizeof(testtext)/2)-1, glyphs, flags); charcount = pGetGlyphIndicesW(hdc, testtext, (sizeof(testtext)/2)-1, glyphs, flags);
ok(charcount == 5, "GetGlyphIndicesW count of glyphs should = 5 not %d\n", charcount); ok(charcount == 5, "GetGlyphIndicesW count of glyphs should = 5 not %d\n", charcount);
...@@ -1027,6 +1035,10 @@ static void test_GetGlyphIndices(void) ...@@ -1027,6 +1035,10 @@ static void test_GetGlyphIndices(void)
ok(charcount == 5, "GetGlyphIndicesW count of glyphs should = 5 not %d\n", charcount); ok(charcount == 5, "GetGlyphIndicesW count of glyphs should = 5 not %d\n", charcount);
ok(glyphs[4] == textm.tmDefaultChar, "GetGlyphIndicesW should have returned a %04x not %04x\n", ok(glyphs[4] == textm.tmDefaultChar, "GetGlyphIndicesW should have returned a %04x not %04x\n",
textm.tmDefaultChar, glyphs[4]); textm.tmDefaultChar, glyphs[4]);
}
else
/* FIXME: Write tests for non-ANSI charsets. */
skip("GetGlyphIndices System font tests only for ANSI_CHARSET\n");
if(!is_font_installed("Tahoma")) if(!is_font_installed("Tahoma"))
{ {
......
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