Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-03 19:05:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix MsiGetFeatureStateA/W and MsiGetComponentStateA/W prototypes

Browse source 
svn path=/trunk/; revision=23805
This commit is contained in:
Hervé Poussineau 2006-08-30 18:08:21 +00:00
parent ec839eb8e2
commit 538082297d
3 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

12
reactos/dll/win32/msi/install.c
View file

@ -580,7 +580,7 @@ UINT WINAPI MsiSetFeatureStateW(MSIHANDLE hInstall, LPCWSTR szFeature,
/*********************************************************************** /***********************************************************************
* MsiGetFeatureStateA (MSI.@) * MsiGetFeatureStateA (MSI.@)
*/ */
UINT WINAPI MsiGetFeatureStateA(MSIHANDLE hInstall, LPSTR szFeature, UINT WINAPI MsiGetFeatureStateA(MSIHANDLE hInstall, LPCSTR szFeature,
INSTALLSTATE *piInstalled, INSTALLSTATE *piAction) INSTALLSTATE *piInstalled, INSTALLSTATE *piAction)
{ {
LPWSTR szwFeature = NULL; LPWSTR szwFeature = NULL;
@ -595,7 +595,7 @@ UINT WINAPI MsiGetFeatureStateA(MSIHANDLE hInstall, LPSTR szFeature,
return rc; return rc;
} }
UINT MSI_GetFeatureStateW(MSIPACKAGE *package, LPWSTR szFeature, UINT MSI_GetFeatureStateW(MSIPACKAGE *package, LPCWSTR szFeature,
INSTALLSTATE *piInstalled, INSTALLSTATE *piAction) INSTALLSTATE *piInstalled, INSTALLSTATE *piAction)
{ {
MSIFEATURE *feature; MSIFEATURE *feature;
@ -618,7 +618,7 @@ UINT MSI_GetFeatureStateW(MSIPACKAGE *package, LPWSTR szFeature,
/*********************************************************************** /***********************************************************************
* MsiGetFeatureStateW (MSI.@) * MsiGetFeatureStateW (MSI.@)
*/ */
UINT WINAPI MsiGetFeatureStateW(MSIHANDLE hInstall, LPWSTR szFeature, UINT WINAPI MsiGetFeatureStateW(MSIHANDLE hInstall, LPCWSTR szFeature,
INSTALLSTATE *piInstalled, INSTALLSTATE *piAction) INSTALLSTATE *piInstalled, INSTALLSTATE *piAction)
{ {
MSIPACKAGE* package; MSIPACKAGE* package;
@ -653,7 +653,7 @@ UINT WINAPI MsiSetComponentStateA(MSIHANDLE hInstall, LPCSTR szComponent,
/*********************************************************************** /***********************************************************************
* MsiGetComponentStateA (MSI.@) * MsiGetComponentStateA (MSI.@)
*/ */
UINT WINAPI MsiGetComponentStateA(MSIHANDLE hInstall, LPSTR szComponent, UINT WINAPI MsiGetComponentStateA(MSIHANDLE hInstall, LPCSTR szComponent,
INSTALLSTATE *piInstalled, INSTALLSTATE *piAction) INSTALLSTATE *piInstalled, INSTALLSTATE *piAction)
{ {
LPWSTR szwComponent= NULL; LPWSTR szwComponent= NULL;
@ -684,7 +684,7 @@ static UINT MSI_SetComponentStateW(MSIPACKAGE *package, LPCWSTR szComponent,
return ERROR_SUCCESS; return ERROR_SUCCESS;
} }
UINT MSI_GetComponentStateW(MSIPACKAGE *package, LPWSTR szComponent, UINT MSI_GetComponentStateW(MSIPACKAGE *package, LPCWSTR szComponent,
INSTALLSTATE *piInstalled, INSTALLSTATE *piAction) INSTALLSTATE *piInstalled, INSTALLSTATE *piAction)
{ {
MSICOMPONENT *comp; MSICOMPONENT *comp;
@ -727,7 +727,7 @@ UINT WINAPI MsiSetComponentStateW(MSIHANDLE hInstall, LPCWSTR szComponent,
/*********************************************************************** /***********************************************************************
* MsiGetComponentStateW (MSI.@) * MsiGetComponentStateW (MSI.@)
*/ */
UINT WINAPI MsiGetComponentStateW(MSIHANDLE hInstall, LPWSTR szComponent, UINT WINAPI MsiGetComponentStateW(MSIHANDLE hInstall, LPCWSTR szComponent,
INSTALLSTATE *piInstalled, INSTALLSTATE *piAction) INSTALLSTATE *piInstalled, INSTALLSTATE *piAction)
{ {
MSIPACKAGE* package; MSIPACKAGE* package;

4
reactos/dll/win32/msi/msipriv.h
View file

@ -393,8 +393,8 @@ extern INT MSI_ProcessMessage( MSIPACKAGE *, INSTALLMESSAGE, MSIRECORD * );
extern UINT MSI_GetPropertyW( MSIPACKAGE *, LPCWSTR, LPWSTR, DWORD * ); extern UINT MSI_GetPropertyW( MSIPACKAGE *, LPCWSTR, LPWSTR, DWORD * );
extern UINT MSI_GetPropertyA(MSIPACKAGE *, LPCSTR, LPSTR, DWORD* ); extern UINT MSI_GetPropertyA(MSIPACKAGE *, LPCSTR, LPSTR, DWORD* );
extern MSICONDITION MSI_EvaluateConditionW( MSIPACKAGE *, LPCWSTR ); extern MSICONDITION MSI_EvaluateConditionW( MSIPACKAGE *, LPCWSTR );
extern UINT MSI_GetComponentStateW( MSIPACKAGE *, LPWSTR, INSTALLSTATE *, INSTALLSTATE * ); extern UINT MSI_GetComponentStateW( MSIPACKAGE *, LPCWSTR, INSTALLSTATE *, INSTALLSTATE * );
extern UINT MSI_GetFeatureStateW( MSIPACKAGE *, LPWSTR, INSTALLSTATE *, INSTALLSTATE * ); extern UINT MSI_GetFeatureStateW( MSIPACKAGE *, LPCWSTR, INSTALLSTATE *, INSTALLSTATE * );
extern UINT WINAPI MSI_SetFeatureStateW(MSIPACKAGE*, LPCWSTR, INSTALLSTATE ); extern UINT WINAPI MSI_SetFeatureStateW(MSIPACKAGE*, LPCWSTR, INSTALLSTATE );
/* for deformating */ /* for deformating */

8
reactos/include/psdk/msiquery.h
View file

@ -189,14 +189,14 @@ UINT WINAPI MsiDatabaseGenerateTransformW(MSIHANDLE,MSIHANDLE,LPCWSTR,int,int);
UINT WINAPI MsiDatabaseCommit(MSIHANDLE); UINT WINAPI MsiDatabaseCommit(MSIHANDLE);
/* install state */ /* install state */
UINT WINAPI MsiGetFeatureStateA(MSIHANDLE,LPSTR,INSTALLSTATE*,INSTALLSTATE*); UINT WINAPI MsiGetFeatureStateA(MSIHANDLE,LPCSTR,INSTALLSTATE*,INSTALLSTATE*);
UINT WINAPI MsiGetFeatureStateW(MSIHANDLE,LPWSTR,INSTALLSTATE*,INSTALLSTATE*); UINT WINAPI MsiGetFeatureStateW(MSIHANDLE,LPCWSTR,INSTALLSTATE*,INSTALLSTATE*);
#define MsiGetFeatureState WINELIB_NAME_AW(MsiGetFeatureState) #define MsiGetFeatureState WINELIB_NAME_AW(MsiGetFeatureState)
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)
UINT WINAPI MsiGetComponentStateA(MSIHANDLE,LPSTR,INSTALLSTATE*,INSTALLSTATE*); UINT WINAPI MsiGetComponentStateA(MSIHANDLE,LPCSTR,INSTALLSTATE*,INSTALLSTATE*);
UINT WINAPI MsiGetComponentStateW(MSIHANDLE,LPWSTR,INSTALLSTATE*,INSTALLSTATE*); UINT WINAPI MsiGetComponentStateW(MSIHANDLE,LPCWSTR,INSTALLSTATE*,INSTALLSTATE*);
#define MsiGetComponentState WINELIB_NAME_AW(MsiGetComponentState) #define MsiGetComponentState WINELIB_NAME_AW(MsiGetComponentState)
MSICONDITION WINAPI MsiEvaluateConditionA(MSIHANDLE,LPCSTR); MSICONDITION WINAPI MsiEvaluateConditionA(MSIHANDLE,LPCSTR);