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

setupapi/tests: Remove workarounds in testRegisterDeviceInfo(). 

Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Zebediah Figura 2018-11-21 00:06:11 -06:00 committed by Alexandre Julliard
parent 16eb2b267c
commit 4e9b306e06
1 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -535,52 +535,52 @@ static void test_get_device_instance_id(void)
SetupDiDestroyDeviceInfoList(set); SetupDiDestroyDeviceInfoList(set);
} }
static void testRegisterDeviceInfo(void) static void test_register_device_info(void)
{ {
static const WCHAR bogus[] = {'S','y','s','t','e','m','\\', static const WCHAR bogus[] = {'S','y','s','t','e','m','\\',
'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\',
'E','n','u','m','\\','U','S','B','\\','B','O','G','U','S',0}; 'E','n','u','m','\\','U','S','B','\\','B','O','G','U','S',0};
SP_DEVINFO_DATA device = {0};
BOOL ret; BOOL ret;
HDEVINFO set; HDEVINFO set;
SetLastError(0xdeadbeef); SetLastError(0xdeadbeef);
ret = pSetupDiRegisterDeviceInfo(NULL, NULL, 0, NULL, NULL, NULL); ret = SetupDiRegisterDeviceInfo(NULL, NULL, 0, NULL, NULL, NULL);
ok(!ret && GetLastError() == ERROR_INVALID_HANDLE, ok(!ret, "Expected failure.\n");
"Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); ok(GetLastError() == ERROR_INVALID_HANDLE, "Got unexpected error %#x.\n", GetLastError());
set = pSetupDiCreateDeviceInfoList(&guid, NULL);
ok(set != NULL, "SetupDiCreateDeviceInfoList failed: %d\n", GetLastError());
if (set)
{
SP_DEVINFO_DATA devInfo = { 0 };
SetLastError(0xdeadbeef); set = SetupDiCreateDeviceInfoList(&guid, NULL);
ret = pSetupDiRegisterDeviceInfo(set, NULL, 0, NULL, NULL, NULL); ok(set != NULL, "Failed to create device list, error %#x.\n", GetLastError());
ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER,
"Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError());
SetLastError(0xdeadbeef);
ret = pSetupDiRegisterDeviceInfo(set, &devInfo, 0, NULL, NULL, NULL);
ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER,
"Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError());
devInfo.cbSize = sizeof(devInfo);
SetLastError(0xdeadbeef);
ret = pSetupDiRegisterDeviceInfo(set, &devInfo, 0, NULL, NULL, NULL);
ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER,
"Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError());
ret = pSetupDiCreateDeviceInfoA(set, "USB\\BOGUS\\0000", &guid, SetLastError(0xdeadbeef);
NULL, NULL, 0, &devInfo); ret = SetupDiRegisterDeviceInfo(set, NULL, 0, NULL, NULL, NULL);
ok(ret, "SetupDiCreateDeviceInfoA failed: %08x\n", GetLastError()); ok(!ret, "Expected failure.\n");
ok(GetLastError() == ERROR_INVALID_PARAMETER, "Got unexpected error %#x.\n", GetLastError());
ret = pSetupDiRegisterDeviceInfo(set, &devInfo, 0, NULL, NULL, NULL); SetLastError(0xdeadbeef);
ok(ret, "SetupDiRegisterDeviceInfo failed: %d\n", GetLastError()); ret = SetupDiRegisterDeviceInfo(set, &device, 0, NULL, NULL, NULL);
ok(!ret, "Expected failure.\n");
ok(GetLastError() == ERROR_INVALID_PARAMETER, "Got unexpected error %#x.\n", GetLastError());
ret = pSetupDiRemoveDevice(set, &devInfo); device.cbSize = sizeof(device);
todo_wine ok(ret, "got %u\n", GetLastError()); SetLastError(0xdeadbeef);
pSetupDiDestroyDeviceInfoList(set); ret = SetupDiRegisterDeviceInfo(set, &device, 0, NULL, NULL, NULL);
ok(!ret, "Expected failure.\n");
ok(GetLastError() == ERROR_INVALID_PARAMETER, "Got unexpected error %#x.\n", GetLastError());
/* remove once Wine is fixed */ ret = SetupDiCreateDeviceInfoA(set, "USB\\BOGUS\\0000", &guid, NULL, NULL, 0, &device);
devinst_RegDeleteTreeW(HKEY_LOCAL_MACHINE, bogus); ok(ret, "Failed to create device, error %#x.\n", GetLastError());
}
ret = SetupDiRegisterDeviceInfo(set, &device, 0, NULL, NULL, NULL);
ok(ret, "Failed to register device, error %#x.\n", GetLastError());
ret = SetupDiRemoveDevice(set, &device);
todo_wine
ok(ret, "Failed to remove device, error %#x.\n", GetLastError());
SetupDiDestroyDeviceInfoList(set);
/* remove once Wine is fixed */
devinst_RegDeleteTreeW(HKEY_LOCAL_MACHINE, bogus);
} }
static void testCreateDeviceInterface(void) static void testCreateDeviceInterface(void)
@ -1517,7 +1517,7 @@ START_TEST(devinst)
test_install_class(); test_install_class();
test_device_info(); test_device_info();
test_get_device_instance_id(); test_get_device_instance_id();
testRegisterDeviceInfo(); test_register_device_info();
testCreateDeviceInterface(); testCreateDeviceInterface();
testGetDeviceInterfaceDetail(); testGetDeviceInterfaceDetail();
testDevRegKey(); testDevRegKey();