Update the Visual C++ 2015-2022 Redistributable runtime to v14.42.344…

…33 (#65) v14.42.34433 is the runtime shipped with Visual Studio 2022 17.12. Projects build with 17.12 need at least this runtime.
team-charls · Dec 18, 2024 · 9dc8ace · 9dc8ace
1 parent 7934e96
commit 9dc8ace
Show file tree

Hide file tree

Showing 10 changed files with 66 additions and 54 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,12 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [0.4.0 - NOT-RELEASED]
+
+### Changed
+
+- Updated Microsoft Visual C++ 2015-2022 Redistributable to version 14.42.34433
+
 ## [0.3.0 - 2024-10-17]
 
 ### Added

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -31,7 +31,7 @@
     <BuildPassReferences>true</BuildPassReferences>
     <AllowParallelCompileInReferencedProjects>true</AllowParallelCompileInReferencedProjects>
 
-    <Version>0.3.0</Version>
+    <Version>0.4.0</Version>
 
     <!-- Define properties for WIX projects -->
     <DefineConstants>FourPartsVersion=$(Version).0;</DefineConstants>

diff --git a/create-signed-builds.cmd b/create-signed-builds.cmd
@@ -4,15 +4,15 @@
 :: Build signed x86
 msbuild -t:clean -p:Configuration=Release -p:Platform=x86
 msbuild -t:restore -p:Configuration=Release -p:Platform=x86
-msbuild -t:build -p:Configuration=Release -p:Platform=x86 -p:SignOutput=true -p:CertificateThumbprint=%1 -p:TimestampUrl=%2
+msbuild -t:build -p:ContinuousIntegrationBuild=true -p:Configuration=Release -p:Platform=x86 -p:SignOutput=true -p:CertificateThumbprint=%1 -p:TimestampUrl=%2
 
 :: Build signed x64
 msbuild -t:clean -p:Configuration=Release -p:Platform=x64
 msbuild -t:restore -p:Configuration=Release -p:Platform=x64
-msbuild -t:build -p:Configuration=Release -p:Platform=x64 -p:SignOutput=true -p:CertificateThumbprint=%1 -p:TimestampUrl=%2
+msbuild -t:build -p:ContinuousIntegrationBuild=true -p:Configuration=Release -p:Platform=x64 -p:SignOutput=true -p:CertificateThumbprint=%1 -p:TimestampUrl=%2
 
 :: Build signed ARM64
 msbuild -t:clean -p:Configuration=Release -p:Platform=ARM64
 msbuild -t:restore -p:Configuration=Release -p:Platform=ARM64
-msbuild -t:build -p:Configuration=Release -p:Platform=ARM64 -p:SignOutput=true -p:CertificateThumbprint=%1 -p:TimestampUrl=%2
+msbuild -t:build -p:ContinuousIntegrationBuild=true -p:Configuration=Release -p:Platform=ARM64 -p:SignOutput=true -p:CertificateThumbprint=%1 -p:TimestampUrl=%2
 
diff --git a/setup/bootstrapper/Bundle.wxs b/setup/bootstrapper/Bundle.wxs
@@ -17,7 +17,7 @@
   <Bundle Name="Netpbm WIC Codec ($(sys.BUILDARCH))"
           Manufacturer="Team CharLS"
           Version="$(FourPartsVersion)"
-          UpgradeCode="$(UpgradeCode)">
+          UpgradeCode="$(var.UpgradeCode)">
 
     <BootstrapperApplication>
       <bal:WixStandardBootstrapperApplication
@@ -63,14 +63,14 @@
         After="REG_ARCH" />
 
     <!-- Visual C++ 2015-2022 Redistributable runtime msi package version -->
-    <Variable Name="VCRUNTIME_VER" Type="version" Value="14.40.33810.0" />
+    <Variable Name="VCRUNTIME_VER" Type="version" Value="14.42.34433.0" />
 
     <Chain>
       <!-- Visual C++ 2015-2022 Redistributable (x86) -->
       <?if $(sys.BUILDARCHSHORT) = "X86" ?>
       <ExePackage
           Id="VC_REDIST_X86"
-          DisplayName="Microsoft Visual C++ 2015-2022 Redistributable (x86) - 14.40.33810"
+          DisplayName="Microsoft Visual C++ 2015-2022 Redistributable (x86) - 14.42.34433"
           Cache="remove"
           PerMachine="yes"
           Permanent="yes"
@@ -82,20 +82,20 @@
           UninstallArguments="/uninstall /quiet /norestart">
         <ExePackagePayload
             Name="VC_redist.x86.exe"
-            ProductName="Microsoft Visual C++ 2015-2022 Redistributable (x86) - 14.40.33810"
-            Description="Microsoft Visual C++ 2015-2022 Redistributable (x86) - 14.40.33810"
-            Hash="91a6283f774f9e2338b65aa835156854e9e76aed32f821b13cfd070dd6c87e1542ce2d5845beb5e4af1ddb102314bb6e0ad6214d896bb3e387590a01eae0c182"
-            Size="13867304"
-            Version="14.40.33810.0"
-            DownloadUrl="https://download.visualstudio.microsoft.com/download/pr/9c69db26-cda4-472d-bdae-f2b87f4a0177/A32DD41EAAB0C5E1EAA78BE3C0BB73B48593DE8D97A7510B97DE3FD993538600/VC_redist.x86.exe" />
+            ProductName="Microsoft Visual C++ 2015-2022 Redistributable (x86) - 14.42.34433"
+            Description="Microsoft Visual C++ 2015-2022 Redistributable (x86) - 14.42.34433"
+            Hash="2C1FACB8567A052B4FA65D173B0BDA64FA5FDED2CDDB9073B7C28507ED95414C17D2839D06D5E961617C754CDA54D6134964B1AFF5C9E9CDFBACE71F1DE2AC3A"
+            Size="13957544"
+            Version="14.42.34433.0"
+            DownloadUrl="https://download.visualstudio.microsoft.com/download/pr/84c7705c-37c2-44cb-9454-c0aadea5661b/DD1A8BE03398367745A87A5E35BEBDAB00FDAD080CF42AF0C3F20802D08C25D4/VC_redist.x86.exe" />
       </ExePackage>
       <?endif?>
 
       <!-- Visual C++ 2015-2022 Redistributable (x64) -->
       <?if $(sys.BUILDARCHSHORT) = "X64" ?>
       <ExePackage
           Id="VC_REDIST_X64"
-          DisplayName="Microsoft Visual C++ 2015-2022 Redistributable (x64) - 14.40.33810"
+          DisplayName="Microsoft Visual C++ 2015-2022 Redistributable (x64) - 14.42.34433"
           Cache="remove"
           PerMachine="yes"
           Permanent="yes"
@@ -107,20 +107,20 @@
           UninstallArguments="/uninstall /quiet /norestart">
         <ExePackagePayload
             Name="VC_redist.x64.exe"
-            ProductName="Microsoft Visual C++ 2015-2022 Redistributable (x64) - 14.40.33810"
-            Description="Microsoft Visual C++ 2015-2022 Redistributable (x64) - 14.40.33810"
-            Hash="5935b69f5138ac3fbc33813c74da853269ba079f910936aefa95e230c6092b92f6225bffb594e5dd35ff29bf260e4b35f91adede90fdf5f062030d8666fd0104"
-            Size="25397512"
-            Version="14.40.33810.0"
-            DownloadUrl="https://download.visualstudio.microsoft.com/download/pr/1754ea58-11a6-44ab-a262-696e194ce543/3642E3F95D50CC193E4B5A0B0FFBF7FE2C08801517758B4C8AEB7105A091208A/VC_redist.x64.exe" />
+            ProductName="Microsoft Visual C++ 2015-2022 Redistributable (x64) - 14.42.34433"
+            Description="Microsoft Visual C++ 2015-2022 Redistributable (x64) - 14.42.34433"
+            Hash="20E2D7437367CB262CE45184EB4D809249FE654AA450D226E376D4057C00B58ECFD8834A8B5153EB148960FFC845BED1F0943D5FF9A6FC1355B1503138562D8D"
+            Size="25640112"
+            Version="14.42.34433.0"
+            DownloadUrl="https://download.visualstudio.microsoft.com/download/pr/c7dac50a-e3e8-40f6-bbb2-9cc4e3dfcabe/1821577409C35B2B9505AC833E246376CC68A8262972100444010B57226F0940/VC_redist.x64.exe" />
       </ExePackage>
       <?endif?>
 
       <!-- Visual C++ 2015-2022 Redistributable (Arm64) -->
       <?if $(sys.BUILDARCHSHORT) = "A64" ?>
       <ExePackage
           Id="VC_REDIST_ARM64"
-          DisplayName="Microsoft Visual C++ 2015-2022 Redistributable (Arm64) - 14.40.33810"
+          DisplayName="Microsoft Visual C++ 2015-2022 Redistributable (Arm64) - 14.42.34433"
           Cache="remove"
           PerMachine="yes"
           Permanent="yes"
@@ -132,12 +132,12 @@
           UninstallArguments="/uninstall /quiet /norestart">
         <ExePackagePayload
             Name="VC_redist.arm64.exe"
-            ProductName="Microsoft Visual C++ 2022 Redistributable (Arm64) - 14.40.33810"
-            Description="Microsoft Visual C++ 2022 Redistributable (Arm64) - 14.40.33810"
-            Hash="76A467E992E4F2CBAE261CFB8C64274782E3D420A61F52458662AA1C3A843ED8F4E340D4C237BB080BE1F2E86D7C4E5F4859FFDA8FDCA4E77375FD4D49663D14"
-            Size="11531032"
-            Version="14.40.33810.0"
-            DownloadUrl="https://download.visualstudio.microsoft.com/download/pr/1754ea58-11a6-44ab-a262-696e194ce543/15B8F5B2106DC7A7BD83AB57B796770E0F4ECB891AD19BF655C9D6A9DA650AD2/VC_redist.arm64.exe" />
+            ProductName="Microsoft Visual C++ 2022 Redistributable (Arm64) - 14.42.34433"
+            Description="Microsoft Visual C++ 2022 Redistributable (Arm64) - 14.42.34433"
+            Hash="81876E6E42183A71CFCCFEC4FCDD0AD7FC1379A08DDB0DC791DFDB2BA95ABAA7F5CB0BC1DB3B706E3147620ED47E9345238385F94AD1990158C910E9314EE429"
+            Size="11723056"
+            Version="14.42.34433.0"
+            DownloadUrl="https://download.visualstudio.microsoft.com/download/pr/5319f718-2a84-4aff-86be-8dbdefd92ca1/C176B30681576B86068F8B55FAE512391EE4217511494B24393C1C9476BC2169/VC_redist.arm64.exe" />
       </ExePackage>
       <?endif?>
 

diff --git a/setup/installer/Package.wxs b/setup/installer/Package.wxs
@@ -16,7 +16,7 @@
     Name="Netpbm WIC Codec"
     Manufacturer="Team CharLS"
     Version="$(FourPartsVersion)"
-    UpgradeCode="$(UpgradeCode)">
+    UpgradeCode="$(var.UpgradeCode)">
 
     <MediaTemplate EmbedCab="yes" />
 

diff --git a/setup/installer/wic_registration.wxi b/setup/installer/wic_registration.wxi
@@ -5,8 +5,8 @@
 
 <Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
   <!-- Register COM objects -->
-  <Class Id="$(CLSID_NetpbmDecoder)" Context="InprocServer32" Server="$(ComServerFileId)" ThreadingModel="both" />
-  <Class Id="$(CLSID_PropertyStore)" Context="InprocServer32" Server="$(ComServerFileId)" ThreadingModel="both" />
+  <Class Id="$(var.CLSID_NetpbmDecoder)" Context="InprocServer32" Server="$(ComServerFileId)" ThreadingModel="both" />
+  <Class Id="$(var.CLSID_PropertyStore)" Context="InprocServer32" Server="$(ComServerFileId)" ThreadingModel="both" />
 
   <!-- Register WIC configuration -->
   <RegistryKey Root="HKCR" Key="CLSID\$(CLSID_NetpbmDecoder)">

diff --git a/src/hresults.ixx b/src/hresults.ixx
@@ -15,7 +15,7 @@ constexpr HRESULT success_ok{S_OK};
 constexpr HRESULT success_false{S_FALSE};
 constexpr HRESULT error_fail{E_FAIL};
 constexpr HRESULT error_pointer{E_POINTER};
-constexpr HRESULT error_already_initialized{ERROR_ALREADY_INITIALIZED};
+constexpr HRESULT error_already_initialized{HRESULT_FROM_WIN32(ERROR_ALREADY_INITIALIZED)};
 constexpr HRESULT error_no_aggregation{CLASS_E_NOAGGREGATION};
 constexpr HRESULT error_class_not_available{CLASS_E_CLASSNOTAVAILABLE};
 constexpr HRESULT error_invalid_argument{E_INVALIDARG};

diff --git a/src/property_store.cpp b/src/property_store.cpp
@@ -18,23 +18,29 @@ import pnm_header;
 import class_factory;
 import property_variant;
 
-using std::span;
+using std::array;
 using std::pair;
+using std::span;
+using std::to_wstring;
 using std::uint32_t;
 using winrt::check_hresult;
 
 namespace {
 
-template<typename K, typename V, std::size_t Extent>
-[[nodiscard]] const V* find(span<pair<K, V>, Extent> values, const K& key)
+template<typename Key, typename Value, size_t Extent>
+[[nodiscard]]
+const Value* find(span<const Key, Extent> keys, span<Value, Extent> values, const Key& key)
 {
-    for (const auto& pair : values)
+    ASSERT(keys.size() == values.size());
+
+    for (size_t i{}; i < keys.size(); ++i)
     {
-        if (pair.first == key)
+        if (keys[i] == key)
         {
-            return &pair.second;
+            return &values[i];
         }
     }
+
     return nullptr;
 }
 
@@ -70,16 +76,13 @@ struct property_store : winrt::implements<property_store, IInitializeWithStream,
 
         buffered_stream_reader stream_reader{stream};
         const pnm_header header{stream_reader};
-        properties_[0].first = PKEY_Image_HorizontalSize;
-        properties_[0].second = property_variant{header.width};
-        properties_[1].first = PKEY_Image_VerticalSize;
-        properties_[1].second = property_variant{header.height};
-        properties_[2].first = PKEY_Image_BitDepth;
-        properties_[2].second = property_variant{compute_bit_depth(header.PnmType, header.MaxColorValue)};
-        properties_[3].first = PKEY_Image_Dimensions;
-        properties_[3].second = property_variant{(std::to_wstring(header.width) + L"x" + std::to_wstring(header.height)).c_str()};
-        properties_[4].first = PKEY_Image_Compression;
-        properties_[4].second = property_variant{static_cast<std::uint16_t>(IMAGE_COMPRESSION_UNCOMPRESSED)};
+
+        property_values_[0] = property_variant{header.width};
+        property_values_[1] = property_variant{header.height};
+        property_values_[2] = property_variant{compute_bit_depth(header.PnmType, header.MaxColorValue)};
+        property_values_[3] = property_variant{(to_wstring(header.width) + L" x " + to_wstring(header.height)).c_str()};
+        property_values_[4] = property_variant{static_cast<std::uint16_t>(IMAGE_COMPRESSION_UNCOMPRESSED)};
+
         initialized_ = true;
 
         return success_ok;
@@ -103,7 +106,7 @@ struct property_store : winrt::implements<property_store, IInitializeWithStream,
         TRACE("{} property_store::GetCount\n", fmt_ptr(this));
 
         // Implementation recommendation is to set count to zero (when possible) in an error condition.
-        *check_out_pointer(count) = static_cast<DWORD>(initialized_ ? properties_.size() : 0U);
+        *check_out_pointer(count) = static_cast<DWORD>(initialized_ ? property_keys.size() : 0U);
         check_state();
 
         return success_ok;
@@ -119,10 +122,10 @@ struct property_store : winrt::implements<property_store, IInitializeWithStream,
         TRACE("{} property_store::GetAt\n", fmt_ptr(this));
         check_state();
 
-        if (index >= properties_.size())
+        if (index >= property_keys.size())
             return error_invalid_argument;
 
-        *check_out_pointer(key) = properties_[index].first;
+        *check_out_pointer(key) = property_keys[index];
         return success_ok;
     }
     catch (...)
@@ -136,7 +139,8 @@ struct property_store : winrt::implements<property_store, IInitializeWithStream,
         TRACE("{} property_store::GetValue\n", fmt_ptr(this));
         check_state();
 
-        if (const auto* property_value{find(span{properties_}, key)}; property_value)
+
+        if (const auto* property_value{find(span{property_keys}, span{property_values_}, key)}; property_value)
         {
             property_value->copy(value);
         }
@@ -171,7 +175,9 @@ struct property_store : winrt::implements<property_store, IInitializeWithStream,
             winrt::throw_hresult(error_not_valid_state);
     }
 
