From 9c11ca5bda66de570bf786b7341b81ffa3ccf23a Mon Sep 17 00:00:00 2001
From: Bill Zissimopoulos <billziss@navimatics.com>
Date: Fri, 29 Apr 2016 16:33:55 -0700
Subject: [PATCH] installer: remember installation directory in registry

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

diff --git a/build/VStudio/installer/Product.wxs b/build/VStudio/installer/Product.wxs
index 924de3e1..362b1ea5 100644
--- a/build/VStudio/installer/Product.wxs
+++ b/build/VStudio/installer/Product.wxs
@@ -15,6 +15,15 @@
         <MajorUpgrade
             DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
         <Media Id="1" Cabinet="WinFsp.cab" EmbedCab="yes" />
+        <Property Id="P.RegistryKey">Software\$(var.MyProductName)</Property>
+        <Property Id="INSTALLDIR">
+            <RegistrySearch
+                Id="R.INSTALLDIR"
+                Root="HKLM"
+                Key="[P.RegistryKey]"
+                Name="InstallDir"
+                Type="raw" />
+        </Property>
         <Directory Id="TARGETDIR" Name="SourceDir">
             <Directory Id="ProgramFilesFolder">
                 <Directory Id="INSTALLDIR" Name="WinFsp">
@@ -25,6 +34,16 @@
                 </Directory>
             </Directory>
         </Directory>
+        <DirectoryRef Id="INSTALLDIR">
+            <Component Id="C.INSTALLDIR">
+                <RegistryValue
+                    Root="HKLM"
+                    Key="[P.RegistryKey]"
+                    Name="InstallDir"
+                    Type="string"
+                    Value="[INSTALLDIR]" />
+            </Component>
+        </DirectoryRef>
         <DirectoryRef Id="BINDIR" FileSource="..\build\$(var.Configuration)">
             <Component Id="C.winfsp_x64.sys">
                 <File Name="winfsp-x64.sys" KeyPath="yes" />
@@ -107,12 +126,7 @@
             AllowAdvertise="no"
             InstallDefault="local"
             Absent="disallow">
-            <!-- dummy component to eliminate "installed to run from network" option -->
-            <Component
-                Id="C.Dummy"
-                Guid="{10EF63D3-A790-475C-B978-A22A6A16FE00}"
-                Directory="INSTALLDIR"
-                KeyPath="yes" />
+            <ComponentRef Id="C.INSTALLDIR" />
             <Feature
                 Id="F.User"
                 Level="1"