Paul Vriens : setupapi/tests: Fix a test on NT4.

Alexandre Julliard julliard at winehq.org
Mon May 26 13:13:08 CDT 2008


Module: wine
Branch: master
Commit: b1b4063c0ba95ef9177a144cb021041486986a2c
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=b1b4063c0ba95ef9177a144cb021041486986a2c

Author: Paul Vriens <paul.vriens.wine at gmail.com>
Date:   Mon May 26 11:32:37 2008 +0200

setupapi/tests: Fix a test on NT4.

---

 dlls/setupapi/tests/devinst.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c
index 6896646..f29ce34 100644
--- a/dlls/setupapi/tests/devinst.c
+++ b/dlls/setupapi/tests/devinst.c
@@ -760,8 +760,9 @@ static void testDevRegKey(void)
         ok(ret, "SetupDiCreateDeviceInfoA failed: %08x\n", GetLastError());
         SetLastError(0xdeadbeef);
         key = pSetupDiOpenDevRegKey(NULL, NULL, 0, 0, 0, 0);
-        ok(key == INVALID_HANDLE_VALUE &&
-         GetLastError() == ERROR_INVALID_HANDLE,
+        ok(!key || key == INVALID_HANDLE_VALUE,
+         "Expected INVALID_HANDLE_VALUE or a NULL key (NT4)\n");
+        ok(GetLastError() == ERROR_INVALID_HANDLE,
          "Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError());
         SetLastError(0xdeadbeef);
         key = pSetupDiOpenDevRegKey(set, NULL, 0, 0, 0, 0);




More information about the wine-cvs mailing list