Commit 83b558c5 authored by Alistair Leslie-Hughes's avatar Alistair Leslie-Hughes Committed by Alexandre Julliard

msado15: Clear interface point after release.

Since we clear the recordset pointer, we need to reassign it when retreiving Fields. Signed-off-by: 's avatarAlistair Leslie-Hughes <leslie_alistair@hotmail.com> Signed-off-by: 's avatarHans Leidekker <hans@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent c93798bd
......@@ -488,6 +488,7 @@ static ULONG WINAPI fields_Release( Fields *iface )
if (!refs)
{
if (fields->recordset) _Recordset_Release( &fields->recordset->Recordset_iface );
fields->recordset = NULL;
WARN( "not destroying %p\n", fields );
return InterlockedIncrement( &fields->refs );
}
......@@ -864,7 +865,6 @@ static void close_recordset( struct recordset *recordset )
if (!recordset->fields) return;
col_count = get_column_count( recordset );
recordset->fields->recordset = NULL;
Fields_Release( &recordset->fields->Fields_iface );
recordset->fields = NULL;
......@@ -1092,6 +1092,7 @@ static HRESULT WINAPI recordset_get_Fields( _Recordset *iface, Fields **obj )
{
/* yes, this adds a reference to the recordset instead of the fields object */
_Recordset_AddRef( &recordset->Recordset_iface );
recordset->fields->recordset = recordset;
*obj = &recordset->fields->Fields_iface;
return S_OK;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment