remove superfluous "struct tagMSIVIEW"

13 files changed, 153 insertions, 153 deletions

diff --git a/libmsi/alter.c b/libmsi/alter.c
index c7ce1e3..daba950 100644
--- a/libmsi/alter.c
+++ b/libmsi/alter.c
@@ -41,7 +41,7 @@ typedef struct tagMSIALTERVIEW
     INT hold;
 } MSIALTERVIEW;
 
-static UINT ALTER_fetch_int( struct tagMSIVIEW *view, UINT row, UINT col, UINT *val )
+static UINT ALTER_fetch_int( MSIVIEW *view, UINT row, UINT col, UINT *val )
 {
     MSIALTERVIEW *av = (MSIALTERVIEW*)view;
 
@@ -50,7 +50,7 @@ static UINT ALTER_fetch_int( struct tagMSIVIEW *view, UINT row, UINT col, UINT *
     return ERROR_FUNCTION_FAILED;
 }
 
-static UINT ALTER_fetch_stream( struct tagMSIVIEW *view, UINT row, UINT col, IStream **stm)
+static UINT ALTER_fetch_stream( MSIVIEW *view, UINT row, UINT col, IStream **stm)
 {
     MSIALTERVIEW *av = (MSIALTERVIEW*)view;
 
@@ -59,7 +59,7 @@ 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 )
+static UINT ALTER_get_row( MSIVIEW *view, UINT row, MSIRECORD **rec )
 {
     MSIALTERVIEW *av = (MSIALTERVIEW*)view;
 
@@ -147,7 +147,7 @@ static UINT alter_add_column(MSIALTERVIEW *av)
     return r;
 }
 
-static UINT ALTER_execute( struct tagMSIVIEW *view, MSIRECORD *record )
+static UINT ALTER_execute( MSIVIEW *view, MSIRECORD *record )
 {
     MSIALTERVIEW *av = (MSIALTERVIEW*)view;
     UINT ref;
@@ -169,7 +169,7 @@ static UINT ALTER_execute( struct tagMSIVIEW *view, MSIRECORD *record )
     return ERROR_SUCCESS;
 }
 
-static UINT ALTER_close( struct tagMSIVIEW *view )
+static UINT ALTER_close( MSIVIEW *view )
 {
     MSIALTERVIEW *av = (MSIALTERVIEW*)view;
 
@@ -178,7 +178,7 @@ static UINT ALTER_close( struct tagMSIVIEW *view )
     return ERROR_SUCCESS;
 }
 
-static UINT ALTER_get_dimensions( struct tagMSIVIEW *view, UINT *rows, UINT *cols )
+static UINT ALTER_get_dimensions( MSIVIEW *view, UINT *rows, UINT *cols )
 {
     MSIALTERVIEW *av = (MSIALTERVIEW*)view;
 
@@ -187,7 +187,7 @@ static UINT ALTER_get_dimensions( struct tagMSIVIEW *view, UINT *rows, UINT *col
     return ERROR_FUNCTION_FAILED;
 }
 
-static UINT ALTER_get_column_info( struct tagMSIVIEW *view, UINT n, const WCHAR **name,
+static UINT ALTER_get_column_info( MSIVIEW *view, UINT n, const WCHAR **name,
                                    UINT *type, BOOL *temporary, const WCHAR **table_name )
 {
     MSIALTERVIEW *av = (MSIALTERVIEW*)view;
@@ -197,7 +197,7 @@ static UINT ALTER_get_column_info( struct tagMSIVIEW *view, UINT n, const WCHAR
     return ERROR_FUNCTION_FAILED;
 }
 
-static UINT ALTER_modify( struct tagMSIVIEW *view, MSIMODIFY eModifyMode,
+static UINT ALTER_modify( MSIVIEW *view, MSIMODIFY eModifyMode,
                           MSIRECORD *rec, UINT row )
 {
     MSIALTERVIEW *av = (MSIALTERVIEW*)view;
@@ -207,7 +207,7 @@ static UINT ALTER_modify( struct tagMSIVIEW *view, MSIMODIFY eModifyMode,
     return ERROR_FUNCTION_FAILED;
 }
 
-static UINT ALTER_delete( struct tagMSIVIEW *view )
+static UINT ALTER_delete( MSIVIEW *view )
 {
     MSIALTERVIEW *av = (MSIALTERVIEW*)view;
 
@@ -219,7 +219,7 @@ static UINT ALTER_delete( struct tagMSIVIEW *view )
     return ERROR_SUCCESS;
 }
 
-static UINT ALTER_find_matching_rows( struct tagMSIVIEW *view, UINT col,
+static UINT ALTER_find_matching_rows( MSIVIEW *view, UINT col,
     UINT val, UINT *row, MSIITERHANDLE *handle )
 {
     TRACE("%p, %d, %u, %p\n", view, col, val, *handle);
diff --git a/libmsi/create.c b/libmsi/create.c
index 0a03565..24a9fb1 100644
--- a/libmsi/create.c
+++ b/libmsi/create.c
@@ -47,7 +47,7 @@ typedef struct tagMSICREATEVIEW
     column_info     *col_info;
 } MSICREATEVIEW;
 
-static UINT CREATE_fetch_int( struct tagMSIVIEW *view, UINT row, UINT col, UINT *val )
+static UINT CREATE_fetch_int( MSIVIEW *view, UINT row, UINT col, UINT *val )
 {
     MSICREATEVIEW *cv = (MSICREATEVIEW*)view;
 
@@ -56,7 +56,7 @@ static UINT CREATE_fetch_int( struct tagMSIVIEW *view, UINT row, UINT col, UINT
     return ERROR_FUNCTION_FAILED;
 }
 
-static UINT CREATE_execute( struct tagMSIVIEW *view, MSIRECORD *record )
+static UINT CREATE_execute( MSIVIEW *view, MSIRECORD *record )
 {
     MSICREATEVIEW *cv = (MSICREATEVIEW*)view;
     BOOL persist = (cv->bIsTemp) ? MSICONDITION_FALSE : MSICONDITION_TRUE;
@@ -70,7 +70,7 @@ static UINT CREATE_execute( struct tagMSIVIEW *view, MSIRECORD *record )
     return msi_create_table( cv->db, cv->name, cv->col_info, persist );
 }
 
-static UINT CREATE_close( struct tagMSIVIEW *view )
+static UINT CREATE_close( MSIVIEW *view )
 {
     MSICREATEVIEW *cv = (MSICREATEVIEW*)view;
 
@@ -79,7 +79,7 @@ static UINT CREATE_close( struct tagMSIVIEW *view )
     return ERROR_SUCCESS;
 }
 
-static UINT CREATE_get_dimensions( struct tagMSIVIEW *view, UINT *rows, UINT *cols )
+static UINT CREATE_get_dimensions( MSIVIEW *view, UINT *rows, UINT *cols )
 {
     MSICREATEVIEW *cv = (MSICREATEVIEW*)view;
 
@@ -88,7 +88,7 @@ static UINT CREATE_get_dimensions( struct tagMSIVIEW *view, UINT *rows, UINT *co
     return ERROR_FUNCTION_FAILED;
 }
 
-static UINT CREATE_get_column_info( struct tagMSIVIEW *view, UINT n, const WCHAR **name,
+static UINT CREATE_get_column_info( MSIVIEW *view, UINT n, const WCHAR **name,
                                     UINT *type, BOOL *temporary, const WCHAR **table_name )
 {
     MSICREATEVIEW *cv = (MSICREATEVIEW*)view;
@@ -98,7 +98,7 @@ static UINT CREATE_get_column_info( struct tagMSIVIEW *view, UINT n, const WCHAR
     return ERROR_FUNCTION_FAILED;
 }
 
-static UINT CREATE_modify( struct tagMSIVIEW *view, MSIMODIFY eModifyMode,
+static UINT CREATE_modify( MSIVIEW *view, MSIMODIFY eModifyMode,
                            MSIRECORD *rec, UINT row)
 {
     MSICREATEVIEW *cv = (MSICREATEVIEW*)view;
@@ -108,7 +108,7 @@ static UINT CREATE_modify( struct tagMSIVIEW *view, MSIMODIFY eModifyMode,
     return ERROR_FUNCTION_FAILED;
 }
 
-static UINT CREATE_delete( struct tagMSIVIEW *view )
+static UINT CREATE_delete( MSIVIEW *view )
 {
     MSICREATEVIEW *cv = (MSICREATEVIEW*)view;
 
diff --git a/libmsi/delete.c b/libmsi/delete.c
index 6ec36a4..b6371db 100644
--- a/libmsi/delete.c
+++ b/libmsi/delete.c
@@ -53,7 +53,7 @@ typedef struct tagMSIDELETEVIEW
     MSIVIEW       *table;
 } MSIDELETEVIEW;
 
-static UINT DELETE_fetch_int( struct tagMSIVIEW *view, UINT row, UINT col, UINT *val )
+static UINT DELETE_fetch_int( MSIVIEW *view, UINT row, UINT col, UINT *val )
 {
     MSIDELETEVIEW *dv = (MSIDELETEVIEW*)view;
 
@@ -62,7 +62,7 @@ static UINT DELETE_fetch_int( struct tagMSIVIEW *view, UINT row, UINT col, UINT
     return ERROR_FUNCTION_FAILED;
 }
 
-static UINT DELETE_fetch_stream( struct tagMSIVIEW *view, UINT row, UINT col, IStream **stm)
+static UINT DELETE_fetch_stream( MSIVIEW *view, UINT row, UINT col, IStream **stm)
 {
     MSIDELETEVIEW *dv = (MSIDELETEVIEW*)view;
 
@@ -71,7 +71,7 @@ static UINT DELETE_fetch_stream( struct tagMSIVIEW *view, UINT row, UINT col, IS
     return ERROR_FUNCTION_FAILED;
 }
 
-static UINT DELETE_execute( struct tagMSIVIEW *view, MSIRECORD *record )
+static UINT DELETE_execute( MSIVIEW *view, MSIRECORD *record )
 {
     MSIDELETEVIEW *dv = (MSIDELETEVIEW*)view;
     UINT r, i, rows = 0, cols = 0;
@@ -98,7 +98,7 @@ static UINT DELETE_execute( struct tagMSIVIEW *view, MSIRECORD *record )
     return ERROR_SUCCESS;
 }
 
-static UINT DELETE_close( struct tagMSIVIEW *view )
+static UINT DELETE_close( MSIVIEW *view )
 {
     MSIDELETEVIEW *dv = (MSIDELETEVIEW*)view;
 
@@ -110,7 +110,7 @@ static UINT DELETE_close( struct tagMSIVIEW *view )
     return dv->table->ops->close( dv->table );
 }
 
-static UINT DELETE_get_dimensions( struct tagMSIVIEW *view, UINT *rows, UINT *cols )
+static UINT DELETE_get_dimensions( MSIVIEW *view, UINT *rows, UINT *cols )
 {
     MSIDELETEVIEW *dv = (MSIDELETEVIEW*)view;
 
@@ -124,7 +124,7 @@ static UINT DELETE_get_dimensions( struct tagMSIVIEW *view, UINT *rows, UINT *co
     return dv->table->ops->get_dimensions( dv->table, NULL, cols );
 }
 
-static UINT DELETE_get_column_info( struct tagMSIVIEW *view, UINT n, const WCHAR **name,
+static UINT DELETE_get_column_info( MSIVIEW *view, UINT n, const WCHAR **name,
                                     UINT *type, BOOL *temporary, const WCHAR **table_name )
 {
     MSIDELETEVIEW *dv = (MSIDELETEVIEW*)view;
@@ -138,7 +138,7 @@ static UINT DELETE_get_column_info( struct tagMSIVIEW *view, UINT n, const WCHAR
                                             type, temporary, table_name);
 }
 
-static UINT DELETE_modify( struct tagMSIVIEW *view, MSIMODIFY eModifyMode,
+static UINT DELETE_modify( MSIVIEW *view, MSIMODIFY eModifyMode,
                            MSIRECORD *rec, UINT row )
 {
     MSIDELETEVIEW *dv = (MSIDELETEVIEW*)view;
@@ -148,7 +148,7 @@ static UINT DELETE_modify( struct tagMSIVIEW *view, MSIMODIFY eModifyMode,
     return ERROR_FUNCTION_FAILED;
 }
 
-static UINT DELETE_delete( struct tagMSIVIEW *view )
+static UINT DELETE_delete( MSIVIEW *view )
 {
     MSIDELETEVIEW *dv = (MSIDELETEVIEW*)view;
 
@@ -162,7 +162,7 @@ static UINT DELETE_delete( struct tagMSIVIEW *view )
     return ERROR_SUCCESS;
 }
 
-static UINT DELETE_find_matching_rows( struct tagMSIVIEW *view, UINT col,
+static UINT DELETE_find_matching_rows( MSIVIEW *view, UINT col,
     UINT val, UINT *row, MSIITERHANDLE *handle )
 {
     TRACE("%p, %d, %u, %p\n", view, col, val, *handle);
diff --git a/libmsi/distinct.c b/libmsi/distinct.c
index a408f4e..d8cb895 100644
--- a/libmsi/distinct.c
+++ b/libmsi/distinct.c
@@ -88,7 +88,7 @@ static void distinct_free( DISTINCTSET *x )
     }
 }
 
-static UINT DISTINCT_fetch_int( struct tagMSIVIEW *view, UINT row, UINT col, UINT *val )
+static UINT DISTINCT_fetch_int( MSIVIEW *view, UINT row, UINT col, UINT *val )
 {
     MSIDISTINCTVIEW *dv = (MSIDISTINCTVIEW*)view;
 
@@ -105,7 +105,7 @@ static UINT DISTINCT_fetch_int( struct tagMSIVIEW *view, UINT row, UINT col, UIN
     return dv->table->ops->fetch_int( dv->table, row, col, val );
 }
 
-static UINT DISTINCT_execute( struct tagMSIVIEW *view, MSIRECORD *record )
+static UINT DISTINCT_execute( MSIVIEW *view, MSIRECORD *record )
 {
     MSIDISTINCTVIEW *dv = (MSIDISTINCTVIEW*)view;
     UINT r, i, j, r_count, c_count;
@@ -167,7 +167,7 @@ static UINT DISTINCT_execute( struct tagMSIVIEW *view, MSIRECORD *record )
     return ERROR_SUCCESS;
 }
 
-static UINT DISTINCT_close( struct tagMSIVIEW *view )
+static UINT DISTINCT_close( MSIVIEW *view )
 {
     MSIDISTINCTVIEW *dv = (MSIDISTINCTVIEW*)view;
 
@@ -183,7 +183,7 @@ static UINT DISTINCT_close( struct tagMSIVIEW *view )
     return dv->table->ops->close( dv->table );
 }
 
-static UINT DISTINCT_get_dimensions( struct tagMSIVIEW *view, UINT *rows, UINT *cols )
+static UINT DISTINCT_get_dimensions( MSIVIEW *view, UINT *rows, UINT *cols )
 {
     MSIDISTINCTVIEW *dv = (MSIDISTINCTVIEW*)view;
 
@@ -202,7 +202,7 @@ static UINT DISTINCT_get_dimensions( struct tagMSIVIEW *view, UINT *rows, UINT *
     return dv->table->ops->get_dimensions( dv->table, NULL, cols );
 }
 
-static UINT DISTINCT_get_column_info( struct tagMSIVIEW *view, UINT n, const WCHAR **name,
+static UINT DISTINCT_get_column_info( MSIVIEW *view, UINT n, const WCHAR **name,
                                       UINT *type, BOOL *temporary, const WCHAR **table_name )
 {
     MSIDISTINCTVIEW *dv = (MSIDISTINCTVIEW*)view;
@@ -216,7 +216,7 @@ static UINT DISTINCT_get_column_info( struct tagMSIVIEW *view, UINT n, const WCH
                                             type, temporary, table_name );
 }
 
-static UINT DISTINCT_modify( struct tagMSIVIEW *view, MSIMODIFY eModifyMode,
+static UINT DISTINCT_modify( MSIVIEW *view, MSIMODIFY eModifyMode,
                              MSIRECORD *rec, UINT row )
 {
     MSIDISTINCTVIEW *dv = (MSIDISTINCTVIEW*)view;
@@ -229,7 +229,7 @@ static UINT DISTINCT_modify( struct tagMSIVIEW *view, MSIMODIFY eModifyMode,
     return dv->table->ops->modify( dv->table, eModifyMode, rec, row );
 }
 
-static UINT DISTINCT_delete( struct tagMSIVIEW *view )
+static UINT DISTINCT_delete( MSIVIEW *view )
 {
     MSIDISTINCTVIEW *dv = (MSIDISTINCTVIEW*)view;
 
@@ -245,7 +245,7 @@ static UINT DISTINCT_delete( struct tagMSIVIEW *view )
     return ERROR_SUCCESS;
 }
 
-static UINT DISTINCT_find_matching_rows( struct tagMSIVIEW *view, UINT col,
+static UINT DISTINCT_find_matching_rows( MSIVIEW *view, UINT col,
     UINT val, UINT *row, MSIITERHANDLE *handle )
 {
     MSIDISTINCTVIEW *dv = (MSIDISTINCTVIEW*)view;
diff --git a/libmsi/drop.c b/libmsi/drop.c
index db5a7af..0be6435 100644
--- a/libmsi/drop.c
+++ b/libmsi/drop.c
@@ -41,7 +41,7 @@ typedef struct tagMSIDROPVIEW
     INT hold;
 } MSIDROPVIEW;
 
-static UINT DROP_execute(struct tagMSIVIEW *view, MSIRECORD *record)
+static UINT DROP_execute(MSIVIEW *view, MSIRECORD *record)
 {
     MSIDROPVIEW *dv = (MSIDROPVIEW*)view;
     UINT r;
@@ -58,7 +58,7 @@ static UINT DROP_execute(struct tagMSIVIEW *view, MSIRECORD *record)
     return dv->table->ops->drop(dv->table);
 }
 
-static UINT DROP_close(struct tagMSIVIEW *view)
+static UINT DROP_close(MSIVIEW *view)
 {
     MSIDROPVIEW *dv = (MSIDROPVIEW*)view;
 
@@ -67,7 +67,7 @@ static UINT DROP_close(struct tagMSIVIEW *view)
     return ERROR_SUCCESS;
 }
 
-static UINT DROP_get_dimensions(struct tagMSIVIEW *view, UINT *rows, UINT *cols)
+static UINT DROP_get_dimensions(MSIVIEW *view, UINT *rows, UINT *cols)
 {
     MSIDROPVIEW *dv = (MSIDROPVIEW*)view;
 
@@ -76,7 +76,7 @@ static UINT DROP_get_dimensions(struct tagMSIVIEW *view, UINT *rows, UINT *cols)
     return ERROR_FUNCTION_FAILED;
 }
 
-static UINT DROP_delete( struct tagMSIVIEW *view )
+static UINT DROP_delete( MSIVIEW *view )
 {
     MSIDROPVIEW *dv = (MSIDROPVIEW*)view;
 
diff --git a/libmsi/insert.c b/libmsi/insert.c
index 205b715..13cbc6b 100644
--- a/libmsi/insert.c
+++ b/libmsi/insert.c
@@ -47,7 +47,7 @@ typedef struct tagMSIINSERTVIEW
     column_info     *vals;
 } MSIINSERTVIEW;
 
-static UINT INSERT_fetch_int( struct tagMSIVIEW *view, UINT row, UINT col, UINT *val )
+static UINT INSERT_fetch_int( MSIVIEW *view, UINT row, UINT col, UINT *val )
 {
     MSIINSERTVIEW *iv = (MSIINSERTVIEW*)view;
 
@@ -202,7 +202,7 @@ static BOOL row_has_null_primary_keys(MSIINSERTVIEW *iv, MSIRECORD *row)
     return FALSE;
 }
 
-static UINT INSERT_execute( struct tagMSIVIEW *view, MSIRECORD *record )
+static UINT INSERT_execute( MSIVIEW *view, MSIRECORD *record )
 {
     MSIINSERTVIEW *iv = (MSIINSERTVIEW*)view;
     UINT r, row = -1, col_count = 0;
@@ -250,7 +250,7 @@ err:
 }
 
 
-static UINT INSERT_close( struct tagMSIVIEW *view )
+static UINT INSERT_close( MSIVIEW *view )
 {
     MSIINSERTVIEW *iv = (MSIINSERTVIEW*)view;
     MSIVIEW *sv;
@@ -264,7 +264,7 @@ static UINT INSERT_close( struct tagMSIVIEW *view )
     return sv->ops->close( sv );
 }
 
-static UINT INSERT_get_dimensions( struct tagMSIVIEW *view, UINT *rows, UINT *cols )
+static UINT INSERT_get_dimensions( MSIVIEW *view, UINT *rows, UINT *cols )
 {
     MSIINSERTVIEW *iv = (MSIINSERTVIEW*)view;
     MSIVIEW *sv;
@@ -278,7 +278,7 @@ static UINT INSERT_get_dimensions( struct tagMSIVIEW *view, UINT *rows, UINT *co
     return sv->ops->get_dimensions( sv, rows, cols );
 }
 
-static UINT INSERT_get_column_info( struct tagMSIVIEW *view, UINT n, const WCHAR **name,
+static UINT INSERT_get_column_info( MSIVIEW *view, UINT n, const WCHAR **name,
                                     UINT *type, BOOL *temporary, const WCHAR **table_name )
 {
     MSIINSERTVIEW *iv = (MSIINSERTVIEW*)view;
@@ -293,7 +293,7 @@ static UINT INSERT_get_column_info( struct tagMSIVIEW *view, UINT n, const WCHAR
     return sv->ops->get_column_info( sv, n, name, type, temporary, table_name );
 }
 
-static UINT INSERT_modify( struct tagMSIVIEW *view, MSIMODIFY eModifyMode, MSIRECORD *rec, UINT row)
+static UINT INSERT_modify( MSIVIEW *view, MSIMODIFY eModifyMode, MSIRECORD *rec, UINT row)
 {
     MSIINSERTVIEW *iv = (MSIINSERTVIEW*)view;
 
@@ -302,7 +302,7 @@ static UINT INSERT_modify( struct tagMSIVIEW *view, MSIMODIFY eModifyMode, MSIRE
     return ERROR_FUNCTION_FAILED;
 }
 
-static UINT INSERT_delete( struct tagMSIVIEW *view )
+static UINT INSERT_delete( MSIVIEW *view )
 {
     MSIINSERTVIEW *iv = (MSIINSERTVIEW*)view;
     MSIVIEW *sv;
@@ -318,7 +318,7 @@ static UINT INSERT_delete( struct tagMSIVIEW *view )
     return ERROR_SUCCESS;
 }
 
-static UINT INSERT_find_matching_rows( struct tagMSIVIEW *view, UINT col,
+static UINT INSERT_find_matching_rows( MSIVIEW *view, UINT col,
     UINT val, UINT *row, MSIITERHANDLE *handle )
 {
     TRACE("%p, %d, %u, %p\n", view, col, val, *handle);
diff --git a/libmsi/msipriv.h b/libmsi/msipriv.h
index 9c696cf..6f2def5 100644
--- a/libmsi/msipriv.h
+++ b/libmsi/msipriv.h
@@ -141,7 +141,7 @@ typedef struct tagMSIVIEWOPS
      *  To get a string value, query the database's string table with
      *   the integer value returned from this function.
      */
-    UINT (*fetch_int)( struct tagMSIVIEW *view, UINT row, UINT col, UINT *val );
+    UINT (*fetch_int)( MSIVIEW *view, UINT row, UINT col, UINT *val );
 
     /*
      * fetch_stream - gets a stream from {row,col} in the table
@@ -149,40 +149,40 @@ typedef struct tagMSIVIEWOPS
      *  This function is similar to fetch_int, except fetches a
      *    stream instead of an integer.
      */
-    UINT (*fetch_stream)( struct tagMSIVIEW *view, UINT row, UINT col, IStream **stm );
+    UINT (*fetch_stream)( MSIVIEW *view, UINT row, UINT col, IStream **stm );
 
     /*
      * get_row - gets values from a row
      *
      */
-    UINT (*get_row)( struct tagMSIVIEW *view, UINT row, MSIRECORD **rec );
+    UINT (*get_row)( MSIVIEW *view, UINT row, MSIRECORD **rec );
 
     /*
      * set_row - sets values in a row as specified by mask
      *
      *  Similar semantics to fetch_int
      */
-    UINT (*set_row)( struct tagMSIVIEW *view, UINT row, MSIRECORD *rec, UINT mask );
+    UINT (*set_row)( MSIVIEW *view, UINT row, MSIRECORD *rec, UINT mask );
 
     /*
      * Inserts a new row into the database from the records contents
      */
-    UINT (*insert_row)( struct tagMSIVIEW *view, MSIRECORD *record, UINT row, BOOL temporary );
+    UINT (*insert_row)( MSIVIEW *view, MSIRECORD *record, UINT row, BOOL temporary );
 
     /*
      * Deletes a row from the database
      */
-    UINT (*delete_row)( struct tagMSIVIEW *view, UINT row );
+    UINT (*delete_row)( MSIVIEW *view, UINT row );
 
     /*
      * execute - loads the underlying data into memory so it can be read
      */
-    UINT (*execute)( struct tagMSIVIEW *view, MSIRECORD *record );
+    UINT (*execute)( MSIVIEW *view, MSIRECORD *record );
 
     /*
      * close - clears the data read by execute from memory
      */
-    UINT (*close)( struct tagMSIVIEW *view );
+    UINT (*close)( MSIVIEW *view );
 
     /*
      * get_dimensions - returns the number of rows or columns in a table.
@@ -190,25 +190,25 @@ typedef struct tagMSIVIEWOPS
      *  The number of rows can only be queried after the execute method
      *   is called. The number of columns can be queried at any time.
      */
-    UINT (*get_dimensions)( struct tagMSIVIEW *view, UINT *rows, UINT *cols );
+    UINT (*get_dimensions)( MSIVIEW *view, UINT *rows, UINT *cols );
 
     /*
      * get_column_info - returns the name and type of a specific column
      *
      *  The column information can be queried at any time.
      */
-    UINT (*get_column_info)( struct tagMSIVIEW *view, UINT n, const WCHAR **name, UINT *type,
+    UINT (*get_column_info)( MSIVIEW *view, UINT n, const WCHAR **name, UINT *type,
                              BOOL *temporary, const WCHAR **table_name );
 
     /*
      * modify - not yet implemented properly
      */
-    UINT (*modify)( struct tagMSIVIEW *view, MSIMODIFY eModifyMode, MSIRECORD *record, UINT row );
+    UINT (*modify)( MSIVIEW *view, MSIMODIFY eModifyMode, MSIRECORD *record, UINT row );
 
     /*
      * delete - destroys the structure completely
      */
-    UINT (*delete)( struct tagMSIVIEW * );
+    UINT (*delete)( MSIVIEW * );
 
     /*
      * find_matching_rows - iterates through rows that match a value
@@ -221,37 +221,37 @@ typedef struct tagMSIVIEWOPS
      *  position in the iteration. It must be initialised to zero before the
      *  first call and continued to be passed in to subsequent calls.
      */
-    UINT (*find_matching_rows)( struct tagMSIVIEW *view, UINT col, UINT val, UINT *row, MSIITERHANDLE *handle );
+    UINT (*find_matching_rows)( MSIVIEW *view, UINT col, UINT val, UINT *row, MSIITERHANDLE *handle );
 
     /*
      * add_ref - increases the reference count of the table
      */
-    UINT (*add_ref)( struct tagMSIVIEW *view );
+    UINT (*add_ref)( MSIVIEW *view );
 
     /*
      * release - decreases the reference count of the table
      */
-    UINT (*release)( struct tagMSIVIEW *view );
+    UINT (*release)( MSIVIEW *view );
 
     /*
      * add_column - adds a column to the table
      */
-    UINT (*add_column)( struct tagMSIVIEW *view, const WCHAR *table, UINT number, const WCHAR *column, UINT type, BOOL hold );
+    UINT (*add_column)( MSIVIEW *view, const WCHAR *table, UINT number, const WCHAR *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, const WCHAR *table, UINT number );
+    UINT (*remove_column)( MSIVIEW *view, const WCHAR *table, UINT number );
 
     /*
      * sort - orders the table by columns
      */
-    UINT (*sort)( struct tagMSIVIEW *view, column_info *columns );
+    UINT (*sort)( MSIVIEW *view, column_info *columns );
 
     /*
      * drop - drops the table from the database
      */
-    UINT (*drop)( struct tagMSIVIEW *view );
+    UINT (*drop)( MSIVIEW *view );
 } MSIVIEWOPS;
 
 struct tagMSIVIEW
diff --git a/libmsi/select.c b/libmsi/select.c
index 5ed94b3..e01dbc1 100644
--- a/libmsi/select.c
+++ b/libmsi/select.c
@@ -46,7 +46,7 @@ typedef struct tagMSISELECTVIEW
     UINT           cols[1];
 } MSISELECTVIEW;
 
-static UINT SELECT_fetch_int( struct tagMSIVIEW *view, UINT row, UINT col, UINT *val )
+static UINT SELECT_fetch_int( MSIVIEW *view, UINT row, UINT col, UINT *val )
 {
     MSISELECTVIEW *sv = (MSISELECTVIEW*)view;
 
@@ -67,7 +67,7 @@ static UINT SELECT_fetch_int( struct tagMSIVIEW *view, UINT row, UINT col, UINT
     return sv->table->ops->fetch_int( sv->table, row, col, val );
 }
 
-static UINT SELECT_fetch_stream( struct tagMSIVIEW *view, UINT row, UINT col, IStream **stm)
+static UINT SELECT_fetch_stream( MSIVIEW *view, UINT row, UINT col, IStream **stm)
 {
     MSISELECTVIEW *sv = (MSISELECTVIEW*)view;
 
@@ -88,7 +88,7 @@ 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 )
+static UINT SELECT_get_row( MSIVIEW *view, UINT row, MSIRECORD **rec )
 {
     MSISELECTVIEW *sv = (MSISELECTVIEW *)view;
 
@@ -100,7 +100,7 @@ static UINT SELECT_get_row( struct tagMSIVIEW *view, UINT row, MSIRECORD **rec )
     return msi_view_get_row(sv->db, view, row, rec);
 }
 
-static UINT SELECT_set_row( struct tagMSIVIEW *view, UINT row, MSIRECORD *rec, UINT mask )
+static UINT SELECT_set_row( MSIVIEW *view, UINT row, MSIRECORD *rec, UINT mask )
 {
     MSISELECTVIEW *sv = (MSISELECTVIEW*)view;
     UINT i, expanded_mask = 0, r = ERROR_SUCCESS, col_count = 0;
@@ -142,7 +142,7 @@ static UINT SELECT_set_row( struct tagMSIVIEW *view, UINT row, MSIRECORD *rec, U
     return r;
 }
 
-static UINT SELECT_insert_row( struct tagMSIVIEW *view, MSIRECORD *record, UINT row, BOOL temporary )
+static UINT SELECT_insert_row( MSIVIEW *view, MSIRECORD *record, UINT row, BOOL temporary )
 {
     MSISELECTVIEW *sv = (MSISELECTVIEW*)view;
     UINT i, table_cols, r;
@@ -175,7 +175,7 @@ fail:
     return r;
 }
 
-static UINT SELECT_execute( struct tagMSIVIEW *view, MSIRECORD *record )
+static UINT SELECT_execute( MSIVIEW *view, MSIRECORD *record )
 {
     MSISELECTVIEW *sv = (MSISELECTVIEW*)view;
 
@@ -187,7 +187,7 @@ static UINT SELECT_execute( struct tagMSIVIEW *view, MSIRECORD *record )
     return sv->table->ops->execute( sv->table, record );
 }
 
-static UINT SELECT_close( struct tagMSIVIEW *view )
+static UINT SELECT_close( MSIVIEW *view )
 {
     MSISELECTVIEW *sv = (MSISELECTVIEW*)view;
 
@@ -199,7 +199,7 @@ static UINT SELECT_close( struct tagMSIVIEW *view )
     return sv->table->ops->close( sv->table );
 }
 
-static UINT SELECT_get_dimensions( struct tagMSIVIEW *view, UINT *rows, UINT *cols )
+static UINT SELECT_get_dimensions( MSIVIEW *view, UINT *rows, UINT *cols )
 {
     MSISELECTVIEW *sv = (MSISELECTVIEW*)view;
 
@@ -214,7 +214,7 @@ static UINT SELECT_get_dimensions( struct tagMSIVIEW *view, UINT *rows, UINT *co
     return sv->table->ops->get_dimensions( sv->table, rows, NULL );
 }
 
-static UINT SELECT_get_column_info( struct tagMSIVIEW *view, UINT n, const WCHAR **name,
+static UINT SELECT_get_column_info( MSIVIEW *view, UINT n, const WCHAR **name,
                                     UINT *type, BOOL *temporary, const WCHAR **table_name )
 {
     MSISELECTVIEW *sv = (MSISELECTVIEW*)view;
@@ -240,7 +240,7 @@ static UINT SELECT_get_column_info( struct tagMSIVIEW *view, UINT n, const WCHAR
                                             type, temporary, table_name );
 }
 
-static UINT msi_select_update(struct tagMSIVIEW *view, MSIRECORD *rec, UINT row)
+static UINT msi_select_update(MSIVIEW *view, MSIRECORD *rec, UINT row)
 {
     MSISELECTVIEW *sv = (MSISELECTVIEW*)view;
     UINT r, i, num_columns, col, type, val;
@@ -297,7 +297,7 @@ done:
     return r;
 }
 
-static UINT SELECT_modify( struct tagMSIVIEW *view, MSIMODIFY eModifyMode,
+static UINT SELECT_modify( MSIVIEW *view, MSIMODIFY eModifyMode,
                            MSIRECORD *rec, UINT row )
 {
     MSISELECTVIEW *sv = (MSISELECTVIEW*)view;
@@ -313,7 +313,7 @@ static UINT SELECT_modify( struct tagMSIVIEW *view, MSIMODIFY eModifyMode,
     return sv->table->ops->modify( sv->table, eModifyMode, rec, row );
 }
 
-static UINT SELECT_delete( struct tagMSIVIEW *view )
+static UINT SELECT_delete( MSIVIEW *view )
 {
     MSISELECTVIEW *sv = (MSISELECTVIEW*)view;
 
@@ -328,7 +328,7 @@ static UINT SELECT_delete( struct tagMSIVIEW *view )
     return ERROR_SUCCESS;
 }
 
-static UINT SELECT_find_matching_rows( struct tagMSIVIEW *view, UINT col,
+static UINT SELECT_find_matching_rows( MSIVIEW *view, UINT col,
     UINT val, UINT *row, MSIITERHANDLE *handle )
 {
     MSISELECTVIEW *sv = (MSISELECTVIEW*)view;
diff --git a/libmsi/storages.c b/libmsi/storages.c
index ca8f04b..a0a548c 100644
--- a/libmsi/storages.c
+++ b/libmsi/storages.c
@@ -83,7 +83,7 @@ static STORAGE *create_storage(MSISTORAGESVIEW *sv, const WCHAR *name, IStorage
     return storage;
 }
 
-static UINT STORAGES_fetch_int(struct tagMSIVIEW *view, UINT row, UINT col, UINT *val)
+static UINT STORAGES_fetch_int(MSIVIEW *view, UINT row, UINT col, UINT *val)
 {
     MSISTORAGESVIEW *sv = (MSISTORAGESVIEW *)view;
 
@@ -100,7 +100,7 @@ static UINT STORAGES_fetch_int(struct tagMSIVIEW *view, UINT row, UINT col, UINT
     return ERROR_SUCCESS;
 }
 
-static UINT STORAGES_fetch_stream(struct tagMSIVIEW *view, UINT row, UINT col, IStream **stm)
+static UINT STORAGES_fetch_stream(MSIVIEW *view, UINT row, UINT col, IStream **stm)
 {
     MSISTORAGESVIEW *sv = (MSISTORAGESVIEW *)view;
 
@@ -112,7 +112,7 @@ 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 )
+static UINT STORAGES_get_row( MSIVIEW *view, UINT row, MSIRECORD **rec )
 {
     MSISTORAGESVIEW *sv = (MSISTORAGESVIEW *)view;
 
@@ -170,7 +170,7 @@ done:
     return hr;
 }
 
-static UINT STORAGES_set_row(struct tagMSIVIEW *view, UINT row, MSIRECORD *rec, UINT mask)
+static UINT STORAGES_set_row(MSIVIEW *view, UINT row, MSIRECORD *rec, UINT mask)
 {
     MSISTORAGESVIEW *sv = (MSISTORAGESVIEW *)view;
     IStorage *stg, *substg = NULL;
@@ -232,7 +232,7 @@ done:
     return r;
 }
 
-static UINT STORAGES_insert_row(struct tagMSIVIEW *view, MSIRECORD *rec, UINT row, BOOL temporary)
+static UINT STORAGES_insert_row(MSIVIEW *view, MSIRECORD *rec, UINT row, BOOL temporary)
 {
     MSISTORAGESVIEW *sv = (MSISTORAGESVIEW *)view;
 
@@ -247,25 +247,25 @@ static UINT STORAGES_insert_row(struct tagMSIVIEW *view, MSIRECORD *rec, UINT ro
     return STORAGES_set_row(view, row, rec, 0);
 }
 
-static UINT STORAGES_delete_row(struct tagMSIVIEW *view, UINT row)
+static UINT STORAGES_delete_row(MSIVIEW *view, UINT row)
 {
     FIXME("(%p %d): stub!\n", view, row);
     return ERROR_SUCCESS;
 }
 
-static UINT STORAGES_execute(struct tagMSIVIEW *view, MSIRECORD *record)
+static UINT STORAGES_execute(MSIVIEW *view, MSIRECORD *record)
 {
     TRACE("(%p, %p)\n", view, record);
     return ERROR_SUCCESS;
 }
 
-static UINT STORAGES_close(struct tagMSIVIEW *view)
+static UINT STORAGES_close(MSIVIEW *view)
 {
     TRACE("(%p)\n", view);
     return ERROR_SUCCESS;
 }
 
-static UINT STORAGES_get_dimensions(struct tagMSIVIEW *view, UINT *rows, UINT *cols)
+static UINT STORAGES_get_dimensions(MSIVIEW *view, UINT *rows, UINT *cols)
 {
     MSISTORAGESVIEW *sv = (MSISTORAGESVIEW *)view;
 
@@ -277,7 +277,7 @@ static UINT STORAGES_get_dimensions(struct tagMSIVIEW *view, UINT *rows, UINT *c
     return ERROR_SUCCESS;
 }
 
-static UINT STORAGES_get_column_info( struct tagMSIVIEW *view, UINT n, const WCHAR **name,
+static UINT STORAGES_get_column_info( MSIVIEW *view, UINT n, const WCHAR **name,
                                       UINT *type, BOOL *temporary, const WCHAR **table_name )
 {
     TRACE("(%p, %d, %p, %p, %p, %p)\n", view, n, name, type, temporary,
@@ -327,7 +327,7 @@ static UINT storages_find_row(MSISTORAGESVIEW *sv, MSIRECORD *rec, UINT *row)
     return ERROR_FUNCTION_FAILED;
 }
 
-static UINT storages_modify_update(struct tagMSIVIEW *view, MSIRECORD *rec)
+static UINT storages_modify_update(MSIVIEW *view, MSIRECORD *rec)
 {
     MSISTORAGESVIEW *sv = (MSISTORAGESVIEW *)view;
     UINT r, row;
@@ -339,7 +339,7 @@ static UINT storages_modify_update(struct tagMSIVIEW *view, MSIRECORD *rec)
     return STORAGES_set_row(view, row, rec, 0);
 }
 
-static UINT storages_modify_assign(struct tagMSIVIEW *view, MSIRECORD *rec)
+static UINT storages_modify_assign(MSIVIEW *view, MSIRECORD *rec)
 {
     MSISTORAGESVIEW *sv = (MSISTORAGESVIEW *)view;
     UINT r, row;
@@ -351,7 +351,7 @@ static UINT storages_modify_assign(struct tagMSIVIEW *view, MSIRECORD *rec)
     return STORAGES_insert_row(view, rec, -1, FALSE);
 }
 
-static UINT STORAGES_modify(struct tagMSIVIEW *view, MSIMODIFY eModifyMode, MSIRECORD *rec, UINT row)
+static UINT STORAGES_modify(MSIVIEW *view, MSIMODIFY eModifyMode, MSIRECORD *rec, UINT row)
 {
     UINT r;
 
@@ -391,7 +391,7 @@ static UINT STORAGES_modify(struct tagMSIVIEW *view, MSIMODIFY eModifyMode, MSIR
     return r;
 }
 
-static UINT STORAGES_delete(struct tagMSIVIEW *view)
+static UINT STORAGES_delete(MSIVIEW *view)
 {
     MSISTORAGESVIEW *sv = (MSISTORAGESVIEW *)view;
     UINT i;
@@ -412,7 +412,7 @@ static UINT STORAGES_delete(struct tagMSIVIEW *view)
     return ERROR_SUCCESS;
 }
 
-static UINT STORAGES_find_matching_rows(struct tagMSIVIEW *view, UINT col,
+static UINT STORAGES_find_matching_rows(MSIVIEW *view, UINT col,
                                        UINT val, UINT *row, MSIITERHANDLE *handle)
 {
     MSISTORAGESVIEW *sv = (MSISTORAGESVIEW *)view;
diff --git a/libmsi/streams.c b/libmsi/streams.c
index 72ab8be..6657693 100644
--- a/libmsi/streams.c
+++ b/libmsi/streams.c
@@ -86,7 +86,7 @@ static STREAM *create_stream(MSISTREAMSVIEW *sv, const WCHAR *name, BOOL encoded
     return stream;
 }
 
-static UINT STREAMS_fetch_int(struct tagMSIVIEW *view, UINT row, UINT col, UINT *val)
+static UINT STREAMS_fetch_int(MSIVIEW *view, UINT row, UINT col, UINT *val)
 {
     MSISTREAMSVIEW *sv = (MSISTREAMSVIEW *)view;
 
@@ -103,7 +103,7 @@ static UINT STREAMS_fetch_int(struct tagMSIVIEW *view, UINT row, UINT col, UINT
     return ERROR_SUCCESS;
 }
 
-static UINT STREAMS_fetch_stream(struct tagMSIVIEW *view, UINT row, UINT col, IStream **stm)
+static UINT STREAMS_fetch_stream(MSIVIEW *view, UINT row, UINT col, IStream **stm)
 {
     MSISTREAMSVIEW *sv = (MSISTREAMSVIEW *)view;
 
@@ -118,7 +118,7 @@ static UINT STREAMS_fetch_stream(struct tagMSIVIEW *view, UINT row, UINT col, IS
     return ERROR_SUCCESS;
 }
 
-static UINT STREAMS_get_row( struct tagMSIVIEW *view, UINT row, MSIRECORD **rec )
+static UINT STREAMS_get_row( MSIVIEW *view, UINT row, MSIRECORD **rec )
 {
     MSISTREAMSVIEW *sv = (MSISTREAMSVIEW *)view;
 
@@ -127,7 +127,7 @@ static UINT STREAMS_get_row( struct tagMSIVIEW *view, UINT row, MSIRECORD **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)
+static UINT STREAMS_set_row(MSIVIEW *view, UINT row, MSIRECORD *rec, UINT mask)
 {
     MSISTREAMSVIEW *sv = (MSISTREAMSVIEW *)view;
     STREAM *stream;
@@ -214,7 +214,7 @@ done:
     return r;
 }
 
-static UINT STREAMS_insert_row(struct tagMSIVIEW *view, MSIRECORD *rec, UINT row, BOOL temporary)
+static UINT STREAMS_insert_row(MSIVIEW *view, MSIRECORD *rec, UINT row, BOOL temporary)
 {
     MSISTREAMSVIEW *sv = (MSISTREAMSVIEW *)view;
     UINT i;
@@ -236,25 +236,25 @@ static UINT STREAMS_insert_row(struct tagMSIVIEW *view, MSIRECORD *rec, UINT row
     return STREAMS_set_row(view, row, rec, 0);
 }
 
-static UINT STREAMS_delete_row(struct tagMSIVIEW *view, UINT row)
+static UINT STREAMS_delete_row(MSIVIEW *view, UINT row)
 {
     FIXME("(%p %d): stub!\n", view, row);
     return ERROR_SUCCESS;
 }
 
-static UINT STREAMS_execute(struct tagMSIVIEW *view, MSIRECORD *record)
+static UINT STREAMS_execute(MSIVIEW *view, MSIRECORD *record)
 {
     TRACE("(%p, %p)\n", view, record);
     return ERROR_SUCCESS;
 }
 
-static UINT STREAMS_close(struct tagMSIVIEW *view)
+static UINT STREAMS_close(MSIVIEW *view)
 {
     TRACE("(%p)\n", view);
     return ERROR_SUCCESS;
 }
 
-static UINT STREAMS_get_dimensions(struct tagMSIVIEW *view, UINT *rows, UINT *cols)
+static UINT STREAMS_get_dimensions(MSIVIEW *view, UINT *rows, UINT *cols)
 {
     MSISTREAMSVIEW *sv = (MSISTREAMSVIEW *)view;
 
@@ -266,7 +266,7 @@ static UINT STREAMS_get_dimensions(struct tagMSIVIEW *view, UINT *rows, UINT *co
     return ERROR_SUCCESS;
 }
 
-static UINT STREAMS_get_column_info( struct tagMSIVIEW *view, UINT n, const WCHAR **name,
+static UINT STREAMS_get_column_info( MSIVIEW *view, UINT n, const WCHAR **name,
                                      UINT *type, BOOL *temporary, const WCHAR **table_name )
 {
     TRACE("(%p, %d, %p, %p, %p, %p)\n", view, n, name, type, temporary,
@@ -316,7 +316,7 @@ static UINT streams_find_row(MSISTREAMSVIEW *sv, MSIRECORD *rec, UINT *row)
     return ERROR_FUNCTION_FAILED;
 }
 
-static UINT streams_modify_update(struct tagMSIVIEW *view, MSIRECORD *rec)
+static UINT streams_modify_update(MSIVIEW *view, MSIRECORD *rec)
 {
     MSISTREAMSVIEW *sv = (MSISTREAMSVIEW *)view;
     UINT r, row;
@@ -328,7 +328,7 @@ static UINT streams_modify_update(struct tagMSIVIEW *view, MSIRECORD *rec)
     return STREAMS_set_row(view, row, rec, 0);
 }
 
-static UINT streams_modify_assign(struct tagMSIVIEW *view, MSIRECORD *rec)
+static UINT streams_modify_assign(MSIVIEW *view, MSIRECORD *rec)
 {
     MSISTREAMSVIEW *sv = (MSISTREAMSVIEW *)view;
     UINT r, row;
@@ -340,7 +340,7 @@ static UINT streams_modify_assign(struct tagMSIVIEW *view, MSIRECORD *rec)
     return STREAMS_insert_row(view, rec, -1, FALSE);
 }
 
-static UINT STREAMS_modify(struct tagMSIVIEW *view, MSIMODIFY eModifyMode, MSIRECORD *rec, UINT row)
+static UINT STREAMS_modify(MSIVIEW *view, MSIMODIFY eModifyMode, MSIRECORD *rec, UINT row)
 {
     UINT r;
 
@@ -380,7 +380,7 @@ static UINT STREAMS_modify(struct tagMSIVIEW *view, MSIMODIFY eModifyMode, MSIRE
     return r;
 }
 
-static UINT STREAMS_delete(struct tagMSIVIEW *view)
+static UINT STREAMS_delete(MSIVIEW *view)
 {
     MSISTREAMSVIEW *sv = (MSISTREAMSVIEW *)view;
     UINT i;
@@ -403,7 +403,7 @@ static UINT STREAMS_delete(struct tagMSIVIEW *view)
     return ERROR_SUCCESS;
 }
 
-static UINT STREAMS_find_matching_rows(struct tagMSIVIEW *view, UINT col,
+static UINT STREAMS_find_matching_rows(MSIVIEW *view, UINT col,
                                        UINT val, UINT *row, MSIITERHANDLE *handle)
 {
     MSISTREAMSVIEW *sv = (MSISTREAMSVIEW *)view;
diff --git a/libmsi/table.c b/libmsi/table.c
index d5013f1..dabe8a5 100644
--- a/libmsi/table.c
+++ b/libmsi/table.c
@@ -1016,7 +1016,7 @@ typedef struct tagMSITABLEVIEW
     WCHAR          name[1];
 } MSITABLEVIEW;
 
-static UINT TABLE_fetch_int( struct tagMSIVIEW *view, UINT row, UINT col, UINT *val )
+static UINT TABLE_fetch_int( MSIVIEW *view, UINT row, UINT col, UINT *val )
 {
     MSITABLEVIEW *tv = (MSITABLEVIEW*)view;
     UINT offset, n;
@@ -1145,7 +1145,7 @@ err:
  * the name of the stream in the same table, and the table name
  * which may not be available at higher levels of the query
  */
-static UINT TABLE_fetch_stream( struct tagMSIVIEW *view, UINT row, UINT col, IStream **stm )
+static UINT TABLE_fetch_stream( MSIVIEW *view, UINT row, UINT col, IStream **stm )
 {
     MSITABLEVIEW *tv = (MSITABLEVIEW*)view;
     UINT r;
@@ -1209,7 +1209,7 @@ static UINT TABLE_set_int( MSITABLEVIEW *tv, UINT row, UINT col, UINT val )
     return ERROR_SUCCESS;
 }
 
-static UINT TABLE_get_row( struct tagMSIVIEW *view, UINT row, MSIRECORD **rec )
+static UINT TABLE_get_row( MSIVIEW *view, UINT row, MSIRECORD **rec )
 {
     MSITABLEVIEW *tv = (MSITABLEVIEW *)view;
 
@@ -1301,7 +1301,7 @@ static UINT get_table_value_from_record( MSITABLEVIEW *tv, MSIRECORD *rec, UINT
     return ERROR_SUCCESS;
 }
 
-static UINT TABLE_set_row( struct tagMSIVIEW *view, UINT row, MSIRECORD *rec, UINT mask )
+static UINT TABLE_set_row( MSIVIEW *view, UINT row, MSIRECORD *rec, UINT mask )
 {
     MSITABLEVIEW *tv = (MSITABLEVIEW*)view;
     UINT i, val, r = ERROR_SUCCESS;
@@ -1386,7 +1386,7 @@ static UINT TABLE_set_row( struct tagMSIVIEW *view, UINT row, MSIRECORD *rec, UI
     return r;
 }
 
-static UINT table_create_new_row( struct tagMSIVIEW *view, UINT *num, BOOL temporary )
+static UINT table_create_new_row( MSIVIEW *view, UINT *num, BOOL temporary )
 {
     MSITABLEVIEW *tv = (MSITABLEVIEW*)view;
     BYTE **p, *row;
@@ -1445,7 +1445,7 @@ static UINT table_create_new_row( struct tagMSIVIEW *view, UINT *num, BOOL tempo
     return ERROR_SUCCESS;
 }
 
-static UINT TABLE_execute( struct tagMSIVIEW *view, MSIRECORD *record )
+static UINT TABLE_execute( MSIVIEW *view, MSIRECORD *record )
 {
     MSITABLEVIEW *tv = (MSITABLEVIEW*)view;
 
@@ -1456,14 +1456,14 @@ static UINT TABLE_execute( struct tagMSIVIEW *view, MSIRECORD *record )
     return ERROR_SUCCESS;
 }
 
-static UINT TABLE_close( struct tagMSIVIEW *view )
+static UINT TABLE_close( MSIVIEW *view )
 {
     TRACE("%p\n", view );
     
     return ERROR_SUCCESS;
 }
 
-static UINT TABLE_get_dimensions( struct tagMSIVIEW *view, UINT *rows, UINT *cols)
+static UINT TABLE_get_dimensions( MSIVIEW *view, UINT *rows, UINT *cols)
 {
     MSITABLEVIEW *tv = (MSITABLEVIEW*)view;
 
@@ -1481,7 +1481,7 @@ static UINT TABLE_get_dimensions( struct tagMSIVIEW *view, UINT *rows, UINT *col
     return ERROR_SUCCESS;
 }
 
-static UINT TABLE_get_column_info( struct tagMSIVIEW *view,
+static UINT TABLE_get_column_info( MSIVIEW *view,
                 UINT n, const WCHAR **name, UINT *type, BOOL *temporary,
                 const WCHAR **table_name )
 {
@@ -1619,7 +1619,7 @@ static int find_insert_index( MSITABLEVIEW *tv, MSIRECORD *rec )
     return high + 1;
 }
 
-static UINT TABLE_insert_row( struct tagMSIVIEW *view, MSIRECORD *rec, UINT row, BOOL temporary )
+static UINT TABLE_insert_row( MSIVIEW *view, MSIRECORD *rec, UINT row, BOOL temporary )
 {
     MSITABLEVIEW *tv = (MSITABLEVIEW*)view;
     UINT i, r;
@@ -1652,7 +1652,7 @@ static UINT TABLE_insert_row( struct tagMSIVIEW *view, MSIRECORD *rec, UINT row,
     return TABLE_set_row( view, row, rec, (1<<tv->num_cols) - 1 );
 }
 
-static UINT TABLE_delete_row( struct tagMSIVIEW *view, UINT row )
+static UINT TABLE_delete_row( MSIVIEW *view, UINT row )
 {
     MSITABLEVIEW *tv = (MSITABLEVIEW*)view;
     UINT r, num_rows, num_cols, i;
@@ -1690,7 +1690,7 @@ static UINT TABLE_delete_row( struct tagMSIVIEW *view, UINT row )
     return ERROR_SUCCESS;
 }
 
-static UINT msi_table_update(struct tagMSIVIEW *view, MSIRECORD *rec, UINT row)
+static UINT msi_table_update(MSIVIEW *view, MSIRECORD *rec, UINT row)
 {
     MSITABLEVIEW *tv = (MSITABLEVIEW *)view;
     UINT r, new_row;
@@ -1716,7 +1716,7 @@ static UINT msi_table_update(struct tagMSIVIEW *view, MSIRECORD *rec, UINT row)
     return TABLE_set_row(view, new_row, rec, (1 << tv->num_cols) - 1);
 }
 
-static UINT msi_table_assign(struct tagMSIVIEW *view, MSIRECORD *rec)
+static UINT msi_table_assign(MSIVIEW *view, MSIRECORD *rec)
 {
     MSITABLEVIEW *tv = (MSITABLEVIEW *)view;
     UINT r, row;
@@ -1731,7 +1731,7 @@ static UINT msi_table_assign(struct tagMSIVIEW *view, MSIRECORD *rec)
         return TABLE_insert_row( view, rec, -1, FALSE );
 }
 
-static UINT modify_delete_row( struct tagMSIVIEW *view, MSIRECORD *rec )
+static UINT modify_delete_row( MSIVIEW *view, MSIRECORD *rec )
 {
     MSITABLEVIEW *tv = (MSITABLEVIEW *)view;
     UINT row, r;
@@ -1743,7 +1743,7 @@ static UINT modify_delete_row( struct tagMSIVIEW *view, MSIRECORD *rec )
     return TABLE_delete_row(view, row);
 }
 
-static UINT msi_refresh_record( struct tagMSIVIEW *view, MSIRECORD *rec, UINT row )
+static UINT msi_refresh_record( MSIVIEW *view, MSIRECORD *rec, UINT row )
 {
     MSIRECORD *curr;
     UINT r, i, count;
@@ -1763,7 +1763,7 @@ static UINT msi_refresh_record( struct tagMSIVIEW *view, MSIRECORD *rec, UINT ro
     return ERROR_SUCCESS;
 }
 
-static UINT TABLE_modify( struct tagMSIVIEW *view, MSIMODIFY eModifyMode,
+static UINT TABLE_modify( MSIVIEW *view, MSIMODIFY eModifyMode,
                           MSIRECORD *rec, UINT row)
 {
     MSITABLEVIEW *tv = (MSITABLEVIEW*)view;
@@ -1838,7 +1838,7 @@ static UINT TABLE_modify( struct tagMSIVIEW *view, MSIMODIFY eModifyMode,
     return r;
 }
 
-static UINT TABLE_delete( struct tagMSIVIEW *view )
+static UINT TABLE_delete( MSIVIEW *view )
 {
     MSITABLEVIEW *tv = (MSITABLEVIEW*)view;
 
@@ -1852,7 +1852,7 @@ static UINT TABLE_delete( struct tagMSIVIEW *view )
     return ERROR_SUCCESS;
 }
 
-static UINT TABLE_find_matching_rows( struct tagMSIVIEW *view, UINT col,
+static UINT TABLE_find_matching_rows( MSIVIEW *view, UINT col,
     UINT val, UINT *row, MSIITERHANDLE *handle )
 {
     MSITABLEVIEW *tv = (MSITABLEVIEW*)view;
@@ -1931,7 +1931,7 @@ static UINT TABLE_find_matching_rows( struct tagMSIVIEW *view, UINT col,
     return ERROR_SUCCESS;
 }
 
-static UINT TABLE_add_ref(struct tagMSIVIEW *view)
+static UINT TABLE_add_ref(MSIVIEW *view)
 {
     MSITABLEVIEW *tv = (MSITABLEVIEW*)view;
     UINT i;
@@ -1947,7 +1947,7 @@ static UINT TABLE_add_ref(struct tagMSIVIEW *view)
     return InterlockedIncrement(&tv->table->ref_count);
 }
 
-static UINT TABLE_remove_column(struct tagMSIVIEW *view, const WCHAR *table, UINT number)
+static UINT TABLE_remove_column(MSIVIEW *view, const WCHAR *table, UINT number)
 {
     MSITABLEVIEW *tv = (MSITABLEVIEW*)view;
     MSIRECORD *rec = NULL;
@@ -1981,7 +1981,7 @@ done:
     return r;
 }
 
-static UINT TABLE_release(struct tagMSIVIEW *view)
+static UINT TABLE_release(MSIVIEW *view)
 {
     MSITABLEVIEW *tv = (MSITABLEVIEW*)view;
     INT ref = tv->table->ref_count;
@@ -2018,7 +2018,7 @@ static UINT TABLE_release(struct tagMSIVIEW *view)
     return ref;
 }
 
-static UINT TABLE_add_column(struct tagMSIVIEW *view, const WCHAR *table, UINT number,
+static UINT TABLE_add_column(MSIVIEW *view, const WCHAR *table, UINT number,
                              const WCHAR *column, UINT type, BOOL hold)
 {
     MSITABLEVIEW *tv = (MSITABLEVIEW*)view;
@@ -2059,7 +2059,7 @@ done:
     return r;
 }
 
-static UINT TABLE_drop(struct tagMSIVIEW *view)
+static UINT TABLE_drop(MSIVIEW *view)
 {
     MSITABLEVIEW *tv = (MSITABLEVIEW*)view;
     MSIVIEW *tables = NULL;
diff --git a/libmsi/update.c b/libmsi/update.c
index 6c1526d..ffec789 100644
--- a/libmsi/update.c
+++ b/libmsi/update.c
@@ -44,7 +44,7 @@ typedef struct tagMSIUPDATEVIEW
     column_info     *vals;
 } MSIUPDATEVIEW;
 
-static UINT UPDATE_fetch_int( struct tagMSIVIEW *view, UINT row, UINT col, UINT *val )
+static UINT UPDATE_fetch_int( MSIVIEW *view, UINT row, UINT col, UINT *val )
 {
     MSIUPDATEVIEW *uv = (MSIUPDATEVIEW*)view;
 
@@ -53,7 +53,7 @@ static UINT UPDATE_fetch_int( struct tagMSIVIEW *view, UINT row, UINT col, UINT
     return ERROR_FUNCTION_FAILED;
 }
 
-static UINT UPDATE_execute( struct tagMSIVIEW *view, MSIRECORD *record )
+static UINT UPDATE_execute( MSIVIEW *view, MSIRECORD *record )
 {
     MSIUPDATEVIEW *uv = (MSIUPDATEVIEW*)view;
     UINT i, r, col_count = 0, row_count = 0;
@@ -124,7 +124,7 @@ done:
 }
 
 
-static UINT UPDATE_close( struct tagMSIVIEW *view )
+static UINT UPDATE_close( MSIVIEW *view )
 {
     MSIUPDATEVIEW *uv = (MSIUPDATEVIEW*)view;
     MSIVIEW *wv;
@@ -138,7 +138,7 @@ static UINT UPDATE_close( struct tagMSIVIEW *view )
     return wv->ops->close( wv );
 }
 
-static UINT UPDATE_get_dimensions( struct tagMSIVIEW *view, UINT *rows, UINT *cols )
+static UINT UPDATE_get_dimensions( MSIVIEW *view, UINT *rows, UINT *cols )
 {
     MSIUPDATEVIEW *uv = (MSIUPDATEVIEW*)view;
     MSIVIEW *wv;
@@ -152,7 +152,7 @@ static UINT UPDATE_get_dimensions( struct tagMSIVIEW *view, UINT *rows, UINT *co
     return wv->ops->get_dimensions( wv, rows, cols );
 }
 
-static UINT UPDATE_get_column_info( struct tagMSIVIEW *view, UINT n, const WCHAR **name,
+static UINT UPDATE_get_column_info( MSIVIEW *view, UINT n, const WCHAR **name,
                                     UINT *type, BOOL *temporary, const WCHAR **table_name )
 {
     MSIUPDATEVIEW *uv = (MSIUPDATEVIEW*)view;
@@ -167,7 +167,7 @@ static UINT UPDATE_get_column_info( struct tagMSIVIEW *view, UINT n, const WCHAR
     return wv->ops->get_column_info( wv, n, name, type, temporary, table_name );
 }
 
-static UINT UPDATE_modify( struct tagMSIVIEW *view, MSIMODIFY eModifyMode,
+static UINT UPDATE_modify( MSIVIEW *view, MSIMODIFY eModifyMode,
                            MSIRECORD *rec, UINT row )
 {
     MSIUPDATEVIEW *uv = (MSIUPDATEVIEW*)view;
@@ -177,7 +177,7 @@ static UINT UPDATE_modify( struct tagMSIVIEW *view, MSIMODIFY eModifyMode,
     return ERROR_FUNCTION_FAILED;
 }
 
-static UINT UPDATE_delete( struct tagMSIVIEW *view )
+static UINT UPDATE_delete( MSIVIEW *view )
 {
     MSIUPDATEVIEW *uv = (MSIUPDATEVIEW*)view;
     MSIVIEW *wv;
@@ -193,7 +193,7 @@ static UINT UPDATE_delete( struct tagMSIVIEW *view )
     return ERROR_SUCCESS;
 }
 
-static UINT UPDATE_find_matching_rows( struct tagMSIVIEW *view, UINT col, UINT val, UINT *row, MSIITERHANDLE *handle )
+static UINT UPDATE_find_matching_rows( MSIVIEW *view, UINT col, UINT val, UINT *row, MSIITERHANDLE *handle )
 {
     TRACE("%p %d %d %p\n", view, col, val, *handle );
 
diff --git a/libmsi/where.c b/libmsi/where.c
index 953e472..3bc841f 100644
--- a/libmsi/where.c
+++ b/libmsi/where.c
@@ -211,7 +211,7 @@ static UINT parse_column(MSIWHEREVIEW *wv, union ext_column *column,
     return ERROR_BAD_QUERY_SYNTAX;
 }
 
-static UINT WHERE_fetch_int( struct tagMSIVIEW *view, UINT row, UINT col, UINT *val )
+static UINT WHERE_fetch_int( MSIVIEW *view, UINT row, UINT col, UINT *val )
 {
     MSIWHEREVIEW *wv = (MSIWHEREVIEW*)view;
     JOINTABLE *table;
@@ -234,7 +234,7 @@ static UINT WHERE_fetch_int( struct tagMSIVIEW *view, UINT row, UINT col, UINT *
     return table->view->ops->fetch_int(table->view, rows[table->table_index], col, val);
 }
 
-static UINT WHERE_fetch_stream( struct tagMSIVIEW *view, UINT row, UINT col, IStream **stm )
+static UINT WHERE_fetch_stream( MSIVIEW *view, UINT row, UINT col, IStream **stm )
 {
     MSIWHEREVIEW *wv = (MSIWHEREVIEW*)view;
     JOINTABLE *table;
@@ -257,7 +257,7 @@ 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 )
+static UINT WHERE_get_row( MSIVIEW *view, UINT row, MSIRECORD **rec )
 {
     MSIWHEREVIEW *wv = (MSIWHEREVIEW *)view;
 
@@ -269,7 +269,7 @@ static UINT WHERE_get_row( struct tagMSIVIEW *view, UINT row, MSIRECORD **rec )
     return msi_view_get_row( wv->db, view, row, rec );
 }
 
-static UINT WHERE_set_row( struct tagMSIVIEW *view, UINT row, MSIRECORD *rec, UINT mask )
+static UINT WHERE_set_row( MSIVIEW *view, UINT row, MSIRECORD *rec, UINT mask )
 {
     MSIWHEREVIEW *wv = (MSIWHEREVIEW*)view;
     UINT i, r, offset = 0;
@@ -344,7 +344,7 @@ static UINT WHERE_set_row( struct tagMSIVIEW *view, UINT row, MSIRECORD *rec, UI
     return r;
 }
 
-static UINT WHERE_delete_row(struct tagMSIVIEW *view, UINT row)
+static UINT WHERE_delete_row(MSIVIEW *view, UINT row)
 {
     MSIWHEREVIEW *wv = (MSIWHEREVIEW *)view;
     UINT r;
@@ -761,7 +761,7 @@ static JOINTABLE **ordertables( MSIWHEREVIEW *wv )
     return tables;
 }
 
-static UINT WHERE_execute( struct tagMSIVIEW *view, MSIRECORD *record )
+static UINT WHERE_execute( MSIVIEW *view, MSIRECORD *record )
 {
     MSIWHEREVIEW *wv = (MSIWHEREVIEW*)view;
     UINT r;
@@ -817,7 +817,7 @@ static UINT WHERE_execute( struct tagMSIVIEW *view, MSIRECORD *record )
     return r;
 }
 
-static UINT WHERE_close( struct tagMSIVIEW *view )
+static UINT WHERE_close( MSIVIEW *view )
 {
     MSIWHEREVIEW *wv = (MSIWHEREVIEW*)view;
     JOINTABLE *table = wv->tables;
@@ -834,7 +834,7 @@ static UINT WHERE_close( struct tagMSIVIEW *view )
     return ERROR_SUCCESS;
 }
 
-static UINT WHERE_get_dimensions( struct tagMSIVIEW *view, UINT *rows, UINT *cols )
+static UINT WHERE_get_dimensions( MSIVIEW *view, UINT *rows, UINT *cols )
 {
     MSIWHEREVIEW *wv = (MSIWHEREVIEW*)view;
 
@@ -856,7 +856,7 @@ static UINT WHERE_get_dimensions( struct tagMSIVIEW *view, UINT *rows, UINT *col
     return ERROR_SUCCESS;
 }
 
-static UINT WHERE_get_column_info( struct tagMSIVIEW *view, UINT n, const WCHAR **name,
+static UINT WHERE_get_column_info( MSIVIEW *view, UINT n, const WCHAR **name,
                                    UINT *type, BOOL *temporary, const WCHAR **table_name )
 {
     MSIWHEREVIEW *wv = (MSIWHEREVIEW*)view;
@@ -899,7 +899,7 @@ static UINT join_find_row( MSIWHEREVIEW *wv, MSIRECORD *rec, UINT *row )
     return ERROR_FUNCTION_FAILED;
 }
 
-static UINT join_modify_update( struct tagMSIVIEW *view, MSIRECORD *rec )
+static UINT join_modify_update( MSIVIEW *view, MSIRECORD *rec )
 {
     MSIWHEREVIEW *wv = (MSIWHEREVIEW *)view;
     UINT r, row, i, mask = 0;
@@ -926,7 +926,7 @@ static UINT join_modify_update( struct tagMSIVIEW *view, MSIRECORD *rec )
     return WHERE_set_row( view, row, rec, mask );
 }
 
-static UINT WHERE_modify( struct tagMSIVIEW *view, MSIMODIFY eModifyMode,
+static UINT WHERE_modify( MSIVIEW *view, MSIMODIFY eModifyMode,
                           MSIRECORD *rec, UINT row )
 {
     MSIWHEREVIEW *wv = (MSIWHEREVIEW*)view;
@@ -982,7 +982,7 @@ static UINT WHERE_modify( struct tagMSIVIEW *view, MSIMODIFY eModifyMode,
     return r;
 }
 
-static UINT WHERE_delete( struct tagMSIVIEW *view )
+static UINT WHERE_delete( MSIVIEW *view )
 {
     MSIWHEREVIEW *wv = (MSIWHEREVIEW*)view;
     JOINTABLE *table = wv->tables;
@@ -1013,7 +1013,7 @@ static UINT WHERE_delete( struct tagMSIVIEW *view )
     return ERROR_SUCCESS;
 }
 
-static UINT WHERE_find_matching_rows( struct tagMSIVIEW *view, UINT col,
+static UINT WHERE_find_matching_rows( MSIVIEW *view, UINT col,
     UINT val, UINT *row, MSIITERHANDLE *handle )
 {
     MSIWHEREVIEW *wv = (MSIWHEREVIEW*)view;
@@ -1043,7 +1043,7 @@ static UINT WHERE_find_matching_rows( struct tagMSIVIEW *view, UINT col,
     return ERROR_NO_MORE_ITEMS;
 }
 
-static UINT WHERE_sort(struct tagMSIVIEW *view, column_info *columns)
+static UINT WHERE_sort(MSIVIEW *view, column_info *columns)
 {
     MSIWHEREVIEW *wv = (MSIWHEREVIEW *)view;
     JOINTABLE *table = wv->tables;