[PATCH v5 0/2] MR4748: Don't test function directly when reporting GetLastError()
-- v5: ntoskrnl/tests: Use RtlNtStatusToDosErrorNoTeb() for stateless conversion mscoree/tests: Don't test function directly when reporting GetLastError() https://gitlab.winehq.org/wine/wine/-/merge_requests/4748
From: André Zwing <nerv(a)dawncrow.de> --- dlls/mscoree/tests/mscoree.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mscoree/tests/mscoree.c b/dlls/mscoree/tests/mscoree.c index 33f5bfa905b..36594972866 100644 --- a/dlls/mscoree/tests/mscoree.c +++ b/dlls/mscoree/tests/mscoree.c @@ -633,8 +633,8 @@ static void test_loadpaths_execute(const WCHAR *exe_name, const WCHAR *dll_name, DWORD exit_code = 0xdeadbeef, err; BOOL ret; - ok(create_new_dir(tmpdir, L"loadpaths"), - "failed to create a new dir %lu\n", GetLastError()); + ret = create_new_dir(tmpdir, L"loadpaths"); + ok(ret, "failed to create a new dir %lu\n", GetLastError()); end = tmpdir + wcslen(tmpdir); wcscpy(tmpexe, tmpdir); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/4748
From: André Zwing <nerv(a)dawncrow.de> --- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 13258b05291..5a47523cf71 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -672,7 +672,7 @@ static void do_return_status(ULONG ioctl, struct return_status_params *params) } else { - ok(GetLastError() == RtlNtStatusToDosError(expect_status), "got error %lu\n", GetLastError()); + ok(GetLastError() == RtlNtStatusToDosErrorNoTeb(expect_status), "got error %lu\n", GetLastError()); } if (NT_ERROR(expect_status)) ok(size == 0xdeadf00d, "got size %lu\n", size); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/4748
This merge request was approved by Esme Povirk. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/4748
participants (2)
-
André Zwing -
Esme Povirk (@madewokherd)