Paul Vriens : version/tests: Win98, NT4 and W2K return different errors.

Alexandre Julliard julliard at winehq.org
Mon Feb 25 14:21:27 CST 2008


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

Author: Paul Vriens <paul.vriens.wine at gmail.com>
Date:   Mon Feb 25 17:07:52 2008 +0100

version/tests: Win98, NT4 and W2K return different errors.

---

 dlls/version/tests/info.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/dlls/version/tests/info.c b/dlls/version/tests/info.c
index d31797a..3bfc9fb 100644
--- a/dlls/version/tests/info.c
+++ b/dlls/version/tests/info.c
@@ -476,7 +476,8 @@ static void test_VerQueryValue(void)
     SetLastError(0xdeadbeef);
     ret = VerQueryValue(ver, "String", (LPVOID*)&p, &len);
     ok(!ret, "VerQueryValue should fail\n");
-    ok(GetLastError() == ERROR_RESOURCE_TYPE_NOT_FOUND,
+    ok(GetLastError() == ERROR_RESOURCE_TYPE_NOT_FOUND ||
+       GetLastError() == 0xdeadbeef /* Win9x, NT4, W2K */,
        "VerQueryValue returned %u\n", GetLastError());
     ok(p == (char *)0xdeadbeef, "expected 0xdeadbeef got %p\n", p);
     ok(len == 0, "expected 0 got %x\n", len);
@@ -542,7 +543,8 @@ todo_wine ok(len == 0, "VerQueryValue returned %u, expected 0\n", len);
         SetLastError(0xdeadbeef);
         ret = VerQueryValue(ver, buf, (LPVOID*)&p, &len);
         ok(!ret, "VerQueryValue(%s) succeeded\n", buf);
-        ok(GetLastError() == ERROR_RESOURCE_TYPE_NOT_FOUND,
+        ok(GetLastError() == ERROR_RESOURCE_TYPE_NOT_FOUND ||
+           GetLastError() == 0xdeadbeef /* Win9x, NT4, W2K */,
            "VerQueryValue returned %u\n", GetLastError());
         ok(p == (char *)0xdeadbeef, "expected 0xdeadbeef got %p\n", p);
         ok(len == 0, "expected 0 got %x\n", len);




More information about the wine-cvs mailing list