mirrors/Sandboxie
mirrors
/
Sandboxie
mirror of https://github.com/sandboxie-plus/Sandboxie.git
1
0
Fork 0
Code Releases Activity

1.5.3

This commit is contained in:
DavidXanatos 2022-10-31 23:09:48 +01:00
parent 484132caea
commit 18d6dd9aa4
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Installer/Sandboxie-Plus.iss
View File

@ -284,10 +284,6 @@ begin
exit; exit;
end; end;
// Stop processes.
UpdateStatus(OutputProgressPage, 'Taskkill /IM Sandman.exe /IM SbieCtrl.exe /IM Start.exe /F', 30);
Exec(ExpandConstant('{sys}\taskkill.exe'), '/IM Sandman.exe /IM SbieCtrl.exe /IM Start.exe /F', '', SW_HIDE, ewWaitUntilTerminated, ExecRet);
// Stop service and driver. // Stop service and driver.
UpdateStatus(OutputProgressPage, 'KmdUtil stop SbieSvc', 55); UpdateStatus(OutputProgressPage, 'KmdUtil stop SbieSvc', 55);
Exec(ExpandConstant('{app}\KmdUtil.exe'), 'stop SbieSvc', '', SW_SHOWNORMAL, ewWaitUntilTerminated, ExecRet); Exec(ExpandConstant('{app}\KmdUtil.exe'), 'stop SbieSvc', '', SW_SHOWNORMAL, ewWaitUntilTerminated, ExecRet);
@ -328,6 +324,8 @@ end;
function NextButtonClick(CurPageID: Integer): Boolean; function NextButtonClick(CurPageID: Integer): Boolean;
var
ExecRet: Integer;
begin begin
// Get mode setting from Custom page and set path for the Dir page. // Get mode setting from Custom page and set path for the Dir page.
@ -346,6 +344,10 @@ begin
// Shutdown service, driver and processes as ready to install. // Shutdown service, driver and processes as ready to install.
if ((CurPageID = wpReady) and (not IsPortable())) then if ((CurPageID = wpReady) and (not IsPortable())) then
begin begin
// Stop processes.
Exec(ExpandConstant('{sys}\taskkill.exe'), '/IM Sandman.exe /IM SbieCtrl.exe /IM Start.exe /F', '', SW_HIDE, ewWaitUntilTerminated, ExecRet);
Result := ShutdownSbie(); Result := ShutdownSbie();
exit; exit;
end; end;
@ -517,7 +519,7 @@ begin
if TaskRet > 2 then begin if TaskRet > 2 then begin
Log('Debug: Start terminate_all'); Log('Debug: Start terminate_all');
Exec(ExpandConstant('{app}\start.exe'), 'terminate_all', '', SW_SHOWNORMAL, ewWaitUntilTerminated, ExecRet); Exec(ExpandConstant('{app}\start.exe'), '/terminate_all', '', SW_SHOWNORMAL, ewWaitUntilTerminated, ExecRet);
end; end;
if TaskRet > 2 then begin if TaskRet > 2 then begin
@ -559,12 +561,17 @@ end;
procedure CurUninstallStepChanged(CurUninstallStep: TUninstallStep); procedure CurUninstallStepChanged(CurUninstallStep: TUninstallStep);
var
ExecRet: Integer;
begin begin
// Before the uninstallation. // Before the uninstallation.
if (CurUninstallStep <> usUninstall) then if (CurUninstallStep <> usUninstall) then
exit; exit;
// Stop processes.
Exec(ExpandConstant('{sys}\taskkill.exe'), '/IM Sandman.exe /IM SbieCtrl.exe /IM Start.exe /F', '', SW_HIDE, ewWaitUntilTerminated, ExecRet);
// User to confirm extra files to remove. // User to confirm extra files to remove.
if not UninstallSilent then if not UninstallSilent then
UninstallCleanup(3); UninstallCleanup(3);