Commit 292a1042 authored by Francois Gouget's avatar Francois Gouget Committed by Alexandre Julliard

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

parent 8b28508d
......@@ -259,7 +259,7 @@ static void test_SetupDiCreateDeviceInfoListEx(void)
error = GetLastError();
if (error == ERROR_CALL_NOT_IMPLEMENTED)
{
skip("SetupDiCreateDeviceInfoListExW is not implemented\n");
win_skip("SetupDiCreateDeviceInfoListExW is not implemented\n");
return;
}
ok(devlist == INVALID_HANDLE_VALUE, "SetupDiCreateDeviceInfoListExW failed : %p %d (expected %p)\n", devlist, error, INVALID_HANDLE_VALUE);
......@@ -667,7 +667,7 @@ static void testCreateDeviceInterface(void)
if (!pSetupDiCreateDeviceInterfaceA || !pSetupDiEnumDeviceInterfaces)
{
skip("SetupDiCreateDeviceInterfaceA and/or SetupDiEnumDeviceInterfaces are not available\n");
win_skip("SetupDiCreateDeviceInterfaceA and/or SetupDiEnumDeviceInterfaces are not available\n");
return;
}
SetLastError(0xdeadbeef);
......@@ -764,7 +764,7 @@ static void testGetDeviceInterfaceDetail(void)
if (!pSetupDiCreateDeviceInterfaceA || !pSetupDiGetDeviceInterfaceDetailA)
{
skip("SetupDiCreateDeviceInterfaceA and/or SetupDiGetDeviceInterfaceDetailA are not available\n");
win_skip("SetupDiCreateDeviceInterfaceA and/or SetupDiGetDeviceInterfaceDetailA are not available\n");
return;
}
SetLastError(0xdeadbeef);
......@@ -1051,7 +1051,7 @@ static void testRegisterAndGetDetail(void)
if (!pSetupDiCreateDeviceInterfaceA || !pSetupDiEnumDeviceInterfaces ||
!pSetupDiGetDeviceInterfaceDetailA)
{
skip("Needed functions are not available\n");
win_skip("Needed functions are not available\n");
return;
}
......@@ -1357,19 +1357,19 @@ START_TEST(devinst)
set = pSetupDiGetClassDevsW(NULL, NULL, 0, 0);
if (set == INVALID_HANDLE_VALUE && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)
{
skip("Win9x/WinMe has totally different behavior\n");
win_skip("Win9x/WinMe has totally different behavior\n");
return;
}
if (pSetupDiCreateDeviceInfoListExW)
test_SetupDiCreateDeviceInfoListEx();
else
skip("SetupDiCreateDeviceInfoListExW is not available\n");
win_skip("SetupDiCreateDeviceInfoListExW is not available\n");
if (pSetupDiOpenClassRegKeyExA)
test_SetupDiOpenClassRegKeyExA();
else
skip("SetupDiOpenClassRegKeyExA is not available\n");
win_skip("SetupDiOpenClassRegKeyExA is not available\n");
testInstallClass();
testCreateDeviceInfo();
......
......@@ -190,7 +190,7 @@ static void test_install_svc_from(void)
if (!scm_handle && (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED))
{
skip("OpenSCManagerA is not implemented, we are most likely on win9x\n");
win_skip("OpenSCManagerA is not implemented, we are most likely on win9x\n");
return;
}
CloseServiceHandle(scm_handle);
......@@ -348,7 +348,7 @@ static void test_driver_install(void)
if (!scm_handle && (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED))
{
skip("OpenSCManagerA is not implemented, we are most likely on win9x\n");
win_skip("OpenSCManagerA is not implemented, we are most likely on win9x\n");
return;
}
else if (!scm_handle && (GetLastError() == ERROR_ACCESS_DENIED))
......@@ -421,7 +421,7 @@ static void test_profile_items(void)
pSHGetFolderPathA = (void*)GetProcAddress(hShell32, "SHGetFolderPathA");
if (!pSHGetFolderPathA)
{
skip("SHGetFolderPathA is not available\n");
win_skip("SHGetFolderPathA is not available\n");
goto cleanup;
}
......@@ -500,7 +500,7 @@ START_TEST(install)
ok(DeleteFile(inffile), "Expected source inf to exist, last error was %d\n", GetLastError());
}
if (!pInstallHinfSectionW && !pInstallHinfSectionA)
skip("InstallHinfSectionA and InstallHinfSectionW are not available\n");
win_skip("InstallHinfSectionA and InstallHinfSectionW are not available\n");
else
{
/* Set CBT hook to disallow MessageBox creation in current thread */
......
......@@ -107,7 +107,7 @@ static void test_original_file_name(LPCSTR original, LPCSTR dest)
if (!pSetupQueryInfOriginalFileInformationA)
{
skip("SetupQueryInfOriginalFileInformationA is not available\n");
win_skip("SetupQueryInfOriginalFileInformationA is not available\n");
return;
}
......@@ -591,14 +591,14 @@ START_TEST(misc)
if (pSetupCopyOEMInfA)
test_SetupCopyOEMInf();
else
skip("SetupCopyOEMInfA is not available\n");
win_skip("SetupCopyOEMInfA is not available\n");
test_SetupGetFileCompressionInfo();
if (pSetupGetFileCompressionInfoExA)
test_SetupGetFileCompressionInfoEx();
else
skip("SetupGetFileCompressionInfoExA is not available\n");
win_skip("SetupGetFileCompressionInfoExA is not available\n");
test_SetupDecompressOrCopyFile();
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment