diff --git a/Installer/Sandboxie-Plus.iss b/Installer/Sandboxie-Plus.iss index c65303e1..2b29fba7 100644 --- a/Installer/Sandboxie-Plus.iss +++ b/Installer/Sandboxie-Plus.iss @@ -52,7 +52,7 @@ Name: "RefreshBuild"; Description: "{cm:RefreshBuild}"; MinVersion: 0.0,5.0; Che [Files] ; Both portable and install. Source: ".\Release\{#MyAppSrc}\*"; DestDir: "{app}"; MinVersion: 0.0,5.0; Flags: recursesubdirs ignoreversion; Excludes: "*.pdb" -; include the driver pdb +; Include the .pdb files. Source: ".\Release\{#MyAppSrc}\SbieDrv.pdb"; DestDir: "{app}"; MinVersion: 0.0,5.0; Flags: ignoreversion Source: ".\Release\{#MyAppSrc}\SbieDll.pdb"; DestDir: "{app}"; MinVersion: 0.0,5.0; Flags: ignoreversion @@ -79,11 +79,15 @@ Filename: "{app}\{#MyAppName}.ini"; Section: "Options"; Key: "UiLanguage"; Strin [InstallDelete] -; Remove deprecated files at install time. +; Delete obsolete files as the first step of installation. Type: filesandordirs; Name: "{app}\translations" Type: files; Name: "{app}\SbieDrv.sys.w10" Type: files; Name: "{app}\SbieDrv.sys.rc4" Type: files; Name: "{app}\SbieIni.exe.sig" +Type: files; Name: "{app}\libcrypto-1_1-x64.dll" +Type: files; Name: "{app}\libssl-1_1-x64.dll" +; Delete existing .pdb files before installing new ones. +Type: files; Name: "{app}\*.pdb" [Registry] @@ -463,7 +467,7 @@ begin end; begin - + // Return the path to use for the value of IniPath. if RegQueryStringValue(HKLM, 'SYSTEM\CurrentControlSet\Services\SbieDrv', 'IniPath', IniPath) then begin @@ -667,7 +671,7 @@ begin exit; end; - // remove shell integration. + // Remove shell integration. ShellUninstall(); end; diff --git a/Sandboxie/install/SandboxieVS.nsi b/Sandboxie/install/SandboxieVS.nsi index 22c8d130..3f27c403 100644 --- a/Sandboxie/install/SandboxieVS.nsi +++ b/Sandboxie/install/SandboxieVS.nsi @@ -954,6 +954,10 @@ NoTrendMicro: Upgrade: + ; Delete obsolete files + Delete "$INSTDIR\${SBIEDRV_SYS}.rc4" + Delete "$INSTDIR\${SBIEDRV_SYS}.w10" + Delete "$INSTDIR\${SBIEINI_EXE}.sig" Call DeleteProductKey Call DeleteSystemKeys Call DeleteShortCuts @@ -1141,7 +1145,7 @@ WriteOk: SkipCopyInstaller: ; - ; Delete old files + ; Delete obsolete files ; Delete "$DESKTOP\${PRODUCT_NAME} Quick Launch.lnk" @@ -1180,8 +1184,9 @@ Function DeleteProgramFiles Delete "$INSTDIR\${SBIEMSG_DLL}" Delete "$INSTDIR\${SBIEDRV_SYS}" - Delete "$INSTDIR\${SBIEDRV_SYS}.rc4" ; leftover - Delete "$INSTDIR\${SBIEDRV_SYS}.w10" ; leftover + ; Delete obsolete files + Delete "$INSTDIR\${SBIEDRV_SYS}.rc4" + Delete "$INSTDIR\${SBIEDRV_SYS}.w10" Delete "$INSTDIR\KmdUtil.exe" Delete "$INSTDIR\UpdUtil.exe" @@ -1210,7 +1215,8 @@ Function DeleteProgramFiles Delete "$INSTDIR\Manifest2.txt" Delete "$INSTDIR\${SBIEINI_EXE}" - Delete "$INSTDIR\${SBIEINI_EXE}.sig" ; leftover + ; Delete obsolete file + Delete "$INSTDIR\${SBIEINI_EXE}.sig" Delete "$INSTDIR\whatsnew.html"