From 50447dfc2c9d25edc3a8edd6df6cf2b4fdf7fc03 Mon Sep 17 00:00:00 2001
From: "Galvan, Mark" <mark.galvan@intel.com>
Date: Wed, 5 Nov 2025 22:37:24 -0800
Subject: [PATCH] Changes to gracefully handle silent installs

---
 IntelPresentMon/PMInstaller/PresentMon.wxs    | 19 +++++++++
 IntelPresentMon/PMInstallerLib/Library.wxs    | 40 ++++++++++++++-----
 .../PMInstallerLib/PMInstallerLib.wixproj     |  4 --
 .../ServiceMergeModule.wixproj                |  3 --
 .../ServiceMergeModule/ServiceMergeModule.wxs |  3 ++
 5 files changed, 51 insertions(+), 18 deletions(-)

diff --git a/IntelPresentMon/PMInstaller/PresentMon.wxs b/IntelPresentMon/PMInstaller/PresentMon.wxs
index fe8d8a49..96b40556 100644
--- a/IntelPresentMon/PMInstaller/PresentMon.wxs
+++ b/IntelPresentMon/PMInstaller/PresentMon.wxs
@@ -10,6 +10,10 @@
 
         <Package InstallerVersion="500" Compressed="yes" InstallScope="perMachine" Platform="x64"/>
 
+        <!-- Handle in-use files by scheduling for reboot (user will see FilesInUse dialog) -->
+        <Property Id="MSIRESTARTMANAGERCONTROL" Value="DisableShutdown" />
+        <Property Id="REBOOT" Value="ReallySuppress" />
+
         <MajorUpgrade
             Schedule="afterInstallValidate"
             AllowDowngrades="no"
@@ -87,6 +91,17 @@
         <UIRef Id="WixUI_ErrorProgressText" />
 
         <WixVariable Id="WixUILicenseRtf" Value="license.rtf" />
+
+        <!-- Custom action to set REINSTALLMODE for handling in-use files -->
+        <CustomAction Id="SetReinstallMode"
+                      Property="REINSTALLMODE"
+                      Value="amus"
+                      Execute="immediate" />
+
+        <InstallExecuteSequence>
+            <!-- Always set REINSTALLMODE to handle file replacement -->
+            <Custom Action="SetReinstallMode" Before="CostInitialize">1</Custom>
+        </InstallExecuteSequence>
     </Product>
 
     <Fragment>
@@ -147,6 +162,10 @@
                 Id="DesktopFolder"
                 Name="Desktop">
             </Directory>
+            <Directory 
+                Id="WindowsFolder">
+                <Directory Id="SystemFolder" Name="System32" />
+            </Directory>            
         </Directory>
     </Fragment>
 
diff --git a/IntelPresentMon/PMInstallerLib/Library.wxs b/IntelPresentMon/PMInstallerLib/Library.wxs
index 09a6b9a9..aa2de017 100644
--- a/IntelPresentMon/PMInstallerLib/Library.wxs
+++ b/IntelPresentMon/PMInstallerLib/Library.wxs
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
   <Fragment>
 
@@ -9,11 +9,15 @@
       <!-- PresentMonService.exe (key file + Windows service) -->
       <Component Id="pmon_shared_service_component"
                  Guid="{45531AC0-CEB6-4DD0-B6B6-2BAD7F6AD01E}"
-                 Win64="yes">
+                 Win64="yes"
+                 NeverOverwrite="no"
+                 Permanent="no">
         <File Id="pmon_shared_service_exe"
               Name="$(var.PresentMonService.TargetFileName)"
               Source="$(var.PresentMonService.TargetPath)"
-              KeyPath="yes" />
+              KeyPath="yes"
+              Checksum="yes"
+              Vital="yes" />
 
         <ServiceInstall Id="PmSharedServiceInstall"
                         Name="PresentMonSharedService"
@@ -22,15 +26,12 @@
                         Start="auto"
                         Type="ownProcess"
                         ErrorControl="normal"
-                        Vital="yes" />
-
-        <!-- Stop before replace, remove on uninstall, start after install -->
+                        Vital="no" />
+        <!-- Only handle service removal on uninstall - let RestartManager handle in-use files -->
         <ServiceControl Id="SharedPresentMonServiceControl"
                         Name="PresentMonSharedService"
