summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile.am2
-rw-r--r--include/libmsi.h (renamed from include/msiquery.h)107
-rw-r--r--libmsi/alter.c2
-rw-r--r--libmsi/create.c2
-rw-r--r--libmsi/database.c2
-rw-r--r--libmsi/delete.c2
-rw-r--r--libmsi/distinct.c2
-rw-r--r--libmsi/drop.c2
-rw-r--r--libmsi/handle.c2
-rw-r--r--libmsi/insert.c2
-rw-r--r--libmsi/msipriv.h3
-rw-r--r--libmsi/msiquery.c2
-rw-r--r--libmsi/record.c2
-rw-r--r--libmsi/select.c2
-rw-r--r--libmsi/storages.c2
-rw-r--r--libmsi/streams.c2
-rw-r--r--libmsi/string.c2
-rw-r--r--libmsi/suminfo.c72
-rw-r--r--libmsi/table.c2
-rw-r--r--libmsi/update.c2
-rw-r--r--libmsi/where.c2
21 files changed, 86 insertions, 132 deletions
diff --git a/Makefile.am b/Makefile.am
index 7bfb11f..123937a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
ACLOCAL_AMFLAGS = -I m4
SUBDIRS = libmsi
-noinst_HEADERS = include/debug.h include/msiquery.h
+noinst_HEADERS = include/debug.h include/libmsi.h
diff --git a/include/msiquery.h b/include/libmsi.h
index 12b116f..aca7649 100644
--- a/include/msiquery.h
+++ b/include/libmsi.h
@@ -16,10 +16,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#ifndef _MSIQUERY_H
-#define _MSIQUERY_H
+#ifndef _LIBMSI_H
+#define _LIBMSI_H
-#include <msi.h>
+typedef unsigned __LONG32 MSIHANDLE;
typedef enum tagMSICONDITION
{
@@ -119,6 +119,33 @@ extern "C" {
#endif
#endif
+#define MSI_PID_DICTIONARY (0)
+#define MSI_PID_CODEPAGE (0x1)
+#define MSI_PID_FIRST_USABLE 2
+#define MSI_PID_TITLE 2
+#define MSI_PID_SUBJECT 3
+#define MSI_PID_AUTHOR 4
+#define MSI_PID_KEYWORDS 5
+#define MSI_PID_COMMENTS 6
+#define MSI_PID_TEMPLATE 7
+#define MSI_PID_LASTAUTHOR 8
+#define MSI_PID_REVNUMBER 9
+#define MSI_PID_EDITTIME 10
+#define MSI_PID_LASTPRINTED 11
+#define MSI_PID_CREATE_DTM 12
+#define MSI_PID_LASTSAVE_DTM 13
+#define MSI_PID_PAGECOUNT 14
+#define MSI_PID_WORDCOUNT 15
+#define MSI_PID_CHARCOUNT 16
+#define MSI_PID_THUMBNAIL 17
+#define MSI_PID_APPNAME 18
+#define MSI_PID_SECURITY 19
+
+#define MSI_PID_MSIVERSION MSI_PID_PAGECOUNT
+#define MSI_PID_MSISOURCE MSI_PID_WORDCOUNT
+#define MSI_PID_MSIRESTRICT MSI_PID_CHARCOUNT
+
+
/* view manipulation */
UINT WINAPI MsiViewFetch(MSIHANDLE,MSIHANDLE*);
UINT WINAPI MsiViewExecute(MSIHANDLE,MSIHANDLE);
@@ -158,80 +185,12 @@ UINT WINAPI MsiDatabaseGetPrimaryKeysA(MSIHANDLE,LPCSTR,MSIHANDLE*);
UINT WINAPI MsiDatabaseGetPrimaryKeysW(MSIHANDLE,LPCWSTR,MSIHANDLE*);
#define MsiDatabaseGetPrimaryKeys WINELIB_NAME_AW(MsiDatabaseGetPrimaryKeys)
-/* installing */
-UINT WINAPI MsiDoActionA(MSIHANDLE,LPCSTR );
-UINT WINAPI MsiDoActionW(MSIHANDLE,LPCWSTR );
-#define MsiDoAction WINELIB_NAME_AW(MsiDoAction)
-
/* database transforms */
UINT WINAPI MsiDatabaseApplyTransformA(MSIHANDLE,LPCSTR,int);
UINT WINAPI MsiDatabaseApplyTransformW(MSIHANDLE,LPCWSTR,int);
#define MsiDatabaseApplyTransform WINELIB_NAME_AW(MsiDatabaseApplyTransform)
-UINT WINAPI MsiDatabaseGenerateTransformA(MSIHANDLE,MSIHANDLE,LPCSTR,int,int);
-UINT WINAPI MsiDatabaseGenerateTransformW(MSIHANDLE,MSIHANDLE,LPCWSTR,int,int);
-#define MsiDatabaseGenerateTransform WINELIB_NAME_AW(MsiDatabaseGenerateTransform)
-
-UINT WINAPI MsiDatabaseCommit(MSIHANDLE);
-
-/* install state */
-UINT WINAPI MsiGetFeatureStateA(MSIHANDLE,LPCSTR,INSTALLSTATE*,INSTALLSTATE*);
-UINT WINAPI MsiGetFeatureStateW(MSIHANDLE,LPCWSTR,INSTALLSTATE*,INSTALLSTATE*);
-#define MsiGetFeatureState WINELIB_NAME_AW(MsiGetFeatureState)
-UINT WINAPI MsiGetFeatureValidStatesA(MSIHANDLE,LPCSTR,LPDWORD);
-UINT WINAPI MsiGetFeatureValidStatesW(MSIHANDLE,LPCWSTR,LPDWORD);
-#define MsiGetFeatureValidStates WINELIB_NAME_AW(MsiGetFeatureValidStates)
-UINT WINAPI MsiSetComponentStateA(MSIHANDLE,LPCSTR,INSTALLSTATE);
-UINT WINAPI MsiSetComponentStateW(MSIHANDLE,LPCWSTR,INSTALLSTATE);
-#define MsiSetComponentState WINELIB_NAME_AW(MsiSetComponentState)
-UINT WINAPI MsiGetComponentStateA(MSIHANDLE,LPCSTR,INSTALLSTATE*,INSTALLSTATE*);
-UINT WINAPI MsiGetComponentStateW(MSIHANDLE,LPCWSTR,INSTALLSTATE*,INSTALLSTATE*);
-#define MsiGetComponentState WINELIB_NAME_AW(MsiGetComponentState)
-
-MSICONDITION WINAPI MsiEvaluateConditionA(MSIHANDLE,LPCSTR);
-MSICONDITION WINAPI MsiEvaluateConditionW(MSIHANDLE,LPCWSTR);
-#define MsiEvaluateCondition WINELIB_NAME_AW(MsiEvaluateCondition)
-
-/* property functions */
-UINT WINAPI MsiGetPropertyA(MSIHANDLE, LPCSTR, LPSTR, LPDWORD);
-UINT WINAPI MsiGetPropertyW(MSIHANDLE, LPCWSTR, LPWSTR, LPDWORD);
-#define MsiGetProperty WINELIB_NAME_AW(MsiGetProperty)
-
-UINT WINAPI MsiSetPropertyA(MSIHANDLE, LPCSTR, LPCSTR);
-UINT WINAPI MsiSetPropertyW(MSIHANDLE, LPCWSTR, LPCWSTR);
-#define MsiSetProperty WINELIB_NAME_AW(MsiSetProperty)
-
-UINT WINAPI MsiGetTargetPathA(MSIHANDLE,LPCSTR,LPSTR,LPDWORD);
-UINT WINAPI MsiGetTargetPathW(MSIHANDLE,LPCWSTR,LPWSTR,LPDWORD);
-#define MsiGetTargetPath WINELIB_NAME_AW(MsiGetTargetPath)
-
-UINT WINAPI MsiSetTargetPathA(MSIHANDLE, LPCSTR, LPCSTR);
-UINT WINAPI MsiSetTargetPathW(MSIHANDLE, LPCWSTR, LPCWSTR);
-#define MsiSetTargetPath WINELIB_NAME_AW(MsiSetTargetPath)
-
-UINT WINAPI MsiGetSourcePathA(MSIHANDLE,LPCSTR,LPSTR,LPDWORD);
-UINT WINAPI MsiGetSourcePathW(MSIHANDLE,LPCWSTR,LPWSTR,LPDWORD);
-#define MsiGetSourcePath WINELIB_NAME_AW(MsiGetSourcePath)
-
-MSIHANDLE WINAPI MsiGetActiveDatabase(MSIHANDLE);
UINT WINAPI MsiViewGetColumnInfo(MSIHANDLE, MSICOLINFO, MSIHANDLE*);
-INT WINAPI MsiProcessMessage(MSIHANDLE, INSTALLMESSAGE, MSIHANDLE);
-
-UINT WINAPI MsiSetFeatureAttributesA(MSIHANDLE, LPCSTR, DWORD);
-UINT WINAPI MsiSetFeatureAttributesW(MSIHANDLE, LPCWSTR, DWORD);
-#define MsiSetFeatureAttributes WINELIB_NAME_AW(MsiSetFeatureAttributes)
-
-UINT WINAPI MsiSetFeatureStateA(MSIHANDLE, LPCSTR, INSTALLSTATE);
-UINT WINAPI MsiSetFeatureStateW(MSIHANDLE, LPCWSTR, INSTALLSTATE);
-#define MsiSetFeatureState WINELIB_NAME_AW(MsiSetFeatureState)
-
-UINT WINAPI MsiPreviewDialogA(MSIHANDLE, LPCSTR);
-UINT WINAPI MsiPreviewDialogW(MSIHANDLE, LPCWSTR);
-#define MsiPreviewDialog WINELIB_NAME_AW(MsiPreviewDialog)
-
-UINT WINAPI MsiPreviewBillboardA(MSIHANDLE, LPCSTR, LPCSTR);
-UINT WINAPI MsiPreviewBillboardW(MSIHANDLE, LPCWSTR, LPCWSTR);
-#define MsiPreviewBillboard WINELIB_NAME_AW(MsiPreviewBillboard)
UINT WINAPI MsiCreateTransformSummaryInfoA(MSIHANDLE, MSIHANDLE, LPCSTR, int, int);
UINT WINAPI MsiCreateTransformSummaryInfoW(MSIHANDLE, MSIHANDLE, LPCWSTR, int, int);
@@ -265,10 +224,6 @@ MSICONDITION WINAPI MsiDatabaseIsTablePersistentA(MSIHANDLE, LPCSTR);
MSICONDITION WINAPI MsiDatabaseIsTablePersistentW(MSIHANDLE, LPCWSTR);
#define MsiDatabaseIsTablePersistent WINELIB_NAME_AW(MsiDatabaseIsTablePersistent)
-UINT WINAPI MsiSequenceA(MSIHANDLE, LPCSTR, INT);
-UINT WINAPI MsiSequenceW(MSIHANDLE, LPCWSTR, INT);
-#define MsiSequence WINELIB_NAME_AW(MsiSequence)
-
UINT WINAPI MsiSummaryInfoPersist(MSIHANDLE);
UINT WINAPI MsiSummaryInfoGetPropertyCount(MSIHANDLE,PUINT);
@@ -289,4 +244,4 @@ MSIHANDLE WINAPI MsiGetLastErrorRecord(void);
}
#endif
-#endif /* _MSIQUERY_H */
+#endif /* _LIBMSI_H */
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"
generated by cgit (git 2.34.1) at 2024-05-06 01:45:41 +0000