Release console for ghci wrapper

Summary:
It seems the call that caused issues with the gcc wrapper before
was needed for the ghci wrapper in order for the child process
to be the one handling console events.

This code slightly refactors the wrappers to make sure only ghci
calls FreeConsole and nothing else.

Test Plan: ./validate , open ghci.exe press ctrl+c

Reviewers: RyanGlScott, austin, hvr, bgamari

Reviewed By: bgamari

Subscribers: rwbarton, thomie, erikd

GHC Trac Issues: #14150

Differential Revision: https://phabricator.haskell.org/D4028

1 files changed, 8 insertions, 1 deletions

diff --git a/driver/utils/cwrapper.c b/driver/utils/cwrapper.c
index 5a30274ba7..522c2b329a 100644
--- a/driver/utils/cwrapper.c
+++ b/driver/utils/cwrapper.c
@@ -70,9 +70,12 @@ char *flattenAndQuoteArgs(char *ptr, int argc, char *argv[])
     return ptr;
 }
 
+/* This function takes a callback to be called after the creation of the child
+   process but before we block waiting for the child. Can be NULL.  */
 __attribute__((noreturn)) int run (char *exePath,
                                    int numArgs1, char **args1,
-                                   int numArgs2, char **args2)
+                                   int numArgs2, char **args2,
+                                   runCallback callback)
 {
     int i, cmdline_len;
     char *new_cmdline, *ptr;
@@ -134,6 +137,10 @@ __attribute__((noreturn)) int run (char *exePath,
     /* Synchronize input and wait for target to be ready.  */
     WaitForInputIdle(pi.hProcess, INFINITE);
 
+    /* If we have a registered callback then call it before we block.  */
+    if (callback)
+      callback();
+
     switch (WaitForSingleObject(pi.hProcess, INFINITE) ) {
     case WAIT_OBJECT_0:
     {