ConPTY: Flush unhandled sequences to the buffer

src/host/VtInputThread.cpp

@@ -28,10 +28,6 @@ VtInputThread::VtInputThread(_In_ wil::unique_hfile hPipe, const bool inheritCur
 
     auto dispatch = std::make_unique<InteractDispatch>();
     auto engine = std::make_unique<InputStateMachineEngine>(std::move(dispatch), inheritCursor);
-
-    // we need this callback to be able to flush an unknown input sequence to the app
-    engine->SetFlushToInputQueueCallback([this] { return _pInputStateMachine->FlushToTerminal(); });
-
     _pInputStateMachine = std::make_unique<StateMachine>(std::move(engine));
 }
 

src/inc/til.h

@@ -96,19 +96,6 @@ namespace til // Terminal Implementation Library. Also: "Today I Learned"
 
 // These sit outside the namespace because they sit outside for WIL too.
 
-// Inspired from RETURN_IF_WIN32_BOOL_FALSE
-// WIL doesn't include a RETURN_BOOL_IF_FALSE, and RETURN_IF_WIN32_BOOL_FALSE
-//  will actually return the value of GLE.
-#define RETURN_BOOL_IF_FALSE(b)                     \
-    do                                              \
-    {                                               \
-        const bool __boolRet = wil::verify_bool(b); \
-        if (!__boolRet)                             \
-        {                                           \
-            return __boolRet;                       \
-        }                                           \
-    } while (0, 0)
-
 // Due to a bug (DevDiv 441931), Warning 4297 (function marked noexcept throws
 // exception) is detected even when the throwing code is unreachable, such as
 // the end of scope after a return, in function-level catch.

src/terminal/adapter/DispatchTypes.hpp

@@ -280,7 +280,7 @@ namespace Microsoft::Console::VirtualTerminal
         }
 
         template<typename T>
-        bool for_each(const T&& predicate) const
+        void for_each(const T&& predicate) const
         {
             auto params = _params;
 
@@ -291,12 +291,10 @@ namespace Microsoft::Console::VirtualTerminal
                 params = defaultParameters;
             }
 
-            auto success = true;
             for (const auto& v : params)
             {
-                success = predicate(v) && success;
+                predicate(v);
             }
-            return success;
         }
 
     private:

src/terminal/adapter/FontBuffer.cpp

@@ -198,7 +198,10 @@ void FontBuffer::AddSixelData(const wchar_t ch)
 bool FontBuffer::FinalizeSixelData()
 {
     // If the charset ID hasn't been initialized this isn't a valid update.
-    RETURN_BOOL_IF_FALSE(_charsetIdInitialized);
+    if (!_charsetIdInitialized)
+    {
+        return false;
+    }
 
     // Flush the current line to make sure we take all the used positions
     // into account when calculating the font dimensions.

src/terminal/adapter/IInteractDispatch.hpp

@@ -28,21 +28,13 @@ namespace Microsoft::Console::VirtualTerminal
         virtual ~IInteractDispatch() = default;
 #pragma warning(pop)
 
-        virtual bool WriteInput(const std::span<const INPUT_RECORD>& inputEvents) = 0;
-
-        virtual bool WriteCtrlKey(const INPUT_RECORD& event) = 0;
-
-        virtual bool WriteString(const std::wstring_view string) = 0;
-
-        virtual bool WindowManipulation(const DispatchTypes::WindowManipulationType function,
-                                        const VTParameter parameter1,
-                                        const VTParameter parameter2) = 0;
-
-        virtual bool MoveCursor(const VTInt row,
-                                const VTInt col) = 0;
-
         virtual bool IsVtInputEnabled() const = 0;
 
-        virtual bool FocusChanged(const bool focused) const = 0;
+        virtual void WriteInput(const std::span<const INPUT_RECORD>& inputEvents) = 0;
+        virtual void WriteCtrlKey(const INPUT_RECORD& event) = 0;
+        virtual void WriteString(std::wstring_view string) = 0;
+        virtual void WindowManipulation(DispatchTypes::WindowManipulationType function, VTParameter parameter1, VTParameter parameter2) = 0;
+        virtual void MoveCursor(VTInt row, VTInt col) = 0;
+        virtual void FocusChanged(bool focused) = 0;
     };
 }

src/terminal/adapter/InteractDispatch.cpp

@@ -37,11 +37,10 @@ InteractDispatch::InteractDispatch() :
 // - inputEvents: a collection of IInputEvents
 // Return Value:
 // - True.
-bool InteractDispatch::WriteInput(const std::span<const INPUT_RECORD>& inputEvents)
+void InteractDispatch::WriteInput(const std::span<const INPUT_RECORD>& inputEvents)
 {
     const auto& gci = ServiceLocator::LocateGlobals().getConsoleInformation();
     gci.GetActiveInputBuffer()->Write(inputEvents);
-    return true;
 }
 
 // Method Description:
