Module: wine Branch: master Commit: d7119f2b736013326dbe14bc30aa12e3c7454305 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7119f2b736013326dbe14bc30...
Author: Francois Gouget fgouget@codeweavers.com Date: Wed Nov 26 17:15:59 2008 +0100
msi: Remove WINAPI on static functions where not needed.
---
dlls/msi/automation.c | 2 +- dlls/msi/custom.c | 6 +++--- dlls/msi/install.c | 4 ++-- dlls/msi/msi.c | 12 ++++++------ dlls/msi/registry.c | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/dlls/msi/automation.c b/dlls/msi/automation.c index 834e406..3b01266 100644 --- a/dlls/msi/automation.c +++ b/dlls/msi/automation.c @@ -708,7 +708,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. */ -static HRESULT WINAPI DispGetParam_CopyOnly( +static HRESULT 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/custom.c b/dlls/msi/custom.c index 71864d5..66a7ce6 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -659,7 +659,7 @@ static UINT get_action_info( const GUID *guid, INT *type, MSIHANDLE *handle, return ERROR_SUCCESS; }
-static DWORD WINAPI ACTION_CallDllFunction( const GUID *guid ) +static DWORD ACTION_CallDllFunction( const GUID *guid ) { MsiCustomActionEntryPoint fn; MSIHANDLE hPackage, handle; @@ -744,7 +744,7 @@ static DWORD WINAPI DllThread( LPVOID arg ) return rc; }
-static DWORD WINAPI ACTION_CAInstallPackage(const GUID *guid) +static DWORD ACTION_CAInstallPackage(const GUID *guid) { msi_custom_action_info *info; UINT r = ERROR_FUNCTION_FAILED; @@ -1147,7 +1147,7 @@ static UINT HANDLE_CustomType34(MSIPACKAGE *package, LPCWSTR source, return wait_process_handle(package, type, info.hProcess, action); }
-static DWORD WINAPI ACTION_CallScript( const GUID *guid ) +static DWORD ACTION_CallScript( const GUID *guid ) { msi_custom_action_info *info; MSIHANDLE hPackage; diff --git a/dlls/msi/install.c b/dlls/msi/install.c index 95fe51a..bcb68c3 100644 --- a/dlls/msi/install.c +++ b/dlls/msi/install.c @@ -215,8 +215,8 @@ UINT msi_strcpy_to_awstring( LPCWSTR str, awstring *awbuf, DWORD *sz ) /*********************************************************************** * MsiGetTargetPath (internal) */ -static UINT WINAPI MSI_GetTargetPath( MSIHANDLE hInstall, LPCWSTR szFolder, - awstring *szPathBuf, LPDWORD pcchPathBuf ) +static UINT MSI_GetTargetPath( MSIHANDLE hInstall, LPCWSTR szFolder, + awstring *szPathBuf, LPDWORD pcchPathBuf ) { MSIPACKAGE *package; LPWSTR path; diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 2b3b635..68c0706 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -690,8 +690,8 @@ static LPWSTR msi_reg_get_value(HKEY hkey, LPCWSTR name, DWORD *type) return strdupW(temp); }
-static UINT WINAPI MSI_GetProductInfo(LPCWSTR szProduct, LPCWSTR szAttribute, - awstring *szValue, LPDWORD pcchValueBuf) +static UINT MSI_GetProductInfo(LPCWSTR szProduct, LPCWSTR szAttribute, + awstring *szValue, LPDWORD pcchValueBuf) { UINT r = ERROR_UNKNOWN_PROPERTY; HKEY prodkey, userdata, source; @@ -1748,8 +1748,8 @@ UINT WINAPI MsiVerifyPackageW( LPCWSTR szPackage ) return r; }
-static INSTALLSTATE WINAPI MSI_GetComponentPath(LPCWSTR szProduct, LPCWSTR szComponent, - awstring* lpPathBuf, LPDWORD pcchBuf) +static INSTALLSTATE MSI_GetComponentPath(LPCWSTR szProduct, LPCWSTR szComponent, + awstring* lpPathBuf, LPDWORD pcchBuf) { WCHAR squished_pc[GUID_SIZE]; WCHAR squished_comp[GUID_SIZE]; @@ -2292,7 +2292,7 @@ INSTALLSTATE WINAPI MsiUseFeatureA( LPCSTR szProduct, LPCSTR szFeature ) /*********************************************************************** * MSI_ProvideQualifiedComponentEx [internal] */ -static UINT WINAPI MSI_ProvideQualifiedComponentEx(LPCWSTR szComponent, +static UINT MSI_ProvideQualifiedComponentEx(LPCWSTR szComponent, LPCWSTR szQualifier, DWORD dwInstallMode, LPCWSTR szProduct, DWORD Unused1, DWORD Unused2, awstring *lpPathBuf, LPDWORD pcchPathBuf) @@ -2417,7 +2417,7 @@ UINT WINAPI MsiProvideQualifiedComponentA( LPCSTR szComponent, /*********************************************************************** * MSI_GetUserInfo [internal] */ -static USERINFOSTATE WINAPI MSI_GetUserInfo(LPCWSTR szProduct, +static USERINFOSTATE MSI_GetUserInfo(LPCWSTR szProduct, awstring *lpUserNameBuf, LPDWORD pcchUserNameBuf, awstring *lpOrgNameBuf, LPDWORD pcchOrgNameBuf, awstring *lpSerialBuf, LPDWORD pcchSerialBuf) diff --git a/dlls/msi/registry.c b/dlls/msi/registry.c index 26b872d..2568e7e 100644 --- a/dlls/msi/registry.c +++ b/dlls/msi/registry.c @@ -1436,7 +1436,7 @@ UINT WINAPI MsiEnumClientsW(LPCWSTR szComponent, DWORD index, LPWSTR szProduct) return r; }
-static UINT WINAPI MSI_EnumComponentQualifiers( LPCWSTR szComponent, DWORD iIndex, +static UINT MSI_EnumComponentQualifiers( LPCWSTR szComponent, DWORD iIndex, awstring *lpQualBuf, LPDWORD pcchQual, awstring *lpAppBuf, LPDWORD pcchAppBuf ) {