To: vim_dev@googlegroups.com Subject: Patch 8.0.0051 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.0.0051 (after 8.0.0048) Problem: New code for job_stop() breaks channel test on AppVeyor. Solution: Revert the change. Files: src/os_win32.c, src/structs.h *** ../vim-8.0.0050/src/os_win32.c 2016-10-27 16:46:49.419993332 +0200 --- src/os_win32.c 2016-10-27 21:11:18.235315329 +0200 *************** *** 50,59 **** # endif #endif - #ifdef FEAT_JOB_CHANNEL - # include - #endif - #ifdef __MINGW32__ # ifndef FROM_LEFT_1ST_BUTTON_PRESSED # define FROM_LEFT_1ST_BUTTON_PRESSED 0x0001 --- 50,55 ---- *************** *** 4800,4805 **** --- 4796,4802 ---- { STARTUPINFO si; PROCESS_INFORMATION pi; + HANDLE jo; SECURITY_ATTRIBUTES saAttr; channel_T *channel = NULL; HANDLE ifd[2]; *************** *** 4824,4829 **** --- 4821,4833 ---- efd[0] = INVALID_HANDLE_VALUE; efd[1] = INVALID_HANDLE_VALUE; + jo = CreateJobObject(NULL, NULL); + if (jo == NULL) + { + job->jv_status = JOB_FAILED; + goto failed; + } + ZeroMemory(&pi, sizeof(pi)); ZeroMemory(&si, sizeof(si)); si.cb = sizeof(si); *************** *** 4908,4924 **** --- 4912,4939 ---- } if (!vim_create_process(cmd, TRUE, + CREATE_SUSPENDED | CREATE_DEFAULT_ERROR_MODE | CREATE_NEW_PROCESS_GROUP | CREATE_NEW_CONSOLE, &si, &pi)) { + CloseHandle(jo); job->jv_status = JOB_FAILED; goto failed; } + if (!AssignProcessToJobObject(jo, pi.hProcess)) + { + /* if failing, switch the way to terminate + * process with TerminateProcess. */ + CloseHandle(jo); + jo = NULL; + } + ResumeThread(pi.hThread); CloseHandle(pi.hThread); job->jv_proc_info = pi; + job->jv_job_object = jo; job->jv_status = JOB_STARTED; CloseHandle(ifd[0]); *************** *** 5005,5048 **** return NULL; } - static BOOL - terminate_all(HANDLE process, int code) - { - PROCESSENTRY32 pe; - HANDLE h = INVALID_HANDLE_VALUE; - DWORD pid = GetProcessId(process); - - if (pid != 0) - { - h = CreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0); - if (h == INVALID_HANDLE_VALUE) - goto theend; - - pe.dwSize = sizeof(PROCESSENTRY32); - if (Process32First(h, &pe)) - { - do - { - if (pe.th32ParentProcessID == pid) - { - HANDLE ph = OpenProcess( - PROCESS_ALL_ACCESS, FALSE, pe.th32ProcessID); - if (ph != NULL) - { - terminate_all(ph, code); - CloseHandle(ph); - } - } - } while (Process32Next(h, &pe)); - } - - CloseHandle(h); - } - - theend: - return TerminateProcess(process, code); - } - int mch_stop_job(job_T *job, char_u *how) { --- 5020,5025 ---- *************** *** 5050,5056 **** if (STRCMP(how, "term") == 0 || STRCMP(how, "kill") == 0 || *how == NUL) { ! return terminate_all(job->jv_proc_info.hProcess, 0) ? OK : FAIL; } if (!AttachConsole(job->jv_proc_info.dwProcessId)) --- 5027,5036 ---- if (STRCMP(how, "term") == 0 || STRCMP(how, "kill") == 0 || *how == NUL) { ! if (job->jv_job_object != NULL) ! return TerminateJobObject(job->jv_job_object, 0) ? OK : FAIL; ! else ! return TerminateProcess(job->jv_proc_info.hProcess, 0) ? OK : FAIL; } if (!AttachConsole(job->jv_proc_info.dwProcessId)) *************** *** 5071,5076 **** --- 5051,5058 ---- { if (job->jv_status != JOB_FAILED) { + if (job->jv_job_object != NULL) + CloseHandle(job->jv_job_object); CloseHandle(job->jv_proc_info.hProcess); } } *** ../vim-8.0.0050/src/structs.h 2016-10-27 16:46:49.423993309 +0200 --- src/structs.h 2016-10-27 21:11:27.439259254 +0200 *************** *** 1437,1442 **** --- 1437,1443 ---- #endif #ifdef WIN32 PROCESS_INFORMATION jv_proc_info; + HANDLE jv_job_object; #endif jobstatus_T jv_status; char_u *jv_stoponexit; /* allocated */ *** ../vim-8.0.0050/src/version.c 2016-10-27 20:00:03.665357405 +0200 --- src/version.c 2016-10-27 21:12:22.526923642 +0200 *************** *** 766,767 **** --- 766,769 ---- { /* Add new patch number below this line */ + /**/ + 51, /**/ -- BODY: I'm not dead! CART DRIVER: 'Ere. He says he's not dead. LARGE MAN: Yes he is. BODY: I'm not! "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///