From 0aeab56a607c5aecf4ce66f58ca03aed4e5758fc Mon Sep 17 00:00:00 2001
From: Jeremy Sinclair <4016293+snickler@users.noreply.github.com>
Date: Tue, 2 May 2023 06:56:55 -0400
Subject: [PATCH] [CI] Fix for building with Visual Studio 17.6 (#25759)

* Disable building Stl Modules

* [FindMyMouse] Fix C26495 errors
---
 Cpp.Build.props                                    | 1 +
 src/modules/MouseUtils/FindMyMouse/FindMyMouse.cpp | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Cpp.Build.props b/Cpp.Build.props
index 14ef3a7645..16a54b0e29 100644
--- a/Cpp.Build.props
+++ b/Cpp.Build.props
@@ -53,6 +53,7 @@
       <ConformanceMode>false</ConformanceMode>
       <TreatWarningAsError>true</TreatWarningAsError>
       <LanguageStandard>stdcpplatest</LanguageStandard>
+	<BuildStlModules>false</BuildStlModules>
       <AdditionalOptions>/await %(AdditionalOptions)</AdditionalOptions>
       <PreprocessorDefinitions>_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
diff --git a/src/modules/MouseUtils/FindMyMouse/FindMyMouse.cpp b/src/modules/MouseUtils/FindMyMouse/FindMyMouse.cpp
index 4c84691095..f768931d97 100644
--- a/src/modules/MouseUtils/FindMyMouse/FindMyMouse.cpp
+++ b/src/modules/MouseUtils/FindMyMouse/FindMyMouse.cpp
@@ -54,7 +54,7 @@ protected:
     D* Shim() { return static_cast<D*>(this); }
     LRESULT BaseWndProc(UINT message, WPARAM wParam, LPARAM lParam) noexcept;
 
-    HWND m_hwnd;
+    HWND m_hwnd{};
     POINT m_sonarPos = ptNowhere;
 
     // Only consider double left control click if at least 100ms passed between the clicks, to avoid keyboards that might be sending rapid clicks.
@@ -118,7 +118,7 @@ private:
         ControlUp2,
     };
 
-    HWND m_hwndOwner;
+    HWND m_hwndOwner{};
     SonarState m_sonarState = SonarState::Idle;
     POINT m_lastKeyPos{};
     ULONGLONG m_lastKeyTime{};