ok, things start to be readable

fix

1 files changed, 130 insertions, 130 deletions

diff --git a/include/libmsi.h b/include/libmsi.h
index b6bc739..ea82bef 100644
--- a/include/libmsi.h
+++ b/include/libmsi.h
@@ -22,93 +22,93 @@
 #include <stdint.h>
 #include <stdbool.h>
 
-struct tagMSIOBJECT;
-typedef struct tagMSIOBJECT MSIOBJECT;
+struct LibmsiObject;
+typedef struct LibmsiObject LibmsiObject;
 
-typedef enum tagMSICONDITION
+typedef enum LibmsiCondition
 {
-    MSICONDITION_FALSE = 0,
-    MSICONDITION_TRUE  = 1,
-    MSICONDITION_NONE  = 2,
-    MSICONDITION_ERROR = 3,
-} MSICONDITION;
+    LIBMSI_CONDITION_FALSE = 0,
+    LIBMSI_CONDITION_TRUE  = 1,
+    LIBMSI_CONDITION_NONE  = 2,
+    LIBMSI_CONDITION_ERROR = 3,
+} LibmsiCondition;
 
 #define MSI_NULL_INTEGER 0x80000000
 
-typedef enum tagMSICOLINFO
+typedef enum LibmsiColInfo
 {
-    MSICOLINFO_NAMES = 0,
-    MSICOLINFO_TYPES = 1
-} MSICOLINFO;
+    LIBMSI_COL_INFO_NAMES = 0,
+    LIBMSI_COL_INFO_TYPES = 1
+} LibmsiColInfo;
 
