diff options
| author | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2015-09-22 01:12:32 +0200 |
|---|---|---|
| committer | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2015-09-26 17:44:09 +0200 |
| commit | f41be7399b414da60ab5eec2a84aedf5e77ae00e (patch) | |
| tree | 359d4db2c8f6f5b337215ea7279a3bf2ac24da26 /src/Format | |
| parent | 307568f631dd792780cb552b8eafcd91bd8c651c (diff) | |
| download | VeraCrypt-f41be7399b414da60ab5eec2a84aedf5e77ae00e.tar.gz VeraCrypt-f41be7399b414da60ab5eec2a84aedf5e77ae00e.zip | |
Windows: Support specifying volumes size using TB in GUI as it is the case in command line.
Diffstat (limited to 'src/Format')
| -rw-r--r-- | src/Format/Format.rc | 7 | ||||
| -rw-r--r-- | src/Format/Resource.h | 3 | ||||
| -rw-r--r-- | src/Format/Tcformat.c | bin | 631176 -> 633378 bytes | |||
| -rw-r--r-- | src/Format/Tcformat.h | 2 |
4 files changed, 7 insertions, 5 deletions
diff --git a/src/Format/Format.rc b/src/Format/Format.rc index 0cb989a5..ade75bd6 100644 --- a/src/Format/Format.rc +++ b/src/Format/Format.rc @@ -131,9 +131,10 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN
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 "&MB",IDC_MB,"Button",BS_AUTORADIOBUTTON,119,25,38,10
- CONTROL "&GB",IDC_GB,"Button",BS_AUTORADIOBUTTON,158,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,115,25,27,10
+ CONTROL "&GB",IDC_GB,"Button",BS_AUTORADIOBUTTON,150,25,27,10
LTEXT "",IDC_BOX_HELP,0,75,214,64
LTEXT "",IDC_SPACE_LEFT,0,44,214,21
+ CONTROL "&TB",IDC_TB,"Button",BS_AUTORADIOBUTTON,185,25,27,10
END
diff --git a/src/Format/Resource.h b/src/Format/Resource.h index e7048d66..d41c8f5e 100644 --- a/src/Format/Resource.h +++ b/src/Format/Resource.h @@ -144,4 +144,5 @@ #define IDC_LINK_PIM_INFO 1105
#define IDC_SHOW_PIM 1106
+#define IDC_TB 1107
// Next default values for new objects
@@ -152,5 +153,5 @@ #define _APS_NEXT_RESOURCE_VALUE 134
#define _APS_NEXT_COMMAND_VALUE 40001
-#define _APS_NEXT_CONTROL_VALUE 1107
+#define _APS_NEXT_CONTROL_VALUE 1108
#define _APS_NEXT_SYMED_VALUE 101
#endif
diff --git a/src/Format/Tcformat.c b/src/Format/Tcformat.c Binary files differindex 9f31ae30..3fb1aca7 100644 --- a/src/Format/Tcformat.c +++ b/src/Format/Tcformat.c diff --git a/src/Format/Tcformat.h b/src/Format/Tcformat.h index 7e94782a..5bf42fc9 100644 --- a/src/Format/Tcformat.h +++ b/src/Format/Tcformat.h @@ -40,5 +40,5 @@ static void __cdecl sysEncDriveAnalysisThread (void *hwndDlgArg); static void __cdecl volTransformThreadFunction ( void *hwndDlg );
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 EnableDisableFileNext ( HWND hComboBox , HWND hMainButton );
|