James Hawkins : ntdll: Fix a couple failing tests in NT4.

[Alexandre Julliard]

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

Author: James Hawkins 
Date:   Wed Sep 24 03:05:19 2008 -0500

ntdll: Fix a couple failing tests in NT4.

---

dlls/ntdll/tests/om.c |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c
index 46c9084..2e5f355 100644
--- a/dlls/ntdll/tests/om.c
+++ b/dlls/ntdll/tests/om.c
@@ -451,16 +451,20 @@ static void test_directory(void)
     pNtClose(dir);
 }

-#define SYMLNK_TEST_CREATE_OPEN_FAILURE(h,n,t,e) \
+#define SYMLNK_TEST_CREATE_OPEN_FAILURE2(h,n,t,e,e2) \
     pRtlCreateUnicodeStringFromAsciiz(&str, n);\
     pRtlCreateUnicodeStringFromAsciiz(&target, t);\
     status = pNtCreateSymbolicLinkObject(h, SYMBOLIC_LINK_QUERY, &attr, &target);\
-    ok(status == e,"NtCreateSymbolicLinkObject should have failed with %s got(%08x)\n", #e, status);\
+    ok(status == e || status == e2, \
+       "NtCreateSymbolicLinkObject should have failed with %s or %s got(%08x)\n", #e, #e2, status);\
     status = pNtOpenSymbolicLinkObject(h, SYMBOLIC_LINK_QUERY, &attr);\
-    ok(status == e,"NtOpenSymbolicLinkObject should have failed with %s got(%08x)\n", #e, status);\
+    ok(status == e || status == e2, \
+       "NtOpenSymbolicLinkObject should have failed with %s or %s got(%08x)\n", #e, #e2, status);\
     pRtlFreeUnicodeString(&target);\
     pRtlFreeUnicodeString(&str);

+#define SYMLNK_TEST_CREATE_OPEN_FAILURE(h,n,t,e) SYMLNK_TEST_CREATE_OPEN_FAILURE2(h,n,t,e,e)
+
 static void test_symboliclink(void)
 {
     NTSTATUS status;
@@ -521,7 +525,8 @@ static void test_symboliclink(void)
     SYMLNK_TEST_CREATE_OPEN_FAILURE(&h, "\BaseNamedObjects\", "->Somewhere", STATUS_OBJECT_NAME_INVALID)
     SYMLNK_TEST_CREATE_OPEN_FAILURE(&h, "\\BaseNamedObjects", "->Somewhere", STATUS_OBJECT_NAME_INVALID)
     SYMLNK_TEST_CREATE_OPEN_FAILURE(&h, "\BaseNamedObjects\\om.c-test", "->Somewhere", STATUS_OBJECT_NAME_INVALID)
-    SYMLNK_TEST_CREATE_OPEN_FAILURE(&h, "\BaseNamedObjects\om.c-test\", "->Somewhere", STATUS_OBJECT_NAME_INVALID)
+    SYMLNK_TEST_CREATE_OPEN_FAILURE2(&h, "\BaseNamedObjects\om.c-test\", "->Somewhere",
+                                     STATUS_OBJECT_NAME_INVALID, STATUS_OBJECT_PATH_NOT_FOUND)

/* Compaund test */