From 4439e0b57d9dc3491b7f6fe33b795caac6e61acc Mon Sep 17 00:00:00 2001 From: James Hawkins Date: Fri, 29 Feb 2008 23:29:43 -0600 Subject: [PATCH] msi: Make local functions static. --- dlls/msi/action.c | 4 ++-- dlls/msi/automation.c | 6 +++--- dlls/msi/database.c | 16 ++++++++-------- dlls/msi/package.c | 36 ++++++++++++++++++------------------ dlls/msi/record.c | 2 +- 5 files changed, 32 insertions(+), 32 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 6efe14cceca..346fac27ca5 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -576,7 +576,7 @@ static UINT msi_apply_transforms( MSIPACKAGE *package ) return r; } -BOOL ui_sequence_exists( MSIPACKAGE *package ) +static BOOL ui_sequence_exists( MSIPACKAGE *package ) { MSIQUERY *view; UINT rc; @@ -5220,7 +5220,7 @@ static BOOL add_wildcard(FILE_LIST *files, LPWSTR source, LPWSTR dest) return TRUE; } -BOOL move_files_wildcard(LPWSTR source, LPWSTR dest, int options) +static BOOL move_files_wildcard(LPWSTR source, LPWSTR dest, int options) { WIN32_FIND_DATAW wfd; HANDLE hfile; diff --git a/dlls/msi/automation.c b/dlls/msi/automation.c index ed6b7f11ee8..32dfc2a188c 100644 --- a/dlls/msi/automation.c +++ b/dlls/msi/automation.c @@ -150,7 +150,7 @@ HRESULT load_type_info(IDispatch *iface, ITypeInfo **pptinfo, REFIID clsid, LCID /* Create the automation object, placing the result in the pointer ppObj. The automation object is created * with the appropriate clsid and invocation function. */ -HRESULT create_automation_object(MSIHANDLE msiHandle, IUnknown *pUnkOuter, LPVOID *ppObj, REFIID clsid, +static HRESULT create_automation_object(MSIHANDLE msiHandle, IUnknown *pUnkOuter, LPVOID *ppObj, REFIID clsid, HRESULT (STDMETHODCALLTYPE *funcInvoke)(AutomationObject*,DISPID,REFIID,LCID,WORD,DISPPARAMS*, VARIANT*,EXCEPINFO*,UINT*), void (STDMETHODCALLTYPE *funcFree)(AutomationObject*), @@ -191,7 +191,7 @@ HRESULT create_automation_object(MSIHANDLE msiHandle, IUnknown *pUnkOuter, LPVOI } /* Create a list enumerator, placing the result in the pointer ppObj. */ -HRESULT create_list_enumerator(IUnknown *pUnkOuter, LPVOID *ppObj, AutomationObject *pObj, ULONG ulPos) +static HRESULT create_list_enumerator(IUnknown *pUnkOuter, LPVOID *ppObj, AutomationObject *pObj, ULONG ulPos) { ListEnumerator *object; @@ -705,7 +705,7 @@ static const struct IEnumVARIANTVtbl ListEnumerator_Vtbl = /* Helper function that copies a passed parameter instead of using VariantChangeType like the actual DispGetParam. This function is only for VARIANT type parameters that have several types that cannot be properly discriminated using DispGetParam/VariantChangeType. */ -HRESULT WINAPI DispGetParam_CopyOnly( +static HRESULT WINAPI DispGetParam_CopyOnly( DISPPARAMS *pdispparams, /* [in] Parameter list */ UINT *position, /* [in] Position of parameter to copy in pdispparams; on return will contain calculated position */ VARIANT *pvarResult) /* [out] Destination for resulting variant */ diff --git a/dlls/msi/database.c b/dlls/msi/database.c index bad40b8011a..875d2d0b681 100644 --- a/dlls/msi/database.c +++ b/dlls/msi/database.c @@ -1052,32 +1052,32 @@ static ULONG WINAPI mrd_Release( IWineMsiRemoteDatabase *iface ) return r; } -HRESULT WINAPI mrd_IsTablePersistent( IWineMsiRemoteDatabase *iface, - BSTR table, MSICONDITION *persistent ) +static HRESULT WINAPI mrd_IsTablePersistent( IWineMsiRemoteDatabase *iface, + BSTR table, MSICONDITION *persistent ) { msi_remote_database_impl *This = mrd_from_IWineMsiRemoteDatabase( iface ); *persistent = MsiDatabaseIsTablePersistentW(This->database, (LPWSTR)table); return S_OK; } -HRESULT WINAPI mrd_GetPrimaryKeys( IWineMsiRemoteDatabase *iface, - BSTR table, MSIHANDLE *keys ) +static HRESULT WINAPI mrd_GetPrimaryKeys( IWineMsiRemoteDatabase *iface, + BSTR table, MSIHANDLE *keys ) { msi_remote_database_impl *This = mrd_from_IWineMsiRemoteDatabase( iface ); UINT r = MsiDatabaseGetPrimaryKeysW(This->database, (LPWSTR)table, keys); return HRESULT_FROM_WIN32(r); } -HRESULT WINAPI mrd_GetSummaryInformation( IWineMsiRemoteDatabase *iface, - UINT updatecount, MSIHANDLE *suminfo ) +static HRESULT WINAPI mrd_GetSummaryInformation( IWineMsiRemoteDatabase *iface, + UINT updatecount, MSIHANDLE *suminfo ) { msi_remote_database_impl *This = mrd_from_IWineMsiRemoteDatabase( iface ); UINT r = MsiGetSummaryInformationW(This->database, NULL, updatecount, suminfo); return HRESULT_FROM_WIN32(r); } -HRESULT WINAPI mrd_OpenView( IWineMsiRemoteDatabase *iface, - BSTR query, MSIHANDLE *view ) +static HRESULT WINAPI mrd_OpenView( IWineMsiRemoteDatabase *iface, + BSTR query, MSIHANDLE *view ) { msi_remote_database_impl *This = mrd_from_IWineMsiRemoteDatabase( iface ); UINT r = MsiDatabaseOpenViewW(This->database, (LPWSTR)query, view); diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 672de8d3e1f..fad05200f5d 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -1648,7 +1648,7 @@ static HRESULT WINAPI mrp_SetMsiHandle( IWineMsiRemotePackage *iface, MSIHANDLE return S_OK; } -HRESULT WINAPI mrp_GetActiveDatabase( IWineMsiRemotePackage *iface, MSIHANDLE *handle ) +static HRESULT WINAPI mrp_GetActiveDatabase( IWineMsiRemotePackage *iface, MSIHANDLE *handle ) { msi_remote_package_impl* This = mrp_from_IWineMsiRemotePackage( iface ); IWineMsiRemoteDatabase *rdb = NULL; @@ -1675,7 +1675,7 @@ HRESULT WINAPI mrp_GetActiveDatabase( IWineMsiRemotePackage *iface, MSIHANDLE *h return S_OK; } -HRESULT WINAPI mrp_GetProperty( IWineMsiRemotePackage *iface, BSTR property, BSTR *value, DWORD *size ) +static HRESULT WINAPI mrp_GetProperty( IWineMsiRemotePackage *iface, BSTR property, BSTR *value, DWORD *size ) { msi_remote_package_impl* This = mrp_from_IWineMsiRemotePackage( iface ); UINT r; @@ -1687,63 +1687,63 @@ HRESULT WINAPI mrp_GetProperty( IWineMsiRemotePackage *iface, BSTR property, BST return S_OK; } -HRESULT WINAPI mrp_SetProperty( IWineMsiRemotePackage *iface, BSTR property, BSTR value ) +static HRESULT WINAPI mrp_SetProperty( IWineMsiRemotePackage *iface, BSTR property, BSTR value ) { msi_remote_package_impl* This = mrp_from_IWineMsiRemotePackage( iface ); UINT r = MsiSetPropertyW(This->package, (LPWSTR)property, (LPWSTR)value); return HRESULT_FROM_WIN32(r); } -HRESULT WINAPI mrp_ProcessMessage( IWineMsiRemotePackage *iface, INSTALLMESSAGE message, MSIHANDLE record ) +static HRESULT WINAPI mrp_ProcessMessage( IWineMsiRemotePackage *iface, INSTALLMESSAGE message, MSIHANDLE record ) { msi_remote_package_impl* This = mrp_from_IWineMsiRemotePackage( iface ); UINT r = MsiProcessMessage(This->package, message, record); return HRESULT_FROM_WIN32(r); } -HRESULT WINAPI mrp_DoAction( IWineMsiRemotePackage *iface, BSTR action ) +static HRESULT WINAPI mrp_DoAction( IWineMsiRemotePackage *iface, BSTR action ) { msi_remote_package_impl* This = mrp_from_IWineMsiRemotePackage( iface ); UINT r = MsiDoActionW(This->package, (LPWSTR)action); return HRESULT_FROM_WIN32(r); } -HRESULT WINAPI mrp_Sequence( IWineMsiRemotePackage *iface, BSTR table, int sequence ) +static HRESULT WINAPI mrp_Sequence( IWineMsiRemotePackage *iface, BSTR table, int sequence ) { msi_remote_package_impl* This = mrp_from_IWineMsiRemotePackage( iface ); UINT r = MsiSequenceW(This->package, (LPWSTR)table, sequence); return HRESULT_FROM_WIN32(r); } -HRESULT WINAPI mrp_GetTargetPath( IWineMsiRemotePackage *iface, BSTR folder, BSTR *value, DWORD *size ) +static HRESULT WINAPI mrp_GetTargetPath( IWineMsiRemotePackage *iface, BSTR folder, BSTR *value, DWORD *size ) { msi_remote_package_impl* This = mrp_from_IWineMsiRemotePackage( iface ); UINT r = MsiGetTargetPathW(This->package, (LPWSTR)folder, (LPWSTR)value, size); return HRESULT_FROM_WIN32(r); } -HRESULT WINAPI mrp_SetTargetPath( IWineMsiRemotePackage *iface, BSTR folder, BSTR value) +static HRESULT WINAPI mrp_SetTargetPath( IWineMsiRemotePackage *iface, BSTR folder, BSTR value) { msi_remote_package_impl* This = mrp_from_IWineMsiRemotePackage( iface ); UINT r = MsiSetTargetPathW(This->package, (LPWSTR)folder, (LPWSTR)value); return HRESULT_FROM_WIN32(r); } -HRESULT WINAPI mrp_GetSourcePath( IWineMsiRemotePackage *iface, BSTR folder, BSTR *value, DWORD *size ) +static HRESULT WINAPI mrp_GetSourcePath( IWineMsiRemotePackage *iface, BSTR folder, BSTR *value, DWORD *size ) { msi_remote_package_impl* This = mrp_from_IWineMsiRemotePackage( iface ); UINT r = MsiGetSourcePathW(This->package, (LPWSTR)folder, (LPWSTR)value, size); return HRESULT_FROM_WIN32(r); } -HRESULT WINAPI mrp_GetMode( IWineMsiRemotePackage *iface, MSIRUNMODE mode, BOOL *ret ) +static HRESULT WINAPI mrp_GetMode( IWineMsiRemotePackage *iface, MSIRUNMODE mode, BOOL *ret ) { msi_remote_package_impl* This = mrp_from_IWineMsiRemotePackage( iface ); *ret = MsiGetMode(This->package, mode); return S_OK; } -HRESULT WINAPI mrp_GetFeatureState( IWineMsiRemotePackage *iface, BSTR feature, +static HRESULT WINAPI mrp_GetFeatureState( IWineMsiRemotePackage *iface, BSTR feature, INSTALLSTATE *installed, INSTALLSTATE *action ) { msi_remote_package_impl* This = mrp_from_IWineMsiRemotePackage( iface ); @@ -1751,14 +1751,14 @@ HRESULT WINAPI mrp_GetFeatureState( IWineMsiRemotePackage *iface, BSTR feature, return HRESULT_FROM_WIN32(r); } -HRESULT WINAPI mrp_SetFeatureState( IWineMsiRemotePackage *iface, BSTR feature, INSTALLSTATE state ) +static HRESULT WINAPI mrp_SetFeatureState( IWineMsiRemotePackage *iface, BSTR feature, INSTALLSTATE state ) { msi_remote_package_impl* This = mrp_from_IWineMsiRemotePackage( iface ); UINT r = MsiSetFeatureStateW(This->package, (LPWSTR)feature, state); return HRESULT_FROM_WIN32(r); } -HRESULT WINAPI mrp_GetComponentState( IWineMsiRemotePackage *iface, BSTR component, +static HRESULT WINAPI mrp_GetComponentState( IWineMsiRemotePackage *iface, BSTR component, INSTALLSTATE *installed, INSTALLSTATE *action ) { msi_remote_package_impl* This = mrp_from_IWineMsiRemotePackage( iface ); @@ -1766,28 +1766,28 @@ HRESULT WINAPI mrp_GetComponentState( IWineMsiRemotePackage *iface, BSTR compone return HRESULT_FROM_WIN32(r); } -HRESULT WINAPI mrp_SetComponentState( IWineMsiRemotePackage *iface, BSTR component, INSTALLSTATE state ) +static HRESULT WINAPI mrp_SetComponentState( IWineMsiRemotePackage *iface, BSTR component, INSTALLSTATE state ) { msi_remote_package_impl* This = mrp_from_IWineMsiRemotePackage( iface ); UINT r = MsiSetComponentStateW(This->package, (LPWSTR)component, state); return HRESULT_FROM_WIN32(r); } -HRESULT WINAPI mrp_GetLanguage( IWineMsiRemotePackage *iface, LANGID *language ) +static HRESULT WINAPI mrp_GetLanguage( IWineMsiRemotePackage *iface, LANGID *language ) { msi_remote_package_impl* This = mrp_from_IWineMsiRemotePackage( iface ); *language = MsiGetLanguage(This->package); return S_OK; } -HRESULT WINAPI mrp_SetInstallLevel( IWineMsiRemotePackage *iface, int level ) +static HRESULT WINAPI mrp_SetInstallLevel( IWineMsiRemotePackage *iface, int level ) { msi_remote_package_impl* This = mrp_from_IWineMsiRemotePackage( iface ); UINT r = MsiSetInstallLevel(This->package, level); return HRESULT_FROM_WIN32(r); } -HRESULT WINAPI mrp_FormatRecord( IWineMsiRemotePackage *iface, MSIHANDLE record, +static HRESULT WINAPI mrp_FormatRecord( IWineMsiRemotePackage *iface, MSIHANDLE record, BSTR value, DWORD *size ) { msi_remote_package_impl* This = mrp_from_IWineMsiRemotePackage( iface ); @@ -1795,7 +1795,7 @@ HRESULT WINAPI mrp_FormatRecord( IWineMsiRemotePackage *iface, MSIHANDLE record, return HRESULT_FROM_WIN32(r); } -HRESULT WINAPI mrp_EvaluateCondition( IWineMsiRemotePackage *iface, BSTR condition ) +static HRESULT WINAPI mrp_EvaluateCondition( IWineMsiRemotePackage *iface, BSTR condition ) { msi_remote_package_impl* This = mrp_from_IWineMsiRemotePackage( iface ); UINT r = MsiEvaluateConditionW(This->package, (LPWSTR)condition); diff --git a/dlls/msi/record.c b/dlls/msi/record.c index 7a9c9e0d8cf..9a8abc079f7 100644 --- a/dlls/msi/record.c +++ b/dlls/msi/record.c @@ -673,7 +673,7 @@ UINT MSI_RecordSetStream(MSIRECORD *rec, UINT iField, IStream *stream) return ERROR_SUCCESS; } -UINT MSI_RecordSetStreamFromFileW(MSIRECORD *rec, UINT iField, LPCWSTR szFilename) +static UINT MSI_RecordSetStreamFromFileW(MSIRECORD *rec, UINT iField, LPCWSTR szFilename) { IStream *stm = NULL; HRESULT r;