msi: Better match the PSDK types, remove some now unused types from
win32.api, and update it to fix the winapi_check warnings.
Francois Gouget
fgouget at free.fr
Thu Aug 9 03:41:41 CDT 2007
---
dlls/msi/format.c | 6 ++--
dlls/msi/install.c | 20 ++++++------
dlls/msi/msi.c | 64 +++++++++++++++++++++---------------------
dlls/msi/msipriv.h | 46 +++++++++++++++---------------
dlls/msi/msiquery.c | 6 ++--
dlls/msi/package.c | 8 ++--
dlls/msi/record.c | 72 ++++++++++++++++++++++++------------------------
dlls/msi/registry.c | 20 ++++++------
dlls/msi/suminfo.c | 10 +++---
include/msi.h | 48 ++++++++++++++++----------------
include/msiquery.h | 57 ++++++++++++++++++++------------------
tools/winapi/win32.api | 16 ++++++----
12 files changed, 190 insertions(+), 183 deletions(-)
diff --git a/dlls/msi/format.c b/dlls/msi/format.c
index 8dc99b8..06ef676 100644
--- a/dlls/msi/format.c
+++ b/dlls/msi/format.c
@@ -611,7 +611,7 @@ static DWORD deformat_string_internal(MSIPACKAGE *package, LPCWSTR ptr,
UINT MSI_FormatRecordW( MSIPACKAGE* package, MSIRECORD* record, LPWSTR buffer,
- DWORD *size )
+ LPDWORD size )
{
LPWSTR deformated;
LPWSTR rec;
@@ -658,7 +658,7 @@ UINT MSI_FormatRecordW( MSIPACKAGE* package, MSIRECORD* record, LPWSTR buffer,
}
UINT WINAPI MsiFormatRecordW( MSIHANDLE hInstall, MSIHANDLE hRecord,
- LPWSTR szResult, DWORD *sz )
+ LPWSTR szResult, LPDWORD sz )
{
UINT r = ERROR_INVALID_HANDLE;
MSIPACKAGE *package;
@@ -738,7 +738,7 @@ done:
}
UINT WINAPI MsiFormatRecordA( MSIHANDLE hInstall, MSIHANDLE hRecord,
- LPSTR szResult, DWORD *sz )
+ LPSTR szResult, LPDWORD sz )
{
UINT r;
DWORD len, save;
diff --git a/dlls/msi/install.c b/dlls/msi/install.c
index c370a28..999840d 100644
--- a/dlls/msi/install.c
+++ b/dlls/msi/install.c
@@ -216,7 +216,7 @@ UINT msi_strcpy_to_awstring( LPCWSTR str, awstring *awbuf, DWORD *sz )
* MsiGetTargetPath (internal)
*/
static UINT WINAPI MSI_GetTargetPath( MSIHANDLE hInstall, LPCWSTR szFolder,
- awstring *szPathBuf, DWORD* pcchPathBuf )
+ awstring *szPathBuf, LPDWORD pcchPathBuf )
{
MSIPACKAGE *package;
LPWSTR path;
@@ -297,7 +297,7 @@ done:
* MsiGetTargetPathA (MSI.@)
*/
UINT WINAPI MsiGetTargetPathA( MSIHANDLE hInstall, LPCSTR szFolder,
- LPSTR szPathBuf, DWORD* pcchPathBuf )
+ LPSTR szPathBuf, LPDWORD pcchPathBuf )
{
LPWSTR szwFolder;
awstring path;
@@ -323,7 +323,7 @@ UINT WINAPI MsiGetTargetPathA( MSIHANDLE hInstall, LPCSTR szFolder,
* MsiGetTargetPathW (MSI.@)
*/
UINT WINAPI MsiGetTargetPathW( MSIHANDLE hInstall, LPCWSTR szFolder,
- LPWSTR szPathBuf, DWORD* pcchPathBuf )
+ LPWSTR szPathBuf, LPDWORD pcchPathBuf )
{
awstring path;
@@ -339,7 +339,7 @@ UINT WINAPI MsiGetTargetPathW( MSIHANDLE hInstall, LPCWSTR szFolder,
* MsiGetSourcePath (internal)
*/
static UINT MSI_GetSourcePath( MSIHANDLE hInstall, LPCWSTR szFolder,
- awstring *szPathBuf, DWORD* pcchPathBuf )
+ awstring *szPathBuf, LPDWORD pcchPathBuf )
{
MSIPACKAGE *package;
LPWSTR path;
@@ -429,7 +429,7 @@ done:
* MsiGetSourcePathA (MSI.@)
*/
UINT WINAPI MsiGetSourcePathA( MSIHANDLE hInstall, LPCSTR szFolder,
- LPSTR szPathBuf, DWORD* pcchPathBuf )
+ LPSTR szPathBuf, LPDWORD pcchPathBuf )
{
LPWSTR folder;
awstring str;
@@ -451,7 +451,7 @@ UINT WINAPI MsiGetSourcePathA( MSIHANDLE hInstall, LPCSTR szFolder,
* MsiGetSourcePathW (MSI.@)
*/
UINT WINAPI MsiGetSourcePathW( MSIHANDLE hInstall, LPCWSTR szFolder,
- LPWSTR szPathBuf, DWORD* pcchPathBuf )
+ LPWSTR szPathBuf, LPDWORD pcchPathBuf )
{
awstring str;
@@ -932,7 +932,7 @@ UINT WINAPI MsiGetFeatureStateW(MSIHANDLE hInstall, LPCWSTR szFeature,
* MsiGetFeatureCostA (MSI.@)
*/
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),
iCostTree, iState, piCost);
@@ -944,7 +944,7 @@ UINT WINAPI MsiGetFeatureCostA(MSIHANDLE hInstall, LPCSTR szFeature,
* MsiGetFeatureCostW (MSI.@)
*/
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),
iCostTree, iState, piCost);
@@ -1228,7 +1228,7 @@ UINT WINAPI MsiSetInstallLevel(MSIHANDLE hInstall, int iInstallLevel)
* MsiGetFeatureValidStatesW (MSI.@)
*/
UINT WINAPI MsiGetFeatureValidStatesW(MSIHANDLE hInstall, LPCWSTR szFeature,
- DWORD* pInstallState)
+ LPDWORD pInstallState)
{
if(pInstallState) *pInstallState = 1<<INSTALLSTATE_LOCAL;
FIXME("%ld %s %p stub returning %d\n",
@@ -1241,7 +1241,7 @@ UINT WINAPI MsiGetFeatureValidStatesW(MSIHANDLE hInstall, LPCWSTR szFeature,
* MsiGetFeatureValidStatesA (MSI.@)
*/
UINT WINAPI MsiGetFeatureValidStatesA(MSIHANDLE hInstall, LPCSTR szFeature,
- DWORD* pInstallState)
+ LPDWORD pInstallState)
{
UINT ret;
LPWSTR szwFeature = strdupAtoW(szFeature);
diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c
index 1b01a4d..897e01a 100644
--- a/dlls/msi/msi.c
+++ b/dlls/msi/msi.c
@@ -534,7 +534,7 @@ UINT WINAPI MsiGetProductCodeW(LPCWSTR szComponent, LPWSTR szBuffer)
}
static UINT WINAPI MSI_GetProductInfo(LPCWSTR szProduct, LPCWSTR szAttribute,
- awstring *szValue, DWORD *pcchValueBuf)
+ awstring *szValue, LPDWORD pcchValueBuf)
{
UINT r;
HKEY hkey;
@@ -645,7 +645,7 @@ static UINT WINAPI MSI_GetProductInfo(LPCWSTR szProduct, LPCWSTR szAttribute,
}
UINT WINAPI MsiGetProductInfoA(LPCSTR szProduct, LPCSTR szAttribute,
- LPSTR szBuffer, DWORD *pcchValueBuf)
+ LPSTR szBuffer, LPDWORD pcchValueBuf)
{
LPWSTR szwProduct, szwAttribute = NULL;
UINT r = ERROR_OUTOFMEMORY;
@@ -676,7 +676,7 @@ end:
}
UINT WINAPI MsiGetProductInfoW(LPCWSTR szProduct, LPCWSTR szAttribute,
- LPWSTR szBuffer, DWORD *pcchValueBuf)
+ LPWSTR szBuffer, LPDWORD pcchValueBuf)
{
awstring buffer;
@@ -1034,7 +1034,7 @@ LANGID WINAPI MsiLoadStringA( MSIHANDLE handle, UINT id, LPSTR lpBuffer,
}
INSTALLSTATE WINAPI MsiLocateComponentA(LPCSTR szComponent, LPSTR lpPathBuf,
- DWORD *pcchBuf)
+ LPDWORD pcchBuf)
{
char szProduct[GUID_SIZE];
@@ -1047,7 +1047,7 @@ INSTALLSTATE WINAPI MsiLocateComponentA(LPCSTR szComponent, LPSTR lpPathBuf,
}
INSTALLSTATE WINAPI MsiLocateComponentW(LPCWSTR szComponent, LPWSTR lpPathBuf,
- DWORD *pcchBuf)
+ LPDWORD pcchBuf)
{
WCHAR szProduct[GUID_SIZE];
@@ -1077,7 +1077,7 @@ UINT WINAPI MsiMessageBoxW(HWND hWnd, LPCWSTR lpText, LPCWSTR lpCaption, UINT uT
UINT WINAPI MsiProvideAssemblyA( LPCSTR szAssemblyName, LPCSTR szAppContext,
DWORD dwInstallMode, DWORD dwAssemblyInfo, LPSTR lpPathBuf,
- DWORD* pcchPathBuf )
+ LPDWORD pcchPathBuf )
{
FIXME("%s %s %08x %08x %p %p\n", debugstr_a(szAssemblyName),
debugstr_a(szAppContext), dwInstallMode, dwAssemblyInfo, lpPathBuf,
@@ -1087,7 +1087,7 @@ UINT WINAPI MsiProvideAssemblyA( LPCSTR szAssemblyName, LPCSTR szAppContext,
UINT WINAPI MsiProvideAssemblyW( LPCWSTR szAssemblyName, LPCWSTR szAppContext,
DWORD dwInstallMode, DWORD dwAssemblyInfo, LPWSTR lpPathBuf,
- DWORD* pcchPathBuf )
+ LPDWORD pcchPathBuf )
{
FIXME("%s %s %08x %08x %p %p\n", debugstr_w(szAssemblyName),
debugstr_w(szAppContext), dwInstallMode, dwAssemblyInfo, lpPathBuf,
@@ -1110,8 +1110,8 @@ UINT WINAPI MsiProvideComponentFromDescriptorW( LPCWSTR szDescriptor,
}
HRESULT WINAPI MsiGetFileSignatureInformationA( LPCSTR szSignedObjectPath,
- DWORD dwFlags, PCCERT_CONTEXT* ppcCertContext, BYTE* pbHashData,
- DWORD* pcbHashData)
+ DWORD dwFlags, PCCERT_CONTEXT* ppcCertContext, LPBYTE pbHashData,
+ LPDWORD pcbHashData)
{
FIXME("%s %08x %p %p %p\n", debugstr_a(szSignedObjectPath), dwFlags,
ppcCertContext, pbHashData, pcbHashData);
@@ -1119,8 +1119,8 @@ HRESULT WINAPI MsiGetFileSignatureInformationA( LPCSTR szSignedObjectPath,
}
HRESULT WINAPI MsiGetFileSignatureInformationW( LPCWSTR szSignedObjectPath,
- DWORD dwFlags, PCCERT_CONTEXT* ppcCertContext, BYTE* pbHashData,
- DWORD* pcbHashData)
+ DWORD dwFlags, PCCERT_CONTEXT* ppcCertContext, LPBYTE pbHashData,
+ LPDWORD pcbHashData)
{
FIXME("%s %08x %p %p %p\n", debugstr_w(szSignedObjectPath), dwFlags,
ppcCertContext, pbHashData, pcbHashData);
@@ -1128,14 +1128,14 @@ HRESULT WINAPI MsiGetFileSignatureInformationW( LPCWSTR szSignedObjectPath,
}
UINT WINAPI MsiGetProductPropertyA( MSIHANDLE hProduct, LPCSTR szProperty,
- LPSTR szValue, DWORD *pccbValue )
+ LPSTR szValue, LPDWORD pccbValue )
{
FIXME("%ld %s %p %p\n", hProduct, debugstr_a(szProperty), szValue, pccbValue);
return ERROR_CALL_NOT_IMPLEMENTED;
}
UINT WINAPI MsiGetProductPropertyW( MSIHANDLE hProduct, LPCWSTR szProperty,
- LPWSTR szValue, DWORD *pccbValue )
+ LPWSTR szValue, LPDWORD pccbValue )
{
FIXME("%ld %s %p %p\n", hProduct, debugstr_w(szProperty), szValue, pccbValue);
return ERROR_CALL_NOT_IMPLEMENTED;
@@ -1176,7 +1176,7 @@ UINT WINAPI MsiVerifyPackageW( LPCWSTR szPackage )
}
static INSTALLSTATE WINAPI MSI_GetComponentPath(LPCWSTR szProduct, LPCWSTR szComponent,
- awstring* lpPathBuf, DWORD* pcchBuf)
+ awstring* lpPathBuf, LPDWORD pcchBuf)
{
WCHAR squished_pc[GUID_SIZE], squished_comp[GUID_SIZE];
UINT rc;
@@ -1230,7 +1230,7 @@ static INSTALLSTATE WINAPI MSI_GetComponentPath(LPCWSTR szProduct, LPCWSTR szCom
* MsiGetComponentPathW [MSI.@]
*/
INSTALLSTATE WINAPI MsiGetComponentPathW(LPCWSTR szProduct, LPCWSTR szComponent,
- LPWSTR lpPathBuf, DWORD* pcchBuf)
+ LPWSTR lpPathBuf, LPDWORD pcchBuf)
{
awstring path;
@@ -1244,7 +1244,7 @@ INSTALLSTATE WINAPI MsiGetComponentPathW(LPCWSTR szProduct, LPCWSTR szComponent,
* MsiGetComponentPathA [MSI.@]
*/
INSTALLSTATE WINAPI MsiGetComponentPathA(LPCSTR szProduct, LPCSTR szComponent,
- LPSTR lpPathBuf, DWORD* pcchBuf)
+ LPSTR lpPathBuf, LPDWORD pcchBuf)
{
LPWSTR szwProduct, szwComponent = NULL;
INSTALLSTATE r = INSTALLSTATE_UNKNOWN;
@@ -1398,7 +1398,7 @@ INSTALLSTATE WINAPI MsiQueryFeatureStateW(LPCWSTR szProduct, LPCWSTR szFeature)
* MsiGetFileVersionA [MSI.@]
*/
UINT WINAPI MsiGetFileVersionA(LPCSTR szFilePath, LPSTR lpVersionBuf,
- DWORD* pcchVersionBuf, LPSTR lpLangBuf, DWORD* pcchLangBuf)
+ LPDWORD pcchVersionBuf, LPSTR lpLangBuf, LPDWORD pcchLangBuf)
{
LPWSTR szwFilePath = NULL, lpwVersionBuff = NULL, lpwLangBuff = NULL;
UINT ret = ERROR_OUTOFMEMORY;
@@ -1446,7 +1446,7 @@ end:
* MsiGetFileVersionW [MSI.@]
*/
UINT WINAPI MsiGetFileVersionW(LPCWSTR szFilePath, LPWSTR lpVersionBuf,
- DWORD* pcchVersionBuf, LPWSTR lpLangBuf, DWORD* pcchLangBuf)
+ LPDWORD pcchVersionBuf, LPWSTR lpLangBuf, LPDWORD pcchLangBuf)
{
static const WCHAR szVersionResource[] = {'\\',0};
static const WCHAR szVersionFormat[] = {
@@ -1516,7 +1516,7 @@ end:
* MsiGetFeatureUsageW [MSI.@]
*/
UINT WINAPI MsiGetFeatureUsageW( LPCWSTR szProduct, LPCWSTR szFeature,
- DWORD* pdwUseCount, WORD* pwDateUsed )
+ LPDWORD pdwUseCount, LPWORD pwDateUsed )
{
FIXME("%s %s %p %p\n",debugstr_w(szProduct), debugstr_w(szFeature),
pdwUseCount, pwDateUsed);
@@ -1527,7 +1527,7 @@ UINT WINAPI MsiGetFeatureUsageW( LPCWSTR szProduct, LPCWSTR szFeature,
* MsiGetFeatureUsageA [MSI.@]
*/
UINT WINAPI MsiGetFeatureUsageA( LPCSTR szProduct, LPCSTR szFeature,
- DWORD* pdwUseCount, WORD* pwDateUsed )
+ LPDWORD pdwUseCount, LPWORD pwDateUsed )
{
LPWSTR prod = NULL, feat = NULL;
UINT ret = ERROR_OUTOFMEMORY;
@@ -1628,7 +1628,7 @@ INSTALLSTATE WINAPI MsiUseFeatureA( LPCSTR szProduct, LPCSTR szFeature )
static UINT WINAPI MSI_ProvideQualifiedComponentEx(LPCWSTR szComponent,
LPCWSTR szQualifier, DWORD dwInstallMode, LPCWSTR szProduct,
DWORD Unused1, DWORD Unused2, awstring *lpPathBuf,
- DWORD* pcchPathBuf)
+ LPDWORD pcchPathBuf)
{
WCHAR product[MAX_FEATURE_CHARS+1], component[MAX_FEATURE_CHARS+1],
feature[MAX_FEATURE_CHARS+1];
@@ -1730,7 +1730,7 @@ end:
*/
UINT WINAPI MsiProvideQualifiedComponentW( LPCWSTR szComponent,
LPCWSTR szQualifier, DWORD dwInstallMode, LPWSTR lpPathBuf,
- DWORD* pcchPathBuf)
+ LPDWORD pcchPathBuf)
{
return MsiProvideQualifiedComponentExW(szComponent, szQualifier,
dwInstallMode, NULL, 0, 0, lpPathBuf, pcchPathBuf);
@@ -1741,7 +1741,7 @@ UINT WINAPI MsiProvideQualifiedComponentW( LPCWSTR szComponent,
*/
UINT WINAPI MsiProvideQualifiedComponentA( LPCSTR szComponent,
LPCSTR szQualifier, DWORD dwInstallMode, LPSTR lpPathBuf,
- DWORD* pcchPathBuf)
+ LPDWORD pcchPathBuf)
{
return MsiProvideQualifiedComponentExA(szComponent, szQualifier,
dwInstallMode, NULL, 0, 0, lpPathBuf, pcchPathBuf);
@@ -1751,9 +1751,9 @@ UINT WINAPI MsiProvideQualifiedComponentA( LPCSTR szComponent,
* MSI_GetUserInfo [internal]
*/
static USERINFOSTATE WINAPI MSI_GetUserInfo(LPCWSTR szProduct,
- awstring *lpUserNameBuf, DWORD* pcchUserNameBuf,
- awstring *lpOrgNameBuf, DWORD* pcchOrgNameBuf,
- awstring *lpSerialBuf, DWORD* pcchSerialBuf)
+ awstring *lpUserNameBuf, LPDWORD pcchUserNameBuf,
+ awstring *lpOrgNameBuf, LPDWORD pcchOrgNameBuf,
+ awstring *lpSerialBuf, LPDWORD pcchSerialBuf)
{
HKEY hkey;
LPWSTR user, org, serial;
@@ -1814,9 +1814,9 @@ static USERINFOSTATE WINAPI MSI_GetUserInfo(LPCWSTR szProduct,
* MsiGetUserInfoW [MSI.@]
*/
USERINFOSTATE WINAPI MsiGetUserInfoW(LPCWSTR szProduct,
- LPWSTR lpUserNameBuf, DWORD* pcchUserNameBuf,
- LPWSTR lpOrgNameBuf, DWORD* pcchOrgNameBuf,
- LPWSTR lpSerialBuf, DWORD* pcchSerialBuf)
+ LPWSTR lpUserNameBuf, LPDWORD pcchUserNameBuf,
+ LPWSTR lpOrgNameBuf, LPDWORD pcchOrgNameBuf,
+ LPWSTR lpSerialBuf, LPDWORD pcchSerialBuf)
{
awstring user, org, serial;
@@ -1833,9 +1833,9 @@ USERINFOSTATE WINAPI MsiGetUserInfoW(LPCWSTR szProduct,
}
USERINFOSTATE WINAPI MsiGetUserInfoA(LPCSTR szProduct,
- LPSTR lpUserNameBuf, DWORD* pcchUserNameBuf,
- LPSTR lpOrgNameBuf, DWORD* pcchOrgNameBuf,
- LPSTR lpSerialBuf, DWORD* pcchSerialBuf)
+ LPSTR lpUserNameBuf, LPDWORD pcchUserNameBuf,
+ LPSTR lpOrgNameBuf, LPDWORD pcchOrgNameBuf,
+ LPSTR lpSerialBuf, LPDWORD pcchSerialBuf)
{
awstring user, org, serial;
LPWSTR prod;
diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h
index 799e90a..00a212e 100644
--- a/dlls/msi/msipriv.h
+++ b/dlls/msi/msipriv.h
@@ -653,23 +653,23 @@ extern UINT MSI_SetFeatureStates( MSIPACKAGE *package );
extern UINT msi_parse_command_line( MSIPACKAGE *package, LPCWSTR szCommandLine );
/* record internals */
-extern UINT MSI_RecordSetIStream( MSIRECORD *, unsigned int, IStream *);
-extern UINT MSI_RecordGetIStream( MSIRECORD *, unsigned int, IStream **);
-extern const WCHAR *MSI_RecordGetString( const MSIRECORD *, unsigned int );
-extern MSIRECORD *MSI_CreateRecord( unsigned int );
-extern UINT MSI_RecordSetInteger( MSIRECORD *, unsigned int, int );
-extern UINT MSI_RecordSetStringW( MSIRECORD *, unsigned int, LPCWSTR );
-extern UINT MSI_RecordSetStringA( MSIRECORD *, unsigned int, LPCSTR );
-extern BOOL MSI_RecordIsNull( MSIRECORD *, unsigned int );
-extern UINT MSI_RecordGetStringW( MSIRECORD * , unsigned int, LPWSTR, DWORD *);
-extern UINT MSI_RecordGetStringA( MSIRECORD *, unsigned int, LPSTR, DWORD *);
-extern int MSI_RecordGetInteger( MSIRECORD *, unsigned int );
-extern UINT MSI_RecordReadStream( MSIRECORD *, unsigned int, char *, DWORD *);
-extern unsigned int MSI_RecordGetFieldCount( const MSIRECORD *rec );
-extern UINT MSI_RecordSetStream( MSIRECORD *, unsigned int, IStream * );
-extern UINT MSI_RecordDataSize( MSIRECORD *, unsigned int );
-extern UINT MSI_RecordStreamToFile( MSIRECORD *, unsigned int, LPCWSTR );
-extern UINT MSI_RecordCopyField( MSIRECORD *, unsigned int, MSIRECORD *, unsigned int );
+extern UINT MSI_RecordSetIStream( MSIRECORD *, UINT, IStream *);
+extern UINT MSI_RecordGetIStream( MSIRECORD *, UINT, IStream **);
+extern const WCHAR *MSI_RecordGetString( const MSIRECORD *, UINT );
+extern MSIRECORD *MSI_CreateRecord( UINT );
+extern UINT MSI_RecordSetInteger( MSIRECORD *, UINT, int );
+extern UINT MSI_RecordSetStringW( MSIRECORD *, UINT, LPCWSTR );
+extern UINT MSI_RecordSetStringA( MSIRECORD *, UINT, LPCSTR );
+extern BOOL MSI_RecordIsNull( MSIRECORD *, UINT );
+extern UINT MSI_RecordGetStringW( MSIRECORD * , UINT, LPWSTR, LPDWORD);
+extern UINT MSI_RecordGetStringA( MSIRECORD *, UINT, LPSTR, LPDWORD);
+extern int MSI_RecordGetInteger( MSIRECORD *, UINT );
+extern UINT MSI_RecordReadStream( MSIRECORD *, UINT, char *, LPDWORD);
+extern UINT MSI_RecordGetFieldCount( const MSIRECORD *rec );
+extern UINT MSI_RecordSetStream( MSIRECORD *, UINT, IStream * );
+extern UINT MSI_RecordDataSize( MSIRECORD *, UINT );
+extern UINT MSI_RecordStreamToFile( MSIRECORD *, UINT, LPCWSTR );
+extern UINT MSI_RecordCopyField( MSIRECORD *, UINT, MSIRECORD *, UINT );
/* stream internals */
extern UINT get_raw_stream( MSIHANDLE hdb, LPCWSTR stname, IStream **stm );
@@ -683,7 +683,7 @@ extern UINT MSI_OpenDatabaseW( LPCWSTR, LPCWSTR, MSIDATABASE ** );
extern UINT MSI_DatabaseOpenViewW(MSIDATABASE *, LPCWSTR, MSIQUERY ** );
extern UINT MSI_OpenQuery( MSIDATABASE *, MSIQUERY **, LPCWSTR, ... );
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 UINT MSI_DatabaseImport( MSIDATABASE *, LPCWSTR, LPCWSTR );
extern UINT MSI_DatabaseExport( MSIDATABASE *, LPCWSTR, LPCWSTR, LPCWSTR );
@@ -707,8 +707,8 @@ extern UINT MSI_OpenPackageW( LPCWSTR szPackage, MSIPACKAGE **pPackage );
extern UINT MSI_SetTargetPathW( MSIPACKAGE *, LPCWSTR, LPCWSTR );
extern UINT MSI_SetPropertyW( MSIPACKAGE *, LPCWSTR, LPCWSTR );
extern INT MSI_ProcessMessage( MSIPACKAGE *, INSTALLMESSAGE, MSIRECORD * );
-extern UINT MSI_GetPropertyW( MSIPACKAGE *, LPCWSTR, LPWSTR, DWORD * );
-extern UINT MSI_GetPropertyA(MSIPACKAGE *, LPCSTR, LPSTR, DWORD* );
+extern UINT MSI_GetPropertyW( MSIPACKAGE *, LPCWSTR, LPWSTR, LPDWORD );
+extern UINT MSI_GetPropertyA(MSIPACKAGE *, LPCSTR, LPSTR, LPDWORD );
extern MSICONDITION MSI_EvaluateConditionW( MSIPACKAGE *, LPCWSTR );
extern UINT MSI_GetComponentStateW( 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
extern UINT msi_clone_properties(MSIPACKAGE *);
/* for deformating */
-extern UINT MSI_FormatRecordW( MSIPACKAGE *, MSIRECORD *, LPWSTR, DWORD * );
+extern UINT MSI_FormatRecordW( MSIPACKAGE *, MSIRECORD *, LPWSTR, LPDWORD );
/* registry data encoding/decoding functions */
extern BOOL unsquash_guid(LPCWSTR in, LPWSTR out);
@@ -789,8 +789,8 @@ extern LPWSTR msi_get_suminfo_product( IStorage *stg );
/* undocumented functions */
UINT WINAPI MsiCreateAndVerifyInstallerDirectory( DWORD );
-UINT WINAPI MsiDecomposeDescriptorW( LPCWSTR, LPWSTR, LPWSTR, LPWSTR, DWORD * );
-UINT WINAPI MsiDecomposeDescriptorA( LPCSTR, LPSTR, LPSTR, LPSTR, DWORD * );
+UINT WINAPI MsiDecomposeDescriptorW( LPCWSTR, LPWSTR, LPWSTR, LPWSTR, LPDWORD );
+UINT WINAPI MsiDecomposeDescriptorA( LPCSTR, LPSTR, LPSTR, LPSTR, LPDWORD );
LANGID WINAPI MsiLoadStringW( MSIHANDLE, UINT, LPWSTR, int, LANGID );
LANGID WINAPI MsiLoadStringA( MSIHANDLE, UINT, LPSTR, int, LANGID );
diff --git a/dlls/msi/msiquery.c b/dlls/msi/msiquery.c
index 32bbf97..af14ae5 100644
--- a/dlls/msi/msiquery.c
+++ b/dlls/msi/msiquery.c
@@ -166,7 +166,7 @@ UINT MSI_OpenQuery( MSIDATABASE *db, MSIQUERY **view, LPCWSTR fmt, ... )
return r;
}
-UINT MSI_IterateRecords( MSIQUERY *view, DWORD *count,
+UINT MSI_IterateRecords( MSIQUERY *view, LPDWORD count,
record_func func, LPVOID param )
{
MSIRECORD *rec = NULL;
@@ -602,7 +602,7 @@ UINT WINAPI MsiViewModify( MSIHANDLE hView, MSIMODIFY eModifyMode,
}
MSIDBERROR WINAPI MsiViewGetErrorW( MSIHANDLE handle, LPWSTR szColumnNameBuffer,
- DWORD *pcchBuf )
+ LPDWORD pcchBuf )
{
MSIQUERY *query = NULL;
static const WCHAR szError[] = { 0 };
@@ -634,7 +634,7 @@ MSIDBERROR WINAPI MsiViewGetErrorW( MSIHANDLE handle, LPWSTR szColumnNameBuffer,
}
MSIDBERROR WINAPI MsiViewGetErrorA( MSIHANDLE handle, LPSTR szColumnNameBuffer,
- DWORD *pcchBuf )
+ LPDWORD pcchBuf )
{
static const CHAR szError[] = { 0 };
MSIQUERY *query = NULL;
diff --git a/dlls/msi/package.c b/dlls/msi/package.c
index 35cd328..bb473cd 100644
--- a/dlls/msi/package.c
+++ b/dlls/msi/package.c
@@ -1361,7 +1361,7 @@ static MSIRECORD *MSI_GetPropertyRow( MSIPACKAGE *package, LPCWSTR name )
/* internal function, not compatible with MsiGetPropertyW */
UINT MSI_GetPropertyW( MSIPACKAGE *package, LPCWSTR szName,
- LPWSTR szValueBuf, DWORD* pchValueBuf )
+ LPWSTR szValueBuf, LPDWORD pchValueBuf )
{
MSIRECORD *row;
UINT rc = ERROR_FUNCTION_FAILED;
@@ -1423,7 +1423,7 @@ int msi_get_property_int(MSIPACKAGE *package, LPCWSTR prop, int def)
}
static UINT MSI_GetProperty( MSIHANDLE handle, LPCWSTR name,
- awstring *szValueBuf, DWORD* pchValueBuf )
+ awstring *szValueBuf, LPDWORD pchValueBuf )
{
static const WCHAR empty[] = {0};
MSIPACKAGE *package;
@@ -1513,7 +1513,7 @@ done:
}
UINT WINAPI MsiGetPropertyA( MSIHANDLE hInstall, LPCSTR szName,
- LPSTR szValueBuf, DWORD* pchValueBuf )
+ LPSTR szValueBuf, LPDWORD pchValueBuf )
{
awstring val;
LPWSTR name;
@@ -1532,7 +1532,7 @@ UINT WINAPI MsiGetPropertyA( MSIHANDLE hInstall, LPCSTR szName,
}
UINT WINAPI MsiGetPropertyW( MSIHANDLE hInstall, LPCWSTR szName,
- LPWSTR szValueBuf, DWORD* pchValueBuf )
+ LPWSTR szValueBuf, LPDWORD pchValueBuf )
{
awstring val;
diff --git a/dlls/msi/record.c b/dlls/msi/record.c
index 159f7d1..171d01b 100644
--- a/dlls/msi/record.c
+++ b/dlls/msi/record.c
@@ -73,7 +73,7 @@ static void MSI_CloseRecord( MSIOBJECTHDR *arg )
MSI_FreeField( &rec->fields[i] );
}
-MSIRECORD *MSI_CreateRecord( unsigned int cParams )
+MSIRECORD *MSI_CreateRecord( UINT cParams )
{
MSIRECORD *rec;
UINT len;
@@ -90,7 +90,7 @@ MSIRECORD *MSI_CreateRecord( unsigned int cParams )
return rec;
}
-MSIHANDLE WINAPI MsiCreateRecord( unsigned int cParams )
+MSIHANDLE WINAPI MsiCreateRecord( UINT cParams )
{
MSIRECORD *rec;
MSIHANDLE ret = 0;
@@ -106,12 +106,12 @@ MSIHANDLE WINAPI MsiCreateRecord( unsigned int cParams )
return ret;
}
-unsigned int MSI_RecordGetFieldCount( const MSIRECORD *rec )
+UINT MSI_RecordGetFieldCount( const MSIRECORD *rec )
{
return rec->count;
}
-unsigned int WINAPI MsiRecordGetFieldCount( MSIHANDLE handle )
+UINT WINAPI MsiRecordGetFieldCount( MSIHANDLE handle )
{
MSIRECORD *rec;
UINT ret;
@@ -153,8 +153,8 @@ static BOOL string2intW( LPCWSTR str, int *out )
return TRUE;
}
-UINT MSI_RecordCopyField( MSIRECORD *in_rec, unsigned int in_n,
- MSIRECORD *out_rec, unsigned int out_n )
+UINT MSI_RecordCopyField( MSIRECORD *in_rec, UINT in_n,
+ MSIRECORD *out_rec, UINT out_n )
{
UINT r = ERROR_SUCCESS;
@@ -200,7 +200,7 @@ UINT MSI_RecordCopyField( MSIRECORD *in_rec, unsigned int in_n,
return r;
}
-int MSI_RecordGetInteger( MSIRECORD *rec, unsigned int iField)
+int MSI_RecordGetInteger( MSIRECORD *rec, UINT iField)
{
int ret = 0;
@@ -224,7 +224,7 @@ int MSI_RecordGetInteger( MSIRECORD *rec, unsigned int iField)
return MSI_NULL_INTEGER;
}
-int WINAPI MsiRecordGetInteger( MSIHANDLE handle, unsigned int iField)
+int WINAPI MsiRecordGetInteger( MSIHANDLE handle, UINT iField)
{
MSIRECORD *rec;
UINT ret;
@@ -267,7 +267,7 @@ UINT WINAPI MsiRecordClearData( MSIHANDLE handle )
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);
@@ -281,7 +281,7 @@ UINT MSI_RecordSetInteger( MSIRECORD *rec, unsigned int iField, int iVal )
return ERROR_SUCCESS;
}
-UINT WINAPI MsiRecordSetInteger( MSIHANDLE handle, unsigned int iField, int iVal )
+UINT WINAPI MsiRecordSetInteger( MSIHANDLE handle, UINT iField, int iVal )
{
MSIRECORD *rec;
UINT ret;
@@ -299,7 +299,7 @@ UINT WINAPI MsiRecordSetInteger( MSIHANDLE handle, unsigned int iField, int iVal
return ret;
}
-BOOL MSI_RecordIsNull( MSIRECORD *rec, unsigned int iField )
+BOOL MSI_RecordIsNull( MSIRECORD *rec, UINT iField )
{
BOOL r = TRUE;
@@ -311,7 +311,7 @@ BOOL MSI_RecordIsNull( MSIRECORD *rec, unsigned int iField )
return r;
}
-BOOL WINAPI MsiRecordIsNull( MSIHANDLE handle, unsigned int iField )
+BOOL WINAPI MsiRecordIsNull( MSIHANDLE handle, UINT iField )
{
MSIRECORD *rec;
UINT ret;
@@ -329,8 +329,8 @@ BOOL WINAPI MsiRecordIsNull( MSIHANDLE handle, unsigned int iField )
}
-UINT MSI_RecordGetStringA(MSIRECORD *rec, unsigned int iField,
- LPSTR szValue, DWORD *pcchValue)
+UINT MSI_RecordGetStringA(MSIRECORD *rec, UINT iField,
+ LPSTR szValue, LPDWORD pcchValue)
{
UINT len=0, ret;
CHAR buffer[16];
@@ -375,8 +375,8 @@ UINT MSI_RecordGetStringA(MSIRECORD *rec, unsigned int iField,
return ret;
}
-UINT WINAPI MsiRecordGetStringA(MSIHANDLE handle, unsigned int iField,
- LPSTR szValue, DWORD *pcchValue)
+UINT WINAPI MsiRecordGetStringA(MSIHANDLE handle, UINT iField,
+ LPSTR szValue, LPDWORD pcchValue)
{
MSIRECORD *rec;
UINT ret;
@@ -393,7 +393,7 @@ UINT WINAPI MsiRecordGetStringA(MSIHANDLE handle, unsigned int iField,
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 )
return NULL;
@@ -404,8 +404,8 @@ const WCHAR *MSI_RecordGetString( const MSIRECORD *rec, unsigned int iField )
return rec->fields[iField].u.szwVal;
}
-UINT MSI_RecordGetStringW(MSIRECORD *rec, unsigned int iField,
- LPWSTR szValue, DWORD *pcchValue)
+UINT MSI_RecordGetStringW(MSIRECORD *rec, UINT iField,
+ LPWSTR szValue, LPDWORD pcchValue)
{
UINT len=0, ret;
WCHAR buffer[16];
@@ -445,8 +445,8 @@ UINT MSI_RecordGetStringW(MSIRECORD *rec, unsigned int iField,
return ret;
}
-UINT WINAPI MsiRecordGetStringW(MSIHANDLE handle, unsigned int iField,
- LPWSTR szValue, DWORD *pcchValue)
+UINT WINAPI MsiRecordGetStringW(MSIHANDLE handle, UINT iField,
+ LPWSTR szValue, LPDWORD pcchValue)
{
MSIRECORD *rec;
UINT ret;
@@ -475,7 +475,7 @@ static UINT msi_get_stream_size( IStream *stm )
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);
@@ -496,7 +496,7 @@ UINT MSI_RecordDataSize(MSIRECORD *rec, unsigned int iField)
return 0;
}
-UINT WINAPI MsiRecordDataSize(MSIHANDLE handle, unsigned int iField)
+UINT WINAPI MsiRecordDataSize(MSIHANDLE handle, UINT iField)
{
MSIRECORD *rec;
UINT ret;
@@ -513,7 +513,7 @@ UINT WINAPI MsiRecordDataSize(MSIHANDLE handle, unsigned int iField)
return ret;
}
-UINT MSI_RecordSetStringA( MSIRECORD *rec, unsigned int iField, LPCSTR szValue )
+UINT MSI_RecordSetStringA( MSIRECORD *rec, UINT iField, LPCSTR szValue )
{
LPWSTR str;
@@ -538,7 +538,7 @@ UINT MSI_RecordSetStringA( MSIRECORD *rec, unsigned int iField, LPCSTR szValue )
return 0;
}
-UINT WINAPI MsiRecordSetStringA( MSIHANDLE handle, unsigned int iField, LPCSTR szValue )
+UINT WINAPI MsiRecordSetStringA( MSIHANDLE handle, UINT iField, LPCSTR szValue )
{
MSIRECORD *rec;
UINT ret;
@@ -555,7 +555,7 @@ UINT WINAPI MsiRecordSetStringA( MSIHANDLE handle, unsigned int iField, LPCSTR s
return ret;
}
-UINT MSI_RecordSetStringW( MSIRECORD *rec, unsigned int iField, LPCWSTR szValue )
+UINT MSI_RecordSetStringW( MSIRECORD *rec, UINT iField, LPCWSTR szValue )
{
LPWSTR str;
@@ -581,7 +581,7 @@ UINT MSI_RecordSetStringW( MSIRECORD *rec, unsigned int iField, LPCWSTR szValue
return 0;
}
-UINT WINAPI MsiRecordSetStringW( MSIHANDLE handle, unsigned int iField, LPCWSTR szValue )
+UINT WINAPI MsiRecordSetStringW( MSIHANDLE handle, UINT iField, LPCWSTR szValue )
{
MSIRECORD *rec;
UINT ret;
@@ -649,7 +649,7 @@ static UINT RECORD_StreamFromFile(LPCWSTR szFile, IStream **pstm)
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) )
return ERROR_INVALID_PARAMETER;
@@ -661,7 +661,7 @@ UINT MSI_RecordSetStream(MSIRECORD *rec, unsigned int iField, IStream *stream)
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;
HRESULT r;
@@ -701,7 +701,7 @@ UINT MSI_RecordSetStreamFromFileW(MSIRECORD *rec, unsigned int iField, LPCWSTR s
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;
UINT ret;
@@ -720,7 +720,7 @@ UINT WINAPI MsiRecordSetStreamA(MSIHANDLE hRecord, unsigned int iField, LPCSTR s
return ret;
}
-UINT WINAPI MsiRecordSetStreamW(MSIHANDLE handle, unsigned int iField, LPCWSTR szFilename)
+UINT WINAPI MsiRecordSetStreamW(MSIHANDLE handle, UINT iField, LPCWSTR szFilename)
{
MSIRECORD *rec;
UINT ret;
@@ -738,7 +738,7 @@ UINT WINAPI MsiRecordSetStreamW(MSIHANDLE handle, unsigned int iField, LPCWSTR s
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;
HRESULT r;
@@ -790,7 +790,7 @@ UINT MSI_RecordReadStream(MSIRECORD *rec, unsigned int iField, char *buf, DWORD
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;
UINT ret;
@@ -807,7 +807,7 @@ UINT WINAPI MsiRecordReadStream(MSIHANDLE handle, unsigned int iField, char *buf
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);
@@ -823,7 +823,7 @@ UINT MSI_RecordSetIStream( MSIRECORD *rec, unsigned int iField, IStream *stm )
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);
@@ -871,7 +871,7 @@ end:
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;
UINT r;
diff --git a/dlls/msi/registry.c b/dlls/msi/registry.c
index 67eae4b..9c9400c 100644
--- a/dlls/msi/registry.c
+++ b/dlls/msi/registry.c
@@ -950,7 +950,7 @@ UINT MSIREG_OpenLocalSystemComponentKey(LPCWSTR szComponent, HKEY *key, BOOL cre
*
*/
UINT WINAPI MsiDecomposeDescriptorW( LPCWSTR szDescriptor, LPWSTR szProduct,
- LPWSTR szFeature, LPWSTR szComponent, DWORD *pUsed )
+ LPWSTR szFeature, LPWSTR szComponent, LPDWORD pUsed )
{
UINT r, len;
LPWSTR p;
@@ -999,7 +999,7 @@ UINT WINAPI MsiDecomposeDescriptorW( LPCWSTR szDescriptor, LPWSTR 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 feature[MAX_FEATURE_CHARS+1];
@@ -1213,8 +1213,8 @@ UINT WINAPI MsiEnumClientsW(LPCWSTR szComponent, DWORD index, LPWSTR szProduct)
}
static UINT WINAPI MSI_EnumComponentQualifiers( LPCWSTR szComponent, DWORD iIndex,
- awstring *lpQualBuf, DWORD* pcchQual,
- awstring *lpAppBuf, DWORD* pcchAppBuf )
+ awstring *lpQualBuf, LPDWORD pcchQual,
+ awstring *lpAppBuf, LPDWORD pcchAppBuf )
{
DWORD name_sz, val_sz, name_max, val_max, type, ofs;
LPWSTR name = NULL, val = NULL;
@@ -1310,8 +1310,8 @@ end:
* MsiEnumComponentQualifiersA [MSI.@]
*/
UINT WINAPI MsiEnumComponentQualifiersA( LPCSTR szComponent, DWORD iIndex,
- LPSTR lpQualifierBuf, DWORD* pcchQualifierBuf,
- LPSTR lpApplicationDataBuf, DWORD* pcchApplicationDataBuf )
+ LPSTR lpQualifierBuf, LPDWORD pcchQualifierBuf,
+ LPSTR lpApplicationDataBuf, LPDWORD pcchApplicationDataBuf )
{
awstring qual, appdata;
LPWSTR comp;
@@ -1341,8 +1341,8 @@ UINT WINAPI MsiEnumComponentQualifiersA( LPCSTR szComponent, DWORD iIndex,
* MsiEnumComponentQualifiersW [MSI.@]
*/
UINT WINAPI MsiEnumComponentQualifiersW( LPCWSTR szComponent, DWORD iIndex,
- LPWSTR lpQualifierBuf, DWORD* pcchQualifierBuf,
- LPWSTR lpApplicationDataBuf, DWORD* pcchApplicationDataBuf )
+ LPWSTR lpQualifierBuf, LPDWORD pcchQualifierBuf,
+ LPWSTR lpApplicationDataBuf, LPDWORD pcchApplicationDataBuf )
{
awstring qual, appdata;
@@ -1428,7 +1428,7 @@ UINT WINAPI MsiEnumRelatedProductsA(LPCSTR szUpgradeCode, DWORD dwReserved,
* MsiEnumPatchesA [MSI.@]
*/
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),
iPatchIndex, lpPatchBuf, lpTransformsBuf, pcchTransformsBuf);
@@ -1439,7 +1439,7 @@ UINT WINAPI MsiEnumPatchesA( LPCSTR szProduct, DWORD iPatchIndex,
* MsiEnumPatchesW [MSI.@]
*/
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),
iPatchIndex, lpPatchBuf, lpTransformsBuf, pcchTransformsBuf);
diff --git a/dlls/msi/suminfo.c b/dlls/msi/suminfo.c
index d86a2dc..e3b4b01 100644
--- a/dlls/msi/suminfo.c
+++ b/dlls/msi/suminfo.c
@@ -502,7 +502,7 @@ UINT WINAPI MsiGetSummaryInformationA(MSIHANDLE hDatabase,
return ret;
}
-UINT WINAPI MsiSummaryInfoGetPropertyCount(MSIHANDLE hSummaryInfo, UINT *pCount)
+UINT WINAPI MsiSummaryInfoGetPropertyCount(MSIHANDLE hSummaryInfo, PUINT pCount)
{
MSISUMMARYINFO *si;
@@ -619,8 +619,8 @@ LPWSTR msi_get_suminfo_product( IStorage *stg )
}
UINT WINAPI MsiSummaryInfoGetPropertyA(
- MSIHANDLE handle, UINT uiProperty, UINT *puiDataType, INT *piValue,
- FILETIME *pftValue, LPSTR szValueBuf, DWORD *pcchValueBuf)
+ MSIHANDLE handle, UINT uiProperty, PUINT puiDataType, LPINT piValue,
+ FILETIME *pftValue, LPSTR szValueBuf, LPDWORD pcchValueBuf)
{
awstring str;
@@ -635,8 +635,8 @@ UINT WINAPI MsiSummaryInfoGetPropertyA(
}
UINT WINAPI MsiSummaryInfoGetPropertyW(
- MSIHANDLE handle, UINT uiProperty, UINT *puiDataType, INT *piValue,
- FILETIME *pftValue, LPWSTR szValueBuf, DWORD *pcchValueBuf)
+ MSIHANDLE handle, UINT uiProperty, PUINT puiDataType, LPINT piValue,
+ FILETIME *pftValue, LPWSTR szValueBuf, LPDWORD pcchValueBuf)
{
awstring str;
diff --git a/include/msi.h b/include/msi.h
index 2956ae9..05e5ca8 100644
--- a/include/msi.h
+++ b/include/msi.h
@@ -417,8 +417,8 @@ UINT WINAPI MsiOpenProductA(LPCSTR, MSIHANDLE*);
UINT WINAPI MsiOpenProductW(LPCWSTR, MSIHANDLE*);
#define MsiOpenProduct WINELIB_NAME_AW(MsiOpenProduct)
-UINT WINAPI MsiGetProductPropertyA(MSIHANDLE,LPCSTR,LPSTR,DWORD*);
-UINT WINAPI MsiGetProductPropertyW(MSIHANDLE,LPCWSTR,LPWSTR,DWORD*);
+UINT WINAPI MsiGetProductPropertyA(MSIHANDLE,LPCSTR,LPSTR,LPDWORD);
+UINT WINAPI MsiGetProductPropertyW(MSIHANDLE,LPCWSTR,LPWSTR,LPDWORD);
#define MsiGetProductProperty WINELIB_NAME_AW(MsiGetProductProperty)
UINT WINAPI MsiVerifyPackageA(LPCSTR);
@@ -449,8 +449,8 @@ UINT WINAPI MsiGetProductCodeA(LPCSTR, LPSTR);
UINT WINAPI MsiGetProductCodeW(LPCWSTR, LPWSTR);
#define MsiGetProductCode WINELIB_NAME_AW(MsiGetProductCode)
-UINT WINAPI MsiGetProductInfoA(LPCSTR, LPCSTR, LPSTR, DWORD *);
-UINT WINAPI MsiGetProductInfoW(LPCWSTR, LPCWSTR, LPWSTR, DWORD *);
+UINT WINAPI MsiGetProductInfoA(LPCSTR, LPCSTR, LPSTR, LPDWORD);
+UINT WINAPI MsiGetProductInfoW(LPCWSTR, LPCWSTR, LPWSTR, LPDWORD);
#define MsiGetProductInfo WINELIB_NAME_AW(MsiGetProductInfo)
UINT WINAPI MsiEnableLogA(DWORD, LPCSTR, DWORD);
@@ -461,32 +461,32 @@ INSTALLUI_HANDLERA WINAPI MsiSetExternalUIA(INSTALLUI_HANDLERA, DWORD, LPVOID);
INSTALLUI_HANDLERW WINAPI MsiSetExternalUIW(INSTALLUI_HANDLERW, DWORD, LPVOID);
#define MsiSetExternalUI WINELIB_NAME_AW(MsiSetExternalUI)
-INSTALLSTATE WINAPI MsiGetComponentPathA(LPCSTR, LPCSTR, LPSTR, DWORD*);
-INSTALLSTATE WINAPI MsiGetComponentPathW(LPCWSTR, LPCWSTR, LPWSTR, DWORD*);
+INSTALLSTATE WINAPI MsiGetComponentPathA(LPCSTR, LPCSTR, LPSTR, LPDWORD);
+INSTALLSTATE WINAPI MsiGetComponentPathW(LPCWSTR, LPCWSTR, LPWSTR, LPDWORD);
#define MsiGetComponentPath WINELIB_NAME_AW(MsiGetComponentPath)
INSTALLSTATE WINAPI MsiQueryFeatureStateA(LPCSTR, LPCSTR);
INSTALLSTATE WINAPI MsiQueryFeatureStateW(LPCWSTR, LPCWSTR);
#define MsiQueryFeatureState WINELIB_NAME_AW(MsiQueryFeatureState)
-UINT WINAPI MsiGetFeatureUsageA(LPCSTR, LPCSTR, DWORD*, WORD*);
-UINT WINAPI MsiGetFeatureUsageW(LPCWSTR, LPCWSTR, DWORD*, WORD*);
+UINT WINAPI MsiGetFeatureUsageA(LPCSTR, LPCSTR, LPDWORD, LPWORD);
+UINT WINAPI MsiGetFeatureUsageW(LPCWSTR, LPCWSTR, LPDWORD, LPWORD);
#define MsiGetFeatureUsage WINELIB_NAME_AW(MsiGetFeatureUsage)
UINT WINAPI MsiEnumRelatedProductsA(LPCSTR, DWORD, DWORD, LPSTR);
UINT WINAPI MsiEnumRelatedProductsW(LPCWSTR, DWORD, DWORD, LPWSTR);
#define MsiEnumRelatedProducts WINELIB_NAME_AW(MsiEnumRelatedProducts)
-UINT WINAPI MsiProvideAssemblyA(LPCSTR, LPCSTR, DWORD, DWORD, LPSTR, DWORD*);
-UINT WINAPI MsiProvideAssemblyW(LPCWSTR, LPCWSTR, DWORD, DWORD, LPWSTR, DWORD*);
+UINT WINAPI MsiProvideAssemblyA(LPCSTR, LPCSTR, DWORD, DWORD, LPSTR, LPDWORD);
+UINT WINAPI MsiProvideAssemblyW(LPCWSTR, LPCWSTR, DWORD, DWORD, LPWSTR, LPDWORD);
#define MsiProvideAssembly WINELIB_NAME_AW(MsiProvideAssembly)
-UINT WINAPI MsiEnumComponentQualifiersA(LPCSTR, DWORD, LPSTR, DWORD*, LPSTR, DWORD*);
-UINT WINAPI MsiEnumComponentQualifiersW(LPCWSTR, DWORD, LPWSTR, DWORD*, LPWSTR, DWORD*);
+UINT WINAPI MsiEnumComponentQualifiersA(LPCSTR, DWORD, LPSTR, LPDWORD, LPSTR, LPDWORD);
+UINT WINAPI MsiEnumComponentQualifiersW(LPCWSTR, DWORD, LPWSTR, LPDWORD, LPWSTR, LPDWORD);
#define MsiEnumComponentQualifiers WINELIB_NAME_AW(MsiEnumComponentQualifiers)
-UINT WINAPI MsiGetFileVersionA(LPCSTR, LPSTR, DWORD*, LPSTR, DWORD*);
-UINT WINAPI MsiGetFileVersionW(LPCWSTR, LPWSTR, DWORD*, LPWSTR, DWORD*);
+UINT WINAPI MsiGetFileVersionA(LPCSTR, LPSTR, LPDWORD, LPSTR, LPDWORD);
+UINT WINAPI MsiGetFileVersionW(LPCWSTR, LPWSTR, LPDWORD, LPWSTR, LPDWORD);
#define MsiGetFileVersion WINELIB_NAME_AW(MsiGetFileVersion)
UINT WINAPI MsiMessageBoxA(HWND, LPCSTR, LPCSTR, UINT, WORD, DWORD);
@@ -497,12 +497,12 @@ UINT WINAPI MsiProvideQualifiedComponentExA(LPCSTR, LPCSTR, DWORD, LPCSTR, DWORD
UINT WINAPI MsiProvideQualifiedComponentExW(LPCWSTR, LPCWSTR, DWORD, LPCWSTR, DWORD, DWORD, LPWSTR, LPDWORD);
#define MsiProvideQualifiedComponentEx WINELIB_NAME_AW(MsiProvideQualifiedComponentEx)
-UINT WINAPI MsiProvideQualifiedComponentA(LPCSTR, LPCSTR, DWORD, LPSTR, DWORD*);
-UINT WINAPI MsiProvideQualifiedComponentW(LPCWSTR, LPCWSTR, DWORD, LPWSTR, DWORD*);
+UINT WINAPI MsiProvideQualifiedComponentA(LPCSTR, LPCSTR, DWORD, LPSTR, LPDWORD);
+UINT WINAPI MsiProvideQualifiedComponentW(LPCWSTR, LPCWSTR, DWORD, LPWSTR, LPDWORD);
#define MsiProvideQualifiedComponent WINELIB_NAME_AW(MsiProvideQualifiedComponent)
-USERINFOSTATE WINAPI MsiGetUserInfoA(LPCSTR, LPSTR, DWORD*, LPSTR, DWORD*, LPSTR, DWORD*);
-USERINFOSTATE WINAPI MsiGetUserInfoW(LPCWSTR, LPWSTR, DWORD*, LPWSTR, DWORD*, LPWSTR, DWORD*);
+USERINFOSTATE WINAPI MsiGetUserInfoA(LPCSTR, LPSTR, LPDWORD, LPSTR, LPDWORD, LPSTR, LPDWORD);
+USERINFOSTATE WINAPI MsiGetUserInfoW(LPCWSTR, LPWSTR, LPDWORD, LPWSTR, LPDWORD, LPWSTR, LPDWORD);
#define MsiGetUserInfo WINELIB_NAME_AW(MsiGetUserInfo)
UINT WINAPI MsiCollectUserInfoA(LPCSTR);
@@ -525,12 +525,12 @@ INSTALLSTATE WINAPI MsiUseFeatureExW(LPCWSTR, LPCWSTR, DWORD, DWORD);
INSTALLSTATE WINAPI MsiUseFeatureExA(LPCSTR, LPCSTR, DWORD, DWORD);
#define MsiUseFeatureEx WINELIB_NAME_AW(MsiUseFeatureEx)
-HRESULT WINAPI MsiGetFileSignatureInformationA(LPCSTR, DWORD, PCCERT_CONTEXT*, BYTE*, DWORD*);
-HRESULT WINAPI MsiGetFileSignatureInformationW(LPCWSTR, DWORD, PCCERT_CONTEXT*, BYTE*, DWORD*);
+HRESULT WINAPI MsiGetFileSignatureInformationA(LPCSTR, DWORD, PCCERT_CONTEXT*, LPBYTE, LPDWORD);
+HRESULT WINAPI MsiGetFileSignatureInformationW(LPCWSTR, DWORD, PCCERT_CONTEXT*, LPBYTE, LPDWORD);
#define MsiGetFileSignatureInformation WINELIB_NAME_AW(MsiGetFileSignatureInformation)
-INSTALLSTATE WINAPI MsiLocateComponentA(LPCSTR, LPSTR, DWORD *);
-INSTALLSTATE WINAPI MsiLocateComponentW(LPCWSTR, LPWSTR, DWORD *);
+INSTALLSTATE WINAPI MsiLocateComponentA(LPCSTR, LPSTR, LPDWORD);
+INSTALLSTATE WINAPI MsiLocateComponentW(LPCWSTR, LPWSTR, LPDWORD);
#define MsiLocateComponent WINELIB_NAME_AW(MsiLocateComponent)
UINT WINAPI MsiSourceListAddSourceA(LPCSTR, LPCSTR, DWORD, LPCSTR);
@@ -557,8 +557,8 @@ UINT WINAPI MsiSourceListAddMediaDiskA(LPCSTR, LPCSTR, MSIINSTALLCONTEXT, DWORD,
UINT WINAPI MsiSourceListAddMediaDiskW(LPCWSTR, LPCWSTR, MSIINSTALLCONTEXT, DWORD, DWORD, LPCWSTR, LPCWSTR);
#define MsiSourceListAddMediaDisk WINELIB_NAME_AW(MsiSourceListAddMediaDisk)
-UINT WINAPI MsiEnumPatchesA(LPCSTR, DWORD, LPSTR, LPSTR, DWORD*);
-UINT WINAPI MsiEnumPatchesW(LPCWSTR, DWORD, LPWSTR, LPWSTR, DWORD*);
+UINT WINAPI MsiEnumPatchesA(LPCSTR, DWORD, LPSTR, LPSTR, LPDWORD);
+UINT WINAPI MsiEnumPatchesW(LPCWSTR, DWORD, LPWSTR, LPWSTR, LPDWORD);
#define MsiEnumPatches WINELIB_NAME_AW(MsiEnumPatches)
UINT WINAPI MsiGetFileHashA(LPCSTR, DWORD, PMSIFILEHASHINFO);
diff --git a/include/msiquery.h b/include/msiquery.h
index 5a3f292..67205c9 100644
--- a/include/msiquery.h
+++ b/include/msiquery.h
@@ -149,33 +149,33 @@ UINT WINAPI MsiViewClose(MSIHANDLE);
UINT WINAPI MsiDatabaseOpenViewA(MSIHANDLE,LPCSTR,MSIHANDLE*);
UINT WINAPI MsiDatabaseOpenViewW(MSIHANDLE,LPCWSTR,MSIHANDLE*);
#define MsiDatabaseOpenView WINELIB_NAME_AW(MsiDatabaseOpenView)
-MSIDBERROR WINAPI MsiViewGetErrorA(MSIHANDLE,LPSTR,DWORD*);
-MSIDBERROR WINAPI MsiViewGetErrorW(MSIHANDLE,LPWSTR,DWORD*);
+MSIDBERROR WINAPI MsiViewGetErrorA(MSIHANDLE,LPSTR,LPDWORD);
+MSIDBERROR WINAPI MsiViewGetErrorW(MSIHANDLE,LPWSTR,LPDWORD);
#define MsiViewGetError WINELIB_NAME_AW(MsiViewGetError)
MSIDBSTATE WINAPI MsiGetDatabaseState(MSIHANDLE);
/* record manipulation */
-MSIHANDLE WINAPI MsiCreateRecord(unsigned int);
+MSIHANDLE WINAPI MsiCreateRecord(UINT);
UINT WINAPI MsiRecordClearData(MSIHANDLE);
-UINT WINAPI MsiRecordSetInteger(MSIHANDLE,unsigned int,int);
-UINT WINAPI MsiRecordSetStringA(MSIHANDLE,unsigned int,LPCSTR);
-UINT WINAPI MsiRecordSetStringW(MSIHANDLE,unsigned int,LPCWSTR);
+UINT WINAPI MsiRecordSetInteger(MSIHANDLE,UINT,int);
+UINT WINAPI MsiRecordSetStringA(MSIHANDLE,UINT,LPCSTR);
+UINT WINAPI MsiRecordSetStringW(MSIHANDLE,UINT,LPCWSTR);
#define MsiRecordSetString WINELIB_NAME_AW(MsiRecordSetString)
-UINT WINAPI MsiRecordGetStringA(MSIHANDLE,unsigned int,LPSTR,DWORD*);
-UINT WINAPI MsiRecordGetStringW(MSIHANDLE,unsigned int,LPWSTR,DWORD*);
+UINT WINAPI MsiRecordGetStringA(MSIHANDLE,UINT,LPSTR,LPDWORD);
+UINT WINAPI MsiRecordGetStringW(MSIHANDLE,UINT,LPWSTR,LPDWORD);
#define MsiRecordGetString WINELIB_NAME_AW(MsiRecordGetString)
UINT WINAPI MsiRecordGetFieldCount(MSIHANDLE);
-int WINAPI MsiRecordGetInteger(MSIHANDLE,unsigned int);
-UINT WINAPI MsiRecordDataSize(MSIHANDLE,unsigned int);
-BOOL WINAPI MsiRecordIsNull(MSIHANDLE,unsigned int);
-UINT WINAPI MsiFormatRecordA(MSIHANDLE,MSIHANDLE,LPSTR,DWORD*);
-UINT WINAPI MsiFormatRecordW(MSIHANDLE,MSIHANDLE,LPWSTR,DWORD*);
+int WINAPI MsiRecordGetInteger(MSIHANDLE,UINT);
+UINT WINAPI MsiRecordDataSize(MSIHANDLE,UINT);
+BOOL WINAPI MsiRecordIsNull(MSIHANDLE,UINT);
+UINT WINAPI MsiFormatRecordA(MSIHANDLE,MSIHANDLE,LPSTR,LPDWORD);
+UINT WINAPI MsiFormatRecordW(MSIHANDLE,MSIHANDLE,LPWSTR,LPDWORD);
#define MsiFormatRecord WINELIB_NAME_AW(MsiFormatRecord)
-UINT WINAPI MsiRecordSetStreamA(MSIHANDLE,unsigned int,LPCSTR);
-UINT WINAPI MsiRecordSetStreamW(MSIHANDLE,unsigned int,LPCWSTR);
+UINT WINAPI MsiRecordSetStreamA(MSIHANDLE,UINT,LPCSTR);
+UINT WINAPI MsiRecordSetStreamW(MSIHANDLE,UINT,LPCWSTR);
#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 MsiDatabaseGetPrimaryKeysW(MSIHANDLE,LPCWSTR,MSIHANDLE*);
@@ -200,6 +200,9 @@ UINT WINAPI MsiDatabaseCommit(MSIHANDLE);
UINT WINAPI MsiGetFeatureStateA(MSIHANDLE,LPCSTR,INSTALLSTATE*,INSTALLSTATE*);
UINT WINAPI MsiGetFeatureStateW(MSIHANDLE,LPCWSTR,INSTALLSTATE*,INSTALLSTATE*);
#define MsiGetFeatureState WINELIB_NAME_AW(MsiGetFeatureState)
+UINT WINAPI MsiGetFeatureValidStatesA(MSIHANDLE,LPCSTR,LPDWORD);
+UINT WINAPI MsiGetFeatureValidStatesW(MSIHANDLE,LPCWSTR,LPDWORD);
+#define MsiGetFeatureValidStates WINELIB_NAME_AW(MsiGetFeatureValidStates)
UINT WINAPI MsiSetComponentStateA(MSIHANDLE,LPCSTR,INSTALLSTATE);
UINT WINAPI MsiSetComponentStateW(MSIHANDLE,LPCWSTR,INSTALLSTATE);
#define MsiSetComponentState WINELIB_NAME_AW(MsiSetComponentState)
@@ -212,24 +215,24 @@ MSICONDITION WINAPI MsiEvaluateConditionW(MSIHANDLE,LPCWSTR);
#define MsiEvaluateCondition WINELIB_NAME_AW(MsiEvaluateCondition)
/* property functions */
-UINT WINAPI MsiGetPropertyA(MSIHANDLE, LPCSTR, LPSTR, DWORD*);
-UINT WINAPI MsiGetPropertyW(MSIHANDLE, LPCWSTR, LPWSTR, DWORD*);
+UINT WINAPI MsiGetPropertyA(MSIHANDLE, LPCSTR, LPSTR, LPDWORD);
+UINT WINAPI MsiGetPropertyW(MSIHANDLE, LPCWSTR, LPWSTR, LPDWORD);
#define MsiGetProperty WINELIB_NAME_AW(MsiGetProperty)
UINT WINAPI MsiSetPropertyA(MSIHANDLE, LPCSTR, LPCSTR);
UINT WINAPI MsiSetPropertyW(MSIHANDLE, LPCWSTR, LPCWSTR);
#define MsiSetProperty WINELIB_NAME_AW(MsiSetProperty)
-UINT WINAPI MsiGetTargetPathA(MSIHANDLE,LPCSTR,LPSTR,DWORD*);
-UINT WINAPI MsiGetTargetPathW(MSIHANDLE,LPCWSTR,LPWSTR,DWORD*);
+UINT WINAPI MsiGetTargetPathA(MSIHANDLE,LPCSTR,LPSTR,LPDWORD);
+UINT WINAPI MsiGetTargetPathW(MSIHANDLE,LPCWSTR,LPWSTR,LPDWORD);
#define MsiGetTargetPath WINELIB_NAME_AW(MsiGetTargetPath)
UINT WINAPI MsiSetTargetPathA(MSIHANDLE, LPCSTR, LPCSTR);
UINT WINAPI MsiSetTargetPathW(MSIHANDLE, LPCWSTR, LPCWSTR);
#define MsiSetTargetPath WINELIB_NAME_AW(MsiSetTargetPath)
-UINT WINAPI MsiGetSourcePathA(MSIHANDLE,LPCSTR,LPSTR,DWORD*);
-UINT WINAPI MsiGetSourcePathW(MSIHANDLE,LPCWSTR,LPWSTR,DWORD*);
+UINT WINAPI MsiGetSourcePathA(MSIHANDLE,LPCSTR,LPSTR,LPDWORD);
+UINT WINAPI MsiGetSourcePathW(MSIHANDLE,LPCWSTR,LPWSTR,LPDWORD);
#define MsiGetSourcePath WINELIB_NAME_AW(MsiGetSourcePath)
MSIHANDLE WINAPI MsiGetActiveDatabase(MSIHANDLE);
@@ -257,8 +260,8 @@ UINT WINAPI MsiGetSummaryInformationA(MSIHANDLE, LPCSTR, UINT, MSIHANDLE *);
UINT WINAPI MsiGetSummaryInformationW(MSIHANDLE, LPCWSTR, UINT, MSIHANDLE *);
#define MsiGetSummaryInformation WINELIB_NAME_AW(MsiGetSummaryInformation)
-UINT WINAPI MsiSummaryInfoGetPropertyA(MSIHANDLE,UINT,UINT*,INT*,FILETIME*,LPSTR,DWORD*);
-UINT WINAPI MsiSummaryInfoGetPropertyW(MSIHANDLE,UINT,UINT*,INT*,FILETIME*,LPWSTR,DWORD*);
+UINT WINAPI MsiSummaryInfoGetPropertyA(MSIHANDLE,UINT,PUINT,LPINT,FILETIME*,LPSTR,LPDWORD);
+UINT WINAPI MsiSummaryInfoGetPropertyW(MSIHANDLE,UINT,PUINT,LPINT,FILETIME*,LPWSTR,LPDWORD);
#define MsiSummaryInfoGetProperty WINELIB_NAME_AW(MsiSummaryInfoGetProperty)
UINT WINAPI MsiSummaryInfoSetPropertyA(MSIHANDLE, UINT, UINT, INT, FILETIME*, LPCSTR);
@@ -286,7 +289,7 @@ UINT WINAPI MsiSequenceW(MSIHANDLE, LPCWSTR, INT);
#define MsiSequence WINELIB_NAME_AW(MsiSequence)
UINT WINAPI MsiSummaryInfoPersist(MSIHANDLE);
-UINT WINAPI MsiSummaryInfoGetPropertyCount(MSIHANDLE,UINT*);
+UINT WINAPI MsiSummaryInfoGetPropertyCount(MSIHANDLE,PUINT);
UINT WINAPI MsiEnableUIPreview(MSIHANDLE, MSIHANDLE*);
BOOL WINAPI MsiGetMode(MSIHANDLE, MSIRUNMODE);
@@ -294,8 +297,8 @@ BOOL WINAPI MsiSetMode(MSIHANDLE, MSIRUNMODE, BOOL);
UINT WINAPI MsiViewModify(MSIHANDLE, MSIMODIFY, MSIHANDLE);
-UINT WINAPI MsiGetFeatureCostA(MSIHANDLE, LPCSTR, MSICOSTTREE, INSTALLSTATE, INT*);
-UINT WINAPI MsiGetFeatureCostW(MSIHANDLE, LPCWSTR, MSICOSTTREE, INSTALLSTATE, INT*);
+UINT WINAPI MsiGetFeatureCostA(MSIHANDLE, LPCSTR, MSICOSTTREE, INSTALLSTATE, LPINT);
+UINT WINAPI MsiGetFeatureCostW(MSIHANDLE, LPCWSTR, MSICOSTTREE, INSTALLSTATE, LPINT);
#define MsiGetFeatureCost WINELIB_NAME_AW(MsiGetFeatureCost)
LANGID WINAPI MsiGetLanguage(MSIHANDLE);
diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api
index fc05505..b13aa5d 100644
--- a/tools/winapi/win32.api
+++ b/tools/winapi/win32.api
@@ -2671,41 +2671,44 @@ INT
LANGID
MSICOLINFO
MSICONDITION
+MSICOSTTREE
MSIDBERROR
MSIDBSTATE
MSIHANDLE
+MSIINSTALLCONTEXT
MSIMODIFY
MSIRUNMODE
UINT
USERINFOSTATE
WORD
int
-unsigned int
%ptr
-BYTE *
DLLVERSIONINFO *
-DWORD *
FILETIME *
HWND *
INSTALLSTATE *
INSTALLUI_HANDLERA
INSTALLUI_HANDLERW
-INT *
+LPBYTE
+LPDWORD
+LPINT
LPVOID
LPVOID *
+LPWORD
MSIHANDLE *
+MSIINSTALLCONTEXT *
PCCERT_CONTEXT *
PHKEY
PMSIFILEHASHINFO
+PUINT
REFCLSID
REFIID
-UINT *
-WORD *
%str
+CHAR[39]
LPCSTR
LPSTR
char *
@@ -2714,6 +2717,7 @@ char *
LPCWSTR
LPWSTR
+WCHAR[39]
%%msimg32.dll
--
1.5.2.4
More information about the wine-patches
mailing list