Vincent Povirk : gdiplus/tests: Don't test the exact substitution of MS Shell Dlg.
Alexandre Julliard
julliard at winehq.org
Mon Mar 23 15:47:10 CDT 2020
Module: wine
Branch: master
Commit: 689e94c597471bb5779268bf21f093f9668c163e
URL: https://source.winehq.org/git/wine.git/?a=commit;h=689e94c597471bb5779268bf21f093f9668c163e
Author: Vincent Povirk <vincent at codeweavers.com>
Date: Sun Mar 22 14:46:17 2020 -0500
gdiplus/tests: Don't test the exact substitution of MS Shell Dlg.
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47872
Signed-off-by: Vincent Povirk <vincent at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/gdiplus/tests/font.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c
index a4a96970af..10d1f3bd5a 100644
--- a/dlls/gdiplus/tests/font.c
+++ b/dlls/gdiplus/tests/font.c
@@ -828,8 +828,7 @@ static void test_font_substitution(void)
memset(&lf, 0xfe, sizeof(lf));
status = GdipGetLogFontA(font, graphics, &lf);
expect(Ok, status);
- ok(!lstrcmpA(lf.lfFaceName, "Microsoft Sans Serif") ||
- !lstrcmpA(lf.lfFaceName, "Tahoma"), "wrong face name %s\n", lf.lfFaceName);
+ ok(lstrcmpA(lf.lfFaceName, "MS Shell Dlg") != 0, "expected substitution of MS Shell Dlg\n");
GdipDeleteFont(font);
status = GdipCreateFontFamilyFromName(L"MS Shell Dlg", NULL, &family);
@@ -839,8 +838,7 @@ static void test_font_substitution(void)
memset(&lf, 0xfe, sizeof(lf));
status = GdipGetLogFontA(font, graphics, &lf);
expect(Ok, status);
- ok(!lstrcmpA(lf.lfFaceName, "Microsoft Sans Serif") ||
- !lstrcmpA(lf.lfFaceName, "Tahoma"), "wrong face name %s\n", lf.lfFaceName);
+ ok(lstrcmpA(lf.lfFaceName, "MS Shell Dlg") != 0, "expected substitution of MS Shell Dlg\n");
GdipDeleteFont(font);
GdipDeleteFontFamily(family);
More information about the wine-cvs
mailing list