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

Windows: Support specifying volumes size using TB in GUI as it is the case in command line.

This commit is contained in:
Mounir IDRASSI
2015-09-22 01:12:32 +02:00
parent 307568f631
commit f41be7399b
8 changed files with 172 additions and 194 deletions

View File

@@ -37,6 +37,7 @@
<control lang="en" key="IDC_DOWNLOAD_CD_BURN_SOFTWARE">Download CD/DVD recording software</control> <control lang="en" key="IDC_DOWNLOAD_CD_BURN_SOFTWARE">Download CD/DVD recording software</control>
<control lang="en" key="IDC_FILE_CONTAINER">Create an encrypted file container</control> <control lang="en" key="IDC_FILE_CONTAINER">Create an encrypted file container</control>
<control lang="en" key="IDC_GB">&amp;GB</control> <control lang="en" key="IDC_GB">&amp;GB</control>
<control lang="en" key="IDC_TB">&amp;TB</control>
<control lang="en" key="IDC_HIDDEN_SYSENC_INFO_LINK">More information</control> <control lang="en" key="IDC_HIDDEN_SYSENC_INFO_LINK">More information</control>
<control lang="en" key="IDC_HIDDEN_VOL">Hi&amp;dden VeraCrypt volume </control> <control lang="en" key="IDC_HIDDEN_VOL">Hi&amp;dden VeraCrypt volume </control>
<control lang="en" key="IDC_HIDDEN_VOL_HELP">More information about hidden volumes</control> <control lang="en" key="IDC_HIDDEN_VOL_HELP">More information about hidden volumes</control>
@@ -562,6 +563,7 @@
<string lang="en" key="MAX_HIDVOL_SIZE_KB">Maximum possible hidden volume size for this volume is %.2f KB.</string> <string lang="en" key="MAX_HIDVOL_SIZE_KB">Maximum possible hidden volume size for this volume is %.2f KB.</string>
<string lang="en" key="MAX_HIDVOL_SIZE_MB">Maximum possible hidden volume size for this volume is %.2f MB.</string> <string lang="en" key="MAX_HIDVOL_SIZE_MB">Maximum possible hidden volume size for this volume is %.2f MB.</string>
<string lang="en" key="MAX_HIDVOL_SIZE_GB">Maximum possible hidden volume size for this volume is %.2f GB.</string> <string lang="en" key="MAX_HIDVOL_SIZE_GB">Maximum possible hidden volume size for this volume is %.2f GB.</string>
<string lang="en" key="MAX_HIDVOL_SIZE_TB">Maximum possible hidden volume size for this volume is %.2f TB.</string>
<string lang="en" key="MOUNTED_NOPWCHANGE">Volume password/keyfiles cannot be changed while the volume is mounted. Please dismount the volume first.</string> <string lang="en" key="MOUNTED_NOPWCHANGE">Volume password/keyfiles cannot be changed while the volume is mounted. Please dismount the volume first.</string>
<string lang="en" key="MOUNTED_NO_PKCS5_PRF_CHANGE">The header key derivation algorithm cannot be changed while the volume is mounted. Please dismount the volume first.</string> <string lang="en" key="MOUNTED_NO_PKCS5_PRF_CHANGE">The header key derivation algorithm cannot be changed while the volume is mounted. Please dismount the volume first.</string>
<string lang="en" key="MOUNT_BUTTON">&amp;Mount</string> <string lang="en" key="MOUNT_BUTTON">&amp;Mount</string>

View File

