From 2136af68b542fa1ec185a56c03535f03bb587170 Mon Sep 17 00:00:00 2001
From: sithlord48 <sithlord48@gmail.com>
Date: Mon, 21 Oct 2024 23:19:14 -0400
Subject: [PATCH] build(win32): resolve #7763 working windows installer

  use correct QT_PATH
  Force install of depends
---
 cmake/Packaging.cmake    |   2 +-
 res/dist/wix/Product.wxs | 321 ++++++++++++++++++++-------------------
 2 files changed, 168 insertions(+), 155 deletions(-)

diff --git a/cmake/Packaging.cmake b/cmake/Packaging.cmake
index 04067b3b6..76aaec212 100644
--- a/cmake/Packaging.cmake
+++ b/cmake/Packaging.cmake
@@ -52,7 +52,7 @@ endmacro()
 #
 macro(configure_windows_packaging)
 
-  set(QT_PATH $ENV{CMAKE_PREFIX_PATH})
+  cmake_path(SET QT_PATH NORMALIZE "${Qt6_DIR}../../")
 
   set(DESKFLOW_MSI_64_GUID
       "027D1C8A-E7A5-4754-BB93-B2D45BFDBDC8"
diff --git a/res/dist/wix/Product.wxs b/res/dist/wix/Product.wxs
index 5c364f3d6..c1b932d02 100644
--- a/res/dist/wix/Product.wxs
+++ b/res/dist/wix/Product.wxs
@@ -1,154 +1,167 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:fire="http://schemas.microsoft.com/wix/FirewallExtension" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
-	<?include Include.wxi?>
-	<Product Id="*" Language="1033" Manufacturer="$(var.Author)" Name="$(var.Name) ($(var.PlatformSimpleName))" UpgradeCode="$(var.UpgradeGuid)" Version="$(var.Version)">
-		<Package Compressed="yes" InstallScope="perMachine" InstallerVersion="301"/>
-		<MajorUpgrade DowngradeErrorMessage="A newer version of $(var.Name) is already installed."/>
-		<MediaTemplate EmbedCab="yes"/>
-		<!-- causes ICE61 warning, but stops user from installing many instances from nightly builds. -->
-		<Upgrade Id="$(var.UpgradeGuid)">
-			<UpgradeVersion Minimum="0.0.0.0" Property="UPGRADE"/>
-		</Upgrade>
-		<Feature Id="ProductFeature" Title="$(var.Name)">
-			<ComponentGroupRef Id="ProductComponents"/>
-			<ComponentGroupRef Id="OpenSSLComponents"/>
-			<ComponentGroupRef Id="ProductQtStylesComponents"/>
-			<ComponentGroupRef Id="ProductQtPluginComponents"/>
-			<ComponentRef Id="RegistryEntries"/>
-			<MergeRef Id="VC_Redist"/>
-		</Feature>
-		<DirectoryRef Id="TARGETDIR">
-			<Component Guid="7CF3564D-1F8E-4D3D-9781-E1EE22D5BD67" Id="RegistryEntries">
-				<RegistryKey Id="$(var.AppId)_server" ForceCreateOnInstall="yes" ForceDeleteOnUninstall="yes" Key="Software\Microsoft\Windows NT\CurrentVersion\AppCompatFlags\Layers" Root="HKLM">
-					<RegistryValue Name="[INSTALLFOLDER]$(var.ServerBin)" Type="string" Value="~ HIGHDPIAWARE WIN7RTM"/>
-				</RegistryKey>
-
-				<RegistryKey Id="$(var.AppId)_client" Root="HKLM"
-					Key="Software\Microsoft\Windows NT\CurrentVersion\AppCompatFlags\Layers"
-					ForceCreateOnInstall="yes" ForceDeleteOnUninstall="yes">
-					<RegistryValue Type="string" Name="[INSTALLFOLDER]$(var.ClientBin)" Value="~ HIGHDPIAWARE WIN7RTM"/>
-				</RegistryKey>
-
-				<RegistryKey Id="$(var.AppId)" Root="HKLM"
-					Key="Software\Microsoft\Windows NT\CurrentVersion\AppCompatFlags\Layers"
-					ForceCreateOnInstall="yes" ForceDeleteOnUninstall="yes">
-					<RegistryValue Type="string" Name="[INSTALLFOLDER]$(var.GuiBin)" Value="~ HIGHDPIAWARE WIN7RTM"/>
-				</RegistryKey>
-				<!-- Windows 8 and later only -->
-				<Condition><![CDATA[Installed OR (VersionNT >= 602)]]></Condition>
-			</Component>
-			<?if $(var.Platform) = x64 ?>
-				<Merge Id="VC_Redist" SourceFile="$(var.ProjectResDir)\dist\wix\msm\Microsoft_VC142_CRT_x64.msm" DiskId="1" Language="0"/>
-			<?else ?>
-				<Merge Id="VC_Redist" SourceFile="$(var.ProjectResDir)\dist\wix\msm\Microsoft_VC142_CRT_x86.msm" DiskId="1" Language="0"/>
-			<?endif ?>
-		</DirectoryRef>
-		<Property Id="CommonBackground">CommonBackground</Property>
-		<Binary Id="CommonBackground" SourceFile="$(var.ResDir)\dist\wix\images\common_background.png"/>
-		<Icon Id="AppIcon" SourceFile="$(var.ResDir)/app.ico"/>
-		<WixVariable Id="WixUIBannerBmp" Value="$(var.ResDir)\dist\wix\images\banner.png"/>
-		<WixVariable Id="WixUIDialogBmp" Value="$(var.ResDir)\dist\wix\images\dialog.png"/>
-		<Property Id="ARPPRODUCTICON" Value="AppIcon"/>
-		<Property Id="WIXUI_INSTALLDIR" Value="INSTALLFOLDER"/>
-		<Property Id="LEGACY_UNINSTALL_EXISTS">
-			<RegistrySearch Id="LegacyRegistrySearch" Key="SOFTWARE\Wow6432Node\Microsoft\Windows\CurrentVersion\Uninstall\$(var.Name)" Name="UninstallString" Root="HKLM" Type="file" Win64="no">
-				<FileSearch Id="LegacyFileSearch" Name="uninstall.exe"/>
-			</RegistrySearch>
-		</Property>
-		<Condition Message="An existing installation of $(var.Name) was detected, please uninstall it before continuing.">NOT LEGACY_UNINSTALL_EXISTS
-		</Condition>
-		<CustomAction ExeCommand="" FileKey="GuiProgram" Id="StartGui" Return="asyncNoWait"/>
-		<UI>
-			<UIRef Id="AppDlgSequence" />
-		</UI>
-	</Product>
-	<Fragment>
-		<Directory Id="TARGETDIR" Name="SourceDir">
-			<Directory Id="$(var.ProgramFilesFolder)">
-				<Directory Id="INSTALLFOLDER" Name="$(var.Name)">
-					<Directory Id="OpenSSLDir" Name="OpenSSL"/>
-					<Directory Id="PlatformsDir" Name="Platforms"/>
-					<Directory Id="QTStylesDir" Name="styles"/>
-				</Directory>
-			</Directory>
-			<Directory Id="ProgramMenuFolder"/>
-		</Directory>
-	</Fragment>
-	<Fragment>
-		<ComponentGroup Directory="INSTALLFOLDER" Id="ProductComponents">
-			<Component Guid="EC9AD3B0-277C-4157-B5C8-5FD5B6A5F4AD" Id="Core">
-				<File KeyPath="yes" Source="$(var.BinDir)/$(var.DaemonBin)"/>
-				<ServiceInstall Description="Controls the $(var.Name) foreground processes." DisplayName="$(var.Name)" ErrorControl="normal" Id="ServiceInstall" Name="$(var.Name)" Start="auto" Type="ownProcess">
-					<util:ServiceConfig FirstFailureActionType="restart" ResetPeriodInDays="1" RestartServiceDelayInSeconds="1" SecondFailureActionType="restart" ThirdFailureActionType="restart"/>
-				</ServiceInstall>
-				<ServiceControl Id="ServiceControl" Name="$(var.Name)" Remove="uninstall" Start="install" Stop="both"/>
-				<File Source="$(var.BinDir)/$(var.ServerBin)">
-					<fire:FirewallException Id="ServerFirewallException" IgnoreFailure="yes" Name="$(var.Name) Server" Scope="any"/>
-				</File>
-				<File Source="$(var.BinDir)/$(var.ClientBin)">
-					<fire:FirewallException Id="ClientFirewallException" IgnoreFailure="yes" Name="$(var.Name) Client" Scope="any"/>
-				</File>
-				<File Source="$(var.BinDir)/$(var.LegacyBin)" />
-				<?if $(var.Platform) = x64 ?>
-					<File Source="$(var.OpenSslDllDir)/libssl-3-x64.dll"/>
-					<File Source="$(var.OpenSslDllDir)/libcrypto-3-x64.dll"/>
-				<?else ?>
-					<File Source="$(var.OpenSslDllDir)/libssl-3.dll"/>
-					<File Source="$(var.OpenSslDllDir)/libcrypto-3.dll"/>
-				<?endif ?>
-			</Component>
-			<Component Guid="BAC8149B-6287-45BF-9C27-43D71ED40214" Id="Gui">
-				<File Id="GuiProgram" KeyPath="yes" Source="$(var.BinDir)/$(var.GuiBin)">
-					<Shortcut Advertise="yes" Directory="ProgramMenuFolder" Icon="$(var.GuiBin)" Id="GuiShortcut" Name="$(var.Name)">
-						<Icon Id="$(var.GuiBin)" SourceFile="$(var.ResDir)/app.ico"/>
-					</Shortcut>
-					<fire:FirewallException Id="GuiFirewallException" IgnoreFailure="yes" Name="$(var.Name)" Scope="any"/>
-				</File>
-				<?if $(var.Configuration) = "Debug" ?>
-				<File Source="$(var.BinDir)\Qt6Cored.dll"/>
-				<File Source="$(var.BinDir)\Qt6Guid.dll"/>
-				<File Source="$(var.BinDir)\Qt6Networkd.dll"/>
-				<File Source="$(var.BinDir)\Qt6Svgd.dll"/>
-				<File Source="$(var.BinDir)\Qt6Widgetsd.dll"/>
-				<File Source="$(var.BinDir)\styles\qmodernwindowsstyle.dll"/>
-				<!-- HACK: Normally the C++ redistributable solves this dependency, including it can cause problems -->
-				<File Source="C:\Program Files (x86)\Windows Kits\10\bin\$(var.Platform)\ucrt\ucrtbased.dll"/>
-				<?else ?>
-				<File Source="$(var.BinDir)\Qt6Core.dll"/>
-				<File Source="$(var.BinDir)\Qt6Gui.dll"/>
-				<File Source="$(var.BinDir)\Qt6Network.dll"/>
-				<File Source="$(var.BinDir)\Qt6Svg.dll"/>
-				<File Source="$(var.BinDir)\Qt6Widgets.dll"/>
-				<File Source="$(var.BinDir)\styles\qmodernwindowsstyle.dll"/>
-				<?endif ?>
-			</Component>
-		</ComponentGroup>
-		<ComponentGroup Directory="QTStylesDir" Id="ProductQtStylesComponents">
-			<Component Guid="96E0F8D8-64FD-4CE8-94D1-F6EDCBBB4995" Id="Styles">
-				<File Id="qmodernwindowsstyle" Source="$(var.BinDir)\styles\qmodernwindowsstyle.dll"/>
-			</Component>
-		</ComponentGroup>
-		<ComponentGroup Directory="PlatformsDir" Id="ProductQtPluginComponents">
-			<Component Guid="684EFA14-856B-440E-A5E6-E90E04E36B41" Id="QtPlatformPlugin">
-				<?if $(var.Configuration) = "Debug" ?>
-				<File Source="$(var.BinDir)\platforms\qwindowsd.dll"/>
-				<?else ?>
-				<File Source="$(var.BinDir)\platforms\qwindows.dll"/>
-				<?endif ?>
-			</Component>
-		</ComponentGroup>
-		<ComponentGroup Directory="OpenSSLDir" Id="OpenSSLComponents">
-			<Component Guid="92648F77-65A6-4B16-AC59-A1F37BD341B1" Id="OpenSSL">
-				<?if $(var.Platform) = x64 ?>
-					<File Id="OpenSSLDll1" Source="$(var.OpenSslDllDir)/libcrypto-3-x64.dll"/>
-					<File Id="OpenSSLDll2" Source="$(var.OpenSslDllDir)/libssl-3-x64.dll"/>
-				<?else ?>
-					<File Id="OpenSSLDll1" Source="$(var.OpenSslDllDir)/libcrypto-3.dll"/>
-					<File Id="OpenSSLDll2" Source="$(var.OpenSslDllDir)/libssl-3.dll"/>
-				<?endif ?>
-				<File Source="$(var.OpenSslExeDir)/openssl.exe"/>			
-				<File Source="$(var.OpenSslExeDir)/openssl.cnf"/>
-			</Component>
-		</ComponentGroup>
-	</Fragment>
-</Wix>
+<?xml version="1.0" encoding="UTF-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:fire="http://schemas.microsoft.com/wix/FirewallExtension" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
+	<?include Include.wxi?>
+	<Product Id="*" Language="1033" Manufacturer="$(var.Author)" Name="$(var.Name) ($(var.PlatformSimpleName))" UpgradeCode="$(var.UpgradeGuid)" Version="$(var.Version)">
+		<Package Compressed="yes" InstallScope="perMachine" InstallerVersion="301"/>
+		<MajorUpgrade DowngradeErrorMessage="A newer version of $(var.Name) is already installed."/>
+		<MediaTemplate EmbedCab="yes"/>
+		<!-- causes ICE61 warning, but stops user from installing many instances from nightly builds. -->
+		<Upgrade Id="$(var.UpgradeGuid)">
+			<UpgradeVersion Minimum="0.0.0.0" Property="UPGRADE"/>
+		</Upgrade>
+		<Feature Id="ProductFeature" Title="$(var.Name)">
+			<ComponentGroupRef Id="ProductComponents"/>
+			<ComponentGroupRef Id="OpenSSLComponents"/>
+			<ComponentGroupRef Id="ProductQtStylesComponents"/>
+			<ComponentGroupRef Id="ProductQtPluginComponents"/>
+			<ComponentRef Id="RegistryEntries"/>
+			<MergeRef Id="VC_Redist"/>
+		</Feature>
+		<DirectoryRef Id="TARGETDIR">
+			<Component Guid="7CF3564D-1F8E-4D3D-9781-E1EE22D5BD67" Id="RegistryEntries">
+				<RegistryKey Id="$(var.AppId)_server" ForceCreateOnInstall="yes" ForceDeleteOnUninstall="yes" Key="Software\Microsoft\Windows NT\CurrentVersion\AppCompatFlags\Layers" Root="HKLM">
+					<RegistryValue Name="[INSTALLFOLDER]$(var.ServerBin)" Type="string" Value="~ HIGHDPIAWARE WIN7RTM"/>
+				</RegistryKey>
+
+				<RegistryKey Id="$(var.AppId)_client" Root="HKLM"
+					Key="Software\Microsoft\Windows NT\CurrentVersion\AppCompatFlags\Layers"
+					ForceCreateOnInstall="yes" ForceDeleteOnUninstall="yes">
+					<RegistryValue Type="string" Name="[INSTALLFOLDER]$(var.ClientBin)" Value="~ HIGHDPIAWARE WIN7RTM"/>
+				</RegistryKey>
+
+				<RegistryKey Id="$(var.AppId)" Root="HKLM"
+					Key="Software\Microsoft\Windows NT\CurrentVersion\AppCompatFlags\Layers"
+					ForceCreateOnInstall="yes" ForceDeleteOnUninstall="yes">
+					<RegistryValue Type="string" Name="[INSTALLFOLDER]$(var.GuiBin)" Value="~ HIGHDPIAWARE WIN7RTM"/>
+				</RegistryKey>
+				<!-- Windows 8 and later only -->
+				<Condition><![CDATA[Installed OR (VersionNT >= 602)]]></Condition>
+			</Component>
+			<?if $(var.Platform) = x64 ?>
+				<Merge Id="VC_Redist" SourceFile="$(var.ProjectResDir)\dist\wix\msm\Microsoft_VC142_CRT_x64.msm" DiskId="1" Language="0"/>
+			<?else ?>
+				<Merge Id="VC_Redist" SourceFile="$(var.ProjectResDir)\dist\wix\msm\Microsoft_VC142_CRT_x86.msm" DiskId="1" Language="0"/>
+			<?endif ?>
+		</DirectoryRef>
+		<Property Id="CommonBackground">CommonBackground</Property>
+		<Binary Id="CommonBackground" SourceFile="$(var.ResDir)\dist\wix\images\common_background.png"/>
+		<Icon Id="AppIcon" SourceFile="$(var.ResDir)/app.ico"/>
+		<WixVariable Id="WixUIBannerBmp" Value="$(var.ResDir)\dist\wix\images\banner.png"/>
+		<WixVariable Id="WixUIDialogBmp" Value="$(var.ResDir)\dist\wix\images\dialog.png"/>
+		<Property Id="ARPPRODUCTICON" Value="AppIcon"/>
+		<Property Id="WIXUI_INSTALLDIR" Value="INSTALLFOLDER"/>
+		<Property Id="LEGACY_UNINSTALL_EXISTS">
+			<RegistrySearch Id="LegacyRegistrySearch" Key="SOFTWARE\Wow6432Node\Microsoft\Windows\CurrentVersion\Uninstall\$(var.Name)" Name="UninstallString" Root="HKLM" Type="file" Win64="no">
+				<FileSearch Id="LegacyFileSearch" Name="uninstall.exe"/>
+			</RegistrySearch>
+		</Property>
+		<Condition Message="An existing installation of $(var.Name) was detected, please uninstall it before continuing.">NOT LEGACY_UNINSTALL_EXISTS
+		</Condition>
+		<CustomAction ExeCommand="" FileKey="GuiProgram" Id="StartGui" Return="asyncNoWait"/>
+		<UI>
+			<UIRef Id="AppDlgSequence" />
+		</UI>
+	</Product>
+	<Fragment>
+		<Directory Id="TARGETDIR" Name="SourceDir">
+			<Directory Id="$(var.ProgramFilesFolder)">
+				<Directory Id="INSTALLFOLDER" Name="$(var.Name)">
+					<Directory Id="OpenSSLDir" Name="OpenSSL"/>
+					<Directory Id="PlatformsDir" Name="Platforms"/>
+					<Directory Id="QTStylesDir" Name="styles"/>
+				</Directory>
+			</Directory>
+			<Directory Id="ProgramMenuFolder"/>
+		</Directory>
+	</Fragment>
+	<Fragment>
+		<ComponentGroup Directory="INSTALLFOLDER" Id="ProductComponents">
+			<Component Guid="EC9AD3B0-277C-4157-B5C8-5FD5B6A5F4AD" Id="Core">
+				<File KeyPath="yes" Source="$(var.BinDir)/$(var.DaemonBin)"/>
+				<ServiceInstall Description="Controls the $(var.Name) foreground processes." DisplayName="$(var.Name)" ErrorControl="normal" Id="ServiceInstall" Name="$(var.Name)" Start="auto" Type="ownProcess">
+					<util:ServiceConfig FirstFailureActionType="restart" ResetPeriodInDays="1" RestartServiceDelayInSeconds="1" SecondFailureActionType="restart" ThirdFailureActionType="restart"/>
+				</ServiceInstall>
+				<ServiceControl Id="ServiceControl" Name="$(var.Name)" Remove="uninstall" Start="install" Stop="both"/>
+				<File Source="$(var.BinDir)/$(var.ServerBin)">
+					<fire:FirewallException Id="ServerFirewallException" IgnoreFailure="yes" Name="$(var.Name) Server" Scope="any"/>
+				</File>
+				<File Source="$(var.BinDir)/$(var.ClientBin)">
+					<fire:FirewallException Id="ClientFirewallException" IgnoreFailure="yes" Name="$(var.Name) Client" Scope="any"/>
+				</File>
+				<File Source="$(var.BinDir)/$(var.LegacyBin)" />
+				<?if $(var.Platform) = x64 ?>
+					<File Source="$(var.OpenSslDllDir)/libssl-3-x64.dll"/>
+					<File Source="$(var.OpenSslDllDir)/libcrypto-3-x64.dll"/>
+				<?else ?>
+					<File Source="$(var.OpenSslDllDir)/libssl-3.dll"/>
+					<File Source="$(var.OpenSslDllDir)/libcrypto-3.dll"/>
+				<?endif ?>
+			</Component>
+			<Component Guid="BAC8149B-6287-45BF-9C27-43D71ED40214" Id="Gui">
+				<File Id="GuiProgram" KeyPath="yes" Source="$(var.BinDir)/$(var.GuiBin)">
+					<Shortcut Advertise="yes" Directory="ProgramMenuFolder" Icon="$(var.GuiBin)" Id="GuiShortcut" Name="$(var.Name)">
+						<Icon Id="$(var.GuiBin)" SourceFile="$(var.ResDir)/app.ico"/>
+					</Shortcut>
+					<fire:FirewallException Id="GuiFirewallException" IgnoreFailure="yes" Name="$(var.Name)" Scope="any"/>
+				</File>
+				<?if $(var.Configuration) = "Debug" ?>
+				<File Source="$(var.BinDir)\Qt6Cored.dll"/>
+				<File Source="$(var.BinDir)\Qt6Guid.dll"/>
+				<File Source="$(var.BinDir)\Qt6Networkd.dll"/>
+				<File Source="$(var.BinDir)\Qt6Svgd.dll"/>
+				<File Source="$(var.BinDir)\Qt6Widgetsd.dll"/>
+				<File Source="$(var.BinDir)\styles\qmodernwindowsstyle.dll"/>
+				<!-- HACK: Normally the C++ redistributable solves this dependency, including it can cause problems -->
+				<File Source="C:\Program Files (x86)\Windows Kits\10\bin\$(var.Platform)\ucrt\ucrtbased.dll"/>
+				<?else ?>
+				<File Source="$(var.BinDir)\brotlicommon.dll"/>
+				<File Source="$(var.BinDir)\brotlidec.dll"/>
+				<File Source="$(var.BinDir)\bz2.dll"/>
+				<File Source="$(var.BinDir)\double-conversion.dll"/>
+				<File Source="$(var.BinDir)\freetype.dll"/>
+				<File Source="$(var.BinDir)\harfbuzz.dll"/>
+				<File Source="$(var.BinDir)\icudt74.dll"/>
+				<File Source="$(var.BinDir)\icuin74.dll"/>
+				<File Source="$(var.BinDir)\icuuc74.dll"/>
+				<File Source="$(var.BinDir)\libpng16.dll"/>
+				<File Source="$(var.BinDir)\pcre2-16.dll"/>
+				<File Source="$(var.BinDir)\Qt6Core.dll"/>
+				<File Source="$(var.BinDir)\Qt6Gui.dll"/>
+				<File Source="$(var.BinDir)\Qt6Network.dll"/>
+				<File Source="$(var.BinDir)\Qt6Svg.dll"/>
+				<File Source="$(var.BinDir)\Qt6Widgets.dll"/>
+				<File Source="$(var.BinDir)\zlib1.dll"/>
+				<File Source="$(var.BinDir)\zstd.dll"/>
+				<File Source="$(var.BinDir)\styles\qmodernwindowsstyle.dll"/>
+				<?endif ?>
+			</Component>
+		</ComponentGroup>
+		<ComponentGroup Directory="QTStylesDir" Id="ProductQtStylesComponents">
+			<Component Guid="96E0F8D8-64FD-4CE8-94D1-F6EDCBBB4995" Id="Styles">
+				<File Id="qmodernwindowsstyle" Source="$(var.BinDir)\styles\qmodernwindowsstyle.dll"/>
+			</Component>
+		</ComponentGroup>
+		<ComponentGroup Directory="PlatformsDir" Id="ProductQtPluginComponents">
+			<Component Guid="684EFA14-856B-440E-A5E6-E90E04E36B41" Id="QtPlatformPlugin">
+				<?if $(var.Configuration) = "Debug" ?>
+				<File Source="$(var.BinDir)\platforms\qwindowsd.dll"/>
+				<?else ?>
+				<File Source="$(var.BinDir)\platforms\qwindows.dll"/>
+				<?endif ?>
+			</Component>
+		</ComponentGroup>
+		<ComponentGroup Directory="OpenSSLDir" Id="OpenSSLComponents">
+			<Component Guid="92648F77-65A6-4B16-AC59-A1F37BD341B1" Id="OpenSSL">
+				<?if $(var.Platform) = x64 ?>
+					<File Id="OpenSSLDll1" Source="$(var.OpenSslDllDir)/libcrypto-3-x64.dll"/>
+					<File Id="OpenSSLDll2" Source="$(var.OpenSslDllDir)/libssl-3-x64.dll"/>
+				<?else ?>
+					<File Id="OpenSSLDll1" Source="$(var.OpenSslDllDir)/libcrypto-3.dll"/>
+					<File Id="OpenSSLDll2" Source="$(var.OpenSslDllDir)/libssl-3.dll"/>
+				<?endif ?>
+				<File Source="$(var.OpenSslExeDir)/openssl.exe"/>			
+				<File Source="$(var.OpenSslExeDir)/openssl.cnf"/>
+			</Component>
+		</ComponentGroup>
+	</Fragment>
+</Wix>