[PATCH v2 0/1] MR6063: odbc32 fixes
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). -- v2: https://gitlab.winehq.org/wine/wine/-/merge_requests/6063
From: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- 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 57930e59ad4..b8132a02a62 100644 --- a/dlls/odbc32/proxyodbc.c +++ b/dlls/odbc32/proxyodbc.c @@ -1116,8 +1116,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 )) -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/6063
On Fri Jul 12 12:02:21 2024 +0000, Hans Leidekker wrote:
I turned SQLBindParam() into a stub with 5b510de672baaa57f624457e2c3501b61f3cd070 because it's not exported by current drivers. I'll remove it for now.
As a note, ODBC v2.0 drivers export his function. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/6063#note_76012
It has been replaced by SQLBindParameter(). If we find an app that needs the old function we can implement a forward. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/6063#note_76013
On Fri Jul 12 12:20:28 2024 +0000, Hans Leidekker wrote:
It has been replaced by SQLBindParameter(). If we find an app that needs the old function we can implement a forward. https://bugs.winehq.org/show_bug.cgi?id=56786
-- https://gitlab.winehq.org/wine/wine/-/merge_requests/6063#note_76014
On Fri Jul 12 12:20:28 2024 +0000, Alistair Leslie-Hughes wrote:
https://bugs.winehq.org/show_bug.cgi?id=56786 That bug appears to be about SQLDriverConnectW()?
-- https://gitlab.winehq.org/wine/wine/-/merge_requests/6063#note_76015
On Fri Jul 12 12:34:04 2024 +0000, Hans Leidekker wrote:
That bug appears to be about SQLDriverConnectW()? Yes and no. To completely fix this bug also required a few callback to v2 functions. SQLError was one of them.
-- https://gitlab.winehq.org/wine/wine/-/merge_requests/6063#note_76016
participants (3)
-
Alistair Leslie-Hughes -
Alistair Leslie-Hughes (@alesliehughes) -
Hans Leidekker (@hans)