rename View functions to Query

The implementation-side "view" concept is different from the API side.
Rename the API to make it more consistent.

5 files changed, 69 insertions, 69 deletions

diff --git a/libmsi/alter.c b/libmsi/alter.c
index b96dc61..3d5b632 100644
--- a/libmsi/alter.c
+++ b/libmsi/alter.c
@@ -91,11 +91,11 @@ static bool check_column_exists(LibmsiDatabase *db, const WCHAR *table, const WC
     if (r != ERROR_SUCCESS)
         return false;
 
-    r = MSI_ViewExecute(view, NULL);
+    r = MSI_QueryExecute(view, NULL);
     if (r != ERROR_SUCCESS)
         goto done;
 
-    r = MSI_ViewFetch(view, &rec);
+    r = MSI_QueryFetch(view, &rec);
     if (r == ERROR_SUCCESS)
         msiobj_release(&rec->hdr);
 
diff --git a/libmsi/database.c b/libmsi/database.c
index c40cbbe..acb7b60 100644
--- a/libmsi/database.c
+++ b/libmsi/database.c
@@ -751,12 +751,12 @@ static unsigned msi_add_table_to_db(LibmsiDatabase *db, WCHAR **columns, WCHAR *
     strcatW(create_sql, columns_sql);
     strcatW(create_sql, postlude);
 
-    r = MSI_DatabaseOpenViewW( db, create_sql, &view );
+    r = MSI_DatabaseOpenQueryW( db, create_sql, &view );
     if (r != ERROR_SUCCESS)
         goto done;
 
-    r = MSI_ViewExecute(view, NULL);
-    MSI_ViewClose(view);
+    r = MSI_QueryExecute(view, NULL);
+    MSI_QueryClose(view);
     msiobj_release(&view->hdr);
 
 done:
@@ -857,9 +857,9 @@ static unsigned msi_add_records_to_table(LibmsiDatabase *db, WCHAR **columns, WC
     if (r != ERROR_SUCCESS)
         return r;
 
-    while (MSI_ViewFetch(view, &rec) != ERROR_NO_MORE_ITEMS)
+    while (MSI_QueryFetch(view, &rec) != ERROR_NO_MORE_ITEMS)
     {
-        r = MSI_ViewModify(view, LIBMSI_MODIFY_DELETE, rec);
+        r = MSI_QueryModify(view, LIBMSI_MODIFY_DELETE, rec);
         msiobj_release(&rec->hdr);
         if (r != ERROR_SUCCESS)
             goto done;
@@ -871,7 +871,7 @@ static unsigned msi_add_records_to_table(LibmsiDatabase *db, WCHAR **columns, WC
         if (r != ERROR_SUCCESS)
             goto done;
 
-        r = MSI_ViewModify(view, LIBMSI_MODIFY_INSERT, rec);
+        r = MSI_QueryModify(view, LIBMSI_MODIFY_INSERT, rec);
         if (r != ERROR_SUCCESS)
         {
             msiobj_release(&rec->hdr);
@@ -1111,7 +1111,7 @@ static unsigned MSI_DatabaseExport( LibmsiDatabase *db, const WCHAR *table,
     if (r == ERROR_SUCCESS)
     {
         /* write out row 1, the column names */
-        r = MSI_ViewGetColumnInfo(view, LIBMSI_COL_INFO_NAMES, &rec);
+        r = MSI_QueryGetColumnInfo(view, LIBMSI_COL_INFO_NAMES, &rec);
         if (r == ERROR_SUCCESS)
         {
             msi_export_record( fd, rec, 1 );
@@ -1119,7 +1119,7 @@ static unsigned MSI_DatabaseExport( LibmsiDatabase *db, const WCHAR *table,
         }
 
         /* write out row 2, the column types */
-        r = MSI_ViewGetColumnInfo(view, LIBMSI_COL_INFO_TYPES, &rec);
+        r = MSI_QueryGetColumnInfo(view, LIBMSI_COL_INFO_TYPES, &rec);
         if (r == ERROR_SUCCESS)
         {
             msi_export_record( fd, rec, 1 );
@@ -1239,11 +1239,11 @@ static unsigned merge_verify_colnames(LibmsiQuery *dbview, LibmsiQuery *mergevie
     LibmsiRecord *dbrec, *mergerec;
     unsigned r, i, count;
 
-    r = MSI_ViewGetColumnInfo(dbview, LIBMSI_COL_INFO_NAMES, &dbrec);
+    r = MSI_QueryGetColumnInfo(dbview, LIBMSI_COL_INFO_NAMES, &dbrec);
     if (r != ERROR_SUCCESS)
         return r;
 
-    r = MSI_ViewGetColumnInfo(mergeview, LIBMSI_COL_INFO_NAMES, &mergerec);
+    r = MSI_QueryGetColumnInfo(mergeview, LIBMSI_COL_INFO_NAMES, &mergerec);
     if (r != ERROR_SUCCESS)
         return r;
 
@@ -1264,11 +1264,11 @@ static unsigned merge_verify_colnames(LibmsiQuery *dbview, LibmsiQuery *mergevie
     msiobj_release(&mergerec->hdr);
     dbrec = mergerec = NULL;
 
-    r = MSI_ViewGetColumnInfo(dbview, LIBMSI_COL_INFO_TYPES, &dbrec);
+    r = MSI_QueryGetColumnInfo(dbview, LIBMSI_COL_INFO_TYPES, &dbrec);
     if (r != ERROR_SUCCESS)
         return r;
 
-    r = MSI_ViewGetColumnInfo(mergeview, LIBMSI_COL_INFO_TYPES, &mergerec);
+    r = MSI_QueryGetColumnInfo(mergeview, LIBMSI_COL_INFO_TYPES, &mergerec);
     if (r != ERROR_SUCCESS)
         return r;
 
@@ -1338,7 +1338,7 @@ static WCHAR *get_key_value(LibmsiQuery *view, const WCHAR *key, LibmsiRecord *r
     unsigned r, i = 0, sz = 0;
     int cmp;
 
-    r = MSI_ViewGetColumnInfo(view, LIBMSI_COL_INFO_NAMES, &colnames);
+    r = MSI_QueryGetColumnInfo(view, LIBMSI_COL_INFO_NAMES, &colnames);
     if (r != ERROR_SUCCESS)
         return NULL;
 
@@ -1471,15 +1471,15 @@ static unsigned merge_diff_row(LibmsiRecord *rec, void *param)
         if (!query)
             return ERROR_OUTOFMEMORY;
 
-        r = MSI_DatabaseOpenViewW(data->db, query, &dbview);
+        r = MSI_DatabaseOpenQueryW(data->db, query, &dbview);
         if (r != ERROR_SUCCESS)
             goto done;
 
-        r = MSI_ViewExecute(dbview, NULL);
+        r = MSI_QueryExecute(dbview, NULL);
         if (r != ERROR_SUCCESS)
             goto done;
 
-        r = MSI_ViewFetch(dbview, &row);
+        r = MSI_QueryFetch(dbview, &row);
         if (r == ERROR_SUCCESS && !MSI_RecordsAreEqual(rec, row))
         {
             table->numconflicts++;
@@ -1549,7 +1549,7 @@ static unsigned msi_get_query_columns(LibmsiQuery *query, WCHAR ***columns, unsi
     unsigned r, i, count;
     LibmsiRecord *prec = NULL;
 
-    r = MSI_ViewGetColumnInfo(query, LIBMSI_COL_INFO_NAMES, &prec);
+    r = MSI_QueryGetColumnInfo(query, LIBMSI_COL_INFO_NAMES, &prec);
     if (r != ERROR_SUCCESS)
         return r;
 
@@ -1578,7 +1578,7 @@ static unsigned msi_get_query_types(LibmsiQuery *query, WCHAR ***types, unsigned
     unsigned r, i, count;
     LibmsiRecord *prec = NULL;
 
-    r = MSI_ViewGetColumnInfo(query, LIBMSI_COL_INFO_TYPES, &prec);
+    r = MSI_QueryGetColumnInfo(query, LIBMSI_COL_INFO_TYPES, &prec);
     if (r != ERROR_SUCCESS)
         return r;
 
@@ -1761,7 +1761,7 @@ static unsigned gather_merge_data(LibmsiDatabase *db, LibmsiDatabase *merge,
     MERGEDATA data;
     unsigned r;
 
-    r = MSI_DatabaseOpenViewW(merge, query, &view);
+    r = MSI_DatabaseOpenQueryW(merge, query, &view);
     if (r != ERROR_SUCCESS)
         return r;
 
@@ -1830,7 +1830,7 @@ static unsigned update_merge_errors(LibmsiDatabase *db, const WCHAR *error,
         if (r != ERROR_SUCCESS)
             return r;
 
-        r = MSI_ViewExecute(view, NULL);
+        r = MSI_QueryExecute(view, NULL);
         msiobj_release(&view->hdr);
         if (r != ERROR_SUCCESS)
             return r;
@@ -1840,7 +1840,7 @@ static unsigned update_merge_errors(LibmsiDatabase *db, const WCHAR *error,
     if (r != ERROR_SUCCESS)
         return r;
 
-    r = MSI_ViewExecute(view, NULL);
+    r = MSI_QueryExecute(view, NULL);
     msiobj_release(&view->hdr);
     return r;
 }
diff --git a/libmsi/msipriv.h b/libmsi/msipriv.h
index bd5f776..cec346d 100644
--- a/libmsi/msipriv.h
+++ b/libmsi/msipriv.h
@@ -275,7 +275,7 @@ typedef struct LibmsiSummaryInfo
 #define LIBMSI_OBJECT_TYPE_ANY 0
 #define LIBMSI_OBJECT_TYPE_DATABASE 1
 #define LIBMSI_OBJECT_TYPE_SUMMARYINFO 2
-#define LIBMSI_OBJECT_TYPE_VIEW 3
+#define LIBMSI_OBJECT_TYPE_QUERY 3
 #define LIBMSI_OBJECT_TYPE_RECORD 4
 #define LIBMSI_OBJECT_TYPE_PACKAGE 5
 #define LIBMSI_OBJECT_TYPE_PREVIEW 6
@@ -374,7 +374,7 @@ extern unsigned msi_get_raw_stream( LibmsiDatabase *, const WCHAR *, IStream **)
 extern unsigned msi_clone_open_stream( LibmsiDatabase *, IStorage *, const WCHAR *, IStream ** );
 void msi_destroy_stream( LibmsiDatabase *, const WCHAR * );
 extern unsigned MSI_OpenDatabaseW( const WCHAR *, const WCHAR *, LibmsiDatabase **);
-extern unsigned MSI_DatabaseOpenViewW(LibmsiDatabase *, const WCHAR *, LibmsiQuery **);
+extern unsigned MSI_DatabaseOpenQueryW(LibmsiDatabase *, const WCHAR *, LibmsiQuery **);
 extern unsigned MSI_OpenQuery( LibmsiDatabase *, LibmsiQuery **, const WCHAR *, ... );
 typedef unsigned (*record_func)( LibmsiRecord *, void *);
 extern unsigned MSI_IterateRecords( LibmsiQuery *, unsigned *, record_func, void *);
@@ -382,11 +382,11 @@ extern LibmsiRecord *MSI_QueryGetRecord( LibmsiDatabase *db, const WCHAR *query,
 extern unsigned MSI_DatabaseGetPrimaryKeys( LibmsiDatabase *, const WCHAR *, LibmsiRecord **);
 
 /* view internals */
-extern unsigned MSI_ViewExecute( LibmsiQuery*, LibmsiRecord * );
-extern unsigned MSI_ViewFetch( LibmsiQuery*, LibmsiRecord ** );
-extern unsigned MSI_ViewClose( LibmsiQuery* );
-extern unsigned MSI_ViewGetColumnInfo(LibmsiQuery *, LibmsiColInfo, LibmsiRecord **);
-extern unsigned MSI_ViewModify( LibmsiQuery *, LibmsiModify, LibmsiRecord * );
+extern unsigned MSI_QueryExecute( LibmsiQuery*, LibmsiRecord * );
+extern unsigned MSI_QueryFetch( LibmsiQuery*, LibmsiRecord ** );
+extern unsigned MSI_QueryClose( LibmsiQuery* );
+extern unsigned MSI_QueryGetColumnInfo(LibmsiQuery *, LibmsiColInfo, LibmsiRecord **);
+extern unsigned MSI_QueryModify( LibmsiQuery *, LibmsiModify, LibmsiRecord * );
 extern unsigned VIEW_find_column( LibmsiView *, const WCHAR *, const WCHAR *, unsigned *);
 extern unsigned msi_view_get_row(LibmsiDatabase *, LibmsiView *, unsigned, LibmsiRecord **);
 
diff --git a/libmsi/msiquery.c b/libmsi/msiquery.c
index 9264afb..d3ec774 100644
--- a/libmsi/msiquery.c
+++ b/libmsi/msiquery.c
@@ -39,7 +39,7 @@
 #include "initguid.h"
 
 
-static void MSI_CloseView( LibmsiObject *arg )
+static void MSI_CloseQuery( LibmsiObject *arg )
 {
     LibmsiQuery *query = (LibmsiQuery*) arg;
     struct list *ptr, *t;
@@ -84,7 +84,7 @@ unsigned VIEW_find_column( LibmsiView *table, const WCHAR *name, const WCHAR *ta
     return ERROR_INVALID_PARAMETER;
 }
 
-unsigned MsiDatabaseOpenView(LibmsiObject *hdb,
+unsigned MsiDatabaseOpenQuery(LibmsiObject *hdb,
               const char *szQuery, LibmsiObject **phView)
 {
     unsigned r;
@@ -109,7 +109,7 @@ unsigned MsiDatabaseOpenView(LibmsiObject *hdb,
     if( !db )
         return ERROR_INVALID_HANDLE;
 
-    r = MSI_DatabaseOpenViewW( db, szwQuery, &query );
+    r = MSI_DatabaseOpenQueryW( db, szwQuery, &query );
     if( r == ERROR_SUCCESS )
         *phView = &query->hdr;
     msiobj_release( &db->hdr );
@@ -118,7 +118,7 @@ unsigned MsiDatabaseOpenView(LibmsiObject *hdb,
     return r;
 }
 
-unsigned MSI_DatabaseOpenViewW(LibmsiDatabase *db,
+unsigned MSI_DatabaseOpenQueryW(LibmsiDatabase *db,
               const WCHAR *szQuery, LibmsiQuery **pView)
 {
     LibmsiQuery *query;
@@ -130,8 +130,8 @@ unsigned MSI_DatabaseOpenViewW(LibmsiDatabase *db,
         return ERROR_INVALID_PARAMETER;
 
     /* pre allocate a handle to hold a pointer to the view */
-    query = alloc_msiobject( LIBMSI_OBJECT_TYPE_VIEW, sizeof (LibmsiQuery),
-                              MSI_CloseView );
+    query = alloc_msiobject( LIBMSI_OBJECT_TYPE_QUERY, sizeof (LibmsiQuery),
+                              MSI_CloseQuery );
     if( !query )
         return ERROR_FUNCTION_FAILED;
 
@@ -170,7 +170,7 @@ unsigned MSI_OpenQuery( LibmsiDatabase *db, LibmsiQuery **view, const WCHAR *fmt
         msi_free( query );
     }
     /* perform the query */
-    r = MSI_DatabaseOpenViewW(db, query, view);
+    r = MSI_DatabaseOpenQueryW(db, query, view);
     msi_free(query);
     return r;
 }
@@ -181,7 +181,7 @@ unsigned MSI_IterateRecords( LibmsiQuery *view, unsigned *count,
     LibmsiRecord *rec = NULL;
     unsigned r, n = 0, max = 0;
 
-    r = MSI_ViewExecute( view, NULL );
+    r = MSI_QueryExecute( view, NULL );
     if( r != ERROR_SUCCESS )
         return r;
 
@@ -191,7 +191,7 @@ unsigned MSI_IterateRecords( LibmsiQuery *view, unsigned *count,
     /* iterate a query */
     for( n = 0; (max == 0) || (n < max); n++ )
     {
-        r = MSI_ViewFetch( view, &rec );
+        r = MSI_QueryFetch( view, &rec );
         if( r != ERROR_SUCCESS )
             break;
         if (func)
@@ -201,7 +201,7 @@ unsigned MSI_IterateRecords( LibmsiQuery *view, unsigned *count,
             break;
     }
 
-    MSI_ViewClose( view );
+    MSI_QueryClose( view );
 
     if( count )
         *count = n;
@@ -235,14 +235,14 @@ LibmsiRecord *MSI_QueryGetRecord( LibmsiDatabase *db, const WCHAR *fmt, ... )
         msi_free( query );
     }
     /* perform the query */
-    r = MSI_DatabaseOpenViewW(db, query, &view);
+    r = MSI_DatabaseOpenQueryW(db, query, &view);
     msi_free(query);
 
     if( r == ERROR_SUCCESS )
     {
-        MSI_ViewExecute( view, NULL );
-        MSI_ViewFetch( view, &rec );
-        MSI_ViewClose( view );
+        MSI_QueryExecute( view, NULL );
+        MSI_QueryFetch( view, &rec );
+        MSI_QueryClose( view );
         msiobj_release( &view->hdr );
     }
     return rec;
@@ -326,7 +326,7 @@ unsigned msi_view_get_row(LibmsiDatabase *db, LibmsiView *view, unsigned row, Li
     return ERROR_SUCCESS;
 }
 
-unsigned MSI_ViewFetch(LibmsiQuery *query, LibmsiRecord **prec)
+unsigned MSI_QueryFetch(LibmsiQuery *query, LibmsiRecord **prec)
 {
     LibmsiView *view;
     unsigned r;
@@ -347,7 +347,7 @@ unsigned MSI_ViewFetch(LibmsiQuery *query, LibmsiRecord **prec)
     return r;
 }
 
-unsigned MsiViewFetch(LibmsiObject *hView, LibmsiObject **record)
+unsigned MsiQueryFetch(LibmsiObject *hView, LibmsiObject **record)
 {
     LibmsiQuery *query;
     LibmsiRecord *rec = NULL;
@@ -359,17 +359,17 @@ unsigned MsiViewFetch(LibmsiObject *hView, LibmsiObject **record)
         return ERROR_INVALID_PARAMETER;
     *record = 0;
 
-    query = msihandle2msiinfo( hView, LIBMSI_OBJECT_TYPE_VIEW );
+    query = msihandle2msiinfo( hView, LIBMSI_OBJECT_TYPE_QUERY );
     if( !query )
         return ERROR_INVALID_HANDLE;
-    ret = MSI_ViewFetch( query, &rec );
+    ret = MSI_QueryFetch( query, &rec );
     if( ret == ERROR_SUCCESS )
         *record = &rec->hdr;
     msiobj_release( &query->hdr );
     return ret;
 }
 
-unsigned MSI_ViewClose(LibmsiQuery *query)
+unsigned MSI_QueryClose(LibmsiQuery *query)
 {
     LibmsiView *view;
 
@@ -384,23 +384,23 @@ unsigned MSI_ViewClose(LibmsiQuery *query)
     return view->ops->close( view );
 }
 
-unsigned MsiViewClose(LibmsiObject *hView)
+unsigned MsiQueryClose(LibmsiObject *hView)
 {
     LibmsiQuery *query;
     unsigned ret;
 
     TRACE("%d\n", hView );
 
-    query = msihandle2msiinfo( hView, LIBMSI_OBJECT_TYPE_VIEW );
+    query = msihandle2msiinfo( hView, LIBMSI_OBJECT_TYPE_QUERY );
     if( !query )
         return ERROR_INVALID_HANDLE;
 
-    ret = MSI_ViewClose( query );
+    ret = MSI_QueryClose( query );
     msiobj_release( &query->hdr );
     return ret;
 }
 
-unsigned MSI_ViewExecute(LibmsiQuery *query, LibmsiRecord *rec )
+unsigned MSI_QueryExecute(LibmsiQuery *query, LibmsiRecord *rec )
 {
     LibmsiView *view;
 
@@ -416,7 +416,7 @@ unsigned MSI_ViewExecute(LibmsiQuery *query, LibmsiRecord *rec )
     return view->ops->execute( view, rec );
 }
 
-unsigned MsiViewExecute(LibmsiObject *hView, LibmsiObject *hRec)
+unsigned MsiQueryExecute(LibmsiObject *hView, LibmsiObject *hRec)
 {
     LibmsiQuery *query;
     LibmsiRecord *rec = NULL;
@@ -424,7 +424,7 @@ unsigned MsiViewExecute(LibmsiObject *hView, LibmsiObject *hRec)
     
     TRACE("%d %d\n", hView, hRec);
 
-    query = msihandle2msiinfo( hView, LIBMSI_OBJECT_TYPE_VIEW );
+    query = msihandle2msiinfo( hView, LIBMSI_OBJECT_TYPE_QUERY );
     if( !query )
         return ERROR_INVALID_HANDLE;
 
@@ -438,7 +438,7 @@ unsigned MsiViewExecute(LibmsiObject *hView, LibmsiObject *hRec)
         }
     }
 
-    ret = MSI_ViewExecute( query, rec );
+    ret = MSI_QueryExecute( query, rec );
 
 out:
     msiobj_release( &query->hdr );
@@ -485,7 +485,7 @@ static unsigned msi_set_record_type_string( LibmsiRecord *rec, unsigned field,
     return MSI_RecordSetStringW( rec, field, szType );
 }
 
-unsigned MSI_ViewGetColumnInfo( LibmsiQuery *query, LibmsiColInfo info, LibmsiRecord **prec )
+unsigned MSI_QueryGetColumnInfo( LibmsiQuery *query, LibmsiColInfo info, LibmsiRecord **prec )
 {
     unsigned r = ERROR_FUNCTION_FAILED, i, count = 0, type;
     LibmsiRecord *rec;
@@ -524,7 +524,7 @@ unsigned MSI_ViewGetColumnInfo( LibmsiQuery *query, LibmsiColInfo info, LibmsiRe
     return ERROR_SUCCESS;
 }
 
-unsigned MsiViewGetColumnInfo(LibmsiObject *hView, LibmsiColInfo info, LibmsiObject **hRec)
+unsigned MsiQueryGetColumnInfo(LibmsiObject *hView, LibmsiColInfo info, LibmsiObject **hRec)
 {
     LibmsiQuery *query = NULL;
     LibmsiRecord *rec = NULL;
@@ -538,11 +538,11 @@ unsigned MsiViewGetColumnInfo(LibmsiObject *hView, LibmsiColInfo info, LibmsiObj
     if( info != LIBMSI_COL_INFO_NAMES && info != LIBMSI_COL_INFO_TYPES )
         return ERROR_INVALID_PARAMETER;
 
-    query = msihandle2msiinfo( hView, LIBMSI_OBJECT_TYPE_VIEW );
+    query = msihandle2msiinfo( hView, LIBMSI_OBJECT_TYPE_QUERY );
     if( !query )
         return ERROR_INVALID_HANDLE;
 
-    r = MSI_ViewGetColumnInfo( query, info, &rec );
+    r = MSI_QueryGetColumnInfo( query, info, &rec );
     if ( r == ERROR_SUCCESS )
         *hRec = &rec->hdr;
 
@@ -551,7 +551,7 @@ unsigned MsiViewGetColumnInfo(LibmsiObject *hView, LibmsiColInfo info, LibmsiObj
     return r;
 }
 
-unsigned MSI_ViewModify( LibmsiQuery *query, LibmsiModify mode, LibmsiRecord *rec )
+unsigned MSI_QueryModify( LibmsiQuery *query, LibmsiModify mode, LibmsiRecord *rec )
 {
     LibmsiView *view = NULL;
     unsigned r;
@@ -573,7 +573,7 @@ unsigned MSI_ViewModify( LibmsiQuery *query, LibmsiModify mode, LibmsiRecord *re
     return r;
 }
 
-unsigned MsiViewModify( LibmsiObject *hView, LibmsiModify eModifyMode,
+unsigned MsiQueryModify( LibmsiObject *hView, LibmsiModify eModifyMode,
                 LibmsiObject *hRecord)
 {
     LibmsiQuery *query = NULL;
@@ -582,12 +582,12 @@ unsigned MsiViewModify( LibmsiObject *hView, LibmsiModify eModifyMode,
 
     TRACE("%d %x %d\n", hView, eModifyMode, hRecord);
 
-    query = msihandle2msiinfo( hView, LIBMSI_OBJECT_TYPE_VIEW );
+    query = msihandle2msiinfo( hView, LIBMSI_OBJECT_TYPE_QUERY );
     if( !query )
         return ERROR_INVALID_HANDLE;
 
     rec = msihandle2msiinfo( hRecord, LIBMSI_OBJECT_TYPE_RECORD );
-    r = MSI_ViewModify( query, eModifyMode, rec );
+    r = MSI_QueryModify( query, eModifyMode, rec );
 
     msiobj_release( &query->hdr );
     if( rec )
@@ -596,7 +596,7 @@ unsigned MsiViewModify( LibmsiObject *hView, LibmsiModify eModifyMode,
     return r;
 }
 
-LibmsiDBError MsiViewGetError( LibmsiObject *handle, char *buffer, unsigned *buflen )
+LibmsiDBError MsiQueryGetError( LibmsiObject *handle, char *buffer, unsigned *buflen )
 {
     LibmsiQuery *query;
     const WCHAR *column;
@@ -608,7 +608,7 @@ LibmsiDBError MsiViewGetError( LibmsiObject *handle, char *buffer, unsigned *buf
     if (!buflen)
         return LIBMSI_DB_ERROR_INVALIDARG;
 
-    query = msihandle2msiinfo( handle, LIBMSI_OBJECT_TYPE_VIEW );
+    query = msihandle2msiinfo( handle, LIBMSI_OBJECT_TYPE_QUERY );
     if (!query)
         return LIBMSI_DB_ERROR_INVALIDARG;
 
diff --git a/libmsi/table.c b/libmsi/table.c
index 89d69e7..1d26278 100644
--- a/libmsi/table.c
+++ b/libmsi/table.c
@@ -1284,11 +1284,11 @@ static unsigned msi_addstreamW( LibmsiDatabase *db, const WCHAR *name, IStream *
     if ( r != ERROR_SUCCESS )
        goto err;
 
-    r = MSI_DatabaseOpenViewW( db, insert, &query );
+    r = MSI_DatabaseOpenQueryW( db, insert, &query );
     if ( r != ERROR_SUCCESS )
        goto err;
 
-    r = MSI_ViewExecute( query, rec );
+    r = MSI_QueryExecute( query, rec );
 
 err:
     msiobj_release( &query->hdr );
@@ -1735,7 +1735,7 @@ static unsigned msi_table_update(LibmsiView *view, LibmsiRecord *rec, unsigned r
     LibmsiTableVIEW *tv = (LibmsiTableVIEW *)view;
     unsigned r, new_row;
 
-    /* FIXME: MsiViewFetch should set rec index 0 to some ID that
+    /* FIXME: MsiQueryFetch should set rec index 0 to some ID that
      * sets the fetched record apart from other records
      */