Aric Stewart : usp10/tests: Windows 95 does not set invalid glyphs to 0 but instead 0x80.

Alexandre Julliard julliard at winehq.org
Thu Jun 17 11:17:15 CDT 2010


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

Author: Aric Stewart <aric at codeweavers.com>
Date:   Thu Jun 17 13:11:25 2010 +0900

usp10/tests: Windows 95 does not set invalid glyphs to 0 but instead 0x80.

---

 dlls/usp10/tests/usp10.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c
index 7d0f3eb..522e035 100644
--- a/dlls/usp10/tests/usp10.c
+++ b/dlls/usp10/tests/usp10.c
@@ -262,8 +262,8 @@ static void test_ScriptShape(HDC hdc)
     hr = ScriptShape(hdc, &sc, test2, 4, 4, &items[0].a, glyphs2, logclust, attrs, &nb);
     ok(hr == S_OK, "ScriptShape should return S_OK not %08x\n", hr);
     ok(nb == 4, "Wrong number of items\n");
-    ok(glyphs2[0] == 0, "Incorrect glyph for 0x202B\n");
-    ok(glyphs2[3] == 0, "Incorrect glyph for 0x202C\n");
+    ok(glyphs2[0] == 0 || broken(glyphs2[0] == 0x80), "Incorrect glyph for 0x202B\n");
+    ok(glyphs2[3] == 0 || broken(glyphs2[3] == 0x80), "Incorrect glyph for 0x202C\n");
     ok(logclust[0] == 0, "clusters out of order\n");
     ok(logclust[1] == 1, "clusters out of order\n");
     ok(logclust[2] == 2, "clusters out of order\n");
@@ -640,8 +640,8 @@ static void test_ScriptGetCMap(HDC hdc, unsigned short pwOutGlyphs[256])
     hr = ScriptGetCMap(hdc, &psc, TestItem2, cInChars, dwFlags, pwOutGlyphs3);
     ok (hr == S_FALSE, "ScriptGetCMap should return S_FALSE not (%08x)\n", hr);
     ok (psc != NULL, "psc should not be null and have SCRIPT_CACHE buffer address\n");
-    ok(pwOutGlyphs3[0] == 0, "Glyph 0 should be default glyph\n");
-    ok(pwOutGlyphs3[3] == 0, "Glyph 0 should be default glyph\n");
+    ok(pwOutGlyphs3[0] == 0 || broken(pwOutGlyphs3[0] == 0x80), "Glyph 0 should be default glyph\n");
+    ok(pwOutGlyphs3[3] == 0 || broken(pwOutGlyphs3[0] == 0x80), "Glyph 0 should be default glyph\n");
 
 
     cInChars = cChars = 9;




More information about the wine-cvs mailing list