From f41be7399b414da60ab5eec2a84aedf5e77ae00e Mon Sep 17 00:00:00 2001 From: Mounir IDRASSI Date: Tue, 22 Sep 2015 01:12:32 +0200 Subject: Windows: Support specifying volumes size using TB in GUI as it is the case in command line. --- src/Format/Format.rc | 7 ++++--- src/Format/Resource.h | 3 ++- src/Format/Tcformat.c | Bin 631176 -> 633378 bytes src/Format/Tcformat.h | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-) (limited to 'src/Format') 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 @@ -130,11 +130,12 @@ STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD 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 IDD_VOLUME_LOCATION_PAGE_DLG DIALOGEX 0, 0, 226, 172 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 @@ -143,6 +143,7 @@ #define IDT_DRIVE_LETTER 1104 #define IDC_LINK_PIM_INFO 1105 #define IDC_SHOW_PIM 1106 +#define IDC_TB 1107 // Next default values for new objects // @@ -151,7 +152,7 @@ #define _APS_NO_MFC 1 #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 #endif diff --git a/src/Format/Tcformat.c b/src/Format/Tcformat.c index 9f31ae30..3fb1aca7 100644 Binary files a/src/Format/Tcformat.c and b/src/Format/Tcformat.c differ 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 @@ -39,7 +39,7 @@ static void VerifySizeAndUpdate ( HWND hwndDlg , BOOL bUpdate ); 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 ); BOOL QueryFreeSpace ( HWND hwndDlg , HWND hwndTextBox , BOOL display ); -- cgit v1.2.3