we finally have our own header

19 files changed, 54 insertions, 55 deletions

diff --git a/libmsi/alter.c b/libmsi/alter.c
index c484762..9248d45 100644
--- a/libmsi/alter.c
+++ b/libmsi/alter.c
@@ -24,7 +24,7 @@
 #include "winbase.h"
 #include "winerror.h"
 #include "debug.h"
-#include "msiquery.h"
+#include "libmsi.h"
 #include "objbase.h"
 #include "objidl.h"
 #include "msipriv.h"
diff --git a/libmsi/create.c b/libmsi/create.c
index 082fcf1..1d7eb2b 100644
--- a/libmsi/create.c
+++ b/libmsi/create.c
@@ -25,7 +25,7 @@
 #include "winerror.h"
 #include "debug.h"
 #include "unicode.h"
-#include "msiquery.h"
+#include "libmsi.h"
 #include "objbase.h"
 #include "objidl.h"
 #include "msipriv.h"
diff --git a/libmsi/database.c b/libmsi/database.c
index 21d1c5c..d8f264a 100644
--- a/libmsi/database.c
+++ b/libmsi/database.c
@@ -29,7 +29,7 @@
 #include "winnls.h"
 #include "debug.h"
 #include "unicode.h"
-#include "msiquery.h"
+#include "libmsi.h"
 #include "msipriv.h"
 #include "objidl.h"
 #include "objbase.h"
diff --git a/libmsi/delete.c b/libmsi/delete.c
index 59dc1db..a47b0e2 100644
--- a/libmsi/delete.c
+++ b/libmsi/delete.c
@@ -24,7 +24,7 @@
 #include "winbase.h"
 #include "winerror.h"
 #include "debug.h"
-#include "msiquery.h"
+#include "libmsi.h"
 #include "objbase.h"
 #include "objidl.h"
 #include "msipriv.h"
diff --git a/libmsi/distinct.c b/libmsi/distinct.c
index 31858fb..c1b0d6c 100644
--- a/libmsi/distinct.c
+++ b/libmsi/distinct.c
@@ -24,7 +24,7 @@
 #include "winbase.h"
 #include "winerror.h"
 #include "debug.h"
-#include "msiquery.h"
+#include "libmsi.h"
 #include "objbase.h"
 #include "objidl.h"
 #include "msipriv.h"
diff --git a/libmsi/drop.c b/libmsi/drop.c
index 88b360a..aca8d73 100644
--- a/libmsi/drop.c
+++ b/libmsi/drop.c
@@ -24,7 +24,7 @@
 #include "winbase.h"
 #include "winerror.h"
 #include "debug.h"
-#include "msiquery.h"
+#include "libmsi.h"
 #include "objbase.h"
 #include "objidl.h"
 #include "msipriv.h"
diff --git a/libmsi/handle.c b/libmsi/handle.c
index 4d8ded2..cf6f901 100644
--- a/libmsi/handle.c
+++ b/libmsi/handle.c
@@ -27,7 +27,7 @@
 #include "winreg.h"
 #include "shlwapi.h"
 #include "debug.h"
-#include "msiquery.h"
+#include "libmsi.h"
 #include "msipriv.h"
 
 
diff --git a/libmsi/insert.c b/libmsi/insert.c
index eea54c6..9687f8a 100644
--- a/libmsi/insert.c
+++ b/libmsi/insert.c
@@ -25,7 +25,7 @@
 #include "winerror.h"
 #include "debug.h"
 #include "unicode.h"
-#include "msiquery.h"
+#include "libmsi.h"
 #include "objbase.h"
 #include "objidl.h"
 #include "msipriv.h"
diff --git a/libmsi/msipriv.h b/libmsi/msipriv.h
index acda71b..0e950ee 100644
--- a/libmsi/msipriv.h
+++ b/libmsi/msipriv.h
@@ -27,8 +27,7 @@
 #include "unicode.h"
 #include "windef.h"
 #include "winbase.h"
-#include "msi.h"
-#include "msiquery.h"
+#include "libmsi.h"
 #include "objbase.h"
 #include "objidl.h"
 #include "winnls.h"
