[PATCH v5 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).

--
  v5: odbc32: SQLError/W handle NULL handles
 
https://gitlab.winehq.org/wine/wine/-/merge_requests/6063

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

[Alistair Leslie-Hughes]

From: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com>

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

diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c
index 957584af008..1ef8a01f5d6 100644
--- a/dlls/odbc32/proxyodbc.c
+++ b/dlls/odbc32/proxyodbc.c
@@ -1182,8 +1182,19 @@ 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;
+
+        if(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 );
+        else
+            ERR("No function map found\n");
     }
 
     if (SUCCESS( ret ))
@@ -3569,10 +3580,19 @@ 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;
+
+        if(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 );
+        else
+            ERR("No function map found\n");
     }
 
     if (SUCCESS(ret ))
-- 
GitLab

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

[PATCH v5 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=147082

Your paranoid android.


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

secur32:
schannel.c:1138: Test failed: Wrong buffer size
schannel.c:1187: Test failed: InitializeSecurityContext failed: 80090304
schannel.c:1575: Test failed: got 80090304

urlmon:
protocol.c:857: Test failed: szStatusText = L"text/javascript"

[Hans Leidekker (＠hans)]

Hans Leidekker (@hans) commented about dlls/odbc32/proxyodbc.c:
> -        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;
> +
> +        if(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 );
> +        else
> +            ERR("No function map found\n");
>      }
> The condition for this block ensures that at least one handle is set and we always set win32_funcs when we create a win32 handle. This means that the win32_funcs check is redundant.

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