Less diff, Less problems

Author: lhecker

.github/actions/spelling/expect/expect.txt

@@ -295,7 +295,6 @@ CREATESTRUCT
 CREATESTRUCTW
 createvpack
 crisman
-CRLFs
 crloew
 CRTLIBS
 csbi
@@ -597,7 +596,6 @@ ffd
 FFDE
 FFFD
 FFFDb
-FFrom
 fgbg
 FGCOLOR
 FGHIJ
@@ -1165,7 +1163,6 @@ NOMINMAX
 NOMOVE
 NONALERT
 nonbreaking
-noncharacter
 nonclient
 NONINFRINGEMENT
 NONPREROTATED
@@ -1478,7 +1475,6 @@ READMODE
 rectread
 redef
 redefinable
-Redir
 redist
 REDSCROLL
 REFCLSID
@@ -1889,7 +1885,6 @@ UPDATEDISPLAY
 UPDOWN
 UPKEY
 upss
-UPSS
 uregex
 URegular
 usebackq
@@ -1984,7 +1979,6 @@ wchars
 WCIA
 WCIW
 WCSHELPER
-wcsicmp
 wcsrev
 wcswidth
 wddm

src/buffer/out/Row.cpp

@@ -635,7 +635,7 @@ catch (...)
     throw;
 }
 
-void ROW::WriteHelper::ReplaceText() noexcept
+[[msvc::forceinline]] void ROW::WriteHelper::ReplaceText() noexcept
 {
     // This function starts with a fast-pass for ASCII. ASCII is still predominant in technical areas.
     //
@@ -662,7 +662,7 @@ void ROW::WriteHelper::ReplaceText() noexcept
     charsConsumed = ch - chBeg;
 }
 
-void ROW::WriteHelper::_replaceTextUnicode(size_t ch, size_t off) noexcept
+[[msvc::forceinline]] void ROW::WriteHelper::_replaceTextUnicode(size_t ch, size_t off) noexcept
 {
     auto& cwd = CodepointWidthDetector::Singleton();
     const auto len = chars.size();
@@ -849,7 +849,7 @@ catch (...)
 }
 #pragma warning(pop)
 
