Fixed regression around executing Ctrl+C in session with TTY

manojampalam · manojampalam · commit 7506f83b5974 · 2016-10-21T23:07:05.000-07:00
diff --git a/contrib/win32/win32compat/shell-host.c b/contrib/win32/win32compat/shell-host.c
@@ -826,7 +826,7 @@ DWORD WINAPI ProcessPipes(LPVOID p) {
             INPUT_RECORD ir;
 
 	    if (buf[i] == 3) {/*Ctrl+C - Raise Ctrl+C*/
-		    GenerateConsoleCtrlEvent(CTRL_C_EVENT, childProcessId);
+		    GenerateConsoleCtrlEvent(CTRL_C_EVENT, 0);
 		    continue;
 	    }
 
@@ -1111,6 +1111,7 @@ int start_with_pty(int ac, wchar_t **av) {
         av++;
     }
 
+    SetConsoleCtrlHandler(NULL, FALSE);
     GOTO_CLEANUP_ON_FALSE(CreateProcess(NULL, cmd, NULL, NULL, TRUE, CREATE_NEW_CONSOLE, 
         NULL, NULL, &si, &pi));
     childProcessId = pi.dwProcessId;

Original file line number	Diff line number	Diff line change
`@@ -826,7 +826,7 @@ DWORD WINAPI ProcessPipes(LPVOID p) {`
`826`	`826`	`INPUT_RECORD ir;`
`827`	`827`
`828`	`828`	`if (buf[i] == 3) {/Ctrl+C - Raise Ctrl+C/`
`829`		`- GenerateConsoleCtrlEvent(CTRL_C_EVENT, childProcessId);`
	`829`	`+ GenerateConsoleCtrlEvent(CTRL_C_EVENT, 0);`
`830`	`830`	`continue;`
`831`	`831`	`}`
`832`	`832`
`@@ -1111,6 +1111,7 @@ int start_with_pty(int ac, wchar_t **av) {`
`1111`	`1111`	`av++;`
`1112`	`1112`	`}`
`1113`	`1113`
	`1114`	`+ SetConsoleCtrlHandler(NULL, FALSE);`
`1114`	`1115`	`GOTO_CLEANUP_ON_FALSE(CreateProcess(NULL, cmd, NULL, NULL, TRUE, CREATE_NEW_CONSOLE,`
`1115`	`1116`	`NULL, NULL, &si, &pi));`
`1116`	`1117`	`childProcessId = pi.dwProcessId;`