2nd Command-line "useinterceptor" loads interceptor driver

App cleanup frees windows console in debug mode

Author: Oeddish

Tube/Tube.cs

@@ -77,9 +77,18 @@ static void Main(string[] args)
                 TrayApplicationContext<ViewMain> trayApplicationContext = new TrayApplicationContext<ViewMain>();
                 MainForm = (ViewMain) trayApplicationContext.MainForm;
 
-                // Careful. Does bad things if the event handlers block the driver.
-                // TODO: Make Interceptor driver use toggle-able in the GUI
-                LoadInterceptorDriver();
+                // TODO: Make Interceptor driver use a GUI toggle
+                bool useInterceptor = (args.Length >= 2 && args[1].ToLower().Equals("useinterceptor"));
+                InterceptorDriverInput = new Input();
+                if (useInterceptor)
+                {
+                    LOGGER.Info("Loading interceptor driver..." );
+                    LoadInterceptorDriver();
+                    if (Tube.InterceptorDriverInput.IsLoaded)
+                    {
+                        LOGGER.Info("Interceptor driver loaded and will be used instead of SendInput() and hooks");
+                    }
+                }
 
                 // Native keyboard and mouse hook initialization
                 KeyInterceptor.Initialize(KeyboardHandler.HookCallback);
@@ -99,17 +108,26 @@ static void Main(string[] args)
 
                 ProcessFileArg(fileName);
 
-                LOGGER.Debug("Entering Application.Run()...");
+                LOGGER.Debug("Entering Application.Run()");
                 Application.Run(trayApplicationContext);
-                LOGGER.Debug("...returned from Application.Run().");
+                LOGGER.Debug("Returned from Application.Run().");
             }
             finally
             {
+                LOGGER.Info("Starting application exit cleanup...");
+
                 // Native class de-initialization
                 MouseInterceptor.Unhook();
                 KeyInterceptor.Cleanup();
                 CmdFileReader.Dispose();
                 UnloadInterceptorDriver();
+
+                LOGGER.Info("... end application exit cleanup");
+
+                if (LOGGER.IsDebugEnabled)
+                {
+                    WinConsole.Free();
+                }
             }
 
             if (WriteOnExit)
@@ -122,36 +140,29 @@ static void Main(string[] args)
 
         private static void LoadInterceptorDriver()
         {
-            InterceptorDriverInput = new Input
+            try
             {
-                KeyboardFilterMode = KeyboardFilterMode.All,
-
                 // For mouse lock
-                MouseFilterMode = MouseFilterMode.MouseMove
-            };
+                InterceptorDriverInput.MouseFilterMode = MouseFilterMode.MouseMove;
 
-            // Probably not needed unless we need the filter driver for both input and output
-            // IntercepterDriverWrapper.OnKeyPressed += IntercepterDriverWrapper_OnKeyPressed;
+                // Clicking in debug console with this enabled may lock all inputs and require reboot!
+                InterceptorDriverInput.OnMousePressed += IntercepterDriverWrapper_OnMousePressed;
 
-            // Clicking in console with this enabled is very bad. 
-            InterceptorDriverInput.OnMousePressed += IntercepterDriverWrapper_OnMousePressed;
-
-            try
-            {
                 InterceptorDriverInput.Load();
             }
             catch (DllNotFoundException notFoundException)
             {
-                LOGGER.Info("Unable to load keyboard filter driver DLL. Make sure DLL is in application directory: " + notFoundException);
+                LOGGER.Warn("Unable to load keyboard filter driver DLL. Make sure DLL is in application directory: " + notFoundException);
                 return;
             }
             catch (Exception e)
             {
+                // Code that simulates input should always check filter driver state 
+                // if Tube.InterceptorDriverInput.IsLoaded use it, otherwise use
+                // SendInput
                 LOGGER.Warn("Failed to load keyboard filter driver. SendInput will be used: " + e);
                 return;
             }
-
-            LOGGER.Info("Keyboard filter driver loaded and will be used instead of SendInput()!");
         }
 
         private static void UnloadInterceptorDriver()

Tube/native/WinConsole.cs

@@ -24,6 +24,13 @@ public static void Initialize(bool alwaysCreateNewConsole = true)
             }
         }
 
+        public static void Free()
+        {
+            Console.Out?.Close();
+            Console.In?.Close();
+            FreeConsole();
+        }
+
         private static void InitializeOutStream()
         {
             var fs = CreateFileStream("CONOUT$", GENERIC_WRITE, FILE_SHARE_WRITE, FileAccess.Write);
@@ -44,8 +51,11 @@ private static void InitializeInStream()
             }
         }
 
-        private static FileStream CreateFileStream(string name, uint win32DesiredAccess, uint win32ShareMode,
-                                FileAccess dotNetFileAccess)
+        private static FileStream CreateFileStream(
+            string name, 
+            uint win32DesiredAccess, 
+            uint win32ShareMode,
+            FileAccess dotNetFileAccess)
         {
             var file = new SafeFileHandle(CreateFileW(name, win32DesiredAccess, win32ShareMode, IntPtr.Zero, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, IntPtr.Zero), true);
             if (!file.IsInvalid)
@@ -64,6 +74,13 @@ private static FileStream CreateFileStream(string name, uint win32DesiredAccess,
             CallingConvention = CallingConvention.StdCall)]
         private static extern int AllocConsole();
 
+        [DllImport("kernel32.dll",
+            EntryPoint = "FreeConsole",
+            SetLastError = true,
+            CharSet = CharSet.Auto,
+            CallingConvention = CallingConvention.StdCall)]
+        private static extern bool FreeConsole();
+
         [DllImport("kernel32.dll",
             EntryPoint = "AttachConsole",
             SetLastError = true,
@@ -76,6 +93,7 @@ private static FileStream CreateFileStream(string name, uint win32DesiredAccess,
             SetLastError = true,
             CharSet = CharSet.Auto,
             CallingConvention = CallingConvention.StdCall)]
+
         private static extern IntPtr CreateFileW(
               string lpFileName,
               UInt32 dwDesiredAccess,