Module: wine Branch: master Commit: 7dc1c2af52176342b82102342c4acc9cb107748e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7dc1c2af52176342b82102342c...
Author: Alexandre Julliard julliard@winehq.org Date: Thu Dec 3 10:08:56 2009 +0100
ntdll: Fix test failure on recent Windows versions.
---
dlls/ntdll/directory.c | 2 +- dlls/ntdll/tests/file.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index 8af2d00..de8d57c 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -2349,7 +2349,7 @@ NTSTATUS nt_to_unix_file_name_attr( const OBJECT_ATTRIBUTES *attr, ANSI_STRING * name = attr->ObjectName->Buffer; name_len = attr->ObjectName->Length / sizeof(WCHAR);
- if (name_len && IS_SEPARATOR(name[0])) return STATUS_OBJECT_PATH_SYNTAX_BAD; + if (name_len && IS_SEPARATOR(name[0])) return STATUS_INVALID_PARAMETER;
/* check for invalid characters */ for (p = name; p < name + name_len; p++) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index ccec589..ca0ef28 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -195,7 +195,7 @@ static void open_file_test(void) nameW.Length += sizeof(WCHAR); status = pNtOpenFile( &handle, GENERIC_READ, &attr, &io, FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_DIRECTORY_FILE ); - ok( status == STATUS_OBJECT_PATH_SYNTAX_BAD, + ok( status == STATUS_INVALID_PARAMETER || status == STATUS_OBJECT_PATH_SYNTAX_BAD, /* nt4 */ "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status ); if (!status) CloseHandle( handle );