Module: wine Branch: master Commit: c2810f40a0af6496cfbb7d87685e2e018befd43b URL: https://source.winehq.org/git/wine.git/?a=commit;h=c2810f40a0af6496cfbb7d876...
Author: Zebediah Figura z.figura12@gmail.com Date: Thu Jan 24 00:07:31 2019 -0600
msi: Get rid of the remove_column() view operation.
It was added to the structure, rather unnecessarily, by ccef56f2c.
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
---
dlls/msi/alter.c | 1 - dlls/msi/create.c | 1 - dlls/msi/delete.c | 1 - dlls/msi/distinct.c | 1 - dlls/msi/drop.c | 1 - dlls/msi/insert.c | 1 - dlls/msi/msipriv.h | 5 ----- dlls/msi/select.c | 1 - dlls/msi/storages.c | 1 - dlls/msi/streams.c | 1 - dlls/msi/table.c | 1 - dlls/msi/update.c | 1 - dlls/msi/where.c | 1 - 13 files changed, 17 deletions(-)
diff --git a/dlls/msi/alter.c b/dlls/msi/alter.c index 8899c44..011a2dc 100644 --- a/dlls/msi/alter.c +++ b/dlls/msi/alter.c @@ -240,7 +240,6 @@ static const MSIVIEWOPS alter_ops = NULL, NULL, NULL, - NULL, };
UINT ALTER_CreateView( MSIDATABASE *db, MSIVIEW **view, LPCWSTR name, column_info *colinfo, int hold ) diff --git a/dlls/msi/create.c b/dlls/msi/create.c index 0a60066..dd4739d 100644 --- a/dlls/msi/create.c +++ b/dlls/msi/create.c @@ -141,7 +141,6 @@ static const MSIVIEWOPS create_ops = NULL, NULL, NULL, - NULL, };
static UINT check_columns( const column_info *col_info ) diff --git a/dlls/msi/delete.c b/dlls/msi/delete.c index 4ed5384..4681151 100644 --- a/dlls/msi/delete.c +++ b/dlls/msi/delete.c @@ -183,7 +183,6 @@ static const MSIVIEWOPS delete_ops = NULL, NULL, NULL, - NULL, };
UINT DELETE_CreateView( MSIDATABASE *db, MSIVIEW **view, MSIVIEW *table ) diff --git a/dlls/msi/distinct.c b/dlls/msi/distinct.c index ff292f1..b1945a1 100644 --- a/dlls/msi/distinct.c +++ b/dlls/msi/distinct.c @@ -266,7 +266,6 @@ static const MSIVIEWOPS distinct_ops = NULL, NULL, NULL, - NULL, };
UINT DISTINCT_CreateView( MSIDATABASE *db, MSIVIEW **view, MSIVIEW *table ) diff --git a/dlls/msi/drop.c b/dlls/msi/drop.c index 41dbc8d..3179f14 100644 --- a/dlls/msi/drop.c +++ b/dlls/msi/drop.c @@ -111,7 +111,6 @@ static const MSIVIEWOPS drop_ops = NULL, NULL, NULL, - NULL, };
UINT DROP_CreateView(MSIDATABASE *db, MSIVIEW **view, LPCWSTR name) diff --git a/dlls/msi/insert.c b/dlls/msi/insert.c index 0ae0cdc..a5333c9 100644 --- a/dlls/msi/insert.c +++ b/dlls/msi/insert.c @@ -337,7 +337,6 @@ static const MSIVIEWOPS insert_ops = NULL, NULL, NULL, - NULL, };
static UINT count_column_info( const column_info *ci ) diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 420fe43..d05ad0e 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -317,11 +317,6 @@ typedef struct tagMSIVIEWOPS UINT (*add_column)( struct tagMSIVIEW *view, LPCWSTR table, UINT number, LPCWSTR column, UINT type, BOOL hold );
/* - * remove_column - removes the column represented by table name and column number from the table - */ - UINT (*remove_column)( struct tagMSIVIEW *view, LPCWSTR table, UINT number ); - - /* * sort - orders the table by columns */ UINT (*sort)( struct tagMSIVIEW *view, column_info *columns ); diff --git a/dlls/msi/select.c b/dlls/msi/select.c index 70d2c32..8bd4509 100644 --- a/dlls/msi/select.c +++ b/dlls/msi/select.c @@ -350,7 +350,6 @@ static const MSIVIEWOPS select_ops = NULL, NULL, NULL, - NULL, };
static UINT SELECT_AddColumn( MSISELECTVIEW *sv, LPCWSTR name, diff --git a/dlls/msi/storages.c b/dlls/msi/storages.c index f0b960d..9d262b7 100644 --- a/dlls/msi/storages.c +++ b/dlls/msi/storages.c @@ -434,7 +434,6 @@ static const MSIVIEWOPS storages_ops = NULL, NULL, NULL, - NULL, };
static INT add_storages_to_table(MSISTORAGESVIEW *sv) diff --git a/dlls/msi/streams.c b/dlls/msi/streams.c index e542d78..37b8cb3 100644 --- a/dlls/msi/streams.c +++ b/dlls/msi/streams.c @@ -356,7 +356,6 @@ static const MSIVIEWOPS streams_ops = NULL, NULL, NULL, - NULL, };
static HRESULT open_stream( MSIDATABASE *db, const WCHAR *name, IStream **stream ) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index e24b0bd..4a06334 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -2072,7 +2072,6 @@ static const MSIVIEWOPS table_ops = TABLE_add_ref, TABLE_release, TABLE_add_column, - TABLE_remove_column, NULL, TABLE_drop, }; diff --git a/dlls/msi/update.c b/dlls/msi/update.c index ed81447..ff4e1ab 100644 --- a/dlls/msi/update.c +++ b/dlls/msi/update.c @@ -213,7 +213,6 @@ static const MSIVIEWOPS update_ops = NULL, NULL, NULL, - NULL, };
UINT UPDATE_CreateView( MSIDATABASE *db, MSIVIEW **view, LPWSTR table, diff --git a/dlls/msi/where.c b/dlls/msi/where.c index b493bda..6c08471 100644 --- a/dlls/msi/where.c +++ b/dlls/msi/where.c @@ -1081,7 +1081,6 @@ static const MSIVIEWOPS where_ops = NULL, NULL, NULL, - NULL, WHERE_sort, NULL, };
-
Alexandre Julliard