msi: Cast-qual warning fix (Try 2)

[Andrew Talbot]

Sorry. I missed a few affected files in my first attempt. This one should
cover them all.

-- Andy.
---
Changelog:
    msi: Cast-qual warning fix.

diff -urN a/dlls/msi/alter.c b/dlls/msi/alter.c
--- a/dlls/msi/alter.c	2006-10-31 17:37:57.000000000 +0000
+++ b/dlls/msi/alter.c	2006-11-04 15:35:24.000000000 +0000
@@ -116,7 +116,7 @@
 }
 
 static UINT ALTER_find_matching_rows( struct tagMSIVIEW *view, UINT col,
-    UINT val, UINT *row, MSIITERHANDLE *handle )
+    UINT val, UINT *row, MSICITERHANDLE *handle )
 {
     TRACE("%p, %d, %u, %p\n", view, col, val, *handle);
 
diff -urN a/dlls/msi/delete.c b/dlls/msi/delete.c
--- a/dlls/msi/delete.c	2006-10-26 17:33:14.000000000 +0100
+++ b/dlls/msi/delete.c	2006-11-04 15:53:28.000000000 +0000
@@ -171,7 +171,7 @@
 }
 
 static UINT DELETE_find_matching_rows( struct tagMSIVIEW *view, UINT col,
-    UINT val, UINT *row, MSIITERHANDLE *handle )
+    UINT val, UINT *row, MSICITERHANDLE *handle )
 {
     TRACE("%p, %d, %u, %p\n", view, col, val, *handle);
 
diff -urN a/dlls/msi/distinct.c b/dlls/msi/distinct.c
--- a/dlls/msi/distinct.c	2006-06-10 12:32:04.000000000 +0100
+++ b/dlls/msi/distinct.c	2006-11-04 15:10:53.000000000 +0000
@@ -247,7 +247,7 @@
 }
 
 static UINT DISTINCT_find_matching_rows( struct tagMSIVIEW *view, UINT col,
-    UINT val, UINT *row, MSIITERHANDLE *handle )
+    UINT val, UINT *row, MSICITERHANDLE *handle )
 {
     MSIDISTINCTVIEW *dv = (MSIDISTINCTVIEW*)view;
     UINT r;
diff -urN a/dlls/msi/insert.c b/dlls/msi/insert.c
--- a/dlls/msi/insert.c	2006-10-26 17:33:14.000000000 +0100
+++ b/dlls/msi/insert.c	2006-11-04 15:54:18.000000000 +0000
@@ -211,7 +211,7 @@
 }
 
 static UINT INSERT_find_matching_rows( struct tagMSIVIEW *view, UINT col,
-    UINT val, UINT *row, MSIITERHANDLE *handle )
+    UINT val, UINT *row, MSICITERHANDLE *handle )
 {
     TRACE("%p, %d, %u, %p\n", view, col, val, *handle);
 
diff -urN a/dlls/msi/join.c b/dlls/msi/join.c
--- a/dlls/msi/join.c	2006-10-31 17:37:57.000000000 +0000
+++ b/dlls/msi/join.c	2006-11-04 15:55:02.000000000 +0000
@@ -230,7 +230,7 @@
 }
 
 static UINT JOIN_find_matching_rows( struct tagMSIVIEW *view, UINT col,
-    UINT val, UINT *row, MSIITERHANDLE *handle )
+    UINT val, UINT *row, MSICITERHANDLE *handle )
 {
     MSIJOINVIEW *jv = (MSIJOINVIEW*)view;
 
diff -urN a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h
--- a/dlls/msi/msipriv.h	2006-11-02 17:36:38.000000000 +0000
+++ b/dlls/msi/msipriv.h	2006-11-04 15:08:35.000000000 +0000
@@ -109,7 +109,8 @@
     MSIFIELD fields[1]; /* nb. array size is count+1 */
 } MSIRECORD;
 
-typedef void *MSIITERHANDLE;
+typedef void        *MSIITERHANDLE;
+typedef const void  *MSICITERHANDLE;
 
 typedef struct tagMSIVIEWOPS
 {
@@ -192,7 +193,7 @@
      *  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 *, UINT col, UINT val, UINT *row, MSIITERHANDLE *handle );