-    std::array<pair<PROPERTYKEY, property_variant>, 5> properties_; // Use std::array as a small map.
+    inline const static array property_keys{PKEY_Image_HorizontalSize, PKEY_Image_VerticalSize, PKEY_Image_BitDepth,
+                                            PKEY_Image_Dimensions, PKEY_Image_Compression};
+    array<property_variant, property_keys.size()> property_values_;
     std::atomic<bool> initialized_{};
 };
 

diff --git a/src/version.hpp b/src/version.hpp
@@ -4,7 +4,7 @@
 #pragma once
 
 #define VERSION_MAJOR 0  // NOLINT(modernize-macro-to-enum)
-#define VERSION_MINOR 3  // NOLINT(modernize-macro-to-enum)
+#define VERSION_MINOR 4  // NOLINT(modernize-macro-to-enum)
 #define VERSION_PATCH 0  // NOLINT(modernize-macro-to-enum)
 
 // Turn A into a string literal without expanding macro definitions

diff --git a/test/test_hresults.ixx b/test/test_hresults.ixx
@@ -15,7 +15,7 @@ constexpr HRESULT success_ok{S_OK};
 constexpr HRESULT success_false{S_FALSE};
 constexpr HRESULT error_fail{E_FAIL};
 constexpr HRESULT error_pointer{E_POINTER};
-constexpr HRESULT error_already_initialized{ERROR_ALREADY_INITIALIZED};
+constexpr HRESULT error_already_initialized{HRESULT_FROM_WIN32(ERROR_ALREADY_INITIALIZED)};
 constexpr HRESULT error_invalid_argument{E_INVALIDARG};
 constexpr HRESULT error_no_aggregation{CLASS_E_NOAGGREGATION};
 constexpr HRESULT error_class_not_available{CLASS_E_CLASSNOTAVAILABLE};