From 5867250820d5676a2c4925aade2baeaa30aa2b12 Mon Sep 17 00:00:00 2001 From: Mounir IDRASSI Date: Thu, 28 May 2015 01:01:46 +0200 Subject: Windows: Display VeraCrypt version information when the command line switch /help is used. --- src/Common/Cmdline.c | 12 +++++++++++- src/Common/Common.rc | 8 ++++---- 2 files changed, 15 insertions(+), 5 deletions(-) (limited to 'src/Common') diff --git a/src/Common/Cmdline.c b/src/Common/Cmdline.c index c1fde79a..6e325fe3 100644 --- a/src/Common/Cmdline.c +++ b/src/Common/Cmdline.c @@ -45,7 +45,17 @@ BOOL CALLBACK CommandHelpDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM *tmp = 0; - StringCbCopyA (tmp, 8192, "Command line options:\n\n"); + StringCbCopyA (tmp, 8192, "VeraCrypt " VERSION_STRING); +#ifdef _WIN64 + StringCbCatA (tmp, 8192, " (64-bit)"); +#else + StringCbCatA (tmp, 8192, " (32-bit)"); +#endif +#if (defined(_DEBUG) || defined(DEBUG)) + StringCbCatA (tmp, 8192, " (debug)"); +#endif + + StringCbCatA (tmp, 8192, "\n\nCommand line options:\n\n"); for (i = 0; i < as->arg_cnt; i ++) { if (!as->args[i].Internal) diff --git a/src/Common/Common.rc b/src/Common/Common.rc index d296e7b0..f18c0745 100644 --- a/src/Common/Common.rc +++ b/src/Common/Common.rc @@ -45,14 +45,14 @@ BEGIN CONTROL IDB_TEXTUAL_LOGO_96DPI,IDC_TEXTUAL_LOGO_IMG,"Static",SS_BITMAP,12,26,157,16 END -IDD_COMMANDHELP_DLG DIALOGEX 0, 0, 249, 234 +IDD_COMMANDHELP_DLG DIALOGEX 0, 0, 249, 274 STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Command Line Help" CLASS "VeraCryptCustomDlg" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - DEFPUSHBUTTON "OK",IDOK,93,212,59,14 - LTEXT "",IDC_COMMANDHELP_TEXT,20,11,208,195 + DEFPUSHBUTTON "OK",IDOK,93,252,59,14 + LTEXT "",IDC_COMMANDHELP_TEXT,20,10,208,241 END IDD_RAWDEVICES_DLG DIALOGEX 0, 0, 305, 209 @@ -336,7 +336,7 @@ BEGIN IDD_COMMANDHELP_DLG, DIALOG BEGIN - BOTTOMMARGIN, 226 + BOTTOMMARGIN, 266 END IDD_RAWDEVICES_DLG, DIALOG -- cgit v1.2.3