From: Rémi Bernon <rbernon@codeweavers.com> --- dlls/ntdll/unix/server.c | 7 +++---- server/process.c | 3 +-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c index 469b2c8b130..5ccd649fdc8 100644 --- a/dlls/ntdll/unix/server.c +++ b/dlls/ntdll/unix/server.c @@ -1656,6 +1656,9 @@ size_t server_init_process(void) /* work around Ubuntu's ptrace breakage */ if (server_pid != -1) prctl( 0x59616d61 /* PR_SET_PTRACER */, server_pid ); #endif +#ifdef __APPLE__ + send_server_task_port(); +#endif /* ignore SIGPIPE so that we get an EPIPE error instead */ sig_act.sa_handler = SIG_IGN; @@ -1740,10 +1743,6 @@ void server_init_process_done(void) chdir( "/" ); close( initial_cwd ); -#ifdef __APPLE__ - send_server_task_port(); -#endif - /* Install signal handlers; this cannot be done earlier, since we cannot * send exceptions to the debugger before the create process event that * is sent by init_process_done */ diff --git a/server/process.c b/server/process.c index bda3223a573..e54a8f13df8 100644 --- a/server/process.c +++ b/server/process.c @@ -1496,6 +1496,7 @@ DECL_HANDLER(get_startup_info) current->teb = req->teb; process->peb = req->peb; + init_process_tracing( process ); if (!info) return; @@ -1521,8 +1522,6 @@ DECL_HANDLER(init_process_done) } process->start_time = current_time; - - init_process_tracing( process ); generate_startup_debug_events( process ); set_process_startup_state( process, STARTUP_DONE ); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/10058