[SETUPAPI_WINETEST] Sync with Wine Staging 1.9.23. CORE-12409

svn path=/trunk/; revision=73317
This commit is contained in:
Amine Khaldi 2016-11-17 23:49:54 +00:00
parent 12edc3f68c
commit 1f354adf5e

View file

@ -281,6 +281,12 @@ static void test_SetupDiCreateDeviceInfoListEx(void)
devlist = pSetupDiCreateDeviceInfoListExW(NULL, NULL, machine, NULL);
error = GetLastError();
if (error == ERROR_CALL_NOT_IMPLEMENTED)
{
/* win10 reports ERROR_CALL_NOT_IMPLEMENTED at first here */
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);
ok(error == ERROR_INVALID_MACHINENAME || error == ERROR_MACHINE_UNAVAILABLE, "GetLastError returned wrong value : %d, (expected %d or %d)\n", error, ERROR_INVALID_MACHINENAME, ERROR_MACHINE_UNAVAILABLE);
@ -445,7 +451,6 @@ static void testCreateDeviceInfo(void)
DWORD i;
static GUID deadbeef =
{0xdeadbeef, 0xdead, 0xbeef, {0xde,0xad,0xbe,0xef,0xde,0xad,0xbe,0xef}};
LONG res;
HKEY key;
static const WCHAR bogus0000[] = {'S','y','s','t','e','m','\\',
'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\',
@ -453,8 +458,13 @@ static void testCreateDeviceInfo(void)
'L','E','G','A','C','Y','_','B','O','G','U','S','\\','0','0','0','0',0};
/* So we know we have a clean start */
res = RegOpenKeyW(HKEY_LOCAL_MACHINE, bogus0000, &key);
ok(res != ERROR_SUCCESS, "Expected key to not exist\n");
if (!RegOpenKeyW(HKEY_LOCAL_MACHINE, bogus0000, &key))
{
trace("Expected LEGACY_BOGUS\\0000 key to not exist, will be removed now\n");
change_reg_permissions(bogus0000);
ok(!RegDeleteKeyW(HKEY_LOCAL_MACHINE, bogus0000), "Could not delete LEGACY_BOGUS\\0000 key\n");
}
/* No GUID given */
SetLastError(0xdeadbeef);
ret = pSetupDiCreateDeviceInfoA(set, "Root\\LEGACY_BOGUS\\0000", NULL,