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

Marcus Meissner : dmloader: Mark internal symbols with hidden visibility.
by Alexandre Julliard May 17, 2011

May 17, 2011

Module: wine Branch: master Commit: 8d1a9bb5355d765c5841d4c682787c306c274f3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d1a9bb5355d765c5841d4c68… Author: Marcus Meissner <meissner(a)suse.de> Date: Fri May 13 16:57:22 2011 +0200 dmloader: Mark internal symbols with hidden visibility. --- dlls/dmloader/debug.h | 20 ++++++++++---------- dlls/dmloader/dmloader_private.h | 24 ++++++++++++------------ 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/dlls/dmloader/debug.h b/dlls/dmloader/debug.h index 56cfb72..546d643 100644 --- a/dlls/dmloader/debug.h +++ b/dlls/dmloader/debug.h @@ -42,23 +42,23 @@ typedef struct { #define GE(x) { &x, #x } /* check whether chunkID is valid dmobject form chunk */ -extern BOOL IS_VALID_DMFORM (FOURCC chunkID); +extern BOOL IS_VALID_DMFORM (FOURCC chunkID) DECLSPEC_HIDDEN; /* translate STREAM_SEEK flag to string */ -extern const char *resolve_STREAM_SEEK (DWORD flag); +extern const char *resolve_STREAM_SEEK (DWORD flag) DECLSPEC_HIDDEN; /* FOURCC to string conversion for debug messages */ -extern const char *debugstr_fourcc (DWORD fourcc); +extern const char *debugstr_fourcc (DWORD fourcc) DECLSPEC_HIDDEN; /* DMUS_VERSION struct to string conversion for debug messages */ -extern const char *debugstr_dmversion (const DMUS_VERSION *version); +extern const char *debugstr_dmversion (const DMUS_VERSION *version) DECLSPEC_HIDDEN; /* FILETIME struct to string conversion for debug messages */ -extern const char *debugstr_filetime (const FILETIME *time); +extern const char *debugstr_filetime (const FILETIME *time) DECLSPEC_HIDDEN; /* returns name of given GUID */ -extern const char *debugstr_dmguid (const GUID *id); +extern const char *debugstr_dmguid (const GUID *id) DECLSPEC_HIDDEN; /* returns name of given error code */ -extern const char *debugstr_dmreturn (DWORD code); +extern const char *debugstr_dmreturn (DWORD code) DECLSPEC_HIDDEN; /* dump whole DMUS_OBJECTDESC struct */ -extern const char *debugstr_DMUS_OBJECTDESC (LPDMUS_OBJECTDESC pDesc); -extern const char *debugstr_DMUS_IO_CONTAINER_HEADER (LPDMUS_IO_CONTAINER_HEADER pHeader); -extern const char *debugstr_DMUS_IO_CONTAINED_OBJECT_HEADER (LPDMUS_IO_CONTAINED_OBJECT_HEADER pHeader); +extern const char *debugstr_DMUS_OBJECTDESC (LPDMUS_OBJECTDESC pDesc) DECLSPEC_HIDDEN; +extern const char *debugstr_DMUS_IO_CONTAINER_HEADER (LPDMUS_IO_CONTAINER_HEADER pHeader) DECLSPEC_HIDDEN; +extern const char *debugstr_DMUS_IO_CONTAINED_OBJECT_HEADER (LPDMUS_IO_CONTAINED_OBJECT_HEADER pHeader) DECLSPEC_HIDDEN; #endif /* __WINE_DMLOADER_DEBUG_H */ diff --git a/dlls/dmloader/dmloader_private.h b/dlls/dmloader/dmloader_private.h index 3b09972..4008806 100644 --- a/dlls/dmloader/dmloader_private.h +++ b/dlls/dmloader/dmloader_private.h @@ -45,8 +45,8 @@ #define ICOM_THIS_MULTI(impl,field,iface) impl* const This=(impl*)((char*)(iface) - offsetof(impl,field)) /* dmloader.dll global (for DllCanUnloadNow) */ -extern LONG dwDirectMusicLoader; /* number of DirectMusicLoader(CF) instances */ -extern LONG dwDirectMusicContainer; /* number of DirectMusicContainer(CF) instances */ +extern LONG dwDirectMusicLoader DECLSPEC_HIDDEN; /* number of DirectMusicLoader(CF) instances */ +extern LONG dwDirectMusicContainer DECLSPEC_HIDDEN; /* number of DirectMusicContainer(CF) instances */ /***************************************************************************** * Interfaces @@ -64,14 +64,14 @@ typedef struct IDirectMusicLoaderGenericStream IDirectMusicLoaderGenericStream; /***************************************************************************** * Creation helpers */ -extern HRESULT WINAPI DMUSIC_CreateDirectMusicLoaderCF (LPCGUID lpcGUID, LPVOID *ppobj, LPUNKNOWN pUnkOuter); -extern HRESULT WINAPI DMUSIC_CreateDirectMusicContainerCF (LPCGUID lpcGUID, LPVOID *ppobj, LPUNKNOWN pUnkOuter); +extern HRESULT WINAPI DMUSIC_CreateDirectMusicLoaderCF (LPCGUID lpcGUID, LPVOID *ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN; +extern HRESULT WINAPI DMUSIC_CreateDirectMusicContainerCF (LPCGUID lpcGUID, LPVOID *ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN; -extern HRESULT WINAPI DMUSIC_CreateDirectMusicLoaderImpl (LPCGUID lpcGUID, LPVOID *ppobj, LPUNKNOWN pUnkOuter); -extern HRESULT WINAPI DMUSIC_CreateDirectMusicContainerImpl (LPCGUID lpcGUID, LPVOID *ppobj, LPUNKNOWN pUnkOuter); -extern HRESULT WINAPI DMUSIC_CreateDirectMusicLoaderFileStream (LPVOID *ppobj); -extern HRESULT WINAPI DMUSIC_CreateDirectMusicLoaderResourceStream (LPVOID *ppobj); -extern HRESULT WINAPI DMUSIC_CreateDirectMusicLoaderGenericStream (LPVOID *ppobj); +extern HRESULT WINAPI DMUSIC_CreateDirectMusicLoaderImpl (LPCGUID lpcGUID, LPVOID *ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN; +extern HRESULT WINAPI DMUSIC_CreateDirectMusicContainerImpl (LPCGUID lpcGUID, LPVOID *ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN; +extern HRESULT WINAPI DMUSIC_CreateDirectMusicLoaderFileStream (LPVOID *ppobj) DECLSPEC_HIDDEN; +extern HRESULT WINAPI DMUSIC_CreateDirectMusicLoaderResourceStream (LPVOID *ppobj) DECLSPEC_HIDDEN; +extern HRESULT WINAPI DMUSIC_CreateDirectMusicLoaderGenericStream (LPVOID *ppobj) DECLSPEC_HIDDEN; /***************************************************************************** * IDirectMusicLoaderCF implementation structure @@ -170,7 +170,7 @@ struct IDirectMusicLoaderFileStream { }; /* Custom: */ -extern HRESULT WINAPI IDirectMusicLoaderFileStream_Attach (LPSTREAM iface, LPCWSTR wzFile, LPDIRECTMUSICLOADER8 pLoader); +extern HRESULT WINAPI IDirectMusicLoaderFileStream_Attach (LPSTREAM iface, LPCWSTR wzFile, LPDIRECTMUSICLOADER8 pLoader) DECLSPEC_HIDDEN; /***************************************************************************** * IDirectMusicLoaderResourceStream implementation structure @@ -191,7 +191,7 @@ struct IDirectMusicLoaderResourceStream { }; /* Custom: */ -extern HRESULT WINAPI IDirectMusicLoaderResourceStream_Attach (LPSTREAM iface, LPBYTE pbMemData, LONGLONG llMemLength, LONGLONG llPos, LPDIRECTMUSICLOADER8 pLoader); +extern HRESULT WINAPI IDirectMusicLoaderResourceStream_Attach (LPSTREAM iface, LPBYTE pbMemData, LONGLONG llMemLength, LONGLONG llPos, LPDIRECTMUSICLOADER8 pLoader) DECLSPEC_HIDDEN; /***************************************************************************** * IDirectMusicLoaderGenericStream implementation structure @@ -209,7 +209,7 @@ struct IDirectMusicLoaderGenericStream { }; /* Custom: */ -extern HRESULT WINAPI IDirectMusicLoaderGenericStream_Attach (LPSTREAM iface, LPSTREAM pStream, LPDIRECTMUSICLOADER8 pLoader); +extern HRESULT WINAPI IDirectMusicLoaderGenericStream_Attach (LPSTREAM iface, LPSTREAM pStream, LPDIRECTMUSICLOADER8 pLoader) DECLSPEC_HIDDEN; /***************************************************************************** * Misc.

1 0

Marcus Meissner : dmscript: Mark internal symbols with hidden visibility.
by Alexandre Julliard May 17, 2011

May 17, 2011

Module: wine Branch: master Commit: f301596ce357287b178ffbf88534d795adc330f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f301596ce357287b178ffbf88… Author: Marcus Meissner <meissner(a)suse.de> Date: Fri May 13 16:58:10 2011 +0200 dmscript: Mark internal symbols with hidden visibility. --- dlls/dmscript/dmscript_private.h | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/dmscript/dmscript_private.h b/dlls/dmscript/dmscript_private.h index c152ecc..c31164f 100644 --- a/dlls/dmscript/dmscript_private.h +++ b/dlls/dmscript/dmscript_private.h @@ -52,9 +52,9 @@ typedef struct IDirectMusicScriptTrack IDirectMusicScriptTrack; /***************************************************************************** * ClassFactory */ -extern HRESULT WINAPI DMUSIC_CreateDirectMusicScriptImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter); +extern HRESULT WINAPI DMUSIC_CreateDirectMusicScriptImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN; -extern HRESULT WINAPI DMUSIC_CreateDirectMusicScriptTrack (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter); +extern HRESULT WINAPI DMUSIC_CreateDirectMusicScriptTrack (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN; /***************************************************************************** * IDirectMusicScriptImpl implementation structure @@ -93,7 +93,7 @@ struct IDirectMusicScriptTrack { /********************************************************************** * Dll lifetime tracking declaration for dmscript.dll */ -extern LONG DMSCRIPT_refCount; +extern LONG DMSCRIPT_refCount DECLSPEC_HIDDEN; static inline void DMSCRIPT_LockModule(void) { InterlockedIncrement( &DMSCRIPT_refCount ); } static inline void DMSCRIPT_UnlockModule(void) { InterlockedDecrement( &DMSCRIPT_refCount ); } @@ -130,10 +130,10 @@ typedef struct { #define ICOM_THIS_MULTI(impl,field,iface) impl* const This=(impl*)((char*)(iface) - offsetof(impl,field)) /* FOURCC to string conversion for debug messages */ -extern const char *debugstr_fourcc (DWORD fourcc); +extern const char *debugstr_fourcc (DWORD fourcc) DECLSPEC_HIDDEN; /* returns name of given GUID */ -extern const char *debugstr_dmguid (const GUID *id); +extern const char *debugstr_dmguid (const GUID *id) DECLSPEC_HIDDEN; /* dump whole DMUS_OBJECTDESC struct */ -extern const char *debugstr_DMUS_OBJECTDESC (LPDMUS_OBJECTDESC pDesc); +extern const char *debugstr_DMUS_OBJECTDESC (LPDMUS_OBJECTDESC pDesc) DECLSPEC_HIDDEN; #endif /* __WINE_DMSCRIPT_PRIVATE_H */

1 0

Marcus Meissner : dmband: Mark internal symbols with hidden visibility.
by Alexandre Julliard May 17, 2011

May 17, 2011

Module: wine Branch: master Commit: 70835d7c1d0b05978854599015ae99aa6cf04e60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70835d7c1d0b0597885459901… Author: Marcus Meissner <meissner(a)suse.de> Date: Fri May 13 16:53:13 2011 +0200 dmband: Mark internal symbols with hidden visibility. --- dlls/dmband/dmband_private.h | 6 +++--- dlls/dmband/dmutils.h | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/dmband/dmband_private.h b/dlls/dmband/dmband_private.h index 46a4d07..aa775df 100644 --- a/dlls/dmband/dmband_private.h +++ b/dlls/dmband/dmband_private.h @@ -52,9 +52,9 @@ typedef struct IDirectMusicBandTrack IDirectMusicBandTrack; /***************************************************************************** * ClassFactory */ -extern HRESULT WINAPI DMUSIC_CreateDirectMusicBandImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter); +extern HRESULT WINAPI DMUSIC_CreateDirectMusicBandImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN; -extern HRESULT WINAPI DMUSIC_CreateDirectMusicBandTrack (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter); +extern HRESULT WINAPI DMUSIC_CreateDirectMusicBandTrack (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN; /***************************************************************************** @@ -121,7 +121,7 @@ struct IDirectMusicBandTrack { /********************************************************************** * Dll lifetime tracking declaration for dmband.dll */ -extern LONG DMBAND_refCount; +extern LONG DMBAND_refCount DECLSPEC_HIDDEN; static inline void DMBAND_LockModule(void) { InterlockedIncrement( &DMBAND_refCount ); } static inline void DMBAND_UnlockModule(void) { InterlockedDecrement( &DMBAND_refCount ); } diff --git a/dlls/dmband/dmutils.h b/dlls/dmband/dmutils.h index 6195220..82706d6 100644 --- a/dlls/dmband/dmutils.h +++ b/dlls/dmband/dmutils.h @@ -32,9 +32,9 @@ typedef struct _DMUS_PRIVATE_CHUNK { /** * Parsing utilities */ -extern HRESULT IDirectMusicUtils_IPersistStream_ParseDescGeneric (DMUS_PRIVATE_CHUNK* pChunk, IStream* pStm, LPDMUS_OBJECTDESC pDesc); -extern HRESULT IDirectMusicUtils_IPersistStream_ParseUNFOGeneric (DMUS_PRIVATE_CHUNK* pChunk, IStream* pStm, LPDMUS_OBJECTDESC pDesc); -extern HRESULT IDirectMusicUtils_IPersistStream_ParseReference (LPPERSISTSTREAM iface, DMUS_PRIVATE_CHUNK* pChunk, IStream* pStm, IDirectMusicObject** ppObject); +extern HRESULT IDirectMusicUtils_IPersistStream_ParseDescGeneric (DMUS_PRIVATE_CHUNK* pChunk, IStream* pStm, LPDMUS_OBJECTDESC pDesc) DECLSPEC_HIDDEN; +extern HRESULT IDirectMusicUtils_IPersistStream_ParseUNFOGeneric (DMUS_PRIVATE_CHUNK* pChunk, IStream* pStm, LPDMUS_OBJECTDESC pDesc) DECLSPEC_HIDDEN; +extern HRESULT IDirectMusicUtils_IPersistStream_ParseReference (LPPERSISTSTREAM iface, DMUS_PRIVATE_CHUNK* pChunk, IStream* pStm, IDirectMusicObject** ppObject) DECLSPEC_HIDDEN; /** * Debug utilities @@ -61,10 +61,10 @@ typedef struct { #define GE(x) { &x, #x } /* FOURCC to string conversion for debug messages */ -extern const char *debugstr_fourcc (DWORD fourcc); +extern const char *debugstr_fourcc (DWORD fourcc) DECLSPEC_HIDDEN; /* returns name of given GUID */ -extern const char *debugstr_dmguid (const GUID *id); +extern const char *debugstr_dmguid (const GUID *id) DECLSPEC_HIDDEN; -extern void debug_DMUS_OBJECTDESC (LPDMUS_OBJECTDESC pDesc); +extern void debug_DMUS_OBJECTDESC (LPDMUS_OBJECTDESC pDesc) DECLSPEC_HIDDEN; #endif /* __WINE_DMUTILS_H */

1 0

Marcus Meissner : dmusic: Mark internal symbols as hidden.
by Alexandre Julliard May 17, 2011

May 17, 2011

Module: wine Branch: master Commit: 1aee19753fcbef1b101801203f0ca7778a592c6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1aee19753fcbef1b101801203… Author: Marcus Meissner <meissner(a)suse.de> Date: Fri May 13 17:00:59 2011 +0200 dmusic: Mark internal symbols as hidden. --- dlls/dmusic/dmusic_private.h | 34 +++++++++++++++++----------------- 1 files changed, 17 insertions(+), 17 deletions(-) diff --git a/dlls/dmusic/dmusic_private.h b/dlls/dmusic/dmusic_private.h index e7668a4..1aa0536 100644 --- a/dlls/dmusic/dmusic_private.h +++ b/dlls/dmusic/dmusic_private.h @@ -75,14 +75,14 @@ typedef struct DMUSIC_PRIVATE_CHANNEL_GROUP_ { /***************************************************************************** * ClassFactory */ -extern HRESULT WINAPI DMUSIC_CreateDirectMusicImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter); -extern HRESULT WINAPI DMUSIC_CreateDirectMusicBufferImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter); -extern HRESULT WINAPI DMUSIC_CreateDirectMusicDownloadedInstrumentImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter); -extern HRESULT WINAPI DMUSIC_CreateDirectMusicDownloadImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter); -extern HRESULT WINAPI DMUSIC_CreateReferenceClockImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter); +extern HRESULT WINAPI DMUSIC_CreateDirectMusicImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN; +extern HRESULT WINAPI DMUSIC_CreateDirectMusicBufferImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN; +extern HRESULT WINAPI DMUSIC_CreateDirectMusicDownloadedInstrumentImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN; +extern HRESULT WINAPI DMUSIC_CreateDirectMusicDownloadImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN; +extern HRESULT WINAPI DMUSIC_CreateReferenceClockImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN; -extern HRESULT WINAPI DMUSIC_CreateDirectMusicCollectionImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter); -extern HRESULT WINAPI DMUSIC_CreateDirectMusicInstrumentImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter); +extern HRESULT WINAPI DMUSIC_CreateDirectMusicCollectionImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN; +extern HRESULT WINAPI DMUSIC_CreateDirectMusicInstrumentImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN; /***************************************************************************** * IDirectMusic8Impl implementation structure @@ -151,10 +151,10 @@ struct IDirectMusicPortImpl { DMUSIC_PRIVATE_CHANNEL_GROUP group[1]; }; -extern HRESULT WINAPI IDirectMusicPortImpl_Activate (LPDIRECTMUSICPORT iface, BOOL fActive); +extern HRESULT WINAPI IDirectMusicPortImpl_Activate (LPDIRECTMUSICPORT iface, BOOL fActive) DECLSPEC_HIDDEN; /** Internal factory */ -extern HRESULT WINAPI DMUSIC_CreateDirectMusicPortImpl (LPCGUID lpcGUID, LPVOID *ppobj, LPUNKNOWN pUnkOuter, LPDMUS_PORTPARAMS pPortParams, LPDMUS_PORTCAPS pPortCaps); +extern HRESULT WINAPI DMUSIC_CreateDirectMusicPortImpl (LPCGUID lpcGUID, LPVOID *ppobj, LPUNKNOWN pUnkOuter, LPDMUS_PORTPARAMS pPortParams, LPDMUS_PORTCAPS pPortCaps) DECLSPEC_HIDDEN; /***************************************************************************** * IReferenceClockImpl implementation structure @@ -221,12 +221,12 @@ struct IDirectMusicInstrumentImpl { }; /* custom :) */ -extern HRESULT WINAPI IDirectMusicInstrumentImpl_Custom_Load (LPDIRECTMUSICINSTRUMENT iface, LPSTREAM pStm); +extern HRESULT WINAPI IDirectMusicInstrumentImpl_Custom_Load (LPDIRECTMUSICINSTRUMENT iface, LPSTREAM pStm) DECLSPEC_HIDDEN; /********************************************************************** * Dll lifetime tracking declaration for dmusic.dll */ -extern LONG DMUSIC_refCount; +extern LONG DMUSIC_refCount DECLSPEC_HIDDEN; static inline void DMUSIC_LockModule(void) { InterlockedIncrement( &DMUSIC_refCount ); } static inline void DMUSIC_UnlockModule(void) { InterlockedDecrement( &DMUSIC_refCount ); } @@ -266,17 +266,17 @@ typedef struct { #define GE(x) { &x, #x } /* dwPatch from MIDILOCALE */ -extern DWORD MIDILOCALE2Patch (const MIDILOCALE *pLocale); +extern DWORD MIDILOCALE2Patch (const MIDILOCALE *pLocale) DECLSPEC_HIDDEN; /* MIDILOCALE from dwPatch */ -extern void Patch2MIDILOCALE (DWORD dwPatch, LPMIDILOCALE pLocale); +extern void Patch2MIDILOCALE (DWORD dwPatch, LPMIDILOCALE pLocale) DECLSPEC_HIDDEN; /* check whether the given DWORD is even (return 0) or odd (return 1) */ -extern int even_or_odd (DWORD number); +extern int even_or_odd (DWORD number) DECLSPEC_HIDDEN; /* FOURCC to string conversion for debug messages */ -extern const char *debugstr_fourcc (DWORD fourcc); +extern const char *debugstr_fourcc (DWORD fourcc) DECLSPEC_HIDDEN; /* returns name of given GUID */ -extern const char *debugstr_dmguid (const GUID *id); +extern const char *debugstr_dmguid (const GUID *id) DECLSPEC_HIDDEN; /* dump whole DMUS_OBJECTDESC struct */ -extern const char *debugstr_DMUS_OBJECTDESC (LPDMUS_OBJECTDESC pDesc); +extern const char *debugstr_DMUS_OBJECTDESC (LPDMUS_OBJECTDESC pDesc) DECLSPEC_HIDDEN; #endif /* __WINE_DMUSIC_PRIVATE_H */

1 0

Alexandre Julliard : wined3d: Always create the software cursor.
by Alexandre Julliard May 17, 2011

May 17, 2011

Module: wine Branch: master Commit: 599d09b08ca88a9270c56053317ba922c6c4228a URL: http://source.winehq.org/git/wine.git/?a=commit;h=599d09b08ca88a9270c560533… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 16 20:18:33 2011 +0200 wined3d: Always create the software cursor. --- dlls/wined3d/device.c | 136 +++++++++++++++++++++++----------------------- dlls/wined3d/swapchain.c | 4 +- 2 files changed, 70 insertions(+), 70 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index fb13e02..88aac03 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5224,85 +5224,83 @@ HRESULT CDECL wined3d_device_set_cursor_properties(struct wined3d_device *device return WINED3DERR_INVALIDCALL; } - if (cursor_image->resource.width != 32 || cursor_image->resource.height != 32) + /* TODO: MSDN: Cursor sizes must be a power of 2 */ + + /* Do not store the surface's pointer because the application may + * release it after setting the cursor image. Windows doesn't + * addref the set surface, so we can't do this either without + * creating circular refcount dependencies. Copy out the gl texture + * instead. */ + device->cursorWidth = cursor_image->resource.width; + device->cursorHeight = cursor_image->resource.height; + if (SUCCEEDED(wined3d_surface_map(cursor_image, &rect, NULL, WINED3DLOCK_READONLY))) { - /* TODO: MSDN: Cursor sizes must be a power of 2 */ - - /* Do not store the surface's pointer because the application may - * release it after setting the cursor image. Windows doesn't - * addref the set surface, so we can't do this either without - * creating circular refcount dependencies. Copy out the gl texture - * instead. */ - device->cursorWidth = cursor_image->resource.width; - device->cursorHeight = cursor_image->resource.height; - if (SUCCEEDED(wined3d_surface_map(cursor_image, &rect, NULL, WINED3DLOCK_READONLY))) - { - const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; - const struct wined3d_format *format = wined3d_get_format(gl_info, WINED3DFMT_B8G8R8A8_UNORM); - struct wined3d_context *context; - char *mem, *bits = rect.pBits; - GLint intfmt = format->glInternal; - GLint gl_format = format->glFormat; - GLint type = format->glType; - INT height = device->cursorHeight; - INT width = device->cursorWidth; - INT bpp = format->byte_count; - DWORD sampler; - INT i; - - /* Reformat the texture memory (pitch and width can be - * different) */ - mem = HeapAlloc(GetProcessHeap(), 0, width * height * bpp); - for(i = 0; i < height; i++) - memcpy(&mem[width * bpp * i], &bits[rect.Pitch * i], width * bpp); - wined3d_surface_unmap(cursor_image); - - context = context_acquire(device, NULL); - - ENTER_GL(); + const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; + const struct wined3d_format *format = wined3d_get_format(gl_info, WINED3DFMT_B8G8R8A8_UNORM); + struct wined3d_context *context; + char *mem, *bits = rect.pBits; + GLint intfmt = format->glInternal; + GLint gl_format = format->glFormat; + GLint type = format->glType; + INT height = device->cursorHeight; + INT width = device->cursorWidth; + INT bpp = format->byte_count; + DWORD sampler; + INT i; + + /* Reformat the texture memory (pitch and width can be + * different) */ + mem = HeapAlloc(GetProcessHeap(), 0, width * height * bpp); + for(i = 0; i < height; i++) + memcpy(&mem[width * bpp * i], &bits[rect.Pitch * i], width * bpp); + wined3d_surface_unmap(cursor_image); - if (gl_info->supported[APPLE_CLIENT_STORAGE]) - { - glPixelStorei(GL_UNPACK_CLIENT_STORAGE_APPLE, GL_FALSE); - checkGLcall("glPixelStorei(GL_UNPACK_CLIENT_STORAGE_APPLE, GL_FALSE)"); - } + context = context_acquire(device, NULL); - /* Make sure that a proper texture unit is selected */ - GL_EXTCALL(glActiveTextureARB(GL_TEXTURE0_ARB)); - checkGLcall("glActiveTextureARB"); - sampler = device->rev_tex_unit_map[0]; - if (sampler != WINED3D_UNMAPPED_STAGE) - { - IWineD3DDeviceImpl_MarkStateDirty(device, STATE_SAMPLER(sampler)); - } - /* Create a new cursor texture */ - glGenTextures(1, &device->cursorTexture); - checkGLcall("glGenTextures"); - glBindTexture(GL_TEXTURE_2D, device->cursorTexture); - checkGLcall("glBindTexture"); - /* Copy the bitmap memory into the cursor texture */ - glTexImage2D(GL_TEXTURE_2D, 0, intfmt, width, height, 0, gl_format, type, mem); - checkGLcall("glTexImage2D"); - HeapFree(GetProcessHeap(), 0, mem); - - if (gl_info->supported[APPLE_CLIENT_STORAGE]) - { - glPixelStorei(GL_UNPACK_CLIENT_STORAGE_APPLE, GL_TRUE); - checkGLcall("glPixelStorei(GL_UNPACK_CLIENT_STORAGE_APPLE, GL_TRUE)"); - } + ENTER_GL(); - LEAVE_GL(); + if (gl_info->supported[APPLE_CLIENT_STORAGE]) + { + glPixelStorei(GL_UNPACK_CLIENT_STORAGE_APPLE, GL_FALSE); + checkGLcall("glPixelStorei(GL_UNPACK_CLIENT_STORAGE_APPLE, GL_FALSE)"); + } - context_release(context); + /* Make sure that a proper texture unit is selected */ + GL_EXTCALL(glActiveTextureARB(GL_TEXTURE0_ARB)); + checkGLcall("glActiveTextureARB"); + sampler = device->rev_tex_unit_map[0]; + if (sampler != WINED3D_UNMAPPED_STAGE) + { + IWineD3DDeviceImpl_MarkStateDirty(device, STATE_SAMPLER(sampler)); } - else + /* Create a new cursor texture */ + glGenTextures(1, &device->cursorTexture); + checkGLcall("glGenTextures"); + glBindTexture(GL_TEXTURE_2D, device->cursorTexture); + checkGLcall("glBindTexture"); + /* Copy the bitmap memory into the cursor texture */ + glTexImage2D(GL_TEXTURE_2D, 0, intfmt, width, height, 0, gl_format, type, mem); + checkGLcall("glTexImage2D"); + HeapFree(GetProcessHeap(), 0, mem); + + if (gl_info->supported[APPLE_CLIENT_STORAGE]) { - FIXME("A cursor texture was not returned.\n"); - device->cursorTexture = 0; + glPixelStorei(GL_UNPACK_CLIENT_STORAGE_APPLE, GL_TRUE); + checkGLcall("glPixelStorei(GL_UNPACK_CLIENT_STORAGE_APPLE, GL_TRUE)"); } + + LEAVE_GL(); + + context_release(context); } else { + FIXME("A cursor texture was not returned.\n"); + device->cursorTexture = 0; + } + + if (cursor_image->resource.width == 32 && cursor_image->resource.height == 32) + { /* Draw a hardware cursor */ ICONINFO cursorInfo; HCURSOR cursor; diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 0cfcc8e..8b0833d 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -422,7 +422,9 @@ static HRESULT swapchain_gl_present(struct wined3d_swapchain *swapchain, const R gl_info = context->gl_info; /* Render the cursor onto the back buffer, using our nifty directdraw blitting code :-) */ - if (swapchain->device->bCursorVisible && swapchain->device->cursorTexture) + if (swapchain->device->bCursorVisible && + swapchain->device->cursorTexture && + !swapchain->device->hardwareCursor) { struct wined3d_surface cursor; RECT destRect =

1 0

Marcus Meissner : dmsynth: Mark internal symbols with hidden visibility.
by Alexandre Julliard May 17, 2011

May 17, 2011

Module: wine Branch: master Commit: fa6e4f3a3b50c7262c3457a7717a0bf3e5a2355f URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa6e4f3a3b50c7262c3457a77… Author: Marcus Meissner <meissner(a)suse.de> Date: Fri May 13 17:00:00 2011 +0200 dmsynth: Mark internal symbols with hidden visibility. --- dlls/dmsynth/dmsynth_private.h | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/dmsynth/dmsynth_private.h b/dlls/dmsynth/dmsynth_private.h index 4625141..a3dde97 100644 --- a/dlls/dmsynth/dmsynth_private.h +++ b/dlls/dmsynth/dmsynth_private.h @@ -49,8 +49,8 @@ typedef struct IDirectMusicSynthSinkImpl IDirectMusicSynthSinkImpl; /***************************************************************************** * ClassFactory */ -extern HRESULT WINAPI DMUSIC_CreateDirectMusicSynthImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter); -extern HRESULT WINAPI DMUSIC_CreateDirectMusicSynthSinkImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter); +extern HRESULT WINAPI DMUSIC_CreateDirectMusicSynthImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN; +extern HRESULT WINAPI DMUSIC_CreateDirectMusicSynthSinkImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN; /***************************************************************************** * IDirectMusicSynth8Impl implementation structure @@ -81,7 +81,7 @@ struct IDirectMusicSynthSinkImpl { /********************************************************************** * Dll lifetime tracking declaration for dmsynth.dll */ -extern LONG DMSYNTH_refCount; +extern LONG DMSYNTH_refCount DECLSPEC_HIDDEN; static inline void DMSYNTH_LockModule(void) { InterlockedIncrement( &DMSYNTH_refCount ); } static inline void DMSYNTH_UnlockModule(void) { InterlockedDecrement( &DMSYNTH_refCount ); } @@ -110,6 +110,6 @@ typedef struct { #define GE(x) { &x, #x } /* returns name of given GUID */ -extern const char *debugstr_dmguid (const GUID *id); +extern const char *debugstr_dmguid (const GUID *id) DECLSPEC_HIDDEN; #endif /* __WINE_DMSYNTH_PRIVATE_H */

1 0

Alexandre Julliard : wined3d: Switch to the software cursor when the position diverges from the hardware one .
by Alexandre Julliard May 17, 2011

May 17, 2011

Module: wine Branch: master Commit: 3d229b814e614d4ed529732fc511149d6ebc87a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d229b814e614d4ed529732fc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 16 20:22:25 2011 +0200 wined3d: Switch to the software cursor when the position diverges from the hardware one. --- dlls/wined3d/device.c | 15 ++++++++++++++- 1 files changed, 14 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 88aac03..7570bca 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5323,11 +5323,11 @@ HRESULT CDECL wined3d_device_set_cursor_properties(struct wined3d_device *device wined3d_surface_unmap(cursor_image); /* Create our cursor and clean up. */ cursor = CreateIconIndirect(&cursorInfo); - SetCursor(cursor); if (cursorInfo.hbmMask) DeleteObject(cursorInfo.hbmMask); if (cursorInfo.hbmColor) DeleteObject(cursorInfo.hbmColor); if (device->hardwareCursor) DestroyCursor(device->hardwareCursor); device->hardwareCursor = cursor; + if (device->bCursorVisible) SetCursor( cursor ); HeapFree(GetProcessHeap(), 0, maskBits); } } @@ -5345,6 +5345,19 @@ void CDECL wined3d_device_set_cursor_position(struct wined3d_device *device, device->xScreenSpace = x_screen_space; device->yScreenSpace = y_screen_space; + + /* switch to the software cursor if position diverges from the hardware one */ + if (device->hardwareCursor) + { + POINT pt; + GetCursorPos( &pt ); + if (x_screen_space != pt.x || y_screen_space != pt.y) + { + if (device->bCursorVisible) SetCursor( NULL ); + DestroyCursor( device->hardwareCursor ); + device->hardwareCursor = 0; + } + } } BOOL CDECL wined3d_device_show_cursor(struct wined3d_device *device, BOOL show)

