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

msi: Remove no longer needed parameter from 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-07-01 10:43:05 +02:00 committed by Alexandre Julliard
parent 6a0a0d2a0b
commit d579b17eb4
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dlls/msi/table.c
View File

@ -1949,7 +1949,7 @@ static UINT TABLE_add_ref(struct tagMSIVIEW *view)
return InterlockedIncrement(&tv->table->ref_count); return InterlockedIncrement(&tv->table->ref_count);
} }
static UINT TABLE_remove_column(struct tagMSIVIEW *view, LPCWSTR table, UINT number) static UINT TABLE_remove_column(struct tagMSIVIEW *view, UINT number)
{ {
MSITABLEVIEW *tv = (MSITABLEVIEW*)view; MSITABLEVIEW *tv = (MSITABLEVIEW*)view;
MSIRECORD *rec = NULL; MSIRECORD *rec = NULL;
@ -1974,7 +1974,7 @@ static UINT TABLE_remove_column(struct tagMSIVIEW *view, LPCWSTR table, UINT num
if (!rec) if (!rec)
return ERROR_OUTOFMEMORY; return ERROR_OUTOFMEMORY;
MSI_RecordSetStringW(rec, 1, table); MSI_RecordSetStringW(rec, 1, tv->name);
MSI_RecordSetInteger(rec, 2, number); MSI_RecordSetInteger(rec, 2, number);
r = TABLE_CreateView(tv->db, szColumns, &columns); r = TABLE_CreateView(tv->db, szColumns, &columns);
@ -1992,7 +1992,7 @@ static UINT TABLE_remove_column(struct tagMSIVIEW *view, LPCWSTR table, UINT num
if (r != ERROR_SUCCESS) if (r != ERROR_SUCCESS)
goto done; goto done;
msi_update_table_columns(tv->db, table); msi_update_table_columns(tv->db, tv->name);
done: done:
msiobj_release(&rec->hdr); msiobj_release(&rec->hdr);
@ -2016,8 +2016,7 @@ static UINT TABLE_release(struct tagMSIVIEW *view)
{ {
if (tv->table->colinfo[i].type & MSITYPE_TEMPORARY) if (tv->table->colinfo[i].type & MSITYPE_TEMPORARY)
{ {
r = TABLE_remove_column(view, tv->table->colinfo[i].tablename, r = TABLE_remove_column(view, tv->table->colinfo[i].number);
tv->table->colinfo[i].number);
if (r != ERROR_SUCCESS) if (r != ERROR_SUCCESS)
break; break;
} }
@ -2145,8 +2144,7 @@ static UINT TABLE_drop(struct tagMSIVIEW *view)
for (i = tv->table->col_count - 1; i >= 0; i--) for (i = tv->table->col_count - 1; i >= 0; i--)
{ {
r = TABLE_remove_column(view, tv->table->colinfo[i].tablename, r = TABLE_remove_column(view, tv->table->colinfo[i].number);
tv->table->colinfo[i].number);
if (r != ERROR_SUCCESS) if (r != ERROR_SUCCESS)
return r; return r;
} }