--- truecrypt/mount/mount.rc 2018/04/24 16:47:08 1.1.1.10 +++ truecrypt/mount/mount.rc 2018/04/24 17:01:38 1.1.1.20 @@ -52,12 +52,13 @@ BEGIN "Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,162,10,165,16 CONTROL "Enabled",IDC_PREF_BKG_TASK_ENABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,42,111,10 CONTROL "Exit when there are no mounted volumes",IDC_CLOSE_BKG_TASK_WHEN_NOVOL, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,126,42,160,10 - CONTROL "Start TrueCrypt",IDC_PREF_LOGON_START,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,76,114,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,140,42,188,10 + CONTROL "Start TrueCrypt Background Task",IDC_PREF_LOGON_START, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,76,126,10 CONTROL "Mount all device-hosted TrueCrypt volumes",IDC_PREF_LOGON_MOUNT_DEVICES, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,126,71,202,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,140,71,188,10 CONTROL "Mount favorite volumes",IDC_PREF_LOGON_MOUNT_FAVORITES, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,126,82,202,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,140,82,188,10 CONTROL "User logs off",IDC_PREF_DISMOUNT_LOGOFF,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,81,109,114,11 CONTROL "Screen saver is launched",IDC_PREF_DISMOUNT_SCREENSAVER, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,81,120,114,10 @@ -72,7 +73,7 @@ BEGIN "Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,175,316,11 CONTROL "Close all Explorer windows of volume being dismounted",IDC_PREF_CLOSE_DISMOUNTED_WINDOWS, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,187,316,10 - CONTROL "Preserve timestamps of file containers and keyfiles",IDC_PRESERVE_TIMESTAMPS, + CONTROL "Preserve timestamps of file containers",IDC_PRESERVE_TIMESTAMPS, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,199,316,10 CONTROL "Cache passwords in driver memory",IDC_PREF_CACHE_PASSWORDS, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,228,146,11 @@ -80,10 +81,8 @@ BEGIN "Button",BS_AUTOCHECKBOX | WS_TABSTOP,162,228,165,11 CONTROL "Wipe cached passwords on auto-dismount",IDC_PREF_WIPE_CACHE_ON_AUTODISMOUNT, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,240,296,11 - PUSHBUTTON "Hot Key Settings...",IDC_PREFS_HOTKEY_SETTINGS,4,262,81,14 - PUSHBUTTON "Default Keyfiles...",IDC_PREFS_KEYFILE_SETTINGS,91,262,81,14 - DEFPUSHBUTTON "OK",IDOK,226,262,50,14 - PUSHBUTTON "Cancel",IDCANCEL,282,262,50,14 + DEFPUSHBUTTON "OK",IDOK,225,262,50,14 + PUSHBUTTON "Cancel",IDCANCEL,281,262,50,14 GROUPBOX "Windows",IDT_WINDOWS_RELATED_SETTING,4,164,328,50 GROUPBOX "Default Mount Options",IDT_DEFAULT_MOUNT_OPTIONS,4,2,328,26 GROUPBOX "TrueCrypt Background Task",IDT_TASKBAR_ICON,4,31,328,27 @@ -92,20 +91,21 @@ BEGIN LTEXT "Dismount all when:",IDT_AUTO_DISMOUNT_ON,9,115,71,17 GROUPBOX "Password Cache",IDT_PW_CACHE_OPTIONS,4,217,328,38 GROUPBOX "Actions to perform upon log on to Windows",IDT_LOGON,4,61,328,35 + PUSHBUTTON "More Settings...",IDC_MORE_SETTINGS,5,262,85,14 END -IDD_VOLUME_PROPERTIES DIALOGEX 60, 30, 284, 185 +IDD_VOLUME_PROPERTIES DIALOGEX 60, 30, 284, 186 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "TrueCrypt Volume Properties" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - DEFPUSHBUTTON "OK",IDOK,114,164,55,14 - CONTROL "",IDC_VOLUME_PROPERTIES_LIST,"SysListView32",LVS_REPORT | LVS_ALIGNLEFT | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,7,6,269,152 + DEFPUSHBUTTON "OK",IDOK,114,166,55,14 + 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, 162 STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Change Volume Password and Keyfiles" +CAPTION "Change Password or Keyfiles" CLASS "CustomDlg" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN @@ -149,7 +149,7 @@ BEGIN PUSHBUTTON "&Auto-Mount Devices",IDC_MOUNTALL,100,243,84,18 PUSHBUTTON "Di&smount All",IDC_UNMOUNTALL,192,243,84,18,WS_GROUP PUSHBUTTON "E&xit",IDC_EXIT,284,243,84,18,WS_GROUP - CONTROL 20,IDB_LOGO,"Static",SS_BITMAP | SS_NOTIFY | WS_BORDER,16,192,27,31 + CONTROL 112,IDC_LOGO,"Static",SS_BITMAP | SS_NOTIFY | WS_BORDER,16,192,27,31 GROUPBOX "Volume",IDT_VOLUME,8,179,360,53 CONTROL "",IDC_STATIC,"Static",SS_ETCHEDFRAME,1,0,373,147 GROUPBOX "",IDC_STATIC,282,238,88,24 @@ -176,9 +176,9 @@ BEGIN RTEXT "Password:",IDT_PASSWORD,0,10,46,19 END -IDD_TRAVELLER_DLG DIALOGEX 0, 0, 300, 269 +IDD_TRAVELER_DLG DIALOGEX 0, 0, 300, 269 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "TrueCrypt Traveller Disk Setup" +CAPTION "TrueCrypt Traveler Disk Setup" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN EDITTEXT IDC_DIRECTORY,17,29,205,13,ES_AUTOHSCROLL @@ -201,11 +201,11 @@ BEGIN PUSHBUTTON "Close",IDCLOSE,236,249,57,14 GROUPBOX "File Settings",IDT_FILE_SETTINGS,6,7,287,59 GROUPBOX "AutoRun Configuration (autorun.inf)",IDT_AUTORUN,5,70,288,172 - LTEXT "TrueCrypt volume to mount (relative to traveller disk root):",IDT_TRAVELLER_MOUNT,21,147,248,8,WS_DISABLED + LTEXT "TrueCrypt volume to mount (relative to traveler disk root):",IDT_TRAVELER_MOUNT,21,147,248,8,WS_DISABLED RTEXT "Mount volume as drive letter:",IDT_MOUNT_LETTER,18,177,99,8,WS_DISABLED - LTEXT "Create traveller disk files at (traveller disk root directory):",IDT_TRAVEL_ROOT,18,19,259,8 + LTEXT "Create traveler disk files at (traveler disk root directory):",IDT_TRAVEL_ROOT,18,19,259,8 GROUPBOX "Mount Settings",IDT_MOUNT_SETTINGS,13,134,272,100,WS_DISABLED - LTEXT "Upon insertion of traveller disk: ",IDT_TRAVEL_INSERTION,13,84,263,8 + LTEXT "Upon insertion of traveler disk: ",IDT_TRAVEL_INSERTION,13,84,263,8 END IDD_HOTKEYS_DLG DIALOGEX 0, 0, 381, 239 @@ -234,6 +234,43 @@ BEGIN GROUPBOX "Shortcut",IDT_ASSIGN_HOTKEY,7,108,367,53 END +IDD_TOKEN_PREFERENCES DIALOGEX 0, 0, 316, 199 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "TrueCrypt - Security Token Preferences" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + EDITTEXT IDC_PKCS11_MODULE,16,23,204,13,ES_AUTOHSCROLL + PUSHBUTTON "Select &Library...",IDC_SELECT_PKCS11_MODULE,226,22,75,14 + PUSHBUTTON "Auto-&Detect Library",IDC_AUTO_DETECT_PKCS11_MODULE,16,41,112,14 + CONTROL "&Close token session (log out) after a volume is successfully mounted",IDC_CLOSE_TOKEN_SESSION_AFTER_MOUNT, + "Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,16,154,284,9 + DEFPUSHBUTTON "OK",IDOK,205,178,50,14 + PUSHBUTTON "Cancel",IDCANCEL,259,178,50,14 + GROUPBOX "PKCS #11 Library Path",IDT_PKCS11_LIB_PATH,7,7,302,129 + GROUPBOX "Security Options",IDT_SECURITY_OPTIONS,7,140,302,30 + LTEXT "",IDT_PKCS11_LIB_HELP,16,63,286,65 +END + +IDD_SYSENC_SETTINGS DIALOGEX 0, 0, 370, 242 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "TrueCrypt - System Encryption Settings" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + CONTROL "Do not &show any texts in the pre-boot authentication screen (except the below custom message)",IDC_DISABLE_BOOT_LOADER_OUTPUT, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,22,339,9 + EDITTEXT IDC_CUSTOM_BOOT_LOADER_MESSAGE,18,52,216,14,ES_AUTOHSCROLL + 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,18,178,339,10 + CONTROL "Allow pre-boot &authentication to be bypassed by pressing the Esc key (enables boot manager)",IDC_ALLOW_ESC_PBA_BYPASS, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,193,340,10 + DEFPUSHBUTTON "OK",IDOK,257,220,50,14 + PUSHBUTTON "Cancel",IDCANCEL,313,220,50,14 + LTEXT "Display this custom message in the pre-boot authentication screen (24 characters maximum):",IDT_CUSTOM_BOOT_LOADER_MESSAGE,18,41,337,8 + GROUPBOX "Boot Loader Screen Options",IDT_BOOT_LOADER_SCREEN_OPTIONS,8,7,355,150 + GROUPBOX "Security Options",IDT_SECURITY_OPTIONS,8,163,355,49 + LTEXT "",IDC_CUSTOM_BOOT_LOADER_MESSAGE_HELP,18,74,337,73 +END + ///////////////////////////////////////////////////////////////////////////// // @@ -256,7 +293,7 @@ BEGIN LEFTMARGIN, 7 RIGHTMARGIN, 277 TOPMARGIN, 7 - BOTTOMMARGIN, 178 + BOTTOMMARGIN, 179 END IDD_PASSWORDCHANGE_DLG, DIALOG @@ -278,7 +315,7 @@ BEGIN BOTTOMMARGIN, 63 END - IDD_TRAVELLER_DLG, DIALOG + IDD_TRAVELER_DLG, DIALOG BEGIN LEFTMARGIN, 7 RIGHTMARGIN, 293 @@ -293,6 +330,22 @@ BEGIN TOPMARGIN, 7 BOTTOMMARGIN, 232 END + + IDD_TOKEN_PREFERENCES, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 309 + TOPMARGIN, 7 + BOTTOMMARGIN, 192 + END + + IDD_SYSENC_SETTINGS, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 363 + TOPMARGIN, 7 + BOTTOMMARGIN, 235 + END END #endif // APSTUDIO_INVOKED @@ -303,13 +356,13 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 4,3,0,0 - PRODUCTVERSION 4,3,0,0 - FILEFLAGSMASK 0x37L + FILEVERSION 6,2,0,0 + PRODUCTVERSION 6,2,0,0 + FILEFLAGSMASK 0x17L #ifdef _DEBUG - FILEFLAGS 0x21L + FILEFLAGS 0x1L #else - FILEFLAGS 0x20L + FILEFLAGS 0x0L #endif FILEOS 0x4L FILETYPE 0x1L @@ -321,13 +374,12 @@ BEGIN BEGIN VALUE "CompanyName", "TrueCrypt Foundation" VALUE "FileDescription", "TrueCrypt" - VALUE "FileVersion", "4.3" + VALUE "FileVersion", "6.2" VALUE "LegalCopyright", "TrueCrypt Foundation" VALUE "LegalTrademarks", "TrueCrypt" VALUE "OriginalFilename", "TrueCrypt.exe" VALUE "ProductName", "TrueCrypt" - VALUE "ProductVersion", "4.3" - VALUE "SpecialBuild", "2007-03-19" + VALUE "ProductVersion", "6.2" END END BLOCK "VarFileInfo" @@ -369,9 +421,12 @@ END // Bitmap // -IDB_DRIVEICON BITMAP "driveicon.bmp" -IDB_DRIVEICON_MASK BITMAP "driveicon_mask.bmp" -IDB_LOGO BITMAP "../common/logo.bmp" +IDB_DRIVEICON BITMAP "Drive_icon_96dpi.bmp" +IDB_DRIVEICON_MASK BITMAP "Drive_icon_mask_96dpi.bmp" +IDB_LOGO_96DPI BITMAP "Logo_96dpi.bmp" +IDB_LOGO_288DPI BITMAP "Logo_288dpi.bmp" +IDB_SYS_DRIVEICON BITMAP "System_drive_icon_96dpi.bmp" +IDB_SYS_DRIVEICON_MASK BITMAP "System_drive_icon_mask_96dpi.bmp" ///////////////////////////////////////////////////////////////////////////// // @@ -380,10 +435,6 @@ IDB_LOGO BITMAP IDR_MENU MENU BEGIN - POPUP "File" - BEGIN - MENUITEM "Exit", IDM_EXIT - END POPUP "&Volumes" BEGIN MENUITEM "Select File...", IDM_SELECT_FILE @@ -392,6 +443,8 @@ BEGIN MENUITEM "Mount Favorite Volumes", IDM_MOUNT_FAVORITE_VOLUMES MENUITEM "Save Currently Mounted Volumes as Favorite", IDM_SAVE_FAVORITE_VOLUMES MENUITEM SEPARATOR + MENUITEM "Resume Interrupted Process", IDM_RESUME_INTERRUPTED_PROC + MENUITEM SEPARATOR MENUITEM "Mount Volume", IDM_MOUNT_VOLUME MENUITEM "Mount Volume with Options", IDM_MOUNT_VOLUME_OPTIONS MENUITEM "Auto-Mount All Device-Hosted Volumes", IDM_MOUNTALL @@ -405,6 +458,26 @@ BEGIN MENUITEM SEPARATOR MENUITEM "Volume Properties", IDM_VOLUME_PROPERTIES END + POPUP "S&ystem" + BEGIN + MENUITEM "Encrypt System Partition/Drive...", IDM_ENCRYPT_SYSTEM_DEVICE + MENUITEM "Permanently Decrypt System Partition/Drive", IDM_PERMANENTLY_DECRYPT_SYS + MENUITEM "Resume Interrupted Process", IDM_SYSENC_RESUME + MENUITEM SEPARATOR + MENUITEM "Create Hidden Operating System...", IDM_CREATE_HIDDEN_OS + MENUITEM SEPARATOR + MENUITEM "Create Rescue Disk...", IDM_CREATE_RESCUE_DISK + MENUITEM "Verify Rescue Disk", IDM_VERIFY_RESCUE_DISK + MENUITEM SEPARATOR + MENUITEM "Mount Without Pre-Boot &Authentication...", IDM_MOUNT_SYSENC_PART_WITHOUT_PBA + MENUITEM SEPARATOR + MENUITEM "Change Password...", IDM_CHANGE_SYS_PASSWORD + MENUITEM "Set Header Key Derivation Algorithm...", IDM_CHANGE_SYS_HEADER_KEY_DERIV_ALGO + MENUITEM SEPARATOR + MENUITEM "Properties...", IDM_SYSTEM_ENCRYPTION_STATUS + MENUITEM SEPARATOR + MENUITEM "Settings...", IDM_SYS_ENC_SETTINGS + END POPUP "&Keyfiles" BEGIN MENUITEM "Add/Remove Keyfiles to/from Volume...", IDM_ADD_REMOVE_VOL_KEYFILES @@ -412,6 +485,9 @@ BEGIN MENUITEM SEPARATOR MENUITEM "Generate Random Keyfile...", IDM_GENERATE_KEYFILE MENUITEM SEPARATOR + MENUITEM "Manage Security Token Keyfiles...", IDM_MANAGE_TOKEN_KEYFILES + MENUITEM "Close All Security Token Sessions", IDM_CLOSE_ALL_TOKEN_SESSIONS + MENUITEM SEPARATOR MENUITEM "Set Default Keyfiles/Paths...", IDM_SET_DEFAULT_KEYFILES END POPUP "T&ools" @@ -419,7 +495,7 @@ BEGIN MENUITEM "Benchmark...", IDM_BENCHMARK MENUITEM "Test Vectors...", IDM_TEST_VECTORS MENUITEM SEPARATOR - MENUITEM "Traveller Disk Setup...", IDM_TRAVELLER + MENUITEM "Traveler Disk Setup...", IDM_TRAVELER MENUITEM "Keyfile Generator", IDM_KEYFILE_GENERATOR MENUITEM "Volume Creation Wizard", IDM_VOLUME_WIZARD MENUITEM SEPARATOR @@ -431,11 +507,13 @@ BEGIN MENUITEM "Clear Volume History", IDM_CLEAR_HISTORY MENUITEM "Wipe Cached Passwords", IDM_WIPE_CACHE END - POPUP "Setti&ngs" + POPUP "Settin&gs" BEGIN MENUITEM "Language...", IDM_LANGUAGE MENUITEM "Hot Keys...", IDM_HOTKEY_SETTINGS + MENUITEM "System Encryption...", IDM_SYSENC_SETTINGS MENUITEM "Default Keyfiles...", IDM_DEFAULT_KEYFILES + MENUITEM "Security Tokens...", IDM_TOKEN_PREFERENCES MENUITEM SEPARATOR MENUITEM "Preferences...", IDM_PREFERENCES END