diff options
Diffstat (limited to 'src/Format')
-rw-r--r-- | src/Format/Format.rc | 164 | ||||
-rw-r--r-- | src/Format/Resource.h | 25 | ||||
-rw-r--r-- | src/Format/Tcformat.c | 1237 | ||||
-rw-r--r-- | src/Format/Tcformat.h | 8 |
4 files changed, 243 insertions, 1191 deletions
diff --git a/src/Format/Format.rc b/src/Format/Format.rc index 8a14f413..d4a9a5f5 100644 --- a/src/Format/Format.rc +++ b/src/Format/Format.rc @@ -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 -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 + 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_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 + diff --git a/src/Format/Resource.h b/src/Format/Resource.h index d031a7dd..c37a6f4a 100644 --- a/src/Format/Resource.h +++ b/src/Format/Resource.h @@ -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 // diff --git a/src/Format/Tcformat.c b/src/Format/Tcformat.c index db0a8209..efd95caf 100644 --- a/src/Format/Tcformat.c +++ b/src/Format/Tcformat.c @@ -13,10 +13,6 @@ #include "Tcdefs.h" -#include <iostream> -#include <fstream> -#include <set> -#include <iterator> #include <stdlib.h> #include <limits.h> #include <time.h> @@ -24,7 +20,6 @@ #include <io.h> #include <sys/stat.h> #include <shlobj.h> -#include <commctrl.h> #include "Crypto.h" #include "cpu.h" @@ -133,15 +128,6 @@ enum sys_encryption_cmd_line_switches SYSENC_COMMAND_CREATE_HIDDEN_OS_ELEV }; -enum password_status -{ - very_weak = 0, - weak, - medium, - strong, - very_strong -}; - typedef struct { int NumberOfSysDrives; // Number of drives that contain an operating system. -1: unknown, 1: one, 2: two or more @@ -174,14 +160,7 @@ BOOL DirectNonSysInplaceDecResumeMode = FALSE; BOOL DirectPromptNonSysInplaceEncResumeMode = FALSE; BOOL DirectCreationMode = FALSE; -int iIconX=0; -int iIconY=0; -HWND hDlgItemTooltip = NULL; -HANDLE hIconTooltip = NULL; -char tempPassword[MAX_PASSWORD + 1]; -int iPasswordStrength; - -volatile BOOL bInPlaceEncNonSys = TRUE; /* If TRUE, existing data on a non-system partition/volume are to be encrypted (or decrypted if bInPlaceDecNonSys is TRUE) in place (for system encryption, this flag is ignored) */ +volatile BOOL bInPlaceEncNonSys = FALSE; /* If TRUE, existing data on a non-system partition/volume are to be encrypted (or decrypted if bInPlaceDecNonSys is TRUE) in place (for system encryption, this flag is ignored) */ volatile BOOL bInPlaceDecNonSys = FALSE; /* If TRUE, existing data on a non-system partition/volume are to be decrypted in place (for system encryption, this flag is ignored) */ volatile BOOL bInPlaceEncNonSysResumed = FALSE; /* If TRUE, the wizard is supposed to resume (or has resumed) process of non-system in-place encryption/decryption. */ volatile BOOL bFirstNonSysInPlaceEncResumeDone = FALSE; @@ -257,7 +236,6 @@ Password volumePassword; /* User password */ Password outerVolumePassword; /* Outer volume user password */ char szVerify[MAX_PASSWORD + 1]; /* Tmp password buffer */ char szRawPassword[MAX_PASSWORD + 1]; /* Password before keyfile was applied to it */ -BOOL bNextButtonClicked = FALSE; int volumePim = 0; int outerVolumePim = 0; @@ -323,11 +301,6 @@ BOOL bIsSparseFilesSupportedByHost = FALSE; vector <HostDevice> DeferredNonSysInPlaceEncDevices; -BOOL bChecklistA; -BOOL bChecklistB; -BOOL bChecklistC; -BOOL bCheckboxPretest; - int iMaxPasswordLength = MAX_PASSWORD; // specific definitions and implementation for support of resume operation @@ -1446,11 +1419,89 @@ void ComboSelChangeEA (HWND hwndDlg) else { wchar_t name[100]; + wchar_t auxLine[4096]; + wchar_t hyperLink[256] = { 0 }; + int cipherIDs[5]; + int i, cnt = 0; nIndex = (int) SendMessage (GetDlgItem (hwndDlg, IDC_COMBO_BOX), CB_GETITEMDATA, nIndex, 0); EAGetName (name, ARRAYSIZE(name),nIndex, 0); - SetWindowTextW (GetDlgItem (hwndDlg, IDC_BOX_HELP), GetString ("AES_HELP_NEW")); + if (wcscmp (name, L"AES") == 0) + { + StringCbPrintfW (hyperLink, sizeof(hyperLink) / 2, GetString ("MORE_INFO_ABOUT"), name); + + SetWindowTextW (GetDlgItem (hwndDlg, IDC_BOX_HELP), GetString ("AES_HELP")); + } + else if (wcscmp (name, L"Serpent") == 0) + { + StringCbPrintfW (hyperLink, sizeof(hyperLink) / 2, GetString ("MORE_INFO_ABOUT"), name); + + SetWindowTextW (GetDlgItem (hwndDlg, IDC_BOX_HELP), GetString ("SERPENT_HELP")); + } + else if (wcscmp (name, L"Twofish") == 0) + { + StringCbPrintfW (hyperLink, sizeof(hyperLink) / 2, GetString ("MORE_INFO_ABOUT"), name); + + SetWindowTextW (GetDlgItem (hwndDlg, IDC_BOX_HELP), GetString ("TWOFISH_HELP")); + } + else if (wcscmp (name, L"Kuznyechik") == 0) + { + StringCbPrintfW (hyperLink, sizeof(hyperLink) / 2, GetString ("MORE_INFO_ABOUT"), name); + + SetWindowTextW (GetDlgItem (hwndDlg, IDC_BOX_HELP), GetString ("KUZNYECHIK_HELP")); + } + else if (wcscmp (name, L"Camellia") == 0) + { + StringCbPrintfW (hyperLink, sizeof(hyperLink) / 2, GetString ("MORE_INFO_ABOUT"), name); + + SetWindowTextW (GetDlgItem (hwndDlg, IDC_BOX_HELP), GetString ("CAMELLIA_HELP")); + } + else if (EAGetCipherCount (nIndex) > 1) + { + // Cascade + cipherIDs[cnt++] = i = EAGetLastCipher(nIndex); + while (i = EAGetPreviousCipher(nIndex, i)) + { + cipherIDs[cnt] = i; + cnt++; + } + + switch (cnt) // Number of ciphers in the cascade + { + case 2: + StringCbPrintfW (auxLine, sizeof(auxLine), GetString ("TWO_LAYER_CASCADE_HELP"), + CipherGetName (cipherIDs[1]), + CipherGetKeySize (cipherIDs[1])*8, + CipherGetName (cipherIDs[0]), + CipherGetKeySize (cipherIDs[0])*8); + break; + + case 3: + StringCbPrintfW (auxLine, sizeof(auxLine), GetString ("THREE_LAYER_CASCADE_HELP"), + CipherGetName (cipherIDs[2]), + CipherGetKeySize (cipherIDs[2])*8, + CipherGetName (cipherIDs[1]), + CipherGetKeySize (cipherIDs[1])*8, + CipherGetName (cipherIDs[0]), + CipherGetKeySize (cipherIDs[0])*8); + break; + } + + StringCbCopyW (hyperLink, sizeof(hyperLink), GetString ("IDC_LINK_MORE_INFO_ABOUT_CIPHER")); + + SetWindowTextW (GetDlgItem (hwndDlg, IDC_BOX_HELP), auxLine); + } + else + { + // No info available for this encryption algorithm + SetWindowTextW (GetDlgItem (hwndDlg, IDC_BOX_HELP), L""); + } + + + // Update hyperlink + SetWindowTextW (GetDlgItem (hwndDlg, IDC_LINK_MORE_INFO_ABOUT_CIPHER), hyperLink); + AccommodateTextField (hwndDlg, IDC_LINK_MORE_INFO_ABOUT_CIPHER, FALSE, hUserUnderlineFont); } } @@ -3725,80 +3776,31 @@ BOOL CALLBACK PageDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa break; case SYSENC_TYPE_PAGE: - { bHiddenVolHost = bHiddenVol = bHiddenOS; - wchar_t finalMsg[8024] = {0}; + SetWindowTextW (GetDlgItem (GetParent (hwndDlg), IDC_BOX_TITLE), GetString ("SYSENC_TYPE_PAGE_TITLE")); - try - { - StringCbPrintfW (finalMsg, sizeof(finalMsg), - GetString ("SYSENC_TYPE_PAGE_TITLE"), - GetSystemDriveLetter ()); - } - catch (Exception &e) - { - e.Show (hwndDlg); - EndMainDlg (MainDlg); - return 0; - } + SendMessage (GetDlgItem (hwndDlg, IDC_SYSENC_HIDDEN), WM_SETFONT, (WPARAM) hUserBoldFont, (LPARAM) TRUE); + SendMessage (GetDlgItem (hwndDlg, IDC_SYSENC_NORMAL), WM_SETFONT, (WPARAM) hUserBoldFont, (LPARAM) TRUE); - SetWindowTextW (GetDlgItem (GetParent (hwndDlg), IDC_BOX_TITLE), finalMsg); + DisableIfGpt(GetDlgItem(hwndDlg, IDC_SYSENC_HIDDEN)); - memset (finalMsg, 0, sizeof (finalMsg)); - try - { - StringCbPrintfW (finalMsg, sizeof(finalMsg), - GetString ("SYSENC_INFO"), - GetSystemDriveLetter ()); - } - catch (Exception &e) - { - e.Show (hwndDlg); - EndMainDlg (MainDlg); - return 0; - } + CheckButton (GetDlgItem (hwndDlg, bHiddenOS ? IDC_SYSENC_HIDDEN : IDC_SYSENC_NORMAL)); - SetWindowTextW (GetDlgItem (hwndDlg, IDC_BOX_HELP), finalMsg); - SetWindowTextW (GetDlgItem (hwndDlg, IDT_SYSENC_INFO_2), GetString ("SYSENC_INFO_2")); - - if (bSystemIsGPT) - { - ShowWindow (GetDlgItem(hwndDlg, IDC_ADVANCE_INTRO), SW_HIDE); - ShowWindow (GetDlgItem(hwndDlg, IDC_INFORMATION_TIP), SW_HIDE); - } - else - { - EnableWindow (GetDlgItem(hwndDlg, IDC_ADVANCE_INTRO), TRUE); - iIconX = GetSystemMetrics (SM_CXSMICON); - iIconY = GetSystemMetrics (SM_CYSMICON); + SetWindowTextW (GetDlgItem (hwndDlg, IDC_BOX_HELP), GetString ("SYSENC_HIDDEN_TYPE_HELP")); + SetWindowTextW (GetDlgItem (hwndDlg, IDC_BOX_HELP_SYSENC_NORMAL), GetString ("SYSENC_NORMAL_TYPE_HELP")); + + ToHyperlink (hwndDlg, IDC_HIDDEN_SYSENC_INFO_LINK); - hIconTooltip = LoadImage (NULL, MAKEINTRESOURCE (104), IMAGE_ICON, iIconX, iIconY, LR_DEFAULTCOLOR); - SendDlgItemMessage (hwndDlg, IDC_INFORMATION_TIP, STM_SETICON, (WPARAM) hIconTooltip, 0); - - hDlgItemTooltip = GetDlgItem (hwndDlg, IDC_INFORMATION_TIP); - if (hDlgItemTooltip) - { - CreateToolTip (hwndDlg, hDlgItemTooltip, GetString ("ADV_FEATURES_INTRO_TOOLTIP")); - } - else - { - MessageBox (0, TEXT("Cannot find dialog item"), 0, 0); - } - } - EnableWindow (GetDlgItem (GetParent (hwndDlg), IDC_NEXT), TRUE); EnableWindow (GetDlgItem (GetParent (hwndDlg), IDC_PREV), !bDirectSysEncMode); SetWindowTextW (GetDlgItem (MainDlg, IDC_NEXT), GetString ("NEXT")); SetWindowTextW (GetDlgItem (MainDlg, IDC_PREV), GetString ("PREV")); SetWindowTextW (GetDlgItem (MainDlg, IDCANCEL), GetString ("CANCEL")); - - // Start loading the password dictonary into memory ("need" is just a random word for initializing the process) - CheckWord("need"); break; - } + case SYSENC_HIDDEN_OS_REQ_CHECK_PAGE: SetWindowTextW (GetDlgItem (GetParent (hwndDlg), IDC_BOX_TITLE), GetString ("SYSENC_HIDDEN_OS_REQ_CHECK_PAGE_TITLE")); @@ -3833,6 +3835,7 @@ BOOL CALLBACK PageDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa EnableWindow (GetDlgItem (GetParent (hwndDlg), IDC_PREV), TRUE); break; + case SYSENC_PRE_DRIVE_ANALYSIS_PAGE: Init2RadButtonPageYesNo (SysEncDetectHiddenSectors); @@ -4360,8 +4363,6 @@ BOOL CALLBACK PageDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa { wchar_t str[1000]; - EnableWindow(GetDlgItem(hwndDlg, IDC_VERIFY), FALSE); - hPasswordInputField = GetDlgItem (hwndDlg, IDC_PASSWORD); hVerifyPasswordInputField = GetDlgItem (hwndDlg, IDC_VERIFY); @@ -4373,41 +4374,28 @@ BOOL CALLBACK PageDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa ToBootPwdField (hwndDlg, IDC_PASSWORD); ToBootPwdField (hwndDlg, IDC_VERIFY); - StringCbPrintfW(OrigKeyboardLayout, sizeof(OrigKeyboardLayout), L"%08X", (DWORD)GetKeyboardLayout(NULL) & 0xFFFF); + StringCbPrintfW (OrigKeyboardLayout, sizeof(OrigKeyboardLayout), L"%08X", (DWORD) GetKeyboardLayout (NULL) & 0xFFFF); - if ((DWORD)GetKeyboardLayout(NULL) != 0x00000409 && (DWORD)GetKeyboardLayout(NULL) != 0x04090409) + if ((DWORD) GetKeyboardLayout (NULL) != 0x00000409 && (DWORD) GetKeyboardLayout (NULL) != 0x04090409) { - DWORD keybLayout = (DWORD)LoadKeyboardLayout(L"00000409", KLF_ACTIVATE); + DWORD keybLayout = (DWORD) LoadKeyboardLayout (L"00000409", KLF_ACTIVATE); if (keybLayout != 0x00000409 && keybLayout != 0x04090409) { - Error("CANT_CHANGE_KEYB_LAYOUT_FOR_SYS_ENCRYPTION", MainDlg); - EndMainDlg(MainDlg); + Error ("CANT_CHANGE_KEYB_LAYOUT_FOR_SYS_ENCRYPTION", MainDlg); + EndMainDlg (MainDlg); return 1; } bKeyboardLayoutChanged = TRUE; } + if (SetTimer (MainDlg, TIMER_ID_KEYB_LAYOUT_GUARD, TIMER_INTERVAL_KEYB_LAYOUT_GUARD, NULL) == 0) { Error ("CANNOT_SET_TIMER", MainDlg); EndMainDlg (MainDlg); return 1; } - - ShowWindow(GetDlgItem(hwndDlg, IDC_KEYFILES_ENABLE), SW_HIDE); - ShowWindow(GetDlgItem(hwndDlg, IDC_KEY_FILES), SW_HIDE); - ShowWindow(GetDlgItem(hwndDlg, IDC_PIM_ENABLE), SW_HIDE); - - ShowWindow(GetDlgItem(hwndDlg, IDC_ADVANCE), SW_SHOW); - } - else - { - SetCheckBox (hwndDlg, IDC_PIM_ENABLE, PimEnable); - - SetCheckBox (hwndDlg, IDC_KEYFILES_ENABLE, KeyFilesEnable && !SysEncInEffect()); - EnableWindow (GetDlgItem (hwndDlg, IDC_KEY_FILES), KeyFilesEnable && !SysEncInEffect()); - EnableWindow (GetDlgItem (hwndDlg, IDC_KEYFILES_ENABLE), !SysEncInEffect()); } if (bHiddenVolHost) @@ -4422,14 +4410,20 @@ BOOL CALLBACK PageDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa } else { - StringCbCopyW (str, sizeof(str), GetString ("PASSWORD_HELP_SYSENC")); + StringCbCopyW (str, sizeof(str), GetString ("PASSWORD_HELP")); } - SetPassword(hwndDlg, IDC_PASSWORD, szRawPassword); - SetPassword(hwndDlg, IDC_VERIFY, szVerify); + SetPassword (hwndDlg, IDC_PASSWORD, szRawPassword); + SetPassword (hwndDlg, IDC_VERIFY, szVerify); SetFocus (GetDlgItem (hwndDlg, IDC_PASSWORD)); + SetCheckBox (hwndDlg, IDC_PIM_ENABLE, PimEnable); + + SetCheckBox (hwndDlg, IDC_KEYFILES_ENABLE, KeyFilesEnable && !SysEncInEffect()); + EnableWindow (GetDlgItem (hwndDlg, IDC_KEY_FILES), KeyFilesEnable && !SysEncInEffect()); + EnableWindow (GetDlgItem (hwndDlg, IDC_KEYFILES_ENABLE), !SysEncInEffect()); + SetWindowTextW (GetDlgItem (hwndDlg, IDC_BOX_HELP), str); if (CreatingHiddenSysVol()) @@ -4437,7 +4431,7 @@ BOOL CALLBACK PageDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa else if (bHiddenVol) SetWindowTextW (GetDlgItem (GetParent (hwndDlg), IDC_BOX_TITLE), GetString (bHiddenVolHost ? "PASSWORD_HIDVOL_HOST_TITLE" : "PASSWORD_HIDVOL_TITLE")); else if (WizardMode == WIZARD_MODE_SYS_DEVICE) - SetWindowTextW (GetDlgItem (GetParent (hwndDlg), IDC_BOX_TITLE), GetString ("CHOOSE_PASSWORD_TITLE")); + SetWindowTextW (GetDlgItem (GetParent (hwndDlg), IDC_BOX_TITLE), GetString ("PASSWORD")); else SetWindowTextW (GetDlgItem (GetParent (hwndDlg), IDC_BOX_TITLE), GetString ("PASSWORD_TITLE")); @@ -4453,40 +4447,7 @@ BOOL CALLBACK PageDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa NULL, KeyFilesEnable && FirstKeyFile!=NULL && !SysEncInEffect()); volumePassword.Length = (unsigned __int32) strlen ((char *) volumePassword.Text); - - if(SysEncInEffect ()) - { - /* Random pool parameter is here because random page is removed */ - - mouseEntropyGathered = 0xFFFFFFFF; - mouseEventsInitialCount = 0; - bUseMask = FALSE; - - { - HCRYPTPROV hRngProv; - if (CryptAcquireContext (&hRngProv, NULL, MS_ENHANCED_PROV, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT | CRYPT_SILENT)) - { - if (CryptGenRandom (hRngProv, sizeof (maskRandPool), maskRandPool)) - bUseMask = TRUE; - CryptReleaseContext (hRngProv, 0); - } - } - - SetTimer(GetParent(hwndDlg), TIMER_ID_RANDVIEW, TIMER_INTERVAL_RANDVIEW, NULL); - hRandPoolSys = GetDlgItem(hwndDlg, IDC_SYS_POOL_CONTENTS); - hEntropyBar = GetDlgItem(hwndDlg, IDC_ENTROPY_BAR); - SendMessage(hEntropyBar, PBM_SETRANGE32, 0, maxEntropyLevel); - SendMessage(hEntropyBar, PBM_SETSTEP, 1, 0); - SendMessage(GetDlgItem(hwndDlg, IDC_SYS_POOL_CONTENTS), WM_SETFONT, (WPARAM)hFixedDigitFont, (LPARAM)TRUE); - - /* set default values */ - - hash_algo = bSystemIsGPT ? SHA512 : DEFAULT_HASH_ALGORITHM_BOOT; - RandSetHashFunction(hash_algo); - - nWipeMode = TC_WIPE_NONE; - } } break; @@ -4616,8 +4577,6 @@ BOOL CALLBACK PageDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa SetWindowTextW (GetDlgItem (GetParent (hwndDlg), IDC_NEXT), GetString ("NEXT")); SetWindowTextW (GetDlgItem (GetParent (hwndDlg), IDC_PREV), GetString ("PREV")); SetWindowTextW (GetDlgItem (hwndDlg, IDT_RESCUE_DISK_INFO), bSystemIsGPT? GetString ("RESCUE_DISK_EFI_INFO"): GetString ("RESCUE_DISK_INFO")); - SetWindowTextW(GetDlgItem(hwndDlg, IDT_RESCUE_DISK_INFO_2), GetString("RESCUE_DISK_INFO_2")); - SetCheckBox (hwndDlg, IDC_SKIP_RESCUE_VERIFICATION, bDontVerifyRescueDisk); SetDlgItemText (hwndDlg, IDC_RESCUE_DISK_ISO_PATH, szRescueDiskISO); EnableWindow (GetDlgItem (GetParent (hwndDlg), IDC_NEXT), (GetWindowTextLength (GetDlgItem (hwndDlg, IDC_RESCUE_DISK_ISO_PATH)) > 1)); @@ -4649,9 +4608,25 @@ BOOL CALLBACK PageDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa SetWindowTextW (GetDlgItem (hwndDlg, IDT_RESCUE_DISK_BURN_INFO), szTmp); EnableWindow (GetDlgItem (GetParent (hwndDlg), IDC_NEXT), TRUE); - /* The 'Back' button is enabled but user can't go back, instead warning is provided */ - EnableWindow(GetDlgItem(GetParent(hwndDlg), IDC_PREV), TRUE); - + /* The 'Back' button must be disabled now because the user could burn a Rescue Disk, then go back, and + generate a different master key, which would cause the Rescue Disk verification to fail (the result + would be confusion and bug reports). */ + EnableWindow (GetDlgItem (GetParent (hwndDlg), IDC_PREV), FALSE); + + if (bSystemIsGPT) + { + ShowWindow (GetDlgItem (hwndDlg, IDC_DOWNLOAD_CD_BURN_SOFTWARE), SW_HIDE); + } + else + { + if (IsWindowsIsoBurnerAvailable()) + SetWindowTextW (GetDlgItem (hwndDlg, IDC_DOWNLOAD_CD_BURN_SOFTWARE), GetString ("LAUNCH_WIN_ISOBURN")); + + ToHyperlink (hwndDlg, IDC_DOWNLOAD_CD_BURN_SOFTWARE); + + if (IsWindowsIsoBurnerAvailable() && !bDontVerifyRescueDisk) + LaunchWindowsIsoBurner (hwndDlg, szRescueDiskISO); + } } break; @@ -4676,76 +4651,24 @@ BOOL CALLBACK PageDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa case SYSENC_WIPE_MODE_PAGE: case NONSYS_INPLACE_ENC_WIPE_MODE_PAGE: { - if (SysEncInEffect ()) - { - /* Wipe mode page is now checklist page */ - ShowWindow (GetDlgItem (hwndDlg, IDC_WIPE_MODE), SW_HIDE); - ShowWindow (GetDlgItem (hwndDlg, IDT_WIPE_MODE), SW_HIDE); - ShowWindow (GetDlgItem (hwndDlg, IDT_WIPE_MODE_INFO), SW_HIDE); - - SetWindowTextW (GetDlgItem (hwndDlg, IDC_REMEMBER_PASSWORD), GetString ("REMEMBER_PASSWORD")); - SetWindowTextW (GetDlgItem (hwndDlg, IDC_STORE_RESCUE_DISK), GetString ("STORE_RESCUE_DISK")); - SetWindowTextW (GetDlgItem (hwndDlg, IDC_BACKUP_DATA), GetString ("BACKUP_DATA")); - - SendMessage(GetDlgItem(hwndDlg, IDC_REMEMBER_PASSWORD), WM_SETFONT, (WPARAM)hUserBoldFont, (LPARAM)TRUE); - SendMessage(GetDlgItem(hwndDlg, IDC_STORE_RESCUE_DISK), WM_SETFONT, (WPARAM)hUserBoldFont, (LPARAM)TRUE); - SendMessage(GetDlgItem(hwndDlg, IDC_BACKUP_DATA), WM_SETFONT, (WPARAM)hUserBoldFont, (LPARAM)TRUE); - - bChecklistA = FALSE; - bChecklistB = FALSE; - bChecklistC = FALSE; - - SetWindowTextW(GetDlgItem(GetParent(hwndDlg), IDC_BOX_TITLE), GetString("CHECKLIST_TITLE")); - - SetDlgItemText(hwndDlg, IDC_BROWSE, GetString ("OPEN_PATH_CHECKLIST_PAGE")); - SetWindowTextW (GetDlgItem (hwndDlg, IDT_STORE_RESCUE_DISK), GetString ("RESCUE_DISK_CHECKLIST_B")); - SetWindowTextW (GetDlgItem (hwndDlg, IDT_REMEMBER_PASSWORD), GetString ("RESCUE_DISK_CHECKLIST_A")); - SetWindowTextW (GetDlgItem (hwndDlg, IDT_BACKUP_DATA), GetString ("RESCUE_DISK_CHECKLIST_C")); - - EnableWindow(GetDlgItem(hwndDlg, IDC_REMEMBER_PASSWORD), TRUE); - EnableWindow(GetDlgItem(hwndDlg, IDC_STORE_RESCUE_DISK), TRUE); - EnableWindow(GetDlgItem(hwndDlg, IDC_BACKUP_DATA), TRUE); - - SetWindowTextW (GetDlgItem (GetParent (hwndDlg), IDC_NEXT), GetString ("NEXT")); - - SetWindowTextW (GetDlgItem (GetParent (hwndDlg), IDC_PREV), GetString ("PREV")); - EnableWindow (GetDlgItem (GetParent (hwndDlg), IDC_PREV), TRUE); - EnableWindow (GetDlgItem (GetParent (hwndDlg), IDC_NEXT), FALSE); - } - else - { - /* Hide elements from Checklist page and show Wipe mode page */ - ShowWindow (GetDlgItem (hwndDlg, IDC_CHECKLIST_A), SW_HIDE); - ShowWindow (GetDlgItem (hwndDlg, IDC_CHECKLIST_B), SW_HIDE); - ShowWindow (GetDlgItem (hwndDlg, IDC_CHECKLIST_C), SW_HIDE); - ShowWindow (GetDlgItem (hwndDlg, IDC_STORE_RESCUE_DISK), SW_HIDE); - ShowWindow (GetDlgItem (hwndDlg, IDC_REMEMBER_PASSWORD), SW_HIDE); - ShowWindow (GetDlgItem (hwndDlg, IDC_BACKUP_DATA), SW_HIDE); - ShowWindow (GetDlgItem (hwndDlg, IDT_REMEMBER_PASSWORD), SW_HIDE); - ShowWindow (GetDlgItem (hwndDlg, IDT_STORE_RESCUE_DISK), SW_HIDE); - ShowWindow (GetDlgItem (hwndDlg, IDT_BACKUP_DATA), SW_HIDE); - ShowWindow (GetDlgItem (hwndDlg, IDC_BROWSE), SW_HIDE); - ShowWindow (GetDlgItem (hwndDlg, IDC_RESCUE_DISK_ISO_PATH), SW_HIDE); - - if (nWipeMode == TC_WIPE_1_RAND) - nWipeMode = TC_WIPE_NONE; - - SetWindowTextW (GetDlgItem (GetParent (hwndDlg), IDC_BOX_TITLE), GetString ("WIPE_MODE_TITLE")); - SetWindowTextW (GetDlgItem (hwndDlg, IDT_WIPE_MODE_INFO), GetString ("INPLACE_ENC_WIPE_MODE_INFO")); - - PopulateWipeModeCombo (GetDlgItem (hwndDlg, IDC_WIPE_MODE), - SystemEncryptionStatus == SYSENC_STATUS_DECRYPTING && !bInPlaceEncNonSys, - TRUE, - FALSE); + if (nWipeMode == TC_WIPE_1_RAND) + nWipeMode = TC_WIPE_NONE; - SelectAlgo (GetDlgItem (hwndDlg, IDC_WIPE_MODE), (int *) &nWipeMode); + SetWindowTextW (GetDlgItem (GetParent (hwndDlg), IDC_BOX_TITLE), GetString ("WIPE_MODE_TITLE")); + SetWindowTextW (GetDlgItem (hwndDlg, IDT_WIPE_MODE_INFO), GetString ("INPLACE_ENC_WIPE_MODE_INFO")); - SetWindowTextW (GetDlgItem (GetParent (hwndDlg), IDC_NEXT), GetString ("NEXT")); + PopulateWipeModeCombo (GetDlgItem (hwndDlg, IDC_WIPE_MODE), + SystemEncryptionStatus == SYSENC_STATUS_DECRYPTING && !bInPlaceEncNonSys, + TRUE, + FALSE); - SetWindowTextW (GetDlgItem (GetParent (hwndDlg), IDC_PREV), GetString ("PREV")); - EnableWindow (GetDlgItem (GetParent (hwndDlg), IDC_PREV), TRUE); - EnableWindow (GetDlgItem (GetParent (hwndDlg), IDC_NEXT), TRUE); - } + SelectAlgo (GetDlgItem (hwndDlg, IDC_WIPE_MODE), (int *) &nWipeMode); + + SetWindowTextW (GetDlgItem (GetParent (hwndDlg), IDC_NEXT), GetString ("NEXT")); + + SetWindowTextW (GetDlgItem (GetParent (hwndDlg), IDC_PREV), GetString ("PREV")); + EnableWindow (GetDlgItem (GetParent (hwndDlg), IDC_PREV), TRUE); + EnableWindow (GetDlgItem (GetParent (hwndDlg), IDC_NEXT), TRUE); } break; @@ -4768,7 +4691,7 @@ BOOL CALLBACK PageDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa { StringCbPrintfW (finalMsg, sizeof(finalMsg), GetString ("SYS_ENCRYPTION_PRETEST_INFO"), - GetSystemDriveLetter ()); + BootEncObj->GetSystemDriveConfiguration().DriveNumber); } catch (Exception &e) { @@ -4792,30 +4715,14 @@ BOOL CALLBACK PageDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa SetWindowTextW (GetDlgItem (GetParent (hwndDlg), IDC_BOX_TITLE), GetString ("SYS_ENCRYPTION_PRETEST_RESULT_TITLE")); SetWindowTextW (GetDlgItem (hwndDlg, IDC_BOX_HELP), GetString ("SYS_ENCRYPTION_PRETEST_RESULT_INFO")); - ShowWindow (GetDlgItem (hwndDlg, IDC_CHECKBOX_PRETEST), SW_SHOW); - SetWindowTextW (GetDlgItem (hwndDlg, IDC_CHECKBOX_PRETEST), GetString ("PRETEST_CHECKBOX")); - - bCheckboxPretest = FALSE; - SetWindowTextW (GetDlgItem (GetParent (hwndDlg), IDC_NEXT), GetString ("ENCRYPT")); SetWindowTextW (GetDlgItem (GetParent (hwndDlg), IDC_PREV), GetString ("PREV")); SetWindowTextW (GetDlgItem (GetParent (hwndDlg), IDCANCEL), GetString ("DEFER")); - EnableWindow (GetDlgItem (GetParent (hwndDlg), IDC_NEXT), FALSE); - EnableWindow (GetDlgItem (GetParent (hwndDlg), IDC_PREV), TRUE); + EnableWindow (GetDlgItem (GetParent (hwndDlg), IDC_NEXT), TRUE); + EnableWindow (GetDlgItem (GetParent (hwndDlg), IDC_PREV), FALSE); EnableWindow (GetDlgItem (GetParent (hwndDlg), IDCANCEL), TRUE); - HWND hTooltip; - hTooltip = GetDlgItem (GetParent (hwndDlg), IDC_PREV); - if (hTooltip) - { - CreateToolTip (hwndDlg, hTooltip, GetString ("PRETEST_BACK_BUTTON")); - } - else - { - MessageBox (0, TEXT ("Cannot find dialog item for tooltip!"), 0, 0); - } - break; case SYSENC_ENCRYPTION_PAGE: @@ -4837,9 +4744,8 @@ BOOL CALLBACK PageDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa SetWindowTextW (GetDlgItem (GetParent (hwndDlg), IDC_BOX_TITLE), GetString (SystemEncryptionStatus != SYSENC_STATUS_DECRYPTING ? "ENCRYPTION" : "DECRYPTION")); - - SetWindowTextW (GetDlgItem (hwndDlg, IDC_BOX_HELP), - GetString (SystemEncryptionStatus != SYSENC_STATUS_DECRYPTING ? "SYSENC_ENCRYPTION_PAGE_INFO" : "SYSENC_DECRYPTION_PAGE_INFO")); + + SetWindowTextW (GetDlgItem (hwndDlg, IDC_BOX_HELP), GetString ("SYSENC_ENCRYPTION_PAGE_INFO")); SetWindowTextW (GetDlgItem (GetParent (hwndDlg), IDCANCEL), GetString ("DEFER")); @@ -4857,6 +4763,8 @@ BOOL CALLBACK PageDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa EnableWindow (GetDlgItem (GetParent (hwndDlg), IDCANCEL), TRUE); EnableWindow (GetDlgItem (GetParent (hwndDlg), IDHELP), TRUE); + ToHyperlink (hwndDlg, IDC_MORE_INFO_SYS_ENCRYPTION); + if (SystemEncryptionStatus == SYSENC_STATUS_DECRYPTING) { nWipeMode = TC_WIPE_NONE; @@ -4872,13 +4780,6 @@ BOOL CALLBACK PageDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa SelectAlgo (GetDlgItem (hwndDlg, IDC_WIPE_MODE), (int *) &nWipeMode); } - if (nWipeMode == TC_WIPE_NONE) - { - ShowWindow (GetDlgItem(hwndDlg, IDC_WIPE_MODE), SW_HIDE); - ShowWindow (GetDlgItem(hwndDlg, IDT_FORMAT_OPTIONS), SW_HIDE); - ShowWindow (GetDlgItem(hwndDlg, IDT_WIPE_MODE), SW_HIDE); - } - PostMessage (hwndDlg, TC_APPMSG_PERFORM_POST_SYSENC_WMINIT_TASKS, 0, 0); } else @@ -5368,38 +5269,6 @@ BOOL CALLBACK PageDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa case WM_CTLCOLORSTATIC: { - if ((HWND)lParam == GetDlgItem (hwndDlg, PASSWORD_METER) && iPasswordStrength == 1) - { - // we're about to draw the static - // set the text colour in (HDC)lParam - SetBkMode ((HDC)wParam, TRANSPARENT); - SetTextColor ((HDC)wParam, RGB(255, 0, 0)); // password weak red - return (BOOL)GetSysColorBrush(COLOR_MENU); - } - - if ((HWND)lParam == GetDlgItem (hwndDlg, PASSWORD_METER) && iPasswordStrength == 2) - { - // we're about to draw the static - // set the text colour in (HDC)lParam - SetBkMode ((HDC)wParam, TRANSPARENT); - SetTextColor ((HDC)wParam, RGB (255, 165, 0)); // password medium orange - return (BOOL) GetSysColorBrush (COLOR_MENU); - } - - if ((HWND)lParam == GetDlgItem (hwndDlg, PASSWORD_METER) && iPasswordStrength == 3) - { - SetBkMode ((HDC)wParam, TRANSPARENT); - SetTextColor ((HDC)wParam, RGB (218, 218, 0)); // password strong yellow - return (BOOL) GetSysColorBrush (COLOR_MENU); - } - - if ((HWND)lParam == GetDlgItem (hwndDlg, PASSWORD_METER) && iPasswordStrength == 4) - { - SetBkMode((HDC)wParam, TRANSPARENT); - SetTextColor((HDC)wParam, RGB(50, 205, 50)); // password very strong green - return (BOOL) GetSysColorBrush (COLOR_MENU); - } - if (PimValueChangedWarning && ((HWND)lParam == GetDlgItem(hwndDlg, IDC_PIM_HELP)) ) { // we're about to draw the static @@ -5462,22 +5331,6 @@ BOOL CALLBACK PageDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa } } - if (lw == IDC_ADVANCE_INTRO && nCurPageNo == SYSENC_TYPE_PAGE) - { - DialogBoxParamW(hInst, - MAKEINTRESOURCEW(IDD_ADVANCE_MBR), hwndDlg, - (DLGPROC)AdvanceDlgProcIntro, NULL); - return 1; - } - - if (lw == IDC_ADVANCE && nCurPageNo == PASSWORD_PAGE) - { - DialogBoxParamW(hInst, - MAKEINTRESOURCEW(IDD_ADVANCE), hwndDlg, - (DLGPROC)AdvanceDlgProc, NULL); - return 1; - } - if (nCurPageNo == SYSENC_HIDDEN_OS_REQ_CHECK_PAGE && lw == IDC_HIDDEN_SYSENC_INFO_LINK) { Applink ("hiddensysenc"); @@ -5826,56 +5679,14 @@ BOOL CALLBACK PageDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa if (hw == EN_CHANGE && nCurPageNo == PASSWORD_PAGE) { - // If 'Next' button was clicked (and keyboard layout is not US), don't verify - if (!bNextButtonClicked) - { - VerifyPasswordAndUpdate (hwndDlg, GetDlgItem (GetParent (hwndDlg), IDC_NEXT), - GetDlgItem(hCurPage, IDC_PASSWORD), - GetDlgItem(hCurPage, IDC_VERIFY), - NULL, - NULL, - KeyFilesEnable && FirstKeyFile != NULL && !SysEncInEffect()); - - bNextButtonClicked = FALSE; - } - + VerifyPasswordAndUpdate (hwndDlg, GetDlgItem (GetParent (hwndDlg), IDC_NEXT), + GetDlgItem (hwndDlg, IDC_PASSWORD), + GetDlgItem (hwndDlg, IDC_VERIFY), + NULL, + NULL, + KeyFilesEnable && FirstKeyFile!=NULL && !SysEncInEffect()); volumePassword.Length = (unsigned __int32) strlen ((char *) volumePassword.Text); - - SendMessage (GetDlgItem (hwndDlg, PASSWORD_METER), WM_SETFONT, (WPARAM)hUserBoldFont, (LPARAM)TRUE); - - memset (&tempPassword[0], 0, sizeof (tempPassword)); - - if (GetPassword (hCurPage, IDC_PASSWORD, tempPassword, iMaxPasswordLength + 1, FALSE, TRUE)) - iPasswordStrength = PrintStrongness (tempPassword, strlen (tempPassword)); - else - Error ("ERROR_GETTING_PWD", hwndDlg); - - burn (tempPassword, sizeof (tempPassword)); - if (iPasswordStrength == very_strong) - { - SetWindowTextW (GetDlgItem (hwndDlg, PASSWORD_METER), GetString ("VERY_STRONG_PASSWORD")); - EnableWindow (GetDlgItem (hwndDlg, IDC_VERIFY), TRUE); - } - else if (iPasswordStrength == strong) - { - SetWindowTextW (GetDlgItem (hwndDlg, PASSWORD_METER), GetString ("STRONG_PASSWORD")); - EnableWindow (GetDlgItem (hwndDlg, IDC_VERIFY), TRUE); - } - else if (iPasswordStrength == medium) - { - EnableWindow (GetDlgItem (hwndDlg, IDC_VERIFY), TRUE); - SetWindowTextW (GetDlgItem (hwndDlg, PASSWORD_METER), GetString ("MEDIUM_PASSWORD")); - } - else if (iPasswordStrength == weak) - { - EnableWindow (GetDlgItem (hwndDlg, IDC_VERIFY), FALSE); - SetWindowTextW (GetDlgItem (hwndDlg, PASSWORD_METER), GetString ("WEAK_PASSWORD")); - } - else - { - SetWindowTextW (GetDlgItem (hwndDlg, PASSWORD_METER), GetString ("VERY_WEAK_PASSWORD")); - } return 1; } @@ -5910,32 +5721,6 @@ BOOL CALLBACK PageDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa return 1; } - if (lw == IDC_CHECKLIST_A) - { - bChecklistA = GetCheckBox (hwndDlg, IDC_CHECKLIST_A); - bChecklistB = GetCheckBox (hwndDlg, IDC_CHECKLIST_B); - bChecklistC = GetCheckBox (hwndDlg, IDC_CHECKLIST_C); - } - - if (lw == IDC_CHECKLIST_B) - { - bChecklistA = GetCheckBox (hwndDlg, IDC_CHECKLIST_A); - bChecklistB = GetCheckBox (hwndDlg, IDC_CHECKLIST_B); - bChecklistC = GetCheckBox (hwndDlg, IDC_CHECKLIST_C); - } - - if (lw == IDC_CHECKLIST_C) - { - bChecklistA = GetCheckBox (hwndDlg, IDC_CHECKLIST_A); - bChecklistB = GetCheckBox (hwndDlg, IDC_CHECKLIST_B); - bChecklistC = GetCheckBox (hwndDlg, IDC_CHECKLIST_C); - } - - if (lw == IDC_CHECKBOX_PRETEST) - { - bCheckboxPretest = GetCheckBox (hwndDlg, IDC_CHECKBOX_PRETEST); - } - if (lw == IDC_PIM_ENABLE) { PimEnable = GetCheckBox (hwndDlg, IDC_PIM_ENABLE); @@ -6265,47 +6050,14 @@ BOOL CALLBACK PageDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa } } - /* The password and rescue checkbox have to be clicked in order to enable the next button */ - if ((nCurPageNo == SYSENC_WIPE_MODE_PAGE || nCurPageNo == NONSYS_INPLACE_ENC_WIPE_MODE_PAGE) && - (lw == IDC_CHECKLIST_A || lw == IDC_CHECKLIST_B || lw == IDC_CHECKLIST_C)) - { - if (SysEncInEffect ()) - { - if (bChecklistA && bChecklistB && bChecklistC) - EnableWindow (GetDlgItem (GetParent (hwndDlg), IDC_NEXT), TRUE); - else - EnableWindow (GetDlgItem (GetParent (hwndDlg), IDC_NEXT), FALSE); - } - } - - if (lw == IDC_BROWSE && (nCurPageNo == SYSENC_WIPE_MODE_PAGE || nCurPageNo == NONSYS_INPLACE_ENC_WIPE_MODE_PAGE)) - { - wchar_t tmpszRescueDiskISO [TC_MAX_PATH+1]; - - StringCbCopyW (tmpszRescueDiskISO, sizeof(tmpszRescueDiskISO), szRescueDiskISO); - - //detects the last '\' in order to remove the name of the zip file and save file name - for (int i = wcslen(tmpszRescueDiskISO); i > 1; i--) - { - if (tmpszRescueDiskISO[i] == '\\') - { - for (int j = i + 1; i < wcslen(tmpszRescueDiskISO); i++) - tmpszRescueDiskISO[j] = '\0'; - break; - } - } - - if(!BrowseFile (hwndDlg, "RESCUE_DISK_PATH", tmpszRescueDiskISO)) - return 1; - - return 0; - } - if (nCurPageNo == SYSENC_PRETEST_RESULT_PAGE && lw == IDC_CHECKBOX_PRETEST) + if (nCurPageNo == SYSENC_RESCUE_DISK_BURN_PAGE && lw == IDC_DOWNLOAD_CD_BURN_SOFTWARE) { - if (bCheckboxPretest) - EnableWindow (GetDlgItem (GetParent (hwndDlg), IDC_NEXT), TRUE); + if (IsWindowsIsoBurnerAvailable()) + LaunchWindowsIsoBurner (hwndDlg, szRescueDiskISO); else - EnableWindow (GetDlgItem (GetParent (hwndDlg), IDC_NEXT), FALSE); + Applink ("isoburning"); + + return 1; } if ((nCurPageNo == SYSENC_WIPE_MODE_PAGE @@ -6619,9 +6371,11 @@ BOOL CALLBACK MainDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa } SHGetFolderPath (NULL, CSIDL_MYDOCUMENTS, NULL, 0, szRescueDiskISO); + if (bSystemIsGPT) + StringCbCatW (szRescueDiskISO, sizeof(szRescueDiskISO), L"\\VeraCrypt Rescue Disk.zip"); + else + StringCbCatW (szRescueDiskISO, sizeof(szRescueDiskISO), L"\\VeraCrypt Rescue Disk.iso"); - StringCbCatW (szRescueDiskISO, sizeof(szRescueDiskISO), L"\\VeraCrypt Rescue Disk.zip"); - if (IsOSAtLeast (WIN_VISTA)) { // Availability of in-place encryption (which is pre-selected by default whenever @@ -6905,7 +6659,6 @@ BOOL CALLBACK MainDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa keybLayout = (DWORD) LoadKeyboardLayout (L"00000409", KLF_ACTIVATE); - // East Asian languages are not translated to US keyboard layout so we need to change keyboard layout if (keybLayout != 0x00000409 && keybLayout != 0x04090409) { KillTimer (hwndDlg, TIMER_ID_KEYB_LAYOUT_GUARD); @@ -6913,31 +6666,34 @@ BOOL CALLBACK MainDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa EndMainDlg (MainDlg); return 1; } - + bKeyboardLayoutChanged = TRUE; + wchar_t szTmp [4096]; StringCbCopyW (szTmp, sizeof(szTmp), GetString ("KEYB_LAYOUT_CHANGE_PREVENTED")); StringCbCatW (szTmp, sizeof(szTmp), L"\n\n"); StringCbCatW (szTmp, sizeof(szTmp), GetString ("KEYB_LAYOUT_SYS_ENC_EXPLANATION")); MessageBoxW (MainDlg, szTmp, lpszTitle, MB_ICONWARNING | MB_SETFOREGROUND | MB_TOPMOST); + } - if (bKeyboardLayoutChanged && !bKeybLayoutAltKeyWarningShown) - { - if (GetAsyncKeyState (VK_RMENU) < 0) - { - bKeybLayoutAltKeyWarningShown = TRUE; + /* Watch the right Alt key (which is used to enter various characters on non-US keyboards) */ + if (bKeyboardLayoutChanged && !bKeybLayoutAltKeyWarningShown) + { + if (GetAsyncKeyState (VK_RMENU) < 0) + { + bKeybLayoutAltKeyWarningShown = TRUE; - wchar_t szTmp [4096]; - StringCbCopyW (szTmp, sizeof(szTmp), GetString ("ALT_KEY_CHARS_NOT_FOR_SYS_ENCRYPTION")); - StringCbCatW (szTmp, sizeof(szTmp), L"\n\n"); - StringCbCatW (szTmp, sizeof(szTmp), GetString ("KEYB_LAYOUT_SYS_ENC_EXPLANATION")); - MessageBoxW (MainDlg, szTmp, lpszTitle, MB_ICONINFORMATION | MB_SETFOREGROUND | MB_TOPMOST); - } + wchar_t szTmp [4096]; + StringCbCopyW (szTmp, sizeof(szTmp), GetString ("ALT_KEY_CHARS_NOT_FOR_SYS_ENCRYPTION")); + StringCbCatW (szTmp, sizeof(szTmp), L"\n\n"); + StringCbCatW (szTmp, sizeof(szTmp), GetString ("KEYB_LAYOUT_SYS_ENC_EXPLANATION")); + MessageBoxW (MainDlg, szTmp, lpszTitle, MB_ICONINFORMATION | MB_SETFOREGROUND | MB_TOPMOST); } } } return 1; + case TIMER_ID_SYSENC_DRIVE_ANALYSIS_PROGRESS: if (bSysEncDriveAnalysisInProgress) @@ -7258,20 +7014,7 @@ BOOL CALLBACK MainDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa if (lw == IDHELP) { - if (nCurPageNo == SYSENC_RESCUE_DISK_CREATION_PAGE || - nCurPageNo == SYSENC_RESCUE_DISK_BURN_PAGE || - nCurPageNo == SYSENC_RESCUE_DISK_VERIFIED_PAGE) - { - Applink("rescue"); - } - else if (nCurPageNo == PASSWORD_PAGE) - { - Applink("passwords"); - } - else - { - OpenPageHelp(hwndDlg, nCurPageNo); - } + OpenPageHelp (hwndDlg, nCurPageNo); return 1; } else if (lw == IDCANCEL) @@ -7340,7 +7083,7 @@ BOOL CALLBACK MainDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa } if (!bHiddenOS) - nNewPageNo = PASSWORD_PAGE - 1; // Skip irrelevant pages + nNewPageNo = SYSENC_SPAN_PAGE - 1; // Skip irrelevant pages } else if (nCurPageNo == SYSENC_HIDDEN_OS_REQ_CHECK_PAGE) { @@ -7884,11 +7627,6 @@ BOOL CALLBACK MainDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa else if (nCurPageNo == PASSWORD_PAGE) { - if (SysEncInEffect ()) - { - wchar_t tmpPwd[MAX_PASSWORD + 1]; - GetWindowText (GetDlgItem (hCurPage, IDC_PASSWORD), tmpPwd, iMaxPasswordLength + 1); - } VerifyPasswordAndUpdate (hwndDlg, GetDlgItem (MainDlg, IDC_NEXT), GetDlgItem (hCurPage, IDC_PASSWORD), GetDlgItem (hCurPage, IDC_VERIFY), @@ -7906,7 +7644,7 @@ BOOL CALLBACK MainDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa Error ("UNSUPPORTED_CHARS_IN_PWD", hwndDlg); return 1; } - // Check password length (check also done for outer volume which is not the case in TrueCrypt). + // Check password length (check also done for outer volume which is not the case in TrueCrypt). else if (!CheckPasswordLength (hwndDlg, volumePassword.Length, 0, SysEncInEffect(), SysEncInEffect()? hash_algo : 0, FALSE, FALSE)) { return 1; @@ -7945,6 +7683,7 @@ BOOL CALLBACK MainDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa else bKeyboardLayoutChanged = FALSE; } + } if (!PimEnable) @@ -7965,6 +7704,11 @@ BOOL CALLBACK MainDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa } } + if (SysEncInEffect ()) + { + nNewPageNo = SYSENC_COLLECTING_RANDOM_DATA_PAGE - 1; // Skip irrelevant pages + } + if (bInPlaceEncNonSys) { nNewPageNo = NONSYS_INPLACE_ENC_RAND_DATA_PAGE - 1; // Skip irrelevant pages @@ -7977,41 +7721,6 @@ BOOL CALLBACK MainDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa } } - - - if (SysEncInEffect ()) - { - if (PimEnable) - nNewPageNo = PIM_PAGE - 1; - else - { - nNewPageNo = SYSENC_RESCUE_DISK_CREATION_PAGE - 1; // Skip irrelevant pages - - wchar_t tmp[RANDPOOL_DISPLAY_SIZE + 1]; - if (!bInPlaceEncNonSys) - { - /* Generate master key and other related data (except the rescue disk) for system encryption. */ - try - { - WaitCursor(); - BootEncObj->PrepareInstallation(!bWholeSysDrive, volumePassword, nVolumeEA, FIRST_MODE_OF_OPERATION_ID, hash_algo, volumePim, L""); - } - catch (Exception &e) - { - e.Show(hwndDlg); - NormalCursor(); - return 1; - } - } - KillTimer(hwndDlg, TIMER_ID_RANDVIEW); - // Attempt to wipe the GUI field showing portions of randpool - wmemset(tmp, L'X', ARRAYSIZE(tmp)); - tmp[ARRAYSIZE(tmp) - 1] = 0; - SetWindowText(hRandPoolSys, tmp); - NormalCursor(); - } - - } } else if (nCurPageNo == PIM_PAGE) @@ -8047,12 +7756,18 @@ BOOL CALLBACK MainDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa return 1; } // Check password length (check also done for outer volume which is not the case in TrueCrypt). - else if (!CheckPasswordLength (hwndDlg, volumePassword.Length, volumePim, SysEncInEffect(), SysEncInEffect()? hash_algo : 0, FALSE, FALSE)) + else if (!CheckPasswordLength (hwndDlg, volumePassword.Length, volumePim, SysEncInEffect(), SysEncInEffect()? hash_algo : 0, TRUE, FALSE)) { return 1; } } + if (SysEncInEffect ()) + { + + nNewPageNo = SYSENC_COLLECTING_RANDOM_DATA_PAGE - 1; // Skip irrelevant pages + } + if (bInPlaceEncNonSys) { nNewPageNo = NONSYS_INPLACE_ENC_RAND_DATA_PAGE - 1; // Skip irrelevant pages @@ -8063,34 +7778,6 @@ BOOL CALLBACK MainDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa { nNewPageNo = FORMAT_PAGE - 1; // Skip irrelevant pages } - - if (SysEncInEffect ()) - { - nNewPageNo = SYSENC_RESCUE_DISK_CREATION_PAGE - 1; // Skip irrelevant pages - - wchar_t tmp[RANDPOOL_DISPLAY_SIZE + 1]; - if (!bInPlaceEncNonSys) - { - /* Generate master key and other related data (except the rescue disk) for system encryption. */ - try - { - WaitCursor(); - BootEncObj->PrepareInstallation(!bWholeSysDrive, volumePassword, nVolumeEA, FIRST_MODE_OF_OPERATION_ID, hash_algo, volumePim, L""); - } - catch (Exception &e) - { - e.Show(hwndDlg); - NormalCursor(); - return 1; - } - } - KillTimer(hwndDlg, TIMER_ID_RANDVIEW); - // Attempt to wipe the GUI field showing portions of randpool - wmemset(tmp, L'X', ARRAYSIZE(tmp)); - tmp[ARRAYSIZE(tmp) - 1] = 0; - SetWindowText(hRandPoolSys, tmp); - NormalCursor(); - } } else if (nCurPageNo == HIDDEN_VOL_HOST_PASSWORD_PAGE @@ -9116,26 +8803,6 @@ ovf_end: if (!bHiddenOS) nNewPageNo = SYSENC_TYPE_PAGE + 1; } - - if (nCurPageNo == SYSENC_RESCUE_DISK_CREATION_PAGE) - { - if (SysEncInEffect ()) - { - nNewPageNo = (PimEnable? PIM_PAGE : PASSWORD_PAGE) + 1; - } - } - - if (nCurPageNo == SYSENC_RESCUE_DISK_BURN_PAGE) - { - nNewPageNo = SYSENC_RESCUE_DISK_BURN_PAGE + 1; // Stay on the same page - Warning("RESCUE_DISK_BACK_BUTTON", hwndDlg); - } - - if (nCurPageNo == SYSENC_PRETEST_RESULT_PAGE) - { - nNewPageNo = SYSENC_PRETEST_RESULT_PAGE + 1; // Stay on the same page - } - if (nCurPageNo == SYSENC_MULTI_BOOT_MODE_PAGE) { // Skip the drive analysis page(s) or other irrelevant pages when going back @@ -9261,10 +8928,7 @@ ovf_end: if (SysEncInEffect ()) { - if (!bHiddenOS) - nNewPageNo = SYSENC_TYPE_PAGE + 1; // Skip irrelevant pages - else - nNewPageNo = CIPHER_PAGE + 1; // Skip irrelevant pages + nNewPageNo = CIPHER_PAGE + 1; // Skip irrelevant pages KillTimer (hwndDlg, TIMER_ID_KEYB_LAYOUT_GUARD); @@ -10967,512 +10631,3 @@ static DWORD GetFormatSectorSize () return geometry.Geometry.BytesPerSector; } - -/* This function is called when advanced dialog in intro page is open */ -BOOL CALLBACK AdvanceDlgProcIntro (HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam) -{ - WORD lw = LOWORD(wParam); - - switch (msg) - { - case WM_INITDIALOG: - - bHiddenVolHost = bHiddenVol = bHiddenOS; - - SendMessage (GetDlgItem (hwndDlg, IDC_SYSENC_HIDDEN), WM_SETFONT, (WPARAM) hUserBoldFont, (LPARAM) TRUE); - SendMessage (GetDlgItem (hwndDlg, IDC_SYSENC_NORMAL), WM_SETFONT, (WPARAM) hUserBoldFont, (LPARAM) TRUE); - - CheckButton (GetDlgItem (hwndDlg, bHiddenOS ? IDC_SYSENC_HIDDEN : IDC_SYSENC_NORMAL)); - - return 1; - case WM_COMMAND: - { - if (lw == IDCANCEL) - { - EndDialog(hwndDlg, lw); - return 1; - } - - if(lw == IDOK) - { - if (bHiddenOS) - { - bWholeSysDrive = FALSE; - bHiddenVolDirect = FALSE; - } - EndDialog(hwndDlg, lw); - return 1; - } - - if (lw == IDC_SYSENC_HIDDEN) - { - SendMessage (GetDlgItem (hwndDlg, IDC_SYSENC_NORMAL), BM_SETCHECK, BST_UNCHECKED, 0); - - bHiddenOS = TRUE; - bHiddenVol = TRUE; - bHiddenVolHost = TRUE; - return 1; - } - - if (lw == IDC_SYSENC_NORMAL) - { - SendMessage (GetDlgItem (hwndDlg, IDC_SYSENC_HIDDEN), BM_SETCHECK, BST_UNCHECKED, 0); - - bHiddenOS = FALSE; - bHiddenVol = FALSE; - bHiddenVolHost = FALSE; - return 1; - } - - if(lw == IDHELP) - { - Applink ("hiddensysenc"); - return 1; - } - } - } - return 0; -} - -/* AES, HASH, Pim and Wipe mode can be selected here */ -BOOL CALLBACK AdvanceDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam) -{ - WORD lw = LOWORD(wParam); - WORD hw = HIWORD(wParam); - int ea, hid; - wchar_t buf[100]; - BOOL bNTFSallowed = FALSE; - BOOL bFATallowed = FALSE; - BOOL bEXFATallowed = FALSE; - BOOL bReFSallowed = FALSE; - BOOL bNoFSallowed = FALSE; - hCurPage = hwndDlg; - - switch (msg) - { - case WM_INITDIALOG: - { - SetWindowTextW ( GetDlgItem (hwndDlg, IDT_IMPORTANT_NOTE), GetString ("ADV_FEATURES_NOTE")); - SetWindowTextW ( GetDlgItem (hwndDlg, IDT_PIM_INFO), GetString ("PIM_INFO")); - SetWindowTextW ( GetDlgItem (hwndDlg, IDT_WIPE_INFO), GetString ("WIPE_INFO")); - - /* Encryption algorithms */ - - SendMessage(GetDlgItem(hwndDlg, IDC_COMBO_BOX), CB_RESETCONTENT, 0, 0); - - for (ea = EAGetFirst (); ea != 0; ea = EAGetNext (ea)) - { - if (EAIsFormatEnabled (ea) && (!SysEncInEffect () || bSystemIsGPT || EAIsMbrSysEncEnabled (ea))) - AddComboPair (GetDlgItem (hwndDlg, IDC_COMBO_BOX), EAGetName (buf, ARRAYSIZE(buf), ea, 1), ea); - } - - SelectAlgo (GetDlgItem (hwndDlg, IDC_COMBO_BOX), &nVolumeEA); - ComboSelChangeEA (hwndDlg); - SetFocus (GetDlgItem (hwndDlg, IDC_COMBO_BOX)); - - /* Hash algorithms */ - if (SysEncInEffect()) - { - RandSetHashFunction(hash_algo); - for (hid = FIRST_PRF_ID; hid <= LAST_PRF_ID; hid++) - { - // Use blake2s for hashing - if (((hid == BLAKE2S) || !HashIsDeprecated(hid)) && (bSystemIsGPT || HashForSystemEncryption(hid))) - AddComboPair(GetDlgItem(hwndDlg, IDC_COMBO_BOX_HASH_ALGO), HashGetName(hid), hid); - } - } - else - { - hash_algo = RandGetHashFunction(); - for (hid = FIRST_PRF_ID; hid <= LAST_PRF_ID; hid++) - { - if (!HashIsDeprecated(hid)) - AddComboPair(GetDlgItem(hwndDlg, IDC_COMBO_BOX_HASH_ALGO), HashGetName(hid), hid); - } - } - - if (CreatingHiddenSysVol()) - Warning ("HIDDEN_OS_PRE_CIPHER_WARNING", MainDlg); - - SetWindowText(GetDlgItem(hwndDlg, IDC_SHA512_HELP), GetString("SHA512_HELP")); - SelectAlgo(GetDlgItem(hwndDlg, IDC_COMBO_BOX_HASH_ALGO), &hash_algo); - - /* file system options */ - SetTimer(GetParent(hwndDlg), TIMER_ID_RANDVIEW, TIMER_INTERVAL_RANDVIEW, NULL); - - hMasterKey = GetDlgItem(hwndDlg, IDC_DISK_KEY); - hHeaderKey = GetDlgItem(hwndDlg, IDC_HEADER_KEY); - hRandPool = GetDlgItem(hwndDlg, IDC_RANDOM_BYTES); - - SendMessage(GetDlgItem(hwndDlg, IDC_RANDOM_BYTES), WM_SETFONT, (WPARAM)hFixedDigitFont, (LPARAM)TRUE); - SendMessage(GetDlgItem(hwndDlg, IDC_DISK_KEY), WM_SETFONT, (WPARAM)hFixedDigitFont, (LPARAM)TRUE); - SendMessage(GetDlgItem(hwndDlg, IDC_HEADER_KEY), WM_SETFONT, (WPARAM)hFixedDigitFont, (LPARAM)TRUE); - - /* Quick/Dynamic */ - - if (bHiddenVol) - { - quickFormat = !bHiddenVolHost; - dynamicFormat = FALSE; - bSparseFileSwitch = FALSE; - } - else - { - if (bDevice) - { - dynamicFormat = FALSE; - bSparseFileSwitch = FALSE; - } - else - { - wchar_t root[TC_MAX_PATH]; - DWORD fileSystemFlags = 0; - - /* Check if the host file system supports sparse files */ - - if (GetVolumePathName (szFileName, root, array_capacity (root))) - { - GetVolumeInformation (root, NULL, 0, NULL, NULL, &fileSystemFlags, NULL, 0); - bSparseFileSwitch = fileSystemFlags & FILE_SUPPORTS_SPARSE_FILES; - } - else - bSparseFileSwitch = FALSE; - if (!bSparseFileSwitch) - { - dynamicFormat = FALSE; - } - } - } - SendMessage (GetDlgItem (hwndDlg, IDC_SHOW_KEYS), BM_SETCHECK, showKeys ? BST_CHECKED : BST_UNCHECKED, 0); - SetWindowText (GetDlgItem (hwndDlg, IDC_RANDOM_BYTES), showKeys ? L"" : L"******************************** "); - SetWindowText (GetDlgItem (hwndDlg, IDC_HEADER_KEY), showKeys ? L"" : L"******************************** "); - SetWindowText (GetDlgItem (hwndDlg, IDC_DISK_KEY), showKeys ? L"" : L"******************************** "); - - SendMessage(GetDlgItem(hwndDlg, IDC_CLUSTERSIZE), CB_RESETCONTENT, 0, 0); - AddComboPairW(GetDlgItem(hwndDlg, IDC_CLUSTERSIZE), GetString("DEFAULT"), 0); - SendMessage(GetDlgItem(hwndDlg, IDC_CLUSTERSIZE), CB_SETCURSEL, 0, 0); - EnableWindow(GetDlgItem(hwndDlg, IDC_CLUSTERSIZE), TRUE); - - /* Filesystems */ - bNTFSallowed = FALSE; - bFATallowed = FALSE; - bEXFATallowed = FALSE; - bReFSallowed = FALSE; - bNoFSallowed = FALSE; - - SendMessage(GetDlgItem(hwndDlg, IDC_FILESYS), CB_RESETCONTENT, 0, 0); - EnableWindow(GetDlgItem(hwndDlg, IDC_FILESYS), TRUE); - - uint64 dataAreaSize = GetVolumeDataAreaSize (bHiddenVol && !bHiddenVolHost, nVolumeSize); - - if (!CreatingHiddenSysVol()) - { - if (dataAreaSize >= TC_MIN_NTFS_FS_SIZE && dataAreaSize <= TC_MAX_NTFS_FS_SIZE) - { - AddComboPair (GetDlgItem (hwndDlg, IDC_FILESYS), L"NTFS", FILESYS_NTFS); - bNTFSallowed = TRUE; - } - - if (dataAreaSize >= TC_MIN_FAT_FS_SIZE && dataAreaSize <= TC_MAX_FAT_SECTOR_COUNT * GetFormatSectorSize()) - { - AddComboPair (GetDlgItem (hwndDlg, IDC_FILESYS), L"FAT", FILESYS_FAT); - bFATallowed = TRUE; - } - - //exFAT support added starting from Vista SP1 - if (IsOSVersionAtLeast (WIN_VISTA, 1) && dataAreaSize >= TC_MIN_EXFAT_FS_SIZE && dataAreaSize <= TC_MAX_EXFAT_FS_SIZE) - { - AddComboPair (GetDlgItem (hwndDlg, IDC_FILESYS), L"exFAT", FILESYS_EXFAT); - bEXFATallowed = TRUE; - } - - //ReFS write support activated by default starting from Windows 10 - //We don't support it yet for the creation of hidden volumes - if ((!bHiddenVolHost) && IsOSVersionAtLeast (WIN_10, 0) && dataAreaSize >= TC_MIN_REFS_FS_SIZE && dataAreaSize <= TC_MAX_REFS_FS_SIZE) - { - AddComboPair (GetDlgItem (hwndDlg, IDC_FILESYS), L"ReFS", FILESYS_REFS); - bReFSallowed = TRUE; - } - } - else - { - // We're creating a hidden volume for a hidden OS, so we don't need to format it with - // any filesystem (the entire OS will be copied to the hidden volume sector by sector). - EnableWindow (GetDlgItem (hwndDlg, IDC_FILESYS), FALSE); - EnableWindow (GetDlgItem (hwndDlg, IDC_CLUSTERSIZE), FALSE); - } - if (!bHiddenVolHost) - { - AddComboPairW(GetDlgItem(hwndDlg, IDC_FILESYS), GetString("NONE"), FILESYS_NONE); - bNoFSallowed = TRUE; - } - if (fileSystem == FILESYS_NONE) // If no file system has been previously selected - { - // Set default file system - - if (bFATallowed && !(nNeedToStoreFilesOver4GB == 1 && (bNTFSallowed || bEXFATallowed || bReFSallowed))) - fileSystem = FILESYS_FAT; - else if (bEXFATallowed) - fileSystem = FILESYS_EXFAT; - else if (bNTFSallowed) - fileSystem = FILESYS_NTFS; - else if (bReFSallowed) - fileSystem = FILESYS_REFS; - else if (bNoFSallowed) - fileSystem = FILESYS_NONE; - else - { - AddComboPair (GetDlgItem (hwndDlg, IDC_FILESYS), L"---", 0); - } - } - - SendMessage(GetDlgItem(hwndDlg, IDC_FILESYS), CB_SETCURSEL, 0, 0); - SelectAlgo(GetDlgItem(hwndDlg, IDC_FILESYS), (int *)&fileSystem); - - /* PIM and Wipe mode */ - SetCheckBox(hwndDlg, IDC_PIM_ENABLE, PimEnable); - - PopulateWipeModeCombo(GetDlgItem(hwndDlg, IDC_WIPE_MODE), - SystemEncryptionStatus == SYSENC_STATUS_DECRYPTING && !bInPlaceEncNonSys, - TRUE, - FALSE); - SelectAlgo(GetDlgItem(hwndDlg, IDC_WIPE_MODE), (int *)&nWipeMode); - SetFocus(GetDlgItem(GetParent(hwndDlg), IDOK)); - } - return 1; - case WM_COMMAND: - if (lw == IDCANCEL) - { - EndDialog(hwndDlg, lw); - return 1; - } - if (lw == IDOK) - { - /* Save hash and encryption algo */ - LPARAM nIndex; - nIndex = SendMessage (GetDlgItem (hCurPage, IDC_COMBO_BOX), CB_GETCURSEL, 0, 0); - nVolumeEA = (int) SendMessage (GetDlgItem (hCurPage, IDC_COMBO_BOX), CB_GETITEMDATA, nIndex, 0); - - if (!bSystemIsGPT && SysEncInEffect () - && EAGetCipherCount (nVolumeEA) > 1) // Cascade? - { - if (AskWarnNoYes ("CONFIRM_CASCADE_FOR_SYS_ENCRYPTION", hwndDlg) == IDNO) - return 1; - - if (!bHiddenOS) - Info ("NOTE_CASCADE_FOR_SYS_ENCRYPTION", hwndDlg); - } - - nIndex = SendMessage (GetDlgItem (hCurPage, IDC_COMBO_BOX_HASH_ALGO), CB_GETCURSEL, 0, 0); - hash_algo = (int) SendMessage (GetDlgItem (hCurPage, IDC_COMBO_BOX_HASH_ALGO), CB_GETITEMDATA, nIndex, 0); - - RandSetHashFunction (hash_algo); - - /* Save PIM and Wipe mode */ - nWipeMode = (WipeAlgorithmId)SendMessage(GetDlgItem(hwndDlg, IDC_WIPE_MODE), - CB_GETITEMDATA, - SendMessage(GetDlgItem(hwndDlg, IDC_WIPE_MODE), CB_GETCURSEL, 0, 0), - 0); - - PimEnable = GetCheckBox(hwndDlg, IDC_PIM_ENABLE); - SetCheckBox(hwndDlg, IDC_PIM_ENABLE, PimEnable); - - EndDialog(hwndDlg, lw); - return 1; - } - if (lw == IDC_CIPHER_TEST) - { - LPARAM nIndex; - int c; - - nIndex = SendMessage (GetDlgItem (hCurPage, IDC_COMBO_BOX), CB_GETCURSEL, 0, 0); - nVolumeEA = (int) SendMessage (GetDlgItem (hCurPage, IDC_COMBO_BOX), CB_GETITEMDATA, nIndex, 0); - - for (c = EAGetLastCipher (nVolumeEA); c != 0; c = EAGetPreviousCipher (nVolumeEA, c)) - { - DialogBoxParamW (hInst, MAKEINTRESOURCEW (IDD_CIPHER_TEST_DLG), - GetParent (hwndDlg), (DLGPROC) CipherTestDialogProc, (LPARAM) c); - } - - return 1; - } - - if (lw == IDC_BENCHMARK) - { - // Reduce CPU load - bFastPollEnabled = FALSE; - bRandmixEnabled = FALSE; - - DialogBoxParamW (hInst, - MAKEINTRESOURCEW (IDD_BENCHMARK_DLG), hwndDlg, - (DLGPROC) BenchmarkDlgProc, (LPARAM) bSystemIsGPT); - - bFastPollEnabled = TRUE; - bRandmixEnabled = TRUE; - return 1; - } - - if (lw == IDC_WIPE_MODE && hw == CBN_SELCHANGE) - { - Warning ("WIPE_WARNING", hwndDlg); - return 1; - } - - if (hw == CBN_SELCHANGE && lw == IDC_COMBO_BOX) - { - ComboSelChangeEA (hwndDlg); - SetWindowTextW (GetDlgItem (hCurPage, IDC_BENCHMARK), GetString ("IDC_BENCHMARK")); - return 1; - } - - if (hw == CBN_SELCHANGE && lw == IDC_COMBO_BOX_HASH_ALGO) - { - ShowWindow (GetDlgItem (hwndDlg, IDT_HASH_ALGO), SW_SHOW); - if (SysEncInEffect()) - { - HWND hHashAlgoItem = GetDlgItem (hCurPage, IDC_COMBO_BOX_HASH_ALGO); - int selectedAlgo = (int)SendMessage (hHashAlgoItem, CB_GETITEMDATA, SendMessage (hHashAlgoItem, CB_GETCURSEL, 0, 0), 0); - - if (!bSystemIsGPT && !HashForSystemEncryption (selectedAlgo)) - { - hash_algo = DEFAULT_HASH_ALGORITHM_BOOT; - RandSetHashFunction (DEFAULT_HASH_ALGORITHM_BOOT); - Info ("ALGO_NOT_SUPPORTED_FOR_SYS_ENCRYPTION", MainDlg); - SelectAlgo (GetDlgItem (hCurPage, IDC_COMBO_BOX_HASH_ALGO), &hash_algo); - } - } - return 1; - } - - if (lw == IDC_PIM_ENABLE) - { - PimEnable = GetCheckBox (hwndDlg, IDC_PIM_ENABLE); - if (!PimEnable) - volumePim = 0; - return 1; - } - } - return 0; -} - -void -AddComboPairW (HWND hComboBox, const wchar_t *lpszItem, int value) -{ - LPARAM nIndex; - nIndex = SendMessageW(hComboBox, CB_ADDSTRING, 0, (LPARAM)lpszItem); - nIndex = SendMessage(hComboBox, CB_SETITEMDATA, nIndex, (LPARAM)value); -} - -/* Acording to NIST, only a blacklist check and at least 8 character should be compulsary, no special character check... */ -int PrintStrongness (char input[], unsigned int length) -{ - unsigned int n = length; - int iReturnValue = 0; - if (n < 10) - { - burn (input, sizeof(input)); - return iReturnValue = weak; - } - else if (CheckWord(input)) - { - burn (input, sizeof(input)); - return iReturnValue = weak; - } - //Tetermine the strength of the passsord - if ((n >= 13)) - { - iReturnValue = very_strong; - } - //if 3 out of 4 paramters are true - else if (n >= 10) - { - iReturnValue = strong; - } - //if 2 out of 4 values are true - else if (n >= 8) - { - iReturnValue = medium; - } - else - { - iReturnValue = weak; - } - burn (input, sizeof(input)); - return iReturnValue; -} - -/* Check if password is in list -Credits go Martin York from https://codereview.stackexchange.com/questions/52702/how-to-search-for-a-word-in-a-sorted-text-file-efficiently */ -BOOL CheckWord (char* search) -{ - - bool isWordInDict(std::string const& word); - { - struct MyDict : std::set<std::string> - { - typedef std::set<std::string>::const_iterator const_iterator; - MyDict() - { - wchar_t path[TC_MAX_PATH]; - wchar_t tmp[TC_MAX_PATH]; - wchar_t destFileName[TC_MAX_PATH] = L"password1000000.txt"; - - if (GetModuleFileName (NULL, path, ARRAYSIZE (path)) == 0) - { - Error ("ERROR_GETTING_PATH", MainDlg); - } - - StringCbCopyW(tmp, ARRAYSIZE(tmp), path); - - //detects the last '\' in order to remove the name of the exe file. Afterwards add .txt file in the path - for (int i = wcslen(path); i > 1; i--) - { - if (tmp[i] == '\\') - { - for(unsigned int j = i + 1; j < wcslen(path); j++) - { - tmp[j] = '\0'; - } - break; - } - } - StringCbCatW(tmp, sizeof(tmp), destFileName); - - std::ifstream fin(tmp); - std::copy(std::istream_iterator<std::string>(fin), std::istream_iterator<std::string>(), - std::inserter(*this, end())); - } - }; - static const MyDict dict; - MyDict::const_iterator find = dict.find(search); - - return find != dict.end(); - } -} - -/* Credits go to Barmak Shemirani from https://stackoverflow.com/questions/31407492/c-tooltip-function-for-checkbox */ -void CreateToolTip(HWND hWndParent, HWND hControlItem, PTSTR pszText) -{ - if (!hControlItem || !hWndParent || !pszText) - return; - - HWND hwndTip = CreateWindowEx(NULL, TOOLTIPS_CLASS, NULL, - WS_POPUP | TTS_NOFADE | TTS_ALWAYSTIP /*| TTS_BALLOON*/, - CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, - hWndParent, NULL, GetModuleHandle(NULL), NULL); - - if (!hwndTip) - return; - - TOOLINFO toolInfo = { 0 }; - toolInfo.cbSize = sizeof(toolInfo); - toolInfo.hwnd = hWndParent; - toolInfo.uFlags = TTF_IDISHWND | TTF_SUBCLASS; - toolInfo.uId = (UINT_PTR)hControlItem; - toolInfo.lpszText = pszText; - GetClientRect(hWndParent, &toolInfo.rect); - if (!SendMessage(hwndTip, TTM_ADDTOOL, 0, (LPARAM)&toolInfo)) - { - MessageBox(0, TEXT("TTM_ADDTOOL failed\nWrong project manifest!"), 0, 0); - } -} diff --git a/src/Format/Tcformat.h b/src/Format/Tcformat.h index a8237521..f9328afd 100644 --- a/src/Format/Tcformat.h +++ b/src/Format/Tcformat.h @@ -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 |