1 0

Marcus Meissner : dmcompos: Mark internal symbols with hidden visibility.
by Alexandre Julliard May 17, 2011

May 17, 2011

Module: wine Branch: master Commit: 57d83924ae803a03e230b6ba114f8888790a0b48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57d83924ae803a03e230b6ba1… Author: Marcus Meissner <meissner(a)suse.de> Date: Fri May 13 16:54:02 2011 +0200 dmcompos: Mark internal symbols with hidden visibility. --- dlls/dmcompos/dmcompos_private.h | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/dmcompos/dmcompos_private.h b/dlls/dmcompos/dmcompos_private.h index 5048b33..5e9a9f1 100644 --- a/dlls/dmcompos/dmcompos_private.h +++ b/dlls/dmcompos/dmcompos_private.h @@ -53,10 +53,10 @@ typedef struct IDirectMusicSignPostTrack IDirectMusicSignPostTrack; /***************************************************************************** * ClassFactory */ -extern HRESULT WINAPI DMUSIC_CreateDirectMusicChordMapImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter); -extern HRESULT WINAPI DMUSIC_CreateDirectMusicComposerImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter); -extern HRESULT WINAPI DMUSIC_CreateDirectMusicChordMapTrack (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter); -extern HRESULT WINAPI DMUSIC_CreateDirectMusicSignPostTrack (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter); +extern HRESULT WINAPI DMUSIC_CreateDirectMusicChordMapImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN; +extern HRESULT WINAPI DMUSIC_CreateDirectMusicComposerImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN; +extern HRESULT WINAPI DMUSIC_CreateDirectMusicChordMapTrack (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN; +extern HRESULT WINAPI DMUSIC_CreateDirectMusicSignPostTrack (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN; /***************************************************************************** * IDirectMusicChordMapImpl implementation structure @@ -116,7 +116,7 @@ struct IDirectMusicSignPostTrack { /********************************************************************** * Dll lifetime tracking declaration for dmcompos.dll */ -extern LONG DMCOMPOS_refCount; +extern LONG DMCOMPOS_refCount DECLSPEC_HIDDEN; static inline void DMCOMPOS_LockModule(void) { InterlockedIncrement( &DMCOMPOS_refCount ); } static inline void DMCOMPOS_UnlockModule(void) { InterlockedDecrement( &DMCOMPOS_refCount ); } @@ -153,10 +153,10 @@ typedef struct { #define ICOM_THIS_MULTI(impl,field,iface) impl* const This=(impl*)((char*)(iface) - offsetof(impl,field)) /* FOURCC to string conversion for debug messages */ -extern const char *debugstr_fourcc (DWORD fourcc); +extern const char *debugstr_fourcc (DWORD fourcc) DECLSPEC_HIDDEN; /* returns name of given GUID */ -extern const char *debugstr_dmguid (const GUID *id); +extern const char *debugstr_dmguid (const GUID *id) DECLSPEC_HIDDEN; /* dump whole DMUS_OBJECTDESC struct */ -extern const char *debugstr_DMUS_OBJECTDESC (LPDMUS_OBJECTDESC pDesc); +extern const char *debugstr_DMUS_OBJECTDESC (LPDMUS_OBJECTDESC pDesc) DECLSPEC_HIDDEN; #endif /* __WINE_DMCOMPOS_PRIVATE_H */

1 0

Marcus Meissner : devenum: Mark internal symbols as hidden.
by Alexandre Julliard May 17, 2011

May 17, 2011

Module: wine Branch: master Commit: 455ef03cadc885d2abcdaedff3668e5ada045934 URL: http://source.winehq.org/git/wine.git/?a=commit;h=455ef03cadc885d2abcdaedff… Author: Marcus Meissner <meissner(a)suse.de> Date: Fri May 13 16:43:26 2011 +0200 devenum: Mark internal symbols as hidden. --- dlls/devenum/devenum_main.c | 4 ++-- dlls/devenum/devenum_private.h | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/devenum/devenum_main.c b/dlls/devenum/devenum_main.c index 57805bc..6867fea 100644 --- a/dlls/devenum/devenum_main.c +++ b/dlls/devenum/devenum_main.c @@ -25,8 +25,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(devenum); -LONG dll_refs; -HINSTANCE DEVENUM_hInstance; +DECLSPEC_HIDDEN LONG dll_refs; +DECLSPEC_HIDDEN HINSTANCE DEVENUM_hInstance; typedef struct { diff --git a/dlls/devenum/devenum_private.h b/dlls/devenum/devenum_private.h index da65add..1363e91 100644 --- a/dlls/devenum/devenum_private.h +++ b/dlls/devenum/devenum_private.h @@ -47,7 +47,7 @@ /********************************************************************** * Dll lifetime tracking declaration for devenum.dll */ -extern LONG dll_refs; +extern LONG dll_refs DECLSPEC_HIDDEN; static inline void DEVENUM_LockModule(void) { InterlockedIncrement(&dll_refs); } static inline void DEVENUM_UnlockModule(void) { InterlockedDecrement(&dll_refs); } @@ -85,17 +85,17 @@ typedef struct HKEY hkey; } MediaCatMoniker; -MediaCatMoniker * DEVENUM_IMediaCatMoniker_Construct(void); -HRESULT DEVENUM_IEnumMoniker_Construct(HKEY hkey, IEnumMoniker ** ppEnumMoniker); +MediaCatMoniker * DEVENUM_IMediaCatMoniker_Construct(void) DECLSPEC_HIDDEN; +HRESULT DEVENUM_IEnumMoniker_Construct(HKEY hkey, IEnumMoniker ** ppEnumMoniker) DECLSPEC_HIDDEN; -extern ClassFactoryImpl DEVENUM_ClassFactory; -extern CreateDevEnumImpl DEVENUM_CreateDevEnum; -extern ParseDisplayNameImpl DEVENUM_ParseDisplayName; +extern ClassFactoryImpl DEVENUM_ClassFactory DECLSPEC_HIDDEN; +extern CreateDevEnumImpl DEVENUM_CreateDevEnum DECLSPEC_HIDDEN; +extern ParseDisplayNameImpl DEVENUM_ParseDisplayName DECLSPEC_HIDDEN; /********************************************************************** * Private helper function to get AM filter category key location */ -HRESULT DEVENUM_GetCategoryKey(REFCLSID clsidDeviceClass, HKEY *pBaseKey, WCHAR *wszRegKeyName, UINT maxLen); +HRESULT DEVENUM_GetCategoryKey(REFCLSID clsidDeviceClass, HKEY *pBaseKey, WCHAR *wszRegKeyName, UINT maxLen) DECLSPEC_HIDDEN; /********************************************************************** * Global string constant declarations

1 0

Alexandre Julliard : wined3d: Only update the cursor position the first time we display it.
by Alexandre Julliard May 17, 2011

May 17, 2011

Module: wine Branch: master Commit: 38d0d9fe809ad368475876834af316d8692f7fa2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=38d0d9fe809ad368475876834… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 16 20:16:15 2011 +0200 wined3d: Only update the cursor position the first time we display it. --- dlls/wined3d/device.c | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index a4e85be..fb13e02 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5352,17 +5352,20 @@ void CDECL wined3d_device_set_cursor_position(struct wined3d_device *device, BOOL CDECL wined3d_device_show_cursor(struct wined3d_device *device, BOOL show) { BOOL oldVisible = device->bCursorVisible; - POINT pt; TRACE("device %p, show %#x.\n", device, show); - /* When ShowCursor is first called it should make the cursor appear at the - * OS's last known cursor position. Because of this, some applications - * just repetitively call ShowCursor in order to update the cursor's - * position. This behavior is undocumented. */ - GetCursorPos(&pt); - device->xScreenSpace = pt.x; - device->yScreenSpace = pt.y; + /* + * When ShowCursor is first called it should make the cursor appear at the OS's last + * known cursor position. + */ + if (show && !oldVisible) + { + POINT pt; + GetCursorPos(&pt); + device->xScreenSpace = pt.x; + device->yScreenSpace = pt.y; + } if (device->hardwareCursor) {

1 0