Zebediah Figura : ntdll/tests: Return early if ThreadHideFromDebugger isn't supported.

Alexandre Julliard julliard at winehq.org
Mon Jul 20 15:30:08 CDT 2020


Module: wine
Branch: master
Commit: 9dd1eaab44ae3677bb93160d4d7d709b26202dac
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=9dd1eaab44ae3677bb93160d4d7d709b26202dac

Author: Zebediah Figura <z.figura12 at gmail.com>
Date:   Fri Jul 17 19:12:32 2020 -0500

ntdll/tests: Return early if ThreadHideFromDebugger isn't supported.

We're not testing anything interesting in this case.

Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/ntdll/tests/info.c | 31 +++++++++++++++----------------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c
index 780b223990..03d8b26503 100644
--- a/dlls/ntdll/tests/info.c
+++ b/dlls/ntdll/tests/info.c
@@ -2367,19 +2367,20 @@ static void test_HideFromDebugger(void)
     dummy = 0;
     status = NtQueryInformationThread( GetCurrentThread(), ThreadHideFromDebugger, &dummy, sizeof(ULONG), NULL );
     if (status == STATUS_INVALID_INFO_CLASS)
-        win_skip("ThreadHideFromDebugger not available\n");
-    else
     {
-        ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status );
-        dummy = 0;
-        status = NtQueryInformationThread( (HANDLE)0xdeadbeef, ThreadHideFromDebugger, &dummy, sizeof(ULONG), NULL );
-        ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status );
-        dummy = 0;
-        status = NtQueryInformationThread( GetCurrentThread(), ThreadHideFromDebugger, &dummy, 1, NULL );
-        ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status );
-        if (status == STATUS_SUCCESS) ok( dummy == 1, "Expected dummy == 1, got %08x\n", dummy );
+        win_skip("ThreadHideFromDebugger not available\n");
+        return;
     }
 
+    ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status );
+    dummy = 0;
+    status = NtQueryInformationThread( (HANDLE)0xdeadbeef, ThreadHideFromDebugger, &dummy, sizeof(ULONG), NULL );
+    ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status );
+    dummy = 0;
+    status = NtQueryInformationThread( GetCurrentThread(), ThreadHideFromDebugger, &dummy, 1, NULL );
+    ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status );
+    ok( dummy == 1, "Expected dummy == 1, got %08x\n", dummy );
+
     stop_event = CreateEventA( NULL, FALSE, FALSE, NULL );
     ok( stop_event != NULL, "CreateEvent failed\n" );
     thread = CreateThread( NULL, 0, hide_from_debugger_thread, stop_event, 0, NULL );
@@ -2387,18 +2388,16 @@ static void test_HideFromDebugger(void)
 
     dummy = 0;
     status = NtQueryInformationThread( thread, ThreadHideFromDebugger, &dummy, 1, NULL );
-    ok( status == STATUS_SUCCESS || status == STATUS_INVALID_INFO_CLASS,
-        "Expected STATUS_SUCCESS, got %08x\n", status );
-    if (status == STATUS_SUCCESS) ok( dummy == 0, "Expected dummy == 0, got %08x\n", dummy );
+    ok( status == STATUS_SUCCESS, "got %#x\n", status );
+    ok( dummy == 0, "Expected dummy == 0, got %08x\n", dummy );
 
     status = pNtSetInformationThread( thread, ThreadHideFromDebugger, NULL, 0 );
     ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status );
 
     dummy = 0;
     status = NtQueryInformationThread( thread, ThreadHideFromDebugger, &dummy, 1, NULL );
-    ok( status == STATUS_SUCCESS || status == STATUS_INVALID_INFO_CLASS,
-        "Expected STATUS_SUCCESS, got %08x\n", status );
-    if (status == STATUS_SUCCESS) ok( dummy == 1, "Expected dummy == 1, got %08x\n", dummy );
+    ok( status == STATUS_SUCCESS, "got %#x\n", status );
+    ok( dummy == 1, "Expected dummy == 1, got %08x\n", dummy );
 
     SetEvent( stop_event );
     WaitForSingleObject( thread, INFINITE );




More information about the wine-cvs mailing list