From 0eec3bc3494260c7d4bff7442c6a3316e4d17c4e Mon Sep 17 00:00:00 2001 From: Mounir IDRASSI Date: Mon, 21 Sep 2015 00:17:09 +0200 Subject: 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. --- src/Setup/Setup.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'src') 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") ) ) -- cgit v1.2.3