@@ -51,10 +50,9 @@ bool InteractDispatch::WriteInput(const std::span<const INPUT_RECORD>& inputEven
 //   client application.
 // Arguments:
 // - event: The key to send to the host.
-bool InteractDispatch::WriteCtrlKey(const INPUT_RECORD& event)
+void InteractDispatch::WriteCtrlKey(const INPUT_RECORD& event)
 {
     HandleGenericKeyEvent(event, false);
-    return true;
 }
 
 // Method Description:
@@ -63,7 +61,7 @@ bool InteractDispatch::WriteCtrlKey(const INPUT_RECORD& event)
 // - string : a string to write to the console.
 // Return Value:
 // - True.
-bool InteractDispatch::WriteString(const std::wstring_view string)
+void InteractDispatch::WriteString(const std::wstring_view string)
 {
     if (!string.empty())
     {
@@ -77,7 +75,6 @@ bool InteractDispatch::WriteString(const std::wstring_view string)
 
         WriteInput(keyEvents);
     }
-    return true;
 }
 
 //Method Description:
@@ -92,7 +89,7 @@ bool InteractDispatch::WriteString(const std::wstring_view string)
 // - parameter2 - The second optional parameter for the function
 // Return value:
 // True if handled successfully. False otherwise.
-bool InteractDispatch::WindowManipulation(const DispatchTypes::WindowManipulationType function,
+void InteractDispatch::WindowManipulation(const DispatchTypes::WindowManipulationType function,
                                           const VTParameter parameter1,
                                           const VTParameter parameter2)
 {
@@ -103,20 +100,20 @@ bool InteractDispatch::WindowManipulation(const DispatchTypes::WindowManipulatio
     {
     case DispatchTypes::WindowManipulationType::DeIconifyWindow:
         _api.ShowWindow(true);
-        return true;
+        break;
     case DispatchTypes::WindowManipulationType::IconifyWindow:
         _api.ShowWindow(false);
-        return true;
+        break;
     case DispatchTypes::WindowManipulationType::RefreshWindow:
         _api.GetBufferAndViewport().buffer.TriggerRedrawAll();
-        return true;
+        break;
     case DispatchTypes::WindowManipulationType::ResizeWindowInCharacters:
         // TODO:GH#1765 We should introduce a better `ResizeConpty` function to
         // ConhostInternalGetSet, that specifically handles a conpty resize.
         _api.ResizeWindow(parameter2.value_or(0), parameter1.value_or(0));
-        return true;
+        break;
     default:
-        return false;
+        break;
     }
 }
 
@@ -128,7 +125,7 @@ bool InteractDispatch::WindowManipulation(const DispatchTypes::WindowManipulatio
 // - col: The column to move the cursor to.
 // Return value:
 // - True.
-bool InteractDispatch::MoveCursor(const VTInt row, const VTInt col)
+void InteractDispatch::MoveCursor(const VTInt row, const VTInt col)
 {
     // First retrieve some information about the buffer
     const auto viewport = _api.GetBufferAndViewport().viewport;
@@ -142,7 +139,7 @@ bool InteractDispatch::MoveCursor(const VTInt row, const VTInt col)
     // Finally, attempt to set the adjusted cursor position back into the console.
     const auto api = gsl::not_null{ ServiceLocator::LocateGlobals().api };
     auto& info = ServiceLocator::LocateGlobals().getConsoleInformation().GetActiveOutputBuffer();
-    return SUCCEEDED(api->SetConsoleCursorPositionImpl(info, coordCursor));
+    LOG_IF_FAILED(api->SetConsoleCursorPositionImpl(info, coordCursor));
 }
 
 // Routine Description:
@@ -166,7 +163,7 @@ bool InteractDispatch::IsVtInputEnabled() const
 // - focused: if the terminal is now focused
 // Return Value:
 // - true always.
-bool InteractDispatch::FocusChanged(const bool focused) const
+void InteractDispatch::FocusChanged(const bool focused)
 {
     auto& g = ServiceLocator::LocateGlobals();
     auto& gci = g.getConsoleInformation();
@@ -231,6 +228,4 @@ bool InteractDispatch::FocusChanged(const bool focused) const
         gci.pInputBuffer->WriteFocusEvent(focused);
     }
     // Does nothing outside of ConPTY. If there's a real HWND, then the HWND is solely in charge.
-
-    return true;
 }

src/terminal/adapter/InteractDispatch.hpp

@@ -25,17 +25,14 @@ namespace Microsoft::Console::VirtualTerminal
     public:
         InteractDispatch();
 
-        bool WriteInput(const std::span<const INPUT_RECORD>& inputEvents) override;
-        bool WriteCtrlKey(const INPUT_RECORD& event) override;
-        bool WriteString(const std::wstring_view string) override;
-        bool WindowManipulation(const DispatchTypes::WindowManipulationType function,
-                                const VTParameter parameter1,
-                                const VTParameter parameter2) override; // DTTERM_WindowManipulation
-        bool MoveCursor(const VTInt row, const VTInt col) override;
-
         bool IsVtInputEnabled() const override;
 
-        bool FocusChanged(const bool focused) const override;
+        void WriteInput(const std::span<const INPUT_RECORD>& inputEvents) override;
+        void WriteCtrlKey(const INPUT_RECORD& event) override;
+        void WriteString(std::wstring_view string) override;
+        void WindowManipulation(DispatchTypes::WindowManipulationType function, VTParameter parameter1, VTParameter parameter2) override;
+        void MoveCursor(VTInt row, VTInt col) override;
+        void FocusChanged(bool focused) override;
 
     private:
         ConhostInternalGetSet _api;