gdi32: Fix two tests that fail in win2k3.

This commit is contained in:
James Hawkins 2008-05-19 02:24:06 -05:00 committed by Alexandre Julliard
parent 96653ca60a
commit 617d8fee03

View File

@ -1823,7 +1823,9 @@ static void test_nonexistent_font(void)
GetTextFaceA(hdc, sizeof(buf), buf);
todo_wine /* Wine uses Arial for all substitutions */
ok(!lstrcmpiA(buf, "Nonexistent font") /* XP, Vista */ ||
!lstrcmpiA(buf, "MS Serif") /* Win9x */, "Got %s\n", buf);
!lstrcmpiA(buf, "MS Serif") || /* Win9x */
!lstrcmpiA(buf, "MS Sans Serif"), /* win2k3 */
"Got %s\n", buf);
cs = GetTextCharset(hdc);
ok(cs == expected_cs, "expected %d, got %d\n", expected_cs, cs);
DeleteObject(SelectObject(hdc, hfont));
@ -1850,7 +1852,9 @@ todo_wine /* Wine uses Arial for all substitutions */
GetTextFaceA(hdc, sizeof(buf), buf);
todo_wine /* Wine uses Arial for all substitutions */
ok(!lstrcmpiA(buf, "Times New Roman CE") /* XP, Vista */ ||
!lstrcmpiA(buf, "MS Serif") /* Win9x */, "Got %s\n", buf);
!lstrcmpiA(buf, "MS Serif") /* Win9x */ ||
!lstrcmpiA(buf, "MS Sans Serif"), /* win2k3 */
"Got %s\n", buf);
cs = GetTextCharset(hdc);
ok(cs == expected_cs, "expected %d, got %d\n", expected_cs, cs);
DeleteObject(SelectObject(hdc, hfont));