VeraCrypt
aboutsummaryrefslogtreecommitdiff
path: root/src/Common
diff options
context:
space:
mode:
authorMounir IDRASSI <mounir.idrassi@idrix.fr>2018-04-22 14:14:53 (GMT)
committerMounir IDRASSI <mounir.idrassi@idrix.fr>2018-04-23 14:59:36 (GMT)
commit3659ddd70ce8f1616a44e5bcce793eda076b835d (patch)
treef34e796866cf21e0a2f4140ccf697095949d5df0 /src/Common
parentf4edd72662106798dc216c5cabbf39605391523e (diff)
downloadVeraCrypt-3659ddd70ce8f1616a44e5bcce793eda076b835d.zip
VeraCrypt-3659ddd70ce8f1616a44e5bcce793eda076b835d.tar.gz
Windows: enhance ReflectDrivers mechanism by persisting it across major Windows upgrades.
Diffstat (limited to 'src/Common')
-rw-r--r--src/Common/BootEncryption.cpp35
-rw-r--r--src/Common/BootEncryption.h4
2 files changed, 35 insertions, 4 deletions
diff --git a/src/Common/BootEncryption.cpp b/src/Common/BootEncryption.cpp
index c62df95..9c69ef0 100644
--- a/src/Common/BootEncryption.cpp
+++ b/src/Common/BootEncryption.cpp
@@ -2722,8 +2722,37 @@ namespace VeraCrypt
StringCchCatW (szSetupconfigLocation, ARRAYSIZE (szSetupconfigLocation), L"SetupConfig.ini");
- if (bForInstall || FileExists (szSetupconfigLocation))
- WritePrivateProfileStringW (L"SetupConfig", L"ReflectDrivers", bForInstall? szInstallPath : NULL, szSetupconfigLocation);
+ if (bForInstall)
+ {
+ wstring szPathParam = L"\"";
+ szPathParam += szInstallPath;
+ szPathParam += L"\"";
+ WritePrivateProfileStringW (L"SetupConfig", L"ReflectDrivers", szPathParam.c_str(), szSetupconfigLocation);
+
+ szPathParam = GetProgramConfigPath (L"SetupComplete.cmd");
+ FILE* scriptFile = _wfopen (szPathParam.c_str(), L"w");
+ if (scriptFile)
+ {
+ fwprintf (scriptFile, L"\"%s\\VeraCrypt.exe\" /PostOOBE\n", szInstallPath);
+ fclose (scriptFile);
+
+ WritePrivateProfileStringW (L"SetupConfig", L"PostOOBE", szPathParam.c_str(), szSetupconfigLocation);
+ }
+ }
+ else
+ {
+ if (FileExists (szSetupconfigLocation))
+ {
+ WritePrivateProfileStringW (L"SetupConfig", L"ReflectDrivers", NULL, szSetupconfigLocation);
+ WritePrivateProfileStringW (L"SetupConfig", L"PostOOBE", NULL, szSetupconfigLocation);
+ }
+
+ wstring scriptFilePath = GetProgramConfigPath (L"SetupComplete.cmd");
+ if (FileExists (scriptFilePath.c_str()))
+ {
+ ::DeleteFileW (scriptFilePath.c_str());
+ }
+ }
}
}
}
@@ -3717,7 +3746,7 @@ namespace VeraCrypt
finally_do ({ EfiBootInst.DismountBootPartition(); });
- EfiBootInst.MountBootPartition(0);
+ EfiBootInst.MountBootPartition(0);
EfiBootInst.GetFileSize(Is64BitOs()? L"\\EFI\\Boot\\bootx64.efi" : L"\\EFI\\Boot\\bootia32.efi", loaderSize);
diff --git a/src/Common/BootEncryption.h b/src/Common/BootEncryption.h
index 6eb42b5..63ebe35 100644
--- a/src/Common/BootEncryption.h
+++ b/src/Common/BootEncryption.h
@@ -310,7 +310,7 @@ namespace VeraCrypt
void GetEfiBootDeviceNumber (PSTORAGE_DEVICE_NUMBER pSdn);
void BackupSystemLoader ();
void RestoreSystemLoader ();
- void UpdateSetupConfigFile (bool bForInstall);
+ static void UpdateSetupConfigFile (bool bForInstall);
protected:
static const uint32 RescueIsoImageSize = 1835008; // Size of ISO9660 image with bootable emulated 1.44MB floppy disk image
@@ -354,4 +354,6 @@ namespace VeraCrypt
#define TC_SYSTEM_FAVORITES_SERVICE_LOAD_ORDER_GROUP L"Event Log"
#define TC_SYSTEM_FAVORITES_SERVICE_CMDLINE_OPTION L"/systemFavoritesService"
+#define VC_WINDOWS_UPGRADE_POSTOOBE_CMDLINE_OPTION L"/PostOOBE"
+
#endif // TC_HEADER_Common_BootEncryption