comctl32/tests: Use win_skip() for tests that should not be skipped on Wine.
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
669d033ee1
commit
ad566da137
|
@ -527,23 +527,14 @@ static void test_dtm_set_and_get_system_time(void)
|
||||||
{
|
{
|
||||||
LRESULT r;
|
LRESULT r;
|
||||||
SYSTEMTIME st, getSt, ref;
|
SYSTEMTIME st, getSt, ref;
|
||||||
HWND hWnd, hWndDateTime_test_gdt_none;
|
HWND hWnd;
|
||||||
|
|
||||||
hWndDateTime_test_gdt_none = create_datetime_control(0);
|
hWnd = create_datetime_control(0);
|
||||||
|
ok(hWnd !=NULL, "Expected non NULL, got %p\n", hWnd);
|
||||||
ok(hWndDateTime_test_gdt_none!=NULL, "Expected non NULL, got %p\n", hWndDateTime_test_gdt_none);
|
r = SendMessageA(hWnd, DTM_SETSYSTEMTIME, GDT_NONE, (LPARAM)&st);
|
||||||
if(hWndDateTime_test_gdt_none) {
|
|
||||||
r = SendMessageA(hWndDateTime_test_gdt_none, DTM_SETSYSTEMTIME, GDT_NONE, (LPARAM)&st);
|
|
||||||
expect(0, r);
|
expect(0, r);
|
||||||
}
|
|
||||||
else {
|
|
||||||
skip("hWndDateTime_test_gdt_none is NULL\n");
|
|
||||||
flush_sequences(sequences, NUM_MSG_SEQUENCES);
|
|
||||||
|
|
||||||
return;
|
DestroyWindow(hWnd);
|
||||||
}
|
|
||||||
|
|
||||||
DestroyWindow(hWndDateTime_test_gdt_none);
|
|
||||||
|
|
||||||
hWnd = create_datetime_control(DTS_SHOWNONE);
|
hWnd = create_datetime_control(DTS_SHOWNONE);
|
||||||
flush_sequences(sequences, NUM_MSG_SEQUENCES);
|
flush_sequences(sequences, NUM_MSG_SEQUENCES);
|
||||||
|
@ -797,7 +788,7 @@ START_TEST(datetime)
|
||||||
pInitCommonControlsEx = (void*)GetProcAddress(hComctl32, "InitCommonControlsEx");
|
pInitCommonControlsEx = (void*)GetProcAddress(hComctl32, "InitCommonControlsEx");
|
||||||
if (!pInitCommonControlsEx)
|
if (!pInitCommonControlsEx)
|
||||||
{
|
{
|
||||||
skip("InitCommonControlsEx() is missing. Skipping the tests\n");
|
win_skip("InitCommonControlsEx() is missing. Skipping the tests\n");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
iccex.dwSize = sizeof(iccex);
|
iccex.dwSize = sizeof(iccex);
|
||||||
|
|
|
@ -1662,7 +1662,7 @@ static BOOL init(void)
|
||||||
pInitCommonControlsEx = (void*)GetProcAddress(hComctl32, "InitCommonControlsEx");
|
pInitCommonControlsEx = (void*)GetProcAddress(hComctl32, "InitCommonControlsEx");
|
||||||
if (!pInitCommonControlsEx)
|
if (!pInitCommonControlsEx)
|
||||||
{
|
{
|
||||||
skip("InitCommonControlsEx() is missing. Skipping the tests\n");
|
win_skip("InitCommonControlsEx() is missing. Skipping the tests\n");
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -2053,7 +2053,7 @@ START_TEST(monthcal)
|
||||||
pInitCommonControlsEx = (void*)GetProcAddress(hComctl32, "InitCommonControlsEx");
|
pInitCommonControlsEx = (void*)GetProcAddress(hComctl32, "InitCommonControlsEx");
|
||||||
if (!pInitCommonControlsEx)
|
if (!pInitCommonControlsEx)
|
||||||
{
|
{
|
||||||
skip("InitCommonControlsEx() is missing. Skipping the tests\n");
|
win_skip("InitCommonControlsEx() is missing. Skipping the tests\n");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
iccex.dwSize = sizeof(iccex);
|
iccex.dwSize = sizeof(iccex);
|
||||||
|
|
|
@ -236,7 +236,7 @@ static void test_MRUListA(void)
|
||||||
|
|
||||||
if (!pCreateMRUListA || !pFreeMRUList || !pAddMRUStringA || !pEnumMRUListA)
|
if (!pCreateMRUListA || !pFreeMRUList || !pAddMRUStringA || !pEnumMRUListA)
|
||||||
{
|
{
|
||||||
skip("MRU entry points not found\n");
|
win_skip("MRU entry points not found\n");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue