Remove dependencies on unstable MSVC/STL extensions,

src/host/VtIo.cpp

@@ -567,17 +567,26 @@ void VtIo::Writer::WriteUTF16(std::wstring_view str) const
 
     // C++23's resize_and_overwrite is too valuable to not use.
     // It reduce the CPU overhead by roughly half.
-#if !defined(_HAS_CXX23) || !_HAS_CXX23
-#define resize_and_overwrite _Resize_and_overwrite
+#if !defined(__cpp_lib_string_resize_and_overwrite)
+#if defined(_MSVC_STL_UPDATE)
+    // NOTE: Throwing inside resize_and_overwrite invokes undefined behavior.
+    _io->_back._Resize_and_overwrite(totalUTF8Cap, [&](char* buf, const size_t) noexcept {
+        const auto len = WideCharToMultiByte(CP_UTF8, 0, str.data(), gsl::narrow_cast<int>(incomingUTF16Len), buf + existingUTF8Len, gsl::narrow_cast<int>(incomingUTF8Cap), nullptr, nullptr);
+        return existingUTF8Len + std::max(0, len);
+    });
+#else
+    auto& back = _io->_back;
+    back.resize(totalUTF8Cap);
+    const auto len = WideCharToMultiByte(CP_UTF8, 0, str.data(), gsl::narrow_cast<int>(incomingUTF16Len), back.data() + existingUTF8Len, gsl::narrow_cast<int>(incomingUTF8Cap), nullptr, nullptr);
+    back.resize(existingUTF8Len + std::max(0, len));
 #endif
-
+#else
     // NOTE: Throwing inside resize_and_overwrite invokes undefined behavior.
     _io->_back.resize_and_overwrite(totalUTF8Cap, [&](char* buf, const size_t) noexcept {
         const auto len = WideCharToMultiByte(CP_UTF8, 0, str.data(), gsl::narrow_cast<int>(incomingUTF16Len), buf + existingUTF8Len, gsl::narrow_cast<int>(incomingUTF8Cap), nullptr, nullptr);
         return existingUTF8Len + std::max(0, len);
     });
-
-#undef resize_and_overwrite
+#endif
 }
 
 // When DISABLE_NEWLINE_AUTO_RETURN is not set (Bad! Don't do it!) we'll do newline translation for you.

src/inc/LibraryIncludes.h

@@ -65,9 +65,15 @@
 // GSL
 // Block GSL Multi Span include because it both has C++17 deprecated iterators
 // and uses the C-namespaced "max" which conflicts with Windows definitions.
-#include <gsl/gsl>
+#if __has_include(<gsl/gsl_util>)
 #include <gsl/gsl_util>
+#else
+#include <gsl/util>
+#endif
 #include <gsl/pointers>
+#if __has_include(<gsl/narrow>)
+#include <gsl/narrow>
+#endif
 
 // CppCoreCheck
 #include <CppCoreCheck/Warnings.h>

src/renderer/atlas/AtlasEngine.api.cpp

@@ -7,6 +7,7 @@
 #include "Backend.h"
 #include "../../buffer/out/textBuffer.hpp"
 #include "../base/FontCache.h"
+#include <cassert>
 
 // #### NOTE ####
 // If you see any code in here that contains "_r." you might be seeing a race condition.

src/renderer/atlas/pch.h

@@ -24,8 +24,15 @@
 #include <VersionHelpers.h>
 #include <wincodec.h>
 
+#if __has_include(<gsl/gsl_util>)
 #include <gsl/gsl_util>
+#else
+#include <gsl/util>
+#endif
 #include <gsl/pointers>
+#if __has_include(<gsl/narrow>)
+#include <gsl/narrow>
+#endif
 #include <wil/com.h>
 #include <wil/filesystem.h>
 #include <wil/stl.h>

src/renderer/gdi/gdirenderer.hpp

@@ -165,7 +165,7 @@ namespace Microsoft::Console::Render
         // It's important the pool is first so it can be given to the others on construction.
         std::pmr::unsynchronized_pool_resource _pool;
         std::pmr::vector<std::pmr::wstring> _polyStrings;
