May 2011 - Wine-commits - list.winehq.org

Vincent Povirk : mscoree: Accept a NULL version in CorBindToRuntimeEx.
by Alexandre Julliard 20 May '11

20 May '11

Module: wine Branch: master Commit: d434b3369503b3d2852925518db07145bc322b92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d434b3369503b3d2852925518… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu May 19 12:59:44 2011 -0500 mscoree: Accept a NULL version in CorBindToRuntimeEx. --- dlls/mscoree/mscoree_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index 6fe32d2..9e37eae 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -373,7 +373,7 @@ HRESULT WINAPI CorBindToRuntimeEx(LPWSTR szVersion, LPWSTR szBuildFlavor, DWORD *ppv = NULL; - ret = get_runtime_info(NULL, szVersion, NULL, nflags, 0, TRUE, &info); + ret = get_runtime_info(NULL, szVersion, NULL, nflags, RUNTIME_INFO_UPGRADE_VERSION, TRUE, &info); if (SUCCEEDED(ret)) {

1 0

Vincent Povirk : mscoree: Return success from ICorRuntimeHost_Start stub.
by Alexandre Julliard 20 May '11

20 May '11

Module: wine Branch: master Commit: 692a7593cf79626b4467754de1af4c3bf397d859 URL: http://source.winehq.org/git/wine.git/?a=commit;h=692a7593cf79626b4467754de… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu May 19 13:10:36 2011 -0500 mscoree: Return success from ICorRuntimeHost_Start stub. We don't really have the ability to "Start" and "Stop" Mono, though we can create a default domain. --- dlls/mscoree/corruntimehost.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c index bcdd485..231295d 100644 --- a/dlls/mscoree/corruntimehost.c +++ b/dlls/mscoree/corruntimehost.c @@ -253,7 +253,7 @@ static HRESULT WINAPI corruntimehost_Start( ICorRuntimeHost* iface) { FIXME("stub %p\n", iface); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI corruntimehost_Stop(

1 0

Vincent Povirk : mscoree: Implement ICorRuntimeHost_GetDefaultDomain.
by Alexandre Julliard 20 May '11

20 May '11

Module: wine Branch: master Commit: 6bd0887225fc05d8139e747a8581ea3a7ccc52fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=6bd0887225fc05d8139e747a8… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu May 19 14:08:12 2011 -0500 mscoree: Implement ICorRuntimeHost_GetDefaultDomain. --- dlls/mscoree/corruntimehost.c | 79 +++++++++++++++++++++++++++++++++++++++- 1 files changed, 77 insertions(+), 2 deletions(-) diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c index 231295d..607537c 100644 --- a/dlls/mscoree/corruntimehost.c +++ b/dlls/mscoree/corruntimehost.c @@ -39,6 +39,10 @@ WINE_DEFAULT_DEBUG_CHANNEL( mscoree ); +#include "initguid.h" + +DEFINE_GUID(IID__AppDomain, 0x05f696dc,0x2b29,0x3663,0xad,0x8b,0xc4,0x38,0x9c,0xf2,0xa7,0x13); + struct RuntimeHost { const struct ICorRuntimeHostVtbl *lpVtbl; @@ -142,6 +146,65 @@ static void RuntimeHost_DeleteDomain(RuntimeHost *This, MonoDomain *domain) LeaveCriticalSection(&This->lock); } +static HRESULT RuntimeHost_GetIUnknownForDomain(RuntimeHost *This, MonoDomain *domain, IUnknown **punk) +{ + HRESULT hr; + void *args[0]; + MonoAssembly *assembly; + MonoImage *image; + MonoClass *klass; + MonoMethod *method; + MonoObject *appdomain_object; + IUnknown *unk; + + assembly = This->mono->mono_domain_assembly_open(domain, "mscorlib"); + if (!assembly) + { + ERR("Cannot load mscorlib\n"); + return E_FAIL; + } + + image = This->mono->mono_assembly_get_image(assembly); + if (!image) + { + ERR("Couldn't get assembly image\n"); + return E_FAIL; + } + + klass = This->mono->mono_class_from_name(image, "System", "AppDomain"); + if (!klass) + { + ERR("Couldn't get class from image\n"); + return E_FAIL; + } + + method = This->mono->mono_class_get_method_from_name(klass, "get_CurrentDomain", 0); + if (!method) + { + ERR("Couldn't get method from class\n"); + return E_FAIL; + } + + args[0] = NULL; + appdomain_object = This->mono->mono_runtime_invoke(method, NULL, args, NULL); + if (!appdomain_object) + { + ERR("Couldn't get result pointer\n"); + return E_FAIL; + } + + hr = RuntimeHost_GetIUnknownForObject(This, appdomain_object, &unk); + + if (SUCCEEDED(hr)) + { + hr = IUnknown_QueryInterface(unk, &IID__AppDomain, (void**)punk); + + IUnknown_Release(unk); + } + + return hr; +} + static inline RuntimeHost *impl_from_ICLRRuntimeHost( ICLRRuntimeHost *iface ) { return (RuntimeHost *)((char*)iface - FIELD_OFFSET(RuntimeHost, lpCLRHostVtbl)); @@ -277,8 +340,20 @@ static HRESULT WINAPI corruntimehost_GetDefaultDomain( ICorRuntimeHost* iface, IUnknown **pAppDomain) { - FIXME("stub %p\n", iface); - return E_NOTIMPL; + RuntimeHost *This = impl_from_ICorRuntimeHost( iface ); + HRESULT hr; + MonoDomain *domain; + + TRACE("(%p)\n", iface); + + hr = RuntimeHost_GetDefaultDomain(This, &domain); + + if (SUCCEEDED(hr)) + { + hr = RuntimeHost_GetIUnknownForDomain(This, domain, pAppDomain); + } + + return hr; } static HRESULT WINAPI corruntimehost_EnumDomains(

1 0

Marcus Meissner : mscoree: Mark internal symbols with hidden visibility and some vtables as static.
by Alexandre Julliard 20 May '11

20 May '11

Module: wine Branch: master Commit: ba9f4e807ada9bdb4503f2a068f679e937ce18cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba9f4e807ada9bdb4503f2a06… Author: Marcus Meissner <meissner(a)suse.de> Date: Fri May 13 17:31:09 2011 +0200 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 a2db508..5c343f0 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 98f1cbb..8fb846c 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 5428f17..1b583c6 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__ */

1 0

Marcus Meissner : msacm32: Mark internal symbols with hidden visibility.
by Alexandre Julliard 20 May '11

20 May '11

Module: wine Branch: master Commit: d826e08904adce20b6b8f901194d4621ac7b753a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d826e08904adce20b6b8f9011… Author: Marcus Meissner <meissner(a)suse.de> Date: Fri May 13 17:28:12 2011 +0200 msacm32: Mark internal symbols with hidden visibility. --- dlls/msacm32/wineacm.h | 58 ++++++++++++++++++++++++------------------------ 1 files changed, 29 insertions(+), 29 deletions(-) diff --git a/dlls/msacm32/wineacm.h b/dlls/msacm32/wineacm.h index bf0c6ed..406e01b 100644 --- a/dlls/msacm32/wineacm.h +++ b/dlls/msacm32/wineacm.h @@ -110,43 +110,43 @@ typedef struct _WINE_ACMNOTIFYWND } WINE_ACMNOTIFYWND; /* From internal.c */ -extern HANDLE MSACM_hHeap; -extern PWINE_ACMDRIVERID MSACM_pFirstACMDriverID; +extern HANDLE MSACM_hHeap DECLSPEC_HIDDEN; +extern PWINE_ACMDRIVERID MSACM_pFirstACMDriverID DECLSPEC_HIDDEN; extern PWINE_ACMDRIVERID MSACM_RegisterDriver(LPCWSTR pszDriverAlias, LPCWSTR pszFileName, - PWINE_ACMLOCALDRIVER pLocalDriver); -extern void MSACM_RegisterAllDrivers(void); -extern PWINE_ACMDRIVERID MSACM_UnregisterDriver(PWINE_ACMDRIVERID p); -extern void MSACM_UnregisterAllDrivers(void); -extern PWINE_ACMDRIVERID MSACM_GetDriverID(HACMDRIVERID hDriverID); -extern PWINE_ACMDRIVER MSACM_GetDriver(HACMDRIVER hDriver); -extern PWINE_ACMNOTIFYWND MSACM_GetNotifyWnd(HACMDRIVERID hDriver); -extern PWINE_ACMOBJ MSACM_GetObj(HACMOBJ hObj, DWORD type); - -extern MMRESULT MSACM_Message(HACMDRIVER, UINT, LPARAM, LPARAM); -extern BOOL MSACM_FindFormatTagInCache(const WINE_ACMDRIVERID*, DWORD, LPDWORD); - -extern void MSACM_RePositionDriver(PWINE_ACMDRIVERID, DWORD); -extern void MSACM_WriteCurrentPriorities(void); -extern void MSACM_BroadcastNotification(void); -extern void MSACM_DisableNotifications(void); -extern void MSACM_EnableNotifications(void); -extern PWINE_ACMNOTIFYWND MSACM_RegisterNotificationWindow(HWND hNotifyWnd, DWORD dwNotifyMsg); -extern PWINE_ACMNOTIFYWND MSACM_UnRegisterNotificationWindow(const WINE_ACMNOTIFYWND*); - -extern PWINE_ACMDRIVERID MSACM_RegisterDriverFromRegistry(LPCWSTR pszRegEntry); - -extern PWINE_ACMLOCALDRIVER MSACM_RegisterLocalDriver(HMODULE hModule, DRIVERPROC lpDriverProc); -extern PWINE_ACMLOCALDRIVERINST MSACM_OpenLocalDriver(PWINE_ACMLOCALDRIVER, LPARAM); -extern LRESULT MSACM_CloseLocalDriver(PWINE_ACMLOCALDRIVERINST); + PWINE_ACMLOCALDRIVER pLocalDriver) DECLSPEC_HIDDEN; +extern void MSACM_RegisterAllDrivers(void) DECLSPEC_HIDDEN; +extern PWINE_ACMDRIVERID MSACM_UnregisterDriver(PWINE_ACMDRIVERID p) DECLSPEC_HIDDEN; +extern void MSACM_UnregisterAllDrivers(void) DECLSPEC_HIDDEN; +extern PWINE_ACMDRIVERID MSACM_GetDriverID(HACMDRIVERID hDriverID) DECLSPEC_HIDDEN; +extern PWINE_ACMDRIVER MSACM_GetDriver(HACMDRIVER hDriver) DECLSPEC_HIDDEN; +extern PWINE_ACMNOTIFYWND MSACM_GetNotifyWnd(HACMDRIVERID hDriver) DECLSPEC_HIDDEN; +extern PWINE_ACMOBJ MSACM_GetObj(HACMOBJ hObj, DWORD type) DECLSPEC_HIDDEN; + +extern MMRESULT MSACM_Message(HACMDRIVER, UINT, LPARAM, LPARAM) DECLSPEC_HIDDEN; +extern BOOL MSACM_FindFormatTagInCache(const WINE_ACMDRIVERID*, DWORD, LPDWORD) DECLSPEC_HIDDEN; + +extern void MSACM_RePositionDriver(PWINE_ACMDRIVERID, DWORD) DECLSPEC_HIDDEN; +extern void MSACM_WriteCurrentPriorities(void) DECLSPEC_HIDDEN; +extern void MSACM_BroadcastNotification(void) DECLSPEC_HIDDEN; +extern void MSACM_DisableNotifications(void) DECLSPEC_HIDDEN; +extern void MSACM_EnableNotifications(void) DECLSPEC_HIDDEN; +extern PWINE_ACMNOTIFYWND MSACM_RegisterNotificationWindow(HWND hNotifyWnd, DWORD dwNotifyMsg) DECLSPEC_HIDDEN; +extern PWINE_ACMNOTIFYWND MSACM_UnRegisterNotificationWindow(const WINE_ACMNOTIFYWND*) DECLSPEC_HIDDEN; + +extern PWINE_ACMDRIVERID MSACM_RegisterDriverFromRegistry(LPCWSTR pszRegEntry) DECLSPEC_HIDDEN; + +extern PWINE_ACMLOCALDRIVER MSACM_RegisterLocalDriver(HMODULE hModule, DRIVERPROC lpDriverProc) DECLSPEC_HIDDEN; +extern PWINE_ACMLOCALDRIVERINST MSACM_OpenLocalDriver(PWINE_ACMLOCALDRIVER, LPARAM) DECLSPEC_HIDDEN; +extern LRESULT MSACM_CloseLocalDriver(PWINE_ACMLOCALDRIVERINST) DECLSPEC_HIDDEN; /* extern PWINE_ACMLOCALDRIVER MSACM_GetLocalDriver(HACMDRIVER hDriver); */ /* From msacm32.c */ -extern HINSTANCE MSACM_hInstance32; +extern HINSTANCE MSACM_hInstance32 DECLSPEC_HIDDEN; /* From pcmcnvtr.c */ LRESULT CALLBACK PCM_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, - LPARAM dwParam1, LPARAM dwParam2); + LPARAM dwParam1, LPARAM dwParam2) DECLSPEC_HIDDEN; /* Dialog box templates */ #include "msacmdlg.h"

