From 66ff9f7f68b9a8fe497ca99c6c892e76ce62a3c5 Mon Sep 17 00:00:00 2001
From: isaak654 <isaak654@users.noreply.github.com>
Date: Thu, 27 Oct 2022 14:14:00 +0200
Subject: [PATCH 1/2] Improve removal of leftovers

---
 Installer/Sandboxie-Plus.iss      |  1 +
 Sandboxie/install/SandboxieVS.nsi | 14 +++++++++-----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/Installer/Sandboxie-Plus.iss b/Installer/Sandboxie-Plus.iss
index 3d47b7a1dd..3ad40063b1 100644
--- a/Installer/Sandboxie-Plus.iss
+++ b/Installer/Sandboxie-Plus.iss
@@ -83,6 +83,7 @@ Type: files; Name: "{app}\translations\sandman_pt.qm"
 Type: files; Name: "{app}\translations\sandman_ua.qm"
 Type: files; Name: "{app}\SbieDrv.sys.w10"
 Type: files; Name: "{app}\SbieDrv.sys.rc4"
+Type: files; Name: "{app}\SbieIni.exe.sig"
 
 
 [Registry]
diff --git a/Sandboxie/install/SandboxieVS.nsi b/Sandboxie/install/SandboxieVS.nsi
index 8d8acfaf24..b698eca983 100644
--- a/Sandboxie/install/SandboxieVS.nsi
+++ b/Sandboxie/install/SandboxieVS.nsi
@@ -43,8 +43,8 @@ SetCompressor /SOLID /FINAL lzma
 ;    !define _W7DRV_COMPAT "$%SbieVer%.x86"
 ;!endif
 
-;!define SBIEDRV_SYS4    "${SBIEDRV_SYS}.rc4"
-;!define SBIEDRV_SYSX    "${SBIEDRV_SYS}.w10"
+!define SBIEDRV_SYS4    "${SBIEDRV_SYS}.rc4" ; to clean up afterwards
+!define SBIEDRV_SYSX    "${SBIEDRV_SYS}.w10" ; to clean up afterwards
 
 !define OUTFILE_BOTH    "${PRODUCT_NAME}Install.exe"
 !define NAME_Win32      "${PRODUCT_FULL_NAME} ${VERSION} (32-bit)"
@@ -1044,7 +1044,7 @@ WriteLoop:
 
     File /oname=${START_EXE} "${BIN_ROOT}\Start.exe"
     File /oname=${START_EXE}.sig "${BIN_ROOT}\Start.exe.sig"
-    
+
     File /oname=${SBIECTRL_EXE} "${BIN_ROOT}\SbieCtrl.exe"
     File /oname=${SBIECTRL_EXE}.sig "${BIN_ROOT}\SbieCtrl.exe.sig"
 
@@ -1108,6 +1108,9 @@ SkipCopyInstaller:
 
     Delete "$DESKTOP\${PRODUCT_NAME} Quick Launch.lnk"
     Delete "$QUICKLAUNCH\${PRODUCT_NAME} Quick Launch.lnk"
+    Delete "$INSTDIR\${SBIEDRV_SYS4}"
+    Delete "$INSTDIR\${SBIEDRV_SYSX}"
+    Delete "$INSTDIR\${SBIEINI_EXE}.sig"
 
 FunctionEnd
 
@@ -1139,8 +1142,8 @@ Function DeleteProgramFiles
     Delete "$INSTDIR\${SBIEMSG_DLL}"
 
     Delete "$INSTDIR\${SBIEDRV_SYS}"
-;    Delete "$INSTDIR\${SBIEDRV_SYS4}"
-;    Delete "$INSTDIR\${SBIEDRV_SYSX}"
+    Delete "$INSTDIR\${SBIEDRV_SYS4}" ; leftover
+    Delete "$INSTDIR\${SBIEDRV_SYSX}" ; leftover
 
     Delete "$INSTDIR\KmdUtil.exe"
 
@@ -1168,6 +1171,7 @@ Function DeleteProgramFiles
     Delete "$INSTDIR\Manifest2.txt"
 
     Delete "$INSTDIR\${SBIEINI_EXE}"
+    Delete "$INSTDIR\${SBIEINI_EXE}.sig" ; leftover
 
     Delete "$INSTDIR\LICENSE.EXE"
 

From 6954e3c3cbab6ee1e861e5ce5598e88ca89c2178 Mon Sep 17 00:00:00 2001
From: isaak654 <isaak654@users.noreply.github.com>
Date: Thu, 27 Oct 2022 19:09:15 +0200
Subject: [PATCH 2/2] Reduce unnecessary changes

---
 Sandboxie/install/SandboxieVS.nsi | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Sandboxie/install/SandboxieVS.nsi b/Sandboxie/install/SandboxieVS.nsi
index b698eca983..756d64c892 100644
--- a/Sandboxie/install/SandboxieVS.nsi
+++ b/Sandboxie/install/SandboxieVS.nsi
@@ -43,8 +43,8 @@ SetCompressor /SOLID /FINAL lzma
 ;    !define _W7DRV_COMPAT "$%SbieVer%.x86"
 ;!endif
 
-!define SBIEDRV_SYS4    "${SBIEDRV_SYS}.rc4" ; to clean up afterwards
-!define SBIEDRV_SYSX    "${SBIEDRV_SYS}.w10" ; to clean up afterwards
+;!define SBIEDRV_SYS4    "${SBIEDRV_SYS}.rc4"
+;!define SBIEDRV_SYSX    "${SBIEDRV_SYS}.w10"
 
 !define OUTFILE_BOTH    "${PRODUCT_NAME}Install.exe"
 !define NAME_Win32      "${PRODUCT_FULL_NAME} ${VERSION} (32-bit)"
@@ -1108,8 +1108,8 @@ SkipCopyInstaller:
 
     Delete "$DESKTOP\${PRODUCT_NAME} Quick Launch.lnk"
     Delete "$QUICKLAUNCH\${PRODUCT_NAME} Quick Launch.lnk"
-    Delete "$INSTDIR\${SBIEDRV_SYS4}"
-    Delete "$INSTDIR\${SBIEDRV_SYSX}"
+    Delete "$INSTDIR\${SBIEDRV_SYS}.rc4"
+    Delete "$INSTDIR\${SBIEDRV_SYS}.w10"
     Delete "$INSTDIR\${SBIEINI_EXE}.sig"
 
 FunctionEnd
@@ -1142,8 +1142,8 @@ Function DeleteProgramFiles
     Delete "$INSTDIR\${SBIEMSG_DLL}"
 
     Delete "$INSTDIR\${SBIEDRV_SYS}"
-    Delete "$INSTDIR\${SBIEDRV_SYS4}" ; leftover
-    Delete "$INSTDIR\${SBIEDRV_SYSX}" ; leftover
+    Delete "$INSTDIR\${SBIEDRV_SYS}.rc4" ; leftover
+    Delete "$INSTDIR\${SBIEDRV_SYS}.w10" ; leftover
 
     Delete "$INSTDIR\KmdUtil.exe"