Austin Lund : gdiplus/tests: Fix GetLogFont charset tests for Asian platforms.

Alexandre Julliard julliard at winehq.org
Mon Oct 25 10:58:21 CDT 2010


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

Author: Austin Lund <austin.lund at gmail.com>
Date:   Mon Oct 25 14:39:08 2010 +1000

gdiplus/tests: Fix GetLogFont charset tests for Asian platforms.

---

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

diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c
index c2ed3c7..834ba60 100644
--- a/dlls/gdiplus/tests/font.c
+++ b/dlls/gdiplus/tests/font.c
@@ -129,7 +129,8 @@ static void test_logfont(void)
     expect(0, lfa2.lfItalic);
     expect(0, lfa2.lfUnderline);
     expect(0, lfa2.lfStrikeOut);
-    expect(GetTextCharset(hdc), lfa2.lfCharSet);
+    ok(lfa2.lfCharSet == GetTextCharset(hdc) || lfa2.lfCharSet == ANSI_CHARSET,
+        "Expected %x or %x, got %x\n", GetTextCharset(hdc), ANSI_CHARSET, lfa2.lfCharSet);
     expect(0, lfa2.lfOutPrecision);
     expect(0, lfa2.lfClipPrecision);
     expect(0, lfa2.lfQuality);
@@ -159,7 +160,8 @@ static void test_logfont(void)
     expect(TRUE, lfa2.lfItalic);
     expect(TRUE, lfa2.lfUnderline);
     expect(TRUE, lfa2.lfStrikeOut);
-    expect(GetTextCharset(hdc), lfa2.lfCharSet);
+    ok(lfa2.lfCharSet == GetTextCharset(hdc) || lfa2.lfCharSet == ANSI_CHARSET,
+        "Expected %x or %x, got %x\n", GetTextCharset(hdc), ANSI_CHARSET, lfa2.lfCharSet);
     expect(0, lfa2.lfOutPrecision);
     expect(0, lfa2.lfClipPrecision);
     expect(0, lfa2.lfQuality);




More information about the wine-cvs mailing list