[ros-diffs] [reactos] 181/360: [WINESYNC] msi: Get rid of the remove_column() view operation.

[winesync]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fb72dff218860f243c054…

commit fb72dff218860f243c0544eeb3691429461c5ba8
Author:     winesync <ros-dev(a)reactos.org>
AuthorDate: Sun Mar 13 00:16:28 2022 +0100
Commit:     Mark Jansen <mark.jansen(a)reactos.org>
CommitDate: Sun Mar 20 19:28:09 2022 +0100

    [WINESYNC] 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(a)gmail.com>
    Signed-off-by: Hans Leidekker <hans(a)codeweavers.com>
    Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
    
    wine commit id c2810f40a0af6496cfbb7d87685e2e018befd43b by Zebediah Figura
<z.figura12(a)gmail.com>
---
 dll/win32/msi/alter.c    | 1 -
 dll/win32/msi/create.c   | 1 -
 dll/win32/msi/delete.c   | 1 -
 dll/win32/msi/distinct.c | 1 -
 dll/win32/msi/drop.c     | 1 -
 dll/win32/msi/insert.c   | 1 -
 dll/win32/msi/msipriv.h  | 5 -----
 dll/win32/msi/select.c   | 1 -
 dll/win32/msi/storages.c | 1 -
 dll/win32/msi/streams.c  | 1 -
 dll/win32/msi/table.c    | 1 -
 dll/win32/msi/update.c   | 1 -
 dll/win32/msi/where.c    | 1 -
 13 files changed, 17 deletions(-)

diff --git a/dll/win32/msi/alter.c b/dll/win32/msi/alter.c
index 8899c4499da..011a2dcfb81 100644
--- a/dll/win32/msi/alter.c
+++ b/dll/win32/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/dll/win32/msi/create.c b/dll/win32/msi/create.c
index 0a60066d8e2..dd4739df12f 100644
--- a/dll/win32/msi/create.c
+++ b/dll/win32/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/dll/win32/msi/delete.c b/dll/win32/msi/delete.c
index 4ed5384b8d1..468115186b6 100644
--- a/dll/win32/msi/delete.c
+++ b/dll/win32/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/dll/win32/msi/distinct.c b/dll/win32/msi/distinct.c
index ff292f16bc4..b1945a15465 100644
--- a/dll/win32/msi/distinct.c
+++ b/dll/win32/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/dll/win32/msi/drop.c b/dll/win32/msi/drop.c
index 41dbc8d4e28..3179f14219e 100644
--- a/dll/win32/msi/drop.c
+++ b/dll/win32/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/dll/win32/msi/insert.c b/dll/win32/msi/insert.c
index 0ae0cdc77fb..a5333c9cdc6 100644
--- a/dll/win32/msi/insert.c
+++ b/dll/win32/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/dll/win32/msi/msipriv.h b/dll/win32/msi/msipriv.h
index 79c50062ef8..90fd569aea8 100644
--- a/dll/win32/msi/msipriv.h
+++ b/dll/win32/msi/msipriv.h
@@ -316,11 +316,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
      */
diff --git a/dll/win32/msi/select.c b/dll/win32/msi/select.c
index 70d2c329505..8bd4509c0e5 100644
--- a/dll/win32/msi/select.c
+++ b/dll/win32/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/dll/win32/msi/storages.c b/dll/win32/msi/storages.c
index f0b960d7c8b..9d262b78f72 100644
--- a/dll/win32/msi/storages.c
+++ b/dll/win32/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/dll/win32/msi/streams.c b/dll/win32/msi/streams.c
index 05367a42741..78d8aaa69c2 100644
--- a/dll/win32/msi/streams.c
+++ b/dll/win32/msi/streams.c
@@ -380,7 +380,6 @@ static const MSIVIEWOPS streams_ops =
     NULL,
     NULL,
     NULL,
-    NULL,
 };
 
 static HRESULT open_stream( MSIDATABASE *db, const WCHAR *name, IStream **stream )
diff --git a/dll/win32/msi/table.c b/dll/win32/msi/table.c
index e24b0bd0e53..4a0633441f0 100644
--- a/dll/win32/msi/table.c
+++ b/dll/win32/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/dll/win32/msi/update.c b/dll/win32/msi/update.c
index ed81447aa5e..ff4e1abf5f5 100644
--- a/dll/win32/msi/update.c
+++ b/dll/win32/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/dll/win32/msi/where.c b/dll/win32/msi/where.c
index b493bda7dd8..6c08471bbf7 100644
--- a/dll/win32/msi/where.c
+++ b/dll/win32/msi/where.c
@@ -1081,7 +1081,6 @@ static const MSIVIEWOPS where_ops =
     NULL,
     NULL,
     NULL,
-    NULL,
     WHERE_sort,
     NULL,
 };