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

setupapi: Fix a few test failures in win2k3.

This commit is contained in:
James Hawkins 2008-05-20 20:32:40 -05:00 committed by Alexandre Julliard
parent c659ad36e8
commit 5a701ab6b4
1 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -804,8 +804,9 @@ static void testDevRegKey(void)
DIREG_DRV, 0); DIREG_DRV, 0);
todo_wine todo_wine
ok(key == INVALID_HANDLE_VALUE && ok(key == INVALID_HANDLE_VALUE &&
GetLastError() == ERROR_INVALID_DATA, (GetLastError() == ERROR_INVALID_DATA ||
"Expected ERROR_INVALID_DATA, got %08x\n", GetLastError()); 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, key = pSetupDiOpenDevRegKey(set, &devInfo, DICS_FLAG_GLOBAL, 0,
DIREG_DRV, KEY_READ); DIREG_DRV, KEY_READ);
ok(key != INVALID_HANDLE_VALUE, "SetupDiOpenDevRegKey failed: %08x\n", ok(key != INVALID_HANDLE_VALUE, "SetupDiOpenDevRegKey failed: %08x\n",
@ -914,12 +915,11 @@ static void testDeviceRegistryPropertyA()
todo_wine todo_wine
ok(!ret && GetLastError() == ERROR_INVALID_REG_PROPERTY, ok(!ret && GetLastError() == ERROR_INVALID_REG_PROPERTY,
"Expected ERROR_INVALID_REG_PROPERTY, got %08x\n", GetLastError()); "Expected ERROR_INVALID_REG_PROPERTY, got %08x\n", GetLastError());
SetLastError(0xdeadbeef); /* GetLastError() returns nonsense in win2k3 */
ret = pSetupDiSetDeviceRegistryPropertyA(set, &devInfo, SPDRP_FRIENDLYNAME, ret = pSetupDiSetDeviceRegistryPropertyA(set, &devInfo, SPDRP_FRIENDLYNAME,
NULL, 0); NULL, 0);
todo_wine todo_wine
ok(!ret && GetLastError() == ERROR_INVALID_DATA, ok(!ret, "Expected failure, got %d\n", ret);
"Expected ERROR_INVALID_DATA, got %08x\n", GetLastError());
SetLastError(0xdeadbeef); SetLastError(0xdeadbeef);
ret = pSetupDiSetDeviceRegistryPropertyA(set, &devInfo, SPDRP_FRIENDLYNAME, ret = pSetupDiSetDeviceRegistryPropertyA(set, &devInfo, SPDRP_FRIENDLYNAME,
(PBYTE)friendlyName, buflen); (PBYTE)friendlyName, buflen);
@ -937,11 +937,10 @@ static void testDeviceRegistryPropertyA()
todo_wine todo_wine
ok(!ret && GetLastError() == ERROR_INVALID_REG_PROPERTY, ok(!ret && GetLastError() == ERROR_INVALID_REG_PROPERTY,
"Expected ERROR_INVALID_REG_PROPERTY, got %08x\n", GetLastError()); "Expected ERROR_INVALID_REG_PROPERTY, got %08x\n", GetLastError());
SetLastError(0xdeadbeef); /* GetLastError() returns nonsense in win2k3 */
ret = pSetupDiGetDeviceRegistryPropertyA(set, &devInfo, SPDRP_FRIENDLYNAME, ret = pSetupDiGetDeviceRegistryPropertyA(set, &devInfo, SPDRP_FRIENDLYNAME,
NULL, NULL, buflen, NULL); NULL, NULL, buflen, NULL);
ok(!ret && GetLastError() == ERROR_INVALID_DATA, ok(!ret, "Expected failure, got %d\n", ret);
"Expected ERROR_INVALID_DATA, got %08x\n", GetLastError());
SetLastError(0xdeadbeef); SetLastError(0xdeadbeef);
ret = pSetupDiGetDeviceRegistryPropertyA(set, &devInfo, SPDRP_FRIENDLYNAME, ret = pSetupDiGetDeviceRegistryPropertyA(set, &devInfo, SPDRP_FRIENDLYNAME,
NULL, NULL, 0, &size); NULL, NULL, 0, &size);
@ -1012,12 +1011,11 @@ static void testDeviceRegistryPropertyW()
todo_wine todo_wine
ok(!ret && GetLastError() == ERROR_INVALID_REG_PROPERTY, ok(!ret && GetLastError() == ERROR_INVALID_REG_PROPERTY,
"Expected ERROR_INVALID_REG_PROPERTY, got %08x\n", GetLastError()); "Expected ERROR_INVALID_REG_PROPERTY, got %08x\n", GetLastError());
SetLastError(0xdeadbeef); /* GetLastError() returns nonsense in win2k3 */
ret = pSetupDiSetDeviceRegistryPropertyW(set, &devInfo, SPDRP_FRIENDLYNAME, ret = pSetupDiSetDeviceRegistryPropertyW(set, &devInfo, SPDRP_FRIENDLYNAME,
NULL, 0); NULL, 0);
todo_wine todo_wine
ok(!ret && GetLastError() == ERROR_INVALID_DATA, ok(!ret, "Expected failure, got %d\n", ret);
"Expected ERROR_INVALID_DATA, got %08x\n", GetLastError());
SetLastError(0xdeadbeef); SetLastError(0xdeadbeef);
ret = pSetupDiSetDeviceRegistryPropertyW(set, &devInfo, SPDRP_FRIENDLYNAME, ret = pSetupDiSetDeviceRegistryPropertyW(set, &devInfo, SPDRP_FRIENDLYNAME,
(PBYTE)friendlyName, buflen); (PBYTE)friendlyName, buflen);
@ -1035,11 +1033,10 @@ static void testDeviceRegistryPropertyW()
todo_wine todo_wine
ok(!ret && GetLastError() == ERROR_INVALID_REG_PROPERTY, ok(!ret && GetLastError() == ERROR_INVALID_REG_PROPERTY,
"Expected ERROR_INVALID_REG_PROPERTY, got %08x\n", GetLastError()); "Expected ERROR_INVALID_REG_PROPERTY, got %08x\n", GetLastError());
SetLastError(0xdeadbeef); /* GetLastError() returns nonsense in win2k3 */
ret = pSetupDiGetDeviceRegistryPropertyW(set, &devInfo, SPDRP_FRIENDLYNAME, ret = pSetupDiGetDeviceRegistryPropertyW(set, &devInfo, SPDRP_FRIENDLYNAME,
NULL, NULL, buflen, NULL); NULL, NULL, buflen, NULL);
ok(!ret && GetLastError() == ERROR_INVALID_DATA, ok(!ret, "Expected failure, got %d\n", ret);
"Expected ERROR_INVALID_DATA, got %08x\n", GetLastError());
SetLastError(0xdeadbeef); SetLastError(0xdeadbeef);
ret = pSetupDiGetDeviceRegistryPropertyW(set, &devInfo, SPDRP_FRIENDLYNAME, ret = pSetupDiGetDeviceRegistryPropertyW(set, &devInfo, SPDRP_FRIENDLYNAME,
NULL, NULL, 0, &size); NULL, NULL, 0, &size);