system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-14 20:07:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

msado15: Implement ADORecordsetConstruction get/put Rowset.

Browse source 
Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
Signed-off-by: Hans Leidekker <hans@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Alistair Leslie-Hughes 2020-11-20 19:16:26 +11:00 committed by Alexandre Julliard
parent 8049e4dbc9
commit f99a09e906
2 changed files with 30 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
dlls/msado15/recordset.c
View file

@ -23,6 +23,7 @@
#define COBJMACROS #define COBJMACROS
#include "objbase.h" #include "objbase.h"
#include "msado15_backcompat.h" #include "msado15_backcompat.h"
#include "oledb.h"
#include "wine/debug.h" #include "wine/debug.h"
#include "wine/heap.h" #include "wine/heap.h"
@ -46,6 +47,7 @@ struct recordset
VARIANT *data; VARIANT *data;
CursorLocationEnum cursor_location; CursorLocationEnum cursor_location;
CursorTypeEnum cursor_type; CursorTypeEnum cursor_type;
IRowset *row_set;
}; };
struct fields struct fields
@ -757,6 +759,8 @@ static void close_recordset( struct recordset *recordset )
{ {
ULONG row, col, col_count; ULONG row, col, col_count;
if ( recordset->row_set ) IRowset_Release( recordset->row_set );
if (!recordset->fields) return; if (!recordset->fields) return;
col_count = get_column_count( recordset ); col_count = get_column_count( recordset );
@ -1611,15 +1615,31 @@ static HRESULT WINAPI rsconstruction_Invoke(ADORecordsetConstruction *iface, DIS
static HRESULT WINAPI rsconstruction_get_Rowset(ADORecordsetConstruction *iface, IUnknown **row_set) static HRESULT WINAPI rsconstruction_get_Rowset(ADORecordsetConstruction *iface, IUnknown **row_set)
{ {
struct recordset *recordset = impl_from_ADORecordsetConstruction( iface ); struct recordset *recordset = impl_from_ADORecordsetConstruction( iface );
FIXME( "%p, %p\n", recordset, row_set ); HRESULT hr;
return E_NOTIMPL;
TRACE( "%p, %p\n", recordset, row_set );
hr = IRowset_QueryInterface(recordset->row_set, &IID_IUnknown, (void**)row_set);
if ( FAILED(hr) ) return E_FAIL;
return S_OK;
} }
static HRESULT WINAPI rsconstruction_put_Rowset(ADORecordsetConstruction *iface, IUnknown *row_set) static HRESULT WINAPI rsconstruction_put_Rowset(ADORecordsetConstruction *iface, IUnknown *unk)
{ {
struct recordset *recordset = impl_from_ADORecordsetConstruction( iface ); struct recordset *recordset = impl_from_ADORecordsetConstruction( iface );
FIXME( "%p, %p\n", recordset, row_set ); HRESULT hr;
return E_NOTIMPL; IRowset *rowset;
TRACE( "%p, %p\n", recordset, unk );
hr = IUnknown_QueryInterface(unk, &IID_IRowset, (void**)&rowset);
if ( FAILED(hr) ) return E_FAIL;
if ( recordset->row_set ) IRowset_Release( recordset->row_set );
recordset->row_set = rowset;
return S_OK;
} }
static HRESULT WINAPI rsconstruction_get_Chapter(ADORecordsetConstruction *iface, LONG *chapter) static HRESULT WINAPI rsconstruction_get_Chapter(ADORecordsetConstruction *iface, LONG *chapter)
@ -1679,6 +1699,7 @@ HRESULT Recordset_create( void **obj )
recordset->index = -1; recordset->index = -1;
recordset->cursor_location = adUseServer; recordset->cursor_location = adUseServer;
recordset->cursor_type = adOpenForwardOnly; recordset->cursor_type = adOpenForwardOnly;
recordset->row_set = NULL;
*obj = &recordset->Recordset_iface; *obj = &recordset->Recordset_iface;
TRACE( "returning iface %p\n", *obj ); TRACE( "returning iface %p\n", *obj );

8
dlls/msado15/tests/msado15.c
View file

@ -582,17 +582,17 @@ static void test_ADORecordsetConstruction(void)
ref = get_refcount( rowset ); ref = get_refcount( rowset );
ok( ref == 1, "got %d\n", ref ); ok( ref == 1, "got %d\n", ref );
hr = ADORecordsetConstruction_put_Rowset( construct, (IUnknown*)rowset ); hr = ADORecordsetConstruction_put_Rowset( construct, (IUnknown*)rowset );
todo_wine ok( hr == S_OK, "got %08x\n", hr ); ok( hr == S_OK, "got %08x\n", hr );
ref = get_refcount( rowset ); ref = get_refcount( rowset );
todo_wine ok( ref == 2, "got %d\n", ref ); ok( ref == 2, "got %d\n", ref );
hr = _Recordset_get_Fields( recordset, &fields ); hr = _Recordset_get_Fields( recordset, &fields );
ok( hr == S_OK, "got %08x\n", hr ); ok( hr == S_OK, "got %08x\n", hr );
ok( fields != NULL, "NULL value\n"); ok( fields != NULL, "NULL value\n");
ref = get_refcount( rowset ); ref = get_refcount( rowset );
todo_wine ok( ref == 2, "got %d\n", ref ); ok( ref == 2, "got %d\n", ref );
count = -1; count = -1;
hr = Fields_get_Count( fields, &count ); hr = Fields_get_Count( fields, &count );
@ -623,7 +623,7 @@ static void test_ADORecordsetConstruction(void)
} }
ref = get_refcount(rowset); ref = get_refcount(rowset);
todo_wine ok( ref == 2, "got %d\n", ref ); ok( ref == 2, "got %d\n", ref );
Fields_Release(fields); Fields_Release(fields);