1 0

Marcus Meissner : mountmgr.sys: Mark internal symbols with hidden visibility.
by Alexandre Julliard 20 May '11

20 May '11

Module: wine Branch: master Commit: e025b138f9e0d0d93740848c3babeb80ce44322c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e025b138f9e0d0d93740848c3… Author: Marcus Meissner <meissner(a)suse.de> Date: Fri May 13 17:26:00 2011 +0200 mountmgr.sys: Mark internal symbols with hidden visibility. --- dlls/mountmgr.sys/mountmgr.h | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/mountmgr.sys/mountmgr.h b/dlls/mountmgr.sys/mountmgr.h index da1312c..a47a3e3 100644 --- a/dlls/mountmgr.sys/mountmgr.h +++ b/dlls/mountmgr.sys/mountmgr.h @@ -35,8 +35,8 @@ #define WINE_MOUNTMGR_EXTENSIONS #include "ddk/mountmgr.h" -extern void initialize_hal(void); -extern void initialize_diskarbitration(void); +extern void initialize_hal(void) DECLSPEC_HIDDEN; +extern void initialize_diskarbitration(void) DECLSPEC_HIDDEN; /* device functions */ @@ -53,21 +53,21 @@ enum device_type }; extern NTSTATUS add_volume( const char *udi, const char *device, const char *mount_point, - enum device_type type, const GUID *guid ); -extern NTSTATUS remove_volume( const char *udi ); + enum device_type type, const GUID *guid ) DECLSPEC_HIDDEN; +extern NTSTATUS remove_volume( const char *udi ) DECLSPEC_HIDDEN; extern NTSTATUS add_dos_device( int letter, const char *udi, const char *device, - const char *mount_point, enum device_type type, const GUID *guid ); -extern NTSTATUS remove_dos_device( int letter, const char *udi ); -extern NTSTATUS query_dos_device( int letter, enum device_type *type, char **device, char **mount_point ); -extern NTSTATUS WINAPI harddisk_driver_entry( DRIVER_OBJECT *driver, UNICODE_STRING *path ); + const char *mount_point, enum device_type type, const GUID *guid ) DECLSPEC_HIDDEN; +extern NTSTATUS remove_dos_device( int letter, const char *udi ) DECLSPEC_HIDDEN; +extern NTSTATUS query_dos_device( int letter, enum device_type *type, char **device, char **mount_point ) DECLSPEC_HIDDEN; +extern NTSTATUS WINAPI harddisk_driver_entry( DRIVER_OBJECT *driver, UNICODE_STRING *path ) DECLSPEC_HIDDEN; /* mount point functions */ struct mount_point; extern struct mount_point *add_dosdev_mount_point( DEVICE_OBJECT *device, UNICODE_STRING *device_name, - int drive ); + int drive ) DECLSPEC_HIDDEN; extern struct mount_point *add_volume_mount_point( DEVICE_OBJECT *device, UNICODE_STRING *device_name, - const GUID *guid ); -extern void delete_mount_point( struct mount_point *mount ); -extern void set_mount_point_id( struct mount_point *mount, const void *id, unsigned int id_len ); + const GUID *guid ) DECLSPEC_HIDDEN; +extern void delete_mount_point( struct mount_point *mount ) DECLSPEC_HIDDEN; +extern void set_mount_point_id( struct mount_point *mount, const void *id, unsigned int id_len ) DECLSPEC_HIDDEN;

