comctl32/tests: Use BOOL type where appropriate (try 2)

[Frédéric Delanoy]

---
 dlls/comctl32/tests/toolbar.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c
index 29c80fb..1206429 100644
--- a/dlls/comctl32/tests/toolbar.c
+++ b/dlls/comctl32/tests/toolbar.c
@@ -42,8 +42,8 @@ static struct msg_sequence *sequences[NUM_MSG_SEQUENCES];
 static HWND hMainWnd;
 static BOOL g_fBlockHotItemChange;
 static BOOL g_fReceivedHotItemChange;
-static BOOL g_fExpectedHotItemOld;
-static BOOL g_fExpectedHotItemNew;
+static int  g_fExpectedHotItemOld;
+static int  g_fExpectedHotItemNew;
 static DWORD g_dwExpectedDispInfoMask;
 static BOOL g_ResetDispTextPtr;
 
@@ -623,12 +623,12 @@ static void test_hotitem(void)
     g_fReceivedHotItemChange = FALSE;
     ret = SendMessageA(hToolbar, TB_SETHOTITEM, 0xbeaf, 0);
     ok(ret == 3, "TB_SETHOTITEM returned %ld, expected 3\n", ret);
-    ok(g_fReceivedHotItemChange == FALSE, "TBN_HOTITEMCHANGE received for invalid parameter\n");
+    ok(!g_fReceivedHotItemChange, "TBN_HOTITEMCHANGE received for invalid parameter\n");
 
     g_fReceivedHotItemChange = FALSE;
     ret = SendMessageA(hToolbar, TB_SETHOTITEM, 3, 0);
     ok(ret == 3, "TB_SETHOTITEM returned %ld, expected 3\n", ret);
-    ok(g_fReceivedHotItemChange == FALSE, "TBN_HOTITEMCHANGE received after a duplication\n");
+    ok(!g_fReceivedHotItemChange, "TBN_HOTITEMCHANGE received after a duplication\n");
 
     expect_hot_notify(7, 0);
     ret = SendMessageA(hToolbar, TB_SETHOTITEM, -0xbeaf, 0);
@@ -655,7 +655,7 @@ static void test_hotitem(void)
     SendMessageA(hToolbar, TB_ENABLEBUTTON, 7, FALSE);
     ret = SendMessageA(hToolbar, TB_GETHOTITEM, 0, 0);
     ok(ret == 3, "TB_SETHOTITEM returned %ld, expected 3\n", ret);
-    ok(g_fReceivedHotItemChange == FALSE, "Unexpected TBN_HOTITEMCHANGE\n");
+    ok(!g_fReceivedHotItemChange, "Unexpected TBN_HOTITEMCHANGE\n");
 
     SendMessageA(hToolbar, TB_SETHOTITEM, 1, 0);
     tbinfo.cbSize = sizeof(TBBUTTONINFOA);
@@ -665,7 +665,7 @@ static void test_hotitem(void)
     ok(SendMessageA(hToolbar, TB_SETBUTTONINFOA, 1, (LPARAM)&tbinfo) == TRUE, "TB_SETBUTTONINFOA failed\n");
     ret = SendMessageA(hToolbar, TB_GETHOTITEM, 0, 0);
     ok(ret == 1, "TB_SETHOTITEM returned %ld, expected 1\n", ret);
-    ok(g_fReceivedHotItemChange == FALSE, "Unexpected TBN_HOTITEMCHANGE\n");
+    ok(!g_fReceivedHotItemChange, "Unexpected TBN_HOTITEMCHANGE\n");
 
     DestroyWindow(hToolbar);
 }
-- 
1.9.0