Signed-off-by: Fabian Maurer dark.shadow4@web.de --- dlls/ntdll/tests/file.c | 38 +++++++++++++++++++------------------- dlls/ntdll/tests/info.c | 2 +- dlls/ntdll/tests/reg.c | 6 +++--- 3 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 19ae5f2ac21..760e2ff167e 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -1113,7 +1113,7 @@ static void test_file_io_completion(void) U(iosb).Status = 0xdeadbeef; res = pNtSetInformationFile( server, &iosb, &fci, sizeof(fci), FileCompletionInformation ); ok( res == STATUS_INVALID_PARAMETER, "NtSetInformationFile failed: %#x\n", res ); -todo_wine + todo_wine ok( U(iosb).Status == 0xdeadbeef, "wrong status %#x\n", U(iosb).Status ); CloseHandle( client ); CloseHandle( server ); @@ -3020,20 +3020,20 @@ static void test_file_disposition_information(void) res = pNtSetInformationFile( handle, &io, &fdi, sizeof fdi, FileDispositionInformation ); ok( res == STATUS_SUCCESS, "unexpected FileDispositionInformation result (expected STATUS_SUCCESS, got %x)\n", res ); res = nt_get_file_attrs( buffer, &fdi2 ); -todo_wine + todo_wine ok( res == STATUS_DELETE_PENDING, "got %#x\n", res ); /* can't open the deleted file */ handle3 = CreateFileA(buffer, DELETE, FILE_SHARE_DELETE | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, 0); -todo_wine + todo_wine ok( handle3 == INVALID_HANDLE_VALUE, "CreateFile should fail\n" ); -if (handle3 != INVALID_HANDLE_VALUE) - CloseHandle( handle3 ); -todo_wine + if (handle3 != INVALID_HANDLE_VALUE) + CloseHandle( handle3 ); + todo_wine ok(GetLastError() == ERROR_ACCESS_DENIED, "got %u\n", GetLastError()); /* can't open the deleted file (wrong sharing mode) */ handle3 = CreateFileA(buffer, DELETE, 0, NULL, OPEN_EXISTING, 0, 0); ok( handle3 == INVALID_HANDLE_VALUE, "CreateFile should fail\n" ); -todo_wine + todo_wine ok(GetLastError() == ERROR_ACCESS_DENIED, "got %u\n", GetLastError()); CloseHandle( handle ); fileDeleted = GetFileAttributesA( buffer ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; @@ -3153,12 +3153,12 @@ todo_wine fileDeleted = GetFileAttributesA( buffer ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; ok( !fileDeleted, "File shouldn't have been deleted\n" ); res = nt_get_file_attrs( buffer, &fdi2 ); -todo_wine + todo_wine ok( res == STATUS_DELETE_PENDING, "got %#x\n", res ); /* can't open the deleted file */ handle2 = CreateFileA(buffer, DELETE, FILE_SHARE_DELETE, NULL, OPEN_EXISTING, 0, 0); ok( handle2 == INVALID_HANDLE_VALUE, "CreateFile should fail\n" ); -todo_wine + todo_wine ok(GetLastError() == ERROR_ACCESS_DENIED, "got %u\n", GetLastError()); CloseHandle( handle ); fileDeleted = GetFileAttributesA( buffer ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; @@ -3202,13 +3202,13 @@ todo_wine fileDeleted = GetFileAttributesA( buffer ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; ok( !fileDeleted, "Directory shouldn't have been deleted\n" ); res = nt_get_file_attrs( buffer, &fdi2 ); -todo_wine + todo_wine ok( res == STATUS_DELETE_PENDING, "got %#x\n", res ); /* can't open the deleted directory */ handle2 = CreateFileA(buffer, DELETE, FILE_SHARE_DELETE, NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, 0); -todo_wine + todo_wine ok( handle2 == INVALID_HANDLE_VALUE, "CreateFile should fail\n" ); -todo_wine + todo_wine ok(GetLastError() == ERROR_ACCESS_DENIED, "got %u\n", GetLastError()); if (handle2 != INVALID_HANDLE_VALUE) CloseHandle( handle2 ); CloseHandle( handle ); @@ -3227,20 +3227,20 @@ todo_wine res = pNtSetInformationFile( handle2, &io, &fdi, sizeof fdi, FileDispositionInformation ); ok( res == STATUS_SUCCESS, "unexpected FileDispositionInformation result (expected STATUS_SUCCESS, got %x)\n", res ); res = nt_get_file_attrs( buffer, &fdi2 ); -todo_wine + todo_wine ok( res == STATUS_DELETE_PENDING, "got %#x\n", res ); /* can't open the deleted directory */ handle3 = CreateFileA(buffer, DELETE, FILE_SHARE_DELETE, NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, 0); -todo_wine + todo_wine ok( handle3 == INVALID_HANDLE_VALUE, "CreateFile should fail\n" ); -if (handle3 != INVALID_HANDLE_VALUE) - CloseHandle( handle3 ); -todo_wine + if (handle3 != INVALID_HANDLE_VALUE) + CloseHandle( handle3 ); + todo_wine ok(GetLastError() == ERROR_ACCESS_DENIED, "got %u\n", GetLastError()); /* can't open the deleted directory (wrong sharing mode) */ handle3 = CreateFileA(buffer, DELETE, 0, NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, 0); ok( handle3 == INVALID_HANDLE_VALUE, "CreateFile should fail\n" ); -todo_wine + todo_wine ok(GetLastError() == ERROR_ACCESS_DENIED, "got %u\n", GetLastError()); CloseHandle( handle2 ); fileDeleted = GetFileAttributesA( buffer ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; @@ -4231,7 +4231,7 @@ static void test_NtCreateFile(void) /* FIXME: leave only 'else' case below once Wine is fixed */ if (ret != td[i].attrib_out) { - todo_wine + todo_wine ok(ret == td[i].attrib_out, "%d: expected %#x got %#x\n", i, td[i].attrib_out, ret); SetFileAttributesW(path, td[i].attrib_out); } diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 5bcccd8a322..e9d42127c3e 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -2251,7 +2251,7 @@ static void test_query_process_image_file_name(void) buffer = heap_alloc(ReturnLength); status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessImageFileName, buffer, ReturnLength, &ReturnLength); ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); -todo_wine + todo_wine ok(!memcmp(buffer->Buffer, deviceW, sizeof(deviceW)), "Expected image name to begin with \Device\, got %s\n", wine_dbgstr_wn(buffer->Buffer, buffer->Length / sizeof(WCHAR))); diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index 91b752ac069..bd8d531edf0 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -374,9 +374,9 @@ static void test_NtOpenKey(void) attr.Length = sizeof(attr); key = (HANDLE)0xdeadbeef; status = pNtOpenKey(&key, 0, &attr); -todo_wine + todo_wine ok(status == STATUS_ACCESS_DENIED, "Expected STATUS_ACCESS_DENIED, got: 0x%08x\n", status); -todo_wine + todo_wine ok(!key, "key = %p\n", key); if (status == STATUS_SUCCESS) NtClose(key);
@@ -386,7 +386,7 @@ todo_wine key = (HANDLE)0xdeadbeef; status = pNtOpenKey(&key, KEY_READ, &attr); todo_wine ok(status == STATUS_OBJECT_PATH_SYNTAX_BAD, "NtOpenKey Failed: 0x%08x\n", status); -todo_wine + todo_wine ok(!key, "key = %p\n", key); pRtlFreeUnicodeString( &str );
-- 2.35.0