From c27461572ca09705c16f26a1e9128ff3a4ebdda0 Mon Sep 17 00:00:00 2001 From: Mounir IDRASSI Date: Tue, 16 Dec 2014 00:14:42 +0100 Subject: Windows: Enhance performance by implementing the possibility to choose the correct hash algorithm of volumes during various operations (mount, change password...). In case of system encryption, slightly speedup Windows startup time by making the driver pickup the correct hash algorithm used for the encryption. --- src/Mount/Mount.rc | 63 +++++++++++++++++++++++++++++------------------------- 1 file changed, 34 insertions(+), 29 deletions(-) (limited to 'src/Mount/Mount.rc') diff --git a/src/Mount/Mount.rc b/src/Mount/Mount.rc index 56597cd2..8851646e 100644 --- a/src/Mount/Mount.rc +++ b/src/Mount/Mount.rc @@ -103,32 +103,34 @@ BEGIN CONTROL "",IDC_VOLUME_PROPERTIES_LIST,"SysListView32",LVS_REPORT | LVS_ALIGNLEFT | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,7,6,269,154 END -IDD_PASSWORDCHANGE_DLG DIALOGEX 0, 0, 316, 183 +IDD_PASSWORDCHANGE_DLG DIALOGEX 0, 0, 316, 207 STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Change Password or Keyfiles" CLASS "CustomDlg" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN EDITTEXT IDC_OLD_PASSWORD,89,14,147,13,ES_PASSWORD | ES_AUTOHSCROLL - CONTROL "Use keyfiles",IDC_ENABLE_KEYFILES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,89,34,86,10 - PUSHBUTTON "Keyfiles...",IDC_KEYFILES,177,32,59,14 - CONTROL "Display password",IDC_SHOW_PASSWORD_CHPWD_ORI,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,89,46,138,10,WS_EX_TRANSPARENT - EDITTEXT IDC_PASSWORD,89,74,147,13,ES_PASSWORD | ES_AUTOHSCROLL - EDITTEXT IDC_VERIFY,89,90,147,13,ES_PASSWORD | ES_AUTOHSCROLL - CONTROL "Use keyfiles",IDC_ENABLE_NEW_KEYFILES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,89,109,86,11 - PUSHBUTTON "Keyfiles...",IDC_NEW_KEYFILES,177,107,59,14 - CONTROL "Display password",IDC_SHOW_PASSWORD_CHPWD_NEW,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,89,121,139,11,WS_EX_TRANSPARENT - COMBOBOX IDC_PKCS5_PRF_ID,89,136,91,90,CBS_DROPDOWNLIST | WS_TABSTOP + CONTROL "Use keyfiles",IDC_ENABLE_KEYFILES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,89,53,86,10 + PUSHBUTTON "Keyfiles...",IDC_KEYFILES,177,51,59,14 + CONTROL "Display password",IDC_SHOW_PASSWORD_CHPWD_ORI,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,89,65,138,10,WS_EX_TRANSPARENT + EDITTEXT IDC_PASSWORD,89,99,147,13,ES_PASSWORD | ES_AUTOHSCROLL + EDITTEXT IDC_VERIFY,89,115,147,13,ES_PASSWORD | ES_AUTOHSCROLL + CONTROL "Use keyfiles",IDC_ENABLE_NEW_KEYFILES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,89,134,86,11 + PUSHBUTTON "Keyfiles...",IDC_NEW_KEYFILES,177,132,59,14 + CONTROL "Display password",IDC_SHOW_PASSWORD_CHPWD_NEW,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,89,146,139,11,WS_EX_TRANSPARENT + COMBOBOX IDC_PKCS5_PRF_ID,89,161,91,90,CBS_DROPDOWNLIST | WS_TABSTOP DEFPUSHBUTTON "OK",IDOK,251,7,59,14 PUSHBUTTON "Cancel",IDCANCEL,251,24,59,14 RTEXT "Password:",IDT_PASSWORD,12,16,72,8 - RTEXT "Password:",IDT_NEW_PASSWORD,8,77,76,8 - RTEXT "Confirm Password:",IDT_CONFIRM_PASSWORD,9,93,75,16 - RTEXT "PKCS-5 PRF:",IDT_PKCS5_PRF,9,137,74,10,SS_CENTERIMAGE - GROUPBOX "Current",IDT_CURRENT,6,3,238,58 - GROUPBOX "New",IDT_NEW,6,63,238,113 - COMBOBOX IDC_WIPE_MODE,89,155,125,90,CBS_DROPDOWNLIST | WS_TABSTOP - RTEXT "Wipe mode:",IDT_WIPE_MODE,9,157,74,8,0,WS_EX_RIGHT + RTEXT "Password:",IDT_NEW_PASSWORD,8,102,76,8 + RTEXT "Confirm Password:",IDT_CONFIRM_PASSWORD,9,118,75,16 + RTEXT "PKCS-5 PRF:",IDT_NEW_PKCS5_PRF,9,162,74,10,SS_CENTERIMAGE + GROUPBOX "Current",IDT_CURRENT,6,3,238,77 + GROUPBOX "New",IDT_NEW,6,87,238,113 + COMBOBOX IDC_WIPE_MODE,89,180,125,90,CBS_DROPDOWNLIST | WS_TABSTOP + RTEXT "Wipe mode:",IDT_WIPE_MODE,9,182,74,8,0,WS_EX_RIGHT + COMBOBOX IDC_PKCS5_OLD_PRF_ID,89,33,91,90,CBS_DROPDOWNLIST | WS_TABSTOP + RTEXT "PKCS-5 PRF:",IDT_PKCS5_PRF,12,34,74,10,SS_CENTERIMAGE END IDD_MOUNT_DLG DIALOGEX 0, 0, 375, 271 @@ -161,21 +163,23 @@ BEGIN CONTROL "",IDC_STATIC,"Static",SS_ETCHEDFRAME,2,151,372,119 END -IDD_PASSWORD_DLG DIALOGEX 0, 0, 280, 68 +IDD_PASSWORD_DLG DIALOGEX 0, 0, 305, 91 STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION CAPTION "Enter VeraCrypt Volume Password" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - EDITTEXT IDC_PASSWORD,48,8,153,14,ES_PASSWORD | ES_AUTOHSCROLL + EDITTEXT IDC_PASSWORD,69,8,153,14,ES_PASSWORD | ES_AUTOHSCROLL CONTROL "Cache passwords and keyfil&es in memory",IDC_CACHE, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,52,27,153,10 - CONTROL "&Display password",IDC_SHOW_PASSWORD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,52,40,83,10 - CONTROL "U&se keyfiles",IDC_KEYFILES_ENABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,52,52,83,11 - PUSHBUTTON "&Keyfiles...",IDC_KEY_FILES,137,49,64,14 - PUSHBUTTON "Mount Opti&ons...",IDC_MOUNT_OPTIONS,208,49,64,14 - DEFPUSHBUTTON "OK",IDOK,208,8,64,14 - PUSHBUTTON "Cancel",IDCANCEL,208,25,64,14 - RTEXT "Password:",IDT_PASSWORD,0,10,46,19 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,70,50,153,10 + CONTROL "&Display password",IDC_SHOW_PASSWORD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,70,63,83,10 + CONTROL "U&se keyfiles",IDC_KEYFILES_ENABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,70,75,83,11 + PUSHBUTTON "&Keyfiles...",IDC_KEY_FILES,158,72,64,14 + PUSHBUTTON "Mount Opti&ons...",IDC_MOUNT_OPTIONS,229,72,64,14 + DEFPUSHBUTTON "OK",IDOK,229,8,64,14 + PUSHBUTTON "Cancel",IDCANCEL,229,25,64,14 + RTEXT "Password:",IDT_PASSWORD,0,10,65,13 + COMBOBOX IDC_PKCS5_PRF_ID,69,26,91,90,CBS_DROPDOWNLIST | WS_TABSTOP + RTEXT "PKCS-5 PRF:",IDT_PKCS5_PRF,0,27,65,13 END IDD_TRAVELER_DLG DIALOGEX 0, 0, 300, 269 @@ -355,7 +359,7 @@ BEGIN LEFTMARGIN, 7 RIGHTMARGIN, 309 TOPMARGIN, 7 - BOTTOMMARGIN, 176 + BOTTOMMARGIN, 200 END IDD_MOUNT_DLG, DIALOG @@ -366,7 +370,8 @@ BEGIN IDD_PASSWORD_DLG, DIALOG BEGIN - BOTTOMMARGIN, 63 + RIGHTMARGIN, 296 + BOTTOMMARGIN, 86 END IDD_TRAVELER_DLG, DIALOG -- cgit v1.2.3