marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

msi: Write-strings warnings fix.

oldstable
Andrew Talbot 2006-08-04 22:27:42 +01:00 committed by Alexandre Julliard
parent 3d9e96f3bc
commit d58e1dba42
4 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dlls/msi/install.c
View File

@ -579,7 +579,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;
@ -594,7 +594,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;
@ -617,7 +617,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;
@ -652,7 +652,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;
@ -683,7 +683,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;
@ -726,7 +726,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
dlls/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 */

16
dlls/msi/tests/package.c
View File

@ -98,7 +98,7 @@ static UINT create_file_table( MSIHANDLE hdb )
"PRIMARY KEY `File`)" ); "PRIMARY KEY `File`)" );
} }
static UINT add_component_entry( MSIHANDLE hdb, char *values ) static UINT add_component_entry( MSIHANDLE hdb, const char *values )
{ {
char insert[] = "INSERT INTO `Component` " char insert[] = "INSERT INTO `Component` "
"(`Component`, `ComponentId`, `Directory_`, `Attributes`, `Condition`, `KeyPath`) " "(`Component`, `ComponentId`, `Directory_`, `Attributes`, `Condition`, `KeyPath`) "
@ -114,7 +114,7 @@ static UINT add_component_entry( MSIHANDLE hdb, char *values )
return r; return r;
} }
static UINT add_feature_entry( MSIHANDLE hdb, char *values ) static UINT add_feature_entry( MSIHANDLE hdb, const char *values )
{ {
char insert[] = "INSERT INTO `Feature` (`Feature`, `Feature_Parent`, " char insert[] = "INSERT INTO `Feature` (`Feature`, `Feature_Parent`, "
"`Title`, `Description`, `Display`, `Level`, `Directory_`, `Attributes`) VALUES( %s )"; "`Title`, `Description`, `Display`, `Level`, `Directory_`, `Attributes`) VALUES( %s )";
@ -129,7 +129,7 @@ static UINT add_feature_entry( MSIHANDLE hdb, char *values )
return r; return r;
} }
static UINT add_feature_components_entry( MSIHANDLE hdb, char *values ) static UINT add_feature_components_entry( MSIHANDLE hdb, const char *values )
{ {
char insert[] = "INSERT INTO `FeatureComponents` " char insert[] = "INSERT INTO `FeatureComponents` "
"(`Feature_`, `Component_`) " "(`Feature_`, `Component_`) "
@ -145,7 +145,7 @@ static UINT add_feature_components_entry( MSIHANDLE hdb, char *values )
return r; return r;
} }
static UINT add_file_entry( MSIHANDLE hdb, char *values ) static UINT add_file_entry( MSIHANDLE hdb, const char *values )
{ {
char insert[] = "INSERT INTO `File` " char insert[] = "INSERT INTO `File` "
"(`File`, `Component_`, `FileName`, `FileSize`, `Version`, `Language`, `Attributes`, `Sequence`) " "(`File`, `Component_`, `FileName`, `FileSize`, `Version`, `Language`, `Attributes`, `Sequence`) "
@ -291,7 +291,7 @@ static void test_getsourcepath_bad( void )
ok( r == ERROR_INVALID_HANDLE, "return value wrong\n"); ok( r == ERROR_INVALID_HANDLE, "return value wrong\n");
} }
static UINT add_directory_entry( MSIHANDLE hdb, char *values ) static UINT add_directory_entry( MSIHANDLE hdb, const char *values )
{ {
char insert[] = "INSERT INTO `Directory` (`Directory`,`Directory_Parent`,`DefaultDir`) VALUES( %s )"; char insert[] = "INSERT INTO `Directory` (`Directory`,`Directory_Parent`,`DefaultDir`) VALUES( %s )";
char *query; char *query;
@ -334,7 +334,7 @@ static void test_getsourcepath( void )
/* another test but try create a directory this time */ /* another test but try create a directory this time */
hdb = create_package_db(); hdb = create_package_db();
ok( hdb, "failed to create database\n"); ok( hdb, "failed to create database\n");
r = add_directory_entry( hdb, "'TARGETDIR', '', 'SourceDir'"); r = add_directory_entry( hdb, "'TARGETDIR', '', 'SourceDir'");
ok( r == S_OK, "failed\n"); ok( r == S_OK, "failed\n");
@ -470,7 +470,7 @@ static void test_settargetpath(void)
MSIHANDLE hpkg; MSIHANDLE hpkg;
UINT r; UINT r;
MSIHANDLE hdb; MSIHANDLE hdb;
hdb = create_package_db(); hdb = create_package_db();
ok ( hdb, "failed to create package database\n" ); ok ( hdb, "failed to create package database\n" );
@ -985,7 +985,7 @@ static void test_condition(void)
DeleteFile(msifile); DeleteFile(msifile);
} }
static BOOL check_prop_empty( MSIHANDLE hpkg, char * prop) static BOOL check_prop_empty( MSIHANDLE hpkg, const char * prop)
{ {
UINT r; UINT r;
DWORD sz; DWORD sz;

8
include/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);