From 881fd62d24e336f3f571a9a5926512a10450b447 Mon Sep 17 00:00:00 2001
From: Simon Rozman <simon@rozman.si>
Date: Mon, 24 Feb 2020 13:21:28 +0100
Subject: [PATCH] Fix StubPath for products in ACTIVESETUPFAULTYPRODUCTS

The products using Active Setup prior to
18cd389029502ec73da4b62ecdc1792ebdb805f8 upgrade are prone to uninstall
failure because of the missing StubPath value in the registry.

Author the Upgrade table of the package to have those products listed in
a property called `ACTIVESETUPFAULTYPRODUCTS` to inject StubPath in the
registry before RemoveExistingProducts.

Signed-off-by: Simon Rozman <simon@rozman.si>
---
 Core/Binary/EvaluateFixActiveSetup.js |  26 +++++++++++++++++++
 Core/Binary/FixActiveSetup.js         |  36 ++++++++++++++++++++++++++
 Core/Makefile                         | Bin 159626 -> 161614 bytes
 3 files changed, 62 insertions(+)
 create mode 100644 Core/Binary/EvaluateFixActiveSetup.js
 create mode 100644 Core/Binary/FixActiveSetup.js

diff --git a/Core/Binary/EvaluateFixActiveSetup.js b/Core/Binary/EvaluateFixActiveSetup.js
new file mode 100644
index 0000000..8b8fec4
--- /dev/null
+++ b/Core/Binary/EvaluateFixActiveSetup.js
@@ -0,0 +1,26 @@
+/*
+ *  MSIBuild — MSI packaging
+ *
+ *  Copyright (C) 2018-2020 Amebis <info@amebis.si>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+
+/**
+ * Prepares instructions for FixActiveSetup deferred action.
+ */
+
+// Save the data for the deferred action.
+Session.Property("FixActiveSetup") = Session.Property("ACTIVESETUPFAULTYPRODUCTS")
diff --git a/Core/Binary/FixActiveSetup.js b/Core/Binary/FixActiveSetup.js
new file mode 100644
index 0000000..2c22093
--- /dev/null
+++ b/Core/Binary/FixActiveSetup.js
@@ -0,0 +1,36 @@
+/*
+ *  MSIBuild — MSI packaging
+ *
+ *  Copyright (C) 2018-2020 Amebis <info@amebis.si>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+ 
+/**
+ * Fixes Active Setup component to allow graceful uninstall
+ *
+ * This is a deffered execution action. CustomActionData property should be a semicolon delimited
+ * list of product IDs that require this fix to be uninstalled successfuly.
+ */
+
+var data = Session.Property("CustomActionData").split(";");
+if (data) {
+	var wsh = new ActiveXObject("WScript.Shell");
+
+	for (var i in data) {
+		var regPath = "HKLM\\Software\\Microsoft\\Active Setup\\Installed Components\\" + data[i] + "\\";
+		wsh.RegWrite(regPath + "StubPath", "\"%SystemRoot%\\system32\\msiexec.exe\" /fu \"" + data[i] + "\" /qn", "REG_EXPAND_SZ");
+	}
+}
diff --git a/Core/Makefile b/Core/Makefile
index 563ec889b891a663ec29aaefba90a6a47b4bc9f8..7aa2cb0ed94b8b6186e38ec2012a30795800d26d 100644
GIT binary patch
delta 561
zcmZWmF-t;G6h7xd$h~Pi#I&GCYDEne`e<lyDsu=CDH^qglIlHt79ozl#s-Pra9SGt
z34w5-AqbkC+FKeUnwlJXf^?tCh08tn`_A_rzH|G*d*8g(#bSl>4r)_*IEN-(ni!+|
zG8*)jMQuI~*I+{&ssj)>gg}5I2Kcb(lyPa$5T(WjTO%vNj_KtHn{GT@m)>JPNDn6F
zsABt#Oy#*MH48r(T{#$4zdChyPz#(YOP%g&D140n5xl{5`BTF_l9*#@Dw&v6yacsv
zTprd>HqsarQP83Ms$)T$2&LWf3+mJ3VbE_2!%9{saf5=g4!%!FSq?7vn3GaHXGBVR
zQpHEArdW=wvOmHY=iXKfNQ2>a0<*4B3d@T{)(E*<JV<*9cA|V@^t{f_^i9ZkXRycw
d>_Pz!ynA%5)Jrje8TVDJP$|h~WIx5)+kYv6m1_V1

delta 86
zcmV-c0IC1Z?g@(D34pW#PF}YxUjf1mx87|5<N}kX2N0J$UjZ1ms&N6(0hhW-0+_en
sbpf;wmtKYe*th(L0Z5&fR%!thx8@}RbPbcJ2M(9YC;|?*z%&AmLMb33-~a#s