@@ -90,8 +90,8 @@ int GetSpaceString(char *dest, size_t maxlen, uint64 size, BOOL bDevice)
void SetCurrentVolSize(HWND hwndDlg, uint64 size) void SetCurrentVolSize(HWND hwndDlg, uint64 size)
{ {
const uint64 Muliplier[] = {BYTES_PER_KB, BYTES_PER_MB, BYTES_PER_GB}; const uint64 Muliplier[] = {BYTES_PER_KB, BYTES_PER_MB, BYTES_PER_GB, BYTES_PER_TB};
const int IdRadioBtn[] = {IDC_KB, IDC_MB, IDC_GB}; const int IdRadioBtn[] = {IDC_KB, IDC_MB, IDC_GB, IDC_TB};
const int nMaxSuffix = sizeof(Muliplier)/sizeof(uint64) - 1; const int nMaxSuffix = sizeof(Muliplier)/sizeof(uint64) - 1;
int i; int i;
char szTemp[256]; char szTemp[256];
@@ -107,8 +107,8 @@ void SetCurrentVolSize(HWND hwndDlg, uint64 size)
uint64 GetSizeBoxMultiplier(HWND hwndDlg) uint64 GetSizeBoxMultiplier(HWND hwndDlg)
{ {
const uint64 Muliplier[] = {BYTES_PER_KB, BYTES_PER_MB, BYTES_PER_GB}; const uint64 Muliplier[] = {BYTES_PER_KB, BYTES_PER_MB, BYTES_PER_GB, BYTES_PER_TB};
const int IdRadioBtn[] = {IDC_KB, IDC_MB, IDC_GB}; const int IdRadioBtn[] = {IDC_KB, IDC_MB, IDC_GB, IDC_TB};
const int nMaxSuffix = sizeof(Muliplier)/sizeof(uint64) - 1; const int nMaxSuffix = sizeof(Muliplier)/sizeof(uint64) - 1;
int i; int i;
@@ -135,6 +135,7 @@ BOOL CALLBACK ExpandVolSizeDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
EnableWindow (GetDlgItem (hwndDlg, IDC_KB), !pVolExpandParam->bIsDevice); EnableWindow (GetDlgItem (hwndDlg, IDC_KB), !pVolExpandParam->bIsDevice);
EnableWindow (GetDlgItem (hwndDlg, IDC_MB), !pVolExpandParam->bIsDevice); EnableWindow (GetDlgItem (hwndDlg, IDC_MB), !pVolExpandParam->bIsDevice);
EnableWindow (GetDlgItem (hwndDlg, IDC_GB), !pVolExpandParam->bIsDevice); EnableWindow (GetDlgItem (hwndDlg, IDC_GB), !pVolExpandParam->bIsDevice);
EnableWindow (GetDlgItem (hwndDlg, IDC_TB), !pVolExpandParam->bIsDevice);
EnableWindow (GetDlgItem (hwndDlg, IDC_INIT_NEWSPACE), EnableWindow (GetDlgItem (hwndDlg, IDC_INIT_NEWSPACE),
!(pVolExpandParam->bIsLegacy && pVolExpandParam->bIsDevice)); !(pVolExpandParam->bIsLegacy && pVolExpandParam->bIsDevice));

View File

@@ -14,11 +14,11 @@
#undef APSTUDIO_READONLY_SYMBOLS #undef APSTUDIO_READONLY_SYMBOLS
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// German (Germany) resources // English (U.S.) resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_DEU) #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
#ifdef _WIN32 #ifdef _WIN32
LANGUAGE LANG_GERMAN, SUBLANG_GERMAN LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
#pragma code_page(1252) #pragma code_page(1252)
#endif //_WIN32 #endif //_WIN32
@@ -35,7 +35,7 @@ BEGIN
EDITTEXT IDC_SIZEBOX,30,102,109,14,ES_RIGHT | ES_AUTOHSCROLL | ES_NUMBER EDITTEXT IDC_SIZEBOX,30,102,109,14,ES_RIGHT | ES_AUTOHSCROLL | ES_NUMBER
CONTROL "&KB",IDC_KB,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,169,105,38,10 CONTROL "&KB",IDC_KB,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,169,105,38,10
CONTROL "&MB",IDC_MB,"Button",BS_AUTORADIOBUTTON,209,105,38,10 CONTROL "&MB",IDC_MB,"Button",BS_AUTORADIOBUTTON,209,105,38,10
CONTROL "&GB",IDC_GB,"Button",BS_AUTORADIOBUTTON,247,105,38,10 CONTROL "&GB",IDC_GB,"Button",BS_AUTORADIOBUTTON,248,105,38,10
CONTROL "Fill new space with random data",IDC_INIT_NEWSPACE, CONTROL "Fill new space with random data",IDC_INIT_NEWSPACE,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,30,127,118,10 "Button",BS_AUTOCHECKBOX | WS_TABSTOP,30,127,118,10
DEFPUSHBUTTON "Continue",IDOK,15,238,84,18 DEFPUSHBUTTON "Continue",IDOK,15,238,84,18
@@ -51,46 +51,9 @@ BEGIN
CONTROL "",IDC_EXPAND_VOLUME_NAME,"Static",SS_SIMPLE | WS_GROUP,80,18,275,8,WS_EX_TRANSPARENT CONTROL "",IDC_EXPAND_VOLUME_NAME,"Static",SS_SIMPLE | WS_GROUP,80,18,275,8,WS_EX_TRANSPARENT
RTEXT "File system: ",IDT_FILE_SYS,31,30,42,8 RTEXT "File system: ",IDT_FILE_SYS,31,30,42,8
CONTROL "",IDC_EXPAND_FILE_SYSTEM,"Static",SS_SIMPLE | WS_GROUP,80,30,275,8,WS_EX_TRANSPARENT CONTROL "",IDC_EXPAND_FILE_SYSTEM,"Static",SS_SIMPLE | WS_GROUP,80,30,275,8,WS_EX_TRANSPARENT
CONTROL "&TB",IDC_TB,"Button",BS_AUTORADIOBUTTON,288,105,38,10
END END
/////////////////////////////////////////////////////////////////////////////
//
// DESIGNINFO
//
#ifdef APSTUDIO_INVOKED
GUIDELINES DESIGNINFO
BEGIN
IDD_SIZE_DIALOG, DIALOG
BEGIN
LEFTMARGIN, 15
RIGHTMARGIN, 361
VERTGUIDE, 30
TOPMARGIN, 14
BOTTOMMARGIN, 256
END
END
#endif // APSTUDIO_INVOKED
#endif // German (Germany) resources
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
// English (U.S.) resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
#ifdef _WIN32
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
#pragma code_page(1252)
#endif //_WIN32
/////////////////////////////////////////////////////////////////////////////
//
// Dialog
//
IDD_MOUNT_DLG DIALOGEX 0, 0, 376, 271 IDD_MOUNT_DLG DIALOGEX 0, 0, 376, 271
STYLE DS_SETFONT | DS_SETFOREGROUND | DS_3DLOOK | DS_FIXEDSYS | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU STYLE DS_SETFONT | DS_SETFOREGROUND | DS_3DLOOK | DS_FIXEDSYS | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "VeraCrypt Expander" CAPTION "VeraCrypt Expander"
@@ -178,6 +141,15 @@ END
#ifdef APSTUDIO_INVOKED #ifdef APSTUDIO_INVOKED
GUIDELINES DESIGNINFO GUIDELINES DESIGNINFO
BEGIN BEGIN
IDD_SIZE_DIALOG, DIALOG
BEGIN
LEFTMARGIN, 15
RIGHTMARGIN, 361
VERTGUIDE, 30
TOPMARGIN, 14
BOTTOMMARGIN, 256
END
IDD_MOUNT_DLG, DIALOG IDD_MOUNT_DLG, DIALOG
BEGIN BEGIN
RIGHTMARGIN, 369 RIGHTMARGIN, 369

View File

@@ -1,146 +1,147 @@
//{{NO_DEPENDENCIES}} //{{NO_DEPENDENCIES}}
// Microsoft Visual C++ generated include file. // Microsoft Visual C++ generated include file.
// Used by ExpandVolume.rc // Used by ExpandVolume.rc
// //
#define IDD_MOUNT_DLG 101 #define IDD_MOUNT_DLG 101
#define IDD_PASSWORD_DLG 104 #define IDD_PASSWORD_DLG 104
#define IDR_MENU 106 #define IDR_MENU 106
#define IDD_EXPAND_PROGRESS_DLG 106 #define IDD_EXPAND_PROGRESS_DLG 106
#define IDR_MOUNT_RSRC_HEADER 109 #define IDR_MOUNT_RSRC_HEADER 109
#define IDS_UACSTRING 110 #define IDS_UACSTRING 110
#define IDB_LOGO_288DPI 111 #define IDB_LOGO_288DPI 111
#define IDB_LOGO_96DPI 112 #define IDB_LOGO_96DPI 112
#define IDD_SIZE_DIALOG 117 #define IDD_SIZE_DIALOG 117
#define IDC_BOX_HELP 1003 #define IDC_BOX_HELP 1003
#define IDC_CACHE 1005 #define IDC_CACHE 1005
#define IDC_NO_HISTORY 1006 #define IDC_NO_HISTORY 1006
#define IDC_DRIVELIST 1007 #define IDC_DRIVELIST 1007
#define IDC_SPACE_LEFT 1009 #define IDC_SPACE_LEFT 1009
#define IDC_KB 1011 #define IDC_KB 1011
#define IDC_MB 1013 #define IDC_MB 1013
#define IDC_PROGRESS_BAR 1014 #define IDC_PROGRESS_BAR 1014
#define IDC_GB 1015 #define IDC_GB 1015
#define IDC_EXPAND_VOLUME_OLDSIZE 1017 #define IDC_TB 1016
#define IDC_EXPAND_VOLUME_NEWSIZE 1019 #define IDC_EXPAND_VOLUME_OLDSIZE 1017
#define IDC_EXPAND_VOLUME_NAME 1020 #define IDC_EXPAND_VOLUME_NEWSIZE 1019
#define IDC_EXPAND_VOLUME_INITSPACE 1021 #define IDC_EXPAND_VOLUME_NAME 1020
#define IDC_EXPAND_FILE_SYSTEM 1022 #define IDC_EXPAND_VOLUME_INITSPACE 1021
#define IDC_RANDOM_BYTES 1023 #define IDC_EXPAND_FILE_SYSTEM 1022
#define IDC_BYTESWRITTEN 1024 #define IDC_RANDOM_BYTES 1023
#define IDC_WRITESPEED 1025 #define IDC_BYTESWRITTEN 1024
#define IDC_MOUNT_OPTIONS 1026 #define IDC_WRITESPEED 1025
#define IDC_TIMEREMAIN 1027 #define IDC_MOUNT_OPTIONS 1026
#define IDC_KEY_FILES 1030 #define IDC_TIMEREMAIN 1027
#define IDC_VOLUME 1033 #define IDC_KEY_FILES 1030
#define IDC_PASSWORD 1034 #define IDC_VOLUME 1033
#define IDC_SELECT_DEVICE 1036 #define IDC_PASSWORD 1034
#define IDC_CREATE_VOLUME 1037 #define IDC_SELECT_DEVICE 1036
#define IDC_VOLUME_TOOLS 1038 #define IDC_CREATE_VOLUME 1037
#define IDC_SIZEBOX 1038 #define IDC_VOLUME_TOOLS 1038
#define IDC_WIPE_CACHE 1039 #define IDC_SIZEBOX 1038
#define IDC_MOUNTALL 1040 #define IDC_WIPE_CACHE 1039
#define IDC_SELECT_FILE 1042 #define IDC_MOUNTALL 1040
#define IDC_VOLUME_PROPERTIES 1044 #define IDC_SELECT_FILE 1042
#define IDT_RANDOM_POOL 1047 #define IDC_VOLUME_PROPERTIES 1044
#define IDT_VOL_NAME 1047 #define IDT_RANDOM_POOL 1047
#define IDT_HEADER_KEY 1048 #define IDT_VOL_NAME 1047
#define IDT_CURRENT_SIZE 1048 #define IDT_HEADER_KEY 1048
#define IDT_VOLUME 1049 #define IDT_CURRENT_SIZE 1048
#define IDT_MASTER_KEY 1049 #define IDT_VOLUME 1049
#define IDT_NEW_SIZE 1049 #define IDT_MASTER_KEY 1049
#define IDT_PASSWORD 1050 #define IDT_NEW_SIZE 1049
#define IDT_DONE 1050 #define IDT_PASSWORD 1050
#define IDT_SPEED 1051 #define IDT_DONE 1050
#define IDT_LEFT 1052 #define IDT_SPEED 1051
#define IDT_INIT_SPACE 1053 #define IDT_LEFT 1052
#define IDT_FILE_SYS 1054 #define IDT_INIT_SPACE 1053
#define IDT_INIT_SPACE2 1055 #define IDT_FILE_SYS 1054
#define IDT_RANDOM_POOL2 1055 #define IDT_INIT_SPACE2 1055
#define IDC_EXIT 1060 #define IDT_RANDOM_POOL2 1055
#define IDC_UNMOUNTALL 1063 #define IDC_EXIT 1060
#define IDC_SHOW_PASSWORD 1094 #define IDC_UNMOUNTALL 1063
#define IDC_LOGO 1095 #define IDC_SHOW_PASSWORD 1094
#define IDC_SIZEDLG_TITLE 1111 #define IDC_LOGO 1095
#define IDC_INIT_NEWSPACE 1112 #define IDC_SIZEDLG_TITLE 1111
#define IDC_INFOEXPAND 1113 #define IDC_INIT_NEWSPACE 1112
#define IDC_BOX_STATUS 1114 #define IDC_INFOEXPAND 1113
#define IDC_TRUECRYPT_MODE 1140 #define IDC_BOX_STATUS 1114
#define IDC_TRUECRYPT_MODE 1140
#define IDC_PREF_TEMP_CACHE_ON_MULTIPLE_MOUNT 1141 #define IDC_PREF_TEMP_CACHE_ON_MULTIPLE_MOUNT 1141
#define IDT_OLD_PIM 1142 #define IDT_OLD_PIM 1142
#define IDC_OLD_PIM 1143 #define IDC_OLD_PIM 1143
#define IDC_OLD_PIM_HELP 1144 #define IDC_OLD_PIM_HELP 1144
#define IDM_HELP 40001 #define ID_HOMEPAGE 1145
#define IDM_ABOUT 40002 #define IDM_HELP 40001
#define IDM_UNMOUNT_VOLUME 40003 #define IDM_ABOUT 40002
#define IDM_CLEAR_HISTORY 40004 #define IDM_UNMOUNT_VOLUME 40003
#define IDM_FORUMS 40005 #define IDM_CLEAR_HISTORY 40004
#define IDM_BENCHMARK 40006 #define IDM_FORUMS 40005
#define IDM_TRAVELER 40007 #define IDM_BENCHMARK 40006
#define IDM_MOUNT_VOLUME_OPTIONS 40008 #define IDM_TRAVELER 40007
#define IDM_FAQ 40009 #define IDM_MOUNT_VOLUME_OPTIONS 40008
#define IDM_REFRESH_DRIVE_LETTERS 40010 #define IDM_FAQ 40009
#define IDM_DEFAULT_KEYFILES 40011 #define IDM_REFRESH_DRIVE_LETTERS 40010
#define IDM_WEBSITE 40012 #define IDM_DEFAULT_KEYFILES 40011
#define IDM_MOUNTALL 40013 #define IDM_WEBSITE 40012
#define IDM_UNMOUNTALL 40014 #define IDM_MOUNTALL 40013
#define IDM_MOUNT_VOLUME 40015 #define IDM_UNMOUNTALL 40014
#define IDM_CHANGE_PASSWORD 40016 #define IDM_MOUNT_VOLUME 40015
#define IDM_VOLUME_WIZARD 40017 #define IDM_CHANGE_PASSWORD 40016
#define IDM_CREATE_VOLUME 40018 #define IDM_VOLUME_WIZARD 40017
#define IDM_WIPE_CACHE 40019 #define IDM_CREATE_VOLUME 40018
#define IDM_PREFERENCES 40020 #define IDM_WIPE_CACHE 40019
#define IDM_LICENSE 40021 #define IDM_PREFERENCES 40020
#define IDM_SELECT_FILE 40022 #define IDM_LICENSE 40021
#define IDM_SELECT_DEVICE 40023 #define IDM_SELECT_FILE 40022
#define IDM_VOLUME_PROPERTIES 40024 #define IDM_SELECT_DEVICE 40023
#define IDM_LANGUAGE 40025 #define IDM_VOLUME_PROPERTIES 40024
#define IDM_MOUNT_FAVORITE_VOLUMES 40026 #define IDM_LANGUAGE 40025
#define IDM_SAVE_FAVORITE_VOLUMES 40027 #define IDM_MOUNT_FAVORITE_VOLUMES 40026
#define IDM_BACKUP_VOL_HEADER 40028 #define IDM_SAVE_FAVORITE_VOLUMES 40027
#define IDM_RESTORE_VOL_HEADER 40029 #define IDM_BACKUP_VOL_HEADER 40028
#define IDM_HOTKEY_SETTINGS 40030 #define IDM_RESTORE_VOL_HEADER 40029
#define IDM_TC_DOWNLOADS 40031 #define IDM_HOTKEY_SETTINGS 40030
#define IDM_NEWS 40032 #define IDM_TC_DOWNLOADS 40031
#define IDM_BUGREPORT 40033 #define IDM_NEWS 40032
#define IDM_CONTACT 40034 #define IDM_BUGREPORT 40033
#define IDM_VERSION_HISTORY 40035 #define IDM_CONTACT 40034
#define IDM_HOMEPAGE 40036 #define IDM_VERSION_HISTORY 40035
#define IDM_TEST_VECTORS 40037 #define IDM_HOMEPAGE 40036
#define IDM_ADD_REMOVE_VOL_KEYFILES 40038 #define IDM_TEST_VECTORS 40037
#define IDM_REMOVE_ALL_KEYFILES_FROM_VOL 40039 #define IDM_ADD_REMOVE_VOL_KEYFILES 40038
#define IDM_GENERATE_KEYFILE 40040 #define IDM_REMOVE_ALL_KEYFILES_FROM_VOL 40039
#define IDM_CHANGE_HEADER_KEY_DERIV_ALGO 40041 #define IDM_GENERATE_KEYFILE 40040
#define IDM_KEYFILE_GENERATOR 40042 #define IDM_CHANGE_HEADER_KEY_DERIV_ALGO 40041
#define IDM_SET_DEFAULT_KEYFILES 40043 #define IDM_KEYFILE_GENERATOR 40042
#define IDM_ONLINE_TUTORIAL 40044 #define IDM_SET_DEFAULT_KEYFILES 40043
#define IDM_ONLINE_HELP 40045 #define IDM_ONLINE_TUTORIAL 40044
#define IDM_DONATIONS 40046 #define IDM_ONLINE_HELP 40045
#define IDM_CHANGE_SYS_HEADER_KEY_DERIV_ALGO 40047 #define IDM_DONATIONS 40046
#define IDM_CHANGE_SYS_PASSWORD 40048 #define IDM_CHANGE_SYS_HEADER_KEY_DERIV_ALGO 40047
#define IDM_CREATE_RESCUE_DISK 40049 #define IDM_CHANGE_SYS_PASSWORD 40048
#define IDM_PERMANENTLY_DECRYPT_SYS 40050 #define IDM_CREATE_RESCUE_DISK 40049
#define IDM_VERIFY_RESCUE_DISK 40051 #define IDM_PERMANENTLY_DECRYPT_SYS 40050
#define IDM_SYSTEM_ENCRYPTION_STATUS 40052 #define IDM_VERIFY_RESCUE_DISK 40051
#define IDM_ENCRYPT_SYSTEM_DEVICE 40053 #define IDM_SYSTEM_ENCRYPTION_STATUS 40052
#define IDM_SYSENC_RESUME 40054 #define IDM_ENCRYPT_SYSTEM_DEVICE 40053
#define IDM_MOUNT_SYSENC_PART_WITHOUT_PBA 40055 #define IDM_SYSENC_RESUME 40054
#define IDM_CREATE_HIDDEN_OS 40056 #define IDM_MOUNT_SYSENC_PART_WITHOUT_PBA 40055
#define IDM_TOKEN_PREFERENCES 40057 #define IDM_CREATE_HIDDEN_OS 40056
#define IDM_CLOSE_ALL_TOKEN_SESSIONS 40058 #define IDM_TOKEN_PREFERENCES 40057
#define IDM_SYS_ENC_SETTINGS 40059 #define IDM_CLOSE_ALL_TOKEN_SESSIONS 40058
#define IDM_SYSENC_SETTINGS 40060 #define IDM_SYS_ENC_SETTINGS 40059
#define IDM_RESUME_INTERRUPTED_PROC 40061 #define IDM_SYSENC_SETTINGS 40060
#define IDM_MANAGE_TOKEN_KEYFILES 40062 #define IDM_RESUME_INTERRUPTED_PROC 40061
#define ID_HOMEPAGE 40063 #define IDM_MANAGE_TOKEN_KEYFILES 40062
// Next default values for new objects // Next default values for new objects
// //
#ifdef APSTUDIO_INVOKED #ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS #ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NO_MFC 1 #define _APS_NO_MFC 1
#define _APS_NEXT_RESOURCE_VALUE 120 #define _APS_NEXT_RESOURCE_VALUE 120
#define _APS_NEXT_COMMAND_VALUE 40064 #define _APS_NEXT_COMMAND_VALUE 40064
#define _APS_NEXT_CONTROL_VALUE 1145 #define _APS_NEXT_CONTROL_VALUE 1146
#define _APS_NEXT_SYMED_VALUE 101 #define _APS_NEXT_SYMED_VALUE 101
#endif #endif
#endif #endif

View File

@@ -130,11 +130,12 @@ STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD
FONT 8, "MS Shell Dlg", 0, 0, 0x0 FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN BEGIN
EDITTEXT IDC_SIZEBOX,0,22,71,14,ES_AUTOHSCROLL | ES_NUMBER EDITTEXT IDC_SIZEBOX,0,22,71,14,ES_AUTOHSCROLL | ES_NUMBER
CONTROL "&KB",IDC_KB,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,80,25,38,10 CONTROL "&KB",IDC_KB,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,80,25,27,10
CONTROL "&MB",IDC_MB,"Button",BS_AUTORADIOBUTTON,119,25,38,10 CONTROL "&MB",IDC_MB,"Button",BS_AUTORADIOBUTTON,115,25,27,10
CONTROL "&GB",IDC_GB,"Button",BS_AUTORADIOBUTTON,158,25,38,10 CONTROL "&GB",IDC_GB,"Button",BS_AUTORADIOBUTTON,150,25,27,10
LTEXT "",IDC_BOX_HELP,0,75,214,64 LTEXT "",IDC_BOX_HELP,0,75,214,64
LTEXT "",IDC_SPACE_LEFT,0,44,214,21 LTEXT "",IDC_SPACE_LEFT,0,44,214,21
CONTROL "&TB",IDC_TB,"Button",BS_AUTORADIOBUTTON,185,25,27,10
END END
IDD_VOLUME_LOCATION_PAGE_DLG DIALOGEX 0, 0, 226, 172 IDD_VOLUME_LOCATION_PAGE_DLG DIALOGEX 0, 0, 226, 172

View File

@@ -143,6 +143,7 @@
#define IDT_DRIVE_LETTER 1104 #define IDT_DRIVE_LETTER 1104
#define IDC_LINK_PIM_INFO 1105 #define IDC_LINK_PIM_INFO 1105
#define IDC_SHOW_PIM 1106 #define IDC_SHOW_PIM 1106
#define IDC_TB 1107
// Next default values for new objects // Next default values for new objects
// //
@@ -151,7 +152,7 @@
#define _APS_NO_MFC 1 #define _APS_NO_MFC 1
#define _APS_NEXT_RESOURCE_VALUE 134 #define _APS_NEXT_RESOURCE_VALUE 134
#define _APS_NEXT_COMMAND_VALUE 40001 #define _APS_NEXT_COMMAND_VALUE 40001
#define _APS_NEXT_CONTROL_VALUE 1107 #define _APS_NEXT_CONTROL_VALUE 1108
#define _APS_NEXT_SYMED_VALUE 101 #define _APS_NEXT_SYMED_VALUE 101
#endif #endif
#endif #endif

Binary file not shown.

View File

@@ -39,7 +39,7 @@ static void VerifySizeAndUpdate ( HWND hwndDlg , BOOL bUpdate );
static void __cdecl sysEncDriveAnalysisThread (void *hwndDlgArg); static void __cdecl sysEncDriveAnalysisThread (void *hwndDlgArg);
static void __cdecl volTransformThreadFunction ( void *hwndDlg ); static void __cdecl volTransformThreadFunction ( void *hwndDlg );
static void LoadPage ( HWND hwndDlg , int nPageNo ); static void LoadPage ( HWND hwndDlg , int nPageNo );
int PrintFreeSpace ( HWND hwndTextBox , char *lpszDrive , PLARGE_INTEGER lDiskFree ); __int64 PrintFreeSpace ( HWND hwndTextBox , char *lpszDrive , PLARGE_INTEGER lDiskFree );
void DisplaySizingErrorText ( HWND hwndTextBox ); void DisplaySizingErrorText ( HWND hwndTextBox );
void EnableDisableFileNext ( HWND hComboBox , HWND hMainButton ); void EnableDisableFileNext ( HWND hComboBox , HWND hMainButton );
BOOL QueryFreeSpace ( HWND hwndDlg , HWND hwndTextBox , BOOL display ); BOOL QueryFreeSpace ( HWND hwndDlg , HWND hwndTextBox , BOOL display );