[PATCH 0/2] MR4748: Don't test function directly when reporting GetLastError()

[André Zwing]

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/4748

[PATCH 1/2] mscoree/tests: Don't test function directly when reporting GetLastError()

[André Zwing]

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 bfcbc78db55..7a3dda729d6 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;
     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

[PATCH 2/2] ntoskrnl/tests: Don't test against GetLastError() when reporting GetLastError()

[André Zwing]

From: André Zwing <nerv(a)dawncrow.de>

---
 dlls/ntoskrnl.exe/tests/ntoskrnl.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c
index 13258b05291..8c3d7e9848c 100644
--- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c
+++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c
@@ -672,7 +672,8 @@ static void do_return_status(ULONG ioctl, struct return_status_params *params)
     }
     else
     {
-        ok(GetLastError() == RtlNtStatusToDosError(expect_status), "got error %lu\n", GetLastError());
+        ret = GetLastError() == RtlNtStatusToDosError(expect_status);
+        ok(ret, "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

[PATCH 2/2] ntoskrnl/tests: Don't test against GetLastError() when reporting GetLastError()

[Marvin]

Hi,

It looks like your patch introduced the new failures shown below.
Please investigate and fix them before resubmitting your patch.
If they are not new, fixing them anyway would help a lot. Otherwise
please ask for the known failures list to be updated.

The tests also ran into some preexisting test failures. If you know how
to fix them that would be helpful. See the TestBot job for the details:

The full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=141486

Your paranoid android.


=== w7pro64 (64 bit report) ===

mscoree:
mscoree.c:705: Test failed: RemoveDirectoryW(L"C:\\Users\\winetest\\Documents\\loadpaths0000") failed: 145
mscoree.c:705: Test failed: RemoveDirectoryW(L"C:\\Users\\winetest\\Documents\\loadpaths0001") failed: 145
mscoree.c:705: Test failed: RemoveDirectoryW(L"C:\\Users\\winetest\\Documents\\loadpaths0002") failed: 145
mscoree.c:705: Test failed: RemoveDirectoryW(L"C:\\Users\\winetest\\Documents\\loadpaths0003") failed: 145

[Esme Povirk (＠madewokherd)]

The mscoree test failed in the testbot run, but I don't think it could have been caused by this patch series. I'll look into it later.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/4748#note_56434

[Zebediah Figura (＠zfigura)]

ntoskrnl is broken, but this patch won't fix it. We should be using RtlNtStatusToDosErrorNoTeb(), and then it'll be stateless.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/4748#note_56437