diff --git a/libmsi/msiquery.c b/libmsi/msiquery.c
index 8257ebf..f624879 100644
--- a/libmsi/msiquery.c
+++ b/libmsi/msiquery.c
@@ -27,7 +27,7 @@
 #include "winerror.h"
 #include "debug.h"
 #include "unicode.h"
-#include "msiquery.h"
+#include "libmsi.h"
 #include "objbase.h"
 #include "objidl.h"
 #include "msipriv.h"
diff --git a/libmsi/record.c b/libmsi/record.c
index db23f29..9a0ee77 100644
--- a/libmsi/record.c
+++ b/libmsi/record.c
@@ -27,7 +27,7 @@
 #include "winerror.h"
 #include "debug.h"
 #include "unicode.h"
-#include "msiquery.h"
+#include "libmsi.h"
 #include "msipriv.h"
 #include "objidl.h"
 #include "winnls.h"
diff --git a/libmsi/select.c b/libmsi/select.c
index 2474328..31a861d 100644
--- a/libmsi/select.c
+++ b/libmsi/select.c
@@ -24,7 +24,7 @@
 #include "winbase.h"
 #include "winerror.h"
 #include "debug.h"
-#include "msiquery.h"
+#include "libmsi.h"
 #include "objbase.h"
 #include "objidl.h"
 #include "msipriv.h"
diff --git a/libmsi/storages.c b/libmsi/storages.c
index 6f33b8e..7d20844 100644
--- a/libmsi/storages.c
+++ b/libmsi/storages.c
@@ -26,7 +26,7 @@
 #include "winbase.h"
 #include "winerror.h"
 #include "ole2.h"
-#include "msiquery.h"
+#include "libmsi.h"
 #include "objbase.h"
 #include "msipriv.h"
 #include "query.h"
diff --git a/libmsi/streams.c b/libmsi/streams.c
index 187e44d..2c270fa 100644
--- a/libmsi/streams.c
+++ b/libmsi/streams.c
@@ -25,7 +25,7 @@
 #include "windef.h"
 #include "winbase.h"
 #include "winerror.h"
-#include "msiquery.h"
+#include "libmsi.h"
 #include "objbase.h"
 #include "msipriv.h"
 #include "query.h"
diff --git a/libmsi/string.c b/libmsi/string.c
index 40d9c1e..adc2788 100644
--- a/libmsi/string.c
+++ b/libmsi/string.c
@@ -30,7 +30,7 @@
 #include "winerror.h"
 #include "debug.h"
 #include "unicode.h"
-#include "msiquery.h"
+#include "libmsi.h"
 #include "objbase.h"
 #include "objidl.h"
 #include "msipriv.h"
diff --git a/libmsi/suminfo.c b/libmsi/suminfo.c
index a41b1e9..4cefaab 100644
--- a/libmsi/suminfo.c
+++ b/libmsi/suminfo.c
@@ -29,7 +29,7 @@
 #include "shlwapi.h"
 #include "debug.h"
 #include "unicode.h"
-#include "msiquery.h"
+#include "libmsi.h"
 #include "msipriv.h"
 #include "objidl.h"
 #include "propvarutil.h"
@@ -106,29 +106,29 @@ static UINT get_type( UINT uiProperty )
 {
     switch( uiProperty )
     {
-    case PID_CODEPAGE:
+    case MSI_PID_CODEPAGE:
          return VT_I2;
 
-    case PID_SUBJECT:
-    case PID_AUTHOR:
-    case PID_KEYWORDS:
-    case PID_COMMENTS:
-    case PID_TEMPLATE:
-    case PID_LASTAUTHOR:
-    case PID_REVNUMBER:
-    case PID_APPNAME:
-    case PID_TITLE:
+    case MSI_PID_SUBJECT:
+    case MSI_PID_AUTHOR:
+    case MSI_PID_KEYWORDS:
+    case MSI_PID_COMMENTS:
+    case MSI_PID_TEMPLATE:
+    case MSI_PID_LASTAUTHOR:
+    case MSI_PID_REVNUMBER:
+    case MSI_PID_APPNAME:
+    case MSI_PID_TITLE:
          return VT_LPSTR;
 
-    case PID_LASTPRINTED:
-    case PID_CREATE_DTM:
-    case PID_LASTSAVE_DTM:
+    case MSI_PID_LASTPRINTED:
+    case MSI_PID_CREATE_DTM:
+    case MSI_PID_LASTSAVE_DTM:
          return VT_FILETIME;
 
-    case PID_WORDCOUNT:
-    case PID_CHARCOUNT:
-    case PID_SECURITY:
-    case PID_PAGECOUNT:
+    case MSI_PID_WORDCOUNT:
+    case MSI_PID_CHARCOUNT:
+    case MSI_PID_SECURITY:
+    case MSI_PID_PAGECOUNT:
          return VT_I4;
     }
     return VT_EMPTY;
@@ -643,7 +643,7 @@ LPWSTR msi_get_suminfo_product( IStorage *stg )
         ERR("no summary information!\n");
         return NULL;
     }
