msi: Constify some variables
Andrew Talbot
Andrew.Talbot at talbotville.com
Thu May 31 16:19:28 CDT 2007
Changelog:
msi: Constify some variables.
diff -urN a/dlls/msi/appsearch.c b/dlls/msi/appsearch.c
--- a/dlls/msi/appsearch.c 2007-05-10 17:30:53.000000000 +0100
+++ b/dlls/msi/appsearch.c 2007-05-31 21:25:47.000000000 +0100
@@ -474,7 +474,7 @@
* Return ERROR_SUCCESS in case of success (whether or not the file matches),
* something else if an install-halting error occurs.
*/
-static UINT ACTION_FileVersionMatches(MSISIGNATURE *sig, LPCWSTR filePath,
+static UINT ACTION_FileVersionMatches(const MSISIGNATURE *sig, LPCWSTR filePath,
BOOL *matches)
{
UINT rc = ERROR_SUCCESS;
@@ -549,8 +549,8 @@
* Return ERROR_SUCCESS in case of success (whether or not the file matches),
* something else if an install-halting error occurs.
*/
-static UINT ACTION_FileMatchesSig(MSISIGNATURE *sig,
- LPWIN32_FIND_DATAW findData, LPCWSTR fullFilePath, BOOL *matches)
+static UINT ACTION_FileMatchesSig(const MSISIGNATURE *sig,
+ const WIN32_FIND_DATAW *findData, LPCWSTR fullFilePath, BOOL *matches)
{
UINT rc = ERROR_SUCCESS;
diff -urN a/dlls/msi/classes.c b/dlls/msi/classes.c
--- a/dlls/msi/classes.c 2006-10-10 19:20:06.000000000 +0100
+++ b/dlls/msi/classes.c 2007-05-31 21:26:06.000000000 +0100
@@ -735,7 +735,7 @@
mime->InstallMe = TRUE;
}
-static UINT register_appid(MSIAPPID *appid, LPCWSTR app )
+static UINT register_appid(const MSIAPPID *appid, LPCWSTR app )
{
static const WCHAR szAppID[] = { 'A','p','p','I','D',0 };
static const WCHAR szRemoteServerName[] =
@@ -965,7 +965,7 @@
return rc;
}
-static LPCWSTR get_clsid_of_progid( MSIPROGID *progid )
+static LPCWSTR get_clsid_of_progid( const MSIPROGID *progid )
{
while (progid)
{
@@ -976,7 +976,7 @@
return NULL;
}
-static UINT register_progid( MSIPROGID* progid )
+static UINT register_progid( const MSIPROGID* progid )
{
static const WCHAR szCLSID[] = { 'C','L','S','I','D',0 };
static const WCHAR szDefaultIcon[] =
@@ -1048,7 +1048,7 @@
}
static UINT register_verb(MSIPACKAGE *package, LPCWSTR progid,
- MSICOMPONENT* component, MSIEXTENSION* extension,
+ MSICOMPONENT* component, const MSIEXTENSION* extension,
MSIVERB* verb, INT* Sequence )
{
LPWSTR keyname;
diff -urN a/dlls/msi/cond.y b/dlls/msi/cond.y
--- a/dlls/msi/cond.y 2006-12-14 20:25:01.000000000 +0000
+++ b/dlls/msi/cond.y 2007-05-31 21:32:22.000000000 +0100
@@ -56,8 +56,8 @@
INT len;
};
-static LPWSTR COND_GetString( struct cond_str *str );
-static LPWSTR COND_GetLiteral( struct cond_str *str );
+static LPWSTR COND_GetString( const struct cond_str *str );
+static LPWSTR COND_GetLiteral( const struct cond_str *str );
static int cond_lex( void *COND_lval, COND_input *info);
static const WCHAR szEmpty[] = { 0 };
@@ -678,7 +678,7 @@
return rc;
}
-static LPWSTR COND_GetString( struct cond_str *str )
+static LPWSTR COND_GetString( const struct cond_str *str )
{
LPWSTR ret;
@@ -692,7 +692,7 @@
return ret;
}
-static LPWSTR COND_GetLiteral( struct cond_str *str )
+static LPWSTR COND_GetLiteral( const struct cond_str *str )
{
LPWSTR ret;
diff -urN a/dlls/msi/custom.c b/dlls/msi/custom.c
--- a/dlls/msi/custom.c 2007-05-30 17:21:38.000000000 +0100
+++ b/dlls/msi/custom.c 2007-05-31 22:12:36.000000000 +0100
@@ -124,7 +124,7 @@
/* stores the CustomActionData before the action:
* [CustomActionData]Action
*/
-static LPWSTR msi_get_deferred_action(LPCWSTR action, LPWSTR actiondata)
+static LPWSTR msi_get_deferred_action(LPCWSTR action, LPCWSTR actiondata)
{
LPWSTR deferred;
DWORD len;
@@ -981,7 +981,7 @@
return wait_process_handle(package, type, info.hProcess, action);
}
-static DWORD WINAPI ACTION_CallScript( const LPGUID guid )
+static DWORD WINAPI ACTION_CallScript( const GUID *guid )
{
msi_custom_action_info *info;
MSIHANDLE hPackage;
@@ -1200,7 +1200,7 @@
return wait_thread_handle( info );
}
-void ACTION_FinishCustomActions(MSIPACKAGE* package)
+void ACTION_FinishCustomActions(const MSIPACKAGE* package)
{
struct list *item;
HANDLE *wait_handles;
diff -urN a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h
--- a/dlls/msi/msipriv.h 2007-05-30 17:21:38.000000000 +0100
+++ b/dlls/msi/msipriv.h 2007-05-31 22:10:10.000000000 +0100
@@ -726,7 +726,7 @@
/* action related functions */
extern UINT ACTION_PerformAction(MSIPACKAGE *package, const WCHAR *action, BOOL force);
extern UINT ACTION_PerformUIAction(MSIPACKAGE *package, const WCHAR *action);
-extern void ACTION_FinishCustomActions( MSIPACKAGE* package);
+extern void ACTION_FinishCustomActions( const MSIPACKAGE* package);
extern UINT ACTION_CustomAction(MSIPACKAGE *package,const WCHAR *action, BOOL execute);
static inline void msi_feature_set_state( MSIFEATURE *feature, INSTALLSTATE state )
More information about the wine-patches
mailing list