From 69e95bc245ab928455d6d7ab166796def6027a4d Mon Sep 17 00:00:00 2001
From: 21pages <pages21@163.com>
Date: Wed, 1 Mar 2023 11:17:46 +0800
Subject: [PATCH] fix windows uninstall can not delete the installation
 directory

Signed-off-by: 21pages <pages21@163.com>
---
 src/platform/windows.rs | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/platform/windows.rs b/src/platform/windows.rs
index 0bba649f4..561bb4570 100644
--- a/src/platform/windows.rs
+++ b/src/platform/windows.rs
@@ -976,7 +976,7 @@ fn get_after_install(exe: &str) -> String {
 }
 
 pub fn install_me(options: &str, path: String, silent: bool, debug: bool) -> ResultType<()> {
-    let uninstall_str = get_uninstall();
+    let uninstall_str = get_uninstall(false);
     let mut path = path.trim_end_matches('\\').to_owned();
     let (subkey, _path, start_menu, exe) = get_default_install_info();
     let mut exe = exe;
@@ -1188,30 +1188,35 @@ pub fn run_after_install() -> ResultType<()> {
 }
 
 pub fn run_before_uninstall() -> ResultType<()> {
-    run_cmds(get_before_uninstall(), true, "before_install")
+    run_cmds(get_before_uninstall(true), true, "before_install")
 }
 
-fn get_before_uninstall() -> String {
+fn get_before_uninstall(kill_self: bool) -> String {
     let app_name = crate::get_app_name();
     let ext = app_name.to_lowercase();
+    let filter = if kill_self {
+        "".to_string()
+    } else {
+        format!(" /FI \"PID ne {}\"", get_current_pid())
+    };
     format!(
         "
     chcp 65001
     sc stop {app_name}
     sc delete {app_name}
     taskkill /F /IM {broker_exe}
-    taskkill /F /IM {app_name}.exe /FI \"PID ne {cur_pid}\"
+    taskkill /F /IM {app_name}.exe{filter}
     reg delete HKEY_CLASSES_ROOT\\.{ext} /f
     netsh advfirewall firewall delete rule name=\"{app_name} Service\"
     ",
         app_name = app_name,
         broker_exe = crate::win_privacy::INJECTED_PROCESS_EXE,
         ext = ext,
-        cur_pid = get_current_pid(),
+        filter = filter,
     )
 }
 
-fn get_uninstall() -> String {
+fn get_uninstall(kill_self: bool) -> String {
     let (subkey, path, start_menu, _) = get_install_info();
     format!(
         "
@@ -1222,7 +1227,7 @@ fn get_uninstall() -> String {
     if exist \"%PUBLIC%\\Desktop\\{app_name}.lnk\" del /f /q \"%PUBLIC%\\Desktop\\{app_name}.lnk\"
     if exist \"%PROGRAMDATA%\\Microsoft\\Windows\\Start Menu\\Programs\\Startup\\{app_name} Tray.lnk\" del /f /q \"%PROGRAMDATA%\\Microsoft\\Windows\\Start Menu\\Programs\\Startup\\{app_name} Tray.lnk\"
     ",
-        before_uninstall=get_before_uninstall(),
+        before_uninstall=get_before_uninstall(kill_self),
         subkey=subkey,
         app_name = crate::get_app_name(),
         path = path,
@@ -1231,7 +1236,7 @@ fn get_uninstall() -> String {
 }
 
 pub fn uninstall_me() -> ResultType<()> {
-    run_cmds(get_uninstall(), true, "uninstall")
+    run_cmds(get_uninstall(true), true, "uninstall")
 }
 
 fn write_cmds(cmds: String, ext: &str, tip: &str) -> ResultType<std::path::PathBuf> {