[PATCH v7 0/1] MR6063: odbc32 fixes

[Alistair Leslie-Hughes (＠alesliehughes)]

The function SQLBindParam was missed when binding all the available functions. Will implement the SQLBindParam in a future patchset.

The other is just a fix for when parameters are NULL when passed in (Same the the W version).

--
  v7: odbc32: SQLError/W handle NULL handles

https://gitlab.winehq.org/wine/wine/-/merge_requests/6063

[PATCH v7 1/1] odbc32: SQLError/W handle NULL handles

[Alistair Leslie-Hughes]

From: Alistair Leslie-Hughes

---
 dlls/odbc32/proxyodbc.c | 26 ++++++++++++++++++++------
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c
index 045738b45f7..46f96651b1d 100644
--- a/dlls/odbc32/proxyodbc.c
+++ b/dlls/odbc32/proxyodbc.c
@@ -1217,8 +1217,16 @@ SQLRETURN WINAPI SQLError(SQLHENV EnvironmentHandle, SQLHDBC ConnectionHandle, S
     }
     else if ((env && env->win32_handle) || (con && con->win32_handle) || (stmt && stmt->win32_handle))
     {
-        ret = env->win32_funcs->SQLError( env->win32_handle, con->win32_handle, stmt->win32_handle, SqlState,
-                                          NativeError, MessageText, BufferLength, TextLength );
+        const struct win32_funcs *win32_funcs = NULL;
+
+        if (env) win32_funcs = env->win32_funcs;
+        else if (con) win32_funcs = con->win32_funcs;
+        else if (stmt) win32_funcs = stmt->win32_funcs;
+
+        ret = win32_funcs->SQLError( env ? env->win32_handle : NULL,
+                                     con ? con->win32_handle : NULL,
+                                     stmt ? stmt->win32_handle : NULL,
+                                     SqlState, NativeError, MessageText, BufferLength, TextLength );
     }

if (SUCCESS( ret ))
@@ -3781,10 +3789,16 @@ SQLRETURN WINAPI SQLErrorW(SQLHENV EnvironmentHandle, SQLHDBC ConnectionHandle,
     }
     else if ((env && env->win32_handle) || (con && con->win32_handle) || (stmt && stmt->win32_handle))
     {
-        ret = env->win32_funcs->SQLErrorW( env ? env->win32_handle : NULL,
-                                           con ? con->win32_handle : NULL,
-                                           stmt ? stmt->win32_handle : NULL,
-                                           SqlState, NativeError, MessageText, BufferLength, TextLength );
+        const struct win32_funcs *win32_funcs = NULL;
+
+        if (env) win32_funcs = env->win32_funcs;
+        else if (con) win32_funcs = con->win32_funcs;
+        else if (stmt) win32_funcs = stmt->win32_funcs;
+
+        ret = win32_funcs->SQLErrorW( env ? env->win32_handle : NULL,
+                                      con ? con->win32_handle : NULL,
+                                      stmt ? stmt->win32_handle : NULL,
+                                      SqlState, NativeError, MessageText, BufferLength, TextLength );
     }

if (SUCCESS(ret ))

[PATCH v7 1/1] odbc32: SQLError/W handle NULL handles

[Marvin]

Hi,

It looks like your patch introduced the new failures shown below.
Please investigate and fix them before resubmitting your patch.
If they are not new, fixing them anyway would help a lot. Otherwise
please ask for the known failures list to be updated.

The tests also ran into some preexisting test failures. If you know how
to fix them that would be helpful. See the TestBot job for the details:

The full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=147134

Your paranoid android.

=== debian11b (64 bit WoW report) ===

ddraw:
ddraw1.c:3645: Test failed: Expected (0,0)-(640,480), got (-32000,-32000)-(-31840,-31969).

[PATCH v7 0/1] MR6063: odbc32 fixes - approved

[Hans Leidekker (＠hans)]

This merge request was approved by Hans Leidekker.