-void ROW::WriteHelper::Finish()
+[[msvc::forceinline]] void ROW::WriteHelper::Finish()
 {
     colEndDirty = row._adjustForward(colEndDirty);
 

src/host/ConsoleArguments.cpp

@@ -7,21 +7,23 @@
 #include <shellapi.h>
 using namespace Microsoft::Console::Utils;
 
-static constexpr std::wstring_view VT_MODE_ARG{ L"--vtmode" };
-static constexpr std::wstring_view HEADLESS_ARG{ L"--headless" };
-static constexpr std::wstring_view SERVER_HANDLE_ARG{ L"--server" };
-static constexpr std::wstring_view SIGNAL_HANDLE_ARG{ L"--signal" };
-static constexpr std::wstring_view HANDLE_PREFIX{ L"0x" };
-static constexpr std::wstring_view CLIENT_COMMANDLINE_ARG{ L"--" };
-static constexpr std::wstring_view FORCE_V1_ARG{ L"-ForceV1" };
-static constexpr std::wstring_view FORCE_NO_HANDOFF_ARG{ L"-ForceNoHandoff" };
-static constexpr std::wstring_view FILEPATH_LEADER_PREFIX{ L"\\??\\" };
-static constexpr std::wstring_view WIDTH_ARG{ L"--width" };
-static constexpr std::wstring_view HEIGHT_ARG{ L"--height" };
-static constexpr std::wstring_view INHERIT_CURSOR_ARG{ L"--inheritcursor" };
-static constexpr std::wstring_view RESIZE_QUIRK{ L"--resizeQuirk" };
+const std::wstring_view ConsoleArguments::VT_MODE_ARG = L"--vtmode";
+const std::wstring_view ConsoleArguments::HEADLESS_ARG = L"--headless";
+const std::wstring_view ConsoleArguments::SERVER_HANDLE_ARG = L"--server";
+const std::wstring_view ConsoleArguments::SIGNAL_HANDLE_ARG = L"--signal";
+const std::wstring_view ConsoleArguments::HANDLE_PREFIX = L"0x";
+const std::wstring_view ConsoleArguments::CLIENT_COMMANDLINE_ARG = L"--";
+const std::wstring_view ConsoleArguments::FORCE_V1_ARG = L"-ForceV1";
+const std::wstring_view ConsoleArguments::FORCE_NO_HANDOFF_ARG = L"-ForceNoHandoff";
+const std::wstring_view ConsoleArguments::FILEPATH_LEADER_PREFIX = L"\\??\\";
+const std::wstring_view ConsoleArguments::WIDTH_ARG = L"--width";
+const std::wstring_view ConsoleArguments::HEIGHT_ARG = L"--height";
+const std::wstring_view ConsoleArguments::INHERIT_CURSOR_ARG = L"--inheritcursor";
+const std::wstring_view ConsoleArguments::RESIZE_QUIRK = L"--resizeQuirk";
+const std::wstring_view ConsoleArguments::FEATURE_ARG = L"--feature";
+const std::wstring_view ConsoleArguments::FEATURE_PTY_ARG = L"pty";
+const std::wstring_view ConsoleArguments::COM_SERVER_ARG = L"-Embedding";
 static constexpr std::wstring_view GLYPH_WIDTH{ L"--textMeasurement" };
-static constexpr std::wstring_view COM_SERVER_ARG{ L"-Embedding" };
 // NOTE: Thinking about adding more commandline args that control conpty, for
 // the Terminal? Make sure you add them to the commandline in
 // ConsoleEstablishHandoff. We use that to initialize the ConsoleArguments for a
@@ -203,6 +205,37 @@ void ConsoleArguments::s_ConsumeArg(_Inout_ std::vector<std::wstring>& args, _In
     return (hasNext) ? S_OK : E_INVALIDARG;
 }
 
+// Routine Description:
+// Similar to s_GetArgumentValue.
+// Attempts to get the next arg as a "feature" arg - this can be used for
+//      feature detection.
+// If the next arg is not recognized, then we don't support that feature.
+// Currently, the only supported feature arg is `pty`, to identify pty support.
+// Arguments:
+//  args: A collection of wstrings representing command-line arguments
+//  index: the index of the argument of which to get the value for. The value
+//      should be at (index+1). index will be decremented by one on success.
+//  pSetting: receives the string at index+1
+// Return Value:
+//  S_OK if we parsed the string successfully, otherwise E_INVALIDARG indicating
+//      failure.
+[[nodiscard]] HRESULT ConsoleArguments::s_HandleFeatureValue(_Inout_ std::vector<std::wstring>& args, _Inout_ size_t& index)
+{
+    auto hr = E_INVALIDARG;
+    auto hasNext = (index + 1) < args.size();
+    if (hasNext)
+    {
+        s_ConsumeArg(args, index);
+        auto value = args[index];
+        if (value == FEATURE_PTY_ARG)
+        {
+            hr = S_OK;
+        }
+        s_ConsumeArg(args, index);
+    }
+    return (hasNext) ? hr : E_INVALIDARG;
+}
+
 // Method Description:
 // Routine Description:
 //  Given the commandline of tokens `args`, tries to find the argument at
@@ -353,10 +386,13 @@ void ConsoleArguments::s_ConsumeArg(_Inout_ std::vector<std::wstring>& args, _In
     std::vector<std::wstring> args;
     auto hr = S_OK;
 
+    // Make a mutable copy of the commandline for tokenizing
+    auto copy = _commandline;
+
     // Tokenize the commandline
     auto argc = 0;
     wil::unique_hlocal_ptr<PWSTR[]> argv;
-    argv.reset(CommandLineToArgvW(_commandline.c_str(), &argc));
+    argv.reset(CommandLineToArgvW(copy.c_str(), &argc));
     RETURN_LAST_ERROR_IF(argv == nullptr);
 
     for (auto i = 1; i < argc; ++i)
@@ -371,7 +407,7 @@ void ConsoleArguments::s_ConsumeArg(_Inout_ std::vector<std::wstring>& args, _In
     {
         hr = E_INVALIDARG;
 
-        const std::wstring_view arg{ args[i] };
+        auto arg = args[i];
 
         if (arg.substr(0, HANDLE_PREFIX.length()) == HANDLE_PREFIX ||
             arg == SERVER_HANDLE_ARG)
@@ -380,7 +416,7 @@ void ConsoleArguments::s_ConsumeArg(_Inout_ std::vector<std::wstring>& args, _In
             // --server 0x4 (new method)
             // 0x4 (legacy method)
             // If we see >1 of these, it's invalid.
-            std::wstring serverHandleVal{ arg };
+            auto serverHandleVal = arg;
 
             if (arg == SERVER_HANDLE_ARG)
             {
@@ -450,6 +486,10 @@ void ConsoleArguments::s_ConsumeArg(_Inout_ std::vector<std::wstring>& args, _In
         {
             hr = s_GetArgumentValue(args, i, &_height);
         }
+        else if (arg == FEATURE_ARG)
+        {
+            hr = s_HandleFeatureValue(args, i);
+        }
         else if (arg == HEADLESS_ARG)
         {
             _headless = true;
@@ -580,12 +620,17 @@ HANDLE ConsoleArguments::GetVtOutHandle() const
     return _vtOutHandle;
 }
 
-const std::wstring& ConsoleArguments::GetClientCommandline() const
+std::wstring ConsoleArguments::GetOriginalCommandLine() const
+{
+    return _commandline;
+}
+
+std::wstring ConsoleArguments::GetClientCommandline() const
 {
     return _clientCommandline;
 }
 
-const std::wstring& ConsoleArguments::GetVtMode() const
+std::wstring ConsoleArguments::GetVtMode() const
 {
     return _vtMode;
 }

src/host/ConsoleArguments.hpp

@@ -44,8 +44,9 @@ class ConsoleArguments
     bool HasSignalHandle() const;
     HANDLE GetSignalHandle() const;
 
-    const std::wstring& GetClientCommandline() const;
-    const std::wstring& GetVtMode() const;
+    std::wstring GetOriginalCommandLine() const;
+    std::wstring GetClientCommandline() const;
+    std::wstring GetVtMode() const;
     const std::wstring& GetTextMeasurement() const;
     bool GetForceV1() const;
     bool GetForceNoHandoff() const;
@@ -59,6 +60,23 @@ class ConsoleArguments
     void EnableConptyModeForTests();
 #endif
 
+    static const std::wstring_view VT_MODE_ARG;
+    static const std::wstring_view HEADLESS_ARG;
+    static const std::wstring_view SERVER_HANDLE_ARG;
+    static const std::wstring_view SIGNAL_HANDLE_ARG;
+    static const std::wstring_view HANDLE_PREFIX;
+    static const std::wstring_view CLIENT_COMMANDLINE_ARG;
+    static const std::wstring_view FORCE_V1_ARG;
+    static const std::wstring_view FORCE_NO_HANDOFF_ARG;
+    static const std::wstring_view FILEPATH_LEADER_PREFIX;
+    static const std::wstring_view WIDTH_ARG;
+    static const std::wstring_view HEIGHT_ARG;
+    static const std::wstring_view INHERIT_CURSOR_ARG;
+    static const std::wstring_view RESIZE_QUIRK;
+    static const std::wstring_view FEATURE_ARG;
+    static const std::wstring_view FEATURE_PTY_ARG;
+    static const std::wstring_view COM_SERVER_ARG;
+
 private:
 #ifdef UNIT_TESTING
     // This accessor used to create a copy of this class for unit testing comparison ease.
@@ -134,6 +152,8 @@ class ConsoleArguments
     [[nodiscard]] static HRESULT s_GetArgumentValue(_Inout_ std::vector<std::wstring>& args,
                                                     _Inout_ size_t& index,
                                                     _Out_opt_ short* const pSetting);
+    [[nodiscard]] static HRESULT s_HandleFeatureValue(_Inout_ std::vector<std::wstring>& args,
+                                                      _Inout_ size_t& index);
 
     [[nodiscard]] static HRESULT s_ParseHandleArg(const std::wstring& handleAsText,
                                                   _Inout_ DWORD& handleAsVal);

src/host/VtIo.cpp

@@ -9,11 +9,11 @@
 #include "../renderer/vt/Xterm256Engine.hpp"
 
 #include "../renderer/base/renderer.hpp"
+#include "../types/inc/CodepointWidthDetector.hpp"
 #include "../types/inc/utils.hpp"
 #include "handle.h" // LockConsole
 #include "input.h" // ProcessCtrlEvents
 #include "output.h" // CloseConsoleProcessState
-#include "../types/inc/CodepointWidthDetector.hpp"
 
 using namespace Microsoft::Console;
 using namespace Microsoft::Console::Render;

src/host/inputBuffer.cpp

@@ -810,8 +810,7 @@ bool InputBuffer::_CoalesceEvent(const INPUT_RECORD& inEvent) noexcept
             // You can't update the repeat count of such a A,B pair, because they're stored as A,A,B,B (down-down, up-up).
             // I believe the proper approach is to store pairs of characters as pairs, update their combined
             // repeat count and only when they're being read de-coalesce them into their alternating form.
-            // TODO:GH#8000 IsGlyphFullWidth was replaced with til::is_surrogate to get rid off the former. Neither approach is fully correct.
-            !til::is_surrogate(inKey.uChar.UnicodeChar))
+            !IsGlyphFullWidth(inKey.uChar.UnicodeChar))
         {
             lastKey.wRepeatCount += inKey.wRepeatCount;
             return true;

src/host/stream.cpp

@@ -2,11 +2,18 @@
 // Licensed under the MIT license.
 
 #include "precomp.h"
+
+#include "_stream.h"
 #include "stream.h"
 
 #include "handle.h"
 #include "misc.h"
 #include "readDataRaw.hpp"
+
+#include "ApiRoutines.h"
+
+#include "../types/inc/GlyphWidth.hpp"
+
 #include "../interactivity/inc/ServiceLocator.hpp"
 
 using Microsoft::Console::Interactivity::ServiceLocator;