Andrew Talbot : msi: Write-strings warnings fix.
Alexandre Julliard
julliard at wine.codeweavers.com
Sat Aug 5 04:41:15 CDT 2006
Module: wine
Branch: refs/heads/master
Commit: d58e1dba4233ac5b69ac978a63624f95c1358e73
URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d58e1dba4233ac5b69ac978a63624f95c1358e73
Author: Andrew Talbot <Andrew.Talbot at talbotville.com>
Date: Fri Aug 4 22:27:42 2006 +0100
msi: Write-strings warnings fix.
---
dlls/msi/install.c | 12 ++++++------
dlls/msi/msipriv.h | 4 ++--
dlls/msi/tests/package.c | 16 ++++++++--------
include/msiquery.h | 8 ++++----
4 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/dlls/msi/install.c b/dlls/msi/install.c
index f5e2c42..249102f 100644
--- a/dlls/msi/install.c
+++ b/dlls/msi/install.c
@@ -579,7 +579,7 @@ UINT WINAPI MsiSetFeatureStateW(MSIHANDL
/***********************************************************************
* 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 @@ UINT WINAPI MsiGetFeatureStateA(MSIHANDL
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 @@ UINT MSI_GetFeatureStateW(MSIPACKAGE *pa
/***********************************************************************
* 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 @@ UINT WINAPI MsiSetComponentStateA(MSIHAN
/***********************************************************************
* 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 @@ static UINT MSI_SetComponentStateW(MSIPA
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 @@ UINT WINAPI MsiSetComponentStateW(MSIHAN
/***********************************************************************
* MsiGetComponentStateW (MSI.@)
*/
-UINT WINAPI MsiGetComponentStateW(MSIHANDLE hInstall, LPWSTR szComponent,
+UINT WINAPI MsiGetComponentStateW(MSIHANDLE hInstall, LPCWSTR szComponent,
INSTALLSTATE *piInstalled, INSTALLSTATE *piAction)
{
MSIPACKAGE* package;
diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h
index 27655ae..5d2c21e 100644
--- a/dlls/msi/msipriv.h
+++ b/dlls/msi/msipriv.h
@@ -393,8 +393,8 @@ extern INT MSI_ProcessMessage( MSIPACKAG
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 --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c
index 3f0299e..679c45c 100644
--- a/dlls/msi/tests/package.c
+++ b/dlls/msi/tests/package.c
@@ -98,7 +98,7 @@ static UINT create_file_table( MSIHANDLE
"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 @@ static UINT add_component_entry( MSIHAND
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 @@ static UINT add_feature_entry( MSIHANDLE
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 @@ static UINT add_feature_components_entry
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 @@ static void test_getsourcepath_bad( void
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 @@ static void test_getsourcepath( void )
/* 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 @@ static void test_settargetpath(void)
MSIHANDLE hpkg;
UINT r;
MSIHANDLE hdb;
-
+
hdb = create_package_db();
ok ( hdb, "failed to create package database\n" );
@@ -985,7 +985,7 @@ static void test_condition(void)
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 --git a/include/msiquery.h b/include/msiquery.h
index b1de190..ed99b85 100644
--- a/include/msiquery.h
+++ b/include/msiquery.h
@@ -189,14 +189,14 @@ #define MsiDatabaseGenerateTransform
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-cvs
mailing list