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

--
  v3: odbc32: SQLError handle NULL handles

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

[PATCH v3 1/1] odbc32: SQLError handle NULL handles

[Alistair Leslie-Hughes]

From: Alistair Leslie-Hughes

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

diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c
index 957584af008..ebf7b70d40c 100644
--- a/dlls/odbc32/proxyodbc.c
+++ b/dlls/odbc32/proxyodbc.c
@@ -1182,8 +1182,10 @@ 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 );
+        ret = env->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 ))

[Elizabeth Figura (＠zfigura)]

Elizabeth Figura (@zfigura) commented about dlls/odbc32/proxyodbc.c:
>  }
>  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 );
> -
>    ret = env->win32_funcs->SQLError( env ? env->win32_handle : NULL,

Do we need to retrieve win32_funcs from a different handle in that case?

[Alistair Leslie-Hughes (＠alesliehughes)]

On Sat Jul 13 01:40:11 2024 +0000, Elizabeth Figura wrote:
> Do we need to retrieve win32_funcs from a different handle in that case?

Good catch. I'll fix it up.