make MSIOBJECT arguments explicitly pointers

6 files changed, 63 insertions, 65 deletions

diff --git a/libmsi/database.c b/libmsi/database.c
index eaf86e4..72bceaf 100644
--- a/libmsi/database.c
+++ b/libmsi/database.c
@@ -450,7 +450,7 @@ end:
     return ret;
 }
 
-UINT WINAPI MsiOpenDatabaseW(const WCHAR *szDBPath, const WCHAR *szPersist, PMSIOBJECT *phDB)
+UINT WINAPI MsiOpenDatabaseW(const WCHAR *szDBPath, const WCHAR *szPersist, MSIOBJECT **phDB)
 {
     MSIDATABASE *db;
     UINT ret;
@@ -466,7 +466,7 @@ UINT WINAPI MsiOpenDatabaseW(const WCHAR *szDBPath, const WCHAR *szPersist, PMSI
     return ret;
 }
 
-UINT WINAPI MsiOpenDatabaseA(const CHAR *szDBPath, const CHAR *szPersist, PMSIOBJECT *phDB)
+UINT WINAPI MsiOpenDatabaseA(const CHAR *szDBPath, const CHAR *szPersist, MSIOBJECT **phDB)
 {
     HRESULT r = ERROR_FUNCTION_FAILED;
     WCHAR *szwDBPath = NULL;
@@ -1026,7 +1026,7 @@ done:
     return r;
 }
 
-UINT WINAPI MsiDatabaseImportW(PMSIOBJECT handle, const WCHAR *szFolder, const WCHAR *szFilename)
+UINT WINAPI MsiDatabaseImportW(MSIOBJECT *handle, const WCHAR *szFolder, const WCHAR *szFilename)
 {
     MSIDATABASE *db;
     UINT r;
@@ -1041,7 +1041,7 @@ UINT WINAPI MsiDatabaseImportW(PMSIOBJECT handle, const WCHAR *szFolder, const W
     return r;
 }
 
-UINT WINAPI MsiDatabaseImportA( PMSIOBJECT handle,
+UINT WINAPI MsiDatabaseImportA( MSIOBJECT *handle,
                const CHAR *szFolder, const CHAR *szFilename )
 {
     WCHAR *path = NULL;
@@ -1234,7 +1234,7 @@ done:
  *
  * row4 : data <tab> data <tab> data <tab> ... data <cr> <lf>
  */
-UINT WINAPI MsiDatabaseExportW( PMSIOBJECT handle, const WCHAR *szTable,
+UINT WINAPI MsiDatabaseExportW( MSIOBJECT *handle, const WCHAR *szTable,
                const WCHAR *szFolder, const WCHAR *szFilename )
 {
     MSIDATABASE *db;
@@ -1251,7 +1251,7 @@ UINT WINAPI MsiDatabaseExportW( PMSIOBJECT handle, const WCHAR *szTable,
     return r;
 }
 
-UINT WINAPI MsiDatabaseExportA( PMSIOBJECT handle, const CHAR *szTable,
+UINT WINAPI MsiDatabaseExportA( MSIOBJECT *handle, const CHAR *szTable,
                const CHAR *szFolder, const CHAR *szFilename )
 {
     WCHAR *path = NULL;
@@ -1293,7 +1293,7 @@ end:
     return r;
 }
 
-UINT WINAPI MsiDatabaseMergeA(PMSIOBJECT hDatabase, PMSIOBJECT hDatabaseMerge,
+UINT WINAPI MsiDatabaseMergeA(MSIOBJECT *hDatabase, MSIOBJECT *hDatabaseMerge,
                               const CHAR *szTableName)
 {
     UINT r;
@@ -1962,7 +1962,7 @@ static UINT update_merge_errors(MSIDATABASE *db, const WCHAR *error,
     return r;
 }
 
-UINT WINAPI MsiDatabaseMergeW(PMSIOBJECT hDatabase, PMSIOBJECT hDatabaseMerge,
+UINT WINAPI MsiDatabaseMergeW(MSIOBJECT *hDatabase, MSIOBJECT *hDatabaseMerge,
                               const WCHAR *szTableName)
 {
     struct list tabledata = LIST_INIT(tabledata);
@@ -2026,7 +2026,7 @@ done:
     return r;
 }
 
-MSIDBSTATE WINAPI MsiGetDatabaseState( PMSIOBJECT handle )
+MSIDBSTATE WINAPI MsiGetDatabaseState( MSIOBJECT *handle )
 {
     MSIDBSTATE ret = MSIDBSTATE_READ;
     MSIDATABASE *db;
diff --git a/libmsi/handle.c b/libmsi/handle.c
index bf1fb98..0da7fad 100644
--- a/libmsi/handle.c
+++ b/libmsi/handle.c
@@ -41,7 +41,7 @@ static CRITICAL_SECTION_DEBUG MSI_object_cs_debug =
 };
 static CRITICAL_SECTION MSI_object_cs = { &MSI_object_cs_debug, -1, 0, 0, 0, 0 };
 
-void *msihandle2msiinfo(PMSIOBJECT obj, UINT type)
+void *msihandle2msiinfo(MSIOBJECT *obj, UINT type)
 {
     if( !obj )
         return NULL;
@@ -107,7 +107,7 @@ int msiobj_release( MSIOBJECT *obj )
 /***********************************************************
  *   MsiCloseHandle   [MSI.@]
  */
-UINT WINAPI MsiCloseHandle(PMSIOBJECT obj)
+UINT WINAPI MsiCloseHandle(MSIOBJECT *obj)
 {
     TRACE("%x\n",obj);
 
diff --git a/libmsi/msipriv.h b/libmsi/msipriv.h
index 1a39fc4..9c696cf 100644
--- a/libmsi/msipriv.h
+++ b/libmsi/msipriv.h
@@ -280,8 +280,6 @@ typedef struct tagMSISUMMARYINFO
 #define MSIOBJECTTYPE_PACKAGE 5
 #define MSIOBJECTTYPE_PREVIEW 6
 
-#define PMSIOBJECT_MAGIC 0x4d434923
-
 /* handle unicode/ascii output in the Msi* API functions */
 typedef struct {
     BOOL unicode;
@@ -302,9 +300,9 @@ typedef struct {
 UINT msi_strcpy_to_awstring( const WCHAR *str, awstring *awbuf, DWORD *sz );
 
 /* handle functions */
-extern void *msihandle2msiinfo(PMSIOBJECT handle, UINT type);
-extern PMSIOBJECT alloc_msihandle( MSIOBJECT * );
-extern PMSIOBJECT alloc_msi_remote_handle( IUnknown *unk );
+extern void *msihandle2msiinfo(MSIOBJECT *handle, UINT type);
+extern MSIOBJECT *alloc_msihandle( MSIOBJECT * );
+extern MSIOBJECT *alloc_msi_remote_handle( IUnknown *unk );
 extern void *alloc_msiobject(UINT type, UINT size, msihandledestructor destroy );
 extern void msiobj_addref(MSIOBJECT *);
 extern int msiobj_release(MSIOBJECT *);
diff --git a/libmsi/msiquery.c b/libmsi/msiquery.c
index d293a69..c7504f5 100644
--- a/libmsi/msiquery.c
+++ b/libmsi/msiquery.c
@@ -84,8 +84,8 @@ UINT VIEW_find_column( MSIVIEW *table, const WCHAR *name, const WCHAR *table_nam
     return ERROR_INVALID_PARAMETER;
 }
 
-UINT WINAPI MsiDatabaseOpenViewA(PMSIOBJECT hdb,
-              const CHAR *szQuery, PMSIOBJECT *phView)
+UINT WINAPI MsiDatabaseOpenViewA(MSIOBJECT *hdb,
+              const CHAR *szQuery, MSIOBJECT **phView)
 {
     UINT r;
     WCHAR *szwQuery;
@@ -237,8 +237,8 @@ MSIRECORD *MSI_QueryGetRecord( MSIDATABASE *db, const WCHAR *fmt, ... )
     return rec;
 }
 
-UINT WINAPI MsiDatabaseOpenViewW(PMSIOBJECT hdb,
-              const WCHAR *szQuery, PMSIOBJECT *phView)
+UINT WINAPI MsiDatabaseOpenViewW(MSIOBJECT *hdb,
+              const WCHAR *szQuery, MSIOBJECT **phView)
 {
     MSIDATABASE *db;
     MSIQUERY *query = NULL;
@@ -357,7 +357,7 @@ UINT MSI_ViewFetch(MSIQUERY *query, MSIRECORD **prec)
     return r;
 }
 
-UINT WINAPI MsiViewFetch(PMSIOBJECT hView, PMSIOBJECT *record)
+UINT WINAPI MsiViewFetch(MSIOBJECT *hView, MSIOBJECT **record)
 {
     MSIQUERY *query;
     MSIRECORD *rec = NULL;
@@ -394,7 +394,7 @@ UINT MSI_ViewClose(MSIQUERY *query)
     return view->ops->close( view );
 }
 
-UINT WINAPI MsiViewClose(PMSIOBJECT hView)
+UINT WINAPI MsiViewClose(MSIOBJECT *hView)
 {
     MSIQUERY *query;
     UINT ret;
@@ -426,7 +426,7 @@ UINT MSI_ViewExecute(MSIQUERY *query, MSIRECORD *rec )
     return view->ops->execute( view, rec );
 }
 
-UINT WINAPI MsiViewExecute(PMSIOBJECT hView, PMSIOBJECT hRec)
+UINT WINAPI MsiViewExecute(MSIOBJECT *hView, MSIOBJECT *hRec)
 {
     MSIQUERY *query;
     MSIRECORD *rec = NULL;
@@ -536,7 +536,7 @@ UINT MSI_ViewGetColumnInfo( MSIQUERY *query, MSICOLINFO info, MSIRECORD **prec )
     return ERROR_SUCCESS;
 }
 
-UINT WINAPI MsiViewGetColumnInfo(PMSIOBJECT hView, MSICOLINFO info, PMSIOBJECT *hRec)
+UINT WINAPI MsiViewGetColumnInfo(MSIOBJECT *hView, MSICOLINFO info, MSIOBJECT **hRec)
 {
     MSIQUERY *query = NULL;
     MSIRECORD *rec = NULL;
@@ -585,8 +585,8 @@ UINT MSI_ViewModify( MSIQUERY *query, MSIMODIFY mode, MSIRECORD *rec )
     return r;
 }
 
-UINT WINAPI MsiViewModify( PMSIOBJECT hView, MSIMODIFY eModifyMode,
-                PMSIOBJECT hRecord)
+UINT WINAPI MsiViewModify( MSIOBJECT *hView, MSIMODIFY eModifyMode,
+                MSIOBJECT *hRecord)
 {
     MSIQUERY *query = NULL;
     MSIRECORD *rec = NULL;
@@ -608,7 +608,7 @@ UINT WINAPI MsiViewModify( PMSIOBJECT hView, MSIMODIFY eModifyMode,
     return r;
 }
 
-MSIDBERROR WINAPI MsiViewGetErrorW( PMSIOBJECT handle, WCHAR *buffer, DWORD *buflen )
+MSIDBERROR WINAPI MsiViewGetErrorW( MSIOBJECT *handle, WCHAR *buffer, DWORD *buflen )
 {
     MSIQUERY *query;
     const WCHAR *column;
@@ -640,7 +640,7 @@ MSIDBERROR WINAPI MsiViewGetErrorW( PMSIOBJECT handle, WCHAR *buffer, DWORD *buf
     return r;
 }
 
-MSIDBERROR WINAPI MsiViewGetErrorA( PMSIOBJECT handle, CHAR *buffer, DWORD *buflen )
+MSIDBERROR WINAPI MsiViewGetErrorA( MSIOBJECT *handle, CHAR *buffer, DWORD *buflen )
 {
     MSIQUERY *query;
     const WCHAR *column;
@@ -672,7 +672,7 @@ MSIDBERROR WINAPI MsiViewGetErrorA( PMSIOBJECT handle, CHAR *buffer, DWORD *bufl
     return r;
 }
 
-PMSIOBJECT WINAPI MsiGetLastErrorRecord( void )
+MSIOBJECT *WINAPI MsiGetLastErrorRecord( void )
 {
     FIXME("\n");
     return 0;
@@ -714,7 +714,7 @@ end:
     return ret;
 }
 
-UINT WINAPI MsiDatabaseApplyTransformW( PMSIOBJECT hdb,
+UINT WINAPI MsiDatabaseApplyTransformW( MSIOBJECT *hdb,
                  const WCHAR *szTransformFile, int iErrorCond)
 {
     MSIDATABASE *db;
@@ -728,7 +728,7 @@ UINT WINAPI MsiDatabaseApplyTransformW( PMSIOBJECT hdb,
     return r;
 }
 
-UINT WINAPI MsiDatabaseApplyTransformA( PMSIOBJECT hdb, 
+UINT WINAPI MsiDatabaseApplyTransformA( MSIOBJECT *hdb, 
                  const CHAR *szTransformFile, int iErrorCond)
 {
     WCHAR *wstr;
@@ -747,7 +747,7 @@ UINT WINAPI MsiDatabaseApplyTransformA( PMSIOBJECT hdb,
     return ret;
 }
 
-UINT WINAPI MsiDatabaseCommit( PMSIOBJECT hdb )
+UINT WINAPI MsiDatabaseCommit( MSIOBJECT *hdb )
 {
     MSIDATABASE *db;
     UINT r;
@@ -856,8 +856,8 @@ UINT MSI_DatabaseGetPrimaryKeys( MSIDATABASE *db,
     return r;
 }
 
-UINT WINAPI MsiDatabaseGetPrimaryKeysW( PMSIOBJECT hdb,
-                    const WCHAR *table, PMSIOBJECT* phRec )
+UINT WINAPI MsiDatabaseGetPrimaryKeysW( MSIOBJECT *hdb,
+                    const WCHAR *table, MSIOBJECT **phRec )
 {
     MSIRECORD *rec = NULL;
     MSIDATABASE *db;
@@ -877,8 +877,8 @@ UINT WINAPI MsiDatabaseGetPrimaryKeysW( PMSIOBJECT hdb,
     return r;
 }
 
-UINT WINAPI MsiDatabaseGetPrimaryKeysA(PMSIOBJECT hdb, 
-                    const CHAR *table, PMSIOBJECT* phRec)
+UINT WINAPI MsiDatabaseGetPrimaryKeysA(MSIOBJECT *hdb, 
+                    const CHAR *table, MSIOBJECT **phRec)
 {
     WCHAR *szwTable = NULL;
     UINT r;
@@ -898,7 +898,7 @@ UINT WINAPI MsiDatabaseGetPrimaryKeysA(PMSIOBJECT hdb,
 }
 
 MSICONDITION WINAPI MsiDatabaseIsTablePersistentA(
-              PMSIOBJECT hDatabase, const CHAR *szTableName)
+              MSIOBJECT *hDatabase, const CHAR *szTableName)
 {
     WCHAR *szwTableName = NULL;
     MSICONDITION r;
@@ -918,7 +918,7 @@ MSICONDITION WINAPI MsiDatabaseIsTablePersistentA(
 }
 
 MSICONDITION WINAPI MsiDatabaseIsTablePersistentW(
-              PMSIOBJECT hDatabase, const WCHAR *szTableName)
+              MSIOBJECT *hDatabase, const WCHAR *szTableName)
 {
     MSIDATABASE *db;
     MSICONDITION r;
diff --git a/libmsi/record.c b/libmsi/record.c
index 17672be..39add5c 100644
--- a/libmsi/record.c
+++ b/libmsi/record.c
@@ -89,7 +89,7 @@ MSIRECORD *MSI_CreateRecord( UINT cParams )
     return rec;
 }
 
-PMSIOBJECT WINAPI MsiCreateRecord( UINT cParams )
+MSIOBJECT *WINAPI MsiCreateRecord( UINT cParams )
 {
     MSIRECORD *rec;
 
@@ -104,7 +104,7 @@ UINT MSI_RecordGetFieldCount( const MSIRECORD *rec )
     return rec->count;
 }
 
-UINT WINAPI MsiRecordGetFieldCount( PMSIOBJECT handle )
+UINT WINAPI MsiRecordGetFieldCount( MSIOBJECT *handle )
 {
     MSIRECORD *rec;
     UINT ret;
@@ -248,7 +248,7 @@ int MSI_RecordGetInteger( MSIRECORD *rec, UINT iField)
     return MSI_NULL_INTEGER;
 }
 
-int WINAPI MsiRecordGetInteger( PMSIOBJECT handle, UINT iField)
+int WINAPI MsiRecordGetInteger( MSIOBJECT *handle, UINT iField)
 {
     MSIRECORD *rec;
     UINT ret;
@@ -267,7 +267,7 @@ int WINAPI MsiRecordGetInteger( PMSIOBJECT handle, UINT iField)
     return ret;
 }
 
-UINT WINAPI MsiRecordClearData( PMSIOBJECT handle )
+UINT WINAPI MsiRecordClearData( MSIOBJECT *handle )
 {
     MSIRECORD *rec;
     UINT i;
@@ -319,7 +319,7 @@ UINT MSI_RecordSetInteger( MSIRECORD *rec, UINT iField, int iVal )
     return ERROR_SUCCESS;
 }
 
-UINT WINAPI MsiRecordSetInteger( PMSIOBJECT handle, UINT iField, int iVal )
+UINT WINAPI MsiRecordSetInteger( MSIOBJECT *handle, UINT iField, int iVal )
 {
     MSIRECORD *rec;
     UINT ret;
@@ -349,7 +349,7 @@ BOOL MSI_RecordIsNull( MSIRECORD *rec, UINT iField )
     return r;
 }
 
-BOOL WINAPI MsiRecordIsNull( PMSIOBJECT handle, UINT iField )
+BOOL WINAPI MsiRecordIsNull( MSIOBJECT *handle, UINT iField )
 {
     MSIRECORD *rec;
     UINT ret;
@@ -420,7 +420,7 @@ UINT MSI_RecordGetStringA(MSIRECORD *rec, UINT iField,
     return ret;
 }
 
-UINT WINAPI MsiRecordGetStringA(PMSIOBJECT handle, UINT iField,
+UINT WINAPI MsiRecordGetStringA(MSIOBJECT *handle, UINT iField,
                CHAR *szValue, DWORD *pcchValue)
 {
     MSIRECORD *rec;
@@ -496,7 +496,7 @@ UINT MSI_RecordGetStringW(MSIRECORD *rec, UINT iField,
     return ret;
 }
 
-UINT WINAPI MsiRecordGetStringW(PMSIOBJECT handle, UINT iField,
+UINT WINAPI MsiRecordGetStringW(MSIOBJECT *handle, UINT iField,
                WCHAR *szValue, DWORD *pcchValue)
 {
     MSIRECORD *rec;
@@ -547,7 +547,7 @@ static UINT MSI_RecordDataSize(MSIRECORD *rec, UINT iField)
     return 0;
 }
 
-UINT WINAPI MsiRecordDataSize(PMSIOBJECT handle, UINT iField)
+UINT WINAPI MsiRecordDataSize(MSIOBJECT *handle, UINT iField)
 {
     MSIRECORD *rec;
     UINT ret;
@@ -589,7 +589,7 @@ static UINT MSI_RecordSetStringA( MSIRECORD *rec, UINT iField, const CHAR *szVal
     return 0;
 }
 
-UINT WINAPI MsiRecordSetStringA( PMSIOBJECT handle, UINT iField, const CHAR *szValue )
+UINT WINAPI MsiRecordSetStringA( MSIOBJECT *handle, UINT iField, const CHAR *szValue )
 {
     MSIRECORD *rec;
     UINT ret;
@@ -632,7 +632,7 @@ UINT MSI_RecordSetStringW( MSIRECORD *rec, UINT iField, const WCHAR *szValue )
     return 0;
 }
 
-UINT WINAPI MsiRecordSetStringW( PMSIOBJECT handle, UINT iField, const WCHAR *szValue )
+UINT WINAPI MsiRecordSetStringW( MSIOBJECT *handle, UINT iField, const WCHAR *szValue )
 {
     MSIRECORD *rec;
     UINT ret;
@@ -752,7 +752,7 @@ UINT MSI_RecordSetStreamFromFileW(MSIRECORD *rec, UINT iField, const WCHAR *szFi
     return ERROR_SUCCESS;
 }
 
-UINT WINAPI MsiRecordSetStreamA(PMSIOBJECT hRecord, UINT iField, const CHAR *szFilename)
+UINT WINAPI MsiRecordSetStreamA(MSIOBJECT *hRecord, UINT iField, const CHAR *szFilename)
 {
     WCHAR *wstr = NULL;
     UINT ret;
@@ -771,7 +771,7 @@ UINT WINAPI MsiRecordSetStreamA(PMSIOBJECT hRecord, UINT iField, const CHAR *szF
     return ret;
 }
 
-UINT WINAPI MsiRecordSetStreamW(PMSIOBJECT handle, UINT iField, const WCHAR *szFilename)
+UINT WINAPI MsiRecordSetStreamW(MSIOBJECT *handle, UINT iField, const WCHAR *szFilename)
 {
     MSIRECORD *rec;
     UINT ret;
@@ -847,7 +847,7 @@ UINT MSI_RecordReadStream(MSIRECORD *rec, UINT iField, char *buf, DWORD *sz)
     return ERROR_SUCCESS;
 }
 
-UINT WINAPI MsiRecordReadStream(PMSIOBJECT handle, UINT iField, char *buf, DWORD *sz)
+UINT WINAPI MsiRecordReadStream(MSIOBJECT *handle, UINT iField, char *buf, DWORD *sz)
 {
     MSIRECORD *rec;
     UINT ret;
diff --git a/libmsi/suminfo.c b/libmsi/suminfo.c
index d7e96a3..f1212a1 100644
--- a/libmsi/suminfo.c
+++ b/libmsi/suminfo.c
@@ -456,8 +456,8 @@ MSISUMMARYINFO *MSI_GetSummaryInformationW( IStorage *stg, UINT uiUpdateCount )
     return si;
 }
 
-UINT WINAPI MsiGetSummaryInformationW( PMSIOBJECT hDatabase, 
-              const WCHAR *szDatabase, UINT uiUpdateCount, PMSIOBJECT *pHandle )
+UINT WINAPI MsiGetSummaryInformationW( MSIOBJECT *hDatabase, 
+              const WCHAR *szDatabase, UINT uiUpdateCount, MSIOBJECT **pHandle )
 {
     MSISUMMARYINFO *si;
     MSIDATABASE *db;
@@ -495,8 +495,8 @@ UINT WINAPI MsiGetSummaryInformationW( PMSIOBJECT hDatabase,
     return ret;
 }
 
-UINT WINAPI MsiGetSummaryInformationA(PMSIOBJECT hDatabase, 
-              const CHAR *szDatabase, UINT uiUpdateCount, PMSIOBJECT *pHandle)
+UINT WINAPI MsiGetSummaryInformationA(MSIOBJECT *hDatabase, 
+              const CHAR *szDatabase, UINT uiUpdateCount, MSIOBJECT **pHandle)
 {
     WCHAR *szwDatabase = NULL;
     UINT ret;
@@ -518,7 +518,7 @@ UINT WINAPI MsiGetSummaryInformationA(PMSIOBJECT hDatabase,
     return ret;
 }
 
-UINT WINAPI MsiSummaryInfoGetPropertyCount(PMSIOBJECT hSummaryInfo, UINT *pCount)
+UINT WINAPI MsiSummaryInfoGetPropertyCount(MSIOBJECT *hSummaryInfo, UINT *pCount)
 {
     MSISUMMARYINFO *si;
 
@@ -535,7 +535,7 @@ UINT WINAPI MsiSummaryInfoGetPropertyCount(PMSIOBJECT hSummaryInfo, UINT *pCount
     return ERROR_SUCCESS;
 }
 
-static UINT get_prop( PMSIOBJECT handle, UINT uiProperty, UINT *puiDataType,
+static UINT get_prop( MSIOBJECT *handle, UINT uiProperty, UINT *puiDataType,
           INT *piValue, FILETIME *pftValue, awstring *str, DWORD *pcchValueBuf)
 {
     MSISUMMARYINFO *si;
@@ -646,7 +646,7 @@ WCHAR *msi_get_suminfo_product( IStorage *stg )
 }
 
 UINT WINAPI MsiSummaryInfoGetPropertyA(
-      PMSIOBJECT handle, UINT uiProperty, UINT *puiDataType, INT *piValue,
+      MSIOBJECT *handle, UINT uiProperty, UINT *puiDataType, INT *piValue,
       FILETIME *pftValue, CHAR *szValueBuf, DWORD *pcchValueBuf)
 {
     awstring str;
@@ -662,7 +662,7 @@ UINT WINAPI MsiSummaryInfoGetPropertyA(
 }
 
 UINT WINAPI MsiSummaryInfoGetPropertyW(
-      PMSIOBJECT handle, UINT uiProperty, UINT *puiDataType, INT *piValue,
+      MSIOBJECT *handle, UINT uiProperty, UINT *puiDataType, INT *piValue,
       FILETIME *pftValue, WCHAR *szValueBuf, DWORD *pcchValueBuf)
 {
     awstring str;
@@ -732,7 +732,7 @@ static UINT set_prop( MSISUMMARYINFO *si, UINT uiProperty, UINT type,
     return ERROR_SUCCESS;
 }
 
-UINT WINAPI MsiSummaryInfoSetPropertyW( PMSIOBJECT handle, UINT uiProperty,
+UINT WINAPI MsiSummaryInfoSetPropertyW( MSIOBJECT *handle, UINT uiProperty,
                UINT uiDataType, INT iValue, FILETIME* pftValue, const WCHAR *szValue )
 {
     awcstring str;
@@ -764,7 +764,7 @@ UINT WINAPI MsiSummaryInfoSetPropertyW( PMSIOBJECT handle, UINT uiProperty,
     return ret;
 }
 
-UINT WINAPI MsiSummaryInfoSetPropertyA( PMSIOBJECT handle, UINT uiProperty,
+UINT WINAPI MsiSummaryInfoSetPropertyA( MSIOBJECT *handle, UINT uiProperty,
                UINT uiDataType, INT iValue, FILETIME* pftValue, const CHAR *szValue )
 {
     awcstring str;
@@ -934,7 +934,7 @@ end:
     return r;
 }
 
-UINT WINAPI MsiSummaryInfoPersist( PMSIOBJECT handle )
+UINT WINAPI MsiSummaryInfoPersist( MSIOBJECT *handle )
 {
     MSISUMMARYINFO *si;
     UINT ret;
@@ -951,7 +951,7 @@ UINT WINAPI MsiSummaryInfoPersist( PMSIOBJECT handle )
     return ret;
 }
 
-UINT WINAPI MsiCreateTransformSummaryInfoA( PMSIOBJECT db, PMSIOBJECT db_ref, const CHAR *transform, int error, int validation )
+UINT WINAPI MsiCreateTransformSummaryInfoA( MSIOBJECT *db, MSIOBJECT *db_ref, const CHAR *transform, int error, int validation )
 {
     UINT r;
     WCHAR *transformW = NULL;
@@ -966,7 +966,7 @@ UINT WINAPI MsiCreateTransformSummaryInfoA( PMSIOBJECT db, PMSIOBJECT db_ref, co
     return r;
 }
 
-UINT WINAPI MsiCreateTransformSummaryInfoW( PMSIOBJECT db, PMSIOBJECT db_ref, const WCHAR *transform, int error, int validation )
+UINT WINAPI MsiCreateTransformSummaryInfoW( MSIOBJECT *db, MSIOBJECT *db_ref, const WCHAR *transform, int error, int validation )
 {
     FIXME("%u, %u, %s, %d, %d\n", db, db_ref, debugstr_w(transform), error, validation);
     return ERROR_FUNCTION_FAILED;