From 9b12d13c68eb95049cddf8abf24bba0349e8cfe6 Mon Sep 17 00:00:00 2001
From: Simon Rozman <simon@rozman.si>
Date: Tue, 10 Nov 2020 10:24:02 +0100
Subject: installer: clean-up adapters and Wintun driver on uninstall

Signed-off-by: Simon Rozman <simon@rozman.si>
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
---
 installer/wireguard.wxs | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

(limited to 'installer/wireguard.wxs')

diff --git a/installer/wireguard.wxs b/installer/wireguard.wxs
index 56d00163..8b18189f 100644
--- a/installer/wireguard.wxs
+++ b/installer/wireguard.wxs
@@ -99,12 +99,28 @@
 			<Custom Action="EvaluateWireGuardServices" After="FindRelatedProducts" />
 		</InstallExecuteSequence>
 
+		<!--
+			Evaluate WireGuard components
+		-->
+		<CustomAction Id="EvaluateWireGuardComponents" BinaryKey="customactions.dll" DllEntry="EvaluateWireGuardComponents" />
+		<InstallExecuteSequence>
+			<Custom Action="EvaluateWireGuardComponents" After="ProcessComponents" />
+		</InstallExecuteSequence>
+
 		<!--
 			Clear out our config folder on uninstall
 		-->
 		<CustomAction Id="RemoveConfigFolder" BinaryKey="customactions.dll" DllEntry="RemoveConfigFolder" Execute="deferred" Impersonate="no" />
 		<InstallExecuteSequence>
-			<Custom Action="RemoveConfigFolder" After="DeleteServices">(NOT UPGRADINGPRODUCTCODE) AND (REMOVE="ALL")</Custom>
+			<Custom Action="RemoveConfigFolder" After="DeleteServices" />
+		</InstallExecuteSequence>
+
+		<!--
+			Clear out our adapters on uninstall
+		-->
+		<CustomAction Id="RemoveAdapters" BinaryKey="customactions.dll" DllEntry="RemoveAdapters" Execute="deferred" Impersonate="no" />
+		<InstallExecuteSequence>
+			<Custom Action="RemoveAdapters" Before="RemoveFiles" />
 		</InstallExecuteSequence>
 
 		<!--
-- 
cgit v1.2.3-59-g8ed1b