From fb668f3a4ad14a876585c2f1603880dd159f64eb Mon Sep 17 00:00:00 2001 From: "Dustin L. Howett" Date: Thu, 13 Nov 2025 12:23:59 -0600 Subject: [PATCH] chore: Update to WIL 1.0.250325.1 (#19553) It adds a C++/WinRT-compatible COM server class factory and `ArgvToCommandlineW` (which is just plain fun.) It also makes more things noexcept. --- dep/nuget/packages.config | 2 +- src/common.nugetversions.targets | 4 ++-- src/inc/til/env.h | 2 +- src/terminal/input/terminalInput.cpp | 2 +- src/terminal/input/terminalInput.hpp | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dep/nuget/packages.config b/dep/nuget/packages.config index 3079be4cee..84dde46946 100644 --- a/dep/nuget/packages.config +++ b/dep/nuget/packages.config @@ -9,7 +9,7 @@ - + diff --git a/src/common.nugetversions.targets b/src/common.nugetversions.targets index e8245aff7e..19d396d475 100644 --- a/src/common.nugetversions.targets +++ b/src/common.nugetversions.targets @@ -62,7 +62,7 @@ - + @@ -95,7 +95,7 @@ - + diff --git a/src/inc/til/env.h b/src/inc/til/env.h index 9e0eebf61a..bd95c5675b 100644 --- a/src/inc/til/env.h +++ b/src/inc/til/env.h @@ -140,7 +140,7 @@ namespace til // Terminal Implementation Library. Also: "Today I Learned" template HRESULT GetShortPathNameW(PCWSTR file, string_type& path) { - const auto hr = wil::AdaptFixedSizeToAllocatedResult(path, [&](_Out_writes_(valueLength) PWSTR value, size_t valueLength, _Out_ size_t* valueLengthNeededWithNull) -> HRESULT { + const auto hr = wil::AdaptFixedSizeToAllocatedResult(path, [&](_Out_writes_(valueLength) PWSTR value, size_t valueLength, _Out_ size_t* valueLengthNeededWithNull) noexcept -> HRESULT { // Note that GetShortPathNameW() is not limited to MAX_PATH // but it does take a fixed size buffer. *valueLengthNeededWithNull = ::GetShortPathNameW(file, value, static_cast(valueLength)); diff --git a/src/terminal/input/terminalInput.cpp b/src/terminal/input/terminalInput.cpp index 65dfa6f33c..8f5fb0c820 100644 --- a/src/terminal/input/terminalInput.cpp +++ b/src/terminal/input/terminalInput.cpp @@ -532,7 +532,7 @@ try } CATCH_LOG() -DWORD TerminalInput::_trackControlKeyState(const KEY_EVENT_RECORD& key) +DWORD TerminalInput::_trackControlKeyState(const KEY_EVENT_RECORD& key) noexcept { // First record which key state bits were previously off but are now on. const auto pressedKeyState = ~_lastControlKeyState & key.dwControlKeyState; diff --git a/src/terminal/input/terminalInput.hpp b/src/terminal/input/terminalInput.hpp index 9d52ac03ec..a9abf74f79 100644 --- a/src/terminal/input/terminalInput.hpp +++ b/src/terminal/input/terminalInput.hpp @@ -85,7 +85,7 @@ namespace Microsoft::Console::VirtualTerminal const wchar_t* _ss3 = L"\x1BO"; void _initKeyboardMap() noexcept; - DWORD _trackControlKeyState(const KEY_EVENT_RECORD& key); + DWORD _trackControlKeyState(const KEY_EVENT_RECORD& key) noexcept; std::array _getKeyboardState(const WORD virtualKeyCode, const DWORD controlKeyState) const; [[nodiscard]] static wchar_t _makeCtrlChar(const wchar_t ch); [[nodiscard]] StringType _makeCharOutput(wchar_t ch);