[PATCH 0/2] 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).

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

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

[Alistair Leslie-Hughes]

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

[PATCH 2/2] odbc32: Load function pointer for SQLBindParam

[Alistair Leslie-Hughes]

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

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

diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c
index b8132a02a62..0de6460642a 100644
--- a/dlls/odbc32/proxyodbc.c
+++ b/dlls/odbc32/proxyodbc.c
@@ -50,6 +50,7 @@ struct win32_funcs
     SQLRETURN WINAPI (*SQLAllocHandleStd)(SQLSMALLINT,SQLHANDLE,SQLHANDLE*);
     SQLRETURN WINAPI (*SQLAllocStmt)(SQLHDBC,SQLHSTMT*);
     SQLRETURN WINAPI (*SQLBindCol)(SQLHSTMT,SQLUSMALLINT,SQLSMALLINT,SQLPOINTER,SQLLEN,SQLLEN*);
+    SQLRETURN WINAPI (*SQLBindParam)(SQLHSTMT,SQLUSMALLINT,SQLSMALLINT,SQLSMALLINT,SQLULEN,SQLSMALLINT,SQLPOINTER,SQLLEN*);
     SQLRETURN WINAPI (*SQLBindParameter)(SQLHSTMT,SQLUSMALLINT,SQLSMALLINT,SQLSMALLINT,SQLSMALLINT,SQLULEN,
                                          SQLSMALLINT,SQLPOINTER,SQLLEN,SQLLEN*);
     SQLRETURN WINAPI (*SQLBrowseConnect)(SQLHDBC,SQLCHAR*,SQLSMALLINT,SQLCHAR*,SQLSMALLINT,SQLSMALLINT*);
@@ -206,6 +207,7 @@ static BOOL load_function_table( HMODULE module, struct win32_driver *driver )
     LOAD_FUNCPTR( SQLAllocHandleStd )
     LOAD_FUNCPTR( SQLAllocStmt )
     LOAD_FUNCPTR( SQLBindCol )
+    LOAD_FUNCPTR( SQLBindParam )
     LOAD_FUNCPTR( SQLBindParameter )
     LOAD_FUNCPTR( SQLBrowseConnect )
     LOAD_FUNCPTR( SQLBrowseConnectW )
-- 
GitLab

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

[Hans Leidekker (＠hans)]

I turned SQLBindParam() into a stub with 5b510de672baaa57f624457e2c3501b61f3cd070 because it's not exported by current drivers.

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