-                        Start="install"
-                        Stop="both"
                         Remove="uninstall"
-                        Wait="yes" />
+                        Wait="no" />
         <RemoveFolder Id ="PresentMonSharedServiceUninstall"
                       Directory="service_folder"
                       On="uninstall"/>
@@ -39,15 +40,32 @@
       <!-- PresentMonAPI2.dll -->
       <Component Id="present_mon_shared_dll_component"
                  Guid="{BC2D2B30-9011-48E5-8592-ACC58CEFDF17}"
-                 Win64="yes">
+                 Win64="yes"
+                 NeverOverwrite="no"
+                 Permanent="no">
         <File Id="present_mon_shared_api_2_dll"
               Name="$(var.PresentMonAPI2.TargetFileName)"
               Source="$(var.PresentMonAPI2.TargetPath)"
-              KeyPath="yes" />
+              KeyPath="yes"
+              Checksum="yes"
+              Vital="yes" />
       </Component>
 
     </DirectoryRef>
 
+    <!-- Smart service start - only if service is not already running -->
+    <CustomAction Id="TryStartSharedService"
+                  Directory="SystemFolder"
+                  ExeCommand='cmd /c "sc query PresentMonSharedService | find "RUNNING" > nul || sc start PresentMonSharedService"'
+                  Execute="deferred"
+                  Impersonate="no"
+                  Return="ignore" />
+
+    <InstallExecuteSequence>
+        <!-- After InstallServices has registered the service (and StartServices would have run) -->
+        <Custom Action="TryStartSharedService" After="StartServices">1</Custom>
+    </InstallExecuteSequence>
+      
     <!-- Group that consumers reference -->
     <ComponentGroup Id="service_files">
       <ComponentRef Id="pmon_shared_service_component" />
diff --git a/IntelPresentMon/PMInstallerLib/PMInstallerLib.wixproj b/IntelPresentMon/PMInstallerLib/PMInstallerLib.wixproj
index 4ee66a22..589c359b 100644
--- a/IntelPresentMon/PMInstallerLib/PMInstallerLib.wixproj
+++ b/IntelPresentMon/PMInstallerLib/PMInstallerLib.wixproj
@@ -33,9 +33,5 @@
       <RefTargetDir>INSTALLFOLDER</RefTargetDir>
     </ProjectReference>
   </ItemGroup>
-  <!-- Add WiX extensions here only if you actually use them in Library.wxs -->
-  <!-- <ItemGroup>
-    <WixExtension Include="WixUtilExtension" />
-  </ItemGroup> -->
   <Import Project="$(WixTargetsPath)" />
 </Project>
\ No newline at end of file
diff --git a/IntelPresentMon/ServiceMergeModule/ServiceMergeModule.wixproj b/IntelPresentMon/ServiceMergeModule/ServiceMergeModule.wixproj
index 835bc2a1..7d2111c2 100644
--- a/IntelPresentMon/ServiceMergeModule/ServiceMergeModule.wixproj
+++ b/IntelPresentMon/ServiceMergeModule/ServiceMergeModule.wixproj
@@ -15,9 +15,6 @@
   <ItemGroup>
     <!-- The module authoring file -->
     <Compile Include="ServiceMergeModule.wxs" />
-    <!-- Link your existing wixlib so we get ComponentGroup Id='service_files' -->
-    <!-- Add extensions only if your wixlib uses them -->
-    <!-- <WixExtension Include="WixUtilExtension" /> -->
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\PMInstallerLib\PMInstallerLib.wixproj">
diff --git a/IntelPresentMon/ServiceMergeModule/ServiceMergeModule.wxs b/IntelPresentMon/ServiceMergeModule/ServiceMergeModule.wxs
index e1954a64..237e4113 100644
--- a/IntelPresentMon/ServiceMergeModule/ServiceMergeModule.wxs
+++ b/IntelPresentMon/ServiceMergeModule/ServiceMergeModule.wxs
@@ -15,6 +15,9 @@
           <Directory Id="service_folder" Name="PresentMonSharedService" />
         </Directory>
       </Directory>
+        <Directory Id="WindowsFolder">
+            <Directory Id="SystemFolder" Name="System32" />
+        </Directory>
     </Directory>
 
     <!-- Pull in the payload from your wixlib; no <Feature> in a Module -->