From beead0e1a4f408bf6167af812f572a311a92cfca Mon Sep 17 00:00:00 2001 From: Heiko Hund Date: Fri, 20 Jul 2012 12:53:14 +0200 Subject: [PATCH] enforce entry of a username when querying auth --- TODO | 1 - openvpn.c | 9 +++++++++ proxy.c | 9 +++++++++ res/openvpn-gui-res-de.rc | 4 ++-- res/openvpn-gui-res-dk.rc | 4 ++-- res/openvpn-gui-res-en.rc | 4 ++-- res/openvpn-gui-res-es.rc | 4 ++-- res/openvpn-gui-res-fi.rc | 4 ++-- res/openvpn-gui-res-fr.rc | 4 ++-- res/openvpn-gui-res-it.rc | 4 ++-- res/openvpn-gui-res-jp.rc | 4 ++-- res/openvpn-gui-res-nl.rc | 4 ++-- res/openvpn-gui-res-no.rc | 4 ++-- res/openvpn-gui-res-pl.rc | 4 ++-- res/openvpn-gui-res-pt.rc | 4 ++-- res/openvpn-gui-res-se.rc | 4 ++-- res/openvpn-gui-res-tr.rc | 4 ++-- res/openvpn-gui-res-zh-hant.rc | 4 ++-- 18 files changed, 48 insertions(+), 31 deletions(-) diff --git a/TODO b/TODO index 8c6f898..0a5766e 100644 --- a/TODO +++ b/TODO @@ -7,4 +7,3 @@ TODOs for OpenVPN-GUI * convert boolean registry values from string to dword * maybe parse config and use selected options in command line directly * have some kind of error log instead of message boxes for low level errors -* user auth dlg box: enable OK button only if username contains something diff --git a/openvpn.c b/openvpn.c index 8f65681..2e8f8a1 100644 --- a/openvpn.c +++ b/openvpn.c @@ -25,6 +25,7 @@ #endif #include +#include #include #include #include @@ -219,6 +220,14 @@ UserAuthDialogFunc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam) c = (connection_t *) GetProp(hwndDlg, cfgProp); switch (LOWORD(wParam)) { + case ID_EDT_AUTH_USER: + if (HIWORD(wParam) == EN_UPDATE) + { + int len = Edit_GetTextLength((HWND) lParam); + EnableWindow(GetDlgItem(hwndDlg, IDOK), (len ? TRUE : FALSE)); + } + break; + case IDOK: ManagementCommandFromInput(c, "username \"Auth\" \"%s\"", hwndDlg, ID_EDT_AUTH_USER); ManagementCommandFromInput(c, "password \"Auth\" \"%s\"", hwndDlg, ID_EDT_AUTH_PASS); diff --git a/proxy.c b/proxy.c index 957575f..ef1e574 100644 --- a/proxy.c +++ b/proxy.c @@ -26,6 +26,7 @@ #endif #include +#include #include #include #include @@ -342,6 +343,14 @@ ProxyAuthDialogFunc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam) case WM_COMMAND: switch (LOWORD(wParam)) { + case ID_EDT_PROXY_USER: + if (HIWORD(wParam) == EN_UPDATE) + { + int len = Edit_GetTextLength((HWND) lParam); + EnableWindow(GetDlgItem(hwndDlg, IDOK), (len ? TRUE : FALSE)); + } + break; + case IDOK: c = (connection_t *) GetProp(hwndDlg, cfgProp); proxy_type = (c->proxy_type == http ? "HTTP" : "SOCKS"); diff --git a/res/openvpn-gui-res-de.rc b/res/openvpn-gui-res-de.rc index a061115..f78b9ab 100644 --- a/res/openvpn-gui-res-de.rc +++ b/res/openvpn-gui-res-de.rc @@ -45,7 +45,7 @@ BEGIN LTEXT "Passwort:", 0, 6, 26, 50, 10 EDITTEXT ID_EDT_AUTH_USER, 60, 6, 94, 12, ES_AUTOHSCROLL EDITTEXT ID_EDT_AUTH_PASS, 60, 23, 94, 12, ES_PASSWORD | ES_AUTOHSCROLL - PUSHBUTTON "Ok", IDOK, 20, 42, 50, 14 + PUSHBUTTON "Ok", IDOK, 20, 42, 50, 14, BS_PUSHBUTTON | WS_TABSTOP | WS_DISABLED PUSHBUTTON "Abbrechen", IDCANCEL, 90, 42, 52, 14 END @@ -146,7 +146,7 @@ BEGIN EDITTEXT ID_EDT_PROXY_USER, 61, 5, 84, 12, ES_AUTOHSCROLL LTEXT "Passwort:", 202, 9, 26, 48, 10 EDITTEXT ID_EDT_PROXY_PASS, 61, 23, 84, 12, ES_PASSWORD | ES_AUTOHSCROLL - PUSHBUTTON "Ok", IDOK, 58, 43, 40, 14 + PUSHBUTTON "Ok", IDOK, 58, 43, 40, 14, BS_PUSHBUTTON | WS_TABSTOP | WS_DISABLED END STRINGTABLE diff --git a/res/openvpn-gui-res-dk.rc b/res/openvpn-gui-res-dk.rc index a61816c..2feba1f 100644 --- a/res/openvpn-gui-res-dk.rc +++ b/res/openvpn-gui-res-dk.rc @@ -46,7 +46,7 @@ BEGIN LTEXT "Password:", 0, 6, 26, 50, 10 EDITTEXT ID_EDT_AUTH_USER, 60, 6, 94, 12, ES_AUTOHSCROLL EDITTEXT ID_EDT_AUTH_PASS, 60, 23, 94, 12, ES_PASSWORD | ES_AUTOHSCROLL - PUSHBUTTON "OK", IDOK, 20, 42, 50, 14 + PUSHBUTTON "OK", IDOK, 20, 42, 50, 14, BS_PUSHBUTTON | WS_TABSTOP | WS_DISABLED PUSHBUTTON "Annuller", IDCANCEL, 90, 42, 52, 14 END @@ -146,7 +146,7 @@ BEGIN EDITTEXT ID_EDT_PROXY_USER, 65, 5, 94, 12, ES_AUTOHSCROLL LTEXT "Password:", 202, 9, 26, 55, 10 EDITTEXT ID_EDT_PROXY_PASS, 65, 23, 94, 12, ES_PASSWORD | ES_AUTOHSCROLL - PUSHBUTTON "OK", IDOK, 60, 43, 50, 14 + PUSHBUTTON "OK", IDOK, 60, 43, 50, 14, BS_PUSHBUTTON | WS_TABSTOP | WS_DISABLED END STRINGTABLE diff --git a/res/openvpn-gui-res-en.rc b/res/openvpn-gui-res-en.rc index d415d07..4747759 100644 --- a/res/openvpn-gui-res-en.rc +++ b/res/openvpn-gui-res-en.rc @@ -45,7 +45,7 @@ BEGIN LTEXT "Password:", 0, 6, 26, 50, 10 EDITTEXT ID_EDT_AUTH_USER, 60, 6, 94, 12, ES_AUTOHSCROLL EDITTEXT ID_EDT_AUTH_PASS, 60, 23, 94, 12, ES_PASSWORD | ES_AUTOHSCROLL - PUSHBUTTON "OK", IDOK, 20, 42, 50, 14 + PUSHBUTTON "OK", IDOK, 20, 42, 50, 14, BS_PUSHBUTTON | WS_TABSTOP | WS_DISABLED PUSHBUTTON "Cancel", IDCANCEL, 90, 42, 52, 14 END @@ -145,7 +145,7 @@ BEGIN EDITTEXT ID_EDT_PROXY_USER, 49, 5, 94, 12, ES_AUTOHSCROLL LTEXT "Password:", 202, 9, 26, 38, 10 EDITTEXT ID_EDT_PROXY_PASS, 49, 23, 94, 12, ES_PASSWORD | ES_AUTOHSCROLL - PUSHBUTTON "OK", IDOK, 58, 43, 40, 14 + PUSHBUTTON "OK", IDOK, 58, 43, 40, 14, BS_PUSHBUTTON | WS_TABSTOP | WS_DISABLED END STRINGTABLE diff --git a/res/openvpn-gui-res-es.rc b/res/openvpn-gui-res-es.rc index 2c16571..58f55ec 100644 --- a/res/openvpn-gui-res-es.rc +++ b/res/openvpn-gui-res-es.rc @@ -44,7 +44,7 @@ BEGIN LTEXT "Password:", 0, 6, 26, 50, 10 EDITTEXT ID_EDT_AUTH_USER, 60, 6, 94, 12, ES_AUTOHSCROLL EDITTEXT ID_EDT_AUTH_PASS, 60, 23, 94, 12, ES_PASSWORD | ES_AUTOHSCROLL - PUSHBUTTON "OK", IDOK, 20, 42, 50, 14 + PUSHBUTTON "OK", IDOK, 20, 42, 50, 14, BS_PUSHBUTTON | WS_TABSTOP | WS_DISABLED PUSHBUTTON "Cancelar", IDCANCEL, 90, 42, 52, 14 END @@ -144,7 +144,7 @@ BEGIN EDITTEXT ID_EDT_PROXY_USER, 49, 5, 94, 12, ES_AUTOHSCROLL LTEXT "Clave:", 202, 9, 26, 38, 10 EDITTEXT ID_EDT_PROXY_PASS, 49, 23, 94, 12, ES_PASSWORD | ES_AUTOHSCROLL - PUSHBUTTON "OK", IDOK, 58, 43, 40, 14 + PUSHBUTTON "OK", IDOK, 58, 43, 40, 14, BS_PUSHBUTTON | WS_TABSTOP | WS_DISABLED END STRINGTABLE diff --git a/res/openvpn-gui-res-fi.rc b/res/openvpn-gui-res-fi.rc index 8c049fa..5d3d0a4 100644 --- a/res/openvpn-gui-res-fi.rc +++ b/res/openvpn-gui-res-fi.rc @@ -46,7 +46,7 @@ BEGIN LTEXT "Salasana:", 0, 6, 26, 50, 10 EDITTEXT ID_EDT_AUTH_USER, 60, 6, 94, 12, ES_AUTOHSCROLL EDITTEXT ID_EDT_AUTH_PASS, 60, 23, 94, 12, ES_PASSWORD | ES_AUTOHSCROLL - PUSHBUTTON "OK", IDOK, 20, 42, 50, 14 + PUSHBUTTON "OK", IDOK, 20, 42, 50, 14, BS_PUSHBUTTON | WS_TABSTOP | WS_DISABLED PUSHBUTTON "Peruuta", IDCANCEL, 90, 42, 52, 14 END @@ -146,7 +146,7 @@ BEGIN EDITTEXT ID_EDT_PROXY_USER, 52, 5, 91, 12, ES_AUTOHSCROLL LTEXT "Salasana:", 202, 9, 26, 38, 10 EDITTEXT ID_EDT_PROXY_PASS, 52, 23, 91, 12, ES_PASSWORD | ES_AUTOHSCROLL - PUSHBUTTON "OK", IDOK, 58, 43, 40, 14 + PUSHBUTTON "OK", IDOK, 58, 43, 40, 14, BS_PUSHBUTTON | WS_TABSTOP | WS_DISABLED END STRINGTABLE diff --git a/res/openvpn-gui-res-fr.rc b/res/openvpn-gui-res-fr.rc index 421c620..1b08ef8 100644 --- a/res/openvpn-gui-res-fr.rc +++ b/res/openvpn-gui-res-fr.rc @@ -44,7 +44,7 @@ BEGIN LTEXT "Mot de passe:", 0, 6, 26, 50, 10 EDITTEXT ID_EDT_AUTH_USER, 60, 6, 94, 12, ES_AUTOHSCROLL EDITTEXT ID_EDT_AUTH_PASS, 60, 23, 94, 12, ES_PASSWORD | ES_AUTOHSCROLL - PUSHBUTTON "OK", IDOK, 20, 42, 50, 14 + PUSHBUTTON "OK", IDOK, 20, 42, 50, 14, BS_PUSHBUTTON | WS_TABSTOP | WS_DISABLED PUSHBUTTON "Annuler", IDCANCEL, 90, 42, 52, 14 END @@ -144,7 +144,7 @@ BEGIN EDITTEXT ID_EDT_PROXY_USER, 57, 5, 87, 12, ES_AUTOHSCROLL LTEXT "Mot de passe:", 202, 9, 26, 47, 10 EDITTEXT ID_EDT_PROXY_PASS, 57, 23, 87, 12, ES_PASSWORD | ES_AUTOHSCROLL - PUSHBUTTON "OK", IDOK, 58, 43, 40, 14 + PUSHBUTTON "OK", IDOK, 58, 43, 40, 14, BS_PUSHBUTTON | WS_TABSTOP | WS_DISABLED END STRINGTABLE diff --git a/res/openvpn-gui-res-it.rc b/res/openvpn-gui-res-it.rc index 203eb54..9765b26 100644 --- a/res/openvpn-gui-res-it.rc +++ b/res/openvpn-gui-res-it.rc @@ -44,7 +44,7 @@ BEGIN LTEXT "Password:", 0, 6, 26, 50, 10 EDITTEXT ID_EDT_AUTH_USER, 60, 6, 94, 12, ES_AUTOHSCROLL EDITTEXT ID_EDT_AUTH_PASS, 60, 23, 94, 12, ES_PASSWORD | ES_AUTOHSCROLL - PUSHBUTTON "OK", IDOK, 20, 42, 50, 14 + PUSHBUTTON "OK", IDOK, 20, 42, 50, 14, BS_PUSHBUTTON | WS_TABSTOP | WS_DISABLED PUSHBUTTON "Annulla", IDCANCEL, 90, 42, 52, 14 END @@ -143,7 +143,7 @@ BEGIN EDITTEXT ID_EDT_PROXY_USER, 49, 5, 94, 12, ES_AUTOHSCROLL LTEXT "Password:", 202, 9, 26, 38, 10 EDITTEXT ID_EDT_PROXY_PASS, 49, 23, 94, 12, ES_PASSWORD | ES_AUTOHSCROLL - PUSHBUTTON "OK", IDOK, 58, 43, 40, 14 + PUSHBUTTON "OK", IDOK, 58, 43, 40, 14, BS_PUSHBUTTON | WS_TABSTOP | WS_DISABLED END STRINGTABLE diff --git a/res/openvpn-gui-res-jp.rc b/res/openvpn-gui-res-jp.rc index 3c221da..7fc85d8 100644 --- a/res/openvpn-gui-res-jp.rc +++ b/res/openvpn-gui-res-jp.rc @@ -47,7 +47,7 @@ BEGIN LTEXT "パスワード:", 0, 6, 26, 50, 10 EDITTEXT ID_EDT_AUTH_USER, 60, 6, 94, 12, ES_AUTOHSCROLL EDITTEXT ID_EDT_AUTH_PASS, 60, 23, 94, 12, ES_PASSWORD | ES_AUTOHSCROLL - PUSHBUTTON "OK", IDOK, 20, 42, 50, 14 + PUSHBUTTON "OK", IDOK, 20, 42, 50, 14, BS_PUSHBUTTON | WS_TABSTOP | WS_DISABLED PUSHBUTTON "キャンセル", IDCANCEL, 90, 42, 52, 14 END @@ -147,7 +147,7 @@ BEGIN EDITTEXT ID_EDT_PROXY_USER, 49, 5, 94, 12, ES_AUTOHSCROLL LTEXT "パスワード:", 202, 9, 26, 38, 10 EDITTEXT ID_EDT_PROXY_PASS, 49, 23, 94, 12, ES_PASSWORD | ES_AUTOHSCROLL - PUSHBUTTON "OK", IDOK, 58, 43, 40, 14 + PUSHBUTTON "OK", IDOK, 58, 43, 40, 14, BS_PUSHBUTTON | WS_TABSTOP | WS_DISABLED END STRINGTABLE diff --git a/res/openvpn-gui-res-nl.rc b/res/openvpn-gui-res-nl.rc index 8d499e2..a866b7d 100644 --- a/res/openvpn-gui-res-nl.rc +++ b/res/openvpn-gui-res-nl.rc @@ -44,7 +44,7 @@ BEGIN LTEXT "Wachtwoord:", 0, 6, 26, 50, 10 EDITTEXT ID_EDT_AUTH_USER, 60, 6, 94, 12, ES_AUTOHSCROLL EDITTEXT ID_EDT_AUTH_PASS, 60, 23, 94, 12, ES_PASSWORD | ES_AUTOHSCROLL - PUSHBUTTON "OK", IDOK, 20, 42, 50, 14 + PUSHBUTTON "OK", IDOK, 20, 42, 50, 14, BS_PUSHBUTTON | WS_TABSTOP | WS_DISABLED PUSHBUTTON "Annuleren", IDCANCEL, 90, 42, 52, 14 END @@ -143,7 +143,7 @@ BEGIN EDITTEXT ID_EDT_PROXY_USER, 49, 5, 94, 12, ES_AUTOHSCROLL LTEXT "Wacthwoord:", 202, 9, 26, 38, 10 EDITTEXT ID_EDT_PROXY_PASS, 49, 23, 94, 12, ES_PASSWORD | ES_AUTOHSCROLL - PUSHBUTTON "OK", IDOK, 58, 43, 40, 14 + PUSHBUTTON "OK", IDOK, 58, 43, 40, 14, BS_PUSHBUTTON | WS_TABSTOP | WS_DISABLED END STRINGTABLE diff --git a/res/openvpn-gui-res-no.rc b/res/openvpn-gui-res-no.rc index eb9fdda..fd2c8d2 100644 --- a/res/openvpn-gui-res-no.rc +++ b/res/openvpn-gui-res-no.rc @@ -45,7 +45,7 @@ BEGIN LTEXT "Passord:", 0, 6, 26, 50, 10 EDITTEXT ID_EDT_AUTH_USER, 60, 6, 94, 12, ES_AUTOHSCROLL EDITTEXT ID_EDT_AUTH_PASS, 60, 23, 94, 12, ES_PASSWORD | ES_AUTOHSCROLL - PUSHBUTTON "OK", IDOK, 20, 42, 50, 14 + PUSHBUTTON "OK", IDOK, 20, 42, 50, 14, BS_PUSHBUTTON | WS_TABSTOP | WS_DISABLED PUSHBUTTON "Avbryt", IDCANCEL, 90, 42, 52, 14 END @@ -145,7 +145,7 @@ BEGIN EDITTEXT ID_EDT_PROXY_USER, 65, 5, 94, 12, ES_AUTOHSCROLL LTEXT "Passord:", 202, 9, 26, 55, 10 EDITTEXT ID_EDT_PROXY_PASS, 65, 23, 94, 12, ES_PASSWORD | ES_AUTOHSCROLL - PUSHBUTTON "OK", IDOK, 60, 43, 50, 14 + PUSHBUTTON "OK", IDOK, 60, 43, 50, 14, BS_PUSHBUTTON | WS_TABSTOP | WS_DISABLED END STRINGTABLE diff --git a/res/openvpn-gui-res-pl.rc b/res/openvpn-gui-res-pl.rc index a80b215..8a00dbf 100644 --- a/res/openvpn-gui-res-pl.rc +++ b/res/openvpn-gui-res-pl.rc @@ -46,7 +46,7 @@ BEGIN LTEXT "Hasło:", 0, 6, 26, 50, 10 EDITTEXT ID_EDT_AUTH_USER, 60, 6, 94, 12, ES_AUTOHSCROLL EDITTEXT ID_EDT_AUTH_PASS, 60, 23, 94, 12, ES_PASSWORD | ES_AUTOHSCROLL - PUSHBUTTON "OK", IDOK, 20, 42, 50, 14 + PUSHBUTTON "OK", IDOK, 20, 42, 50, 14, BS_PUSHBUTTON | WS_TABSTOP | WS_DISABLED PUSHBUTTON "Anuluj", IDCANCEL, 90, 42, 52, 14 END @@ -146,7 +146,7 @@ BEGIN EDITTEXT ID_EDT_PROXY_USER, 49, 5, 94, 12, ES_AUTOHSCROLL LTEXT "Hasło:", 202, 9, 26, 38, 10 EDITTEXT ID_EDT_PROXY_PASS, 49, 23, 94, 12, ES_PASSWORD | ES_AUTOHSCROLL - PUSHBUTTON "OK", IDOK, 58, 43, 40, 14 + PUSHBUTTON "OK", IDOK, 58, 43, 40, 14, BS_PUSHBUTTON | WS_TABSTOP | WS_DISABLED END STRINGTABLE diff --git a/res/openvpn-gui-res-pt.rc b/res/openvpn-gui-res-pt.rc index d1c3c88..5d1eb5d 100644 --- a/res/openvpn-gui-res-pt.rc +++ b/res/openvpn-gui-res-pt.rc @@ -44,7 +44,7 @@ BEGIN LTEXT "Senha:", 0, 6, 26, 50, 10 EDITTEXT ID_EDT_AUTH_USER, 60, 6, 94, 12, ES_AUTOHSCROLL EDITTEXT ID_EDT_AUTH_PASS, 60, 23, 94, 12, ES_PASSWORD | ES_AUTOHSCROLL - PUSHBUTTON "OK", IDOK, 20, 42, 50, 14 + PUSHBUTTON "OK", IDOK, 20, 42, 50, 14, BS_PUSHBUTTON | WS_TABSTOP | WS_DISABLED PUSHBUTTON "Cancelar", IDCANCEL, 90, 42, 52, 14 END @@ -132,7 +132,7 @@ BEGIN EDITTEXT ID_EDT_PROXY_USER, 49, 5, 94, 12, ES_AUTOHSCROLL LTEXT "Senha:", 202, 9, 26, 38, 10 EDITTEXT ID_EDT_PROXY_PASS, 49, 23, 94, 12, ES_PASSWORD | ES_AUTOHSCROLL - PUSHBUTTON "OK", IDOK, 58, 43, 40, 14 + PUSHBUTTON "OK", IDOK, 58, 43, 40, 14, BS_PUSHBUTTON | WS_TABSTOP | WS_DISABLED END STRINGTABLE diff --git a/res/openvpn-gui-res-se.rc b/res/openvpn-gui-res-se.rc index c6e004c..b679958 100644 --- a/res/openvpn-gui-res-se.rc +++ b/res/openvpn-gui-res-se.rc @@ -44,7 +44,7 @@ BEGIN LTEXT "Lösenord:", 0, 6, 26, 50, 10 EDITTEXT ID_EDT_AUTH_USER, 60, 6, 94, 12, ES_AUTOHSCROLL EDITTEXT ID_EDT_AUTH_PASS, 60, 23, 94, 12, ES_PASSWORD | ES_AUTOHSCROLL - PUSHBUTTON "OK", IDOK, 20, 42, 50, 14 + PUSHBUTTON "OK", IDOK, 20, 42, 50, 14, BS_PUSHBUTTON | WS_TABSTOP | WS_DISABLED PUSHBUTTON "Avbryt", IDCANCEL, 90, 42, 52, 14 END @@ -144,7 +144,7 @@ BEGIN EDITTEXT ID_EDT_PROXY_USER, 65, 5, 94, 12, ES_AUTOHSCROLL LTEXT "Lösenord:", 202, 9, 26, 55, 10 EDITTEXT ID_EDT_PROXY_PASS, 65, 23, 94, 12, ES_PASSWORD | ES_AUTOHSCROLL - PUSHBUTTON "OK", IDOK, 60, 43, 50, 14 + PUSHBUTTON "OK", IDOK, 60, 43, 50, 14, BS_PUSHBUTTON | WS_TABSTOP | WS_DISABLED END STRINGTABLE diff --git a/res/openvpn-gui-res-tr.rc b/res/openvpn-gui-res-tr.rc index 96d9799..acc86a2 100644 --- a/res/openvpn-gui-res-tr.rc +++ b/res/openvpn-gui-res-tr.rc @@ -46,7 +46,7 @@ BEGIN LTEXT "Şifre:", 0, 6, 26, 50, 10 EDITTEXT ID_EDT_AUTH_USER, 50, 6, 104, 12, ES_AUTOHSCROLL EDITTEXT ID_EDT_AUTH_PASS, 50, 23, 104, 12, ES_PASSWORD | ES_AUTOHSCROLL - PUSHBUTTON "Tamam", IDOK, 20, 42, 50, 14 + PUSHBUTTON "Tamam", IDOK, 20, 42, 50, 14, BS_PUSHBUTTON | WS_TABSTOP | WS_DISABLED PUSHBUTTON "Çıkış", IDCANCEL, 90, 42, 52, 14 END @@ -146,7 +146,7 @@ BEGIN EDITTEXT ID_EDT_PROXY_USER, 53, 5, 90, 12, ES_AUTOHSCROLL LTEXT "Şifre:", 202, 9, 26, 42, 10 EDITTEXT ID_EDT_PROXY_PASS, 53, 23, 90, 12, ES_PASSWORD | ES_AUTOHSCROLL - PUSHBUTTON "Tamam", IDOK, 58, 43, 40, 14 + PUSHBUTTON "Tamam", IDOK, 58, 43, 40, 14, BS_PUSHBUTTON | WS_TABSTOP | WS_DISABLED END STRINGTABLE diff --git a/res/openvpn-gui-res-zh-hant.rc b/res/openvpn-gui-res-zh-hant.rc index aea3995..d12d018 100644 --- a/res/openvpn-gui-res-zh-hant.rc +++ b/res/openvpn-gui-res-zh-hant.rc @@ -46,7 +46,7 @@ BEGIN LTEXT "密碼:", 0, 6, 26, 50, 10 EDITTEXT ID_EDT_AUTH_USER, 52, 6, 102, 12, ES_AUTOHSCROLL EDITTEXT ID_EDT_AUTH_PASS, 52, 23, 102, 12, ES_PASSWORD | ES_AUTOHSCROLL - PUSHBUTTON "確認", IDOK, 20, 42, 50, 14 + PUSHBUTTON "確認", IDOK, 20, 42, 50, 14, BS_PUSHBUTTON | WS_TABSTOP | WS_DISABLED PUSHBUTTON "取消", IDCANCEL, 90, 42, 52, 14 END @@ -146,7 +146,7 @@ BEGIN EDITTEXT ID_EDT_PROXY_USER, 56, 5, 87, 12, ES_AUTOHSCROLL LTEXT "密碼:", 202, 9, 26, 38, 10 EDITTEXT ID_EDT_PROXY_PASS, 56, 23, 87, 12, ES_PASSWORD | ES_AUTOHSCROLL - PUSHBUTTON "確認", IDOK, 58, 43, 40, 14 + PUSHBUTTON "確認", IDOK, 58, 43, 40, 14, BS_PUSHBUTTON | WS_TABSTOP | WS_DISABLED END STRINGTABLE