ReceiveTempSMS/Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

setupapi/tests: Fix a test on Windows 2000.

Browse Source
This commit is contained in:
Paul Vriens 2008-06-09 13:04:58 +02:00 committed by Alexandre Julliard
parent 5777a3d6cf
commit 02b05393c8
1 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
dlls/setupapi/tests/devinst.c
View File

@ -698,12 +698,14 @@ static void testCreateDeviceInterface(void)
ok(i == 2, "expected 2 interfaces, got %d\n", i); ok(i == 2, "expected 2 interfaces, got %d\n", i);
ok(GetLastError() == ERROR_NO_MORE_ITEMS, ok(GetLastError() == ERROR_NO_MORE_ITEMS,
"SetupDiEnumDeviceInterfaces failed: %08x\n", GetLastError()); "SetupDiEnumDeviceInterfaces failed: %08x\n", GetLastError());
pSetupDiDestroyDeviceInfoList(set); ret = pSetupDiDestroyDeviceInfoList(set);
ok(ret, "SetupDiDestroyDeviceInfoList failed: %08x\n", GetLastError());
/* Cleanup */ /* Cleanup */
/* FIXME: On Wine we still have the bogus entry in Enum\Root and /* FIXME: On Wine we still have the bogus entry in Enum\Root and
* subkeys, as well as the deviceclass key with subkeys. * subkeys, as well as the deviceclass key with subkeys.
* Only do the RegDeleteKey, once Wine is fixed. * Only do the RegDeleteKey (and RegDeleteTree on Windows 2000),
* once Wine is fixed.
*/ */
if (!RegOpenKeyW(HKEY_LOCAL_MACHINE, bogus, &key)) if (!RegOpenKeyW(HKEY_LOCAL_MACHINE, bogus, &key))
{ {
@ -713,11 +715,26 @@ static void testCreateDeviceInterface(void)
devinst_RegDeleteTreeW(HKEY_LOCAL_MACHINE, devclass); devinst_RegDeleteTreeW(HKEY_LOCAL_MACHINE, devclass);
} }
else else
{
DWORD subkeys;
/* Check if we have subkeys as Windows 2000 doesn't delete
* the keys under the DeviceClasses key
*/
RegOpenKeyW(HKEY_LOCAL_MACHINE, devclass, &key);
RegQueryInfoKey(key, NULL, NULL, NULL, &subkeys, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
if (subkeys > 0)
{
trace("We are most likely on Windows 2000\n");
devinst_RegDeleteTreeW(HKEY_LOCAL_MACHINE, devclass);
}
else
{ {
ok(!RegDeleteKeyW(HKEY_LOCAL_MACHINE, devclass), ok(!RegDeleteKeyW(HKEY_LOCAL_MACHINE, devclass),
"Couldn't delete deviceclass key\n"); "Couldn't delete deviceclass key\n");
} }
} }
}
} }
static void testGetDeviceInterfaceDetail(void) static void testGetDeviceInterfaceDetail(void)