Updated odbc32-fixes patchset

Fix some bad logic
This commit is contained in:
Alistair Leslie-Hughes 2024-07-21 09:57:36 +10:00
parent 9eb00790f0
commit 9b107c62cb

View File

@ -1,4 +1,4 @@
From 10eb455088bfa3dbcc9e7431395614e75793bf13 Mon Sep 17 00:00:00 2001
From a286fe2aca1bd8f7c2a95675394fe554d16ef7fa Mon Sep 17 00:00:00 2001
From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
Date: Sat, 20 Jul 2024 12:56:26 +1000
Subject: [PATCH] odbc32: set_con_attr return success by default
@ -8,7 +8,7 @@ Subject: [PATCH] odbc32: set_con_attr return success by default
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c
index dee73f0618e..1706e0f0d93 100644
index dee73f0618e..d29069cb021 100644
--- a/dlls/odbc32/proxyodbc.c
+++ b/dlls/odbc32/proxyodbc.c
@@ -994,7 +994,7 @@ static SQLRETURN create_env( struct handle *handle, BOOL is_unix )
@ -29,9 +29,9 @@ index dee73f0618e..1706e0f0d93 100644
+ ret = handle->win32_funcs->SQLSetConnectOptionW( handle->win32_handle, attr, (SQLULEN)value );
+
+ /* If an option isn't supported on other driver, then just return success for now. */
+ if(!ret)
+ if(ret != SQL_SUCCESS)
+ {
+ FIXME("Driver retured %d for option %d\n", ret, attr);
+ FIXME("Driver returned %d for option %d\n", ret, attr);
+ ret = SQL_SUCCESS;
+ }
+ }