diff options
| author | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2015-09-21 00:17:09 +0200 |
|---|---|---|
| committer | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2015-09-26 17:43:54 +0200 |
| commit | 0eec3bc3494260c7d4bff7442c6a3316e4d17c4e (patch) | |
| tree | 8a75331c2e39c0e7771da4d49007b35ab38457ac | |
| parent | d98367f53b9a1268845d68cde1d02bd6ca35f213 (diff) | |
| download | VeraCrypt-0eec3bc3494260c7d4bff7442c6a3316e4d17c4e.tar.gz VeraCrypt-0eec3bc3494260c7d4bff7442c6a3316e4d17c4e.zip | |
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.
| -rw-r--r-- | src/Setup/Setup.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/Setup/Setup.c b/src/Setup/Setup.c index d93b4ced..7c3caa1c 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")
)
)
|