mirrors
/
VeraCrypt
mirror of https://github.com/veracrypt/VeraCrypt.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Windows Installer: check newly added files if they are used before resuming installation. Avoid using driver handle to check if we are using system encryption.

This commit is contained in:
Mounir IDRASSI 2015-09-21 00:17:09 +02:00
parent d98367f53b
commit 0eec3bc349
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Setup/Setup.c
View File

@ -865,7 +865,7 @@ BOOL DoFilesInstall (HWND hwndDlg, char *szDestDir)
try
{
if (BootEncObj.GetStatus().DriveMounted)
if (BootEncObj.GetDriverServiceStartType() == SERVICE_BOOT_START)
{
BootEncObj.UpdateSystemFavoritesService ();
}
@ -2086,7 +2086,14 @@ void DoInstall (void *arg)
if (bUpgrade
&& (IsFileInUse (string (InstallationPath) + '\\' + TC_APP_NAME ".exe")
|| IsFileInUse (string (InstallationPath) + '\\' + TC_APP_NAME "-x86.exe")
|| IsFileInUse (string (InstallationPath) + '\\' + TC_APP_NAME "-x64.exe")
|| IsFileInUse (string (InstallationPath) + '\\' + TC_APP_NAME " Format.exe")
|| IsFileInUse (string (InstallationPath) + '\\' + TC_APP_NAME " Format-x86.exe")
|| IsFileInUse (string (InstallationPath) + '\\' + TC_APP_NAME " Format-x64.exe")
|| IsFileInUse (string (InstallationPath) + '\\' + TC_APP_NAME "Expander.exe")
|| IsFileInUse (string (InstallationPath) + '\\' + TC_APP_NAME "Expander-x86.exe")
|| IsFileInUse (string (InstallationPath) + '\\' + TC_APP_NAME "Expander-x64.exe")
|| IsFileInUse (string (InstallationPath) + '\\' + TC_APP_NAME " Setup.exe")
)
)