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:
Nikolay Sivov 2017-01-25 02:31:00 +03:00 committed by Alexandre Julliard
parent 669d033ee1
commit ad566da137
4 changed files with 10 additions and 19 deletions

View File

@ -527,23 +527,14 @@ static void test_dtm_set_and_get_system_time(void)
{
LRESULT r;
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);
r = SendMessageA(hWnd, DTM_SETSYSTEMTIME, GDT_NONE, (LPARAM)&st);
expect(0, r);
ok(hWndDateTime_test_gdt_none!=NULL, "Expected non NULL, got %p\n", hWndDateTime_test_gdt_none);
if(hWndDateTime_test_gdt_none) {
r = SendMessageA(hWndDateTime_test_gdt_none, DTM_SETSYSTEMTIME, GDT_NONE, (LPARAM)&st);
expect(0, r);
}
else {
skip("hWndDateTime_test_gdt_none is NULL\n");
flush_sequences(sequences, NUM_MSG_SEQUENCES);
return;
}
DestroyWindow(hWndDateTime_test_gdt_none);
DestroyWindow(hWnd);
hWnd = create_datetime_control(DTS_SHOWNONE);
flush_sequences(sequences, NUM_MSG_SEQUENCES);
@ -797,7 +788,7 @@ START_TEST(datetime)
pInitCommonControlsEx = (void*)GetProcAddress(hComctl32, "InitCommonControlsEx");
if (!pInitCommonControlsEx)
{
skip("InitCommonControlsEx() is missing. Skipping the tests\n");
win_skip("InitCommonControlsEx() is missing. Skipping the tests\n");
return;
}
iccex.dwSize = sizeof(iccex);

View File

@ -1662,7 +1662,7 @@ static BOOL init(void)
pInitCommonControlsEx = (void*)GetProcAddress(hComctl32, "InitCommonControlsEx");
if (!pInitCommonControlsEx)
{
skip("InitCommonControlsEx() is missing. Skipping the tests\n");
win_skip("InitCommonControlsEx() is missing. Skipping the tests\n");
return FALSE;
}

View File

@ -2053,7 +2053,7 @@ START_TEST(monthcal)
pInitCommonControlsEx = (void*)GetProcAddress(hComctl32, "InitCommonControlsEx");
if (!pInitCommonControlsEx)
{
skip("InitCommonControlsEx() is missing. Skipping the tests\n");
win_skip("InitCommonControlsEx() is missing. Skipping the tests\n");
return;
}
iccex.dwSize = sizeof(iccex);

View File

@ -236,7 +236,7 @@ static void test_MRUListA(void)
if (!pCreateMRUListA || !pFreeMRUList || !pAddMRUStringA || !pEnumMRUListA)
{
skip("MRU entry points not found\n");
win_skip("MRU entry points not found\n");
return;
}