[PATCH 0/1] MR8119: odbc32: Destroy child objects automatically on successful SQLDisconnect().

[Nikolay Sivov (＠nsivov)]

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com>

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

[PATCH 1/1] odbc32: Destroy child objects automatically on successful SQLDisconnect().

[Nikolay Sivov]

From: Nikolay Sivov <nsivov(a)codeweavers.com>

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com>
---
 dlls/odbc32/proxyodbc.c | 70 ++++++++++++++++++++++++++++-------------
 1 file changed, 49 insertions(+), 21 deletions(-)

diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c
index 6efa8248751..d31a08af14f 100644
--- a/dlls/odbc32/proxyodbc.c
+++ b/dlls/odbc32/proxyodbc.c
@@ -1642,6 +1642,24 @@ static SQLRETURN disconnect_win32( struct connection *con )
     return SQL_ERROR;
 }
 
+static void cleanup_object( struct object *obj );
+
+static void destroy_dependent_objects( struct connection *con )
+{
+    struct object *obj, *next;
+
+    LIST_FOR_EACH_ENTRY_SAFE( obj, next, &con->hdr.children, struct object, entry)
+    {
+        EnterCriticalSection( &obj->cs );
+        cleanup_object( obj );
+        obj->closed = TRUE;
+        LeaveCriticalSection( &obj->cs );
+
+        /* Unlink from the parent object */
+        destroy_object( obj );
+    }
+}
+
 /*************************************************************************
  *				SQLDisconnect           [ODBC32.009]
  */
@@ -1663,6 +1681,11 @@ SQLRETURN WINAPI SQLDisconnect(SQLHDBC ConnectionHandle)
         ret = disconnect_win32( con );
     }
 
+    /* Driver drops allocated statements automatically. After successful disconnect
+       it's possible to free connection handle right away. */
+    if (!ret)
+        destroy_dependent_objects( con );
+
     TRACE("Returning %d\n", ret);
     unlock_object( &con->hdr );
     return ret;
@@ -2140,6 +2163,31 @@ static void free_param_bindings( struct statement *stmt )
     }
 }
 
+static void cleanup_object( struct object *obj )
+{
+    switch (obj->type)
+    {
+    case SQL_HANDLE_ENV:
+    {
+        struct environment *env = (struct environment *)obj;
+        RegCloseKey( env->drivers_key );
+        RegCloseKey( env->sources_key );
+        env->drivers_key = env->sources_key = NULL;
+        env->drivers_idx = env->sources_idx = 0;
+        break;
+    }
+    case SQL_HANDLE_STMT:
+    {
+        struct statement *stmt = (struct statement *)obj;
+        free_col_bindings( stmt );
+        free_param_bindings( stmt );
+        free_descriptors( stmt );
+        break;
+    }
+    default: break;
+    }
+}
+
 /*************************************************************************
  *				SQLFreeHandle           [ODBC32.031]
  */
@@ -2158,27 +2206,7 @@ SQLRETURN WINAPI SQLFreeHandle(SQLSMALLINT HandleType, SQLHANDLE Handle)
         ret = free_handle( HandleType, obj );
         obj->closed = TRUE;
 
-        switch (HandleType)
-        {
-        case SQL_HANDLE_ENV:
-        {
-            struct environment *env = (struct environment *)obj;
-            RegCloseKey( env->drivers_key );
-            RegCloseKey( env->sources_key );
-            env->drivers_key = env->sources_key = NULL;
-            env->drivers_idx = env->sources_idx = 0;
-            break;
-        }
-        case SQL_HANDLE_STMT:
-        {
-            struct statement *stmt = (struct statement *)obj;
-            free_col_bindings( stmt );
-            free_param_bindings( stmt );
-            free_descriptors( stmt );
-            break;
-        }
-        default: break;
-        }
+        cleanup_object( obj );
     }
 
     TRACE("Returning %d\n", ret);
-- 
GitLab

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

[PATCH 0/1] MR8119: odbc32: Destroy child objects automatically on successful SQLDisconnect(). - approved

[Hans Leidekker (＠hans)]

This merge request was approved by Hans Leidekker.
-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/8119