James Hawkins : gdi32: Fix two tests that fail in win2k3.

[Alexandre Julliard]

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

Author: James Hawkins 
Date:   Mon May 19 02:24:06 2008 -0500

gdi32: Fix two tests that fail in win2k3.

---

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

diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c
index d4abc8c..93f45d5 100644
--- a/dlls/gdi32/tests/font.c
+++ b/dlls/gdi32/tests/font.c
@@ -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));