Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
9fa65a87
Commit
9fa65a87
authored
Jan 08, 2019
by
Piotr Caban
Committed by
Alexandre Julliard
Jan 08, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
server: Fix process trace_data initialization race on Mac.
Signed-off-by:
Piotr Caban
<
piotr@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
6bab6ce8
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
4 deletions
+5
-4
server.c
dlls/ntdll/server.c
+4
-3
process.c
server/process.c
+1
-1
No files found.
dlls/ntdll/server.c
View file @
9fa65a87
...
...
@@ -1419,9 +1419,6 @@ void server_init_process(void)
"Or maybe the wrong wineserver is still running?
\n
"
,
version
,
SERVER_PROTOCOL_VERSION
,
(
version
>
SERVER_PROTOCOL_VERSION
)
?
"wine"
:
"wineserver"
);
#ifdef __APPLE__
send_server_task_port
();
#endif
#if defined(__linux__) && defined(HAVE_PRCTL)
/* work around Ubuntu's ptrace breakage */
if
(
server_pid
!=
-
1
)
prctl
(
0x59616d61
/* PR_SET_PTRACER */
,
server_pid
);
...
...
@@ -1440,6 +1437,10 @@ void server_init_process_done(void)
NTSTATUS
status
;
int
suspend
;
#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 REQ_INIT_PROCESS_DONE.
...
...
server/process.c
View file @
9fa65a87
...
...
@@ -587,7 +587,6 @@ data_size_t init_process( struct thread *thread )
struct
process
*
process
=
thread
->
process
;
struct
startup_info
*
info
=
process
->
startup_info
;
init_process_tracing
(
process
);
if
(
!
info
)
return
0
;
return
info
->
data_size
;
}
...
...
@@ -1319,6 +1318,7 @@ DECL_HANDLER(init_process_done)
if
(
process
->
exe_file
)
release_object
(
process
->
exe_file
);
process
->
exe_file
=
NULL
;
init_process_tracing
(
process
);
generate_startup_debug_events
(
process
,
req
->
entry
);
set_process_startup_state
(
process
,
STARTUP_DONE
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment