setup: uninstall msi when executing uninstall via inno setup

Author: HashidaTKS

BrowserGuard.iss

@@ -92,6 +92,7 @@ const
   // hand or by a group policy is not removed on uninstall.
   OwnKey = 'Software\BrowserGuard';
   RegisteredFlag = 'ExtensionSettingsRegistered';
+  MsiProductCode = '{E039FF7F-1CD4-42D7-A254-0ADD92E6517D}';
 
 function GetProgramFiles(Param: string): string;
   begin
@@ -215,6 +216,29 @@ begin
   end;
 end;
 
+function MsiPackageInstalled(): Boolean;
+begin
+  Result := RegKeyExists(HKEY_LOCAL_MACHINE,
+    'SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\' + MsiProductCode);
+end;
+
+procedure UninstallMsiPackage();
+var
+  ResultCode: Integer;
+begin
+  if ExpandConstant('{param:UninstallMsiPackage|yes}') <> 'yes' then
+    Exit;
+  if not MsiPackageInstalled() then
+    Exit;
+
+  if not Exec('msiexec.exe',
+              '/x ' + MsiProductCode + ' /qn UNINSTALL_EXE_PACKAGE=no',
+              '', SW_HIDE, ewWaitUntilTerminated, ResultCode) then
+    Log('Cannot start msiexec.exe')
+  else if ResultCode <> 0 then
+    Log('msiexec returned ' + IntToStr(ResultCode) + ' for ' + MsiProductCode);
+end;
+
 procedure CurUninstallStepChanged(CurUninstallStep: TUninstallStep);
 var
   Flag: String;
@@ -227,4 +251,5 @@ begin
     if Flag = '1' then
       UnregisterExtensionSettings();
   end;
+  UninstallMsiPackage();
 end;

BrowserGuardMsiSetup/Package.wxs

@@ -1,9 +1,12 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-	<!-- ProductCode is left out on purpose, so that WiX generates a new one for
-	     every build. A pinned ProductCode would make MajorUpgrade unreachable:
-	     MSI would read the next version as the same product. -->
+	<!-- ProductCode is pinned because BrowserGuard.iss has to name it: removing
+	     the Inno Setup package on its own would otherwise leave this one behind.
+	     It must still differ from one version to the next, or MajorUpgrade never
+	     fires and MSI reads the new version as the same product. bump-version.ps1
+	     generates a new one and writes it to both files. -->
 	<Package Name="BrowserGuard" Manufacturer="ClearCode Inc." Version="$(var.Version)"
-			 UpgradeCode="390BAE83-8789-4D2C-BDCF-085335FA8E79">
+			 UpgradeCode="390BAE83-8789-4D2C-BDCF-085335FA8E79"
+			 ProductCode="E039FF7F-1CD4-42D7-A254-0ADD92E6517D">
 		<MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
 		<Media Id="1" EmbedCab="yes" Cabinet="cab1.cab" />
 		<Feature Id="Main">

BrowserGuardMsiSetup/tools/uninstall-exe-package.cmd

@@ -18,6 +18,6 @@ reg query "%~1" /v UninstallString %2 >nul 2>&1
 if not %errorlevel% equ 0 exit /b 0
 for /f "tokens=2*" %%A in ('reg query "%~1" /v UninstallString %2') do set "UNINSTALL_PATH=%%B"
 if not defined UNINSTALL_PATH exit /b 0
-call !UNINSTALL_PATH! /VERYSILENT /SUPPRESSMSGBOXES /NORESTART
+call !UNINSTALL_PATH! /VERYSILENT /SUPPRESSMSGBOXES /NORESTART /UninstallMsiPackage=no
 set "UNINSTALL_PATH="
 exit /b 0