kernel32/tests: Use win_skip() to skip over unimplemented functionality.

This commit is contained in:
Francois Gouget 2009-02-24 00:03:07 +01:00 committed by Alexandre Julliard
parent b2f2e53fc8
commit 5989534540
17 changed files with 43 additions and 43 deletions

View File

@ -1202,7 +1202,7 @@ START_TEST(actctx)
if (!init_funcs())
{
skip("Needed functions are not available\n");
win_skip("Needed functions are not available\n");
return;
}
init_paths();

View File

@ -264,7 +264,7 @@ static void test_ffcn(void)
r = GetTempPathW( MAX_PATH, path );
if (!r && (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED))
{
skip("GetTempPathW is not implemented\n");
win_skip("GetTempPathW is not implemented\n");
return;
}
ok( r != 0, "temp path failed\n");
@ -387,7 +387,7 @@ static void test_readdirectorychanges(void)
if (!pReadDirectoryChangesW)
{
skip("ReadDirectoryChangesW is not available\n");
win_skip("ReadDirectoryChangesW is not available\n");
return;
}
@ -395,7 +395,7 @@ static void test_readdirectorychanges(void)
r = GetTempPathW( MAX_PATH, path );
if (!r && (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED))
{
skip("GetTempPathW is not implemented\n");
win_skip("GetTempPathW is not implemented\n");
return;
}
ok( r != 0, "temp path failed\n");
@ -615,14 +615,14 @@ static void test_readdirectorychanges_null(void)
if (!pReadDirectoryChangesW)
{
skip("ReadDirectoryChangesW is not available\n");
win_skip("ReadDirectoryChangesW is not available\n");
return;
}
SetLastError(0xdeadbeef);
r = GetTempPathW( MAX_PATH, path );
if (!r && (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED))
{
skip("GetTempPathW is not implemented\n");
win_skip("GetTempPathW is not implemented\n");
return;
}
ok( r != 0, "temp path failed\n");
@ -717,7 +717,7 @@ static void test_readdirectorychanges_filedir(void)
r = GetTempPathW( MAX_PATH, path );
if (!r && (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED))
{
skip("GetTempPathW is not implemented\n");
win_skip("GetTempPathW is not implemented\n");
return;
}
ok( r != 0, "temp path failed\n");

View File

@ -706,7 +706,7 @@ static void testScreenBuffer(HANDLE hConOut)
ret = SetConsoleOutputCP(866);
if (!ret && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)
{
skip("SetConsoleOutputCP is not implemented\n");
win_skip("SetConsoleOutputCP is not implemented\n");
return;
}
ok(ret, "Cannot set output codepage to 866\n");
@ -962,7 +962,7 @@ START_TEST(console)
if (!pGetConsoleInputExeNameA || !pSetConsoleInputExeNameA)
{
skip("GetConsoleInputExeNameA and/or SetConsoleInputExeNameA is not available\n");
win_skip("GetConsoleInputExeNameA and/or SetConsoleInputExeNameA is not available\n");
return;
}
else

View File

