From ba9f4e807ada9bdb4503f2a068f679e937ce18cd Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Fri, 13 May 2011 17:31:09 +0200 Subject: [PATCH] mscoree: Mark internal symbols with hidden visibility and some vtables as static. --- dlls/mscoree/metadata.c | 2 +- dlls/mscoree/metahost.c | 8 ++++---- dlls/mscoree/mscoree_private.h | 36 +++++++++++++++++----------------- 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/dlls/mscoree/metadata.c b/dlls/mscoree/metadata.c index a2db50828d3..5c343f05cf7 100644 --- a/dlls/mscoree/metadata.c +++ b/dlls/mscoree/metadata.c @@ -169,7 +169,7 @@ static HRESULT WINAPI MetaDataDispenser_FindAssemblyModule(IMetaDataDispenserEx* return E_NOTIMPL; } -const struct IMetaDataDispenserExVtbl MetaDataDispenserVtbl = +static const struct IMetaDataDispenserExVtbl MetaDataDispenserVtbl = { MetaDataDispenser_QueryInterface, MetaDataDispenser_AddRef, diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index 98f1cbb6892..8fb846ccaef 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -46,7 +46,7 @@ static const WCHAR net_11_subdir[] = {'1','.','0',0}; static const WCHAR net_20_subdir[] = {'2','.','0',0}; static const WCHAR net_40_subdir[] = {'4','.','0',0}; -const struct ICLRRuntimeInfoVtbl CLRRuntimeInfoVtbl; +static const struct ICLRRuntimeInfoVtbl CLRRuntimeInfoVtbl; #define NUM_RUNTIMES 3 @@ -528,7 +528,7 @@ static HRESULT WINAPI CLRRuntimeInfo_IsStarted(ICLRRuntimeInfo* iface, return E_NOTIMPL; } -const struct ICLRRuntimeInfoVtbl CLRRuntimeInfoVtbl = { +static const struct ICLRRuntimeInfoVtbl CLRRuntimeInfoVtbl = { CLRRuntimeInfo_QueryInterface, CLRRuntimeInfo_AddRef, CLRRuntimeInfo_Release, @@ -767,7 +767,7 @@ struct InstalledRuntimeEnum ULONG pos; }; -const struct IEnumUnknownVtbl InstalledRuntimeEnum_Vtbl; +static const struct IEnumUnknownVtbl InstalledRuntimeEnum_Vtbl; static inline struct InstalledRuntimeEnum *impl_from_IEnumUnknown(IEnumUnknown *iface) { @@ -909,7 +909,7 @@ static HRESULT WINAPI InstalledRuntimeEnum_Clone(IEnumUnknown *iface, IEnumUnkno return S_OK; } -const struct IEnumUnknownVtbl InstalledRuntimeEnum_Vtbl = { +static const struct IEnumUnknownVtbl InstalledRuntimeEnum_Vtbl = { InstalledRuntimeEnum_QueryInterface, InstalledRuntimeEnum_AddRef, InstalledRuntimeEnum_Release, diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index 5428f17f60e..1b583c64b71 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -20,18 +20,18 @@ #ifndef __MSCOREE_PRIVATE__ #define __MSCOREE_PRIVATE__ -extern char *WtoA(LPCWSTR wstr); +extern char *WtoA(LPCWSTR wstr) DECLSPEC_HIDDEN; -extern HRESULT CLRMetaHost_CreateInstance(REFIID riid, void **ppobj); +extern HRESULT CLRMetaHost_CreateInstance(REFIID riid, void **ppobj) DECLSPEC_HIDDEN; extern HRESULT WINAPI CLRMetaHost_GetVersionFromFile(ICLRMetaHost* iface, - LPCWSTR pwzFilePath, LPWSTR pwzBuffer, DWORD *pcchBuffer); + LPCWSTR pwzFilePath, LPWSTR pwzBuffer, DWORD *pcchBuffer) DECLSPEC_HIDDEN; typedef struct tagASSEMBLY ASSEMBLY; -HRESULT assembly_create(ASSEMBLY **out, LPCWSTR file); -HRESULT assembly_release(ASSEMBLY *assembly); -HRESULT assembly_get_runtime_version(ASSEMBLY *assembly, LPSTR *version); +HRESULT assembly_create(ASSEMBLY **out, LPCWSTR file) DECLSPEC_HIDDEN; +HRESULT assembly_release(ASSEMBLY *assembly) DECLSPEC_HIDDEN; +HRESULT assembly_get_runtime_version(ASSEMBLY *assembly, LPSTR *version) DECLSPEC_HIDDEN; typedef struct RuntimeHost RuntimeHost; @@ -49,11 +49,11 @@ typedef struct CLRRuntimeInfo } CLRRuntimeInfo; extern HRESULT get_runtime_info(LPCWSTR exefile, LPCWSTR version, LPCWSTR config_file, - DWORD startup_flags, DWORD runtimeinfo_flags, BOOL legacy, ICLRRuntimeInfo **result); + DWORD startup_flags, DWORD runtimeinfo_flags, BOOL legacy, ICLRRuntimeInfo **result) DECLSPEC_HIDDEN; -extern HRESULT ICLRRuntimeInfo_GetRuntimeHost(ICLRRuntimeInfo *iface, RuntimeHost **result); +extern HRESULT ICLRRuntimeInfo_GetRuntimeHost(ICLRRuntimeInfo *iface, RuntimeHost **result) DECLSPEC_HIDDEN; -extern HRESULT MetaDataDispenser_CreateInstance(IUnknown **ppUnk); +extern HRESULT MetaDataDispenser_CreateInstance(IUnknown **ppUnk) DECLSPEC_HIDDEN; typedef struct parsed_config_file { @@ -66,9 +66,9 @@ typedef struct supported_runtime LPWSTR version; } supported_runtime; -extern HRESULT parse_config_file(LPCWSTR filename, parsed_config_file *result); +extern HRESULT parse_config_file(LPCWSTR filename, parsed_config_file *result) DECLSPEC_HIDDEN; -extern void free_parsed_config_file(parsed_config_file *file); +extern void free_parsed_config_file(parsed_config_file *file) DECLSPEC_HIDDEN; /* Mono embedding */ typedef struct _MonoDomain MonoDomain; @@ -129,20 +129,20 @@ typedef struct loaded_mono } loaded_mono; /* loaded runtime interfaces */ -extern void unload_all_runtimes(void); +extern void unload_all_runtimes(void) DECLSPEC_HIDDEN; -extern void expect_no_runtimes(void); +extern void expect_no_runtimes(void) DECLSPEC_HIDDEN; extern HRESULT RuntimeHost_Construct(const CLRRuntimeInfo *runtime_version, - loaded_mono *loaded_mono, RuntimeHost** result); + loaded_mono *loaded_mono, RuntimeHost** result) DECLSPEC_HIDDEN; -extern HRESULT RuntimeHost_GetInterface(RuntimeHost *This, REFCLSID clsid, REFIID riid, void **ppv); +extern HRESULT RuntimeHost_GetInterface(RuntimeHost *This, REFCLSID clsid, REFIID riid, void **ppv) DECLSPEC_HIDDEN; -extern HRESULT RuntimeHost_GetIUnknownForObject(RuntimeHost *This, MonoObject *obj, IUnknown **ppUnk); +extern HRESULT RuntimeHost_GetIUnknownForObject(RuntimeHost *This, MonoObject *obj, IUnknown **ppUnk) DECLSPEC_HIDDEN; extern HRESULT RuntimeHost_CreateManagedInstance(RuntimeHost *This, LPCWSTR name, - MonoDomain *domain, MonoObject **result); + MonoDomain *domain, MonoObject **result) DECLSPEC_HIDDEN; -extern HRESULT RuntimeHost_Destroy(RuntimeHost *This); +extern HRESULT RuntimeHost_Destroy(RuntimeHost *This) DECLSPEC_HIDDEN; #endif /* __MSCOREE_PRIVATE__ */