1
0
mirror of https://github.com/veracrypt/VeraCrypt.git synced 2025-11-11 11:08:02 -06:00

Revert "New sys enc wizard (#957)"

This reverts commit c0ff7a7c52.
This commit is contained in:
Mounir IDRASSI
2022-12-11 13:01:14 +01:00
parent c0ff7a7c52
commit 44c9c077f3
14 changed files with 290 additions and 1001431 deletions

View File

@@ -85,13 +85,13 @@ CAPTION "VeraCrypt Volume Creation Wizard"
CLASS "VeraCryptCustomDlg"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
PUSHBUTTON "&Documentation",IDHELP,166,234,60,14
PUSHBUTTON "",IDC_PREV,243,234,60,14
DEFPUSHBUTTON "",IDC_NEXT,305,234,60,14
PUSHBUTTON "&Help",IDHELP,166,234,60,14
PUSHBUTTON "",IDC_PREV,238,234,60,14
DEFPUSHBUTTON "",IDC_NEXT,310,234,60,14
PUSHBUTTON "Cancel",IDCANCEL,382,234,60,14
LTEXT "",IDC_BOX_TITLE,160,10,283,17
GROUPBOX "",IDC_STATIC,4,0,440,230
CONTROL 116,IDC_BITMAP_WIZARD,"Static",SS_BITMAP | SS_SUNKEN,10,18,137,200
LTEXT "",IDC_BOX_TITLE,160,8,283,17
GROUPBOX "",IDC_STATIC,4,0,439,230
CONTROL 116,IDC_BITMAP_WIZARD,"Static",SS_BITMAP | SS_SUNKEN,10,9,137,193
LTEXT "",IDC_POS_BOX,160,24,281,193
END
@@ -114,21 +114,15 @@ IDD_PASSWORD_PAGE_DLG DIALOGEX 0, 0, 276, 193
STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
EDITTEXT IDC_PASSWORD,69,3,202,14,ES_PASSWORD | ES_AUTOHSCROLL
EDITTEXT IDC_VERIFY,69,20,202,14,ES_PASSWORD | ES_AUTOHSCROLL
LTEXT "Password strength: ", IDT_PASSWORD_STRENGTH, 71, 54, 70, 10
LTEXT "", PASSWORD_METER, 140, 55, 50, 20
CONTROL "&Display password",IDC_SHOW_PASSWORD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,71,41,108,11,WS_EX_TRANSPARENT
RTEXT "Password:", IDT_PASSWORD, 1, 6, 40, 8
RTEXT "&Confirm:", IDT_CONFIRM, 1, 23, 40, 8
LTEXT "", IDC_BOX_HELP, 1, 95, 270, 120
PUSHBUTTON "Advanced features", IDC_ADVANCE, 203, 156, 68, 14, NOT WS_VISIBLE
CONTROL "",IDC_SYS_POOL_CONTENTS,"Static",SS_LEFTNOWORDWRAP | WS_GROUP | NOT WS_VISIBLE,33,17,209,63,WS_EX_TRANSPARENT
CONTROL "", IDC_ENTROPY_BAR, "msctls_progress32", WS_BORDER | NOT WS_VISIBLE, 11, 140, 202, 6
CONTROL "U&se keyfiles",IDC_KEYFILES_ENABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,71,64,103,10
PUSHBUTTON "&Keyfiles...",IDC_KEY_FILES,192,65,71,14,WS_DISABLED
CONTROL "Use P&IM",IDC_PIM_ENABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,71,76,114,10
EDITTEXT IDC_PASSWORD,71,3,202,14,ES_PASSWORD | ES_AUTOHSCROLL
EDITTEXT IDC_VERIFY,71,19,202,14,ES_PASSWORD | ES_AUTOHSCROLL
CONTROL "U&se keyfiles",IDC_KEYFILES_ENABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,71,35,103,10
PUSHBUTTON "&Keyfiles...",IDC_KEY_FILES,182,36,91,14,WS_DISABLED
CONTROL "&Display password",IDC_SHOW_PASSWORD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,71,45,108,11,WS_EX_TRANSPARENT
CONTROL "Use P&IM",IDC_PIM_ENABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,71,56,114,10
RTEXT "Password:",IDT_PASSWORD,1,6,68,8
RTEXT "&Confirm:",IDT_CONFIRM,1,23,68,8
LTEXT "",IDC_BOX_HELP,0,71,273,121
END
IDD_SIZE_PAGE_DLG DIALOGEX 0, 0, 276, 193
@@ -208,8 +202,7 @@ IDD_INFO_PAGE_DLG DIALOGEX 0, 0, 276, 193
STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
LTEXT "",IDC_BOX_HELP,0,15,267,155
CONTROL "", IDC_CHECKBOX_PRETEST, "Button", BS_AUTOCHECKBOX | BS_MULTILINE | NOT WS_VISIBLE, 0, 150, 267, 50
LTEXT "",IDC_BOX_HELP,0,31,269,155
END
IDD_HIDVOL_HOST_FILL_PAGE_DLG DIALOGEX 0, 0, 276, 193
@@ -274,12 +267,11 @@ IDD_SYSENC_RESCUE_DISK_CREATION_DLG DIALOGEX 0, 0, 276, 193
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, 159, 180, 13, ES_AUTOHSCROLL
PUSHBUTTON "Bro&wse...",IDC_BROWSE,185,159,70,14
LTEXT "",IDT_RESCUE_DISK_INFO,0,1,266,137
LTEXT "",IDT_RESCUE_DISK_INFO_2,0,135,266,20
EDITTEXT IDC_RESCUE_DISK_ISO_PATH,0,180,201,13,ES_AUTOHSCROLL
PUSHBUTTON "Bro&wse...",IDC_BROWSE,204,179,70,14
LTEXT "",IDT_RESCUE_DISK_INFO,0,1,273,137
CONTROL "Skip Rescue Disk verification",IDC_SKIP_RESCUE_VERIFICATION,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,0,178,273,10
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,0,166,273,10
END
IDD_SYSENC_COLLECTING_RANDOM_DATA_DLG DIALOGEX 0, 0, 276, 193
@@ -308,46 +300,37 @@ IDD_SYSENC_RESCUE_DISK_BURN_PAGE_DLG DIALOGEX 0, 0, 276, 193
STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
LTEXT "",IDT_RESCUE_DISK_BURN_INFO,0,15,275,170
LTEXT "Download CD/DVD recording software",IDC_DOWNLOAD_CD_BURN_SOFTWARE,0,159,273,10,SS_NOTIFY
LTEXT "",IDT_RESCUE_DISK_BURN_INFO,0,4,273,148
END
IDD_SYSENC_WIPE_MODE_PAGE_DLG DIALOGEX 0, 0, 276, 193
STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
CONTROL "A", IDC_CHECKLIST_A, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 0, 13, 10, 10
CONTROL "B", IDC_CHECKLIST_B, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 0, 60, 10, 10
CONTROL "C", IDC_CHECKLIST_C, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 0, 135, 10, 10
LTEXT " I remember my Password", IDC_REMEMBER_PASSWORD, 11, 13, 212, 10
LTEXT " I securely stored the Rescue Disk", IDC_STORE_RESCUE_DISK, 11, 60, 217, 10
LTEXT " I considered doing a backup of my personal Data", IDC_BACKUP_DATA, 11, 135, 226, 10
LTEXT "", IDT_REMEMBER_PASSWORD, 16, 26, 205, 32
LTEXT "", IDT_STORE_RESCUE_DISK, 16, 73, 205, 60
PUSHBUTTON "",IDC_BROWSE,16,109,60,14
LTEXT "", IDT_BACKUP_DATA, 16, 146, 205, 72
COMBOBOX IDC_WIPE_MODE,88,0,138,90,CBS_DROPDOWNLIST | WS_TABSTOP
RTEXT "Wipe mode:", IDT_WIPE_MODE,0,2,83,8,0,WS_EX_RIGHT
LTEXT "", IDT_WIPE_MODE_INFO,0,19,269,167
COMBOBOX IDC_WIPE_MODE,88,0,138,90,CBS_DROPDOWNLIST | WS_TABSTOP
RTEXT "Wipe mode:",IDT_WIPE_MODE,0,2,83,8,0,WS_EX_RIGHT
LTEXT "",IDT_WIPE_MODE_INFO,0,19,269,167
END
IDD_INPLACE_ENCRYPTION_PAGE_DLG DIALOGEX 0, 0, 276, 193
STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
COMBOBOX IDC_WIPE_MODE,96,60,125,90,CBS_DROPDOWNLIST | WS_TABSTOP
PUSHBUTTON "&Pause",IDC_PAUSE,204,8,63,14
LTEXT "More information",IDC_MORE_INFO_SYS_ENCRYPTION,1,176,266,10,SS_NOTIFY | NOT WS_VISIBLE
LTEXT "",IDC_BYTESWRITTEN,29,26,39,11,SS_CENTERIMAGE,WS_EX_TRANSPARENT | WS_EX_RIGHT | WS_EX_STATICEDGE
RTEXT "",IDC_WRITESPEED,110,26,56,11,SS_CENTERIMAGE,WS_EX_TRANSPARENT | WS_EX_RIGHT | WS_EX_STATICEDGE
RTEXT "",IDC_TIMEREMAIN,212,26,54,11,SS_CENTERIMAGE,WS_EX_TRANSPARENT | WS_EX_RIGHT | WS_EX_STATICEDGE
RTEXT "Wipe mode:",IDT_WIPE_MODE,6,62,85,8,0,WS_EX_RIGHT
CONTROL "",IDC_PROGRESS_BAR,"msctls_progress32",PBS_SMOOTH | WS_BORDER,6,9,192,12
RTEXT "Done",IDT_DONE,5,27,22,8
RTEXT "Status",IDT_STATUS,73,27,33,8
RTEXT "Left",IDT_LEFT,172,27,35,8
LTEXT "",IDC_BOX_HELP,1,100,266,90
GROUPBOX "",IDC_STATIC,0,3,268,41
GROUPBOX "Options",IDT_FORMAT_OPTIONS,0,50,268,29
COMBOBOX IDC_WIPE_MODE,96,13,125,90,CBS_DROPDOWNLIST | WS_TABSTOP
PUSHBUTTON "&Pause",IDC_PAUSE,204,40,63,14
LTEXT "More information",IDC_MORE_INFO_SYS_ENCRYPTION,1,176,266,10,SS_NOTIFY
LTEXT "",IDC_BYTESWRITTEN,29,58,39,11,SS_CENTERIMAGE,WS_EX_TRANSPARENT | WS_EX_RIGHT | WS_EX_STATICEDGE
RTEXT "",IDC_WRITESPEED,110,58,56,11,SS_CENTERIMAGE,WS_EX_TRANSPARENT | WS_EX_RIGHT | WS_EX_STATICEDGE
RTEXT "",IDC_TIMEREMAIN,212,58,54,11,SS_CENTERIMAGE,WS_EX_TRANSPARENT | WS_EX_RIGHT | WS_EX_STATICEDGE
RTEXT "Wipe mode:",IDT_WIPE_MODE,6,15,85,8,0,WS_EX_RIGHT
CONTROL "",IDC_PROGRESS_BAR,"msctls_progress32",PBS_SMOOTH | WS_BORDER,6,41,192,12
RTEXT "Done",IDT_DONE,5,59,22,8
RTEXT "Status",IDT_STATUS,73,59,33,8
RTEXT "Left",IDT_LEFT,172,59,35,8
LTEXT "",IDC_BOX_HELP,1,77,266,95
GROUPBOX "Options",IDT_FORMAT_OPTIONS,0,3,267,29
GROUPBOX "",IDC_STATIC,0,32,267,41
END
IDD_SYSENC_KEYS_GEN_PAGE_DLG DIALOGEX 0, 0, 276, 193
@@ -386,29 +369,13 @@ IDD_SYSENC_TYPE_PAGE_DLG DIALOGEX 0, 0, 276, 193
STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
LTEXT "", IDC_BOX_HELP, 5, 20, 250, 16
LTEXT "", IDT_SYSENC_INFO_2, 5, 50, 250, 60
PUSHBUTTON "Advanced features", IDC_ADVANCE_INTRO, 190, 160, 68, 14
CONTROL "", IDC_INFORMATION_TIP, "Static", SS_ICON | SS_NOTIFY, 262,163,10,5
CONTROL "Normal",IDC_SYSENC_NORMAL,"Button",BS_AUTORADIOBUTTON,0,7,269,10
CONTROL "Hi&dden",IDC_SYSENC_HIDDEN,"Button",BS_AUTORADIOBUTTON,0,64,269,10
LTEXT "More information",IDC_HIDDEN_SYSENC_INFO_LINK,16,173,253,10,SS_NOTIFY
LTEXT "",IDC_BOX_HELP_SYSENC_NORMAL,16,20,253,41
LTEXT "",IDC_BOX_HELP,16,78,253,90
END
IDD_ADVANCE_MBR DIALOGEX 102, -10, 245, 233
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Advanced Options"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
CONTROL " Normal",IDC_SYSENC_NORMAL,"Button", BS_AUTOCHECKBOX, 10,40,200,10
CONTROL " Hi&dden",IDC_SYSENC_HIDDEN,"Button", BS_AUTOCHECKBOX, 10,99,200,10
LTEXT "Select this option if you merely want to encrypt the system partition or the entire system drive.",-1,26,57,200,30
LTEXT "If you select this option, you will create a hidden operating system whose existence should be impossible to prove (provided that certain guidelines are followed). Thus, you will not have to decrypt or reveal the password to the hidden operating system.",-1,26,116,200,50
LTEXT "For a detailed explanation, please click the Help button. ",-1,26,180,200,10
LTEXT "IMPORTANT: Only advanced users should make modifications on this page.", -1, 10, 12, 217, 19,
GROUPBOX "", -1, 6, 30, 232, 178
DEFPUSHBUTTON "OK", IDOK, 129, 213, 50, 14
PUSHBUTTON "Cancel", IDCANCEL, 180, 213, 50, 14
PUSHBUTTON "&Help",IDHELP,15,213,50,14
END
IDD_SYSENC_HIDDEN_OS_REQ_CHECK_PAGE_DLG DIALOGEX 0, 0, 276, 193
STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD
FONT 8, "MS Shell Dlg", 0, 0, 0x0
@@ -486,30 +453,6 @@ BEGIN
CONTROL "Display PIM",IDC_SHOW_PIM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,74,17,196,10
END
IDD_ADVANCE DIALOGEX 75, -62, 245, 362
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Advanced Algorithm Options"
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
DEFPUSHBUTTON "OK", IDOK, 129, 345, 50, 14
PUSHBUTTON "Cancel", IDCANCEL, 180, 345, 50, 14
COMBOBOX IDC_COMBO_BOX_HASH_ALGO, 21, 47, 137, 130, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
LTEXT "", IDC_SHA512_HELP, 21, 65, 205, 40
COMBOBOX IDC_COMBO_BOX, 21, 113, 137, 126, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
LTEXT "", IDC_BOX_HELP, 21, 131, 205, 40
PUSHBUTTON "&Verify", IDC_CIPHER_TEST, 40, 181, 59, 14
PUSHBUTTON "&Benchmark", IDC_BENCHMARK, 140, 181, 59, 14, BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE
GROUPBOX "Encryption Algorithm", IDT_ENCRYPTION_ALGO, 14, 100, 217, 60
GROUPBOX "Hash Algorithm", IDT_HASH_ALGO, 14, 35, 217, 60
GROUPBOX "Test Algorithms", IDT_TEST_ALGO, 14, 168, 217, 35
GROUPBOX "PIM", -1, 14, 206, 217, 59
CONTROL "Modify P&IM", IDC_PIM_ENABLE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 19, 217, 97, 10
LTEXT "", IDT_PIM_INFO, 21, 231, 203, 25
GROUPBOX "Wipe Mode", IDT_WIPE_MODE, 14, 270, 217, 71
COMBOBOX IDC_WIPE_MODE, 21, 284, 127, 90, CBS_DROPDOWNLIST | WS_TABSTOP
LTEXT "", IDT_WIPE_INFO, 21, 303, 200, 32
LTEXT "", IDT_IMPORTANT_NOTE, 18, 10, 217, 19
END
#ifdef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
@@ -680,22 +623,6 @@ BEGIN
HORZGUIDE, 96
END
IDD_ADVANCE, DIALOG
BEGIN
LEFTMARGIN, 7
RIGHTMARGIN, 238
TOPMARGIN, 7
BOTTOMMARGIN, 242
END
IDD_ADVANCE_MBR, DIALOG
BEGIN
LEFTMARGIN, 7
RIGHTMARGIN, 238
TOPMARGIN, 7
BOTTOMMARGIN, 242
END
IDD_SYSENC_KEYS_GEN_PAGE_DLG, DIALOG
BEGIN
RIGHTMARGIN, 267
@@ -814,3 +741,4 @@ END
/////////////////////////////////////////////////////////////////////////////
#endif // not APSTUDIO_INVOKED

