From fede2cfa18b5cd8bb40f01a5fb53f1effb4c80a0 Mon Sep 17 00:00:00 2001
From: Mounir IDRASSI <mounir.idrassi@idrix.fr>
Date: Thu, 5 May 2016 11:25:28 +0200
Subject: Windows: Add checkbox in "VeraCrypt Format" to skip Rescue Disk
 verification during system encryption wizard

---
 src/Common/Language.xml |   1 +
 src/Format/Format.rc    |   8 +++++---
 src/Format/Resource.h   |   3 ++-
 src/Format/Tcformat.c   | Bin 643202 -> 643534 bytes
 4 files changed, 8 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/Common/Language.xml b/src/Common/Language.xml
index 8f83b864..b64e8568 100644
--- a/src/Common/Language.xml
+++ b/src/Common/Language.xml
@@ -1397,6 +1397,7 @@
     <control lang="en" key="IDC_DISABLE_BOOT_LOADER_PIM_PROMPT">Do not request PIM in the pre-boot authentication screen (PIM value is stored unencrypted on disk)</control>
     <string lang="en" key="DISABLE_BOOT_LOADER_PIM_PROMPT">WARNING: Please keep in mind that if you enable this option, the PIM value will be stored unencrypted on the disk.\n\nAre you sure you want to enable this option?</string>
     <string lang="en" key="PIM_TOO_BIG">Personal Iterations Multiplier (PIM) maximum value is 2147468.</string>
+    <control lang="en" key="IDC_SKIP_RESCUE_VERIFICATION">Skip Rescue Disk verification</control>
   </localization>
   <!-- XML Schema -->
   <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
diff --git a/src/Format/Format.rc b/src/Format/Format.rc
index 32da02eb..9e13a29b 100644
--- a/src/Format/Format.rc
+++ b/src/Format/Format.rc
@@ -266,9 +266,11 @@ IDD_SYSENC_RESCUE_DISK_CREATION_DLG DIALOGEX 0, 0, 226, 172
 STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    EDITTEXT        IDC_RESCUE_DISK_ISO_PATH,0,152,163,13,ES_AUTOHSCROLL
-    PUSHBUTTON      "Bro&wse...",IDC_BROWSE,166,151,59,14
-    LTEXT           "",IDT_RESCUE_DISK_INFO,0,1,225,145
+    EDITTEXT        IDC_RESCUE_DISK_ISO_PATH,0,159,163,13,ES_AUTOHSCROLL
+    PUSHBUTTON      "Bro&wse...",IDC_BROWSE,166,158,59,14
+    LTEXT           "",IDT_RESCUE_DISK_INFO,0,1,225,137
+    CONTROL         "Skip Rescue Disk verification",IDC_SKIP_RESCUE_VERIFICATION,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,0,145,106,10
 END
 
 IDD_SYSENC_COLLECTING_RANDOM_DATA_DLG DIALOGEX 0, 0, 226, 172
diff --git a/src/Format/Resource.h b/src/Format/Resource.h
index d41c8f5e..6f0fdb1b 100644
--- a/src/Format/Resource.h
+++ b/src/Format/Resource.h
@@ -144,6 +144,7 @@
 #define IDC_LINK_PIM_INFO               1105
 #define IDC_SHOW_PIM                    1106
 #define IDC_TB                          1107
+#define IDC_SKIP_RESCUE_VERIFICATION    1108
 
 // Next default values for new objects
 // 
@@ -152,7 +153,7 @@
 #define _APS_NO_MFC                     1
 #define _APS_NEXT_RESOURCE_VALUE        134
 #define _APS_NEXT_COMMAND_VALUE         40001
-#define _APS_NEXT_CONTROL_VALUE         1108
+#define _APS_NEXT_CONTROL_VALUE         1109
 #define _APS_NEXT_SYMED_VALUE           101
 #endif
 #endif
diff --git a/src/Format/Tcformat.c b/src/Format/Tcformat.c
index c49bc94b..0af4e001 100644
Binary files a/src/Format/Tcformat.c and b/src/Format/Tcformat.c differ
-- 
cgit v1.2.3