-    prod = msi_suminfo_dup_string( si, PID_REVNUMBER );
+    prod = msi_suminfo_dup_string( si, MSI_PID_REVNUMBER );
     msiobj_release( &si->hdr );
     return prod;
 }
@@ -862,29 +862,29 @@ static UINT parse_prop( LPCWSTR prop, LPCWSTR value, UINT *pid, INT *int_value,
     *pid = atoiW( prop );
     switch (*pid)
     {
-    case PID_CODEPAGE:
-    case PID_WORDCOUNT:
-    case PID_CHARCOUNT:
-    case PID_SECURITY:
-    case PID_PAGECOUNT:
+    case MSI_PID_CODEPAGE:
+    case MSI_PID_WORDCOUNT:
+    case MSI_PID_CHARCOUNT:
+    case MSI_PID_SECURITY:
+    case MSI_PID_PAGECOUNT:
         *int_value = atoiW( value );
         break;
 
-    case PID_LASTPRINTED:
-    case PID_CREATE_DTM:
-    case PID_LASTSAVE_DTM:
+    case MSI_PID_LASTPRINTED:
+    case MSI_PID_CREATE_DTM:
+    case MSI_PID_LASTSAVE_DTM:
         parse_filetime( value, ft_value );
         break;
 
-    case PID_SUBJECT:
-    case PID_AUTHOR:
-    case PID_KEYWORDS:
-    case PID_COMMENTS:
-    case PID_TEMPLATE:
-    case PID_LASTAUTHOR:
-    case PID_REVNUMBER:
-    case PID_APPNAME:
-    case PID_TITLE:
+    case MSI_PID_SUBJECT:
+    case MSI_PID_AUTHOR:
+    case MSI_PID_KEYWORDS:
+    case MSI_PID_COMMENTS:
+    case MSI_PID_TEMPLATE:
+    case MSI_PID_LASTAUTHOR:
+    case MSI_PID_REVNUMBER:
+    case MSI_PID_APPNAME:
+    case MSI_PID_TITLE:
         str_value->str.w = value;
         str_value->unicode = TRUE;
         break;
diff --git a/libmsi/table.c b/libmsi/table.c
index f6a170c..3c0dea2 100644
--- a/libmsi/table.c
+++ b/libmsi/table.c
@@ -28,7 +28,7 @@
 #include "windef.h"
 #include "winbase.h"
 #include "winerror.h"
-#include "msiquery.h"
+#include "libmsi.h"
 #include "objbase.h"
 #include "objidl.h"
 #include "winnls.h"
diff --git a/libmsi/update.c b/libmsi/update.c
index 357c496..56114ea 100644
--- a/libmsi/update.c
+++ b/libmsi/update.c
@@ -24,7 +24,7 @@
 #include "winbase.h"
 #include "winerror.h"
 #include "debug.h"
-#include "msiquery.h"
+#include "libmsi.h"
 #include "objbase.h"
 #include "objidl.h"
 #include "msipriv.h"
diff --git a/libmsi/where.c b/libmsi/where.c
index c1311f0..332d81a 100644
--- a/libmsi/where.c
+++ b/libmsi/where.c
@@ -27,7 +27,7 @@
 #include "winerror.h"
 #include "debug.h"
 #include "unicode.h"
-#include "msiquery.h"
+#include "libmsi.h"
 #include "objbase.h"
 #include "objidl.h"
 #include "msipriv.h"