Address warnings for std::aligned_storage_t and va_start/va_end in newer VS toolset

Author: fdwr

TextLayoutSampler.vcxproj

@@ -27,7 +27,7 @@
   <PropertyGroup Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
@@ -63,7 +63,7 @@
       </UndefinePreprocessorDefinitions>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <PrecompiledHeaderFile>precomp.h</PrecompiledHeaderFile>
-      <AdditionalOptions>/ifcSearchDir $(IntDir)</AdditionalOptions>
+      <AdditionalOptions>/ifcSearchDir $(IntDir) /utf-8</AdditionalOptions>
       <AdditionalIncludeDirectories>$(ProjectDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <DisableSpecificWarnings>
       </DisableSpecificWarnings>

source/Common.FastVector.h

@@ -765,7 +765,7 @@ class fast_vector : public fast_vector<T, 0, ShouldInitializeElements>
 private:
     constexpr array_ref<T> GetFixedSizeArrayData() noexcept
     {
-        return array_ref<T>(reinterpret_cast<T*>(std::data(fixedSizedArrayData_)), std::size(fixedSizedArrayData_));
+        return array_ref<T>(reinterpret_cast<T*>(std::data(fixedSizedArrayData_)), DefaultArraySize);
     }
 
 private:
@@ -776,7 +776,7 @@ class fast_vector : public fast_vector<T, 0, ShouldInitializeElements>
     // Note Visual Studio 2017 15.8 requires you to declare _ENABLE_EXTENDED_ALIGNED_STORAGE
     // if your type T is > max_align_t.
     //
-    std::aligned_storage_t<sizeof(T), alignof(T)> fixedSizedArrayData_[DefaultArraySize];
+    /*[[uninitialized]]*/ alignas(T) std::byte fixedSizedArrayData_[sizeof(T) * DefaultArraySize];
 };
 
 #ifdef USE_GSL_SPAN_INSTEAD_OF_ARRAY_REF

source/MainWindow.h

@@ -155,7 +155,7 @@ class MainWindow
     void AppendLogUnformatted(char16_t const* logMessage);
     void ShowMessageAndAppendLog(char16_t const* logMessage, ...);
     void ShowMessageAndAppendLogUnformatted(char16_t const* logMessage);
-    HRESULT ShowMessageIfError(char16_t const* logMessage, HRESULT hr, ...);
+    HRESULT ShowMessageIfError(char16_t const* logMessage, /*HRESULT hr,*/ ...);
 
     void ClearLog();
 

source/MainWindow.ixx

@@ -1,4 +1,4 @@
-//----------------------------------------------------------------------------
+//----------------------------------------------------------------------------
 //  History:    2015-06-19 Dwayne Robinson - Created
 //              2022-03-17 Updated for high DPI
 //----------------------------------------------------------------------------
@@ -3291,6 +3291,7 @@ void MainWindow::AppendLogCached(char16_t const* logMessage, ...)
     buffer[0] = 0;
 
     StringCchVPrintf(OUT ToWChar(buffer), countof(buffer), ToWChar(logMessage), argList);
+    va_end(argList);
     cachedLog_ += buffer;
 }
 
@@ -3319,6 +3320,7 @@ void MainWindow::AppendLog(char16_t const* logMessage, ...)
     buffer[0] = 0;
 
     StringCchVPrintf(OUT ToWChar(buffer), countof(buffer), ToWChar(logMessage), argList);
+    va_end(argList);
     AppendLogUnformatted(buffer);
 }
 
@@ -3342,22 +3344,28 @@ void MainWindow::ShowMessageAndAppendLog(char16_t const* logMessage, ...)
     buffer[0] = 0;
 
     StringCchVPrintf(OUT ToWChar(buffer), countof(buffer), ToWChar(logMessage), argList);
+    va_end(argList);
     ShowMessageAndAppendLogUnformatted(buffer);
 }
 
 
-HRESULT MainWindow::ShowMessageIfError(char16_t const* logMessage, HRESULT hr, ...)
+HRESULT MainWindow::ShowMessageIfError(char16_t const* logMessage, /*HRESULT hr,*/ ...)
 {
+    va_list originalList, argList;
+    va_start(originalList, logMessage);
+    va_copy(argList, originalList);
+    HRESULT hr = va_arg(originalList, HRESULT);
+
     if (FAILED(hr))
     {
-        va_list argList;
-        va_start(argList, logMessage);
         char16_t buffer[1000];
         buffer[0] = 0;
 
         StringCchVPrintf(OUT ToWChar(buffer), countof(buffer), ToWChar(logMessage), argList);
         MainWindow::ShowMessageAndAppendLogUnformatted(buffer);
     }
+    va_end(argList);
+    va_end(originalList);
     return hr;
 }