20 Mar
2022
20 Mar
'22
6:44 p.m.
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f6659d1de9b9ca1cc1406…
commit f6659d1de9b9ca1cc140643c755afe41755c0130
Author: winesync <ros-dev(a)reactos.org>
AuthorDate: Sun Mar 13 00:16:35 2022 +0100
Commit: Mark Jansen <mark.jansen(a)reactos.org>
CommitDate: Sun Mar 20 19:28:10 2022 +0100
[WINESYNC] 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>
wine commit id 7c28a1dbddc012d497988f638b7ecb70e75b17c3 by Zebediah Figura
<z.figura12(a)gmail.com>
---
dll/win32/msi/alter.c | 10 ----------
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 | 6 ------
dll/win32/msi/select.c | 13 -------------
dll/win32/msi/storages.c | 10 ----------
dll/win32/msi/streams.c | 10 ----------
dll/win32/msi/table.c | 1 -
dll/win32/msi/update.c | 1 -
dll/win32/msi/where.c | 13 -------------
13 files changed, 69 deletions(-)
diff --git a/dll/win32/msi/alter.c b/dll/win32/msi/alter.c
index 96ff284a3df..d1a481ebfc9 100644
--- a/dll/win32/msi/alter.c
+++ b/dll/win32/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/dll/win32/msi/create.c b/dll/win32/msi/create.c
index 2777954aa7d..3c00b70c531 100644
--- a/dll/win32/msi/create.c
+++ b/dll/win32/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/dll/win32/msi/delete.c b/dll/win32/msi/delete.c
index 81bd9d7db2f..e2e0e34678b 100644
--- a/dll/win32/msi/delete.c
+++ b/dll/win32/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/dll/win32/msi/distinct.c b/dll/win32/msi/distinct.c
index e102adb3de2..5bd5bf8676d 100644
--- a/dll/win32/msi/distinct.c
+++ b/dll/win32/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/dll/win32/msi/drop.c b/dll/win32/msi/drop.c
index 89fac9dfc7c..60a92021060 100644
--- a/dll/win32/msi/drop.c
+++ b/dll/win32/msi/drop.c
@@ -94,7 +94,6 @@ static UINT DROP_delete( struct tagMSIVIEW *view )
static const MSIVIEWOPS drop_ops =
{
- NULL,
NULL,
NULL,
NULL,
diff --git a/dll/win32/msi/insert.c b/dll/win32/msi/insert.c
index f1185eebaeb..ed913c034c1 100644
--- a/dll/win32/msi/insert.c
+++ b/dll/win32/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/dll/win32/msi/msipriv.h b/dll/win32/msi/msipriv.h
index 9677d046452..8bf0385a440 100644
--- a/dll/win32/msi/msipriv.h
+++ b/dll/win32/msi/msipriv.h
@@ -242,12 +242,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
diff --git a/dll/win32/msi/select.c b/dll/win32/msi/select.c
index 91765c8ec3b..99339c24b89 100644
--- a/dll/win32/msi/select.c
+++ b/dll/win32/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/dll/win32/msi/storages.c b/dll/win32/msi/storages.c
index ad020dec55e..9e161c9e1bd 100644
--- a/dll/win32/msi/storages.c
+++ b/dll/win32/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/dll/win32/msi/streams.c b/dll/win32/msi/streams.c
index ec34e34a85e..150e9288682 100644
--- a/dll/win32/msi/streams.c
+++ b/dll/win32/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;
@@ -371,7 +362,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/dll/win32/msi/table.c b/dll/win32/msi/table.c
index a5de8ccf59c..f26ab9f5b45 100644
--- a/dll/win32/msi/table.c
+++ b/dll/win32/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/dll/win32/msi/update.c b/dll/win32/msi/update.c
index e61342d11e4..af629d2236c 100644
--- a/dll/win32/msi/update.c
+++ b/dll/win32/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/dll/win32/msi/where.c b/dll/win32/msi/where.c
index 6a10a049a63..eaadac4310c 100644
--- a/dll/win32/msi/where.c
+++ b/dll/win32/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,