psqlodbc.git / summary / log / commit / refs
commit bfc4cb1b57dbf8fe3da5c03fbb91e0f49d243ddd
Author: Hiroshi Inoue <h-inoue@dream.email.ne.jp>
Date: Wed May 31 06:13:18 2017 +0000
In psqlodbc ODBC Driver Setup dialog, reflect the updates of the initial dialog to other dialogs.
setup.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/setup.c b/setup.c
index 53d5130..930ae4d 100644
--- a/setup.c
+++ b/setup.c
@@ -308,6 +308,7 @@ ConfigDlgProc(HWND hdlg,
/* Process buttons */
case WM_COMMAND:
+ lpsetupdlg = (LPSETUPDLG) GetWindowLongPtr(hdlg, DWLP_USER);
switch (cmd = GET_WM_COMMAND_ID(wParam, lParam))
{
/*
@@ -331,15 +332,14 @@ ConfigDlgProc(HWND hdlg,
/* Accept results */
case IDOK:
case IDAPPLY:
- lpsetupdlg = (LPSETUPDLG) GetWindowLongPtr(hdlg, DWLP_USER);
/* Retrieve dialog values */
if (!lpsetupdlg->fDefault)
GetDlgItemText(hdlg, IDC_DSNAME,
lpsetupdlg->ci.dsn,
sizeof(lpsetupdlg->ci.dsn));
+
/* Get Dialog Values */
GetDlgStuff(hdlg, &lpsetupdlg->ci);
-
/* Update ODBC.INI */
SetDSNAttributes(hdlg, lpsetupdlg, NULL);
if (IDAPPLY == cmd)
@@ -351,7 +351,6 @@ ConfigDlgProc(HWND hdlg,
case IDC_TEST:
{
- lpsetupdlg = (LPSETUPDLG) GetWindowLongPtr(hdlg, DWLP_USER);
if (NULL != lpsetupdlg)
{
/* Get Dialog Values */
@@ -362,19 +361,20 @@ ConfigDlgProc(HWND hdlg,
break;
}
case IDC_DATASOURCE:
- lpsetupdlg = (LPSETUPDLG) GetWindowLongPtr(hdlg, DWLP_USER);
+ /* Get Dialog Values */
+ GetDlgStuff(hdlg, &lpsetupdlg->ci);
DialogBoxParam(s_hModule, MAKEINTRESOURCE(DLG_OPTIONS_DRV),
hdlg, ds_options1Proc, (LPARAM) &lpsetupdlg->ci);
return TRUE;
case IDC_DRIVER:
- lpsetupdlg = (LPSETUPDLG) GetWindowLongPtr(hdlg, DWLP_USER);
+ /* Get Dialog Values */
+ GetDlgStuff(hdlg, &lpsetupdlg->ci);
DialogBoxParam(s_hModule, MAKEINTRESOURCE(DLG_OPTIONS_GLOBAL),
hdlg, global_optionsProc, (LPARAM) &lpsetupdlg->ci);
return TRUE;
case IDC_MANAGEDSN:
- lpsetupdlg = (LPSETUPDLG) GetWindowLongPtr(hdlg, DWLP_USER);
if (DialogBoxParam(s_hModule, MAKEINTRESOURCE(DLG_DRIVER_CHANGE),
hdlg, manage_dsnProc,
(LPARAM) lpsetupdlg) > 0)
[parent: 7556b9567056]