1 0

Marcus Meissner : mciqtz: Mark one variable as static.
by Alexandre Julliard 20 May '11

20 May '11

Module: wine Branch: master Commit: 4ef1e17f03a0fc1d32d4bd81d9ede1556fe59a1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ef1e17f03a0fc1d32d4bd81d… Author: Marcus Meissner <meissner(a)suse.de> Date: Fri May 13 17:23:56 2011 +0200 mciqtz: Mark one variable as static. --- dlls/mciqtz32/mciqtz.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mciqtz32/mciqtz.c b/dlls/mciqtz32/mciqtz.c index aca7bf4..03f6f9d 100644 --- a/dlls/mciqtz32/mciqtz.c +++ b/dlls/mciqtz32/mciqtz.c @@ -37,7 +37,7 @@ static DWORD MCIQTZ_mciStop(UINT, DWORD, LPMCI_GENERIC_PARMS); * MCI QTZ implementation * *======================================================================*/ -HINSTANCE MCIQTZ_hInstance = 0; +static HINSTANCE MCIQTZ_hInstance = 0; /*********************************************************************** * DllMain (MCIQTZ.0)

1 0

Marcus Meissner : mciavi32: Mark internal symbols with hidden visibility.
by Alexandre Julliard 20 May '11

20 May '11

Module: wine Branch: master Commit: fb48414419a112358c686a2b7d677977615cb4e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb48414419a112358c686a2b7… Author: Marcus Meissner <meissner(a)suse.de> Date: Fri May 13 17:23:16 2011 +0200 mciavi32: Mark internal symbols with hidden visibility. --- dlls/mciavi32/private_mciavi.h | 38 +++++++++++++++++++------------------- 1 files changed, 19 insertions(+), 19 deletions(-) diff --git a/dlls/mciavi32/private_mciavi.h b/dlls/mciavi32/private_mciavi.h index 548254c..1ee0eb3 100644 --- a/dlls/mciavi32/private_mciavi.h +++ b/dlls/mciavi32/private_mciavi.h @@ -82,32 +82,32 @@ typedef struct { HANDLE ack_event; /* acknowledge that an async command has started */ } WINE_MCIAVI; -extern HINSTANCE MCIAVI_hInstance; +extern HINSTANCE MCIAVI_hInstance DECLSPEC_HIDDEN; /* info.c */ -DWORD MCIAVI_ConvertTimeFormatToFrame(WINE_MCIAVI* wma, DWORD val); -DWORD MCIAVI_mciGetDevCaps(UINT wDevID, DWORD dwFlags, LPMCI_GETDEVCAPS_PARMS lpParms); -DWORD MCIAVI_mciInfo(UINT wDevID, DWORD dwFlags, LPMCI_DGV_INFO_PARMSW lpParms); -DWORD MCIAVI_mciSet(UINT wDevID, DWORD dwFlags, LPMCI_DGV_SET_PARMS lpParms); -DWORD MCIAVI_mciStatus(UINT wDevID, DWORD dwFlags, LPMCI_DGV_STATUS_PARMSW lpParms); +DWORD MCIAVI_ConvertTimeFormatToFrame(WINE_MCIAVI* wma, DWORD val) DECLSPEC_HIDDEN; +DWORD MCIAVI_mciGetDevCaps(UINT wDevID, DWORD dwFlags, LPMCI_GETDEVCAPS_PARMS lpParms) DECLSPEC_HIDDEN; +DWORD MCIAVI_mciInfo(UINT wDevID, DWORD dwFlags, LPMCI_DGV_INFO_PARMSW lpParms) DECLSPEC_HIDDEN; +DWORD MCIAVI_mciSet(UINT wDevID, DWORD dwFlags, LPMCI_DGV_SET_PARMS lpParms) DECLSPEC_HIDDEN; +DWORD MCIAVI_mciStatus(UINT wDevID, DWORD dwFlags, LPMCI_DGV_STATUS_PARMSW lpParms) DECLSPEC_HIDDEN; /* mmoutput.c */ -BOOL MCIAVI_GetInfo(WINE_MCIAVI* wma); -DWORD MCIAVI_OpenAudio(WINE_MCIAVI* wma, unsigned* nHdr, LPWAVEHDR* pWaveHdr); -BOOL MCIAVI_OpenVideo(WINE_MCIAVI* wma); -void MCIAVI_PlayAudioBlocks(WINE_MCIAVI* wma, unsigned nHdr, LPWAVEHDR waveHdr); -LRESULT MCIAVI_PaintFrame(WINE_MCIAVI* wma, HDC hDC); +BOOL MCIAVI_GetInfo(WINE_MCIAVI* wma) DECLSPEC_HIDDEN; +DWORD MCIAVI_OpenAudio(WINE_MCIAVI* wma, unsigned* nHdr, LPWAVEHDR* pWaveHdr) DECLSPEC_HIDDEN; +BOOL MCIAVI_OpenVideo(WINE_MCIAVI* wma) DECLSPEC_HIDDEN; +void MCIAVI_PlayAudioBlocks(WINE_MCIAVI* wma, unsigned nHdr, LPWAVEHDR waveHdr) DECLSPEC_HIDDEN; +LRESULT MCIAVI_PaintFrame(WINE_MCIAVI* wma, HDC hDC) DECLSPEC_HIDDEN; /* mciavi.c */ -WINE_MCIAVI* MCIAVI_mciGetOpenDev(UINT wDevID); -DWORD MCIAVI_mciClose(UINT, DWORD, LPMCI_GENERIC_PARMS); +WINE_MCIAVI* MCIAVI_mciGetOpenDev(UINT wDevID) DECLSPEC_HIDDEN; +DWORD MCIAVI_mciClose(UINT, DWORD, LPMCI_GENERIC_PARMS) DECLSPEC_HIDDEN; /* wnd.c */ -BOOL MCIAVI_RegisterClass(void); -BOOL MCIAVI_UnregisterClass(void); -BOOL MCIAVI_CreateWindow(WINE_MCIAVI* wma, DWORD dwFlags, LPMCI_DGV_OPEN_PARMSW lpOpenParms); -DWORD MCIAVI_mciPut(UINT wDevID, DWORD dwFlags, LPMCI_DGV_PUT_PARMS lpParms); -DWORD MCIAVI_mciWhere(UINT wDevID, DWORD dwFlags, LPMCI_DGV_RECT_PARMS lpParms); -DWORD MCIAVI_mciWindow(UINT wDevID, DWORD dwFlags, LPMCI_DGV_WINDOW_PARMSW lpParms); +BOOL MCIAVI_RegisterClass(void) DECLSPEC_HIDDEN; +BOOL MCIAVI_UnregisterClass(void) DECLSPEC_HIDDEN; +BOOL MCIAVI_CreateWindow(WINE_MCIAVI* wma, DWORD dwFlags, LPMCI_DGV_OPEN_PARMSW lpOpenParms) DECLSPEC_HIDDEN; +DWORD MCIAVI_mciPut(UINT wDevID, DWORD dwFlags, LPMCI_DGV_PUT_PARMS lpParms) DECLSPEC_HIDDEN; +DWORD MCIAVI_mciWhere(UINT wDevID, DWORD dwFlags, LPMCI_DGV_RECT_PARMS lpParms) DECLSPEC_HIDDEN; +DWORD MCIAVI_mciWindow(UINT wDevID, DWORD dwFlags, LPMCI_DGV_WINDOW_PARMSW lpParms) DECLSPEC_HIDDEN; #endif /* __WINE_PRIVATE_MCIAVI_H */

