setupapi/tests: Remove win9x specifics from testCreateDeviceInfo.

This commit is contained in:
Paul Vriens 2008-06-23 09:47:48 +02:00 committed by Alexandre Julliard
parent 51b3b4a481
commit d2ee399c66
1 changed files with 1 additions and 18 deletions

View File

@ -401,30 +401,13 @@ static void testCreateDeviceInfo(void)
'E','n','u','m','\\','R','o','o','t','\\',
'L','E','G','A','C','Y','_','B','O','G','U','S',0};
if (!pSetupDiCreateDeviceInfoList || !pSetupDiEnumDeviceInfo ||
!pSetupDiDestroyDeviceInfoList || !pSetupDiCreateDeviceInfoA)
{
skip("No SetupDiCreateDeviceInfoA\n");
return;
}
SetLastError(0xdeadbeef);
ret = pSetupDiCreateDeviceInfoA(NULL, NULL, NULL, NULL, NULL, 0, NULL);
ok(!ret, "Expected failure\n");
ok(GetLastError() == ERROR_INVALID_DEVINST_NAME ||
GetLastError() == ERROR_INVALID_PARAMETER /* NT4 */ ||
GetLastError() == ERROR_INVALID_HANDLE /* Win9x */,
GetLastError() == ERROR_INVALID_PARAMETER /* NT4 */,
"Unexpected last error, got %08x\n", GetLastError());
/* If we are running on win9x we should skip these tests. Win95
* fails most tests anyway and win98 pops up the "Add New Hardware
* Wizard".
*/
if (GetLastError() == ERROR_INVALID_HANDLE)
{
skip("We are on win9x where the tests introduce issues\n");
return;
}
SetLastError(0xdeadbeef);
ret = pSetupDiCreateDeviceInfoA(NULL, "Root\\LEGACY_BOGUS\\0000", NULL,
NULL, NULL, 0, NULL);