From 064982c2017dccac81fb4e4c9c195ecc1cd15e26 Mon Sep 17 00:00:00 2001 From: Mounir IDRASSI Date: Fri, 9 Jun 2017 17:03:28 +0200 Subject: Windows: Enhancements to EFI System Information dialog --- src/Common/Language.xml | 1 + src/Mount/Mount.rc | 19 ++++++++++--------- src/Mount/Resource.h | 3 ++- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/src/Common/Language.xml b/src/Common/Language.xml index 36c3a42a..ab348a82 100644 --- a/src/Common/Language.xml +++ b/src/Common/Language.xml @@ -1421,6 +1421,7 @@ EFI Platform Information WARNING: Inexperienced users should never attempt to manually edit boot loader configurations.\n\nContinue? WARNING: Failed to validate the XML format of the Boot Loader configuration. Please check your modifications. + Advanced Options diff --git a/src/Mount/Mount.rc b/src/Mount/Mount.rc index d07a9b4a..689a9b0e 100644 --- a/src/Mount/Mount.rc +++ b/src/Mount/Mount.rc @@ -285,15 +285,15 @@ BEGIN LTEXT "",IDT_PKCS11_LIB_HELP,16,63,286,65 END -IDD_EFI_SYSENC_SETTINGS DIALOGEX 0, 0, 374, 156 +IDD_EFI_SYSENC_SETTINGS DIALOGEX 0, 0, 374, 165 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 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,16,68,339,10 - DEFPUSHBUTTON "OK",IDOK,258,132,50,14 - PUSHBUTTON "Cancel",IDCANCEL,317,132,50,14 + DEFPUSHBUTTON "OK",IDOK,255,141,50,14 + PUSHBUTTON "Cancel",IDCANCEL,313,141,50,14 GROUPBOX "Boot Loader Screen Options",IDT_BOOT_LOADER_SCREEN_OPTIONS,8,7,355,45 GROUPBOX "Security Options",IDT_SECURITY_OPTIONS,7,53,355,44 CONTROL "Include PIM when caching pre-boot authentication password",IDC_BOOT_LOADER_CACHE_PIM, @@ -302,8 +302,9 @@ BEGIN "Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,20,339,9 CONTROL "Do not request Hash algorithm in the pre-boot authentication screen",IDC_DISABLE_BOOT_LOADER_HASH_PROMPT, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,35,339,9 - PUSHBUTTON "Display EFI Platform Information",IDC_SHOW_PLATFORMINFO,16,126,154,14 - PUSHBUTTON "Edit Boot Loader Configuration",IDC_EDIT_DCSPROP,16,105,154,14 + PUSHBUTTON "Display EFI Platform Information",IDC_SHOW_PLATFORMINFO,187,112,173,14 + PUSHBUTTON "Edit Boot Loader Configuration",IDC_EDIT_DCSPROP,10,112,173,14 + GROUPBOX "Advanced Options",IDT_ADVANCED_OPTIONS,7,99,355,36 END IDD_PERFORMANCE_SETTINGS DIALOGEX 0, 0, 370, 248 @@ -485,7 +486,7 @@ BEGIN LEFTMARGIN, 7 RIGHTMARGIN, 367 TOPMARGIN, 7 - BOTTOMMARGIN, 146 + BOTTOMMARGIN, 155 END IDD_PERFORMANCE_SETTINGS, DIALOG @@ -605,7 +606,7 @@ IDB_SYS_DRIVEICON_MASK BITMAP "System_drive_icon_mask_96dpi.bm // Menu // -IDR_MENU MENU +IDR_MENU MENU BEGIN POPUP "&Volumes" BEGIN @@ -640,7 +641,7 @@ BEGIN MENUITEM SEPARATOR MENUITEM "Create Rescue Disk...", IDM_CREATE_RESCUE_DISK MENUITEM "Verify Rescue Disk", IDM_VERIFY_RESCUE_DISK - MENUITEM "Verify Rescue Disk Image", IDM_VERIFY_RESCUE_DISK_ISO + MENUITEM "Verify Rescue Disk Image", IDM_VERIFY_RESCUE_DISK_ISO MENUITEM SEPARATOR MENUITEM "Mount Without Pre-Boot &Authentication...", IDM_MOUNT_SYSENC_PART_WITHOUT_PBA MENUITEM SEPARATOR @@ -724,7 +725,7 @@ END // String Table // -STRINGTABLE +STRINGTABLE BEGIN IDS_UACSTRING "VeraCrypt" END diff --git a/src/Mount/Resource.h b/src/Mount/Resource.h index 62d7ea1a..907e5ad3 100644 --- a/src/Mount/Resource.h +++ b/src/Mount/Resource.h @@ -186,6 +186,7 @@ #define IDC_SECURE_DESKTOP_PASSWORD_ENTRY 1163 #define IDC_SHOW_PLATFORMINFO 1164 #define IDC_EDIT_DCSPROP 1165 +#define IDT_ADVANCED_OPTIONS 1166 #define IDM_HELP 40001 #define IDM_ABOUT 40002 #define IDM_UNMOUNT_VOLUME 40003 @@ -262,7 +263,7 @@ #define _APS_NO_MFC 1 #define _APS_NEXT_RESOURCE_VALUE 120 #define _APS_NEXT_COMMAND_VALUE 40069 -#define _APS_NEXT_CONTROL_VALUE 1166 +#define _APS_NEXT_CONTROL_VALUE 1167 #define _APS_NEXT_SYMED_VALUE 101 #endif #endif -- cgit v1.2.3