usp10/tests: Use BOOL type where appropriate

Frédéric Delanoy frederic.delanoy at gmail.com
Wed Feb 26 01:12:41 CST 2014


cf. http://msdn.microsoft.com/en-us/library/windows/desktop/ff468839%28v=vs.85%29.aspx
---
 dlls/usp10/tests/usp10.c | 76 ++++++++++++++++++++++++------------------------
 1 file changed, 38 insertions(+), 38 deletions(-)

diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c
index 22a4ab2..291bbc7 100644
--- a/dlls/usp10/tests/usp10.c
+++ b/dlls/usp10/tests/usp10.c
@@ -1375,18 +1375,18 @@ static void test_ScriptShape(HDC hdc)
     ok(attrs[1].uJustification == SCRIPT_JUSTIFY_CHARACTER, "uJustification incorrect\n");
     ok(attrs[2].uJustification == SCRIPT_JUSTIFY_CHARACTER, "uJustification incorrect\n");
     ok(attrs[3].uJustification == SCRIPT_JUSTIFY_CHARACTER, "uJustification incorrect\n");
-    ok(attrs[0].fClusterStart == 1, "fClusterStart incorrect\n");
-    ok(attrs[1].fClusterStart == 1, "fClusterStart incorrect\n");
-    ok(attrs[2].fClusterStart == 1, "fClusterStart incorrect\n");
-    ok(attrs[3].fClusterStart == 1, "fClusterStart incorrect\n");
-    ok(attrs[0].fDiacritic == 0, "fDiacritic incorrect\n");
-    ok(attrs[1].fDiacritic == 0, "fDiacritic incorrect\n");
-    ok(attrs[2].fDiacritic == 0, "fDiacritic incorrect\n");
-    ok(attrs[3].fDiacritic == 0, "fDiacritic incorrect\n");
-    ok(attrs[0].fZeroWidth == 0, "fZeroWidth incorrect\n");
-    ok(attrs[1].fZeroWidth == 0, "fZeroWidth incorrect\n");
-    ok(attrs[2].fZeroWidth == 0, "fZeroWidth incorrect\n");
-    ok(attrs[3].fZeroWidth == 0, "fZeroWidth incorrect\n");
+    ok(attrs[0].fClusterStart == TRUE, "fClusterStart incorrect\n");
+    ok(attrs[1].fClusterStart == TRUE, "fClusterStart incorrect\n");
+    ok(attrs[2].fClusterStart == TRUE, "fClusterStart incorrect\n");
+    ok(attrs[3].fClusterStart == TRUE, "fClusterStart incorrect\n");
+    ok(attrs[0].fDiacritic == FALSE, "fDiacritic incorrect\n");
+    ok(attrs[1].fDiacritic == FALSE, "fDiacritic incorrect\n");
+    ok(attrs[2].fDiacritic == FALSE, "fDiacritic incorrect\n");
+    ok(attrs[3].fDiacritic == FALSE, "fDiacritic incorrect\n");
+    ok(attrs[0].fZeroWidth == FALSE, "fZeroWidth incorrect\n");
+    ok(attrs[1].fZeroWidth == FALSE, "fZeroWidth incorrect\n");
+    ok(attrs[2].fZeroWidth == FALSE, "fZeroWidth incorrect\n");
+    ok(attrs[3].fZeroWidth == FALSE, "fZeroWidth incorrect\n");
 
     ScriptFreeCache(&sc);
     sc = NULL;
@@ -1407,21 +1407,21 @@ static void test_ScriptShape(HDC hdc)
     ok(attrs[1].uJustification == SCRIPT_JUSTIFY_CHARACTER, "uJustification incorrect\n");
     ok(attrs[2].uJustification == SCRIPT_JUSTIFY_CHARACTER, "uJustification incorrect\n");
     ok(attrs[3].uJustification == SCRIPT_JUSTIFY_CHARACTER, "uJustification incorrect\n");
