aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-26 04:04:07 -04:00
Code Activity

patch 7.4.1318

Browse Source 
Problem:    Channel with pipes doesn't work in GUI.
Solution:   Register input handlers for pipes.
This commit is contained in:
Bram Moolenaar
2016-02-14 19:13:43 +01:00
parent 0727d362b4
commit 7b3ca76a45
9 changed files with 312 additions and 265 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
src/os_win32.c
View File

@@ -5039,12 +5039,19 @@ mch_start_job(char *cmd, job_T *job)
STARTUPINFO si;
PROCESS_INFORMATION pi;
HANDLE jo;
#ifdef FEAT_CHANNEL
channel_T *channel;
channel = add_channel();
if (channel == NULL)
return;
#endif
jo = CreateJobObject(NULL, NULL);
if (jo == NULL)
{
job->jv_status = JOB_FAILED;
return;
goto failed;
}
ZeroMemory(&pi, sizeof(pi));
@@ -5062,22 +5069,40 @@ mch_start_job(char *cmd, job_T *job)
{
CloseHandle(jo);
job->jv_status = JOB_FAILED;
goto failed;
}
else
if (!AssignProcessToJobObject(jo, pi.hProcess))
{
if (!AssignProcessToJobObject(jo, pi.hProcess))
{
/* if failing, switch the way to terminate
* process with TerminateProcess. */
CloseHandle(jo);
jo = NULL;
}
ResumeThread(pi.hThread);
CloseHandle(job->jv_proc_info.hThread);
job->jv_proc_info = pi;
job->jv_job_object = jo;
job->jv_status = JOB_STARTED;
/* if failing, switch the way to terminate
* process with TerminateProcess. */
CloseHandle(jo);
jo = NULL;
}
ResumeThread(pi.hThread);
CloseHandle(job->jv_proc_info.hThread);
job->jv_proc_info = pi;
job->jv_job_object = jo;
job->jv_status = JOB_STARTED;
#ifdef FEAT_CHANNEL
# if 0
/* TODO: connect stdin/stdout/stderr */
job->jv_channel = channel;
channel_set_pipes(channel, fd_in[1], fd_out[0], fd_err[0]);
channel_set_job(channel, job);
# ifdef FEAT_GUI
channel_gui_register(channel);
# endif
# endif
#endif
return;
failed:
#ifdef FEAT_CHANNEL
channel_free(channel);
#endif
}
char *