+    UINT (*find_matching_rows)( struct tagMSIVIEW *, UINT col, UINT val, UINT *row, MSICITERHANDLE *handle );
 } MSIVIEWOPS;
 
 struct tagMSIVIEW
diff -urN a/dlls/msi/order.c b/dlls/msi/order.c
--- a/dlls/msi/order.c	2006-06-10 12:32:04.000000000 +0100
+++ b/dlls/msi/order.c	2006-11-04 15:12:44.000000000 +0000
@@ -250,7 +250,7 @@
 }
 
 static UINT ORDER_find_matching_rows( struct tagMSIVIEW *view, UINT col,
-    UINT val, UINT *row, MSIITERHANDLE *handle )
+    UINT val, UINT *row, MSICITERHANDLE *handle )
 {
     MSIORDERVIEW *ov = (MSIORDERVIEW*)view;
     UINT r;
diff -urN a/dlls/msi/select.c b/dlls/msi/select.c
--- a/dlls/msi/select.c	2006-10-26 17:33:14.000000000 +0100
+++ b/dlls/msi/select.c	2006-11-04 15:13:58.000000000 +0000
@@ -243,7 +243,7 @@
 }
 
 static UINT SELECT_find_matching_rows( struct tagMSIVIEW *view, UINT col,
-    UINT val, UINT *row, MSIITERHANDLE *handle )
+    UINT val, UINT *row, MSICITERHANDLE *handle )
 {
     MSISELECTVIEW *sv = (MSISELECTVIEW*)view;
 
diff -urN a/dlls/msi/table.c b/dlls/msi/table.c
--- a/dlls/msi/table.c	2006-11-01 17:45:40.000000000 +0000
+++ b/dlls/msi/table.c	2006-11-04 15:07:03.000000000 +0000
@@ -1509,7 +1509,7 @@
 }
 
 static UINT TABLE_find_matching_rows( struct tagMSIVIEW *view, UINT col,
-    UINT val, UINT *row, MSIITERHANDLE *handle )
+    UINT val, UINT *row, MSICITERHANDLE *handle )
 {
     MSITABLEVIEW *tv = (MSITABLEVIEW*)view;
     const MSICOLUMNHASHENTRY *entry;
@@ -1592,7 +1592,7 @@
     while (entry && entry->value != val)
         entry = entry->next;
 
-    *handle = (MSIITERHANDLE)entry;
+    *handle = (MSICITERHANDLE)entry;
     if (!entry)
         return ERROR_NO_MORE_ITEMS;
 
diff -urN a/dlls/msi/update.c b/dlls/msi/update.c
--- a/dlls/msi/update.c	2006-10-26 17:33:14.000000000 +0100
+++ b/dlls/msi/update.c	2006-11-04 15:29:03.000000000 +0000
@@ -163,7 +163,7 @@
     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( struct tagMSIVIEW *view, UINT col, UINT val, UINT *row, MSICITERHANDLE *handle )
 {
     TRACE("%p %d %d %p\n", view, col, val, *handle );
 
diff -urN a/dlls/msi/where.c b/dlls/msi/where.c
--- a/dlls/msi/where.c	2006-10-26 17:33:14.000000000 +0100
+++ b/dlls/msi/where.c	2006-11-04 15:16:43.000000000 +0000
@@ -258,7 +258,7 @@
     wv->row_count = 0;
     if (wv->cond->type == EXPR_STRCMP)
     {
-        MSIITERHANDLE handle = NULL;
+        MSICITERHANDLE handle = NULL;
         UINT row, value, col;
         struct expr *col_cond = wv->cond->u.expr.left;
         struct expr *val_cond = wv->cond->u.expr.right;
@@ -395,7 +395,7 @@
 }
 
 static UINT WHERE_find_matching_rows( struct tagMSIVIEW *view, UINT col,
-    UINT val, UINT *row, MSIITERHANDLE *handle )
+    UINT val, UINT *row, MSICITERHANDLE *handle )
 {
     MSIWHEREVIEW *wv = (MSIWHEREVIEW*)view;
     UINT r;