From e63de0d8674c854a1ada92caa1e780c15b83ee19 Mon Sep 17 00:00:00 2001
From: Lorenz Stechauner <lorenz.stechauner@necronda.net>
Date: Mon, 19 Jan 2026 10:52:53 +0100
Subject: [PATCH] Setup: Try to hotfix VC redist version incompatability

---
 Setup/Bundle.wxs    | 10 +++++-----
 Setup/Setup.wixproj |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Setup/Bundle.wxs b/Setup/Bundle.wxs
index f27a49f..a76027f 100644
--- a/Setup/Bundle.wxs
+++ b/Setup/Bundle.wxs
@@ -8,18 +8,18 @@
                                               SuppressOptionsUI="yes" ShowVersion="yes"/>
     </BootstrapperApplication>
 
-    <util:RegistrySearch Id="VCredistx86" Variable="VCredistx86" Result="exists"
-                         Root="HKLM" Key="SOFTWARE\Classes\Installer\Dependencies\VC,redist.x86,x86,14.36,bundle"/>
+    <util:RegistrySearch Id="VCredistx64" Variable="VCredistx64" Result="exists"
+                         Root="HKLM" Key="SOFTWARE\Classes\Installer\Dependencies\VC,redist.x64,amd64,14.50,bundle"/>
     <util:RegistrySearch Id="Webview2Machine" Variable="Webview2Machine" Result="exists"
                          Root="HKLM" Key="SOFTWARE\WOW6432Node\Microsoft\EdgeUpdate\Clients\{F3017226-FE2A-4295-8BDF-00C3A9A7E4C5}"/>
     <util:RegistrySearch Id="Webview2User" Variable="Webview2User" Result="exists"
                          Root="HKCU" Key="Software\Microsoft\EdgeUpdate\Clients\{F3017226-FE2A-4295-8BDF-00C3A9A7E4C5}"/>
 
     <Chain>
-      <ExePackage Id="VCredistx86Installer" DisplayName="VC Redist x86 installer" Name="VC_redist.x86.exe"
-                  SourceFile="$(ProjectDir)\Files\VC_redist.x86.exe"
+      <ExePackage Id="VCredistx64Installer" DisplayName="VC Redist x64 installer" Name="VC_redist.x64.exe"
+                  SourceFile="$(ProjectDir)\Files\VC_redist.x64.exe"
                   Cache="remove" Compressed="yes" PerMachine="yes" Permanent="yes" Vital="yes"
-                  InstallArguments="/install /passive /norestart" DetectCondition="VCredistx86"/>
+                  InstallArguments="/install /passive /norestart" DetectCondition="VCredistx64"/>
       <ExePackage Id="MicrosoftEdgeWebview2" DisplayName="Microsoft Edge Webview2 Runtime" Name="MicrosoftEdgeWebview2Setup.exe"
                   SourceFile="$(ProjectDir)\Files\MicrosoftEdgeWebview2Setup.exe"
                   Cache="remove" Compressed="yes" PerMachine="yes" Permanent ="yes" Vital="no"
diff --git a/Setup/Setup.wixproj b/Setup/Setup.wixproj
index e412f8b..98a95e2 100644
--- a/Setup/Setup.wixproj
+++ b/Setup/Setup.wixproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
   <Target Name="CustomBeforeBuild" BeforeTargets="BeforeBuild">
     <Exec Command="curl --fail -s -L &quot;https://go.microsoft.com/fwlink/p/?LinkId=2124703&quot; -z &quot;$(ProjectDir)\Files\MicrosoftEdgeWebview2Setup.exe&quot; -o &quot;$(ProjectDir)\Files\MicrosoftEdgeWebview2Setup.exe&quot;" />
-    <Exec Command="curl --fail -s -L &quot;https://aka.ms/vs/17/release/vc_redist.x86.exe&quot; -z &quot;$(ProjectDir)\Files\VC_redist.x86.exe&quot; -o &quot;$(ProjectDir)\Files\VC_redist.x86.exe&quot;" />
+    <Exec Command="curl --fail -s -L &quot;https://aka.ms/vc14/vc_redist.x64.exe&quot; -z &quot;$(ProjectDir)\Files\VC_redist.x64.exe&quot; -o &quot;$(ProjectDir)\Files\VC_redist.x64.exe&quot;" />
     <PropertyGroup>
       <DefineConstants>ElwigProjectDir=..\Elwig</DefineConstants>
     </PropertyGroup>