mirror of
https://github.com/Genymobile/scrcpy
synced 2024-12-24 08:02:45 +00:00
Simplify Windows process inheritance configuration
Merge if-blocks together.
This commit is contained in:
parent
3e54773c48
commit
b9b8b6aab8
@ -79,14 +79,19 @@ sc_process_execute_p(const char *const argv[], HANDLE *handle,
|
|||||||
LPPROC_THREAD_ATTRIBUTE_LIST lpAttributeList = NULL;
|
LPPROC_THREAD_ATTRIBUTE_LIST lpAttributeList = NULL;
|
||||||
if (handle_count) {
|
if (handle_count) {
|
||||||
si.StartupInfo.dwFlags = STARTF_USESTDHANDLES;
|
si.StartupInfo.dwFlags = STARTF_USESTDHANDLES;
|
||||||
|
|
||||||
|
unsigned i = 0;
|
||||||
if (pin) {
|
if (pin) {
|
||||||
si.StartupInfo.hStdInput = stdin_read_handle;
|
si.StartupInfo.hStdInput = stdin_read_handle;
|
||||||
|
handles[i++] = si.StartupInfo.hStdInput;
|
||||||
}
|
}
|
||||||
if (pout) {
|
if (pout) {
|
||||||
si.StartupInfo.hStdOutput = stdout_write_handle;
|
si.StartupInfo.hStdOutput = stdout_write_handle;
|
||||||
|
handles[i++] = si.StartupInfo.hStdOutput;
|
||||||
}
|
}
|
||||||
if (perr) {
|
if (perr) {
|
||||||
si.StartupInfo.hStdError = stderr_write_handle;
|
si.StartupInfo.hStdError = stderr_write_handle;
|
||||||
|
handles[i++] = si.StartupInfo.hStdError;
|
||||||
}
|
}
|
||||||
|
|
||||||
SIZE_T size;
|
SIZE_T size;
|
||||||
@ -110,17 +115,6 @@ sc_process_execute_p(const char *const argv[], HANDLE *handle,
|
|||||||
goto error_close_stderr;
|
goto error_close_stderr;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Explicitly pass the HANDLEs that must be inherited
|
|
||||||
unsigned i = 0;
|
|
||||||
if (pin) {
|
|
||||||
handles[i++] = stdin_read_handle;
|
|
||||||
}
|
|
||||||
if (pout) {
|
|
||||||
handles[i++] = stdout_write_handle;
|
|
||||||
}
|
|
||||||
if (perr) {
|
|
||||||
handles[i++] = stderr_write_handle;
|
|
||||||
}
|
|
||||||
ok = UpdateProcThreadAttribute(lpAttributeList, 0,
|
ok = UpdateProcThreadAttribute(lpAttributeList, 0,
|
||||||
PROC_THREAD_ATTRIBUTE_HANDLE_LIST,
|
PROC_THREAD_ATTRIBUTE_HANDLE_LIST,
|
||||||
handles, handle_count * sizeof(HANDLE),
|
handles, handle_count * sizeof(HANDLE),
|
||||||
|
Loading…
Reference in New Issue
Block a user