ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

This commit is contained in:
Alexandre Julliard 2009-08-26 13:09:05 +02:00
parent 5f9f079d71
commit 454a7fde33
1 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
dlls/comctl32/tests/tab.c
View File

@ -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)
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,6 +917,8 @@ 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");
if (tcItem.dwState)
{
ok (tcItem.dwState == TCIS_BUTTONPRESSED, "TCIS_BUTTONPRESSED should be set.\n"); ok (tcItem.dwState == TCIS_BUTTONPRESSED, "TCIS_BUTTONPRESSED should be set.\n");
/* next highlight item, test that dwStateMask actually masks */ /* next highlight item, test that dwStateMask actually masks */
tcItem.mask = TCIF_STATE; tcItem.mask = TCIF_STATE;
@ -935,6 +934,8 @@ static void test_getters_setters(HWND parent_wnd, INT nTabs)
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"); 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 */
{ {