VeraCrypt
aboutsummaryrefslogtreecommitdiff
path: root/src/Setup/Setup.c
diff options
context:
space:
mode:
authorMounir IDRASSI <mounir.idrassi@idrix.fr>2015-09-20 22:17:09 (GMT)
committerMounir IDRASSI <mounir.idrassi@idrix.fr>2015-09-26 15:43:54 (GMT)
commit0eec3bc3494260c7d4bff7442c6a3316e4d17c4e (patch)
tree8a75331c2e39c0e7771da4d49007b35ab38457ac /src/Setup/Setup.c
parentd98367f53b9a1268845d68cde1d02bd6ca35f213 (diff)
downloadVeraCrypt-0eec3bc3494260c7d4bff7442c6a3316e4d17c4e.zip
VeraCrypt-0eec3bc3494260c7d4bff7442c6a3316e4d17c4e.tar.gz
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.
Diffstat (limited to 'src/Setup/Setup.c')
-rw-r--r--src/Setup/Setup.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/Setup/Setup.c b/src/Setup/Setup.c
index d93b4ce..7c3caa1 100644
--- a/src/Setup/Setup.c
+++ b/src/Setup/Setup.c
@@ -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")
)
)