From 2aa67ccd578a1406a7717b0391f685a2b2e7c803 Mon Sep 17 00:00:00 2001
From: dijunkun <junkun.di@hotmail.com>
Date: Tue, 30 Sep 2025 15:27:34 +0800
Subject: [PATCH] [feat] prompt user to close crossdesk.exe during
 install/uninstall on Windows

---
 .github/workflows/build.yaml    |   5 ++++
 scripts/windows/nsProcess.dll   | Bin 0 -> 4608 bytes
 scripts/windows/nsis_script.nsi |  51 +++++++++++++++++++++++++++++++-
 3 files changed, 55 insertions(+), 1 deletion(-)
 create mode 100644 scripts/windows/nsProcess.dll

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 97efcfe..5daa730 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -275,6 +275,11 @@ jobs:
       - name: Initialize submodules
         run: git submodule update --init --recursive
 
+      - name: Copy nsProcess plugin to NSIS folder
+        run: |
+          $nsisPluginDir = "C:\Program Files (x86)\NSIS\Plugins\x86-unicode"
+          copy "${{ github.workspace }}\scripts\windows\nsProcess.dll" $nsisPluginDir
+
       - name: Build CrossDesk
         run: xmake b -vy crossdesk
 
diff --git a/scripts/windows/nsProcess.dll b/scripts/windows/nsProcess.dll
new file mode 100644
index 0000000000000000000000000000000000000000..2478624ee0bcceb6e2c0eee3a563e7cea272ba9a
GIT binary patch
literal 4608
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
I{EsW}54bMdo&W#<

literal 0
HcmV?d00001

diff --git a/scripts/windows/nsis_script.nsi b/scripts/windows/nsis_script.nsi
index c7d3751..81daee6 100644
--- a/scripts/windows/nsis_script.nsi
+++ b/scripts/windows/nsis_script.nsi
@@ -38,6 +38,9 @@ RequestExecutionLevel admin
 !insertmacro MUI_RESERVEFILE_INSTALLOPTIONS
 ; ------ End of MUI Definition ------
 
+; Include LogicLib for process handling
+!include "LogicLib.nsh"
+
 Name "${PRODUCT_NAME} ${PRODUCT_VERSION}"
 OutFile "crossdesk-win-x64-${PRODUCT_VERSION}.exe"
 InstallDir "$PROGRAMFILES\CrossDesk"
@@ -66,6 +69,29 @@ Section "VC++ Runtime"
 SectionEnd
 
 Section "MainSection"
+    ; Check if CrossDesk is running
+    StrCpy $1 "crossdesk.exe"
+    
+    nsProcess::_FindProcess "$1"
+    Pop $R0
+    ${If} $R0 = 0  ;
+        MessageBox MB_ICONQUESTION|MB_YESNO "CrossDesk is running. Do you want to close it and continue the installation?" IDYES closeApp IDNO cancelInstall
+    ${Else}
+        Goto installApp
+    ${EndIf}
+
+closeApp:
+    nsProcess::_KillProcess "$1"
+    Pop $R0
+    Sleep 500
+    Goto installApp
+
+cancelInstall:
+    SetDetailsPrint both
+    MessageBox MB_ICONEXCLAMATION|MB_OK "Installation has been aborted."
+    Abort
+
+installApp:
     SetOutPath "$INSTDIR"
     SetOverwrite ifnewer
 
@@ -108,6 +134,29 @@ Section -AdditionalIcons
 SectionEnd
 
 Section "Uninstall"
+    ; Check if CrossDesk is running
+    StrCpy $1 "crossdesk.exe"
+    
+    nsProcess::_FindProcess "$1"
+    Pop $R0
+    ${If} $R0 = 0
+        MessageBox MB_ICONQUESTION|MB_YESNO "CrossDesk is running. Do you want to close it and uninstall?" IDYES closeApp IDNO cancelUninstall
+    ${Else}
+        Goto uninstallApp
+    ${EndIf}
+
+closeApp:
+    nsProcess::_KillProcess "$1"
+    Pop $R0
+    Sleep 500
+    Goto uninstallApp
+
+cancelUninstall:
+    SetDetailsPrint both
+    MessageBox MB_ICONEXCLAMATION|MB_OK "Uninstallation has been aborted."
+    Abort
+
+uninstallApp:
     ; Delete main executable and uninstaller
     Delete "$INSTDIR\crossdesk.exe"
     Delete "$INSTDIR\uninstall.exe"
@@ -133,4 +182,4 @@ SectionEnd
 ; ------ Functions ------
 Function LaunchApp
     Exec "$INSTDIR\crossdesk.exe"
-FunctionEnd
\ No newline at end of file
+FunctionEnd