From f4ae097722d7641a7c6556c533ba78ad77576739 Mon Sep 17 00:00:00 2001
From: Bill Zissimopoulos <billziss@navimatics.com>
Date: Mon, 5 Sep 2022 17:28:31 +0100
Subject: [PATCH] installer: SxS: WIP

---
 build/VStudio/installer/Product.wxs | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/build/VStudio/installer/Product.wxs b/build/VStudio/installer/Product.wxs
index c88216d4..bf571b4a 100644
--- a/build/VStudio/installer/Product.wxs
+++ b/build/VStudio/installer/Product.wxs
@@ -33,6 +33,7 @@
             NOT OLDVERSIONINSTALLED
         </Condition>
 
+        <!-- Determine OS architecture. -->
         <Property Id="OSARCH" Secure="yes" Value="AMD64">
             <RegistrySearch
                 Id="R.OSARCH"
@@ -41,9 +42,10 @@
                 Name="PROCESSOR_ARCHITECTURE"
                 Type="raw" />
         </Property>
-
-        <Property Id="P.LauncherRegistryKey">Software\$(var.MyProductName)\Services</Property>
+        
+        <!-- Setup INSTALLDIR and SXSDIR from the registry or defaults. -->
         <Property Id="P.RegistryKey">Software\$(var.MyProductName)</Property>
+        <Property Id="P.LauncherRegistryKey">Software\$(var.MyProductName)\Services</Property>
         <Property Id="INSTALLDIR">
             <RegistrySearch
                 Id="R.INSTALLDIR"
@@ -66,7 +68,8 @@
         <SetProperty Id="SXSDIR" Value="[INSTALLDIR]SxS\sxs.[InstanceID]\" After="SetINSTALLDIR">
             NOT SXSDIR
         </SetProperty>
-
+        
+        <!-- Setup directory structure. -->
         <Directory Id="TARGETDIR" Name="SourceDir">
             <Directory Id="ProgramFilesFolder">
                 <Directory Id="INSTALLDIR" Name="DYNAMIC">