Skip to content

W
wine-winehq
Commit 53fc157f authored by Eric Pouech's avatar Eric Pouech Committed by Alexandre Julliard
Browse files
Options

kernel32/tests: Fix debugger.c:test_kill_on_exit().

As background information from Windows testings: - the debug port event is closed upon thread regular exit. - results are however inconsistent across Windows versions for forced termination (through TerminateThread and equiv). - this is moreover crippled by most of the 32bit implementation on Windows (except Win8) which don't enforce the close on exit flag for wow64 debuggee:s (they enforce it for 64bit though) - but, in the cases where the debuggee terminates, the debug port is always closed *after* the debuggee process termination. So I adapted the tests to conform to "debug port is closed" when handling the thread termination. Some tests had to be moved *after* debuggee termination to ensure success. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53144Signed-off-by: 's avatarEric Pouech <eric.pouech@gmail.com>
parent 3bbb2caf
Hide whitespace changes
Inline Side-by-side
Showing with 34 additions and 13 deletions
dlls/kernel32/tests/debugger.c
View file @ 53fc157f
...@@ -2098,6 +2098,7 @@ static void test_kill_on_exit(const char *argv0) ...@@ -2098,6 +2098,7 @@ static void test_kill_on_exit(const char *argv0)
HANDLE event, debug, thread; HANDLE event, debug, thread;
DWORD exit_code, tid; DWORD exit_code, tid;
ULONG val; ULONG val;
BOOL ret;
event = CreateEventW(&sa, FALSE, FALSE, NULL); event = CreateEventW(&sa, FALSE, FALSE, NULL);
ok(event != NULL, "CreateEvent failed: %lu\n", GetLastError()); ok(event != NULL, "CreateEvent failed: %lu\n", GetLastError());
...@@ -2169,29 +2170,46 @@ static void test_kill_on_exit(const char *argv0) ...@@ -2169,29 +2170,46 @@ static void test_kill_on_exit(const char *argv0)
CloseHandle( pi.hThread ); CloseHandle( pi.hThread );
CloseHandle( thread ); CloseHandle( thread );
/* but not on forced exit */ /* checking on forced exit */
status = pNtCreateDebugObject( &debug, DEBUG_ALL_ACCESS, &attr, DEBUG_KILL_ON_CLOSE ); status = pNtCreateDebugObject( &debug, DEBUG_ALL_ACCESS, &attr, DEBUG_KILL_ON_CLOSE );
ok( !status, "NtCreateDebugObject failed %lx\n", status ); ok( !status, "NtCreateDebugObject failed %lx\n", status );
thread = CreateThread(NULL, 0, debug_and_wait, &debug, 0, &tid); thread = CreateThread(NULL, 0, debug_and_wait, &debug, 0, &tid);
Sleep( 100 ); Sleep( 100 );
ok( debug != 0, "no debug port\n" ); ok( debug != 0, "no debug port\n" );
val = 1; val = DEBUG_KILL_ON_CLOSE;
status = pNtSetInformationDebugObject( debug, DebugObjectKillProcessOnExitInformation, status = pNtSetInformationDebugObject( debug, DebugObjectKillProcessOnExitInformation,
&val, sizeof(val), NULL ); &val, sizeof(val), NULL );
ok( status == STATUS_SUCCESS, "NtSetInformationDebugObject failed %lx\n", status ); ok( status == STATUS_SUCCESS, "NtSetInformationDebugObject failed %lx\n", status );
TerminateThread( thread, 0 ); TerminateThread( thread, 0 );
status = pNtSetInformationDebugObject( debug, DebugObjectKillProcessOnExitInformation,
&val, sizeof(val), NULL ); status = WaitForSingleObject( pi.hProcess, 1500 );
ok( status == STATUS_SUCCESS, "NtSetInformationDebugObject failed %lx\n", status ); if (status != WAIT_OBJECT_0)
WaitForSingleObject( pi.hProcess, 300 ); {
GetExitCodeProcess( pi.hProcess, &exit_code ); todo_wine /* Wine doesn't handle debug port of TerminateThread */
todo_wine ok(broken(sizeof(void*) == sizeof(int)), /* happens consistently on 32bit on Win7, 10 & 11 */
ok( exit_code == STATUS_DEBUGGER_INACTIVE || broken(exit_code == STILL_ACTIVE), /* wow64 */ "Terminating thread should terminate debuggee\n");
"exit code = %08lx\n", exit_code);
ret = TerminateProcess( pi.hProcess, 0 );
ok(ret, "TerminateProcess failed: %lu\n", GetLastError());
CloseHandle( debug );
}
else
{
ok(status == WAIT_OBJECT_0, "debuggee didn't terminate %lx\n", status);
ret = GetExitCodeProcess( pi.hProcess, &exit_code );
ok(ret, "No exit code: %lu\n", GetLastError());
todo_wine
ok( exit_code == STATUS_DEBUGGER_INACTIVE || broken(exit_code == STILL_ACTIVE), /* wow64 */
"exit code = %08lx\n", exit_code);
status = pNtSetInformationDebugObject( debug, DebugObjectKillProcessOnExitInformation,
&val, sizeof(val), NULL );
todo_wine
ok( status == STATUS_INVALID_HANDLE, "NtSetInformationDebugObject failed %lx\n", status );
}
CloseHandle( pi.hProcess ); CloseHandle( pi.hProcess );
CloseHandle( pi.hThread ); CloseHandle( pi.hThread );
CloseHandle( thread ); CloseHandle( thread );
CloseHandle( debug );
debug = 0; debug = 0;
thread = CreateThread(NULL, 0, create_debug_port, &debug, 0, &tid); thread = CreateThread(NULL, 0, create_debug_port, &debug, 0, &tid);
...@@ -2202,10 +2220,13 @@ static void test_kill_on_exit(const char *argv0) ...@@ -2202,10 +2220,13 @@ static void test_kill_on_exit(const char *argv0)
&val, sizeof(val), NULL ); &val, sizeof(val), NULL );
ok( status == STATUS_SUCCESS, "NtSetInformationDebugObject failed %lx\n", status ); ok( status == STATUS_SUCCESS, "NtSetInformationDebugObject failed %lx\n", status );
TerminateThread( thread, 0 ); TerminateThread( thread, 0 );
Sleep( 200 );
status = pNtSetInformationDebugObject( debug, DebugObjectKillProcessOnExitInformation, status = pNtSetInformationDebugObject( debug, DebugObjectKillProcessOnExitInformation,
&val, sizeof(val), NULL ); &val, sizeof(val), NULL );
ok( status == STATUS_SUCCESS, "NtSetInformationDebugObject failed %lx\n", status ); todo_wine
CloseHandle( debug ); ok( status == STATUS_INVALID_HANDLE || broken( status == STATUS_SUCCESS ),
"NtSetInformationDebugObject failed %lx\n", status );
if (status != STATUS_INVALID_HANDLE) CloseHandle( debug );
CloseHandle( thread ); CloseHandle( thread );
CloseHandle( event ); CloseHandle( event );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment