Huw Davies : gdi32/tests: Output the requested font name on failure.
Alexandre Julliard
julliard at winehq.org
Thu Feb 19 09:18:46 CST 2009
Module: wine
Branch: master
Commit: e6a0fa9f4428126985c146fb0e3833424ae510c9
URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6a0fa9f4428126985c146fb0e3833424ae510c9
Author: Huw Davies <huw at codeweavers.com>
Date: Wed Feb 18 22:52:22 2009 +0000
gdi32/tests: Output the requested font name on failure.
---
dlls/gdi32/tests/font.c | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c
index 2a10f80..badd572 100644
--- a/dlls/gdi32/tests/font.c
+++ b/dlls/gdi32/tests/font.c
@@ -2574,16 +2574,16 @@ todo_wine /* Wine uses Arial for all substitutions */
cs = GetTextCharset(hdc);
if (font_subst[i].charset == expected_cs)
{
- ok(cs == expected_cs, "expected %d, got %d\n", expected_cs, cs);
+ ok(cs == expected_cs, "expected %d, got %d for font %s\n", expected_cs, cs, font_subst[i].name);
GetTextFaceA(hdc, sizeof(buf), buf);
ok(!lstrcmpiA(buf, font_subst[i].name), "expected %s, got %s\n", font_subst[i].name, buf);
}
else
{
- ok(cs == ANSI_CHARSET, "expected ANSI_CHARSET, got %d\n", cs);
+ ok(cs == ANSI_CHARSET, "expected ANSI_CHARSET, got %d for font %s\n", cs, font_subst[i].name);
GetTextFaceA(hdc, sizeof(buf), buf);
ok(!lstrcmpiA(buf, "Arial") /* XP, Vista */ ||
- !lstrcmpiA(buf, "Times New Roman") /* Win9x */, "got %s\n", buf);
+ !lstrcmpiA(buf, "Times New Roman") /* Win9x */, "got %s for font %s\n", buf, font_subst[i].name);
}
DeleteObject(SelectObject(hdc, hfont));
@@ -2598,9 +2598,9 @@ todo_wine /* Wine uses Arial for all substitutions */
!lstrcmpiA(buf, font_subst[i].name) /* XP, Vista */ ||
!lstrcmpiA(buf, "MS Serif") /* Win9x */ ||
!lstrcmpiA(buf, "MS Sans Serif"), /* win2k3 */
- "got %s\n", buf);
+ "got %s for font %s\n", buf, font_subst[i].name);
cs = GetTextCharset(hdc);
- ok(cs == expected_cs, "expected %d, got %d\n", expected_cs, cs);
+ ok(cs == expected_cs, "expected %d, got %d for font %s\n", expected_cs, cs, font_subst[i].name);
DeleteObject(SelectObject(hdc, hfont));
}
More information about the wine-cvs
mailing list