From afc11eca51440f78c17793782ef57306acd854b6 Mon Sep 17 00:00:00 2001 From: Mounir IDRASSI Date: Wed, 8 Jul 2020 02:12:46 +0200 Subject: Windows: Add UI options to control the behavior of automatic bootloader fixing when System Encryption used. --- src/Mount/Mount.rc | 49 ++++++++++++++++++++++++++++++------------------- 1 file changed, 30 insertions(+), 19 deletions(-) (limited to 'src/Mount/Mount.rc') diff --git a/src/Mount/Mount.rc b/src/Mount/Mount.rc index cd4a3e13..f63afe5c 100644 --- a/src/Mount/Mount.rc +++ b/src/Mount/Mount.rc @@ -287,7 +287,7 @@ BEGIN LTEXT "",IDT_PKCS11_LIB_HELP,16,63,286,65 END -IDD_EFI_SYSENC_SETTINGS DIALOGEX 0, 0, 375, 194 +IDD_EFI_SYSENC_SETTINGS DIALOGEX 0, 0, 375, 250 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "VeraCrypt - System Encryption Settings" FONT 8, "MS Shell Dlg", 400, 0, 0x1 @@ -304,13 +304,21 @@ BEGIN "Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,16,83,340,10 CONTROL "Block TRIM command on system partition/drive",IDC_BLOCK_SYSENC_TRIM, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,98,340,10 - GROUPBOX "Advanced Options",IDT_ADVANCED_OPTIONS,7,131,355,36 - PUSHBUTTON "Edit Boot Loader Configuration",IDC_EDIT_DCSPROP,10,144,173,14 - PUSHBUTTON "Display EFI Platform Information",IDC_SHOW_PLATFORMINFO,187,144,173,14 - PUSHBUTTON "Cancel",IDCANCEL,313,170,50,14 - DEFPUSHBUTTON "OK",IDOK,255,170,50,14 CONTROL "Clear encryption keys from memory if a new device is inserted",IDC_CLEAR_KEYS_ON_NEW_DEVICE_INSERTION, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,112,340,10 + GROUPBOX "Advanced Options",IDT_ADVANCED_OPTIONS,7,131,355,91 + CONTROL "Automatically fix boot configuration issues that may prevent Windows from starting",IDC_UPDATE_BOOTLOADER_ON_SHUTDOWN, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,144,340,10 + CONTROL "Force machine to boot on VeraCrypt in the next startup",IDC_FORCE_NEXT_BOOT_VERACRYPT, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,158,340,10 + CONTROL "Force the presence of VeraCrypt entry in the EFI firmware boot menu",IDC_FORCE_VERACRYPT_BOOT_ENTRY, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,172,340,10 + CONTROL "Force VeraCrypt entry to be the first in the EFI firmware boot menu",IDC_FORCE_VERACRYPT_FIRST_BOOT_ENTRY, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,186,340,10 + PUSHBUTTON "Edit Boot Loader Configuration",IDC_EDIT_DCSPROP,10,201,173,14 + PUSHBUTTON "Display EFI Platform Information",IDC_SHOW_PLATFORMINFO,187,201,173,14 + PUSHBUTTON "Cancel",IDCANCEL,313,226,50,14 + DEFPUSHBUTTON "OK",IDOK,255,226,50,14 END IDD_PERFORMANCE_SETTINGS DIALOGEX 0, 0, 371, 293 @@ -401,7 +409,7 @@ BEGIN CONTROL "TrueCrypt Mode",IDC_TRUECRYPT_MODE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,7,76,10 END -IDD_SYSENC_SETTINGS DIALOGEX 0, 0, 371, 310 +IDD_SYSENC_SETTINGS DIALOGEX 0, 0, 371, 344 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "VeraCrypt - System Encryption Settings" FONT 8, "MS Shell Dlg", 400, 0, 0x1 @@ -414,21 +422,24 @@ BEGIN CONTROL "&Cache pre-boot authentication password in driver memory (for mounting of non-system volumes)",IDC_BOOT_LOADER_CACHE_PASSWORD, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,192,339,10 CONTROL "Include PIM when caching pre-boot authentication password",IDC_BOOT_LOADER_CACHE_PIM, - "Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,18,207,340,10 + "Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,18,207,339,10 CONTROL "Allow pre-boot &authentication to be bypassed by pressing the Esc key (enables boot manager)",IDC_ALLOW_ESC_PBA_BYPASS, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,222,340,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,222,339,10 CONTROL "Disable ""Evil Maid"" attack detection",IDC_DISABLE_EVIL_MAID_ATTACK_DETECTION, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,237,340,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,237,339,10 CONTROL "Block TRIM command on system partition/drive",IDC_BLOCK_SYSENC_TRIM, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,251,340,10 - PUSHBUTTON "Cancel",IDCANCEL,314,286,50,14 - DEFPUSHBUTTON "OK",IDOK,257,286,50,14 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,251,339,10 + CONTROL "Clear encryption keys from memory if a new device is inserted",IDC_CLEAR_KEYS_ON_NEW_DEVICE_INSERTION, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,265,339,10 + CONTROL "Automatically fix boot configuration issues that may prevent Windows from starting",IDC_UPDATE_BOOTLOADER_ON_SHUTDOWN, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,298,339,10 + PUSHBUTTON "Cancel",IDCANCEL,314,320,50,14 + DEFPUSHBUTTON "OK",IDOK,257,320,50,14 LTEXT "Display this custom message in the pre-boot authentication screen (24 characters maximum):",IDT_CUSTOM_BOOT_LOADER_MESSAGE,18,39,337,8 - GROUPBOX "Boot Loader Screen Options",IDT_BOOT_LOADER_SCREEN_OPTIONS,9,7,355,165 - GROUPBOX "Security Options",IDT_SECURITY_OPTIONS,9,177,355,105 LTEXT "",IDC_CUSTOM_BOOT_LOADER_MESSAGE_HELP,18,72,337,73 - CONTROL "Clear encryption keys from memory if a new device is inserted",IDC_CLEAR_KEYS_ON_NEW_DEVICE_INSERTION, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,265,340,10 + GROUPBOX "Security Options",IDT_SECURITY_OPTIONS,9,177,355,105 + GROUPBOX "Boot Loader Screen Options",IDT_BOOT_LOADER_SCREEN_OPTIONS,9,7,355,165 + GROUPBOX "Advanced Options",IDT_ADVANCED_OPTIONS,9,285,355,29 END ///////////////////////////////////////////////////////////////////////////// @@ -504,7 +515,7 @@ BEGIN LEFTMARGIN, 7 RIGHTMARGIN, 368 TOPMARGIN, 7 - BOTTOMMARGIN, 184 + BOTTOMMARGIN, 240 END IDD_PERFORMANCE_SETTINGS, DIALOG @@ -536,7 +547,7 @@ BEGIN LEFTMARGIN, 7 RIGHTMARGIN, 364 TOPMARGIN, 7 - BOTTOMMARGIN, 300 + BOTTOMMARGIN, 334 END END #endif // APSTUDIO_INVOKED -- cgit v1.2.3