github
/
openvpn-gui
mirror of https://github.com/OpenVPN/openvpn-gui
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #128 from selvanair/help-msg 

Fix truncation of usage message shown when --help is used

Acked-By: Gert Doering <gert@greenie.muc.de>
pull/145/head
Selva Nair 2017-03-05 11:55:53 -05:00 committed by GitHub
parent 470c886574 4b716b4666
commit 55f00b87d9
4 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
localization.c
View File

@ -63,7 +63,7 @@ FindResourceLang(PTSTR resType, PTSTR resId, LANGID langId)
} }
static LANGID LANGID
GetGUILanguage(void) GetGUILanguage(void)
{ {
if (gui_language != 0) if (gui_language != 0)

1
localization.h
View File

@ -34,5 +34,6 @@ INT_PTR LocalizedDialogBoxParam(const UINT, DLGPROC, const LPARAM);
HWND CreateLocalizedDialogParam(const UINT, DLGPROC, const LPARAM); HWND CreateLocalizedDialogParam(const UINT, DLGPROC, const LPARAM);
HWND CreateLocalizedDialog(const UINT, DLGPROC); HWND CreateLocalizedDialog(const UINT, DLGPROC);
INT_PTR CALLBACK GeneralSettingsDlgProc(HWND, UINT, WPARAM, LPARAM); INT_PTR CALLBACK GeneralSettingsDlgProc(HWND, UINT, WPARAM, LPARAM);
LANGID GetGUILanguage(void);
#endif #endif

1
main.h
View File

@ -40,6 +40,7 @@
#define MAX_LOG_LENGTH 1024/* Max number of characters per log line */ #define MAX_LOG_LENGTH 1024/* Max number of characters per log line */
#define MAX_LOG_LINES 500 /* Max number of lines in LogWindow */ #define MAX_LOG_LINES 500 /* Max number of lines in LogWindow */
#define DEL_LOG_LINES 10 /* Number of lines to delete from LogWindow */ #define DEL_LOG_LINES 10 /* Number of lines to delete from LogWindow */
#define USAGE_BUF_SIZE 2048 /* Size of buffer used to display usage message */
/* Authorized group who can use any options and config locations */ /* Authorized group who can use any options and config locations */
#define OVPN_ADMIN_GROUP TEXT("OpenVPN Administrators") /* May be reset in registry */ #define OVPN_ADMIN_GROUP TEXT("OpenVPN Administrators") /* May be reset in registry */

4
options.c
View File

@ -83,8 +83,10 @@ add_option(options_t *options, int i, TCHAR **p)
if (streq(p[0], _T("help"))) if (streq(p[0], _T("help")))
{ {
TCHAR caption[200]; TCHAR caption[200];
TCHAR msg[USAGE_BUF_SIZE];
LoadLocalizedStringBuf(caption, _countof(caption), IDS_NFO_USAGECAPTION); LoadLocalizedStringBuf(caption, _countof(caption), IDS_NFO_USAGECAPTION);
ShowLocalizedMsgEx(MB_OK, caption, IDS_NFO_USAGE); LoadLocalizedStringBuf(msg, _countof(msg), IDS_NFO_USAGE);
MessageBoxEx(NULL, msg, caption, MB_OK | MB_SETFOREGROUND, GetGUILanguage());
exit(0); exit(0);
} }
else if (streq(p[0], _T("connect")) && p[1]) else if (streq(p[0], _T("connect")) && p[1])