-        std::pmr::vector<std::pmr::basic_string<int>> _polyWidths;
+        std::pmr::vector<std::pmr::basic_string<char32_t>> _polyWidths;
 
         std::vector<DWORD> _imageMask;
 

src/renderer/gdi/paint.cpp

@@ -419,7 +419,7 @@ bool GdiEngine::FontHasWesternScript(HDC hdc)
         pPolyTextLine->rcl.top = pPolyTextLine->y + topOffset;
         pPolyTextLine->rcl.right = pPolyTextLine->rcl.left + (til::CoordType)cchCharWidths;
         pPolyTextLine->rcl.bottom = pPolyTextLine->y + coordFontSize.height - bottomOffset;
-        pPolyTextLine->pdx = polyWidth.data();
+        pPolyTextLine->pdx = reinterpret_cast<int*>(polyWidth.data());
 
         if (trimLeft)
         {

src/server/WaitBlock.h

@@ -42,10 +42,10 @@ class ConsoleWaitBlock
                      _In_ IWaitRoutine* const pWaiter);
 
     ConsoleWaitQueue* const _pProcessQueue;
-    std::_List_const_iterator<std::_List_val<std::_List_simple_types<ConsoleWaitBlock*>>> _itProcessQueue;
+    typename std::list<ConsoleWaitBlock*>::const_iterator _itProcessQueue;
 
     ConsoleWaitQueue* const _pObjectQueue;
-    std::_List_const_iterator<std::_List_val<std::_List_simple_types<ConsoleWaitBlock*>>> _itObjectQueue;
+    typename std::list<ConsoleWaitBlock*>::const_iterator _itObjectQueue;
 
     CONSOLE_API_MSG _WaitReplyMessage;
 

src/terminal/adapter/SixelParser.hpp

@@ -104,7 +104,7 @@ namespace Microsoft::Console::VirtualTerminal
         size_t _colorsUsed = 0;
         size_t _colorsAvailable = 0;
         bool _colorTableChanged = false;
-        IndexedPixel _foregroundPixel = 0;
+        IndexedPixel _foregroundPixel = {};
 
         void _initImageBuffer();
         void _resizeImageBuffer(const til::CoordType requiredHeight);

src/types/colorTable.cpp

@@ -247,6 +247,9 @@ void Utils::InitializeVT340ColorTable(const std::span<COLORREF> table) noexcept
     }
 }
 
+#pragma warning(push)
+#pragma warning(disable : 26497) // This is a false positive in audit mode.
+
 // Function Description:
 // - Fill color table entries from 16 to 255 with the default colors used by
 //   modern terminals. This includes a range of colors from a 6x6x6 color cube
@@ -255,7 +258,7 @@ void Utils::InitializeVT340ColorTable(const std::span<COLORREF> table) noexcept
 // - table: a color table to be filled
 // Return Value:
 // - <none>
-constexpr void Utils::InitializeExtendedColorTable(const std::span<COLORREF> table, const bool monochrome) noexcept
+void Utils::InitializeExtendedColorTable(const std::span<COLORREF> table, const bool monochrome) noexcept
 {
     if (table.size() >= 256)
     {
@@ -279,6 +282,8 @@ constexpr void Utils::InitializeExtendedColorTable(const std::span<COLORREF> tab
     }
 }
 
+#pragma warning(pop)
+
 #pragma warning(push)
 #pragma warning(disable : 26447) // This is a false positive.
 

src/types/inc/colorTable.hpp

@@ -15,7 +15,7 @@ namespace Microsoft::Console::Utils
     void InitializeColorTable(const std::span<COLORREF> table) noexcept;
     void InitializeANSIColorTable(const std::span<COLORREF> table) noexcept;
     void InitializeVT340ColorTable(const std::span<COLORREF> table) noexcept;
-    constexpr void InitializeExtendedColorTable(const std::span<COLORREF> table, const bool monochrome = false) noexcept;
+    void InitializeExtendedColorTable(const std::span<COLORREF> table, const bool monochrome = false) noexcept;
     std::span<const til::color> CampbellColorTable() noexcept;
 
     std::optional<til::color> ColorFromXOrgAppColorName(const std::wstring_view wstr) noexcept;