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

Windows: code refactoring

This commit is contained in:
Mounir IDRASSI 2018-04-19 18:31:40 +02:00
parent 8e4497de2a
commit f4edd72662
No known key found for this signature in database
GPG Key ID: DD0C382D5FCFB8FC
1 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/Common/BootEncryption.cpp
View File

@ -2717,11 +2717,13 @@ namespace VeraCrypt
}
if (GetSetupconfigLocation (szSetupconfigLocation, ARRAYSIZE (szSetupconfigLocation)))
{
::CreateDirectoryW (szSetupconfigLocation, NULL);
if (bForInstall)
::CreateDirectoryW (szSetupconfigLocation, NULL);
StringCchCatW (szSetupconfigLocation, ARRAYSIZE (szSetupconfigLocation), L"SetupConfig.ini");
WritePrivateProfileStringW (L"SetupConfig", L"ReflectDrivers", bForInstall? szInstallPath : NULL, szSetupconfigLocation);
if (bForInstall || FileExists (szSetupconfigLocation))
WritePrivateProfileStringW (L"SetupConfig", L"ReflectDrivers", bForInstall? szInstallPath : NULL, szSetupconfigLocation);
}
}
}
@ -3837,20 +3839,13 @@ namespace VeraCrypt
device.Write (bootLoaderBuf, sizeof (bootLoaderBuf));
}
// starting from Windows 10 1607 (Build 14393), ReflectDrivers in Setupconfig.ini is supported
if (IsOSVersionAtLeast (WIN_10, 0) && CurrentOSBuildNumber >= 14393)
if (!IsAdmin() && IsUacSupported())
{
wchar_t szSetupconfigLocation [TC_MAX_PATH + 20];
if (GetSetupconfigLocation (szSetupconfigLocation, ARRAYSIZE (szSetupconfigLocation)))
{
StringCchCatW (szSetupconfigLocation, ARRAYSIZE (szSetupconfigLocation), L"SetupConfig.ini");
if (FileExists (szSetupconfigLocation))
{
WritePrivateProfileStringW (L"SetupConfig", L"ReflectDrivers", NULL, szSetupconfigLocation);
}
}
Elevator::UpdateSetupConfigFile (false);
}
else
{
UpdateSetupConfigFile (false);
}
}