msi: Write-strings warnings fix
Andrew Talbot
Andrew.Talbot at talbotville.com
Fri Aug 4 16:27:42 CDT 2006
MSI{Get|Set}FeatureState(), MSI{Get|Set}ComponentState() and
MSI{Get|Set}Property() have appropriate const string arguments in the SDK.
---
Changelog:
msi: Write-strings warnings fix.
diff -urN a/dlls/msi/install.c b/dlls/msi/install.c
--- a/dlls/msi/install.c 2006-07-20 17:41:34.000000000 +0100
+++ b/dlls/msi/install.c 2006-08-04 22:10:10.000000000 +0100
@@ -579,7 +579,7 @@
/***********************************************************************
* MsiGetFeatureStateA (MSI.@)
*/
-UINT WINAPI MsiGetFeatureStateA(MSIHANDLE hInstall, LPSTR szFeature,
+UINT WINAPI MsiGetFeatureStateA(MSIHANDLE hInstall, LPCSTR szFeature,
INSTALLSTATE *piInstalled, INSTALLSTATE *piAction)
{
LPWSTR szwFeature = NULL;
@@ -594,7 +594,7 @@
return rc;
}
-UINT MSI_GetFeatureStateW(MSIPACKAGE *package, LPWSTR szFeature,
+UINT MSI_GetFeatureStateW(MSIPACKAGE *package, LPCWSTR szFeature,
INSTALLSTATE *piInstalled, INSTALLSTATE *piAction)
{
MSIFEATURE *feature;
@@ -617,7 +617,7 @@
/***********************************************************************
* MsiGetFeatureStateW (MSI.@)
*/
-UINT WINAPI MsiGetFeatureStateW(MSIHANDLE hInstall, LPWSTR szFeature,
+UINT WINAPI MsiGetFeatureStateW(MSIHANDLE hInstall, LPCWSTR szFeature,
INSTALLSTATE *piInstalled, INSTALLSTATE *piAction)
{
MSIPACKAGE* package;
@@ -652,7 +652,7 @@
/***********************************************************************
* MsiGetComponentStateA (MSI.@)
*/
-UINT WINAPI MsiGetComponentStateA(MSIHANDLE hInstall, LPSTR szComponent,
+UINT WINAPI MsiGetComponentStateA(MSIHANDLE hInstall, LPCSTR szComponent,
INSTALLSTATE *piInstalled, INSTALLSTATE *piAction)
{
LPWSTR szwComponent= NULL;
@@ -683,7 +683,7 @@
return ERROR_SUCCESS;
}
-UINT MSI_GetComponentStateW(MSIPACKAGE *package, LPWSTR szComponent,
+UINT MSI_GetComponentStateW(MSIPACKAGE *package, LPCWSTR szComponent,
INSTALLSTATE *piInstalled, INSTALLSTATE *piAction)
{
MSICOMPONENT *comp;
@@ -726,7 +726,7 @@
/***********************************************************************
* MsiGetComponentStateW (MSI.@)
*/
-UINT WINAPI MsiGetComponentStateW(MSIHANDLE hInstall, LPWSTR szComponent,
+UINT WINAPI MsiGetComponentStateW(MSIHANDLE hInstall, LPCWSTR szComponent,
INSTALLSTATE *piInstalled, INSTALLSTATE *piAction)
{
MSIPACKAGE* package;
diff -urN a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h
--- a/dlls/msi/msipriv.h 2006-07-28 17:23:46.000000000 +0100
+++ b/dlls/msi/msipriv.h 2006-08-04 22:10:10.000000000 +0100
@@ -393,8 +393,8 @@
extern UINT MSI_GetPropertyW( MSIPACKAGE *, LPCWSTR, LPWSTR, DWORD * );
extern UINT MSI_GetPropertyA(MSIPACKAGE *, LPCSTR, LPSTR, DWORD* );
extern MSICONDITION MSI_EvaluateConditionW( MSIPACKAGE *, LPCWSTR );
-extern UINT MSI_GetComponentStateW( MSIPACKAGE *, LPWSTR, INSTALLSTATE *, INSTALLSTATE * );
-extern UINT MSI_GetFeatureStateW( MSIPACKAGE *, LPWSTR, INSTALLSTATE *, INSTALLSTATE * );
+extern UINT MSI_GetComponentStateW( MSIPACKAGE *, LPCWSTR, INSTALLSTATE *, INSTALLSTATE * );
+extern UINT MSI_GetFeatureStateW( MSIPACKAGE *, LPCWSTR, INSTALLSTATE *, INSTALLSTATE * );
extern UINT WINAPI MSI_SetFeatureStateW(MSIPACKAGE*, LPCWSTR, INSTALLSTATE );
/* for deformating */
diff -urN a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c
--- a/dlls/msi/tests/package.c 2006-08-02 17:16:46.000000000 +0100
+++ b/dlls/msi/tests/package.c 2006-08-04 22:10:10.000000000 +0100
@@ -98,7 +98,7 @@
"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` "
"(`Component`, `ComponentId`, `Directory_`, `Attributes`, `Condition`, `KeyPath`) "
@@ -114,7 +114,7 @@
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`, "
"`Title`, `Description`, `Display`, `Level`, `Directory_`, `Attributes`) VALUES( %s )";
@@ -129,7 +129,7 @@
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` "
"(`Feature_`, `Component_`) "
@@ -145,7 +145,7 @@
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` "
"(`File`, `Component_`, `FileName`, `FileSize`, `Version`, `Language`, `Attributes`, `Sequence`) "
@@ -291,7 +291,7 @@
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 *query;
@@ -334,7 +334,7 @@
/* another test but try create a directory this time */
hdb = create_package_db();
ok( hdb, "failed to create database\n");
-
+
r = add_directory_entry( hdb, "'TARGETDIR', '', 'SourceDir'");
ok( r == S_OK, "failed\n");
@@ -470,7 +470,7 @@
MSIHANDLE hpkg;
UINT r;
MSIHANDLE hdb;
-
+
hdb = create_package_db();
ok ( hdb, "failed to create package database\n" );
@@ -985,7 +985,7 @@
DeleteFile(msifile);
}
-static BOOL check_prop_empty( MSIHANDLE hpkg, char * prop)
+static BOOL check_prop_empty( MSIHANDLE hpkg, const char * prop)
{
UINT r;
DWORD sz;
diff -urN a/include/msiquery.h b/include/msiquery.h
--- a/include/msiquery.h 2006-05-23 13:49:04.000000000 +0100
+++ b/include/msiquery.h 2006-08-04 22:10:10.000000000 +0100
@@ -189,14 +189,14 @@
UINT WINAPI MsiDatabaseCommit(MSIHANDLE);
/* install state */
-UINT WINAPI MsiGetFeatureStateA(MSIHANDLE,LPSTR,INSTALLSTATE*,INSTALLSTATE*);
-UINT WINAPI MsiGetFeatureStateW(MSIHANDLE,LPWSTR,INSTALLSTATE*,INSTALLSTATE*);
+UINT WINAPI MsiGetFeatureStateA(MSIHANDLE,LPCSTR,INSTALLSTATE*,INSTALLSTATE*);
+UINT WINAPI MsiGetFeatureStateW(MSIHANDLE,LPCWSTR,INSTALLSTATE*,INSTALLSTATE*);
#define MsiGetFeatureState WINELIB_NAME_AW(MsiGetFeatureState)
UINT WINAPI MsiSetComponentStateA(MSIHANDLE,LPCSTR,INSTALLSTATE);
UINT WINAPI MsiSetComponentStateW(MSIHANDLE,LPCWSTR,INSTALLSTATE);
#define MsiSetComponentState WINELIB_NAME_AW(MsiSetComponentState)
-UINT WINAPI MsiGetComponentStateA(MSIHANDLE,LPSTR,INSTALLSTATE*,INSTALLSTATE*);
-UINT WINAPI MsiGetComponentStateW(MSIHANDLE,LPWSTR,INSTALLSTATE*,INSTALLSTATE*);
+UINT WINAPI MsiGetComponentStateA(MSIHANDLE,LPCSTR,INSTALLSTATE*,INSTALLSTATE*);
+UINT WINAPI MsiGetComponentStateW(MSIHANDLE,LPCWSTR,INSTALLSTATE*,INSTALLSTATE*);
#define MsiGetComponentState WINELIB_NAME_AW(MsiGetComponentState)
MSICONDITION WINAPI MsiEvaluateConditionA(MSIHANDLE,LPCSTR);
More information about the wine-patches
mailing list