From 4359874f5a086805d65d4f8114414a88c86009e7 Mon Sep 17 00:00:00 2001 From: Hiroshi Inoue Date: Sat, 20 Apr 2013 20:26:45 +0900 Subject: [PATCH] Fix a DataSource registration crash bug on 64bit Windows. --- setup.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/setup.c b/setup.c index 73a6a8c..2c6d869 100644 --- a/setup.c +++ b/setup.c @@ -105,11 +105,11 @@ ConfigDSN(HWND hwnd, if (hwnd) { /* Display dialog(s) */ - fSuccess = (IDOK == DialogBoxParam(s_hModule, - MAKEINTRESOURCE(DLG_CONFIG), - hwnd, - ConfigDlgProc, - (LONG) (LPSTR) lpsetupdlg)); + fSuccess = (IDOK == DialogBoxParam(s_hModule, + MAKEINTRESOURCE(DLG_CONFIG), + hwnd, + ConfigDlgProc, + (LPARAM) lpsetupdlg)); } else if (lpsetupdlg->ci.dsn[0]) fSuccess = SetDSNAttributes(hwnd, lpsetupdlg, NULL); @@ -306,7 +306,7 @@ ConfigDlgProc(HWND hdlg, /* Accept results */ case IDOK: case IDAPPLY: - lpsetupdlg = (LPSETUPDLG) GetWindowLong(hdlg, DWLP_USER); + lpsetupdlg = (LPSETUPDLG) GetWindowLongPtr(hdlg, DWLP_USER); /* Retrieve dialog values */ if (!lpsetupdlg->fDefault) GetDlgItemText(hdlg, IDC_DSNAME, @@ -326,7 +326,7 @@ ConfigDlgProc(HWND hdlg, case IDC_TEST: { - lpsetupdlg = (LPSETUPDLG) GetWindowLong(hdlg, DWLP_USER); + lpsetupdlg = (LPSETUPDLG) GetWindowLongPtr(hdlg, DWLP_USER); if (NULL != lpsetupdlg) { EnvironmentClass *env = EN_Constructor(); @@ -397,19 +397,19 @@ ConfigDlgProc(HWND hdlg, break; } case IDC_DATASOURCE: - lpsetupdlg = (LPSETUPDLG) GetWindowLong(hdlg, DWLP_USER); + lpsetupdlg = (LPSETUPDLG) GetWindowLongPtr(hdlg, DWLP_USER); DialogBoxParam(s_hModule, MAKEINTRESOURCE(DLG_OPTIONS_DRV), hdlg, ds_options1Proc, (LPARAM) &lpsetupdlg->ci); return TRUE; case IDC_DRIVER: - lpsetupdlg = (LPSETUPDLG) GetWindowLong(hdlg, DWLP_USER); + lpsetupdlg = (LPSETUPDLG) GetWindowLongPtr(hdlg, DWLP_USER); DialogBoxParam(s_hModule, MAKEINTRESOURCE(DLG_OPTIONS_GLOBAL), hdlg, global_optionsProc, (LPARAM) &lpsetupdlg->ci); return TRUE; case IDC_MANAGEDSN: - lpsetupdlg = (LPSETUPDLG) GetWindowLong(hdlg, DWLP_USER); + lpsetupdlg = (LPSETUPDLG) GetWindowLongPtr(hdlg, DWLP_USER); if (DialogBoxParam(s_hModule, MAKEINTRESOURCE(DLG_DRIVER_CHANGE), hdlg, manage_dsnProc, (LPARAM) lpsetupdlg) > 0) -- 2.39.5