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>

msi: Remove no longer needed parameter from TABLE_remove_column.
d579b17e · Piotr Caban · Alexandre Julliard · 6a0a0d2a · d579b17e
Commit d579b17e authored Jul 01, 2020 by Piotr Caban Committed by Alexandre Julliard Jul 02, 2020
Show whitespace changes
Inline Side-by-side

Showing with 5 additions and 7 deletions

table.c dlls/msi/table.c +5 -7

No files found.
--- a/dlls/msi/table.c
+++ b/dlls/msi/table.c
@@ -1949,7 +1949,7 @@ static UINT TABLE_add_ref(struct tagMSIVIEW *view)
    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;
    MSIRECORD *rec = NULL;
@@ -1974,7 +1974,7 @@ static UINT TABLE_remove_column(struct tagMSIVIEW *view, LPCWSTR table, UINT num
    if (!rec)
        return ERROR_OUTOFMEMORY;
-    MSI_RecordSetStringW(rec, 1, table);
+    MSI_RecordSetStringW(rec, 1, tv->name);
    MSI_RecordSetInteger(rec, 2, number);
    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)
        goto done;
-    msi_update_table_columns(tv->db, table);
+    msi_update_table_columns(tv->db, tv->name);
 done:
    msiobj_release(&rec->hdr);
@@ -2016,8 +2016,7 @@ static UINT TABLE_release(struct tagMSIVIEW *view)
        {
            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)
                    break;
            }
@@ -2145,8 +2144,7 @@ static UINT TABLE_drop(struct tagMSIVIEW *view)
    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)
            return r;
    }