Signed-off-by: Fabian Maurer dark.shadow4@web.de --- dlls/kernel32/tests/actctx.c | 8 ++++---- dlls/kernel32/tests/file.c | 6 +++--- dlls/kernel32/tests/loader.c | 6 +++--- dlls/kernel32/tests/locale.c | 2 +- dlls/kernel32/tests/mailslot.c | 2 +- dlls/kernel32/tests/sync.c | 6 +++--- dlls/kernel32/tests/thread.c | 2 +- 7 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index e103dfdcf2b..c26eb08f306 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -2668,7 +2668,7 @@ todo_wine { SetLastError(0xdeadbeef); handle = CreateActCtxA(&actctx); ok(handle == INVALID_HANDLE_VALUE, "got handle %p\n", handle); -todo_wine + todo_wine ok(GetLastError() == ERROR_SXS_CANT_GEN_ACTCTX || broken(GetLastError() == ERROR_NOT_ENOUGH_MEMORY) /* XP, win2k3 */, "got error %d\n", GetLastError());
@@ -2770,7 +2770,7 @@ static void test_ZombifyActCtx(void)
SetLastError(0xdeadbeef); ret = ZombifyActCtx(NULL); -todo_wine + todo_wine ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "got %d, error %d\n", ret, GetLastError());
handle = create_manifest("test.manifest", testdep_manifest3, __LINE__); @@ -2800,7 +2800,7 @@ todo_wine ok(basicinfo.dwFlags == 0, "got %x\n", basicinfo.dwFlags);
ret = ZombifyActCtx(handle); -todo_wine + todo_wine ok(ret, "got %d\n", ret);
memset(&basicinfo, 0xff, sizeof(basicinfo)); @@ -2822,7 +2822,7 @@ todo_wine
/* one more time */ ret = ZombifyActCtx(handle); -todo_wine + todo_wine ok(ret, "got %d\n", ret);
ret = DeactivateActCtx(0, cookie); diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 60fe532adc2..f8e49491a7d 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -5313,12 +5313,12 @@ static void test_SetFileInformationByHandle(void) /* test FileDispositionInfo, additional details already covered by ntdll tests */ SetLastError(0xdeadbeef); ret = pSetFileInformationByHandle(file, FileDispositionInfo, &dispinfo, 0); -todo_wine + todo_wine ok(!ret && GetLastError() == ERROR_BAD_LENGTH, "got %d, error %d\n", ret, GetLastError());
SetLastError(0xdeadbeef); ret = pSetFileInformationByHandle(file, FileBasicInfo, &basicinfo, 0); -todo_wine + todo_wine ok(!ret && GetLastError() == ERROR_BAD_LENGTH, "got %d, error %d\n", ret, GetLastError());
memset(&basicinfo, 0, sizeof(basicinfo)); @@ -5409,7 +5409,7 @@ static void test_SetFileRenameInfo(void) fri->FileNameLength = wcslen(tempFileTo1) * sizeof(WCHAR); memcpy(fri->FileName, tempFileTo1, fri->FileNameLength + sizeof(WCHAR)); ret = pSetFileInformationByHandle(file, FileRenameInfo, fri, size); -todo_wine + todo_wine ok(!ret && GetLastError() == ERROR_ACCESS_DENIED, "FileRenameInfo unexpected result %d\n", GetLastError()); CloseHandle(file);
diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index f990d632f73..6b5099ea612 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -2442,7 +2442,7 @@ static BOOL WINAPI dll_entry_point(HINSTANCE hinst, DWORD reason, LPVOID param) * doesn't call the DLL entry point on process detach either. */ HeapLock(GetProcessHeap()); -todo_wine + todo_wine ok(0, "dll_entry_point: process should already deadlock\n"); break; } @@ -3308,7 +3308,7 @@ static void test_ExitProcess(void) ret = CreateProcessA(argv[0], cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); ok(ret, "CreateProcess(%s) error %d\n", cmdline, GetLastError()); ret = WaitForSingleObject(pi.hProcess, 5000); -todo_wine + todo_wine ok(ret == WAIT_TIMEOUT || broken(ret == WAIT_OBJECT_0) /* XP */, "child process should fail to terminate\n"); if (ret != WAIT_OBJECT_0) { @@ -3318,7 +3318,7 @@ todo_wine ret = WaitForSingleObject(pi.hProcess, 1000); ok(ret == WAIT_OBJECT_0, "child process failed to terminate\n"); GetExitCodeProcess(pi.hProcess, &ret); -todo_wine + todo_wine ok(ret == 201 || broken(ret == 1) /* XP */, "expected exit code 201, got %u\n", ret); if (*child_failures) { diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 2d327b7130c..8f48b89334c 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -5519,7 +5519,7 @@ static void test_GetThreadPreferredUILanguages(void) ok(!ret, "Expected GetThreadPreferredUILanguages to fail\n"); ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Expected error ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); -todo_wine + todo_wine ok(size == size_id || size == size_id - 1 /* before win10 1809 */, "expected %u, got %u\n", size_id, size);
HeapFree(GetProcessHeap(), 0, buf); diff --git a/dlls/kernel32/tests/mailslot.c b/dlls/kernel32/tests/mailslot.c index 9da960fba81..7e488566dbb 100644 --- a/dlls/kernel32/tests/mailslot.c +++ b/dlls/kernel32/tests/mailslot.c @@ -88,7 +88,7 @@ static int mailslot_test(void) SetLastError(0xdeadbeef); ret = ReadFile(hSlot, buffer, 0, &count, NULL); ok(!ret, "ReadFile should fail\n"); -todo_wine + todo_wine ok(GetLastError() == ERROR_SEM_TIMEOUT, "wrong error %u\n", GetLastError()); ok(count == 0, "expected 0, got %u\n", count);
diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index 827f4c53aa0..a6ee90b81f3 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -202,9 +202,9 @@ static void test_mutex(void)
SetLastError(0xdeadbeef); hOpened = OpenMutexA(0, FALSE, "WineTestMutex"); -todo_wine + todo_wine ok(hOpened == NULL, "OpenMutex succeeded\n"); -todo_wine + todo_wine ok(GetLastError() == ERROR_ACCESS_DENIED, "wrong error %u\n", GetLastError());
SetLastError(0xdeadbeef); @@ -249,7 +249,7 @@ todo_wine } }
-todo_wine + todo_wine ok( failed == 0x0de0fffe, "open succeeded when it shouldn't: %x\n", failed);
SetLastError(0xdeadbeef); diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index e9fd90b1889..6ccf7af85f8 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -2338,7 +2338,7 @@ static void test_thread_info(void) break;
case ThreadIsIoPending: -todo_wine + todo_wine ok(status == STATUS_ACCESS_DENIED, "for info %u expected STATUS_ACCESS_DENIED, got %08x (ret_len %u)\n", i, status, ret_len); break;
-- 2.35.0