Skip to content

Commit fb668f3

Browse files
authored
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.
1 parent d2f977a commit fb668f3

File tree

5 files changed

+6
-6
lines changed

5 files changed

+6
-6
lines changed

dep/nuget/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<package id="Microsoft.VisualStudio.Setup.Configuration.Native" version="2.3.2262" targetFramework="native" developmentDependency="true" />
1010
<package id="Microsoft.UI.Xaml" version="2.8.4" targetFramework="native" />
1111
<package id="Microsoft.Web.WebView2" version="1.0.1661.34" targetFramework="native" />
12-
<package id="Microsoft.Windows.ImplementationLibrary" version="1.0.240122.1" targetFramework="native" developmentDependency="true" />
12+
<package id="Microsoft.Windows.ImplementationLibrary" version="1.0.250325.1" targetFramework="native" developmentDependency="true" />
1313
<package id="Microsoft.WindowsPackageManager.ComInterop" version="1.8.1911" targetFramework="native" developmentDependency="true" />
1414

1515
<!-- Managed packages -->

src/common.nugetversions.targets

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
<Import Project="$(MSBuildThisFileDirectory)..\build\rules\Microsoft.UI.Xaml.Additional.targets" Condition="'$(TerminalMUX)' == 'true'" />
6363

6464
<!-- WIL (so widely used that this one does not have a TerminalWIL opt-in property; it is automatic) -->
65-
<Import Project="$(MSBuildThisFileDirectory)..\packages\Microsoft.Windows.ImplementationLibrary.1.0.240122.1\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('$(MSBuildThisFileDirectory)..\packages\Microsoft.Windows.ImplementationLibrary.1.0.240122.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" />
65+
<Import Project="$(MSBuildThisFileDirectory)..\packages\Microsoft.Windows.ImplementationLibrary.1.0.250325.1\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('$(MSBuildThisFileDirectory)..\packages\Microsoft.Windows.ImplementationLibrary.1.0.250325.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" />
6666

6767
<!-- WinGet Interop -->
6868
<Import Project="$(MSBuildThisFileDirectory)..\build\rules\Microsoft.WindowsPackageManager.ComInterop.Additional.targets" Condition="'$(TerminalWinGetInterop)' == 'true'" />
@@ -95,7 +95,7 @@
9595
<Error Condition="'$(TerminalMUX)' == 'true' AND !Exists('$(MSBuildThisFileDirectory)..\packages\Microsoft.Web.WebView2.1.0.1661.34\build\native\Microsoft.Web.WebView2.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(MSBuildThisFileDirectory)..\packages\Microsoft.Web.WebView2.1.0.1661.34\build\native\Microsoft.Web.WebView2.targets'))" />
9696

9797
<!-- WIL (so widely used that this one does not have a TerminalWIL opt-in property; it is automatic) -->
98-
<Error Condition="!Exists('$(MSBuildThisFileDirectory)..\packages\Microsoft.Windows.ImplementationLibrary.1.0.240122.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(MSBuildThisFileDirectory)..\packages\Microsoft.Windows.ImplementationLibrary.1.0.240122.1\build\native\Microsoft.Windows.ImplementationLibrary.targets'))" />
98+
<Error Condition="!Exists('$(MSBuildThisFileDirectory)..\packages\Microsoft.Windows.ImplementationLibrary.1.0.250325.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(MSBuildThisFileDirectory)..\packages\Microsoft.Windows.ImplementationLibrary.1.0.250325.1\build\native\Microsoft.Windows.ImplementationLibrary.targets'))" />
9999

100100
</Target>
101101

src/inc/til/env.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ namespace til // Terminal Implementation Library. Also: "Today I Learned"
140140
template<typename string_type, size_t stackBufferLength = 256>
141141
HRESULT GetShortPathNameW(PCWSTR file, string_type& path)
142142
{
143-
const auto hr = wil::AdaptFixedSizeToAllocatedResult<string_type, stackBufferLength>(path, [&](_Out_writes_(valueLength) PWSTR value, size_t valueLength, _Out_ size_t* valueLengthNeededWithNull) -> HRESULT {
143+
const auto hr = wil::AdaptFixedSizeToAllocatedResult<string_type, stackBufferLength>(path, [&](_Out_writes_(valueLength) PWSTR value, size_t valueLength, _Out_ size_t* valueLengthNeededWithNull) noexcept -> HRESULT {
144144
// Note that GetShortPathNameW() is not limited to MAX_PATH
145145
// but it does take a fixed size buffer.
146146
*valueLengthNeededWithNull = ::GetShortPathNameW(file, value, static_cast<DWORD>(valueLength));

src/terminal/input/terminalInput.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -532,7 +532,7 @@ try
532532
}
533533
CATCH_LOG()
534534

535-
DWORD TerminalInput::_trackControlKeyState(const KEY_EVENT_RECORD& key)
535+
DWORD TerminalInput::_trackControlKeyState(const KEY_EVENT_RECORD& key) noexcept
536536
{
537537
// First record which key state bits were previously off but are now on.
538538
const auto pressedKeyState = ~_lastControlKeyState & key.dwControlKeyState;

src/terminal/input/terminalInput.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ namespace Microsoft::Console::VirtualTerminal
8585
const wchar_t* _ss3 = L"\x1BO";
8686

8787
void _initKeyboardMap() noexcept;
88-
DWORD _trackControlKeyState(const KEY_EVENT_RECORD& key);
88+
DWORD _trackControlKeyState(const KEY_EVENT_RECORD& key) noexcept;
8989
std::array<byte, 256> _getKeyboardState(const WORD virtualKeyCode, const DWORD controlKeyState) const;
9090
[[nodiscard]] static wchar_t _makeCtrlChar(const wchar_t ch);
9191
[[nodiscard]] StringType _makeCharOutput(wchar_t ch);

0 commit comments

Comments
 (0)