1 0

Marcus Meissner : mapi32: Mark internal symbols with hidden visibility.
by Alexandre Julliard 20 May '11

20 May '11

Module: wine Branch: master Commit: b93c6dfc69aa99bd06dce326257bd7eeef694ea1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b93c6dfc69aa99bd06dce3262… Author: Marcus Meissner <meissner(a)suse.de> Date: Fri May 13 17:22:13 2011 +0200 mapi32: Mark internal symbols with hidden visibility. --- dlls/mapi32/mapi32_main.c | 4 ++-- dlls/mapi32/util.h | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/mapi32/mapi32_main.c b/dlls/mapi32/mapi32_main.c index 6c35563..e7c1781 100644 --- a/dlls/mapi32/mapi32_main.c +++ b/dlls/mapi32/mapi32_main.c @@ -33,8 +33,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(mapi); -LONG MAPI_ObjectCount = 0; -HINSTANCE hInstMAPI32; +DECLSPEC_HIDDEN LONG MAPI_ObjectCount = 0; +DECLSPEC_HIDDEN HINSTANCE hInstMAPI32; /*********************************************************************** * DllMain (MAPI32.init) diff --git a/dlls/mapi32/util.h b/dlls/mapi32/util.h index df03d6e..6fbf81e 100644 --- a/dlls/mapi32/util.h +++ b/dlls/mapi32/util.h @@ -25,8 +25,8 @@ #include <mapi.h> #include <mapix.h> -extern void load_mapi_providers(void); -extern void unload_mapi_providers(void); +extern void load_mapi_providers(void) DECLSPEC_HIDDEN; +extern void unload_mapi_providers(void) DECLSPEC_HIDDEN; typedef struct MAPI_FUNCTIONS { LPMAPIADDRESS MAPIAddress; @@ -60,7 +60,7 @@ typedef struct MAPI_FUNCTIONS { SCODE (WINAPI *ScInitMapiUtil) (ULONG ulReserved); } MAPI_FUNCTIONS; -extern MAPI_FUNCTIONS mapiFunctions; -extern HINSTANCE hInstMAPI32; +extern MAPI_FUNCTIONS mapiFunctions DECLSPEC_HIDDEN; +extern HINSTANCE hInstMAPI32 DECLSPEC_HIDDEN; #endif

1 0

Alexandre Julliard : quartz: Make sure the preferred allocator pointer is initialized.
by Alexandre Julliard 20 May '11

20 May '11

Module: wine Branch: master Commit: 7f6e677d5ad5048dd2f1defb50f64928c380606e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f6e677d5ad5048dd2f1defb5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 20 10:28:21 2011 +0200 quartz: Make sure the preferred allocator pointer is initialized. --- dlls/quartz/pin.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/quartz/pin.c b/dlls/quartz/pin.c index 2a3b2d1..af26a6b 100644 --- a/dlls/quartz/pin.c +++ b/dlls/quartz/pin.c @@ -199,6 +199,7 @@ static HRESULT PullPin_Init(const IPinVtbl *PullPin_Vtbl, const PIN_INFO * pPinI pPinImpl->fnDone = pDone; pPinImpl->fnPreConnect = NULL; pPinImpl->pAlloc = NULL; + pPinImpl->prefAlloc = NULL; pPinImpl->pReader = NULL; pPinImpl->hThread = NULL; pPinImpl->hEventStateChanged = CreateEventW(NULL, TRUE, TRUE, NULL);

1 0