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

[André Zwing]

--
  v2: ntoskrnl/tests: Don't test against GetLastError() when reporting GetLastError()
 
https://gitlab.winehq.org/wine/wine/-/merge_requests/4748

[PATCH v2 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 v2 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..da7f5058b13 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() == RtlNtStatusToDosErrorNoTeb(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

[André Zwing]

On Mon Jan  1 15:58:08 2024 +0000, Zebediah Figura wrote:
> ntoskrnl is broken, but this patch won't fix it. We should be using
> RtlNtStatusToDosErrorNoTeb(), and then it'll be stateless.
> done

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

[Zebediah Figura (＠zfigura)]

Splitting that ntoskrnl line into two lines isn't doing anything.

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