From 3cde0d988edc4e013c2bf4edf9761223a5723f4c Mon Sep 17 00:00:00 2001
From: varjolintu <sami.vanttinen@protonmail.com>
Date: Sat, 24 Feb 2018 09:59:49 +0200
Subject: [PATCH] Kills keepassxc-proxy and KeePassXC during install or
 uninstall under Windows

---
 share/windows/wix-template.xml | 16 ++++++++++++++++
 src/CMakeLists.txt             |  5 +++++
 2 files changed, 21 insertions(+)

diff --git a/share/windows/wix-template.xml b/share/windows/wix-template.xml
index 1e47029ef..44cab1641 100644
--- a/share/windows/wix-template.xml
+++ b/share/windows/wix-template.xml
@@ -3,6 +3,7 @@
 <?include "cpack_variables.wxi"?>
 
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
+    xmlns:util="http://schemas.microsoft.com/wix/UtilExtension"
     RequiredVersion="3.6.3303.0">
 
     <Product Id="$(var.CPACK_WIX_PRODUCT_GUID)"
@@ -47,5 +48,20 @@
         <DirectoryRef Id="TARGETDIR">
             <Directory Id="ProgramMenuFolder" />
         </DirectoryRef>
+
+        <Property Id="WixSilentExecCmdLine" Value='"Taskkill" /IM KeePassXC.exe'/>
+        <CustomAction Id="KillKeePassXCInstall" BinaryKey="WixCA" DllEntry="WixSilentExec" Execute="immediate" Return="ignore"/>
+        <CustomAction Id="KillKeePassXCUninstall" BinaryKey="WixCA" DllEntry="WixSilentExec" Execute="immediate" Return="ignore"/>
+
+        <Property Id="WixQuietExecCmdLine" Value='"Taskkill" /IM keepassxc-proxy.exe /F'/>
+        <CustomAction Id="KillProxyInstall" BinaryKey="WixCA" DllEntry="WixQuietExec" Execute="immediate" Return="ignore"/>
+        <CustomAction Id="KillProxyUninstall" BinaryKey="WixCA" DllEntry="WixQuietExec" Execute="immediate" Return="ignore"/>
+
+        <InstallExecuteSequence>
+            <Custom Action="KillKeePassXCInstall" After="InstallInitialize"/>
+            <Custom Action="KillProxyInstall" After="InstallInitialize"/>
+            <Custom Action="KillKeePassXCUninstall" Before="InstallValidate">Installed</Custom>
+            <Custom Action="KillProxyUninstall" Before="InstallValidate">Installed</Custom>
+        </InstallExecuteSequence>
     </Product>
 </Wix>
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 8c3245a28..69526967c 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -362,6 +362,10 @@ if(MINGW)
   set(CPACK_NSIS_MUI_UNWELCOMEFINISHPAGE_BITMAP "${CPACK_NSIS_MUI_WELCOMEFINISHPAGE_BITMAP}")
   set(CPACK_NSIS_CREATE_ICONS_EXTRA "CreateShortCut '$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\${PROGNAME}.lnk' '$INSTDIR\\\\${PROGNAME}.exe'")
   set(CPACK_NSIS_DELETE_ICONS_EXTRA "Delete '$SMPROGRAMS\\\\$START_MENU\\\\${PROGNAME}.lnk'")
+  set(CPACK_NSIS_EXTRA_PREINSTALL_COMMANDS "ExecWait 'Taskkill /IM KeePassXC.exe'")
+  set(CPACK_NSIS_EXTRA_PREINSTALL_COMMANDS "${CPACK_NSIS_EXTRA_PREINSTALL_COMMANDS}\nExecWait 'Taskkill /IM keepassxc-proxy.exe /F'")
+  set(CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS "ExecWait 'Taskkill /IM KeePassXC.exe'")
+  set(CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS "${CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS}\nExecWait 'Taskkill /IM keepassxc-proxy.exe /F'")
   set(CPACK_NSIS_URL_INFO_ABOUT "https://keepassxc.org")
   set(CPACK_NSIS_DISPLAY_NAME ${PROGNAME})
   set(CPACK_NSIS_PACKAGE_NAME "${PROGNAME} v${KEEPASSXC_VERSION}")
@@ -373,6 +377,7 @@ if(MINGW)
   set(CPACK_WIX_TEMPLATE "${CMAKE_SOURCE_DIR}/share/windows/wix-template.xml")
   set(CPACK_WIX_PATCH_FILE "${CMAKE_SOURCE_DIR}/share/windows/wix-patch.xml")
   set(CPACK_WIX_PROPERTY_ARPURLINFOABOUT "https://keepassxc.org")
+  set(CPACK_WIX_EXTENSIONS "WixUtilExtension.dll")
   include(CPack)
 
   install(CODE "