system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-15 00:45:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

msado15: _Recordset get_Fields support 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 2021-02-16 18:17:17 +11:00 committed by Alexandre Julliard
parent b772414328
commit c8e663d6b1
2 changed files with 44 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
dlls/msado15/recordset.c
View file

@ -721,6 +721,46 @@ static const ISupportErrorInfoVtbl fields_supporterrorinfo_vtbl =
fields_supporterrorinfo_InterfaceSupportsErrorInfo
};
static void map_rowset_fields(struct recordset *recordset, struct fields *fields)
{
HRESULT hr;
IColumnsInfo *columninfo;
DBORDINAL columns, i;
DBCOLUMNINFO *colinfo;
OLECHAR *stringsbuffer;
/* Not Finding the interface or GetColumnInfo failing just causes 0 Fields to be returned */
hr = IRowset_QueryInterface(recordset->row_set, &IID_IColumnsInfo, (void**)&columninfo);
if (FAILED(hr))
return;
hr = IColumnsInfo_GetColumnInfo(columninfo, &columns, &colinfo, &stringsbuffer);
if (SUCCEEDED(hr))
{
for (i=0; i < columns; i++)
{
TRACE("Adding Column %lu, pwszName: %s, pTypeInfo %p, iOrdinal %lu, dwFlags 0x%08x, "
"ulColumnSize %lu, wType %d, bPrecision %d, bScale %d\n",
i, debugstr_w(colinfo[i].pwszName), colinfo[i].pTypeInfo, colinfo[i].iOrdinal,
colinfo[i].dwFlags, colinfo[i].ulColumnSize, colinfo[i].wType,
colinfo[i].bPrecision, colinfo[i].bScale);
hr = append_field(fields, colinfo[i].pwszName, colinfo[i].wType, colinfo[i].ulColumnSize,
colinfo[i].dwFlags, NULL);
if (FAILED(hr))
{
ERR("Failed to add Field name - 0x%08x\n", hr);
return;
}
}
CoTaskMemFree(colinfo);
CoTaskMemFree(stringsbuffer);
}
IColumnsInfo_Release(columninfo);
}
static HRESULT fields_create( struct recordset *recordset, struct fields **ret )
{
struct fields *fields;
@ -732,6 +772,9 @@ static HRESULT fields_create( struct recordset *recordset, struct fields **ret )
fields->recordset = recordset;
_Recordset_AddRef( &fields->recordset->Recordset_iface );
if ( recordset->row_set )
map_rowset_fields(recordset, fields);
*ret = fields;
TRACE( "returning %p\n", *ret );
return S_OK;

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

@ -596,7 +596,7 @@ static void test_ADORecordsetConstruction(void)
count = -1;
hr = Fields_get_Count( fields, &count );
todo_wine ok( count == 1, "got %d\n", count );
ok( count == 1, "got %d\n", count );
if (count > 0)
{
VARIANT index;