View File

@@ -118,6 +118,7 @@
#define IDT_SINGLE_BOOT 1079
#define IDC_SYS_POOL_CONTENTS 1080
#define IDT_PARTIAL_POOL_CONTENTS 1081
#define IDC_DOWNLOAD_CD_BURN_SOFTWARE 1082
#define IDT_RESCUE_DISK_BURN_INFO 1083
#define IDT_WIPE_MODE_INFO 1084
#define IDC_WIPE_MODE 1085
@@ -145,30 +146,6 @@
#define IDC_TB 1107
#define IDC_SKIP_RESCUE_VERIFICATION 1108
#define SPARSE_FILE 1109
#define IDC_ADVANCE_INTRO 1110
#define IDD_ADVANCE 1111
#define IDC_ADVANCE 1112
#define PASSWORD_METER 1113
#define IDC_REMEMBER_PASSWORD 1114
#define IDC_STORE_RESCUE_DISK 1115
#define IDC_BACKUP_DATA 1116
#define IDT_REMEMBER_PASSWORD 1117
#define IDT_STORE_RESCUE_DISK 1118
#define IDT_BACKUP_DATA 1119
#define IDC_CHECKLIST_A 1120
#define IDC_CHECKLIST_B 1121
#define IDC_CHECKLIST_C 1122
#define IDD_ADVANCE_MBR 1123
#define IDC_INFORMATION_TIP 1124
#define IDC_SHA512_HELP 1125
#define IDT_PASSWORD_STRENGTH 1126
#define IDT_RESCUE_DISK_INFO_2 1127
#define IDT_SYSENC_INFO_2 1128
#define IDT_IMPORTANT_NOTE 1129
#define IDT_PIM_INFO 1130
#define IDT_WIPE_INFO 1131
#define IDT_TEST_ALGO 1132
#define IDC_CHECKBOX_PRETEST 1133
// Next default values for new objects
//

File diff suppressed because it is too large Load Diff

View File

@@ -104,14 +104,6 @@ extern wchar_t HeaderKeyGUIView [KEY_GUI_VIEW_SIZE];
extern wchar_t MasterKeyGUIView [KEY_GUI_VIEW_SIZE];
extern volatile int NonSysInplaceEncStatus;
BOOL CALLBACK AdvanceDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam);
BOOL CALLBACK FinishDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam);
void AddComboPairW (HWND hComboBox, const wchar_t *lpszItem, int value);
int PrintStrongness (char* input, unsigned int length);
BOOL CheckWord (char search[]);
BOOL CALLBACK AdvanceDlgProcIntro (HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam);
void CreateToolTip (HWND hWndParent, HWND hControlItem, PTSTR pszText);
#ifdef __cplusplus
}
#endif