Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-09-28 13:34:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

[WINESYNC] msi: Factor out msi_view_refresh_row().

Browse source 
Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Hans Leidekker <hans@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id 31628cee6e2ba63a1a08672d89ccd8d10836bf7e by Zebediah Figura <z.figura12@gmail.com>
This commit is contained in:
winesync 2022-03-13 00:16:38 +01:00 committed by Mark Jansen
parent 6425c406fb
commit bef9fb0245
No known key found for this signature in database
GPG key ID: B39240EE84BEAE8B
1 changed files with 30 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
dll/win32/msi/msiquery.c
View file

@ -287,7 +287,7 @@ UINT WINAPI MsiDatabaseOpenViewW(MSIHANDLE hdb,
return ret; return ret;
} }
UINT msi_view_get_row(MSIDATABASE *db, MSIVIEW *view, UINT row, MSIRECORD **rec) UINT msi_view_refresh_row(MSIDATABASE *db, MSIVIEW *view, UINT row, MSIRECORD *rec)
{ {
UINT row_count = 0, col_count = 0, i, ival, ret, type; UINT row_count = 0, col_count = 0, i, ival, ret, type;
@ -300,13 +300,6 @@ UINT msi_view_get_row(MSIDATABASE *db, MSIVIEW *view, UINT row, MSIRECORD **rec)
if (!col_count) if (!col_count)
return ERROR_INVALID_PARAMETER; return ERROR_INVALID_PARAMETER;
if (row >= row_count)
return ERROR_NO_MORE_ITEMS;
*rec = MSI_CreateRecord(col_count);
if (!*rec)
return ERROR_FUNCTION_FAILED;
for (i = 1; i <= col_count; i++) for (i = 1; i <= col_count; i++)
{ {
ret = view->ops->get_column_info(view, i, NULL, &type, NULL, NULL); ret = view->ops->get_column_info(view, i, NULL, &type, NULL, NULL);
@ -323,7 +316,7 @@ UINT msi_view_get_row(MSIDATABASE *db, MSIVIEW *view, UINT row, MSIRECORD **rec)
ret = view->ops->fetch_stream(view, row, i, &stm); ret = view->ops->fetch_stream(view, row, i, &stm);
if ((ret == ERROR_SUCCESS) && stm) if ((ret == ERROR_SUCCESS) && stm)
{ {
MSI_RecordSetIStream(*rec, i, stm); MSI_RecordSetIStream(rec, i, stm);
IStream_Release(stm); IStream_Release(stm);
} }
else else
@ -342,28 +335,48 @@ UINT msi_view_get_row(MSIDATABASE *db, MSIVIEW *view, UINT row, MSIRECORD **rec)
if (! (type & MSITYPE_VALID)) if (! (type & MSITYPE_VALID))
ERR("Invalid type!\n"); ERR("Invalid type!\n");
/* check if it's nul (0) - if so, don't set anything */
if (!ival)
continue;
if (type & MSITYPE_STRING) if (type & MSITYPE_STRING)
{ {
int len; int len;
const WCHAR *sval = msi_string_lookup( db->strings, ival, &len ); const WCHAR *sval = msi_string_lookup(db->strings, ival, &len);
msi_record_set_string( *rec, i, sval, len ); msi_record_set_string(rec, i, sval, len);
} }
else else
{ {
if ((type & MSI_DATASIZEMASK) == 2) if ((type & MSI_DATASIZEMASK) == 2)
MSI_RecordSetInteger(*rec, i, ival - (1<<15)); MSI_RecordSetInteger(rec, i, ival ? ival - (1<<15) : MSI_NULL_INTEGER);
else else
MSI_RecordSetInteger(*rec, i, ival - (1u<<31)); MSI_RecordSetInteger(rec, i, ival - (1u<<31));
} }
} }
return ERROR_SUCCESS; return ERROR_SUCCESS;
} }
UINT msi_view_get_row(MSIDATABASE *db, MSIVIEW *view, UINT row, MSIRECORD **rec)
{
UINT row_count = 0, col_count = 0, r;
MSIRECORD *object;
TRACE("view %p, row %u, rec %p.\n", view, row, rec);
if ((r = view->ops->get_dimensions(view, &row_count, &col_count)))
return r;
if (row >= row_count)
return ERROR_NO_MORE_ITEMS;
if (!(object = MSI_CreateRecord( col_count )))
return ERROR_OUTOFMEMORY;
if ((r = msi_view_refresh_row(db, view, row, object)))
msiobj_release( &object->hdr );
else
*rec = object;
return r;
}
UINT MSI_ViewFetch(MSIQUERY *query, MSIRECORD **prec) UINT MSI_ViewFetch(MSIQUERY *query, MSIRECORD **prec)
{ {
MSIVIEW *view; MSIVIEW *view;