ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

msi: Support removing temporary columns in TABLE_remove_column. 

Signed-off-by: Piotr Caban <piotr@codeweavers.com>
Signed-off-by: Hans Leidekker <hans@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Piotr Caban 2020-06-30 05:40:06 +02:00 committed by Alexandre Julliard
parent 3df16c0b70
commit 5d568279dc
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
dlls/msi/table.c
View File

@ -1966,6 +1966,20 @@ static UINT TABLE_remove_column(struct tagMSIVIEW *view, LPCWSTR table, UINT num
MSIVIEW *columns = NULL; MSIVIEW *columns = NULL;
UINT row, r; UINT row, r;
if (tv->table->col_count != number)
return ERROR_BAD_QUERY_SYNTAX;
if (tv->table->colinfo[number-1].temporary)
{
UINT size = tv->table->colinfo[number-1].offset;
tv->table->col_count--;
tv->table->colinfo = msi_realloc( tv->table->colinfo, sizeof(*tv->table->colinfo) * tv->table->col_count );
for (row = 0; row < tv->table->row_count; row++)
tv->table->data[row] = msi_realloc( tv->table->data[row], size );
return ERROR_SUCCESS;
}
rec = MSI_CreateRecord(2); rec = MSI_CreateRecord(2);
if (!rec) if (!rec)
return ERROR_OUTOFMEMORY; return ERROR_OUTOFMEMORY;
@ -2000,11 +2014,12 @@ static UINT TABLE_release(struct tagMSIVIEW *view)
{ {
MSITABLEVIEW *tv = (MSITABLEVIEW*)view; MSITABLEVIEW *tv = (MSITABLEVIEW*)view;
INT ref = tv->table->ref_count; INT ref = tv->table->ref_count;
UINT i, r; UINT r;
INT i;
TRACE("%p %d\n", view, ref); TRACE("%p %d\n", view, ref);
for (i = 0; i < tv->table->col_count; i++) for (i = tv->table->col_count - 1; i >= 0; i--)
{ {
if (tv->table->colinfo[i].type & MSITYPE_TEMPORARY) if (tv->table->colinfo[i].type & MSITYPE_TEMPORARY)
{ {