On 2/28/2014 13:58, Frédéric Delanoy wrote:
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;
This is correct.
@@ -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");
And this is not better than it was. I prefer original patch, with variable type fixes only.