Commit 57717000 authored by Francois Gouget's avatar Francois Gouget Committed by Alexandre Julliard

msi: Better match the PSDK types, remove some now unused types from win32.api,…

msi: Better match the PSDK types, remove some now unused types from win32.api, and update it to fix the winapi_check warnings.
parent f6848fb6
...@@ -611,7 +611,7 @@ static DWORD deformat_string_internal(MSIPACKAGE *package, LPCWSTR ptr, ...@@ -611,7 +611,7 @@ static DWORD deformat_string_internal(MSIPACKAGE *package, LPCWSTR ptr,
UINT MSI_FormatRecordW( MSIPACKAGE* package, MSIRECORD* record, LPWSTR buffer, UINT MSI_FormatRecordW( MSIPACKAGE* package, MSIRECORD* record, LPWSTR buffer,
DWORD *size ) LPDWORD size )
{ {
LPWSTR deformated; LPWSTR deformated;
LPWSTR rec; LPWSTR rec;
...@@ -658,7 +658,7 @@ UINT MSI_FormatRecordW( MSIPACKAGE* package, MSIRECORD* record, LPWSTR buffer, ...@@ -658,7 +658,7 @@ UINT MSI_FormatRecordW( MSIPACKAGE* package, MSIRECORD* record, LPWSTR buffer,
} }
UINT WINAPI MsiFormatRecordW( MSIHANDLE hInstall, MSIHANDLE hRecord, UINT WINAPI MsiFormatRecordW( MSIHANDLE hInstall, MSIHANDLE hRecord,
LPWSTR szResult, DWORD *sz ) LPWSTR szResult, LPDWORD sz )
{ {
UINT r = ERROR_INVALID_HANDLE; UINT r = ERROR_INVALID_HANDLE;
MSIPACKAGE *package; MSIPACKAGE *package;
...@@ -738,7 +738,7 @@ done: ...@@ -738,7 +738,7 @@ done:
} }
UINT WINAPI MsiFormatRecordA( MSIHANDLE hInstall, MSIHANDLE hRecord, UINT WINAPI MsiFormatRecordA( MSIHANDLE hInstall, MSIHANDLE hRecord,
LPSTR szResult, DWORD *sz ) LPSTR szResult, LPDWORD sz )
{ {
UINT r; UINT r;
DWORD len, save; DWORD len, save;
......
...@@ -216,7 +216,7 @@ UINT msi_strcpy_to_awstring( LPCWSTR str, awstring *awbuf, DWORD *sz ) ...@@ -216,7 +216,7 @@ UINT msi_strcpy_to_awstring( LPCWSTR str, awstring *awbuf, DWORD *sz )
* MsiGetTargetPath (internal) * MsiGetTargetPath (internal)
*/ */
static UINT WINAPI MSI_GetTargetPath( MSIHANDLE hInstall, LPCWSTR szFolder, static UINT WINAPI MSI_GetTargetPath( MSIHANDLE hInstall, LPCWSTR szFolder,
awstring *szPathBuf, DWORD* pcchPathBuf ) awstring *szPathBuf, LPDWORD pcchPathBuf )
{ {
MSIPACKAGE *package; MSIPACKAGE *package;
LPWSTR path; LPWSTR path;
...@@ -297,7 +297,7 @@ done: ...@@ -297,7 +297,7 @@ done:
* MsiGetTargetPathA (MSI.@) * MsiGetTargetPathA (MSI.@)
*/ */
UINT WINAPI MsiGetTargetPathA( MSIHANDLE hInstall, LPCSTR szFolder, UINT WINAPI MsiGetTargetPathA( MSIHANDLE hInstall, LPCSTR szFolder,
LPSTR szPathBuf, DWORD* pcchPathBuf ) LPSTR szPathBuf, LPDWORD pcchPathBuf )
{ {
LPWSTR szwFolder; LPWSTR szwFolder;
awstring path; awstring path;
...@@ -323,7 +323,7 @@ UINT WINAPI MsiGetTargetPathA( MSIHANDLE hInstall, LPCSTR szFolder, ...@@ -323,7 +323,7 @@ UINT WINAPI MsiGetTargetPathA( MSIHANDLE hInstall, LPCSTR szFolder,
* MsiGetTargetPathW (MSI.@) * MsiGetTargetPathW (MSI.@)
*/ */
UINT WINAPI MsiGetTargetPathW( MSIHANDLE hInstall, LPCWSTR szFolder, UINT WINAPI MsiGetTargetPathW( MSIHANDLE hInstall, LPCWSTR szFolder,
LPWSTR szPathBuf, DWORD* pcchPathBuf ) LPWSTR szPathBuf, LPDWORD pcchPathBuf )
{ {
awstring path; awstring path;
...@@ -339,7 +339,7 @@ UINT WINAPI MsiGetTargetPathW( MSIHANDLE hInstall, LPCWSTR szFolder, ...@@ -339,7 +339,7 @@ UINT WINAPI MsiGetTargetPathW( MSIHANDLE hInstall, LPCWSTR szFolder,
* MsiGetSourcePath (internal) * MsiGetSourcePath (internal)
*/ */
static UINT MSI_GetSourcePath( MSIHANDLE hInstall, LPCWSTR szFolder, static UINT MSI_GetSourcePath( MSIHANDLE hInstall, LPCWSTR szFolder,
awstring *szPathBuf, DWORD* pcchPathBuf ) awstring *szPathBuf, LPDWORD pcchPathBuf )
{ {
MSIPACKAGE *package; MSIPACKAGE *package;
LPWSTR path; LPWSTR path;
...@@ -429,7 +429,7 @@ done: ...@@ -429,7 +429,7 @@ done:
* MsiGetSourcePathA (MSI.@) * MsiGetSourcePathA (MSI.@)
*/ */
UINT WINAPI MsiGetSourcePathA( MSIHANDLE hInstall, LPCSTR szFolder, UINT WINAPI MsiGetSourcePathA( MSIHANDLE hInstall, LPCSTR szFolder,
LPSTR szPathBuf, DWORD* pcchPathBuf ) LPSTR szPathBuf, LPDWORD pcchPathBuf )
{ {
LPWSTR folder; LPWSTR folder;
awstring str; awstring str;
...@@ -451,7 +451,7 @@ UINT WINAPI MsiGetSourcePathA( MSIHANDLE hInstall, LPCSTR szFolder, ...@@ -451,7 +451,7 @@ UINT WINAPI MsiGetSourcePathA( MSIHANDLE hInstall, LPCSTR szFolder,
* MsiGetSourcePathW (MSI.@) * MsiGetSourcePathW (MSI.@)
*/ */
UINT WINAPI MsiGetSourcePathW( MSIHANDLE hInstall, LPCWSTR szFolder, UINT WINAPI MsiGetSourcePathW( MSIHANDLE hInstall, LPCWSTR szFolder,
LPWSTR szPathBuf, DWORD* pcchPathBuf ) LPWSTR szPathBuf, LPDWORD pcchPathBuf )
{ {
awstring str; awstring str;
...@@ -932,7 +932,7 @@ UINT WINAPI MsiGetFeatureStateW(MSIHANDLE hInstall, LPCWSTR szFeature, ...@@ -932,7 +932,7 @@ UINT WINAPI MsiGetFeatureStateW(MSIHANDLE hInstall, LPCWSTR szFeature,
* MsiGetFeatureCostA (MSI.@) * MsiGetFeatureCostA (MSI.@)
*/ */
UINT WINAPI MsiGetFeatureCostA(MSIHANDLE hInstall, LPCSTR szFeature, UINT WINAPI MsiGetFeatureCostA(MSIHANDLE hInstall, LPCSTR szFeature,
MSICOSTTREE iCostTree, INSTALLSTATE iState, INT *piCost) MSICOSTTREE iCostTree, INSTALLSTATE iState, LPINT piCost)
{ {
FIXME("(%ld %s %i %i %p): stub\n", hInstall, debugstr_a(szFeature), FIXME("(%ld %s %i %i %p): stub\n", hInstall, debugstr_a(szFeature),
iCostTree, iState, piCost); iCostTree, iState, piCost);
...@@ -944,7 +944,7 @@ UINT WINAPI MsiGetFeatureCostA(MSIHANDLE hInstall, LPCSTR szFeature, ...@@ -944,7 +944,7 @@ UINT WINAPI MsiGetFeatureCostA(MSIHANDLE hInstall, LPCSTR szFeature,
* MsiGetFeatureCostW (MSI.@) * MsiGetFeatureCostW (MSI.@)
*/ */
UINT WINAPI MsiGetFeatureCostW(MSIHANDLE hInstall, LPCWSTR szFeature, UINT WINAPI MsiGetFeatureCostW(MSIHANDLE hInstall, LPCWSTR szFeature,
MSICOSTTREE iCostTree, INSTALLSTATE iState, INT *piCost) MSICOSTTREE iCostTree, INSTALLSTATE iState, LPINT piCost)
{ {
FIXME("(%ld %s %i %i %p): stub\n", hInstall, debugstr_w(szFeature), FIXME("(%ld %s %i %i %p): stub\n", hInstall, debugstr_w(szFeature),
iCostTree, iState, piCost); iCostTree, iState, piCost);
...@@ -1228,7 +1228,7 @@ UINT WINAPI MsiSetInstallLevel(MSIHANDLE hInstall, int iInstallLevel) ...@@ -1228,7 +1228,7 @@ UINT WINAPI MsiSetInstallLevel(MSIHANDLE hInstall, int iInstallLevel)
* MsiGetFeatureValidStatesW (MSI.@) * MsiGetFeatureValidStatesW (MSI.@)
*/ */
UINT WINAPI MsiGetFeatureValidStatesW(MSIHANDLE hInstall, LPCWSTR szFeature, UINT WINAPI MsiGetFeatureValidStatesW(MSIHANDLE hInstall, LPCWSTR szFeature,
DWORD* pInstallState) LPDWORD pInstallState)
{ {
if(pInstallState) *pInstallState = 1<<INSTALLSTATE_LOCAL; if(pInstallState) *pInstallState = 1<<INSTALLSTATE_LOCAL;
FIXME("%ld %s %p stub returning %d\n", FIXME("%ld %s %p stub returning %d\n",
...@@ -1241,7 +1241,7 @@ UINT WINAPI MsiGetFeatureValidStatesW(MSIHANDLE hInstall, LPCWSTR szFeature, ...@@ -1241,7 +1241,7 @@ UINT WINAPI MsiGetFeatureValidStatesW(MSIHANDLE hInstall, LPCWSTR szFeature,
* MsiGetFeatureValidStatesA (MSI.@) * MsiGetFeatureValidStatesA (MSI.@)
*/ */
UINT WINAPI MsiGetFeatureValidStatesA(MSIHANDLE hInstall, LPCSTR szFeature, UINT WINAPI MsiGetFeatureValidStatesA(MSIHANDLE hInstall, LPCSTR szFeature,
DWORD* pInstallState) LPDWORD pInstallState)
{ {
UINT ret; UINT ret;
LPWSTR szwFeature = strdupAtoW(szFeature); LPWSTR szwFeature = strdupAtoW(szFeature);
......
...@@ -653,23 +653,23 @@ extern UINT MSI_SetFeatureStates( MSIPACKAGE *package ); ...@@ -653,23 +653,23 @@ extern UINT MSI_SetFeatureStates( MSIPACKAGE *package );
extern UINT msi_parse_command_line( MSIPACKAGE *package, LPCWSTR szCommandLine ); extern UINT msi_parse_command_line( MSIPACKAGE *package, LPCWSTR szCommandLine );
/* record internals */ /* record internals */
extern UINT MSI_RecordSetIStream( MSIRECORD *, unsigned int, IStream *); extern UINT MSI_RecordSetIStream( MSIRECORD *, UINT, IStream *);
extern UINT MSI_RecordGetIStream( MSIRECORD *, unsigned int, IStream **); extern UINT MSI_RecordGetIStream( MSIRECORD *, UINT, IStream **);
extern const WCHAR *MSI_RecordGetString( const MSIRECORD *, unsigned int ); extern const WCHAR *MSI_RecordGetString( const MSIRECORD *, UINT );
extern MSIRECORD *MSI_CreateRecord( unsigned int ); extern MSIRECORD *MSI_CreateRecord( UINT );
extern UINT MSI_RecordSetInteger( MSIRECORD *, unsigned int, int ); extern UINT MSI_RecordSetInteger( MSIRECORD *, UINT, int );
extern UINT MSI_RecordSetStringW( MSIRECORD *, unsigned int, LPCWSTR ); extern UINT MSI_RecordSetStringW( MSIRECORD *, UINT, LPCWSTR );
extern UINT MSI_RecordSetStringA( MSIRECORD *, unsigned int, LPCSTR ); extern UINT MSI_RecordSetStringA( MSIRECORD *, UINT, LPCSTR );
extern BOOL MSI_RecordIsNull( MSIRECORD *, unsigned int ); extern BOOL MSI_RecordIsNull( MSIRECORD *, UINT );
extern UINT MSI_RecordGetStringW( MSIRECORD * , unsigned int, LPWSTR, DWORD *); extern UINT MSI_RecordGetStringW( MSIRECORD * , UINT, LPWSTR, LPDWORD);
extern UINT MSI_RecordGetStringA( MSIRECORD *, unsigned int, LPSTR, DWORD *); extern UINT MSI_RecordGetStringA( MSIRECORD *, UINT, LPSTR, LPDWORD);
extern int MSI_RecordGetInteger( MSIRECORD *, unsigned int ); extern int MSI_RecordGetInteger( MSIRECORD *, UINT );
extern UINT MSI_RecordReadStream( MSIRECORD *, unsigned int, char *, DWORD *); extern UINT MSI_RecordReadStream( MSIRECORD *, UINT, char *, LPDWORD);
extern unsigned int MSI_RecordGetFieldCount( const MSIRECORD *rec ); extern UINT MSI_RecordGetFieldCount( const MSIRECORD *rec );
extern UINT MSI_RecordSetStream( MSIRECORD *, unsigned int, IStream * ); extern UINT MSI_RecordSetStream( MSIRECORD *, UINT, IStream * );
extern UINT MSI_RecordDataSize( MSIRECORD *, unsigned int ); extern UINT MSI_RecordDataSize( MSIRECORD *, UINT );
extern UINT MSI_RecordStreamToFile( MSIRECORD *, unsigned int, LPCWSTR ); extern UINT MSI_RecordStreamToFile( MSIRECORD *, UINT, LPCWSTR );
extern UINT MSI_RecordCopyField( MSIRECORD *, unsigned int, MSIRECORD *, unsigned int ); extern UINT MSI_RecordCopyField( MSIRECORD *, UINT, MSIRECORD *, UINT );
/* stream internals */ /* stream internals */
extern UINT get_raw_stream( MSIHANDLE hdb, LPCWSTR stname, IStream **stm ); extern UINT get_raw_stream( MSIHANDLE hdb, LPCWSTR stname, IStream **stm );
...@@ -683,7 +683,7 @@ extern UINT MSI_OpenDatabaseW( LPCWSTR, LPCWSTR, MSIDATABASE ** ); ...@@ -683,7 +683,7 @@ extern UINT MSI_OpenDatabaseW( LPCWSTR, LPCWSTR, MSIDATABASE ** );
extern UINT MSI_DatabaseOpenViewW(MSIDATABASE *, LPCWSTR, MSIQUERY ** ); extern UINT MSI_DatabaseOpenViewW(MSIDATABASE *, LPCWSTR, MSIQUERY ** );
extern UINT MSI_OpenQuery( MSIDATABASE *, MSIQUERY **, LPCWSTR, ... ); extern UINT MSI_OpenQuery( MSIDATABASE *, MSIQUERY **, LPCWSTR, ... );
typedef UINT (*record_func)( MSIRECORD *, LPVOID ); typedef UINT (*record_func)( MSIRECORD *, LPVOID );
extern UINT MSI_IterateRecords( MSIQUERY *, DWORD *, record_func, LPVOID ); extern UINT MSI_IterateRecords( MSIQUERY *, LPDWORD, record_func, LPVOID );
extern MSIRECORD *MSI_QueryGetRecord( MSIDATABASE *db, LPCWSTR query, ... ); extern MSIRECORD *MSI_QueryGetRecord( MSIDATABASE *db, LPCWSTR query, ... );
extern UINT MSI_DatabaseImport( MSIDATABASE *, LPCWSTR, LPCWSTR ); extern UINT MSI_DatabaseImport( MSIDATABASE *, LPCWSTR, LPCWSTR );
extern UINT MSI_DatabaseExport( MSIDATABASE *, LPCWSTR, LPCWSTR, LPCWSTR ); extern UINT MSI_DatabaseExport( MSIDATABASE *, LPCWSTR, LPCWSTR, LPCWSTR );
...@@ -707,8 +707,8 @@ extern UINT MSI_OpenPackageW( LPCWSTR szPackage, MSIPACKAGE **pPackage ); ...@@ -707,8 +707,8 @@ extern UINT MSI_OpenPackageW( LPCWSTR szPackage, MSIPACKAGE **pPackage );
extern UINT MSI_SetTargetPathW( MSIPACKAGE *, LPCWSTR, LPCWSTR ); extern UINT MSI_SetTargetPathW( MSIPACKAGE *, LPCWSTR, LPCWSTR );
extern UINT MSI_SetPropertyW( MSIPACKAGE *, LPCWSTR, LPCWSTR ); extern UINT MSI_SetPropertyW( MSIPACKAGE *, LPCWSTR, LPCWSTR );
extern INT MSI_ProcessMessage( MSIPACKAGE *, INSTALLMESSAGE, MSIRECORD * ); extern INT MSI_ProcessMessage( MSIPACKAGE *, INSTALLMESSAGE, MSIRECORD * );
extern UINT MSI_GetPropertyW( MSIPACKAGE *, LPCWSTR, LPWSTR, DWORD * ); extern UINT MSI_GetPropertyW( MSIPACKAGE *, LPCWSTR, LPWSTR, LPDWORD );
extern UINT MSI_GetPropertyA(MSIPACKAGE *, LPCSTR, LPSTR, DWORD* ); extern UINT MSI_GetPropertyA(MSIPACKAGE *, LPCSTR, LPSTR, LPDWORD );
extern MSICONDITION MSI_EvaluateConditionW( MSIPACKAGE *, LPCWSTR ); extern MSICONDITION MSI_EvaluateConditionW( MSIPACKAGE *, LPCWSTR );
extern UINT MSI_GetComponentStateW( MSIPACKAGE *, LPCWSTR, INSTALLSTATE *, INSTALLSTATE * ); extern UINT MSI_GetComponentStateW( MSIPACKAGE *, LPCWSTR, INSTALLSTATE *, INSTALLSTATE * );
extern UINT MSI_GetFeatureStateW( MSIPACKAGE *, LPCWSTR, INSTALLSTATE *, INSTALLSTATE * ); extern UINT MSI_GetFeatureStateW( MSIPACKAGE *, LPCWSTR, INSTALLSTATE *, INSTALLSTATE * );
...@@ -719,7 +719,7 @@ extern UINT msi_package_add_media_disk(MSIPACKAGE *, DWORD, DWORD, DWORD, LPWSTR ...@@ -719,7 +719,7 @@ extern UINT msi_package_add_media_disk(MSIPACKAGE *, DWORD, DWORD, DWORD, LPWSTR
extern UINT msi_clone_properties(MSIPACKAGE *); extern UINT msi_clone_properties(MSIPACKAGE *);
/* for deformating */ /* for deformating */
extern UINT MSI_FormatRecordW( MSIPACKAGE *, MSIRECORD *, LPWSTR, DWORD * ); extern UINT MSI_FormatRecordW( MSIPACKAGE *, MSIRECORD *, LPWSTR, LPDWORD );
/* registry data encoding/decoding functions */ /* registry data encoding/decoding functions */
extern BOOL unsquash_guid(LPCWSTR in, LPWSTR out); extern BOOL unsquash_guid(LPCWSTR in, LPWSTR out);
...@@ -791,8 +791,8 @@ extern LPWSTR msi_get_suminfo_product( IStorage *stg ); ...@@ -791,8 +791,8 @@ extern LPWSTR msi_get_suminfo_product( IStorage *stg );
/* undocumented functions */ /* undocumented functions */
UINT WINAPI MsiCreateAndVerifyInstallerDirectory( DWORD ); UINT WINAPI MsiCreateAndVerifyInstallerDirectory( DWORD );
UINT WINAPI MsiDecomposeDescriptorW( LPCWSTR, LPWSTR, LPWSTR, LPWSTR, DWORD * ); UINT WINAPI MsiDecomposeDescriptorW( LPCWSTR, LPWSTR, LPWSTR, LPWSTR, LPDWORD );
UINT WINAPI MsiDecomposeDescriptorA( LPCSTR, LPSTR, LPSTR, LPSTR, DWORD * ); UINT WINAPI MsiDecomposeDescriptorA( LPCSTR, LPSTR, LPSTR, LPSTR, LPDWORD );
LANGID WINAPI MsiLoadStringW( MSIHANDLE, UINT, LPWSTR, int, LANGID ); LANGID WINAPI MsiLoadStringW( MSIHANDLE, UINT, LPWSTR, int, LANGID );
LANGID WINAPI MsiLoadStringA( MSIHANDLE, UINT, LPSTR, int, LANGID ); LANGID WINAPI MsiLoadStringA( MSIHANDLE, UINT, LPSTR, int, LANGID );
......
...@@ -166,7 +166,7 @@ UINT MSI_OpenQuery( MSIDATABASE *db, MSIQUERY **view, LPCWSTR fmt, ... ) ...@@ -166,7 +166,7 @@ UINT MSI_OpenQuery( MSIDATABASE *db, MSIQUERY **view, LPCWSTR fmt, ... )
return r; return r;
} }
UINT MSI_IterateRecords( MSIQUERY *view, DWORD *count, UINT MSI_IterateRecords( MSIQUERY *view, LPDWORD count,
record_func func, LPVOID param ) record_func func, LPVOID param )
{ {
MSIRECORD *rec = NULL; MSIRECORD *rec = NULL;
...@@ -602,7 +602,7 @@ UINT WINAPI MsiViewModify( MSIHANDLE hView, MSIMODIFY eModifyMode, ...@@ -602,7 +602,7 @@ UINT WINAPI MsiViewModify( MSIHANDLE hView, MSIMODIFY eModifyMode,
} }
MSIDBERROR WINAPI MsiViewGetErrorW( MSIHANDLE handle, LPWSTR szColumnNameBuffer, MSIDBERROR WINAPI MsiViewGetErrorW( MSIHANDLE handle, LPWSTR szColumnNameBuffer,
DWORD *pcchBuf ) LPDWORD pcchBuf )
{ {
MSIQUERY *query = NULL; MSIQUERY *query = NULL;
static const WCHAR szError[] = { 0 }; static const WCHAR szError[] = { 0 };
...@@ -634,7 +634,7 @@ MSIDBERROR WINAPI MsiViewGetErrorW( MSIHANDLE handle, LPWSTR szColumnNameBuffer, ...@@ -634,7 +634,7 @@ MSIDBERROR WINAPI MsiViewGetErrorW( MSIHANDLE handle, LPWSTR szColumnNameBuffer,
} }
MSIDBERROR WINAPI MsiViewGetErrorA( MSIHANDLE handle, LPSTR szColumnNameBuffer, MSIDBERROR WINAPI MsiViewGetErrorA( MSIHANDLE handle, LPSTR szColumnNameBuffer,
DWORD *pcchBuf ) LPDWORD pcchBuf )
{ {
static const CHAR szError[] = { 0 }; static const CHAR szError[] = { 0 };
MSIQUERY *query = NULL; MSIQUERY *query = NULL;
......
...@@ -1361,7 +1361,7 @@ static MSIRECORD *MSI_GetPropertyRow( MSIPACKAGE *package, LPCWSTR name ) ...@@ -1361,7 +1361,7 @@ static MSIRECORD *MSI_GetPropertyRow( MSIPACKAGE *package, LPCWSTR name )
/* internal function, not compatible with MsiGetPropertyW */ /* internal function, not compatible with MsiGetPropertyW */
UINT MSI_GetPropertyW( MSIPACKAGE *package, LPCWSTR szName, UINT MSI_GetPropertyW( MSIPACKAGE *package, LPCWSTR szName,
LPWSTR szValueBuf, DWORD* pchValueBuf ) LPWSTR szValueBuf, LPDWORD pchValueBuf )
{ {
MSIRECORD *row; MSIRECORD *row;
UINT rc = ERROR_FUNCTION_FAILED; UINT rc = ERROR_FUNCTION_FAILED;
...@@ -1423,7 +1423,7 @@ int msi_get_property_int(MSIPACKAGE *package, LPCWSTR prop, int def) ...@@ -1423,7 +1423,7 @@ int msi_get_property_int(MSIPACKAGE *package, LPCWSTR prop, int def)
} }
static UINT MSI_GetProperty( MSIHANDLE handle, LPCWSTR name, static UINT MSI_GetProperty( MSIHANDLE handle, LPCWSTR name,
awstring *szValueBuf, DWORD* pchValueBuf ) awstring *szValueBuf, LPDWORD pchValueBuf )
{ {
static const WCHAR empty[] = {0}; static const WCHAR empty[] = {0};
MSIPACKAGE *package; MSIPACKAGE *package;
...@@ -1513,7 +1513,7 @@ done: ...@@ -1513,7 +1513,7 @@ done:
} }
UINT WINAPI MsiGetPropertyA( MSIHANDLE hInstall, LPCSTR szName, UINT WINAPI MsiGetPropertyA( MSIHANDLE hInstall, LPCSTR szName,
LPSTR szValueBuf, DWORD* pchValueBuf ) LPSTR szValueBuf, LPDWORD pchValueBuf )
{ {
awstring val; awstring val;
LPWSTR name; LPWSTR name;
...@@ -1532,7 +1532,7 @@ UINT WINAPI MsiGetPropertyA( MSIHANDLE hInstall, LPCSTR szName, ...@@ -1532,7 +1532,7 @@ UINT WINAPI MsiGetPropertyA( MSIHANDLE hInstall, LPCSTR szName,
} }
UINT WINAPI MsiGetPropertyW( MSIHANDLE hInstall, LPCWSTR szName, UINT WINAPI MsiGetPropertyW( MSIHANDLE hInstall, LPCWSTR szName,
LPWSTR szValueBuf, DWORD* pchValueBuf ) LPWSTR szValueBuf, LPDWORD pchValueBuf )
{ {
awstring val; awstring val;
......
...@@ -73,7 +73,7 @@ static void MSI_CloseRecord( MSIOBJECTHDR *arg ) ...@@ -73,7 +73,7 @@ static void MSI_CloseRecord( MSIOBJECTHDR *arg )
MSI_FreeField( &rec->fields[i] ); MSI_FreeField( &rec->fields[i] );
} }
MSIRECORD *MSI_CreateRecord( unsigned int cParams ) MSIRECORD *MSI_CreateRecord( UINT cParams )
{ {
MSIRECORD *rec; MSIRECORD *rec;
UINT len; UINT len;
...@@ -90,7 +90,7 @@ MSIRECORD *MSI_CreateRecord( unsigned int cParams ) ...@@ -90,7 +90,7 @@ MSIRECORD *MSI_CreateRecord( unsigned int cParams )
return rec; return rec;
} }
MSIHANDLE WINAPI MsiCreateRecord( unsigned int cParams ) MSIHANDLE WINAPI MsiCreateRecord( UINT cParams )
{ {
MSIRECORD *rec; MSIRECORD *rec;
MSIHANDLE ret = 0; MSIHANDLE ret = 0;
...@@ -106,12 +106,12 @@ MSIHANDLE WINAPI MsiCreateRecord( unsigned int cParams ) ...@@ -106,12 +106,12 @@ MSIHANDLE WINAPI MsiCreateRecord( unsigned int cParams )
return ret; return ret;
} }
unsigned int MSI_RecordGetFieldCount( const MSIRECORD *rec ) UINT MSI_RecordGetFieldCount( const MSIRECORD *rec )
{ {
return rec->count; return rec->count;
} }
unsigned int WINAPI MsiRecordGetFieldCount( MSIHANDLE handle ) UINT WINAPI MsiRecordGetFieldCount( MSIHANDLE handle )
{ {
MSIRECORD *rec; MSIRECORD *rec;
UINT ret; UINT ret;
...@@ -153,8 +153,8 @@ static BOOL string2intW( LPCWSTR str, int *out ) ...@@ -153,8 +153,8 @@ static BOOL string2intW( LPCWSTR str, int *out )
return TRUE; return TRUE;
} }
UINT MSI_RecordCopyField( MSIRECORD *in_rec, unsigned int in_n, UINT MSI_RecordCopyField( MSIRECORD *in_rec, UINT in_n,
MSIRECORD *out_rec, unsigned int out_n ) MSIRECORD *out_rec, UINT out_n )
{ {
UINT r = ERROR_SUCCESS; UINT r = ERROR_SUCCESS;
...@@ -200,7 +200,7 @@ UINT MSI_RecordCopyField( MSIRECORD *in_rec, unsigned int in_n, ...@@ -200,7 +200,7 @@ UINT MSI_RecordCopyField( MSIRECORD *in_rec, unsigned int in_n,
return r; return r;
} }
int MSI_RecordGetInteger( MSIRECORD *rec, unsigned int iField) int MSI_RecordGetInteger( MSIRECORD *rec, UINT iField)
{ {
int ret = 0; int ret = 0;
...@@ -224,7 +224,7 @@ int MSI_RecordGetInteger( MSIRECORD *rec, unsigned int iField) ...@@ -224,7 +224,7 @@ int MSI_RecordGetInteger( MSIRECORD *rec, unsigned int iField)
return MSI_NULL_INTEGER; return MSI_NULL_INTEGER;
} }
int WINAPI MsiRecordGetInteger( MSIHANDLE handle, unsigned int iField) int WINAPI MsiRecordGetInteger( MSIHANDLE handle, UINT iField)
{ {
MSIRECORD *rec; MSIRECORD *rec;
UINT ret; UINT ret;
...@@ -267,7 +267,7 @@ UINT WINAPI MsiRecordClearData( MSIHANDLE handle ) ...@@ -267,7 +267,7 @@ UINT WINAPI MsiRecordClearData( MSIHANDLE handle )
return ERROR_SUCCESS; return ERROR_SUCCESS;
} }
UINT MSI_RecordSetInteger( MSIRECORD *rec, unsigned int iField, int iVal ) UINT MSI_RecordSetInteger( MSIRECORD *rec, UINT iField, int iVal )
{ {
TRACE("%p %u %d\n", rec, iField, iVal); TRACE("%p %u %d\n", rec, iField, iVal);
...@@ -281,7 +281,7 @@ UINT MSI_RecordSetInteger( MSIRECORD *rec, unsigned int iField, int iVal ) ...@@ -281,7 +281,7 @@ UINT MSI_RecordSetInteger( MSIRECORD *rec, unsigned int iField, int iVal )
return ERROR_SUCCESS; return ERROR_SUCCESS;
} }
UINT WINAPI MsiRecordSetInteger( MSIHANDLE handle, unsigned int iField, int iVal ) UINT WINAPI MsiRecordSetInteger( MSIHANDLE handle, UINT iField, int iVal )
{ {
MSIRECORD *rec; MSIRECORD *rec;
UINT ret; UINT ret;
...@@ -299,7 +299,7 @@ UINT WINAPI MsiRecordSetInteger( MSIHANDLE handle, unsigned int iField, int iVal ...@@ -299,7 +299,7 @@ UINT WINAPI MsiRecordSetInteger( MSIHANDLE handle, unsigned int iField, int iVal
return ret; return ret;
} }
BOOL MSI_RecordIsNull( MSIRECORD *rec, unsigned int iField ) BOOL MSI_RecordIsNull( MSIRECORD *rec, UINT iField )
{ {
BOOL r = TRUE; BOOL r = TRUE;
...@@ -311,7 +311,7 @@ BOOL MSI_RecordIsNull( MSIRECORD *rec, unsigned int iField ) ...@@ -311,7 +311,7 @@ BOOL MSI_RecordIsNull( MSIRECORD *rec, unsigned int iField )
return r; return r;
} }
BOOL WINAPI MsiRecordIsNull( MSIHANDLE handle, unsigned int iField ) BOOL WINAPI MsiRecordIsNull( MSIHANDLE handle, UINT iField )
{ {
MSIRECORD *rec; MSIRECORD *rec;
UINT ret; UINT ret;
...@@ -329,8 +329,8 @@ BOOL WINAPI MsiRecordIsNull( MSIHANDLE handle, unsigned int iField ) ...@@ -329,8 +329,8 @@ BOOL WINAPI MsiRecordIsNull( MSIHANDLE handle, unsigned int iField )
} }
UINT MSI_RecordGetStringA(MSIRECORD *rec, unsigned int iField, UINT MSI_RecordGetStringA(MSIRECORD *rec, UINT iField,
LPSTR szValue, DWORD *pcchValue) LPSTR szValue, LPDWORD pcchValue)
{ {
UINT len=0, ret; UINT len=0, ret;
CHAR buffer[16]; CHAR buffer[16];
...@@ -375,8 +375,8 @@ UINT MSI_RecordGetStringA(MSIRECORD *rec, unsigned int iField, ...@@ -375,8 +375,8 @@ UINT MSI_RecordGetStringA(MSIRECORD *rec, unsigned int iField,
return ret; return ret;
} }
UINT WINAPI MsiRecordGetStringA(MSIHANDLE handle, unsigned int iField, UINT WINAPI MsiRecordGetStringA(MSIHANDLE handle, UINT iField,
LPSTR szValue, DWORD *pcchValue) LPSTR szValue, LPDWORD pcchValue)
{ {
MSIRECORD *rec; MSIRECORD *rec;
UINT ret; UINT ret;
...@@ -393,7 +393,7 @@ UINT WINAPI MsiRecordGetStringA(MSIHANDLE handle, unsigned int iField, ...@@ -393,7 +393,7 @@ UINT WINAPI MsiRecordGetStringA(MSIHANDLE handle, unsigned int iField,
return ret; return ret;
} }
const WCHAR *MSI_RecordGetString( const MSIRECORD *rec, unsigned int iField ) const WCHAR *MSI_RecordGetString( const MSIRECORD *rec, UINT iField )
{ {
if( iField > rec->count ) if( iField > rec->count )
return NULL; return NULL;
...@@ -404,8 +404,8 @@ const WCHAR *MSI_RecordGetString( const MSIRECORD *rec, unsigned int iField ) ...@@ -404,8 +404,8 @@ const WCHAR *MSI_RecordGetString( const MSIRECORD *rec, unsigned int iField )
return rec->fields[iField].u.szwVal; return rec->fields[iField].u.szwVal;
} }
UINT MSI_RecordGetStringW(MSIRECORD *rec, unsigned int iField, UINT MSI_RecordGetStringW(MSIRECORD *rec, UINT iField,
LPWSTR szValue, DWORD *pcchValue) LPWSTR szValue, LPDWORD pcchValue)
{ {
UINT len=0, ret; UINT len=0, ret;
WCHAR buffer[16]; WCHAR buffer[16];
...@@ -445,8 +445,8 @@ UINT MSI_RecordGetStringW(MSIRECORD *rec, unsigned int iField, ...@@ -445,8 +445,8 @@ UINT MSI_RecordGetStringW(MSIRECORD *rec, unsigned int iField,
return ret; return ret;
} }
UINT WINAPI MsiRecordGetStringW(MSIHANDLE handle, unsigned int iField, UINT WINAPI MsiRecordGetStringW(MSIHANDLE handle, UINT iField,
LPWSTR szValue, DWORD *pcchValue) LPWSTR szValue, LPDWORD pcchValue)
{ {
MSIRECORD *rec; MSIRECORD *rec;
UINT ret; UINT ret;
...@@ -475,7 +475,7 @@ static UINT msi_get_stream_size( IStream *stm ) ...@@ -475,7 +475,7 @@ static UINT msi_get_stream_size( IStream *stm )
return stat.cbSize.QuadPart; return stat.cbSize.QuadPart;
} }
UINT MSI_RecordDataSize(MSIRECORD *rec, unsigned int iField) UINT MSI_RecordDataSize(MSIRECORD *rec, UINT iField)
{ {
TRACE("%p %d\n", rec, iField); TRACE("%p %d\n", rec, iField);
...@@ -496,7 +496,7 @@ UINT MSI_RecordDataSize(MSIRECORD *rec, unsigned int iField) ...@@ -496,7 +496,7 @@ UINT MSI_RecordDataSize(MSIRECORD *rec, unsigned int iField)
return 0; return 0;
} }
UINT WINAPI MsiRecordDataSize(MSIHANDLE handle, unsigned int iField) UINT WINAPI MsiRecordDataSize(MSIHANDLE handle, UINT iField)
{ {
MSIRECORD *rec; MSIRECORD *rec;
UINT ret; UINT ret;
...@@ -513,7 +513,7 @@ UINT WINAPI MsiRecordDataSize(MSIHANDLE handle, unsigned int iField) ...@@ -513,7 +513,7 @@ UINT WINAPI MsiRecordDataSize(MSIHANDLE handle, unsigned int iField)
return ret; return ret;
} }
UINT MSI_RecordSetStringA( MSIRECORD *rec, unsigned int iField, LPCSTR szValue ) UINT MSI_RecordSetStringA( MSIRECORD *rec, UINT iField, LPCSTR szValue )
{ {
LPWSTR str; LPWSTR str;
...@@ -538,7 +538,7 @@ UINT MSI_RecordSetStringA( MSIRECORD *rec, unsigned int iField, LPCSTR szValue ) ...@@ -538,7 +538,7 @@ UINT MSI_RecordSetStringA( MSIRECORD *rec, unsigned int iField, LPCSTR szValue )
return 0; return 0;
} }
UINT WINAPI MsiRecordSetStringA( MSIHANDLE handle, unsigned int iField, LPCSTR szValue ) UINT WINAPI MsiRecordSetStringA( MSIHANDLE handle, UINT iField, LPCSTR szValue )
{ {
MSIRECORD *rec; MSIRECORD *rec;
UINT ret; UINT ret;
...@@ -555,7 +555,7 @@ UINT WINAPI MsiRecordSetStringA( MSIHANDLE handle, unsigned int iField, LPCSTR s ...@@ -555,7 +555,7 @@ UINT WINAPI MsiRecordSetStringA( MSIHANDLE handle, unsigned int iField, LPCSTR s
return ret; return ret;
} }
UINT MSI_RecordSetStringW( MSIRECORD *rec, unsigned int iField, LPCWSTR szValue ) UINT MSI_RecordSetStringW( MSIRECORD *rec, UINT iField, LPCWSTR szValue )
{ {
LPWSTR str; LPWSTR str;
...@@ -581,7 +581,7 @@ UINT MSI_RecordSetStringW( MSIRECORD *rec, unsigned int iField, LPCWSTR szValue ...@@ -581,7 +581,7 @@ UINT MSI_RecordSetStringW( MSIRECORD *rec, unsigned int iField, LPCWSTR szValue
return 0; return 0;
} }
UINT WINAPI MsiRecordSetStringW( MSIHANDLE handle, unsigned int iField, LPCWSTR szValue ) UINT WINAPI MsiRecordSetStringW( MSIHANDLE handle, UINT iField, LPCWSTR szValue )
{ {
MSIRECORD *rec; MSIRECORD *rec;
UINT ret; UINT ret;
...@@ -649,7 +649,7 @@ static UINT RECORD_StreamFromFile(LPCWSTR szFile, IStream **pstm) ...@@ -649,7 +649,7 @@ static UINT RECORD_StreamFromFile(LPCWSTR szFile, IStream **pstm)
return ERROR_SUCCESS; return ERROR_SUCCESS;
} }
UINT MSI_RecordSetStream(MSIRECORD *rec, unsigned int iField, IStream *stream) UINT MSI_RecordSetStream(MSIRECORD *rec, UINT iField, IStream *stream)
{ {
if ( (iField == 0) || (iField > rec->count) ) if ( (iField == 0) || (iField > rec->count) )
return ERROR_INVALID_PARAMETER; return ERROR_INVALID_PARAMETER;
...@@ -661,7 +661,7 @@ UINT MSI_RecordSetStream(MSIRECORD *rec, unsigned int iField, IStream *stream) ...@@ -661,7 +661,7 @@ UINT MSI_RecordSetStream(MSIRECORD *rec, unsigned int iField, IStream *stream)
return ERROR_SUCCESS; return ERROR_SUCCESS;
} }
UINT MSI_RecordSetStreamFromFileW(MSIRECORD *rec, unsigned int iField, LPCWSTR szFilename) UINT MSI_RecordSetStreamFromFileW(MSIRECORD *rec, UINT iField, LPCWSTR szFilename)
{ {
IStream *stm = NULL; IStream *stm = NULL;
HRESULT r; HRESULT r;
...@@ -701,7 +701,7 @@ UINT MSI_RecordSetStreamFromFileW(MSIRECORD *rec, unsigned int iField, LPCWSTR s ...@@ -701,7 +701,7 @@ UINT MSI_RecordSetStreamFromFileW(MSIRECORD *rec, unsigned int iField, LPCWSTR s
return ERROR_SUCCESS; return ERROR_SUCCESS;
} }
UINT WINAPI MsiRecordSetStreamA(MSIHANDLE hRecord, unsigned int iField, LPCSTR szFilename) UINT WINAPI MsiRecordSetStreamA(MSIHANDLE hRecord, UINT iField, LPCSTR szFilename)
{ {
LPWSTR wstr = NULL; LPWSTR wstr = NULL;
UINT ret; UINT ret;
...@@ -720,7 +720,7 @@ UINT WINAPI MsiRecordSetStreamA(MSIHANDLE hRecord, unsigned int iField, LPCSTR s ...@@ -720,7 +720,7 @@ UINT WINAPI MsiRecordSetStreamA(MSIHANDLE hRecord, unsigned int iField, LPCSTR s
return ret; return ret;
} }
UINT WINAPI MsiRecordSetStreamW(MSIHANDLE handle, unsigned int iField, LPCWSTR szFilename) UINT WINAPI MsiRecordSetStreamW(MSIHANDLE handle, UINT iField, LPCWSTR szFilename)
{ {
MSIRECORD *rec; MSIRECORD *rec;
UINT ret; UINT ret;
...@@ -738,7 +738,7 @@ UINT WINAPI MsiRecordSetStreamW(MSIHANDLE handle, unsigned int iField, LPCWSTR s ...@@ -738,7 +738,7 @@ UINT WINAPI MsiRecordSetStreamW(MSIHANDLE handle, unsigned int iField, LPCWSTR s
return ret; return ret;
} }
UINT MSI_RecordReadStream(MSIRECORD *rec, unsigned int iField, char *buf, DWORD *sz) UINT MSI_RecordReadStream(MSIRECORD *rec, UINT iField, char *buf, LPDWORD sz)
{ {
ULONG count; ULONG count;
HRESULT r; HRESULT r;
...@@ -790,7 +790,7 @@ UINT MSI_RecordReadStream(MSIRECORD *rec, unsigned int iField, char *buf, DWORD ...@@ -790,7 +790,7 @@ UINT MSI_RecordReadStream(MSIRECORD *rec, unsigned int iField, char *buf, DWORD
return ERROR_SUCCESS; return ERROR_SUCCESS;
} }
UINT WINAPI MsiRecordReadStream(MSIHANDLE handle, unsigned int iField, char *buf, DWORD *sz) UINT WINAPI MsiRecordReadStream(MSIHANDLE handle, UINT iField, char *buf, LPDWORD sz)
{ {
MSIRECORD *rec; MSIRECORD *rec;
UINT ret; UINT ret;
...@@ -807,7 +807,7 @@ UINT WINAPI MsiRecordReadStream(MSIHANDLE handle, unsigned int iField, char *buf ...@@ -807,7 +807,7 @@ UINT WINAPI MsiRecordReadStream(MSIHANDLE handle, unsigned int iField, char *buf
return ret; return ret;
} }
UINT MSI_RecordSetIStream( MSIRECORD *rec, unsigned int iField, IStream *stm ) UINT MSI_RecordSetIStream( MSIRECORD *rec, UINT iField, IStream *stm )
{ {
TRACE("%p %d %p\n", rec, iField, stm); TRACE("%p %d %p\n", rec, iField, stm);
...@@ -823,7 +823,7 @@ UINT MSI_RecordSetIStream( MSIRECORD *rec, unsigned int iField, IStream *stm ) ...@@ -823,7 +823,7 @@ UINT MSI_RecordSetIStream( MSIRECORD *rec, unsigned int iField, IStream *stm )
return ERROR_SUCCESS; return ERROR_SUCCESS;
} }
UINT MSI_RecordGetIStream( MSIRECORD *rec, unsigned int iField, IStream **pstm) UINT MSI_RecordGetIStream( MSIRECORD *rec, UINT iField, IStream **pstm)
{ {
TRACE("%p %d %p\n", rec, iField, pstm); TRACE("%p %d %p\n", rec, iField, pstm);
...@@ -871,7 +871,7 @@ end: ...@@ -871,7 +871,7 @@ end:
return ERROR_SUCCESS; return ERROR_SUCCESS;
} }
UINT MSI_RecordStreamToFile( MSIRECORD *rec, unsigned int iField, LPCWSTR name ) UINT MSI_RecordStreamToFile( MSIRECORD *rec, UINT iField, LPCWSTR name )
{ {
IStream *stm = NULL; IStream *stm = NULL;
UINT r; UINT r;
......
...@@ -1014,7 +1014,7 @@ UINT MSIREG_OpenLocalManagedProductKey(LPCWSTR szProductCode, HKEY *key, BOOL cr ...@@ -1014,7 +1014,7 @@ UINT MSIREG_OpenLocalManagedProductKey(LPCWSTR szProductCode, HKEY *key, BOOL cr
* *
*/ */
UINT WINAPI MsiDecomposeDescriptorW( LPCWSTR szDescriptor, LPWSTR szProduct, UINT WINAPI MsiDecomposeDescriptorW( LPCWSTR szDescriptor, LPWSTR szProduct,
LPWSTR szFeature, LPWSTR szComponent, DWORD *pUsed ) LPWSTR szFeature, LPWSTR szComponent, LPDWORD pUsed )
{ {
UINT r, len; UINT r, len;
LPWSTR p; LPWSTR p;
...@@ -1063,7 +1063,7 @@ UINT WINAPI MsiDecomposeDescriptorW( LPCWSTR szDescriptor, LPWSTR szProduct, ...@@ -1063,7 +1063,7 @@ UINT WINAPI MsiDecomposeDescriptorW( LPCWSTR szDescriptor, LPWSTR szProduct,
} }
UINT WINAPI MsiDecomposeDescriptorA( LPCSTR szDescriptor, LPSTR szProduct, UINT WINAPI MsiDecomposeDescriptorA( LPCSTR szDescriptor, LPSTR szProduct,
LPSTR szFeature, LPSTR szComponent, DWORD *pUsed ) LPSTR szFeature, LPSTR szComponent, LPDWORD pUsed )
{ {
WCHAR product[MAX_FEATURE_CHARS+1]; WCHAR product[MAX_FEATURE_CHARS+1];
WCHAR feature[MAX_FEATURE_CHARS+1]; WCHAR feature[MAX_FEATURE_CHARS+1];
...@@ -1277,8 +1277,8 @@ UINT WINAPI MsiEnumClientsW(LPCWSTR szComponent, DWORD index, LPWSTR szProduct) ...@@ -1277,8 +1277,8 @@ UINT WINAPI MsiEnumClientsW(LPCWSTR szComponent, DWORD index, LPWSTR szProduct)
} }
static UINT WINAPI MSI_EnumComponentQualifiers( LPCWSTR szComponent, DWORD iIndex, static UINT WINAPI MSI_EnumComponentQualifiers( LPCWSTR szComponent, DWORD iIndex,
awstring *lpQualBuf, DWORD* pcchQual, awstring *lpQualBuf, LPDWORD pcchQual,
awstring *lpAppBuf, DWORD* pcchAppBuf ) awstring *lpAppBuf, LPDWORD pcchAppBuf )
{ {
DWORD name_sz, val_sz, name_max, val_max, type, ofs; DWORD name_sz, val_sz, name_max, val_max, type, ofs;
LPWSTR name = NULL, val = NULL; LPWSTR name = NULL, val = NULL;
...@@ -1374,8 +1374,8 @@ end: ...@@ -1374,8 +1374,8 @@ end:
* MsiEnumComponentQualifiersA [MSI.@] * MsiEnumComponentQualifiersA [MSI.@]
*/ */
UINT WINAPI MsiEnumComponentQualifiersA( LPCSTR szComponent, DWORD iIndex, UINT WINAPI MsiEnumComponentQualifiersA( LPCSTR szComponent, DWORD iIndex,
LPSTR lpQualifierBuf, DWORD* pcchQualifierBuf, LPSTR lpQualifierBuf, LPDWORD pcchQualifierBuf,
LPSTR lpApplicationDataBuf, DWORD* pcchApplicationDataBuf ) LPSTR lpApplicationDataBuf, LPDWORD pcchApplicationDataBuf )
{ {
awstring qual, appdata; awstring qual, appdata;
LPWSTR comp; LPWSTR comp;
...@@ -1405,8 +1405,8 @@ UINT WINAPI MsiEnumComponentQualifiersA( LPCSTR szComponent, DWORD iIndex, ...@@ -1405,8 +1405,8 @@ UINT WINAPI MsiEnumComponentQualifiersA( LPCSTR szComponent, DWORD iIndex,
* MsiEnumComponentQualifiersW [MSI.@] * MsiEnumComponentQualifiersW [MSI.@]
*/ */
UINT WINAPI MsiEnumComponentQualifiersW( LPCWSTR szComponent, DWORD iIndex, UINT WINAPI MsiEnumComponentQualifiersW( LPCWSTR szComponent, DWORD iIndex,
LPWSTR lpQualifierBuf, DWORD* pcchQualifierBuf, LPWSTR lpQualifierBuf, LPDWORD pcchQualifierBuf,
LPWSTR lpApplicationDataBuf, DWORD* pcchApplicationDataBuf ) LPWSTR lpApplicationDataBuf, LPDWORD pcchApplicationDataBuf )
{ {
awstring qual, appdata; awstring qual, appdata;
...@@ -1492,7 +1492,7 @@ UINT WINAPI MsiEnumRelatedProductsA(LPCSTR szUpgradeCode, DWORD dwReserved, ...@@ -1492,7 +1492,7 @@ UINT WINAPI MsiEnumRelatedProductsA(LPCSTR szUpgradeCode, DWORD dwReserved,
* MsiEnumPatchesA [MSI.@] * MsiEnumPatchesA [MSI.@]
*/ */
UINT WINAPI MsiEnumPatchesA( LPCSTR szProduct, DWORD iPatchIndex, UINT WINAPI MsiEnumPatchesA( LPCSTR szProduct, DWORD iPatchIndex,
LPSTR lpPatchBuf, LPSTR lpTransformsBuf, DWORD* pcchTransformsBuf) LPSTR lpPatchBuf, LPSTR lpTransformsBuf, LPDWORD pcchTransformsBuf)
{ {
FIXME("%s %d %p %p %p\n", debugstr_a(szProduct), FIXME("%s %d %p %p %p\n", debugstr_a(szProduct),
iPatchIndex, lpPatchBuf, lpTransformsBuf, pcchTransformsBuf); iPatchIndex, lpPatchBuf, lpTransformsBuf, pcchTransformsBuf);
...@@ -1503,7 +1503,7 @@ UINT WINAPI MsiEnumPatchesA( LPCSTR szProduct, DWORD iPatchIndex, ...@@ -1503,7 +1503,7 @@ UINT WINAPI MsiEnumPatchesA( LPCSTR szProduct, DWORD iPatchIndex,
* MsiEnumPatchesW [MSI.@] * MsiEnumPatchesW [MSI.@]
*/ */
UINT WINAPI MsiEnumPatchesW( LPCWSTR szProduct, DWORD iPatchIndex, UINT WINAPI MsiEnumPatchesW( LPCWSTR szProduct, DWORD iPatchIndex,
LPWSTR lpPatchBuf, LPWSTR lpTransformsBuf, DWORD* pcchTransformsBuf) LPWSTR lpPatchBuf, LPWSTR lpTransformsBuf, LPDWORD pcchTransformsBuf)
{ {
FIXME("%s %d %p %p %p\n", debugstr_w(szProduct), FIXME("%s %d %p %p %p\n", debugstr_w(szProduct),
iPatchIndex, lpPatchBuf, lpTransformsBuf, pcchTransformsBuf); iPatchIndex, lpPatchBuf, lpTransformsBuf, pcchTransformsBuf);
......
...@@ -502,7 +502,7 @@ UINT WINAPI MsiGetSummaryInformationA(MSIHANDLE hDatabase, ...@@ -502,7 +502,7 @@ UINT WINAPI MsiGetSummaryInformationA(MSIHANDLE hDatabase,
return ret; return ret;
} }
UINT WINAPI MsiSummaryInfoGetPropertyCount(MSIHANDLE hSummaryInfo, UINT *pCount) UINT WINAPI MsiSummaryInfoGetPropertyCount(MSIHANDLE hSummaryInfo, PUINT pCount)
{ {
MSISUMMARYINFO *si; MSISUMMARYINFO *si;
...@@ -619,8 +619,8 @@ LPWSTR msi_get_suminfo_product( IStorage *stg ) ...@@ -619,8 +619,8 @@ LPWSTR msi_get_suminfo_product( IStorage *stg )
} }
UINT WINAPI MsiSummaryInfoGetPropertyA( UINT WINAPI MsiSummaryInfoGetPropertyA(
MSIHANDLE handle, UINT uiProperty, UINT *puiDataType, INT *piValue, MSIHANDLE handle, UINT uiProperty, PUINT puiDataType, LPINT piValue,
FILETIME *pftValue, LPSTR szValueBuf, DWORD *pcchValueBuf) FILETIME *pftValue, LPSTR szValueBuf, LPDWORD pcchValueBuf)
{ {
awstring str; awstring str;
...@@ -635,8 +635,8 @@ UINT WINAPI MsiSummaryInfoGetPropertyA( ...@@ -635,8 +635,8 @@ UINT WINAPI MsiSummaryInfoGetPropertyA(
} }
UINT WINAPI MsiSummaryInfoGetPropertyW( UINT WINAPI MsiSummaryInfoGetPropertyW(
MSIHANDLE handle, UINT uiProperty, UINT *puiDataType, INT *piValue, MSIHANDLE handle, UINT uiProperty, PUINT puiDataType, LPINT piValue,
FILETIME *pftValue, LPWSTR szValueBuf, DWORD *pcchValueBuf) FILETIME *pftValue, LPWSTR szValueBuf, LPDWORD pcchValueBuf)
{ {
awstring str; awstring str;
......
...@@ -417,8 +417,8 @@ UINT WINAPI MsiOpenProductA(LPCSTR, MSIHANDLE*); ...@@ -417,8 +417,8 @@ UINT WINAPI MsiOpenProductA(LPCSTR, MSIHANDLE*);
UINT WINAPI MsiOpenProductW(LPCWSTR, MSIHANDLE*); UINT WINAPI MsiOpenProductW(LPCWSTR, MSIHANDLE*);
#define MsiOpenProduct WINELIB_NAME_AW(MsiOpenProduct) #define MsiOpenProduct WINELIB_NAME_AW(MsiOpenProduct)
UINT WINAPI MsiGetProductPropertyA(MSIHANDLE,LPCSTR,LPSTR,DWORD*); UINT WINAPI MsiGetProductPropertyA(MSIHANDLE,LPCSTR,LPSTR,LPDWORD);
UINT WINAPI MsiGetProductPropertyW(MSIHANDLE,LPCWSTR,LPWSTR,DWORD*); UINT WINAPI MsiGetProductPropertyW(MSIHANDLE,LPCWSTR,LPWSTR,LPDWORD);
#define MsiGetProductProperty WINELIB_NAME_AW(MsiGetProductProperty) #define MsiGetProductProperty WINELIB_NAME_AW(MsiGetProductProperty)
UINT WINAPI MsiVerifyPackageA(LPCSTR); UINT WINAPI MsiVerifyPackageA(LPCSTR);
...@@ -449,8 +449,8 @@ UINT WINAPI MsiGetProductCodeA(LPCSTR, LPSTR); ...@@ -449,8 +449,8 @@ UINT WINAPI MsiGetProductCodeA(LPCSTR, LPSTR);
UINT WINAPI MsiGetProductCodeW(LPCWSTR, LPWSTR); UINT WINAPI MsiGetProductCodeW(LPCWSTR, LPWSTR);
#define MsiGetProductCode WINELIB_NAME_AW(MsiGetProductCode) #define MsiGetProductCode WINELIB_NAME_AW(MsiGetProductCode)
UINT WINAPI MsiGetProductInfoA(LPCSTR, LPCSTR, LPSTR, DWORD *); UINT WINAPI MsiGetProductInfoA(LPCSTR, LPCSTR, LPSTR, LPDWORD);
UINT WINAPI MsiGetProductInfoW(LPCWSTR, LPCWSTR, LPWSTR, DWORD *); UINT WINAPI MsiGetProductInfoW(LPCWSTR, LPCWSTR, LPWSTR, LPDWORD);
#define MsiGetProductInfo WINELIB_NAME_AW(MsiGetProductInfo) #define MsiGetProductInfo WINELIB_NAME_AW(MsiGetProductInfo)
UINT WINAPI MsiEnableLogA(DWORD, LPCSTR, DWORD); UINT WINAPI MsiEnableLogA(DWORD, LPCSTR, DWORD);
...@@ -461,32 +461,32 @@ INSTALLUI_HANDLERA WINAPI MsiSetExternalUIA(INSTALLUI_HANDLERA, DWORD, LPVOID); ...@@ -461,32 +461,32 @@ INSTALLUI_HANDLERA WINAPI MsiSetExternalUIA(INSTALLUI_HANDLERA, DWORD, LPVOID);
INSTALLUI_HANDLERW WINAPI MsiSetExternalUIW(INSTALLUI_HANDLERW, DWORD, LPVOID); INSTALLUI_HANDLERW WINAPI MsiSetExternalUIW(INSTALLUI_HANDLERW, DWORD, LPVOID);
#define MsiSetExternalUI WINELIB_NAME_AW(MsiSetExternalUI) #define MsiSetExternalUI WINELIB_NAME_AW(MsiSetExternalUI)
INSTALLSTATE WINAPI MsiGetComponentPathA(LPCSTR, LPCSTR, LPSTR, DWORD*); INSTALLSTATE WINAPI MsiGetComponentPathA(LPCSTR, LPCSTR, LPSTR, LPDWORD);
INSTALLSTATE WINAPI MsiGetComponentPathW(LPCWSTR, LPCWSTR, LPWSTR, DWORD*); INSTALLSTATE WINAPI MsiGetComponentPathW(LPCWSTR, LPCWSTR, LPWSTR, LPDWORD);
#define MsiGetComponentPath WINELIB_NAME_AW(MsiGetComponentPath) #define MsiGetComponentPath WINELIB_NAME_AW(MsiGetComponentPath)
INSTALLSTATE WINAPI MsiQueryFeatureStateA(LPCSTR, LPCSTR); INSTALLSTATE WINAPI MsiQueryFeatureStateA(LPCSTR, LPCSTR);
INSTALLSTATE WINAPI MsiQueryFeatureStateW(LPCWSTR, LPCWSTR); INSTALLSTATE WINAPI MsiQueryFeatureStateW(LPCWSTR, LPCWSTR);
#define MsiQueryFeatureState WINELIB_NAME_AW(MsiQueryFeatureState) #define MsiQueryFeatureState WINELIB_NAME_AW(MsiQueryFeatureState)
UINT WINAPI MsiGetFeatureUsageA(LPCSTR, LPCSTR, DWORD*, WORD*); UINT WINAPI MsiGetFeatureUsageA(LPCSTR, LPCSTR, LPDWORD, LPWORD);
UINT WINAPI MsiGetFeatureUsageW(LPCWSTR, LPCWSTR, DWORD*, WORD*); UINT WINAPI MsiGetFeatureUsageW(LPCWSTR, LPCWSTR, LPDWORD, LPWORD);
#define MsiGetFeatureUsage WINELIB_NAME_AW(MsiGetFeatureUsage) #define MsiGetFeatureUsage WINELIB_NAME_AW(MsiGetFeatureUsage)
UINT WINAPI MsiEnumRelatedProductsA(LPCSTR, DWORD, DWORD, LPSTR); UINT WINAPI MsiEnumRelatedProductsA(LPCSTR, DWORD, DWORD, LPSTR);
UINT WINAPI MsiEnumRelatedProductsW(LPCWSTR, DWORD, DWORD, LPWSTR); UINT WINAPI MsiEnumRelatedProductsW(LPCWSTR, DWORD, DWORD, LPWSTR);
#define MsiEnumRelatedProducts WINELIB_NAME_AW(MsiEnumRelatedProducts) #define MsiEnumRelatedProducts WINELIB_NAME_AW(MsiEnumRelatedProducts)
UINT WINAPI MsiProvideAssemblyA(LPCSTR, LPCSTR, DWORD, DWORD, LPSTR, DWORD*); UINT WINAPI MsiProvideAssemblyA(LPCSTR, LPCSTR, DWORD, DWORD, LPSTR, LPDWORD);
UINT WINAPI MsiProvideAssemblyW(LPCWSTR, LPCWSTR, DWORD, DWORD, LPWSTR, DWORD*); UINT WINAPI MsiProvideAssemblyW(LPCWSTR, LPCWSTR, DWORD, DWORD, LPWSTR, LPDWORD);
#define MsiProvideAssembly WINELIB_NAME_AW(MsiProvideAssembly) #define MsiProvideAssembly WINELIB_NAME_AW(MsiProvideAssembly)
UINT WINAPI MsiEnumComponentQualifiersA(LPCSTR, DWORD, LPSTR, DWORD*, LPSTR, DWORD*); UINT WINAPI MsiEnumComponentQualifiersA(LPCSTR, DWORD, LPSTR, LPDWORD, LPSTR, LPDWORD);
UINT WINAPI MsiEnumComponentQualifiersW(LPCWSTR, DWORD, LPWSTR, DWORD*, LPWSTR, DWORD*); UINT WINAPI MsiEnumComponentQualifiersW(LPCWSTR, DWORD, LPWSTR, LPDWORD, LPWSTR, LPDWORD);
#define MsiEnumComponentQualifiers WINELIB_NAME_AW(MsiEnumComponentQualifiers) #define MsiEnumComponentQualifiers WINELIB_NAME_AW(MsiEnumComponentQualifiers)
UINT WINAPI MsiGetFileVersionA(LPCSTR, LPSTR, DWORD*, LPSTR, DWORD*); UINT WINAPI MsiGetFileVersionA(LPCSTR, LPSTR, LPDWORD, LPSTR, LPDWORD);
UINT WINAPI MsiGetFileVersionW(LPCWSTR, LPWSTR, DWORD*, LPWSTR, DWORD*); UINT WINAPI MsiGetFileVersionW(LPCWSTR, LPWSTR, LPDWORD, LPWSTR, LPDWORD);
#define MsiGetFileVersion WINELIB_NAME_AW(MsiGetFileVersion) #define MsiGetFileVersion WINELIB_NAME_AW(MsiGetFileVersion)
UINT WINAPI MsiMessageBoxA(HWND, LPCSTR, LPCSTR, UINT, WORD, DWORD); UINT WINAPI MsiMessageBoxA(HWND, LPCSTR, LPCSTR, UINT, WORD, DWORD);
...@@ -497,12 +497,12 @@ UINT WINAPI MsiProvideQualifiedComponentExA(LPCSTR, LPCSTR, DWORD, LPCSTR, DWORD ...@@ -497,12 +497,12 @@ UINT WINAPI MsiProvideQualifiedComponentExA(LPCSTR, LPCSTR, DWORD, LPCSTR, DWORD
UINT WINAPI MsiProvideQualifiedComponentExW(LPCWSTR, LPCWSTR, DWORD, LPCWSTR, DWORD, DWORD, LPWSTR, LPDWORD); UINT WINAPI MsiProvideQualifiedComponentExW(LPCWSTR, LPCWSTR, DWORD, LPCWSTR, DWORD, DWORD, LPWSTR, LPDWORD);
#define MsiProvideQualifiedComponentEx WINELIB_NAME_AW(MsiProvideQualifiedComponentEx) #define MsiProvideQualifiedComponentEx WINELIB_NAME_AW(MsiProvideQualifiedComponentEx)
UINT WINAPI MsiProvideQualifiedComponentA(LPCSTR, LPCSTR, DWORD, LPSTR, DWORD*); UINT WINAPI MsiProvideQualifiedComponentA(LPCSTR, LPCSTR, DWORD, LPSTR, LPDWORD);
UINT WINAPI MsiProvideQualifiedComponentW(LPCWSTR, LPCWSTR, DWORD, LPWSTR, DWORD*); UINT WINAPI MsiProvideQualifiedComponentW(LPCWSTR, LPCWSTR, DWORD, LPWSTR, LPDWORD);
#define MsiProvideQualifiedComponent WINELIB_NAME_AW(MsiProvideQualifiedComponent) #define MsiProvideQualifiedComponent WINELIB_NAME_AW(MsiProvideQualifiedComponent)
USERINFOSTATE WINAPI MsiGetUserInfoA(LPCSTR, LPSTR, DWORD*, LPSTR, DWORD*, LPSTR, DWORD*); USERINFOSTATE WINAPI MsiGetUserInfoA(LPCSTR, LPSTR, LPDWORD, LPSTR, LPDWORD, LPSTR, LPDWORD);
USERINFOSTATE WINAPI MsiGetUserInfoW(LPCWSTR, LPWSTR, DWORD*, LPWSTR, DWORD*, LPWSTR, DWORD*); USERINFOSTATE WINAPI MsiGetUserInfoW(LPCWSTR, LPWSTR, LPDWORD, LPWSTR, LPDWORD, LPWSTR, LPDWORD);
#define MsiGetUserInfo WINELIB_NAME_AW(MsiGetUserInfo) #define MsiGetUserInfo WINELIB_NAME_AW(MsiGetUserInfo)
UINT WINAPI MsiCollectUserInfoA(LPCSTR); UINT WINAPI MsiCollectUserInfoA(LPCSTR);
...@@ -525,12 +525,12 @@ INSTALLSTATE WINAPI MsiUseFeatureExW(LPCWSTR, LPCWSTR, DWORD, DWORD); ...@@ -525,12 +525,12 @@ INSTALLSTATE WINAPI MsiUseFeatureExW(LPCWSTR, LPCWSTR, DWORD, DWORD);
INSTALLSTATE WINAPI MsiUseFeatureExA(LPCSTR, LPCSTR, DWORD, DWORD); INSTALLSTATE WINAPI MsiUseFeatureExA(LPCSTR, LPCSTR, DWORD, DWORD);
#define MsiUseFeatureEx WINELIB_NAME_AW(MsiUseFeatureEx) #define MsiUseFeatureEx WINELIB_NAME_AW(MsiUseFeatureEx)
HRESULT WINAPI MsiGetFileSignatureInformationA(LPCSTR, DWORD, PCCERT_CONTEXT*, BYTE*, DWORD*); HRESULT WINAPI MsiGetFileSignatureInformationA(LPCSTR, DWORD, PCCERT_CONTEXT*, LPBYTE, LPDWORD);
HRESULT WINAPI MsiGetFileSignatureInformationW(LPCWSTR, DWORD, PCCERT_CONTEXT*, BYTE*, DWORD*); HRESULT WINAPI MsiGetFileSignatureInformationW(LPCWSTR, DWORD, PCCERT_CONTEXT*, LPBYTE, LPDWORD);
#define MsiGetFileSignatureInformation WINELIB_NAME_AW(MsiGetFileSignatureInformation) #define MsiGetFileSignatureInformation WINELIB_NAME_AW(MsiGetFileSignatureInformation)
INSTALLSTATE WINAPI MsiLocateComponentA(LPCSTR, LPSTR, DWORD *); INSTALLSTATE WINAPI MsiLocateComponentA(LPCSTR, LPSTR, LPDWORD);
INSTALLSTATE WINAPI MsiLocateComponentW(LPCWSTR, LPWSTR, DWORD *); INSTALLSTATE WINAPI MsiLocateComponentW(LPCWSTR, LPWSTR, LPDWORD);
#define MsiLocateComponent WINELIB_NAME_AW(MsiLocateComponent) #define MsiLocateComponent WINELIB_NAME_AW(MsiLocateComponent)
UINT WINAPI MsiSourceListAddSourceA(LPCSTR, LPCSTR, DWORD, LPCSTR); UINT WINAPI MsiSourceListAddSourceA(LPCSTR, LPCSTR, DWORD, LPCSTR);
...@@ -557,8 +557,8 @@ UINT WINAPI MsiSourceListAddMediaDiskA(LPCSTR, LPCSTR, MSIINSTALLCONTEXT, DWORD, ...@@ -557,8 +557,8 @@ UINT WINAPI MsiSourceListAddMediaDiskA(LPCSTR, LPCSTR, MSIINSTALLCONTEXT, DWORD,
UINT WINAPI MsiSourceListAddMediaDiskW(LPCWSTR, LPCWSTR, MSIINSTALLCONTEXT, DWORD, DWORD, LPCWSTR, LPCWSTR); UINT WINAPI MsiSourceListAddMediaDiskW(LPCWSTR, LPCWSTR, MSIINSTALLCONTEXT, DWORD, DWORD, LPCWSTR, LPCWSTR);
#define MsiSourceListAddMediaDisk WINELIB_NAME_AW(MsiSourceListAddMediaDisk) #define MsiSourceListAddMediaDisk WINELIB_NAME_AW(MsiSourceListAddMediaDisk)
UINT WINAPI MsiEnumPatchesA(LPCSTR, DWORD, LPSTR, LPSTR, DWORD*); UINT WINAPI MsiEnumPatchesA(LPCSTR, DWORD, LPSTR, LPSTR, LPDWORD);
UINT WINAPI MsiEnumPatchesW(LPCWSTR, DWORD, LPWSTR, LPWSTR, DWORD*); UINT WINAPI MsiEnumPatchesW(LPCWSTR, DWORD, LPWSTR, LPWSTR, LPDWORD);
#define MsiEnumPatches WINELIB_NAME_AW(MsiEnumPatches) #define MsiEnumPatches WINELIB_NAME_AW(MsiEnumPatches)
UINT WINAPI MsiGetFileHashA(LPCSTR, DWORD, PMSIFILEHASHINFO); UINT WINAPI MsiGetFileHashA(LPCSTR, DWORD, PMSIFILEHASHINFO);
......
...@@ -149,33 +149,33 @@ UINT WINAPI MsiViewClose(MSIHANDLE); ...@@ -149,33 +149,33 @@ UINT WINAPI MsiViewClose(MSIHANDLE);
UINT WINAPI MsiDatabaseOpenViewA(MSIHANDLE,LPCSTR,MSIHANDLE*); UINT WINAPI MsiDatabaseOpenViewA(MSIHANDLE,LPCSTR,MSIHANDLE*);
UINT WINAPI MsiDatabaseOpenViewW(MSIHANDLE,LPCWSTR,MSIHANDLE*); UINT WINAPI MsiDatabaseOpenViewW(MSIHANDLE,LPCWSTR,MSIHANDLE*);
#define MsiDatabaseOpenView WINELIB_NAME_AW(MsiDatabaseOpenView) #define MsiDatabaseOpenView WINELIB_NAME_AW(MsiDatabaseOpenView)
MSIDBERROR WINAPI MsiViewGetErrorA(MSIHANDLE,LPSTR,DWORD*); MSIDBERROR WINAPI MsiViewGetErrorA(MSIHANDLE,LPSTR,LPDWORD);
MSIDBERROR WINAPI MsiViewGetErrorW(MSIHANDLE,LPWSTR,DWORD*); MSIDBERROR WINAPI MsiViewGetErrorW(MSIHANDLE,LPWSTR,LPDWORD);
#define MsiViewGetError WINELIB_NAME_AW(MsiViewGetError) #define MsiViewGetError WINELIB_NAME_AW(MsiViewGetError)
MSIDBSTATE WINAPI MsiGetDatabaseState(MSIHANDLE); MSIDBSTATE WINAPI MsiGetDatabaseState(MSIHANDLE);
/* record manipulation */ /* record manipulation */
MSIHANDLE WINAPI MsiCreateRecord(unsigned int); MSIHANDLE WINAPI MsiCreateRecord(UINT);
UINT WINAPI MsiRecordClearData(MSIHANDLE); UINT WINAPI MsiRecordClearData(MSIHANDLE);
UINT WINAPI MsiRecordSetInteger(MSIHANDLE,unsigned int,int); UINT WINAPI MsiRecordSetInteger(MSIHANDLE,UINT,int);
UINT WINAPI MsiRecordSetStringA(MSIHANDLE,unsigned int,LPCSTR); UINT WINAPI MsiRecordSetStringA(MSIHANDLE,UINT,LPCSTR);
UINT WINAPI MsiRecordSetStringW(MSIHANDLE,unsigned int,LPCWSTR); UINT WINAPI MsiRecordSetStringW(MSIHANDLE,UINT,LPCWSTR);
#define MsiRecordSetString WINELIB_NAME_AW(MsiRecordSetString) #define MsiRecordSetString WINELIB_NAME_AW(MsiRecordSetString)
UINT WINAPI MsiRecordGetStringA(MSIHANDLE,unsigned int,LPSTR,DWORD*); UINT WINAPI MsiRecordGetStringA(MSIHANDLE,UINT,LPSTR,LPDWORD);
UINT WINAPI MsiRecordGetStringW(MSIHANDLE,unsigned int,LPWSTR,DWORD*); UINT WINAPI MsiRecordGetStringW(MSIHANDLE,UINT,LPWSTR,LPDWORD);
#define MsiRecordGetString WINELIB_NAME_AW(MsiRecordGetString) #define MsiRecordGetString WINELIB_NAME_AW(MsiRecordGetString)
UINT WINAPI MsiRecordGetFieldCount(MSIHANDLE); UINT WINAPI MsiRecordGetFieldCount(MSIHANDLE);
int WINAPI MsiRecordGetInteger(MSIHANDLE,unsigned int); int WINAPI MsiRecordGetInteger(MSIHANDLE,UINT);
UINT WINAPI MsiRecordDataSize(MSIHANDLE,unsigned int); UINT WINAPI MsiRecordDataSize(MSIHANDLE,UINT);
BOOL WINAPI MsiRecordIsNull(MSIHANDLE,unsigned int); BOOL WINAPI MsiRecordIsNull(MSIHANDLE,UINT);
UINT WINAPI MsiFormatRecordA(MSIHANDLE,MSIHANDLE,LPSTR,DWORD*); UINT WINAPI MsiFormatRecordA(MSIHANDLE,MSIHANDLE,LPSTR,LPDWORD);
UINT WINAPI MsiFormatRecordW(MSIHANDLE,MSIHANDLE,LPWSTR,DWORD*); UINT WINAPI MsiFormatRecordW(MSIHANDLE,MSIHANDLE,LPWSTR,LPDWORD);
#define MsiFormatRecord WINELIB_NAME_AW(MsiFormatRecord) #define MsiFormatRecord WINELIB_NAME_AW(MsiFormatRecord)
UINT WINAPI MsiRecordSetStreamA(MSIHANDLE,unsigned int,LPCSTR); UINT WINAPI MsiRecordSetStreamA(MSIHANDLE,UINT,LPCSTR);
UINT WINAPI MsiRecordSetStreamW(MSIHANDLE,unsigned int,LPCWSTR); UINT WINAPI MsiRecordSetStreamW(MSIHANDLE,UINT,LPCWSTR);
#define MsiRecordSetStream WINELIB_NAME_AW(MsiRecordSetStream) #define MsiRecordSetStream WINELIB_NAME_AW(MsiRecordSetStream)
UINT WINAPI MsiRecordReadStream(MSIHANDLE,unsigned int,char*,DWORD *); UINT WINAPI MsiRecordReadStream(MSIHANDLE,UINT,char*,LPDWORD);
UINT WINAPI MsiDatabaseGetPrimaryKeysA(MSIHANDLE,LPCSTR,MSIHANDLE*); UINT WINAPI MsiDatabaseGetPrimaryKeysA(MSIHANDLE,LPCSTR,MSIHANDLE*);
UINT WINAPI MsiDatabaseGetPrimaryKeysW(MSIHANDLE,LPCWSTR,MSIHANDLE*); UINT WINAPI MsiDatabaseGetPrimaryKeysW(MSIHANDLE,LPCWSTR,MSIHANDLE*);
...@@ -200,6 +200,9 @@ UINT WINAPI MsiDatabaseCommit(MSIHANDLE); ...@@ -200,6 +200,9 @@ UINT WINAPI MsiDatabaseCommit(MSIHANDLE);
UINT WINAPI MsiGetFeatureStateA(MSIHANDLE,LPCSTR,INSTALLSTATE*,INSTALLSTATE*); UINT WINAPI MsiGetFeatureStateA(MSIHANDLE,LPCSTR,INSTALLSTATE*,INSTALLSTATE*);
UINT WINAPI MsiGetFeatureStateW(MSIHANDLE,LPCWSTR,INSTALLSTATE*,INSTALLSTATE*); UINT WINAPI MsiGetFeatureStateW(MSIHANDLE,LPCWSTR,INSTALLSTATE*,INSTALLSTATE*);
#define MsiGetFeatureState WINELIB_NAME_AW(MsiGetFeatureState) #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 MsiSetComponentStateA(MSIHANDLE,LPCSTR,INSTALLSTATE);
UINT WINAPI MsiSetComponentStateW(MSIHANDLE,LPCWSTR,INSTALLSTATE); UINT WINAPI MsiSetComponentStateW(MSIHANDLE,LPCWSTR,INSTALLSTATE);
#define MsiSetComponentState WINELIB_NAME_AW(MsiSetComponentState) #define MsiSetComponentState WINELIB_NAME_AW(MsiSetComponentState)
...@@ -212,24 +215,24 @@ MSICONDITION WINAPI MsiEvaluateConditionW(MSIHANDLE,LPCWSTR); ...@@ -212,24 +215,24 @@ MSICONDITION WINAPI MsiEvaluateConditionW(MSIHANDLE,LPCWSTR);
#define MsiEvaluateCondition WINELIB_NAME_AW(MsiEvaluateCondition) #define MsiEvaluateCondition WINELIB_NAME_AW(MsiEvaluateCondition)
/* property functions */ /* property functions */
UINT WINAPI MsiGetPropertyA(MSIHANDLE, LPCSTR, LPSTR, DWORD*); UINT WINAPI MsiGetPropertyA(MSIHANDLE, LPCSTR, LPSTR, LPDWORD);
UINT WINAPI MsiGetPropertyW(MSIHANDLE, LPCWSTR, LPWSTR, DWORD*); UINT WINAPI MsiGetPropertyW(MSIHANDLE, LPCWSTR, LPWSTR, LPDWORD);
#define MsiGetProperty WINELIB_NAME_AW(MsiGetProperty) #define MsiGetProperty WINELIB_NAME_AW(MsiGetProperty)
UINT WINAPI MsiSetPropertyA(MSIHANDLE, LPCSTR, LPCSTR); UINT WINAPI MsiSetPropertyA(MSIHANDLE, LPCSTR, LPCSTR);
UINT WINAPI MsiSetPropertyW(MSIHANDLE, LPCWSTR, LPCWSTR); UINT WINAPI MsiSetPropertyW(MSIHANDLE, LPCWSTR, LPCWSTR);
#define MsiSetProperty WINELIB_NAME_AW(MsiSetProperty) #define MsiSetProperty WINELIB_NAME_AW(MsiSetProperty)
UINT WINAPI MsiGetTargetPathA(MSIHANDLE,LPCSTR,LPSTR,DWORD*); UINT WINAPI MsiGetTargetPathA(MSIHANDLE,LPCSTR,LPSTR,LPDWORD);
UINT WINAPI MsiGetTargetPathW(MSIHANDLE,LPCWSTR,LPWSTR,DWORD*); UINT WINAPI MsiGetTargetPathW(MSIHANDLE,LPCWSTR,LPWSTR,LPDWORD);
#define MsiGetTargetPath WINELIB_NAME_AW(MsiGetTargetPath) #define MsiGetTargetPath WINELIB_NAME_AW(MsiGetTargetPath)
UINT WINAPI MsiSetTargetPathA(MSIHANDLE, LPCSTR, LPCSTR); UINT WINAPI MsiSetTargetPathA(MSIHANDLE, LPCSTR, LPCSTR);
UINT WINAPI MsiSetTargetPathW(MSIHANDLE, LPCWSTR, LPCWSTR); UINT WINAPI MsiSetTargetPathW(MSIHANDLE, LPCWSTR, LPCWSTR);
#define MsiSetTargetPath WINELIB_NAME_AW(MsiSetTargetPath) #define MsiSetTargetPath WINELIB_NAME_AW(MsiSetTargetPath)
UINT WINAPI MsiGetSourcePathA(MSIHANDLE,LPCSTR,LPSTR,DWORD*); UINT WINAPI MsiGetSourcePathA(MSIHANDLE,LPCSTR,LPSTR,LPDWORD);
UINT WINAPI MsiGetSourcePathW(MSIHANDLE,LPCWSTR,LPWSTR,DWORD*); UINT WINAPI MsiGetSourcePathW(MSIHANDLE,LPCWSTR,LPWSTR,LPDWORD);
#define MsiGetSourcePath WINELIB_NAME_AW(MsiGetSourcePath) #define MsiGetSourcePath WINELIB_NAME_AW(MsiGetSourcePath)
MSIHANDLE WINAPI MsiGetActiveDatabase(MSIHANDLE); MSIHANDLE WINAPI MsiGetActiveDatabase(MSIHANDLE);
...@@ -257,8 +260,8 @@ UINT WINAPI MsiGetSummaryInformationA(MSIHANDLE, LPCSTR, UINT, MSIHANDLE *); ...@@ -257,8 +260,8 @@ UINT WINAPI MsiGetSummaryInformationA(MSIHANDLE, LPCSTR, UINT, MSIHANDLE *);
UINT WINAPI MsiGetSummaryInformationW(MSIHANDLE, LPCWSTR, UINT, MSIHANDLE *); UINT WINAPI MsiGetSummaryInformationW(MSIHANDLE, LPCWSTR, UINT, MSIHANDLE *);
#define MsiGetSummaryInformation WINELIB_NAME_AW(MsiGetSummaryInformation) #define MsiGetSummaryInformation WINELIB_NAME_AW(MsiGetSummaryInformation)
UINT WINAPI MsiSummaryInfoGetPropertyA(MSIHANDLE,UINT,UINT*,INT*,FILETIME*,LPSTR,DWORD*); UINT WINAPI MsiSummaryInfoGetPropertyA(MSIHANDLE,UINT,PUINT,LPINT,FILETIME*,LPSTR,LPDWORD);
UINT WINAPI MsiSummaryInfoGetPropertyW(MSIHANDLE,UINT,UINT*,INT*,FILETIME*,LPWSTR,DWORD*); UINT WINAPI MsiSummaryInfoGetPropertyW(MSIHANDLE,UINT,PUINT,LPINT,FILETIME*,LPWSTR,LPDWORD);
#define MsiSummaryInfoGetProperty WINELIB_NAME_AW(MsiSummaryInfoGetProperty) #define MsiSummaryInfoGetProperty WINELIB_NAME_AW(MsiSummaryInfoGetProperty)
UINT WINAPI MsiSummaryInfoSetPropertyA(MSIHANDLE, UINT, UINT, INT, FILETIME*, LPCSTR); UINT WINAPI MsiSummaryInfoSetPropertyA(MSIHANDLE, UINT, UINT, INT, FILETIME*, LPCSTR);
...@@ -286,7 +289,7 @@ UINT WINAPI MsiSequenceW(MSIHANDLE, LPCWSTR, INT); ...@@ -286,7 +289,7 @@ UINT WINAPI MsiSequenceW(MSIHANDLE, LPCWSTR, INT);
#define MsiSequence WINELIB_NAME_AW(MsiSequence) #define MsiSequence WINELIB_NAME_AW(MsiSequence)
UINT WINAPI MsiSummaryInfoPersist(MSIHANDLE); UINT WINAPI MsiSummaryInfoPersist(MSIHANDLE);
UINT WINAPI MsiSummaryInfoGetPropertyCount(MSIHANDLE,UINT*); UINT WINAPI MsiSummaryInfoGetPropertyCount(MSIHANDLE,PUINT);
UINT WINAPI MsiEnableUIPreview(MSIHANDLE, MSIHANDLE*); UINT WINAPI MsiEnableUIPreview(MSIHANDLE, MSIHANDLE*);
BOOL WINAPI MsiGetMode(MSIHANDLE, MSIRUNMODE); BOOL WINAPI MsiGetMode(MSIHANDLE, MSIRUNMODE);
...@@ -294,8 +297,8 @@ BOOL WINAPI MsiSetMode(MSIHANDLE, MSIRUNMODE, BOOL); ...@@ -294,8 +297,8 @@ BOOL WINAPI MsiSetMode(MSIHANDLE, MSIRUNMODE, BOOL);
UINT WINAPI MsiViewModify(MSIHANDLE, MSIMODIFY, MSIHANDLE); UINT WINAPI MsiViewModify(MSIHANDLE, MSIMODIFY, MSIHANDLE);
UINT WINAPI MsiGetFeatureCostA(MSIHANDLE, LPCSTR, MSICOSTTREE, INSTALLSTATE, INT*); UINT WINAPI MsiGetFeatureCostA(MSIHANDLE, LPCSTR, MSICOSTTREE, INSTALLSTATE, LPINT);
UINT WINAPI MsiGetFeatureCostW(MSIHANDLE, LPCWSTR, MSICOSTTREE, INSTALLSTATE, INT*); UINT WINAPI MsiGetFeatureCostW(MSIHANDLE, LPCWSTR, MSICOSTTREE, INSTALLSTATE, LPINT);
#define MsiGetFeatureCost WINELIB_NAME_AW(MsiGetFeatureCost) #define MsiGetFeatureCost WINELIB_NAME_AW(MsiGetFeatureCost)
LANGID WINAPI MsiGetLanguage(MSIHANDLE); LANGID WINAPI MsiGetLanguage(MSIHANDLE);
......
...@@ -2506,41 +2506,44 @@ INT ...@@ -2506,41 +2506,44 @@ INT
LANGID LANGID
MSICOLINFO MSICOLINFO
MSICONDITION MSICONDITION
MSICOSTTREE
MSIDBERROR MSIDBERROR
MSIDBSTATE MSIDBSTATE
MSIHANDLE MSIHANDLE
MSIINSTALLCONTEXT
MSIMODIFY MSIMODIFY
MSIRUNMODE MSIRUNMODE
UINT UINT
USERINFOSTATE USERINFOSTATE
WORD WORD
int int
unsigned int
%ptr %ptr
BYTE *
DLLVERSIONINFO * DLLVERSIONINFO *
DWORD *
FILETIME * FILETIME *
HWND * HWND *
INSTALLSTATE * INSTALLSTATE *
INSTALLUI_HANDLERA INSTALLUI_HANDLERA
INSTALLUI_HANDLERW INSTALLUI_HANDLERW
INT * LPBYTE
LPDWORD
LPINT
LPVOID LPVOID
LPVOID * LPVOID *
LPWORD
MSIHANDLE * MSIHANDLE *
MSIINSTALLCONTEXT *
PCCERT_CONTEXT * PCCERT_CONTEXT *
PHKEY PHKEY
PMSIFILEHASHINFO PMSIFILEHASHINFO
PUINT
REFCLSID REFCLSID
REFIID REFIID
UINT *
WORD *
%str %str
CHAR[39]
LPCSTR LPCSTR
LPSTR LPSTR
char * char *
...@@ -2549,6 +2552,7 @@ char * ...@@ -2549,6 +2552,7 @@ char *
LPCWSTR LPCWSTR
LPWSTR LPWSTR
WCHAR[39]
%%msimg32.dll %%msimg32.dll
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment