user32/tests: Use BOOL type where appropriate

Frédéric Delanoy frederic.delanoy at gmail.com
Mon Jan 6 17:14:35 CST 2014


---
 dlls/user32/tests/dialog.c | 80 +++++++++++++++++++++++-----------------------
 dlls/user32/tests/win.c    |  2 +-
 2 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c
index ef72cfe..dc26fa1 100644
--- a/dlls/user32/tests/dialog.c
+++ b/dlls/user32/tests/dialog.c
@@ -244,7 +244,7 @@ static void FormEnterMsg (MSG *pMsg, HWND hwnd)
 
 typedef struct
 {
-    int isok; /* or is it todo */
+    BOOL isok; /* or is it todo */
     int test;
     int dlg;
     int ctl;
@@ -346,45 +346,45 @@ static void test_GetNextDlgItem(void)
     {
         /* isok test dlg  ctl  tab  prev res  */
 
-        {   1,   1,    6,   0,   0,   1,   0},
-        {   1,   2,    6,   0,   1,   1,   0},
-        {   1,   3,    6,   6,   0,   1,   0},
-        {   1,   4,    6,   6,   1,   1,   0},
-        {   1,   5,    6,   0,   0,   0,  66},
-        {   1,   6,    6,   0,   1,   0,  67},
-        {   1,   7,    6,   6,   0,   0,  66},
-        {   1,   8,    6,   6,   1,   0,  67},
-
-        {   1,   9,    4,  83,   1,   0,  84},
-        {   1,  10,    4,  83,   0,   0,   5},
-        {   1,  11,    5,  81,   1,   0,  67},
-        {   1,  12,    5,  81,   0,   0,  66},
-        {   1,  13,    5,  82,   1,   1,  78},
-
-        {   1,  14,    5,  82,   0,   1,  79},
-        {   1,  15,    6,  70,   0,   0,  72},
-        {   1,  16,    6,  72,   0,   0,  25},
-        {   1,  17,    6,  75,   0,   0,  26},
-        {   1,  18,    6,  77,   0,   0,  76},
-        {   1,  19,    6,  79,   0,   0,  66},
-        {   1,  20,    6,  71,   0,   0,  72},
-        {   1,  21,    6,  64,   0,   0,  66},
-
-        {   1,  22,    6,  25,   0,   0,  70},
-        {   1,  23,    6,  68,   0,   0,  68},
-        {   1,  24,    6,  25,   0,   1,  72},
-        {   1,  25,    1,  70,   0,   0,  72},
-        /*{   0,  26,    1,  70,   0,   1,   3}, Crashes Win95*/
-        {   1,  27,    1,  70,   1,   0,  72},
-        /*{   0,  28,    1,  70,   1,   1,  61}, Crashes Win95*/
-
-        {   1,  29,    6,  67,   1,   0,  72},
-        {   1,  30,    6,  72,   1,   1,  67},
-
-        {   1,  35,    2,   0,   0,   0,  60},
-        {   1,  36,    2,   0,   1,   0,  60},
-
-        {   0,   0,    0,   0,   0,   0,   0}  /* End of test */
+        {  TRUE,  1,  6,   0,   0,   1,   0 },
+        {  TRUE,  2,  6,   0,   1,   1,   0 },
+        {  TRUE,  3,  6,   6,   0,   1,   0 },
+        {  TRUE,  4,  6,   6,   1,   1,   0 },
+        {  TRUE,  5,  6,   0,   0,   0,  66 },
+        {  TRUE,  6,  6,   0,   1,   0,  67 },
+        {  TRUE,  7,  6,   6,   0,   0,  66 },
+        {  TRUE,  8,  6,   6,   1,   0,  67 },
+
+        {  TRUE,  9,  4,  83,   1,   0,  84 },
+        {  TRUE, 10,  4,  83,   0,   0,   5 },
+        {  TRUE, 11,  5,  81,   1,   0,  67 },
+        {  TRUE, 12,  5,  81,   0,   0,  66 },
+        {  TRUE, 13,  5,  82,   1,   1,  78 },
+
+        {  TRUE, 14,  5,  82,   0,   1,  79 },
+        {  TRUE, 15,  6,  70,   0,   0,  72 },
+        {  TRUE, 16,  6,  72,   0,   0,  25 },
+        {  TRUE, 17,  6,  75,   0,   0,  26 },
+        {  TRUE, 18,  6,  77,   0,   0,  76 },
+        {  TRUE, 19,  6,  79,   0,   0,  66 },
+        {  TRUE, 20,  6,  71,   0,   0,  72 },
+        {  TRUE, 21,  6,  64,   0,   0,  66 },
+
+        {  TRUE, 22,  6,  25,   0,   0,  70 },
+        {  TRUE, 23,  6,  68,   0,   0,  68 },
+        {  TRUE, 24,  6,  25,   0,   1,  72 },
+        {  TRUE, 25,  1,  70,   0,   0,  72 },
+     /* { FALSE, 26,  1,  70,   0,   1,   3 }, Crashes Win95 */
+        {  TRUE, 27,  1,  70,   1,   0,  72 },
+     /* { FALSE, 28,  1,  70,   1,   1,  61 }, Crashes Win95 */
+
+        {  TRUE, 29,  6,  67,   1,   0,  72 },
+        {  TRUE, 30,  6,  72,   1,   1,  67 },
+
+        {  TRUE, 35,  2,   0,   0,   0,  60 },
+        {  TRUE, 36,  2,   0,   1,   0,  60 },
+
+        { FALSE,  0,  0,   0,   0,   0,   0 }  /* End of test */
     };
     const test_record *p = test;
 
diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c
index dfcad52..79d7be9 100644
--- a/dlls/user32/tests/win.c
+++ b/dlls/user32/tests/win.c
@@ -7049,7 +7049,7 @@ static void create_window_tree(HWND parent, HWND *window, int size)
 struct window_attributes
 {
     char class_name[128];
-    int is_visible, is_enabled, is_groupbox, is_httransparent, is_extransparent;
+    BOOL is_visible, is_enabled, is_groupbox, is_httransparent, is_extransparent;
 };
 
 static void get_window_attributes(HWND hwnd, struct window_attributes *attrs)
-- 
1.8.5.2




More information about the wine-patches mailing list