diff options
| -rw-r--r-- | include/libmsi.h | 106 | ||||
| -rw-r--r-- | libmsi/database.c | 18 | ||||
| -rw-r--r-- | libmsi/handle.c | 2 | ||||
| -rw-r--r-- | libmsi/msiquery.c | 34 | ||||
| -rw-r--r-- | libmsi/record.c | 28 | ||||
| -rw-r--r-- | libmsi/suminfo.c | 20 |
6 files changed, 104 insertions, 104 deletions
diff --git a/include/libmsi.h b/include/libmsi.h index a7e5fb0..9674465 100644 --- a/include/libmsi.h +++ b/include/libmsi.h @@ -148,97 +148,97 @@ extern "C" { /* view manipulation */ -UINT WINAPI MsiViewFetch(MSIOBJECT *,MSIOBJECT **); -UINT WINAPI MsiViewExecute(MSIOBJECT *,MSIOBJECT *); -UINT WINAPI MsiViewClose(MSIOBJECT *); -UINT WINAPI MsiDatabaseOpenViewA(MSIOBJECT *,const CHAR *,MSIOBJECT **); -UINT WINAPI MsiDatabaseOpenViewW(MSIOBJECT *,const WCHAR *,MSIOBJECT **); +UINT MsiViewFetch(MSIOBJECT *,MSIOBJECT **); +UINT MsiViewExecute(MSIOBJECT *,MSIOBJECT *); +UINT MsiViewClose(MSIOBJECT *); +UINT MsiDatabaseOpenViewA(MSIOBJECT *,const CHAR *,MSIOBJECT **); +UINT MsiDatabaseOpenViewW(MSIOBJECT *,const WCHAR *,MSIOBJECT **); #define MsiDatabaseOpenView WINELIB_NAME_AW(MsiDatabaseOpenView) -MSIDBERROR WINAPI MsiViewGetErrorA(MSIOBJECT *,CHAR *,DWORD *); -MSIDBERROR WINAPI MsiViewGetErrorW(MSIOBJECT *,WCHAR *,DWORD *); +MSIDBERROR MsiViewGetErrorA(MSIOBJECT *,CHAR *,DWORD *); +MSIDBERROR MsiViewGetErrorW(MSIOBJECT *,WCHAR *,DWORD *); #define MsiViewGetError WINELIB_NAME_AW(MsiViewGetError) -MSIDBSTATE WINAPI MsiGetDatabaseState(MSIOBJECT *); +MSIDBSTATE MsiGetDatabaseState(MSIOBJECT *); /* record manipulation */ -MSIOBJECT *WINAPI MsiCreateRecord(UINT); -UINT WINAPI MsiRecordClearData(MSIOBJECT *); -UINT WINAPI MsiRecordSetInteger(MSIOBJECT *,UINT,int); -UINT WINAPI MsiRecordSetStringA(MSIOBJECT *,UINT,const CHAR *); -UINT WINAPI MsiRecordSetStringW(MSIOBJECT *,UINT,const WCHAR *); +MSIOBJECT * MsiCreateRecord(UINT); +UINT MsiRecordClearData(MSIOBJECT *); +UINT MsiRecordSetInteger(MSIOBJECT *,UINT,int); +UINT MsiRecordSetStringA(MSIOBJECT *,UINT,const CHAR *); +UINT MsiRecordSetStringW(MSIOBJECT *,UINT,const WCHAR *); #define MsiRecordSetString WINELIB_NAME_AW(MsiRecordSetString) -UINT WINAPI MsiRecordGetStringA(MSIOBJECT *,UINT,CHAR *,DWORD *); -UINT WINAPI MsiRecordGetStringW(MSIOBJECT *,UINT,WCHAR *,DWORD *); +UINT MsiRecordGetStringA(MSIOBJECT *,UINT,CHAR *,DWORD *); +UINT MsiRecordGetStringW(MSIOBJECT *,UINT,WCHAR *,DWORD *); #define MsiRecordGetString WINELIB_NAME_AW(MsiRecordGetString) -UINT WINAPI MsiRecordGetFieldCount(MSIOBJECT *); -int WINAPI MsiRecordGetInteger(MSIOBJECT *,UINT); -UINT WINAPI MsiRecordDataSize(MSIOBJECT *,UINT); -BOOL WINAPI MsiRecordIsNull(MSIOBJECT *,UINT); -UINT WINAPI MsiFormatRecordA(MSIOBJECT *,MSIOBJECT *,CHAR *,DWORD *); -UINT WINAPI MsiFormatRecordW(MSIOBJECT *,MSIOBJECT *,WCHAR *,DWORD *); +UINT MsiRecordGetFieldCount(MSIOBJECT *); +int MsiRecordGetInteger(MSIOBJECT *,UINT); +UINT MsiRecordDataSize(MSIOBJECT *,UINT); +BOOL MsiRecordIsNull(MSIOBJECT *,UINT); +UINT MsiFormatRecordA(MSIOBJECT *,MSIOBJECT *,CHAR *,DWORD *); +UINT MsiFormatRecordW(MSIOBJECT *,MSIOBJECT *,WCHAR *,DWORD *); #define MsiFormatRecord WINELIB_NAME_AW(MsiFormatRecord) -UINT WINAPI MsiRecordSetStreamA(MSIOBJECT *,UINT,const CHAR *); -UINT WINAPI MsiRecordSetStreamW(MSIOBJECT *,UINT,const WCHAR *); +UINT MsiRecordSetStreamA(MSIOBJECT *,UINT,const CHAR *); +UINT MsiRecordSetStreamW(MSIOBJECT *,UINT,const WCHAR *); #define MsiRecordSetStream WINELIB_NAME_AW(MsiRecordSetStream) -UINT WINAPI MsiRecordReadStream(MSIOBJECT *,UINT,char*,DWORD *); +UINT MsiRecordReadStream(MSIOBJECT *,UINT,char*,DWORD *); -UINT WINAPI MsiDatabaseGetPrimaryKeysA(MSIOBJECT *,const CHAR *,MSIOBJECT **); -UINT WINAPI MsiDatabaseGetPrimaryKeysW(MSIOBJECT *,const WCHAR *,MSIOBJECT **); +UINT MsiDatabaseGetPrimaryKeysA(MSIOBJECT *,const CHAR *,MSIOBJECT **); +UINT MsiDatabaseGetPrimaryKeysW(MSIOBJECT *,const WCHAR *,MSIOBJECT **); #define MsiDatabaseGetPrimaryKeys WINELIB_NAME_AW(MsiDatabaseGetPrimaryKeys) /* database transforms */ -UINT WINAPI MsiDatabaseApplyTransformA(MSIOBJECT *,const CHAR *,int); -UINT WINAPI MsiDatabaseApplyTransformW(MSIOBJECT *,const WCHAR *,int); +UINT MsiDatabaseApplyTransformA(MSIOBJECT *,const CHAR *,int); +UINT MsiDatabaseApplyTransformW(MSIOBJECT *,const WCHAR *,int); #define MsiDatabaseApplyTransform WINELIB_NAME_AW(MsiDatabaseApplyTransform) -UINT WINAPI MsiViewGetColumnInfo(MSIOBJECT *, MSICOLINFO, MSIOBJECT **); +UINT MsiViewGetColumnInfo(MSIOBJECT *, MSICOLINFO, MSIOBJECT **); -UINT WINAPI MsiCreateTransformSummaryInfoA(MSIOBJECT *, MSIOBJECT *, const CHAR *, int, int); -UINT WINAPI MsiCreateTransformSummaryInfoW(MSIOBJECT *, MSIOBJECT *, const WCHAR *, int, int); +UINT MsiCreateTransformSummaryInfoA(MSIOBJECT *, MSIOBJECT *, const CHAR *, int, int); +UINT MsiCreateTransformSummaryInfoW(MSIOBJECT *, MSIOBJECT *, const WCHAR *, int, int); #define MsiCreateTransformSummaryInfo WINELIB_NAME_AW(MsiCreateTransformSummaryInfo) -UINT WINAPI MsiGetSummaryInformationA(MSIOBJECT *, const CHAR *, UINT, MSIOBJECT **); -UINT WINAPI MsiGetSummaryInformationW(MSIOBJECT *, const WCHAR *, UINT, MSIOBJECT **); +UINT MsiGetSummaryInformationA(MSIOBJECT *, const CHAR *, UINT, MSIOBJECT **); +UINT MsiGetSummaryInformationW(MSIOBJECT *, const WCHAR *, UINT, MSIOBJECT **); #define MsiGetSummaryInformation WINELIB_NAME_AW(MsiGetSummaryInformation) -UINT WINAPI MsiSummaryInfoGetPropertyA(MSIOBJECT *,UINT,UINT *,INT *,FILETIME*,CHAR *,DWORD *); -UINT WINAPI MsiSummaryInfoGetPropertyW(MSIOBJECT *,UINT,UINT *,INT *,FILETIME*,WCHAR *,DWORD *); +UINT MsiSummaryInfoGetPropertyA(MSIOBJECT *,UINT,UINT *,INT *,FILETIME*,CHAR *,DWORD *); +UINT MsiSummaryInfoGetPropertyW(MSIOBJECT *,UINT,UINT *,INT *,FILETIME*,WCHAR *,DWORD *); #define MsiSummaryInfoGetProperty WINELIB_NAME_AW(MsiSummaryInfoGetProperty) -UINT WINAPI MsiSummaryInfoSetPropertyA(MSIOBJECT *, UINT, UINT, INT, FILETIME*, const CHAR *); -UINT WINAPI MsiSummaryInfoSetPropertyW(MSIOBJECT *, UINT, UINT, INT, FILETIME*, const WCHAR *); +UINT MsiSummaryInfoSetPropertyA(MSIOBJECT *, UINT, UINT, INT, FILETIME*, const CHAR *); +UINT MsiSummaryInfoSetPropertyW(MSIOBJECT *, UINT, UINT, INT, FILETIME*, const WCHAR *); #define MsiSummaryInfoSetProperty WINELIB_NAME_AW(MsiSummaryInfoSetProperty) -UINT WINAPI MsiDatabaseExportA(MSIOBJECT *, const CHAR *, const CHAR *, const CHAR *); -UINT WINAPI MsiDatabaseExportW(MSIOBJECT *, const WCHAR *, const WCHAR *, const WCHAR *); +UINT MsiDatabaseExportA(MSIOBJECT *, const CHAR *, const CHAR *, const CHAR *); +UINT MsiDatabaseExportW(MSIOBJECT *, const WCHAR *, const WCHAR *, const WCHAR *); #define MsiDatabaseExport WINELIB_NAME_AW(MsiDatabaseExport) -UINT WINAPI MsiDatabaseImportA(MSIOBJECT *, const CHAR *, const CHAR *); -UINT WINAPI MsiDatabaseImportW(MSIOBJECT *, const WCHAR *, const WCHAR *); +UINT MsiDatabaseImportA(MSIOBJECT *, const CHAR *, const CHAR *); +UINT MsiDatabaseImportW(MSIOBJECT *, const WCHAR *, const WCHAR *); #define MsiDatabaseImport WINELIB_NAME_AW(MsiDatabaseImport) -UINT WINAPI MsiOpenDatabaseW(const WCHAR *, const WCHAR *, MSIOBJECT **); -UINT WINAPI MsiOpenDatabaseA(const CHAR *, const CHAR *, MSIOBJECT **); +UINT MsiOpenDatabaseW(const WCHAR *, const WCHAR *, MSIOBJECT **); +UINT MsiOpenDatabaseA(const CHAR *, const CHAR *, MSIOBJECT **); #define MsiOpenDatabase WINELIB_NAME_AW(MsiOpenDatabase) -MSICONDITION WINAPI MsiDatabaseIsTablePersistentA(MSIOBJECT *, const CHAR *); -MSICONDITION WINAPI MsiDatabaseIsTablePersistentW(MSIOBJECT *, const WCHAR *); +MSICONDITION MsiDatabaseIsTablePersistentA(MSIOBJECT *, const CHAR *); +MSICONDITION MsiDatabaseIsTablePersistentW(MSIOBJECT *, const WCHAR *); #define MsiDatabaseIsTablePersistent WINELIB_NAME_AW(MsiDatabaseIsTablePersistent) -UINT WINAPI MsiSummaryInfoPersist(MSIOBJECT *); -UINT WINAPI MsiSummaryInfoGetPropertyCount(MSIOBJECT *,UINT *); +UINT MsiSummaryInfoPersist(MSIOBJECT *); +UINT MsiSummaryInfoGetPropertyCount(MSIOBJECT *,UINT *); -UINT WINAPI MsiViewModify(MSIOBJECT *, MSIMODIFY, MSIOBJECT *); +UINT MsiViewModify(MSIOBJECT *, MSIMODIFY, MSIOBJECT *); -UINT WINAPI MsiDatabaseMergeA(MSIOBJECT *, MSIOBJECT *, const CHAR *); -UINT WINAPI MsiDatabaseMergeW(MSIOBJECT *, MSIOBJECT *, const WCHAR *); +UINT MsiDatabaseMergeA(MSIOBJECT *, MSIOBJECT *, const CHAR *); +UINT MsiDatabaseMergeW(MSIOBJECT *, MSIOBJECT *, const WCHAR *); #define MsiDatabaseMerge WINELIB_NAME_AW(MsiDatabaseMerge) /* Non Unicode */ -UINT WINAPI MsiDatabaseCommit(MSIOBJECT *); -UINT WINAPI MsiCloseHandle(MSIOBJECT *); +UINT MsiDatabaseCommit(MSIOBJECT *); +UINT MsiCloseHandle(MSIOBJECT *); -MSIOBJECT *WINAPI MsiGetLastErrorRecord(void); +MSIOBJECT * MsiGetLastErrorRecord(void); #ifdef __cplusplus } diff --git a/libmsi/database.c b/libmsi/database.c index 72bceaf..a042037 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, MSIOBJECT **phDB) +UINT 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, MSIO return ret; } -UINT WINAPI MsiOpenDatabaseA(const CHAR *szDBPath, const CHAR *szPersist, MSIOBJECT **phDB) +UINT 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(MSIOBJECT *handle, const WCHAR *szFolder, const WCHAR *szFilename) +UINT MsiDatabaseImportW(MSIOBJECT *handle, const WCHAR *szFolder, const WCHAR *szFilename) { MSIDATABASE *db; UINT r; @@ -1041,7 +1041,7 @@ UINT WINAPI MsiDatabaseImportW(MSIOBJECT *handle, const WCHAR *szFolder, const W return r; } -UINT WINAPI MsiDatabaseImportA( MSIOBJECT *handle, +UINT 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( MSIOBJECT *handle, const WCHAR *szTable, +UINT MsiDatabaseExportW( MSIOBJECT *handle, const WCHAR *szTable, const WCHAR *szFolder, const WCHAR *szFilename ) { MSIDATABASE *db; @@ -1251,7 +1251,7 @@ UINT WINAPI MsiDatabaseExportW( MSIOBJECT *handle, const WCHAR *szTable, return r; } -UINT WINAPI MsiDatabaseExportA( MSIOBJECT *handle, const CHAR *szTable, +UINT 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(MSIOBJECT *hDatabase, MSIOBJECT *hDatabaseMerge, +UINT 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(MSIOBJECT *hDatabase, MSIOBJECT *hDatabaseMerge, +UINT MsiDatabaseMergeW(MSIOBJECT *hDatabase, MSIOBJECT *hDatabaseMerge, const WCHAR *szTableName) { struct list tabledata = LIST_INIT(tabledata); @@ -2026,7 +2026,7 @@ done: return r; } -MSIDBSTATE WINAPI MsiGetDatabaseState( MSIOBJECT *handle ) +MSIDBSTATE MsiGetDatabaseState( MSIOBJECT *handle ) { MSIDBSTATE ret = MSIDBSTATE_READ; MSIDATABASE *db; diff --git a/libmsi/handle.c b/libmsi/handle.c index 0da7fad..deb9069 100644 --- a/libmsi/handle.c +++ b/libmsi/handle.c @@ -107,7 +107,7 @@ int msiobj_release( MSIOBJECT *obj ) /*********************************************************** * MsiCloseHandle [MSI.@] */ -UINT WINAPI MsiCloseHandle(MSIOBJECT *obj) +UINT MsiCloseHandle(MSIOBJECT *obj) { TRACE("%x\n",obj); diff --git a/libmsi/msiquery.c b/libmsi/msiquery.c index c7504f5..873a674 100644 --- a/libmsi/msiquery.c +++ b/libmsi/msiquery.c @@ -84,7 +84,7 @@ UINT VIEW_find_column( MSIVIEW *table, const WCHAR *name, const WCHAR *table_nam return ERROR_INVALID_PARAMETER; } -UINT WINAPI MsiDatabaseOpenViewA(MSIOBJECT *hdb, +UINT MsiDatabaseOpenViewA(MSIOBJECT *hdb, const CHAR *szQuery, MSIOBJECT **phView) { UINT r; @@ -237,7 +237,7 @@ MSIRECORD *MSI_QueryGetRecord( MSIDATABASE *db, const WCHAR *fmt, ... ) return rec; } -UINT WINAPI MsiDatabaseOpenViewW(MSIOBJECT *hdb, +UINT MsiDatabaseOpenViewW(MSIOBJECT *hdb, const WCHAR *szQuery, MSIOBJECT **phView) { MSIDATABASE *db; @@ -357,7 +357,7 @@ UINT MSI_ViewFetch(MSIQUERY *query, MSIRECORD **prec) return r; } -UINT WINAPI MsiViewFetch(MSIOBJECT *hView, MSIOBJECT **record) +UINT 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(MSIOBJECT *hView) +UINT 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(MSIOBJECT *hView, MSIOBJECT *hRec) +UINT 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(MSIOBJECT *hView, MSICOLINFO info, MSIOBJECT **hRec) +UINT MsiViewGetColumnInfo(MSIOBJECT *hView, MSICOLINFO info, MSIOBJECT **hRec) { MSIQUERY *query = NULL; MSIRECORD *rec = NULL; @@ -585,7 +585,7 @@ UINT MSI_ViewModify( MSIQUERY *query, MSIMODIFY mode, MSIRECORD *rec ) return r; } -UINT WINAPI MsiViewModify( MSIOBJECT *hView, MSIMODIFY eModifyMode, +UINT MsiViewModify( MSIOBJECT *hView, MSIMODIFY eModifyMode, MSIOBJECT *hRecord) { MSIQUERY *query = NULL; @@ -608,7 +608,7 @@ UINT WINAPI MsiViewModify( MSIOBJECT *hView, MSIMODIFY eModifyMode, return r; } -MSIDBERROR WINAPI MsiViewGetErrorW( MSIOBJECT *handle, WCHAR *buffer, DWORD *buflen ) +MSIDBERROR MsiViewGetErrorW( MSIOBJECT *handle, WCHAR *buffer, DWORD *buflen ) { MSIQUERY *query; const WCHAR *column; @@ -640,7 +640,7 @@ MSIDBERROR WINAPI MsiViewGetErrorW( MSIOBJECT *handle, WCHAR *buffer, DWORD *buf return r; } -MSIDBERROR WINAPI MsiViewGetErrorA( MSIOBJECT *handle, CHAR *buffer, DWORD *buflen ) +MSIDBERROR MsiViewGetErrorA( MSIOBJECT *handle, CHAR *buffer, DWORD *buflen ) { MSIQUERY *query; const WCHAR *column; @@ -672,7 +672,7 @@ MSIDBERROR WINAPI MsiViewGetErrorA( MSIOBJECT *handle, CHAR *buffer, DWORD *bufl return r; } -MSIOBJECT *WINAPI MsiGetLastErrorRecord( void ) +MSIOBJECT * MsiGetLastErrorRecord( void ) { FIXME("\n"); return 0; @@ -714,7 +714,7 @@ end: return ret; } -UINT WINAPI MsiDatabaseApplyTransformW( MSIOBJECT *hdb, +UINT MsiDatabaseApplyTransformW( MSIOBJECT *hdb, const WCHAR *szTransformFile, int iErrorCond) { MSIDATABASE *db; @@ -728,7 +728,7 @@ UINT WINAPI MsiDatabaseApplyTransformW( MSIOBJECT *hdb, return r; } -UINT WINAPI MsiDatabaseApplyTransformA( MSIOBJECT *hdb, +UINT MsiDatabaseApplyTransformA( MSIOBJECT *hdb, const CHAR *szTransformFile, int iErrorCond) { WCHAR *wstr; @@ -747,7 +747,7 @@ UINT WINAPI MsiDatabaseApplyTransformA( MSIOBJECT *hdb, return ret; } -UINT WINAPI MsiDatabaseCommit( MSIOBJECT *hdb ) +UINT MsiDatabaseCommit( MSIOBJECT *hdb ) { MSIDATABASE *db; UINT r; @@ -856,7 +856,7 @@ UINT MSI_DatabaseGetPrimaryKeys( MSIDATABASE *db, return r; } -UINT WINAPI MsiDatabaseGetPrimaryKeysW( MSIOBJECT *hdb, +UINT MsiDatabaseGetPrimaryKeysW( MSIOBJECT *hdb, const WCHAR *table, MSIOBJECT **phRec ) { MSIRECORD *rec = NULL; @@ -877,7 +877,7 @@ UINT WINAPI MsiDatabaseGetPrimaryKeysW( MSIOBJECT *hdb, return r; } -UINT WINAPI MsiDatabaseGetPrimaryKeysA(MSIOBJECT *hdb, +UINT MsiDatabaseGetPrimaryKeysA(MSIOBJECT *hdb, const CHAR *table, MSIOBJECT **phRec) { WCHAR *szwTable = NULL; @@ -897,7 +897,7 @@ UINT WINAPI MsiDatabaseGetPrimaryKeysA(MSIOBJECT *hdb, return r; } -MSICONDITION WINAPI MsiDatabaseIsTablePersistentA( +MSICONDITION MsiDatabaseIsTablePersistentA( MSIOBJECT *hDatabase, const CHAR *szTableName) { WCHAR *szwTableName = NULL; @@ -917,7 +917,7 @@ MSICONDITION WINAPI MsiDatabaseIsTablePersistentA( return r; } -MSICONDITION WINAPI MsiDatabaseIsTablePersistentW( +MSICONDITION MsiDatabaseIsTablePersistentW( MSIOBJECT *hDatabase, const WCHAR *szTableName) { MSIDATABASE *db; diff --git a/libmsi/record.c b/libmsi/record.c index 39add5c..9677ad2 100644 --- a/libmsi/record.c +++ b/libmsi/record.c @@ -89,7 +89,7 @@ MSIRECORD *MSI_CreateRecord( UINT cParams ) return rec; } -MSIOBJECT *WINAPI MsiCreateRecord( UINT cParams ) +MSIOBJECT * MsiCreateRecord( UINT cParams ) { MSIRECORD *rec; @@ -104,7 +104,7 @@ UINT MSI_RecordGetFieldCount( const MSIRECORD *rec ) return rec->count; } -UINT WINAPI MsiRecordGetFieldCount( MSIOBJECT *handle ) +UINT 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( MSIOBJECT *handle, UINT iField) +int MsiRecordGetInteger( MSIOBJECT *handle, UINT iField) { MSIRECORD *rec; UINT ret; @@ -267,7 +267,7 @@ int WINAPI MsiRecordGetInteger( MSIOBJECT *handle, UINT iField) return ret; } -UINT WINAPI MsiRecordClearData( MSIOBJECT *handle ) +UINT 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( MSIOBJECT *handle, UINT iField, int iVal ) +UINT 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( MSIOBJECT *handle, UINT iField ) +BOOL 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(MSIOBJECT *handle, UINT iField, +UINT 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(MSIOBJECT *handle, UINT iField, +UINT 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(MSIOBJECT *handle, UINT iField) +UINT 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( MSIOBJECT *handle, UINT iField, const CHAR *szValue ) +UINT 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( MSIOBJECT *handle, UINT iField, const WCHAR *szValue ) +UINT 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(MSIOBJECT *hRecord, UINT iField, const CHAR *szFilename) +UINT MsiRecordSetStreamA(MSIOBJECT *hRecord, UINT iField, const CHAR *szFilename) { WCHAR *wstr = NULL; UINT ret; @@ -771,7 +771,7 @@ UINT WINAPI MsiRecordSetStreamA(MSIOBJECT *hRecord, UINT iField, const CHAR *szF return ret; } -UINT WINAPI MsiRecordSetStreamW(MSIOBJECT *handle, UINT iField, const WCHAR *szFilename) +UINT 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(MSIOBJECT *handle, UINT iField, char *buf, DWORD *sz) +UINT MsiRecordReadStream(MSIOBJECT *handle, UINT iField, char *buf, DWORD *sz) { MSIRECORD *rec; UINT ret; diff --git a/libmsi/suminfo.c b/libmsi/suminfo.c index f1212a1..92525d2 100644 --- a/libmsi/suminfo.c +++ b/libmsi/suminfo.c @@ -456,7 +456,7 @@ MSISUMMARYINFO *MSI_GetSummaryInformationW( IStorage *stg, UINT uiUpdateCount ) return si; } -UINT WINAPI MsiGetSummaryInformationW( MSIOBJECT *hDatabase, +UINT MsiGetSummaryInformationW( MSIOBJECT *hDatabase, const WCHAR *szDatabase, UINT uiUpdateCount, MSIOBJECT **pHandle ) { MSISUMMARYINFO *si; @@ -495,7 +495,7 @@ UINT WINAPI MsiGetSummaryInformationW( MSIOBJECT *hDatabase, return ret; } -UINT WINAPI MsiGetSummaryInformationA(MSIOBJECT *hDatabase, +UINT MsiGetSummaryInformationA(MSIOBJECT *hDatabase, const CHAR *szDatabase, UINT uiUpdateCount, MSIOBJECT **pHandle) { WCHAR *szwDatabase = NULL; @@ -518,7 +518,7 @@ UINT WINAPI MsiGetSummaryInformationA(MSIOBJECT *hDatabase, return ret; } -UINT WINAPI MsiSummaryInfoGetPropertyCount(MSIOBJECT *hSummaryInfo, UINT *pCount) +UINT MsiSummaryInfoGetPropertyCount(MSIOBJECT *hSummaryInfo, UINT *pCount) { MSISUMMARYINFO *si; @@ -645,7 +645,7 @@ WCHAR *msi_get_suminfo_product( IStorage *stg ) return prod; } -UINT WINAPI MsiSummaryInfoGetPropertyA( +UINT MsiSummaryInfoGetPropertyA( MSIOBJECT *handle, UINT uiProperty, UINT *puiDataType, INT *piValue, FILETIME *pftValue, CHAR *szValueBuf, DWORD *pcchValueBuf) { @@ -661,7 +661,7 @@ UINT WINAPI MsiSummaryInfoGetPropertyA( pftValue, &str, pcchValueBuf ); } -UINT WINAPI MsiSummaryInfoGetPropertyW( +UINT MsiSummaryInfoGetPropertyW( MSIOBJECT *handle, UINT uiProperty, UINT *puiDataType, INT *piValue, FILETIME *pftValue, WCHAR *szValueBuf, DWORD *pcchValueBuf) { @@ -732,7 +732,7 @@ static UINT set_prop( MSISUMMARYINFO *si, UINT uiProperty, UINT type, return ERROR_SUCCESS; } -UINT WINAPI MsiSummaryInfoSetPropertyW( MSIOBJECT *handle, UINT uiProperty, +UINT MsiSummaryInfoSetPropertyW( MSIOBJECT *handle, UINT uiProperty, UINT uiDataType, INT iValue, FILETIME* pftValue, const WCHAR *szValue ) { awcstring str; @@ -764,7 +764,7 @@ UINT WINAPI MsiSummaryInfoSetPropertyW( MSIOBJECT *handle, UINT uiProperty, return ret; } -UINT WINAPI MsiSummaryInfoSetPropertyA( MSIOBJECT *handle, UINT uiProperty, +UINT 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( MSIOBJECT *handle ) +UINT MsiSummaryInfoPersist( MSIOBJECT *handle ) { MSISUMMARYINFO *si; UINT ret; @@ -951,7 +951,7 @@ UINT WINAPI MsiSummaryInfoPersist( MSIOBJECT *handle ) return ret; } -UINT WINAPI MsiCreateTransformSummaryInfoA( MSIOBJECT *db, MSIOBJECT *db_ref, const CHAR *transform, int error, int validation ) +UINT 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( MSIOBJECT *db, MSIOBJECT *db_ref, co return r; } -UINT WINAPI MsiCreateTransformSummaryInfoW( MSIOBJECT *db, MSIOBJECT *db_ref, const WCHAR *transform, int error, int validation ) +UINT 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; |