-    ok(attrs[0].fClusterStart == 1, "fClusterStart incorrect\n");
-    ok(attrs[1].fClusterStart == 1, "fClusterStart incorrect\n");
-    ok(attrs[2].fClusterStart == 1, "fClusterStart incorrect\n");
-    ok(attrs[3].fClusterStart == 1, "fClusterStart incorrect\n");
-    ok(attrs[0].fDiacritic == 0, "fDiacritic incorrect\n");
-    ok(attrs[1].fDiacritic == 0, "fDiacritic incorrect\n");
-    ok(attrs[2].fDiacritic == 0, "fDiacritic incorrect\n");
-    ok(attrs[3].fDiacritic == 0, "fDiacritic incorrect\n");
-    ok(attrs[0].fZeroWidth == 0, "fZeroWidth incorrect\n");
-    ok(attrs[1].fZeroWidth == 0, "fZeroWidth incorrect\n");
-    ok(attrs[2].fZeroWidth == 0, "fZeroWidth incorrect\n");
-    ok(attrs[3].fZeroWidth == 0, "fZeroWidth incorrect\n");
+    ok(attrs[0].fClusterStart == TRUE, "fClusterStart incorrect\n");
+    ok(attrs[1].fClusterStart == TRUE, "fClusterStart incorrect\n");
+    ok(attrs[2].fClusterStart == TRUE, "fClusterStart incorrect\n");
+    ok(attrs[3].fClusterStart == TRUE, "fClusterStart incorrect\n");
+    ok(attrs[0].fDiacritic == FALSE, "fDiacritic incorrect\n");
+    ok(attrs[1].fDiacritic == FALSE, "fDiacritic incorrect\n");
+    ok(attrs[2].fDiacritic == FALSE, "fDiacritic incorrect\n");
+    ok(attrs[3].fDiacritic == FALSE, "fDiacritic incorrect\n");
+    ok(attrs[0].fZeroWidth == FALSE, "fZeroWidth incorrect\n");
+    ok(attrs[1].fZeroWidth == FALSE, "fZeroWidth incorrect\n");
+    ok(attrs[2].fZeroWidth == FALSE, "fZeroWidth incorrect\n");
+    ok(attrs[3].fZeroWidth == FALSE, "fZeroWidth incorrect\n");
 
     /* modify LTR to RTL */
-    items[0].a.fRTL = 1;
+    items[0].a.fRTL = TRUE;
     memset(glyphs2,-1,sizeof(glyphs2));
     memset(logclust,-1,sizeof(logclust));
     memset(attrs,-1,sizeof(attrs));
@@ -1440,18 +1440,18 @@ static void test_ScriptShape(HDC hdc)
     ok(attrs[1].uJustification == SCRIPT_JUSTIFY_CHARACTER, "uJustification incorrect\n");
     ok(attrs[2].uJustification == SCRIPT_JUSTIFY_CHARACTER, "uJustification incorrect\n");
     ok(attrs[3].uJustification == SCRIPT_JUSTIFY_CHARACTER, "uJustification incorrect\n");
-    ok(attrs[0].fClusterStart == 1, "fClusterStart incorrect\n");
-    ok(attrs[1].fClusterStart == 1, "fClusterStart incorrect\n");
-    ok(attrs[2].fClusterStart == 1, "fClusterStart incorrect\n");
-    ok(attrs[3].fClusterStart == 1, "fClusterStart incorrect\n");
-    ok(attrs[0].fDiacritic == 0, "fDiacritic incorrect\n");
-    ok(attrs[1].fDiacritic == 0, "fDiacritic incorrect\n");
-    ok(attrs[2].fDiacritic == 0, "fDiacritic incorrect\n");
-    ok(attrs[3].fDiacritic == 0, "fDiacritic incorrect\n");
-    ok(attrs[0].fZeroWidth == 0, "fZeroWidth incorrect\n");
-    ok(attrs[1].fZeroWidth == 0, "fZeroWidth incorrect\n");
-    ok(attrs[2].fZeroWidth == 0, "fZeroWidth incorrect\n");
-    ok(attrs[3].fZeroWidth == 0, "fZeroWidth incorrect\n");
+    ok(attrs[0].fClusterStart == TRUE, "fClusterStart incorrect\n");
+    ok(attrs[1].fClusterStart == TRUE, "fClusterStart incorrect\n");
+    ok(attrs[2].fClusterStart == TRUE, "fClusterStart incorrect\n");
+    ok(attrs[3].fClusterStart == TRUE, "fClusterStart incorrect\n");
+    ok(attrs[0].fDiacritic == FALSE, "fDiacritic incorrect\n");
+    ok(attrs[1].fDiacritic == FALSE, "fDiacritic incorrect\n");
+    ok(attrs[2].fDiacritic == FALSE, "fDiacritic incorrect\n");
+    ok(attrs[3].fDiacritic == FALSE, "fDiacritic incorrect\n");
+    ok(attrs[0].fZeroWidth == FALSE, "fZeroWidth incorrect\n");
+    ok(attrs[1].fZeroWidth == FALSE, "fZeroWidth incorrect\n");
+    ok(attrs[2].fZeroWidth == FALSE, "fZeroWidth incorrect\n");
+    ok(attrs[3].fZeroWidth == FALSE, "fZeroWidth incorrect\n");
 
     ScriptFreeCache(&sc);
 }
@@ -1611,7 +1611,7 @@ static void test_ScriptItemIzeShapePlace(HDC hdc, unsigned short pwOutGlyphs[256
         if (hr == 0) {
              cChars = cInChars;
              cMaxGlyphs = 256;
-             pItem[0].a.fNoGlyphIndex = 1;                /* say no translate                     */
+             pItem[0].a.fNoGlyphIndex = TRUE; /* say no translate */
              hr = ScriptShape(NULL, &psc, TestItem2, cChars,
                               cMaxGlyphs, &pItem[0].a,
                               pwOutGlyphs2, pwLogClust, psva, &pcGlyphs);
-- 
1.9.0




More information about the wine-patches mailing list