From 697ffc57f92672fcf5a404ed2a53bf31ebb15d40 Mon Sep 17 00:00:00 2001 From: Heiko Hund Date: Tue, 26 Jul 2011 09:05:16 +0200 Subject: [PATCH] fix prototype of dlgproc functions --- localization.c | 2 +- localization.h | 2 +- main.c | 4 ++-- openvpn.c | 6 +++--- passphrase.c | 2 +- proxy.c | 4 ++-- proxy.h | 4 ++-- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/localization.c b/localization.c index 83ce62b..7a697f0 100644 --- a/localization.c +++ b/localization.c @@ -314,7 +314,7 @@ FillLangListProc(HANDLE module, PTSTR type, PTSTR stringId, WORD langId, LONG_PT } -BOOL CALLBACK +INT_PTR CALLBACK LanguageSettingsDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam) { LPPSHNOTIFY psn; diff --git a/localization.h b/localization.h index 3082117..714ff41 100644 --- a/localization.h +++ b/localization.h @@ -31,6 +31,6 @@ INT_PTR LocalizedDialogBoxParam(const UINT, DLGPROC, const LPARAM); INT_PTR LocalizedDialogBox(const UINT, DLGPROC); HWND CreateLocalizedDialogParam(const UINT, DLGPROC, const LPARAM); HWND CreateLocalizedDialog(const UINT, DLGPROC); -BOOL CALLBACK LanguageSettingsDlgProc(HWND, UINT, WPARAM, LPARAM); +INT_PTR CALLBACK LanguageSettingsDlgProc(HWND, UINT, WPARAM, LPARAM); #endif diff --git a/main.c b/main.c index 280b9aa..e1a0fc0 100644 --- a/main.c +++ b/main.c @@ -47,7 +47,7 @@ /* Declare Windows procedure */ LRESULT CALLBACK WindowProcedure (HWND, UINT, WPARAM, LPARAM); -BOOL CALLBACK AboutDialogFunc (HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam); +INT_PTR CALLBACK AboutDialogFunc (HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam); static void ShowSettingsDialog(); void CloseApplication(HWND hwnd); @@ -406,7 +406,7 @@ LRESULT CALLBACK WindowProcedure (HWND hwnd, UINT message, WPARAM wParam, LPARAM } -BOOL CALLBACK AboutDialogFunc (HWND hwndDlg, UINT msg, WPARAM wParam, UNUSED LPARAM lParam) +INT_PTR CALLBACK AboutDialogFunc (HWND hwndDlg, UINT msg, WPARAM wParam, UNUSED LPARAM lParam) { HICON hIcon; diff --git a/openvpn.c b/openvpn.c index 4df60fa..6fbc00d 100644 --- a/openvpn.c +++ b/openvpn.c @@ -203,7 +203,7 @@ OnStateChange(connection_t *c, char *data) /* * DialogProc for OpenVPN username/password auth dialog windows */ -static BOOL CALLBACK +static INT_PTR CALLBACK UserAuthDialogFunc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam) { connection_t *c; @@ -270,7 +270,7 @@ UserAuthDialogFunc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam) /* * DialogProc for OpenVPN private key password dialog windows */ -static BOOL CALLBACK +static INT_PTR CALLBACK PrivKeyPassDialogFunc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam) { connection_t *c; @@ -428,7 +428,7 @@ OnStop(connection_t *c, char *msg) /* * DialogProc for OpenVPN status dialog windows */ -static BOOL CALLBACK +static INT_PTR CALLBACK StatusDialogFunc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam) { connection_t *c; diff --git a/passphrase.c b/passphrase.c index e938a50..25a689d 100644 --- a/passphrase.c +++ b/passphrase.c @@ -336,7 +336,7 @@ ChangePasswordPKCS12(HWND hwndDlg) } -static BOOL CALLBACK +static INT_PTR CALLBACK ChangePassphraseDialogFunc(HWND hwndDlg, UINT msg, WPARAM wParam, UNUSED LPARAM lParam) { HICON hIcon; diff --git a/proxy.c b/proxy.c index e34b702..3987ad6 100644 --- a/proxy.c +++ b/proxy.c @@ -39,7 +39,7 @@ extern options_t o; -bool CALLBACK +INT_PTR CALLBACK ProxySettingsDialogFunc(HWND hwndDlg, UINT msg, WPARAM wParam, UNUSED LPARAM lParam) { HICON hIcon; @@ -320,7 +320,7 @@ GetProxyRegistrySettings() } -BOOL CALLBACK +INT_PTR CALLBACK ProxyAuthDialogFunc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam) { connection_t *c; diff --git a/proxy.h b/proxy.h index 7a2fba2..2fa4619 100644 --- a/proxy.h +++ b/proxy.h @@ -19,10 +19,10 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -BOOL CALLBACK ProxySettingsDialogFunc (HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam); +INT_PTR CALLBACK ProxySettingsDialogFunc (HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam); int CheckProxySettings(HWND hwndDlg); void LoadProxySettings(HWND hwndDlg); void SaveProxySettings(HWND hwndDlg); void GetProxyRegistrySettings(); -BOOL CALLBACK ProxyAuthDialogFunc (HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam); +INT_PTR CALLBACK ProxyAuthDialogFunc (HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam); void ConstructProxyCmdLine(TCHAR *proxy_string_ptr, unsigned int size);