-typedef enum tagMSIMODIFY
+typedef enum LibmsiModify
 {
-    MSIMODIFY_SEEK = -1,
-    MSIMODIFY_REFRESH = 0,
-    MSIMODIFY_INSERT = 1,
-    MSIMODIFY_UPDATE = 2,
-    MSIMODIFY_ASSIGN = 3,
-    MSIMODIFY_REPLACE = 4,
-    MSIMODIFY_MERGE = 5,
-    MSIMODIFY_DELETE = 6,
-    MSIMODIFY_INSERT_TEMPORARY = 7,
-    MSIMODIFY_VALIDATE = 8,
-    MSIMODIFY_VALIDATE_NEW = 9,
-    MSIMODIFY_VALIDATE_FIELD = 10,
-    MSIMODIFY_VALIDATE_DELETE = 11
-} MSIMODIFY;
-
-#define MSIDBOPEN_READONLY (LPCTSTR)0
-#define MSIDBOPEN_TRANSACT (LPCTSTR)1
-#define MSIDBOPEN_DIRECT   (LPCTSTR)2
-#define MSIDBOPEN_CREATE   (LPCTSTR)3
-#define MSIDBOPEN_CREATEDIRECT (LPCTSTR)4
-
-#define MSIDBOPEN_PATCHFILE 32 / sizeof(*MSIDBOPEN_READONLY)
-
-typedef enum tagMSIDBERROR
+    LIBMSI_MODIFY_SEEK = -1,
+    LIBMSI_MODIFY_REFRESH = 0,
+    LIBMSI_MODIFY_INSERT = 1,
+    LIBMSI_MODIFY_UPDATE = 2,
+    LIBMSI_MODIFY_ASSIGN = 3,
+    LIBMSI_MODIFY_REPLACE = 4,
+    LIBMSI_MODIFY_MERGE = 5,
+    LIBMSI_MODIFY_DELETE = 6,
+    LIBMSI_MODIFY_INSERT_TEMPORARY = 7,
+    LIBMSI_MODIFY_VALIDATE = 8,
+    LIBMSI_MODIFY_VALIDATE_NEW = 9,
+    LIBMSI_MODIFY_VALIDATE_FIELD = 10,
+    LIBMSI_MODIFY_VALIDATE_DELETE = 11
+} LibmsiModify;
+
+#define LIBMSI_DB_OPEN_READONLY (LPCTSTR)0
+#define LIBMSI_DB_OPEN_TRANSACT (LPCTSTR)1
+#define LIBMSI_DB_OPEN_DIRECT   (LPCTSTR)2
+#define LIBMSI_DB_OPEN_CREATE   (LPCTSTR)3
+#define LIBMSI_DB_OPEN_CREATEDIRECT (LPCTSTR)4
+
+#define LIBMSI_DB_OPEN_PATCHFILE 32 / sizeof(*LIBMSI_DB_OPEN_READONLY)
+
+typedef enum LibmsiDBError
 {
-    MSIDBERROR_INVALIDARG = -3,
-    MSIDBERROR_MOREDATA = -2,
-    MSIDBERROR_FUNCTIONERROR = -1,
-    MSIDBERROR_NOERROR = 0,
-    MSIDBERROR_DUPLICATEKEY = 1,
-    MSIDBERROR_REQUIRED = 2,
-    MSIDBERROR_BADLINK = 3,
-    MSIDBERROR_OVERFLOW = 4,
-    MSIDBERROR_UNDERFLOW = 5,
-    MSIDBERROR_NOTINSET = 6,
-    MSIDBERROR_BADVERSION = 7,
-    MSIDBERROR_BADCASE = 8,
-    MSIDBERROR_BADGUID = 9,
-    MSIDBERROR_BADWILDCARD = 10,
-    MSIDBERROR_BADIDENTIFIER = 11,
-    MSIDBERROR_BADLANGUAGE = 12,
-    MSIDBERROR_BADFILENAME = 13,
-    MSIDBERROR_BADPATH = 14,
-    MSIDBERROR_BADCONDITION = 15,
-    MSIDBERROR_BADFORMATTED = 16,
-    MSIDBERROR_BADTEMPLATE = 17,
-    MSIDBERROR_BADDEFAULTDIR = 18,
-    MSIDBERROR_BADREGPATH = 19,
-    MSIDBERROR_BADCUSTOMSOURCE = 20,
-    MSIDBERROR_BADPROPERTY = 21,
-    MSIDBERROR_MISSINGDATA = 22,
-    MSIDBERROR_BADCATEGORY = 23,
-    MSIDBERROR_BADKEYTABLE = 24,
-    MSIDBERROR_BADMAXMINVALUES = 25,
-    MSIDBERROR_BADCABINET = 26,
-    MSIDBERROR_BADSHORTCUT= 27,
-    MSIDBERROR_STRINGOVERFLOW = 28,
-    MSIDBERROR_BADLOCALIZEATTRIB = 29
-} MSIDBERROR; 
-
-typedef enum tagMSIDBSTATE
+    LIBMSI_DB_ERROR_INVALIDARG = -3,
+    LIBMSI_DB_ERROR_MOREDATA = -2,
+    LIBMSI_DB_ERROR_FUNCTIONERROR = -1,
+    LIBMSI_DB_ERROR_NOERROR = 0,
+    LIBMSI_DB_ERROR_DUPLICATEKEY = 1,
+    LIBMSI_DB_ERROR_REQUIRED = 2,
+    LIBMSI_DB_ERROR_BADLINK = 3,
+    LIBMSI_DB_ERROR_OVERFLOW = 4,
+    LIBMSI_DB_ERROR_UNDERFLOW = 5,
+    LIBMSI_DB_ERROR_NOTINSET = 6,
+    LIBMSI_DB_ERROR_BADVERSION = 7,
+    LIBMSI_DB_ERROR_BADCASE = 8,
+    LIBMSI_DB_ERROR_BADGUID = 9,
+    LIBMSI_DB_ERROR_BADWILDCARD = 10,
+    LIBMSI_DB_ERROR_BADIDENTIFIER = 11,
+    LIBMSI_DB_ERROR_BADLANGUAGE = 12,
+    LIBMSI_DB_ERROR_BADFILENAME = 13,
+    LIBMSI_DB_ERROR_BADPATH = 14,
+    LIBMSI_DB_ERROR_BADCONDITION = 15,
+    LIBMSI_DB_ERROR_BADFORMATTED = 16,
+    LIBMSI_DB_ERROR_BADTEMPLATE = 17,
+    LIBMSI_DB_ERROR_BADDEFAULTDIR = 18,
+    LIBMSI_DB_ERROR_BADREGPATH = 19,
+    LIBMSI_DB_ERROR_BADCUSTOMSOURCE = 20,
+    LIBMSI_DB_ERROR_BADPROPERTY = 21,
+    LIBMSI_DB_ERROR_MISSINGDATA = 22,
+    LIBMSI_DB_ERROR_BADCATEGORY = 23,
+    LIBMSI_DB_ERROR_BADKEYTABLE = 24,
+    LIBMSI_DB_ERROR_BADMAXMINVALUES = 25,
+    LIBMSI_DB_ERROR_BADCABINET = 26,
+    LIBMSI_DB_ERROR_BADSHORTCUT= 27,
+    LIBMSI_DB_ERROR_STRINGOVERFLOW = 28,
+    LIBMSI_DB_ERROR_BADLOCALIZEATTRIB = 29
+} LibmsiDBError; 
+
+typedef enum LibmsiDBState
 {
-    MSIDBSTATE_ERROR = -1,
-    MSIDBSTATE_READ = 0,
-    MSIDBSTATE_WRITE = 1
-} MSIDBSTATE;
+    LIBMSI_DB_STATE_ERROR = -1,
+    LIBMSI_DB_STATE_READ = 0,
+    LIBMSI_DB_STATE_WRITE = 1
+} LibmsiDBState;
 
 
 #ifdef __cplusplus
