diff options
| author | Gerald Combs <gerald@wireshark.org> | 2018-03-12 08:49:12 -0700 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2018-03-13 17:18:30 +0000 |
| commit | a2f926761525ac67feeda742a796917a1f043b33 (patch) | |
| tree | cf79825b1d983633dc7d7f6d1a28ec2fe70dfa1e /wsutil/ws_pipe.h | |
| parent | 0874b8bac6ca89f1d91d30d66d54f425e4e7c81e (diff) | |
Windows: Always assign newly-created processes to our job.
Move ws_pipe_kill_child_on_exit to win32-utils. Add win32_create_process,
which calls CreateProcess + AssignProcessToJobObject. Use
win32_create_process instead of CreateProcess everywhere.
Bug: 1419
Change-Id: I7a1f17dddf6a73f6973d54621f271b69311400d1
Reviewed-on: https://code.wireshark.org/review/26448
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'wsutil/ws_pipe.h')
| -rw-r--r-- | wsutil/ws_pipe.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/wsutil/ws_pipe.h b/wsutil/ws_pipe.h index a5f37a1040..bd9fca63a3 100644 --- a/wsutil/ws_pipe.h +++ b/wsutil/ws_pipe.h @@ -73,6 +73,7 @@ static inline gboolean ws_pipe_valid(ws_pipe_t *ws_pipe) */ WS_DLL_PUBLIC GPid ws_pipe_spawn_async (ws_pipe_t * ws_pipe, GPtrArray * args ); +#ifdef _WIN32 /** * @brief Wait for a set of handles using WaitForMultipleObjects. Windows only. * @param pipe_handles An array of handles @@ -80,7 +81,6 @@ WS_DLL_PUBLIC GPid ws_pipe_spawn_async (ws_pipe_t * ws_pipe, GPtrArray * args ); * @param pid Child process PID. * @return TRUE on success or FALSE on failure. */ -#ifdef _WIN32 WS_DLL_PUBLIC gboolean ws_pipe_wait_for_pipe(HANDLE * pipe_handles, int num_pipe_handles, HANDLE pid); #endif |