Commit 454a7fde authored by Alexandre Julliard's avatar Alexandre Julliard

comctl32/tests: Fix tab control test failures on older Windows versions.

parent 5f9f079d
...@@ -776,7 +776,8 @@ static void test_getters_setters(HWND parent_wnd, INT nTabs) ...@@ -776,7 +776,8 @@ static void test_getters_setters(HWND parent_wnd, INT nTabs)
tcItem.dwStateMask = TCIS_BUTTONPRESSED; tcItem.dwStateMask = TCIS_BUTTONPRESSED;
selectionIndex = SendMessage(hTab, TCM_GETCURSEL, 0, 0); selectionIndex = SendMessage(hTab, TCM_GETCURSEL, 0, 0);
SendMessage(hTab, TCM_GETITEM, selectionIndex, (LPARAM) &tcItem); SendMessage(hTab, TCM_GETITEM, selectionIndex, (LPARAM) &tcItem);
ok (tcItem.dwState & TCIS_BUTTONPRESSED, "Selected item should have TCIS_BUTTONPRESSED\n"); ok (tcItem.dwState & TCIS_BUTTONPRESSED || broken(tcItem.dwState == 0), /* older comctl32 */
"Selected item should have TCIS_BUTTONPRESSED\n");
} }
/* Testing ExtendedStyle */ /* Testing ExtendedStyle */
...@@ -838,10 +839,6 @@ static void test_getters_setters(HWND parent_wnd, INT nTabs) ...@@ -838,10 +839,6 @@ static void test_getters_setters(HWND parent_wnd, INT nTabs)
DWORD ret; DWORD ret;
char szText[32] = "New Label"; char szText[32] = "New Label";
/* TCM_GETITEM with null dest pointer */
ret = SendMessage(hTab, TCM_GETITEM, 0, (LPARAM)NULL);
expect(FALSE, ret);
/* passing invalid index should result in initialization to zero /* passing invalid index should result in initialization to zero
for members mentioned in mask requested */ for members mentioned in mask requested */
...@@ -920,20 +917,24 @@ static void test_getters_setters(HWND parent_wnd, INT nTabs) ...@@ -920,20 +917,24 @@ static void test_getters_setters(HWND parent_wnd, INT nTabs)
ok ( SendMessage(hTab, TCM_SETITEM, 0, (LPARAM) &tcItem), "Setting new item failed.\n"); ok ( SendMessage(hTab, TCM_SETITEM, 0, (LPARAM) &tcItem), "Setting new item failed.\n");
tcItem.dwState = 0; tcItem.dwState = 0;
ok ( SendMessage(hTab, TCM_GETITEM, 0, (LPARAM) &tcItem), "Getting item failed.\n"); ok ( SendMessage(hTab, TCM_GETITEM, 0, (LPARAM) &tcItem), "Getting item failed.\n");
ok (tcItem.dwState == TCIS_BUTTONPRESSED, "TCIS_BUTTONPRESSED should be set.\n"); if (tcItem.dwState)
/* next highlight item, test that dwStateMask actually masks */ {
tcItem.mask = TCIF_STATE; ok (tcItem.dwState == TCIS_BUTTONPRESSED, "TCIS_BUTTONPRESSED should be set.\n");
tcItem.dwStateMask = TCIS_HIGHLIGHTED; /* next highlight item, test that dwStateMask actually masks */
tcItem.dwState = TCIS_HIGHLIGHTED; tcItem.mask = TCIF_STATE;
ok ( SendMessage(hTab, TCM_SETITEM, 0, (LPARAM) &tcItem), "Setting new item failed.\n"); tcItem.dwStateMask = TCIS_HIGHLIGHTED;
tcItem.dwState = 0; tcItem.dwState = TCIS_HIGHLIGHTED;
ok ( SendMessage(hTab, TCM_GETITEM, 0, (LPARAM) &tcItem), "Getting item failed.\n"); ok ( SendMessage(hTab, TCM_SETITEM, 0, (LPARAM) &tcItem), "Setting new item failed.\n");
ok (tcItem.dwState == TCIS_HIGHLIGHTED, "TCIS_HIGHLIGHTED should be set.\n"); tcItem.dwState = 0;
tcItem.mask = TCIF_STATE; ok ( SendMessage(hTab, TCM_GETITEM, 0, (LPARAM) &tcItem), "Getting item failed.\n");
tcItem.dwStateMask = TCIS_BUTTONPRESSED; ok (tcItem.dwState == TCIS_HIGHLIGHTED, "TCIS_HIGHLIGHTED should be set.\n");
tcItem.dwState = 0; tcItem.mask = TCIF_STATE;
ok ( SendMessage(hTab, TCM_GETITEM, 0, (LPARAM) &tcItem), "Getting item failed.\n"); tcItem.dwStateMask = TCIS_BUTTONPRESSED;
ok (tcItem.dwState == TCIS_BUTTONPRESSED, "TCIS_BUTTONPRESSED should be set.\n"); tcItem.dwState = 0;
ok ( SendMessage(hTab, TCM_GETITEM, 0, (LPARAM) &tcItem), "Getting item failed.\n");
ok (tcItem.dwState == TCIS_BUTTONPRESSED, "TCIS_BUTTONPRESSED should be set.\n");
}
else win_skip( "Item state mask not supported\n" );
} }
/* Testing GetSet ToolTip */ /* Testing GetSet ToolTip */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment