Alexandre Julliard : comctl32/tests: Fix tab control test failures on older Windows versions.
Alexandre Julliard
julliard at winehq.org
Wed Aug 26 10:44:52 CDT 2009
Module: wine
Branch: master
Commit: 454a7fde33955fa448cf4fe02f04547428b971f3
URL: http://source.winehq.org/git/wine.git/?a=commit;h=454a7fde33955fa448cf4fe02f04547428b971f3
Author: Alexandre Julliard <julliard at winehq.org>
Date: Wed Aug 26 13:09:05 2009 +0200
comctl32/tests: Fix tab control test failures on older Windows versions.
---
dlls/comctl32/tests/tab.c | 39 ++++++++++++++++++++-------------------
1 files changed, 20 insertions(+), 19 deletions(-)
diff --git a/dlls/comctl32/tests/tab.c b/dlls/comctl32/tests/tab.c
index 0361d32..f017b13 100644
--- a/dlls/comctl32/tests/tab.c
+++ b/dlls/comctl32/tests/tab.c
@@ -776,7 +776,8 @@ static void test_getters_setters(HWND parent_wnd, INT nTabs)
tcItem.dwStateMask = TCIS_BUTTONPRESSED;
selectionIndex = SendMessage(hTab, TCM_GETCURSEL, 0, 0);
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 */
@@ -838,10 +839,6 @@ static void test_getters_setters(HWND parent_wnd, INT nTabs)
DWORD ret;
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
for members mentioned in mask requested */
@@ -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");
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");
- /* next highlight item, test that dwStateMask actually masks */
- tcItem.mask = TCIF_STATE;
- tcItem.dwStateMask = TCIS_HIGHLIGHTED;
- tcItem.dwState = TCIS_HIGHLIGHTED;
- ok ( SendMessage(hTab, TCM_SETITEM, 0, (LPARAM) &tcItem), "Setting new item failed.\n");
- tcItem.dwState = 0;
- ok ( SendMessage(hTab, TCM_GETITEM, 0, (LPARAM) &tcItem), "Getting item failed.\n");
- ok (tcItem.dwState == TCIS_HIGHLIGHTED, "TCIS_HIGHLIGHTED should be set.\n");
- tcItem.mask = TCIF_STATE;
- tcItem.dwStateMask = TCIS_BUTTONPRESSED;
- 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");
+ if (tcItem.dwState)
+ {
+ ok (tcItem.dwState == TCIS_BUTTONPRESSED, "TCIS_BUTTONPRESSED should be set.\n");
+ /* next highlight item, test that dwStateMask actually masks */
+ tcItem.mask = TCIF_STATE;
+ tcItem.dwStateMask = TCIS_HIGHLIGHTED;
+ tcItem.dwState = TCIS_HIGHLIGHTED;
+ ok ( SendMessage(hTab, TCM_SETITEM, 0, (LPARAM) &tcItem), "Setting new item failed.\n");
+ tcItem.dwState = 0;
+ ok ( SendMessage(hTab, TCM_GETITEM, 0, (LPARAM) &tcItem), "Getting item failed.\n");
+ ok (tcItem.dwState == TCIS_HIGHLIGHTED, "TCIS_HIGHLIGHTED should be set.\n");
+ tcItem.mask = TCIF_STATE;
+ tcItem.dwStateMask = TCIS_BUTTONPRESSED;
+ 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 */
More information about the wine-cvs
mailing list