@@ -151,97 +151,97 @@ extern "C" {
 
 
 /* view manipulation */
-unsigned MsiViewFetch(MSIOBJECT *,MSIOBJECT **);
-unsigned MsiViewExecute(MSIOBJECT *,MSIOBJECT *);
-unsigned MsiViewClose(MSIOBJECT *);
-unsigned MsiDatabaseOpenViewA(MSIOBJECT *,const char *,MSIOBJECT **);
-unsigned MsiDatabaseOpenViewW(MSIOBJECT *,const WCHAR *,MSIOBJECT **);
+unsigned MsiViewFetch(LibmsiObject *,LibmsiObject **);
+unsigned MsiViewExecute(LibmsiObject *,LibmsiObject *);
+unsigned MsiViewClose(LibmsiObject *);
+unsigned MsiDatabaseOpenViewA(LibmsiObject *,const char *,LibmsiObject **);
+unsigned MsiDatabaseOpenViewW(LibmsiObject *,const WCHAR *,LibmsiObject **);
 #define     MsiDatabaseOpenView WINELIB_NAME_AW(MsiDatabaseOpenView)
-MSIDBERROR MsiViewGetErrorA(MSIOBJECT *,char *,unsigned *);
-MSIDBERROR MsiViewGetErrorW(MSIOBJECT *,WCHAR *,unsigned *);
+LibmsiDBError MsiViewGetErrorA(LibmsiObject *,char *,unsigned *);
+LibmsiDBError MsiViewGetErrorW(LibmsiObject *,WCHAR *,unsigned *);
 #define     MsiViewGetError WINELIB_NAME_AW(MsiViewGetError)
 
-MSIDBSTATE MsiGetDatabaseState(MSIOBJECT *);
+LibmsiDBState MsiGetDatabaseState(LibmsiObject *);
 
 /* record manipulation */
-MSIOBJECT * MsiCreateRecord(unsigned);
-unsigned MsiRecordClearData(MSIOBJECT *);
-unsigned MsiRecordSetInteger(MSIOBJECT *,unsigned,int);
-unsigned MsiRecordSetStringA(MSIOBJECT *,unsigned,const char *);
-unsigned MsiRecordSetStringW(MSIOBJECT *,unsigned,const WCHAR *);
+LibmsiObject * MsiCreateRecord(unsigned);
+unsigned MsiRecordClearData(LibmsiObject *);
+unsigned MsiRecordSetInteger(LibmsiObject *,unsigned,int);
+unsigned MsiRecordSetStringA(LibmsiObject *,unsigned,const char *);
+unsigned MsiRecordSetStringW(LibmsiObject *,unsigned,const WCHAR *);
 #define     MsiRecordSetString WINELIB_NAME_AW(MsiRecordSetString)
-unsigned MsiRecordGetStringA(MSIOBJECT *,unsigned,char *,unsigned *);
-unsigned MsiRecordGetStringW(MSIOBJECT *,unsigned,WCHAR *,unsigned *);
+unsigned MsiRecordGetStringA(LibmsiObject *,unsigned,char *,unsigned *);
+unsigned MsiRecordGetStringW(LibmsiObject *,unsigned,WCHAR *,unsigned *);
 #define     MsiRecordGetString WINELIB_NAME_AW(MsiRecordGetString)
-unsigned MsiRecordGetFieldCount(MSIOBJECT *);
-int MsiRecordGetInteger(MSIOBJECT *,unsigned);
-unsigned MsiRecordDataSize(MSIOBJECT *,unsigned);
-bool MsiRecordIsNull(MSIOBJECT *,unsigned);
-unsigned MsiFormatRecordA(MSIOBJECT *,MSIOBJECT *,char *,unsigned *);
-unsigned MsiFormatRecordW(MSIOBJECT *,MSIOBJECT *,WCHAR *,unsigned *);
+unsigned MsiRecordGetFieldCount(LibmsiObject *);
+int MsiRecordGetInteger(LibmsiObject *,unsigned);
+unsigned MsiRecordDataSize(LibmsiObject *,unsigned);
+bool MsiRecordIsNull(LibmsiObject *,unsigned);
+unsigned MsiFormatRecordA(LibmsiObject *,LibmsiObject *,char *,unsigned *);
+unsigned MsiFormatRecordW(LibmsiObject *,LibmsiObject *,WCHAR *,unsigned *);
 #define     MsiFormatRecord WINELIB_NAME_AW(MsiFormatRecord)
-unsigned MsiRecordSetStreamA(MSIOBJECT *,unsigned,const char *);
-unsigned MsiRecordSetStreamW(MSIOBJECT *,unsigned,const WCHAR *);
+unsigned MsiRecordSetStreamA(LibmsiObject *,unsigned,const char *);
+unsigned MsiRecordSetStreamW(LibmsiObject *,unsigned,const WCHAR *);
 #define     MsiRecordSetStream WINELIB_NAME_AW(MsiRecordSetStream)
-unsigned MsiRecordReadStream(MSIOBJECT *,unsigned,char*,unsigned *);
+unsigned MsiRecordReadStream(LibmsiObject *,unsigned,char*,unsigned *);
 
-unsigned MsiDatabaseGetPrimaryKeysA(MSIOBJECT *,const char *,MSIOBJECT **);
-unsigned MsiDatabaseGetPrimaryKeysW(MSIOBJECT *,const WCHAR *,MSIOBJECT **);
+unsigned MsiDatabaseGetPrimaryKeysA(LibmsiObject *,const char *,LibmsiObject **);
+unsigned MsiDatabaseGetPrimaryKeysW(LibmsiObject *,const WCHAR *,LibmsiObject **);
 #define     MsiDatabaseGetPrimaryKeys WINELIB_NAME_AW(MsiDatabaseGetPrimaryKeys)
 
 /* database transforms */
-unsigned MsiDatabaseApplyTransformA(MSIOBJECT *,const char *,int);
-unsigned MsiDatabaseApplyTransformW(MSIOBJECT *,const WCHAR *,int);
+unsigned MsiDatabaseApplyTransformA(LibmsiObject *,const char *,int);
+unsigned MsiDatabaseApplyTransformW(LibmsiObject *,const WCHAR *,int);
 #define     MsiDatabaseApplyTransform WINELIB_NAME_AW(MsiDatabaseApplyTransform)
 
-unsigned MsiViewGetColumnInfo(MSIOBJECT *, MSICOLINFO, MSIOBJECT **);
+unsigned MsiViewGetColumnInfo(LibmsiObject *, LibmsiColInfo, LibmsiObject **);
 
-unsigned MsiCreateTransformSummaryInfoA(MSIOBJECT *, MSIOBJECT *, const char *, int, int);
-unsigned MsiCreateTransformSummaryInfoW(MSIOBJECT *, MSIOBJECT *, const WCHAR *, int, int);
+unsigned MsiCreateTransformSummaryInfoA(LibmsiObject *, LibmsiObject *, const char *, int, int);
+unsigned MsiCreateTransformSummaryInfoW(LibmsiObject *, LibmsiObject *, const WCHAR *, int, int);
 #define     MsiCreateTransformSummaryInfo WINELIB_NAME_AW(MsiCreateTransformSummaryInfo)
 
-unsigned MsiGetSummaryInformationA(MSIOBJECT *, const char *, unsigned, MSIOBJECT **);
-unsigned MsiGetSummaryInformationW(MSIOBJECT *, const WCHAR *, unsigned, MSIOBJECT **);
+unsigned MsiGetSummaryInformationA(LibmsiObject *, const char *, unsigned, LibmsiObject **);
+unsigned MsiGetSummaryInformationW(LibmsiObject *, const WCHAR *, unsigned, LibmsiObject **);
 #define     MsiGetSummaryInformation WINELIB_NAME_AW(MsiGetSummaryInformation)
 
-unsigned MsiSummaryInfoGetPropertyA(MSIOBJECT *,unsigned,unsigned *,int *,FILETIME*,char *,unsigned *);
-unsigned MsiSummaryInfoGetPropertyW(MSIOBJECT *,unsigned,unsigned *,int *,FILETIME*,WCHAR *,unsigned *);
+unsigned MsiSummaryInfoGetPropertyA(LibmsiObject *,unsigned,unsigned *,int *,FILETIME*,char *,unsigned *);
+unsigned MsiSummaryInfoGetPropertyW(LibmsiObject *,unsigned,unsigned *,int *,FILETIME*,WCHAR *,unsigned *);
 #define     MsiSummaryInfoGetProperty WINELIB_NAME_AW(MsiSummaryInfoGetProperty)
 
-unsigned MsiSummaryInfoSetPropertyA(MSIOBJECT *, unsigned, unsigned, int, FILETIME*, const char *);
-unsigned MsiSummaryInfoSetPropertyW(MSIOBJECT *, unsigned, unsigned, int, FILETIME*, const WCHAR *);
+unsigned MsiSummaryInfoSetPropertyA(LibmsiObject *, unsigned, unsigned, int, FILETIME*, const char *);
+unsigned MsiSummaryInfoSetPropertyW(LibmsiObject *, unsigned, unsigned, int, FILETIME*, const WCHAR *);
 #define     MsiSummaryInfoSetProperty WINELIB_NAME_AW(MsiSummaryInfoSetProperty)
 
-unsigned MsiDatabaseExportA(MSIOBJECT *, const char *, const char *, const char *);
-unsigned MsiDatabaseExportW(MSIOBJECT *, const WCHAR *, const WCHAR *, const WCHAR *);
+unsigned MsiDatabaseExportA(LibmsiObject *, const char *, const char *, const char *);
+unsigned MsiDatabaseExportW(LibmsiObject *, const WCHAR *, const WCHAR *, const WCHAR *);
 #define     MsiDatabaseExport WINELIB_NAME_AW(MsiDatabaseExport)
 
-unsigned MsiDatabaseImportA(MSIOBJECT *, const char *, const char *);
-unsigned MsiDatabaseImportW(MSIOBJECT *, const WCHAR *, const WCHAR *);
+unsigned MsiDatabaseImportA(LibmsiObject *, const char *, const char *);
+unsigned MsiDatabaseImportW(LibmsiObject *, const WCHAR *, const WCHAR *);
 #define     MsiDatabaseImport WINELIB_NAME_AW(MsiDatabaseImport)
 
-unsigned MsiOpenDatabaseW(const WCHAR *, const WCHAR *, MSIOBJECT **);
-unsigned MsiOpenDatabaseA(const char *, const char *, MSIOBJECT **);
+unsigned MsiOpenDatabaseW(const WCHAR *, const WCHAR *, LibmsiObject **);
+unsigned MsiOpenDatabaseA(const char *, const char *, LibmsiObject **);
 #define     MsiOpenDatabase WINELIB_NAME_AW(MsiOpenDatabase)
 
-MSICONDITION MsiDatabaseIsTablePersistentA(MSIOBJECT *, const char *);
-MSICONDITION MsiDatabaseIsTablePersistentW(MSIOBJECT *, const WCHAR *);
+LibmsiCondition MsiDatabaseIsTablePersistentA(LibmsiObject *, const char *);
+LibmsiCondition MsiDatabaseIsTablePersistentW(LibmsiObject *, const WCHAR *);
 #define     MsiDatabaseIsTablePersistent WINELIB_NAME_AW(MsiDatabaseIsTablePersistent)
 
-unsigned MsiSummaryInfoPersist(MSIOBJECT *);
-unsigned MsiSummaryInfoGetPropertyCount(MSIOBJECT *,unsigned *);
+unsigned MsiSummaryInfoPersist(LibmsiObject *);
+unsigned MsiSummaryInfoGetPropertyCount(LibmsiObject *,unsigned *);
 
-unsigned MsiViewModify(MSIOBJECT *, MSIMODIFY, MSIOBJECT *);
+unsigned MsiViewModify(LibmsiObject *, LibmsiModify, LibmsiObject *);
 
-unsigned MsiDatabaseMergeA(MSIOBJECT *, MSIOBJECT *, const char *);
-unsigned MsiDatabaseMergeW(MSIOBJECT *, MSIOBJECT *, const WCHAR *);
+unsigned MsiDatabaseMergeA(LibmsiObject *, LibmsiObject *, const char *);
+unsigned MsiDatabaseMergeW(LibmsiObject *, LibmsiObject *, const WCHAR *);
 #define     MsiDatabaseMerge WINELIB_NAME_AW(MsiDatabaseMerge)
 
 /* Non Unicode */
-unsigned MsiDatabaseCommit(MSIOBJECT *);
-unsigned MsiCloseHandle(MSIOBJECT *);
+unsigned MsiDatabaseCommit(LibmsiObject *);
+unsigned MsiCloseHandle(LibmsiObject *);
 
-MSIOBJECT * MsiGetLastErrorRecord(void);
+LibmsiObject * MsiGetLastErrorRecord(void);
 
 #ifdef __cplusplus
 }