Hans Leidekker : odbc32: Use SQLFreeHandle() instead of SQLFreeEnv/Connect().
Module: wine Branch: master Commit: dbe651d330f260183c6d3e59e06b82910ba34c9f URL: https://gitlab.winehq.org/wine/wine/-/commit/dbe651d330f260183c6d3e59e06b829... Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jul 12 08:20:11 2024 +0200 odbc32: Use SQLFreeHandle() instead of SQLFreeEnv/Connect(). The latter are not exported by some drivers. --- dlls/odbc32/proxyodbc.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c index 54b680feb71..033d009be50 100644 --- a/dlls/odbc32/proxyodbc.c +++ b/dlls/odbc32/proxyodbc.c @@ -1359,12 +1359,12 @@ SQLRETURN WINAPI SQLFreeConnect(SQLHDBC ConnectionHandle) if (handle->unix_handle) { - struct SQLFreeConnect_params params = { handle->unix_handle }; - ret = ODBC_CALL( SQLFreeConnect, ¶ms ); + struct SQLFreeHandle_params params = { SQL_HANDLE_DBC, handle->unix_handle }; + ret = ODBC_CALL( SQLFreeHandle, ¶ms ); } else if (handle->win32_handle) { - ret = handle->win32_funcs->SQLFreeConnect( handle->win32_handle ); + ret = handle->win32_funcs->SQLFreeHandle( SQL_HANDLE_DBC, handle->win32_handle ); } free( handle ); @@ -1386,12 +1386,12 @@ SQLRETURN WINAPI SQLFreeEnv(SQLHENV EnvironmentHandle) if (handle->unix_handle) { - struct SQLFreeEnv_params params = { handle->unix_handle }; - ret = ODBC_CALL( SQLFreeEnv, ¶ms ); + struct SQLFreeHandle_params params = { SQL_HANDLE_ENV, handle->unix_handle }; + ret = ODBC_CALL( SQLFreeHandle, ¶ms ); } else if (handle->win32_handle) { - ret = handle->win32_funcs->SQLFreeEnv( handle->win32_handle ); + ret = handle->win32_funcs->SQLFreeHandle( SQL_HANDLE_ENV, handle->win32_handle ); } RegCloseKey( handle->drivers_key );
participants (1)
-
Alexandre Julliard