Module: wine Branch: master Commit: 66d893b0f9c21aba22c8fc0e03b7c2d1f99e619e URL: http://source.winehq.org/git/wine.git/?a=commit;h=66d893b0f9c21aba22c8fc0e03... Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 11 11:39:31 2008 +0100 ntdll/tests: Fix a couple of test failures on Vista. --- dlls/ntdll/tests/om.c | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index 2e5f355..1e4cf17 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -138,13 +138,16 @@ static void test_namespace_pipe(void) pRtlInitUnicodeString(&str, buffer3); InitializeObjectAttributes(&attr, &str, 0, 0, NULL); status = pNtOpenFile(&h, GENERIC_READ, &attr, &iosb, FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_OPEN); - ok(status == STATUS_OBJECT_PATH_NOT_FOUND || status == STATUS_PIPE_NOT_AVAILABLE, + ok(status == STATUS_OBJECT_PATH_NOT_FOUND || + status == STATUS_PIPE_NOT_AVAILABLE || + status == STATUS_OBJECT_NAME_INVALID, /* vista */ "NtOpenFile should have failed with STATUS_OBJECT_PATH_NOT_FOUND got(%08x)\n", status); pRtlInitUnicodeString(&str, buffer4); InitializeObjectAttributes(&attr, &str, OBJ_CASE_INSENSITIVE, 0, NULL); status = pNtOpenFile(&h, GENERIC_READ, &attr, &iosb, FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_OPEN); - ok(status == STATUS_OBJECT_NAME_NOT_FOUND, + ok(status == STATUS_OBJECT_NAME_NOT_FOUND || + status == STATUS_OBJECT_NAME_INVALID, /* vista */ "NtOpenFile should have failed with STATUS_OBJECT_NAME_NOT_FOUND got(%08x)\n", status); pNtClose(pipe); @@ -289,10 +292,10 @@ static void test_directory(void) /* No name and/or no attributes */ status = pNtCreateDirectoryObject(NULL, DIRECTORY_QUERY, &attr); - ok(status == STATUS_ACCESS_VIOLATION, + ok(status == STATUS_ACCESS_VIOLATION || status == STATUS_INVALID_PARAMETER, "NtCreateDirectoryObject should have failed with STATUS_ACCESS_VIOLATION got(%08x)\n", status); status = pNtOpenDirectoryObject(NULL, DIRECTORY_QUERY, &attr); - ok(status == STATUS_ACCESS_VIOLATION, + ok(status == STATUS_ACCESS_VIOLATION || status == STATUS_INVALID_PARAMETER, "NtOpenDirectoryObject should have failed with STATUS_ACCESS_VIOLATION got(%08x)\n", status); status = pNtCreateDirectoryObject(&h, DIRECTORY_QUERY, NULL); @@ -474,7 +477,7 @@ static void test_symboliclink(void) IO_STATUS_BLOCK iosb; /* No name and/or no attributes */ - SYMLNK_TEST_CREATE_OPEN_FAILURE(NULL, "", "", STATUS_ACCESS_VIOLATION) + SYMLNK_TEST_CREATE_OPEN_FAILURE2(NULL, "", "", STATUS_ACCESS_VIOLATION, STATUS_INVALID_PARAMETER) status = pNtCreateSymbolicLinkObject(&h, SYMBOLIC_LINK_QUERY, NULL, NULL); ok(status == STATUS_ACCESS_VIOLATION,