Greg Geldorp : gdi32/tests: Allow ANSI_CHARSET for some tests.

Alexandre Julliard julliard at winehq.org
Wed Jan 12 13:16:53 CST 2011


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

Author: Greg Geldorp <ggeldorp at vmware.com>
Date:   Wed Jan 12 14:11:43 2011 +0100

gdi32/tests: Allow ANSI_CHARSET for some tests.

---

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

diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c
index 28bdcc2..4230ebc 100644
--- a/dlls/gdi32/tests/font.c
+++ b/dlls/gdi32/tests/font.c
@@ -2706,7 +2706,7 @@ todo_wine /* Wine uses Arial for all substitutions */
        !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);
+    ok(cs == expected_cs || cs == ANSI_CHARSET, "expected %d, got %d\n", expected_cs, cs);
     DeleteObject(SelectObject(hdc, hfont));
 
     memset(&lf, 0, sizeof(lf));
@@ -2771,7 +2771,7 @@ todo_wine /* Wine uses Arial for all substitutions */
            !lstrcmpiA(buf, "MS Sans Serif"), /* win2k3 */
            "got %s for font %s\n", buf, font_subst[i].name);
         cs = GetTextCharset(hdc);
-        ok(cs == expected_cs, "expected %d, got %d for font %s\n", expected_cs, cs, font_subst[i].name);
+        ok(cs == expected_cs || cs == ANSI_CHARSET, "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