Zebediah Figura : msi: Get rid of the get_row() view operation.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 7c28a1dbddc012d497988f638b7ecb70e75b17c3
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=7c28a1dbddc012d497988f638...

Author: Zebediah Figura <z.figura12(a)gmail.com>
Date:   Sat Jan 26 16:58:59 2019 -0600

msi: Get rid of the get_row() view operation.

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>

---

 dlls/msi/alter.c    | 10 ----------
 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  |  6 ------
 dlls/msi/select.c   | 13 -------------
 dlls/msi/storages.c | 10 ----------
 dlls/msi/streams.c  | 10 ----------
 dlls/msi/table.c    |  1 -
 dlls/msi/update.c   |  1 -
 dlls/msi/where.c    | 13 -------------
 13 files changed, 69 deletions(-)

diff --git a/dlls/msi/alter.c b/dlls/msi/alter.c
index 96ff284..d1a481e 100644
--- a/dlls/msi/alter.c
+++ b/dlls/msi/alter.c
@@ -61,15 +61,6 @@ static UINT ALTER_fetch_stream( struct tagMSIVIEW *view, UINT row, UINT col, ISt
     return ERROR_FUNCTION_FAILED;
 }
 
-static UINT ALTER_get_row( struct tagMSIVIEW *view, UINT row, MSIRECORD **rec )
-{
-    MSIALTERVIEW *av = (MSIALTERVIEW*)view;
-
-    TRACE("%p %d %p\n", av, row, rec );
-
-    return av->table->ops->get_row(av->table, row, rec);
-}
-
 static UINT ITERATE_columns(MSIRECORD *row, LPVOID param)
 {
     (*(UINT *)param)++;
@@ -225,7 +216,6 @@ static const MSIVIEWOPS alter_ops =
 {
     ALTER_fetch_int,
     ALTER_fetch_stream,
-    ALTER_get_row,
     NULL,
     NULL,
     NULL,
diff --git a/dlls/msi/create.c b/dlls/msi/create.c
index 2777954..3c00b70 100644
--- a/dlls/msi/create.c
+++ b/dlls/msi/create.c
@@ -131,7 +131,6 @@ static const MSIVIEWOPS create_ops =
     NULL,
     NULL,
     NULL,
-    NULL,
     CREATE_execute,
     CREATE_close,
     CREATE_get_dimensions,
diff --git a/dlls/msi/delete.c b/dlls/msi/delete.c
index 81bd9d7..e2e0e34 100644
--- a/dlls/msi/delete.c
+++ b/dlls/msi/delete.c
@@ -173,7 +173,6 @@ static const MSIVIEWOPS delete_ops =
     NULL,
     NULL,
     NULL,
-    NULL,
     DELETE_execute,
     DELETE_close,
     DELETE_get_dimensions,
diff --git a/dlls/msi/distinct.c b/dlls/msi/distinct.c
index e102adb..5bd5bf8 100644
--- a/dlls/msi/distinct.c
+++ b/dlls/msi/distinct.c
@@ -256,7 +256,6 @@ static const MSIVIEWOPS distinct_ops =
     NULL,
     NULL,
     NULL,
-    NULL,
     DISTINCT_execute,
     DISTINCT_close,
     DISTINCT_get_dimensions,
diff --git a/dlls/msi/drop.c b/dlls/msi/drop.c
index 89fac9d..60a9202 100644
--- a/dlls/msi/drop.c
+++ b/dlls/msi/drop.c
@@ -101,7 +101,6 @@ static const MSIVIEWOPS drop_ops =
     NULL,
     NULL,
     NULL,
-    NULL,
     DROP_execute,
     DROP_close,
     DROP_get_dimensions,
diff --git a/dlls/msi/insert.c b/dlls/msi/insert.c
index f1185ee..ed913c0 100644
--- a/dlls/msi/insert.c
+++ b/dlls/msi/insert.c
@@ -327,7 +327,6 @@ static const MSIVIEWOPS insert_ops =
     NULL,
     NULL,
     NULL,
-    NULL,
     INSERT_execute,
     INSERT_close,
     INSERT_get_dimensions,
diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h
index e9c000d..3ff5ac2 100644
--- a/dlls/msi/msipriv.h
+++ b/dlls/msi/msipriv.h
@@ -243,12 +243,6 @@ typedef struct tagMSIVIEWOPS
     UINT (*fetch_stream)( struct tagMSIVIEW *view, UINT row, UINT col, IStream **stm );
 
     /*
-     * get_row - gets values from a row
-     *
-     */
-    UINT (*get_row)( struct tagMSIVIEW *view, UINT row, MSIRECORD **rec );
-
-    /*
      * set_int - set the integer value at {row, col}
      * This function has undefined behaviour if the column does not contain
      * integers.
diff --git a/dlls/msi/select.c b/dlls/msi/select.c
index 91765c8..99339c2 100644
--- a/dlls/msi/select.c
+++ b/dlls/msi/select.c
@@ -90,18 +90,6 @@ static UINT SELECT_fetch_stream( struct tagMSIVIEW *view, UINT row, UINT col, IS
     return sv->table->ops->fetch_stream( sv->table, row, col, stm );
 }
 
-static UINT SELECT_get_row( struct tagMSIVIEW *view, UINT row, MSIRECORD **rec )
-{
-    MSISELECTVIEW *sv = (MSISELECTVIEW *)view;
-
-    TRACE("%p %d %p\n", sv, row, rec );
-
-    if( !sv->table )
-         return ERROR_FUNCTION_FAILED;
-
-    return msi_view_get_row(sv->db, view, row, rec);
-}
-
 static UINT SELECT_set_row( struct tagMSIVIEW *view, UINT row, MSIRECORD *rec, UINT mask )
 {
     MSISELECTVIEW *sv = (MSISELECTVIEW*)view;
@@ -325,7 +313,6 @@ static const MSIVIEWOPS select_ops =
 {
     SELECT_fetch_int,
     SELECT_fetch_stream,
-    SELECT_get_row,
     NULL,
     NULL,
     SELECT_set_row,
diff --git a/dlls/msi/storages.c b/dlls/msi/storages.c
index ad020de..9e161c9 100644
--- a/dlls/msi/storages.c
+++ b/dlls/msi/storages.c
@@ -115,15 +115,6 @@ static UINT STORAGES_fetch_stream(struct tagMSIVIEW *view, UINT row, UINT col, I
     return ERROR_INVALID_DATA;
 }
 
-static UINT STORAGES_get_row( struct tagMSIVIEW *view, UINT row, MSIRECORD **rec )
-{
-    MSISTORAGESVIEW *sv = (MSISTORAGESVIEW *)view;
-
-    FIXME("%p %d %p\n", sv, row, rec);
-
-    return ERROR_CALL_NOT_IMPLEMENTED;
-}
-
 static UINT STORAGES_set_string( struct tagMSIVIEW *view, UINT row, UINT col, const WCHAR *val, int len )
 {
     ERR("Cannot modify primary key.\n");
@@ -425,7 +416,6 @@ static const MSIVIEWOPS storages_ops =
 {
     STORAGES_fetch_int,
     STORAGES_fetch_stream,
-    STORAGES_get_row,
     NULL,
     STORAGES_set_string,
     STORAGES_set_row,
diff --git a/dlls/msi/streams.c b/dlls/msi/streams.c
index ae45c1d..2d458ad 100644
--- a/dlls/msi/streams.c
+++ b/dlls/msi/streams.c
@@ -110,15 +110,6 @@ static UINT STREAMS_set_string( struct tagMSIVIEW *view, UINT row, UINT col, con
     return ERROR_FUNCTION_FAILED;
 }
 
-static UINT STREAMS_get_row( struct tagMSIVIEW *view, UINT row, MSIRECORD **rec )
-{
-    MSISTREAMSVIEW *sv = (MSISTREAMSVIEW *)view;
-
-    TRACE("%p %d %p\n", sv, row, rec);
-
-    return msi_view_get_row( sv->db, view, row, rec );
-}
-
 static UINT STREAMS_set_row(struct tagMSIVIEW *view, UINT row, MSIRECORD *rec, UINT mask)
 {
     MSISTREAMSVIEW *sv = (MSISTREAMSVIEW *)view;
@@ -347,7 +338,6 @@ static const MSIVIEWOPS streams_ops =
 {
     STREAMS_fetch_int,
     STREAMS_fetch_stream,
-    STREAMS_get_row,
     NULL,
     STREAMS_set_string,
     STREAMS_set_row,
diff --git a/dlls/msi/table.c b/dlls/msi/table.c
index a5de8cc..f26ab9f 100644
--- a/dlls/msi/table.c
+++ b/dlls/msi/table.c
@@ -2124,7 +2124,6 @@ static const MSIVIEWOPS table_ops =
 {
     TABLE_fetch_int,
     TABLE_fetch_stream,
-    TABLE_get_row,
     TABLE_set_int,
     TABLE_set_string,
     TABLE_set_row,
diff --git a/dlls/msi/update.c b/dlls/msi/update.c
index e61342d..af629d2 100644
--- a/dlls/msi/update.c
+++ b/dlls/msi/update.c
@@ -204,7 +204,6 @@ static const MSIVIEWOPS update_ops =
     NULL,
     NULL,
     NULL,
-    NULL,
     UPDATE_execute,
     UPDATE_close,
     UPDATE_get_dimensions,
diff --git a/dlls/msi/where.c b/dlls/msi/where.c
index 6a10a04..eaadac4 100644
--- a/dlls/msi/where.c
+++ b/dlls/msi/where.c
@@ -259,18 +259,6 @@ static UINT WHERE_fetch_stream( struct tagMSIVIEW *view, UINT row, UINT col, ISt
     return table->view->ops->fetch_stream( table->view, rows[table->table_index], col, stm );
 }
 
-static UINT WHERE_get_row( struct tagMSIVIEW *view, UINT row, MSIRECORD **rec )
-{
-    MSIWHEREVIEW *wv = (MSIWHEREVIEW *)view;
-
-    TRACE("%p %d %p\n", wv, row, rec );
-
-    if (!wv->tables)
-        return ERROR_FUNCTION_FAILED;
-
-    return msi_view_get_row( wv->db, view, row, rec );
-}
-
 static UINT WHERE_set_int(struct tagMSIVIEW *view, UINT row, UINT col, int val)
 {
     MSIWHEREVIEW *wv = (MSIWHEREVIEW*)view;
@@ -1108,7 +1096,6 @@ static const MSIVIEWOPS where_ops =
 {
     WHERE_fetch_int,
     WHERE_fetch_stream,
-    WHERE_get_row,
     WHERE_set_int,
     WHERE_set_string,
     WHERE_set_row,