Rewrite COOKED_READ_DATA

microsoft · Aug 1, 2023 · 20415e8 · 20415e8
1 parent c6e5f79
commit 20415e8
Show file tree

Hide file tree

Showing 57 changed files with 1,190 additions and 7,003 deletions.
diff --git a/.github/actions/spelling/expect/alphabet.txt b/.github/actions/spelling/expect/alphabet.txt
@@ -21,6 +21,7 @@ BBBBCCCCC
 BBGGRR
 efg
 EFG
+efgh
 EFGh
 KLMNOQQQQQQQQQQ
 QQQQQQQQQQABCDEFGHIJ

diff --git a/.github/actions/spelling/expect/expect.txt b/.github/actions/spelling/expect/expect.txt
@@ -690,7 +690,7 @@ FSINFOCLASS
 fte
 Ftm
 Fullscreens
-fullwidth
+Fullwidth
 FUNCTIONCALL
 fuzzer
 fuzzmain
@@ -1117,6 +1117,7 @@ MDs
 MEASUREITEM
 megamix
 memallocator
+meme
 MENUCHAR
 MENUCONTROL
 MENUDROPALIGNMENT

diff --git a/src/cascadia/UnitTests_TerminalCore/ConptyRoundtripTests.cpp b/src/cascadia/UnitTests_TerminalCore/ConptyRoundtripTests.cpp
@@ -21,7 +21,6 @@
 #include "../host/readDataCooked.hpp"
 #include "../host/output.h"
 #include "../host/_stream.h" // For WriteCharsLegacy
-#include "../host/cmdline.h" // For WC_INTERACTIVE
 #include "test/CommonState.hpp"
 
 #include "../cascadia/TerminalCore/Terminal.hpp"
@@ -3165,20 +3164,6 @@ void ConptyRoundtripTests::NewLinesAtBottomWithBackground()
     verifyBuffer(*termTb, term->_mutableViewport.ToExclusive());
 }
 
-void doWriteCharsLegacy(SCREEN_INFORMATION& screenInfo, const std::wstring_view string, DWORD flags = 0)
-{
-    auto dwNumBytes = string.size() * sizeof(wchar_t);
-    VERIFY_NT_SUCCESS(WriteCharsLegacy(screenInfo,
-                                       string.data(),
-                                       string.data(),
-                                       string.data(),
-                                       &dwNumBytes,
-                                       nullptr,
-                                       screenInfo.GetTextBuffer().GetCursor().GetPosition().x,
-                                       flags,
-                                       nullptr));
-}
-
 void ConptyRoundtripTests::WrapNewLineAtBottom()
 {
     // The actual bug case is
@@ -3220,11 +3205,6 @@ void ConptyRoundtripTests::WrapNewLineAtBottom()
         return;
     }
 
-    // I've tested this with 0x0, 0x4, 0x80, 0x84, and 0-8, and none of these
-    // flags seem to make a difference. So we're just assuming 0 here, so we
-    // don't test a bunch of redundant cases.
-    const auto writeCharsLegacyMode = 0;
-
     // This test was originally written for
     //   https://github.com/microsoft/terminal/issues/5691
     //
@@ -3263,7 +3243,7 @@ void ConptyRoundtripTests::WrapNewLineAtBottom()
         }
         else if (writingMethod == PrintWithWriteCharsLegacy)
         {
-            doWriteCharsLegacy(si, str, writeCharsLegacyMode);
+            WriteCharsLegacy(si, str, false, nullptr));
         }
     };
 
@@ -3421,7 +3401,7 @@ void ConptyRoundtripTests::WrapNewLineAtBottomLikeMSYS()
         }
         else if (writingMethod == PrintWithWriteCharsLegacy)
         {
-            doWriteCharsLegacy(si, str, WC_INTERACTIVE);
+            WriteCharsLegacy(si, str, true, nullptr));
         }
     };