[PATCH v2 0/1] MR2125: ntdll/tests: Fix broken broken(<constant>) calls.

[Michael Stefaniuc (＠mstefani)]

--
  v2: ntdll/tests: Fix broken broken(<constant>) calls.

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

[PATCH v2 1/1] ntdll/tests: Fix broken broken(<constant>) calls.

[Michael Stefaniuc]

From: Michael Stefaniuc

---
 dlls/ntdll/tests/info.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c
index 192f6be7ce9..1363243e7ee 100644
--- a/dlls/ntdll/tests/info.c
+++ b/dlls/ntdll/tests/info.c
@@ -199,7 +199,7 @@ static void test_query_basic(void)
             "info is different\n" );
     }
 #else
-    ok( status == STATUS_INVALID_INFO_CLASS || broken(STATUS_NOT_IMPLEMENTED), /* vista */
+    ok( status == STATUS_INVALID_INFO_CLASS || broken(status == S_OK), /* some Win8 */
         "got %08lx\n", status);
     status = pRtlGetNativeSystemInformation( SystemNativeBasicInformation, &sbi3, sizeof(sbi3), &ReturnLength );
     ok( !status || status == STATUS_INFO_LENGTH_MISMATCH ||
@@ -3219,9 +3219,11 @@ static void test_ThreadEnableAlignmentFaultFixup(void)

dummy = 0;
     status = NtQueryInformationThread( GetCurrentThread(), ThreadEnableAlignmentFaultFixup, &dummy, sizeof(ULONG), NULL );
-    ok( status == STATUS_INVALID_INFO_CLASS || broken(STATUS_NOT_IMPLEMENTED), "Expected STATUS_INVALID_INFO_CLASS, got %08lx\n", status );
+    ok( status == STATUS_INVALID_INFO_CLASS || broken( status == STATUS_NOT_IMPLEMENTED ),
+        "Expected STATUS_INVALID_INFO_CLASS, got %08lx\n", status );
     status = NtQueryInformationThread( GetCurrentThread(), ThreadEnableAlignmentFaultFixup, &dummy, 1, NULL );
-    ok( status == STATUS_INVALID_INFO_CLASS || broken(STATUS_NOT_IMPLEMENTED), "Expected STATUS_INVALID_INFO_CLASS, got %08lx\n", status );
+    ok( status == STATUS_INVALID_INFO_CLASS || broken( status == STATUS_NOT_IMPLEMENTED ),
+        "Expected STATUS_INVALID_INFO_CLASS, got %08lx\n", status );

dummy = 1;
     status = pNtSetInformationThread( GetCurrentThread(), ThreadEnableAlignmentFaultFixup, &dummy, sizeof(ULONG) );

[Michael Stefaniuc (＠mstefani)]

2nd try: Replace no longer needed Vista broken() with one needed for some Win8 machines.

[PATCH v2 0/1] MR2125: Draft: ntdll/tests: Fix broken broken(<constant>) calls.

[Michael Stefaniuc (＠mstefani)]

This can be simplified even further. Closing.

[PATCH v2 0/1] MR2125: Draft: ntdll/tests: Fix broken broken(<constant>) calls. - closed

[Michael Stefaniuc (＠mstefani)]

This merge request was closed by Michael Stefaniuc.