Refactor and simplify the ConGetSet API

src/cascadia/UnitTests_TerminalCore/ConptyRoundtripTests.cpp

@@ -303,7 +303,7 @@ void ConptyRoundtripTests::_resizeConpty(const unsigned short sx,
 void ConptyRoundtripTests::_clearConpty()
 {
     // Taken verbatim from implementation in PtySignalInputThread::_DoClearBuffer
-    _pConApi->PrivateClearBuffer();
+    _pConApi->ClearBuffer();
 }
 
 [[nodiscard]] std::tuple<TextBuffer*, TextBuffer*> ConptyRoundtripTests::_performResize(const til::size newSize)

src/host/PtySignalInputThread.cpp

@@ -145,7 +145,7 @@ void PtySignalInputThread::_DoResizeWindow(const ResizeWindowData& data)
 
 void PtySignalInputThread::_DoClearBuffer()
 {
-    _pConApi->PrivateClearBuffer();
+    _pConApi->ClearBuffer();
 }
 
 // Method Description:

src/host/cmdline.h

@@ -148,8 +148,6 @@ void RedrawCommandLine(COOKED_READ_DATA& cookedReadData);
 bool IsWordDelim(const wchar_t wch);
 bool IsWordDelim(const std::wstring_view charData);
 
-[[nodiscard]] HRESULT DoSrvSetConsoleTitleW(const std::wstring_view title) noexcept;
-
 bool IsValidStringBuffer(_In_ bool Unicode, _In_reads_bytes_(Size) PVOID Buffer, _In_ ULONG Size, _In_ ULONG Count, ...);
 
 void SetCurrentCommandLine(COOKED_READ_DATA& cookedReadData, _In_ SHORT Index);

src/host/directio.cpp

@@ -443,24 +443,6 @@ void EventsToUnicode(_Inout_ std::deque<std::unique_ptr<IInputEvent>>& inEvents,
     CATCH_RETURN();
 }
 
-// Routine Description:
-// - Writes events to the input buffer already formed into IInputEvents (private call)
-// Arguments:
-// - context - the input buffer to write to
-// - events - the events to written
-// - written  - on output, the number of events written
-// - append - true if events should be written to the end of the input
-// buffer, false if they should be written to the front
-// Return Value:
-// - HRESULT indicating success or failure
-[[nodiscard]] HRESULT DoSrvPrivateWriteConsoleInputW(_Inout_ InputBuffer* const pInputBuffer,
-                                                     _Inout_ std::deque<std::unique_ptr<IInputEvent>>& events,
-                                                     _Out_ size_t& eventsWritten,
-                                                     const bool append) noexcept
-{
-    return _WriteConsoleInputWImplHelper(*pInputBuffer, events, eventsWritten, append);
-}
-
 // Routine Description:
 // - Writes events to the input buffer, translating from codepage to unicode first
 // Arguments:
@@ -534,32 +516,6 @@ void EventsToUnicode(_Inout_ std::deque<std::unique_ptr<IInputEvent>>& inEvents,
     CATCH_RETURN();
 }
 
-// Function Description:
-// - Writes the input KeyEvent to the console as a console control event. This
-//      can be used for potentially generating Ctrl-C events, as
-//      HandleGenericKeyEvent will correctly generate the Ctrl-C response in
-//      the same way that it'd be handled from the window proc, with the proper
-//      processed vs raw input handling.
-//  If the input key is *not* a Ctrl-C key, then it will get written to the
-//      buffer just the same as any other KeyEvent.
-// Arguments:
-// - pInputBuffer - the input buffer to write to. Currently unused, as
-//      HandleGenericKeyEvent just gets the global input buffer, but all
-//      ConGetSet API's require an input or output object.
-// - key - The keyevent to send to the console.
-// Return Value:
-// - HRESULT indicating success or failure
-[[nodiscard]] HRESULT DoSrvPrivateWriteConsoleControlInput(_Inout_ InputBuffer* const /*pInputBuffer*/,
-                                                           _In_ KeyEvent key)
-{
-    LockConsole();
-    auto Unlock = wil::scope_exit([&] { UnlockConsole(); });
-
-    HandleGenericKeyEvent(key, false);
-
-    return S_OK;
-}
-
 // Routine Description:
 // - This is used when the app is reading output as cells and needs them converted
 //   into a particular codepage on the way out.

src/host/directio.h

@@ -21,15 +21,7 @@ Revision History:
 
 class SCREEN_INFORMATION;
 
-[[nodiscard]] HRESULT DoSrvPrivateWriteConsoleInputW(_Inout_ InputBuffer* const pInputBuffer,
-                                                     _Inout_ std::deque<std::unique_ptr<IInputEvent>>& events,
-                                                     _Out_ size_t& eventsWritten,
-                                                     const bool append) noexcept;
-
 [[nodiscard]] NTSTATUS ConsoleCreateScreenBuffer(std::unique_ptr<ConsoleHandleData>& handle,
                                                  _In_ PCONSOLE_API_MSG Message,
                                                  _In_ PCD_CREATE_OBJECT_INFORMATION Information,
                                                  _In_ PCONSOLE_CREATESCREENBUFFER_MSG a);
-
-[[nodiscard]] NTSTATUS DoSrvPrivateWriteConsoleControlInput(_Inout_ InputBuffer* const pInputBuffer,
-                                                            _In_ KeyEvent key);