@ -148,7 +148,7 @@ static void test_GetSetEnvironmentVariableW(void)
if (ret == FALSE && GetLastError()==ERROR_CALL_NOT_IMPLEMENTED)
{
/* Must be Win9x which doesn't support the Unicode functions */
skip("SetEnvironmentVariableW is not implemented\n");
win_skip("SetEnvironmentVariableW is not implemented\n");
return;
}
ok(ret == TRUE,
@ -359,7 +359,7 @@ static void test_GetComputerName(void)
ret = GetComputerNameW((LPWSTR)0xdeadbeef, &size);
error = GetLastError();
if (error == ERROR_CALL_NOT_IMPLEMENTED)
skip("GetComputerNameW is not implemented\n");
win_skip("GetComputerNameW is not implemented\n");
else
{
todo_wine
@ -384,7 +384,7 @@ static void test_GetComputerNameExA(void)
if (!pGetComputerNameExA)
{
skip("GetComputerNameExA function not implemented\n");
win_skip("GetComputerNameExA function not implemented\n");
return;
}
@ -458,7 +458,7 @@ static void test_GetComputerNameExW(void)
if (!pGetComputerNameExW)
{
skip("GetComputerNameExW function not implemented\n");
win_skip("GetComputerNameExW function not implemented\n");
return;
}

View File

@ -1506,7 +1506,7 @@ static void test_FindFirstFileExA(void)
if (!pFindFirstFileExA)
{
skip("FindFirstFileExA() is missing\n");
win_skip("FindFirstFileExA() is missing\n");
return;
}
@ -1519,7 +1519,7 @@ static void test_FindFirstFileExA(void)
handle = pFindFirstFileExA("test-dir\\*", FindExInfoStandard, &search_results, FindExSearchLimitToDirectories, NULL, 0);
if (handle == INVALID_HANDLE_VALUE && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)
{
skip("FindFirstFileExA is not implemented\n");
win_skip("FindFirstFileExA is not implemented\n");
goto cleanup;
}
ok(handle != INVALID_HANDLE_VALUE, "FindFirstFile failed (err=%u)\n", GetLastError());
@ -2139,7 +2139,7 @@ static void test_ReplaceFileA(void)
if (!pReplaceFileA)
{
skip("ReplaceFileA() is missing\n");
win_skip("ReplaceFileA() is missing\n");
return;
}
@ -2347,7 +2347,7 @@ static void test_ReplaceFileW(void)
if (!pReplaceFileW)
{
skip("ReplaceFileW() is missing\n");
win_skip("ReplaceFileW() is missing\n");
return;
}

View File

@ -237,7 +237,7 @@ static void test_message_null_buffer(void)
error = GetLastError();
if (!ret && error == ERROR_CALL_NOT_IMPLEMENTED)
{
skip("FormatMessageW is not implemented\n");
win_skip("FormatMessageW is not implemented\n");
return;
}

View File

@ -1909,7 +1909,7 @@ static void test_FoldStringW(void)
if (!pFoldStringW)
{
skip("FoldStringW is not available\n");
win_skip("FoldStringW is not available\n");
return; /* FoldString is present in NT v3.1+, but not 95/98/Me */
}
@ -1921,7 +1921,7 @@ static void test_FoldStringW(void)
ret = pFoldStringW(badFlags[i], src, 256, dst, 256);
if (GetLastError()==ERROR_CALL_NOT_IMPLEMENTED)
{
skip("FoldStringW is not implemented\n");
win_skip("FoldStringW is not implemented\n");
return;
}
ok(!ret && GetLastError() == ERROR_INVALID_FLAGS,
@ -2299,7 +2299,7 @@ static void test_EnumUILanguageA(void)
{
BOOL ret;
if (!pEnumUILanguagesA) {
skip("EnumUILanguagesA is not available on Win9x or NT4\n");
win_skip("EnumUILanguagesA is not available on Win9x or NT4\n");
return;
}

View File

@ -961,7 +961,7 @@ static void test_GetLongPathNameW(void)
length = pGetLongPathNameW(NULL,NULL,0);
if (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)
{
skip("GetLongPathNameW is not implemented\n");
win_skip("GetLongPathNameW is not implemented\n");
return;
}
ok(0==length,"GetLongPathNameW returned %d but expected 0\n",length);
@ -990,7 +990,7 @@ static void test_GetShortPathNameW(void)
GetTempPathW( MAX_PATH, path );
if (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)
{
skip("GetTempPathW is not implemented\n");
win_skip("GetTempPathW is not implemented\n");
return;
}

View File

@ -1409,7 +1409,7 @@ static void test_OpenProcess(void)
/* not exported in all windows versions */
if ((!pVirtualAllocEx) || (!pVirtualFreeEx)) {
skip("VirtualAllocEx not found\n");
win_skip("VirtualAllocEx not found\n");
return;
}
@ -1423,7 +1423,7 @@ static void test_OpenProcess(void)
if (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)
{ /* Win9x */
CloseHandle(hproc);
skip("VirtualAllocEx not implemented\n");
win_skip("VirtualAllocEx not implemented\n");
return;
}
ok(GetLastError() == ERROR_ACCESS_DENIED, "wrong error %d\n", GetLastError());

View File

@ -310,7 +310,7 @@ START_TEST(resource)
if (GLE == ERROR_CALL_NOT_IMPLEMENTED)
{
skip("Resource calls are not implemented\n");
win_skip("Resource calls are not implemented\n");
return;
}

View File

@ -54,7 +54,7 @@ static void test_signalandwait(void)
r = pSignalObjectAndWait(NULL, NULL, 0, 0);
if (r == ERROR_INVALID_FUNCTION)
{
skip("SignalObjectAndWait is not implemented\n");
win_skip("SignalObjectAndWait is not implemented\n");
return; /* Win98/ME */
}
ok( r == WAIT_FAILED, "should fail\n");
@ -220,7 +220,7 @@ static void test_slist(void)
pInterlockedPopEntrySList == NULL ||
pInterlockedPushEntrySList == NULL)
{
skip("some required slist entrypoints were not found, skipping tests\n");
win_skip("some required slist entrypoints were not found, skipping tests\n");
return;
}
@ -393,7 +393,7 @@ static void test_waitable_timer(void)
if (!pCreateWaitableTimerA || !pOpenWaitableTimerA)
{
skip("{Create,Open}WaitableTimerA() is not available\n");
win_skip("{Create,Open}WaitableTimerA() is not available\n");
return;
}
@ -455,7 +455,7 @@ static void test_iocp_callback(void)
p_BindIoCompletionCallback = (void*)GetProcAddress(hmod, "BindIoCompletionCallback");
if(!p_BindIoCompletionCallback) {
skip("BindIoCompletionCallback not found in this DLL\n");
win_skip("BindIoCompletionCallback not found in this DLL\n");
return;
}
@ -645,7 +645,7 @@ static void test_timer_queue(void)
if (!pChangeTimerQueueTimer || !pCreateTimerQueue || !pCreateTimerQueueTimer
|| !pDeleteTimerQueueEx || !pDeleteTimerQueueTimer)
{
skip("TimerQueue API not present\n");
win_skip("TimerQueue API not present\n");
return;
}

View File

@ -308,7 +308,7 @@ static VOID test_CreateRemoteThread(void)
hRemoteEvent, CREATE_SUSPENDED, &tid);
if (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)
{
skip("CreateRemoteThread is not implemented\n");
win_skip("CreateRemoteThread is not implemented\n");
goto cleanup;
}
ok(hThread != NULL, "CreateRemoteThread failed, err=%u\n", GetLastError());
@ -978,7 +978,7 @@ static void test_RegisterWaitForSingleObject(void)
if (!pRegisterWaitForSingleObject || !pUnregisterWait)
{
skip("RegisterWaitForSingleObject or UnregisterWait not implemented\n");
win_skip("RegisterWaitForSingleObject or UnregisterWait not implemented\n");
return;
}

View File

@ -294,7 +294,7 @@ static void test_GetTimeZoneInformation(void)
if (!pSystemTimeToTzSpecificLocalTime)
{
skip("SystemTimeToTzSpecificLocalTime not present\n");
win_skip("SystemTimeToTzSpecificLocalTime not available\n");
return;
}
@ -305,7 +305,7 @@ static void test_GetTimeZoneInformation(void)
res = pSystemTimeToTzSpecificLocalTime(&tzinfo, &utc, &current);
if (!res && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)
{
skip("SystemTimeToTzSpecificLocalTime is not implemented\n");
win_skip("SystemTimeToTzSpecificLocalTime is not implemented\n");
return;
}
@ -425,7 +425,7 @@ static void test_TzSpecificLocalTimeToSystemTime(void)
if (!pTzSpecificLocalTimeToSystemTime || !pSystemTimeToTzSpecificLocalTime)
{
skip("TzSpecificLocalTimeToSystemTime or SystemTimeToTzSpecificLocalTime not present\n");
win_skip("TzSpecificLocalTimeToSystemTime or SystemTimeToTzSpecificLocalTime not available\n");
return;
}

View File

@ -39,14 +39,14 @@ static void test_timer(void)
pCreateWaitableTimerA = (fnCreateWaitableTimerA) GetProcAddress( hker, "CreateWaitableTimerA");
if( !pCreateWaitableTimerA )
{
skip("CreateWaitableTimerA is not available\n");
win_skip("CreateWaitableTimerA is not available\n");
return;
}
pSetWaitableTimer = (fnSetWaitableTimer) GetProcAddress( hker, "SetWaitableTimer");
if( !pSetWaitableTimer )
{
skip("SetWaitableTimer is not available\n");
win_skip("SetWaitableTimer is not available\n");
return;
}

View File

@ -305,7 +305,7 @@ START_TEST(toolhelp)
!pProcess32First || !pProcess32Next ||
!pThread32First || !pThread32Next)
{
skip("Needed functions are not available, most likely running on Windows NT\n");
win_skip("Needed functions are not available, most likely running on Windows NT\n");
return;
}

View File

@ -107,7 +107,7 @@ static void test_VerifyVersionInfo(void)
if(!pVerifyVersionInfoA || !pVerSetConditionMask)
{
skip("Needed functions not available\n");
win_skip("Needed functions not available\n");
return;
}

View File

@ -66,7 +66,7 @@ static void test_VirtualAllocEx(void)
/* not exported in all windows-versions */
if ((!pVirtualAllocEx) || (!pVirtualFreeEx)) {
skip("VirtualAllocEx not found\n");
win_skip("Virtual{Alloc,Free}Ex not available\n");
return;
}
@ -78,7 +78,7 @@ static void test_VirtualAllocEx(void)
PAGE_EXECUTE_READWRITE);
if (!addr1 && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)
{ /* Win9x */
skip("VirtualAllocEx not implemented\n");
win_skip("VirtualAllocEx not implemented\n");
TerminateProcess(hProcess, 0);
CloseHandle(hProcess);
return;
@ -703,7 +703,7 @@ static void test_NtMapViewOfSection(void)
pNtUnmapViewOfSection = (void *)GetProcAddress( GetModuleHandle("ntdll.dll"), "NtUnmapViewOfSection" );
if (!pNtMapViewOfSection || !pNtUnmapViewOfSection)
{
skip( "NtMapViewOfSection not found\n" );
win_skip( "NtMapViewOfSection not available\n" );
return;
}