Skip to content

W
wine-winehq
Commit 5a701ab6 authored by James Hawkins's avatar James Hawkins Committed by Alexandre Julliard
Browse files
Options

setupapi: Fix a few test failures in win2k3.

parent c659ad36
Show whitespace changes
Inline Side-by-side
Showing with 11 additions and 14 deletions
dlls/setupapi/tests/devinst.c
View file @ 5a701ab6
......@@ -804,8 +804,9 @@ static void testDevRegKey(void)
DIREG_DRV, 0);
todo_wine
ok(key == INVALID_HANDLE_VALUE &&
GetLastError() == ERROR_INVALID_DATA,
"Expected ERROR_INVALID_DATA, got %08x\n", GetLastError());
(GetLastError() == ERROR_INVALID_DATA ||
GetLastError() == ERROR_ACCESS_DENIED), /* win2k3 */
"Expected ERROR_INVALID_DATA or ERROR_ACCESS_DENIED, got %08x\n", GetLastError());
key = pSetupDiOpenDevRegKey(set, &devInfo, DICS_FLAG_GLOBAL, 0,
DIREG_DRV, KEY_READ);
ok(key != INVALID_HANDLE_VALUE, "SetupDiOpenDevRegKey failed: %08x\n",
......@@ -914,12 +915,11 @@ static void testDeviceRegistryPropertyA()
todo_wine
ok(!ret && GetLastError() == ERROR_INVALID_REG_PROPERTY,
"Expected ERROR_INVALID_REG_PROPERTY, got %08x\n", GetLastError());
SetLastError(0xdeadbeef);
/* GetLastError() returns nonsense in win2k3 */
ret = pSetupDiSetDeviceRegistryPropertyA(set, &devInfo, SPDRP_FRIENDLYNAME,
NULL, 0);
todo_wine
ok(!ret && GetLastError() == ERROR_INVALID_DATA,
"Expected ERROR_INVALID_DATA, got %08x\n", GetLastError());
ok(!ret, "Expected failure, got %d\n", ret);
SetLastError(0xdeadbeef);
ret = pSetupDiSetDeviceRegistryPropertyA(set, &devInfo, SPDRP_FRIENDLYNAME,
(PBYTE)friendlyName, buflen);
......@@ -937,11 +937,10 @@ static void testDeviceRegistryPropertyA()
todo_wine
ok(!ret && GetLastError() == ERROR_INVALID_REG_PROPERTY,
"Expected ERROR_INVALID_REG_PROPERTY, got %08x\n", GetLastError());
SetLastError(0xdeadbeef);
/* GetLastError() returns nonsense in win2k3 */
ret = pSetupDiGetDeviceRegistryPropertyA(set, &devInfo, SPDRP_FRIENDLYNAME,
NULL, NULL, buflen, NULL);
ok(!ret && GetLastError() == ERROR_INVALID_DATA,
"Expected ERROR_INVALID_DATA, got %08x\n", GetLastError());
ok(!ret, "Expected failure, got %d\n", ret);
SetLastError(0xdeadbeef);
ret = pSetupDiGetDeviceRegistryPropertyA(set, &devInfo, SPDRP_FRIENDLYNAME,
NULL, NULL, 0, &size);
......@@ -1012,12 +1011,11 @@ static void testDeviceRegistryPropertyW()
todo_wine
ok(!ret && GetLastError() == ERROR_INVALID_REG_PROPERTY,
"Expected ERROR_INVALID_REG_PROPERTY, got %08x\n", GetLastError());
SetLastError(0xdeadbeef);
/* GetLastError() returns nonsense in win2k3 */
ret = pSetupDiSetDeviceRegistryPropertyW(set, &devInfo, SPDRP_FRIENDLYNAME,
NULL, 0);
todo_wine
ok(!ret && GetLastError() == ERROR_INVALID_DATA,
"Expected ERROR_INVALID_DATA, got %08x\n", GetLastError());
ok(!ret, "Expected failure, got %d\n", ret);
SetLastError(0xdeadbeef);
ret = pSetupDiSetDeviceRegistryPropertyW(set, &devInfo, SPDRP_FRIENDLYNAME,
(PBYTE)friendlyName, buflen);
......@@ -1035,11 +1033,10 @@ static void testDeviceRegistryPropertyW()
todo_wine
ok(!ret && GetLastError() == ERROR_INVALID_REG_PROPERTY,
"Expected ERROR_INVALID_REG_PROPERTY, got %08x\n", GetLastError());
SetLastError(0xdeadbeef);
/* GetLastError() returns nonsense in win2k3 */
ret = pSetupDiGetDeviceRegistryPropertyW(set, &devInfo, SPDRP_FRIENDLYNAME,
NULL, NULL, buflen, NULL);
ok(!ret && GetLastError() == ERROR_INVALID_DATA,
"Expected ERROR_INVALID_DATA, got %08x\n", GetLastError());
ok(!ret, "Expected failure, got %d\n", ret);
SetLastError(0xdeadbeef);
ret = pSetupDiGetDeviceRegistryPropertyW(set, &devInfo, SPDRP_FRIENDLYNAME,
NULL, NULL, 0, &size);
......
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