x3daudio: Fix lib exports.

Signed-off-by: Rafał Mużyło <galtgendo@o2.pl>
Signed-off-by: Andrew Eikum <aeikum@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Rafał Mużyło 2019-10-04 13:18:17 +02:00 committed by Alexandre Julliard
parent 2199be1c0f
commit a53a9a98f7
4 changed files with 23 additions and 6 deletions

View File

@ -1,2 +1,4 @@
@ cdecl X3DAudioCalculate(ptr ptr ptr long ptr) @ stdcall -arch=i386 _X3DAudioCalculate@20(ptr ptr ptr long ptr) LEGACY_X3DAudioCalculate
@ cdecl X3DAudioInitialize(long float ptr) LEGACY_X3DAudioInitialize @ stdcall -arch=i386 _X3DAudioInitialize@12(long float ptr) LEGACY_X3DAudioInitialize
@ stdcall -arch=!i386 X3DAudioCalculate(ptr ptr ptr long ptr) LEGACY_X3DAudioCalculate
@ stdcall -arch=!i386 X3DAudioInitialize(long float ptr) LEGACY_X3DAudioInitialize

View File

@ -1,2 +1,4 @@
@ cdecl X3DAudioCalculate(ptr ptr ptr long ptr) @ stdcall -arch=i386 _X3DAudioCalculate@20(ptr ptr ptr long ptr) LEGACY_X3DAudioCalculate
@ cdecl X3DAudioInitialize(long float ptr) LEGACY_X3DAudioInitialize @ stdcall -arch=i386 _X3DAudioInitialize@12(long float ptr) LEGACY_X3DAudioInitialize
@ stdcall -arch=!i386 X3DAudioCalculate(ptr ptr ptr long ptr) LEGACY_X3DAudioCalculate
@ stdcall -arch=!i386 X3DAudioInitialize(long float ptr) LEGACY_X3DAudioInitialize

View File

@ -1,2 +1,4 @@
@ cdecl X3DAudioCalculate(ptr ptr ptr long ptr) @ stdcall -arch=i386 _X3DAudioCalculate@20(ptr ptr ptr long ptr) LEGACY_X3DAudioCalculate
@ cdecl X3DAudioInitialize(long float ptr) LEGACY_X3DAudioInitialize @ stdcall -arch=i386 _X3DAudioInitialize@12(long float ptr) LEGACY_X3DAudioInitialize
@ stdcall -arch=!i386 X3DAudioCalculate(ptr ptr ptr long ptr) LEGACY_X3DAudioCalculate
@ stdcall -arch=!i386 X3DAudioInitialize(long float ptr) LEGACY_X3DAudioInitialize

View File

@ -63,8 +63,13 @@ HRESULT CDECL X3DAudioInitialize(UINT32 chanmask, float speedofsound,
#endif /* XAUDIO2_VER >= 8 */ #endif /* XAUDIO2_VER >= 8 */
#ifdef X3DAUDIO1_VER #ifdef X3DAUDIO1_VER
#if X3DAUDIO1_VER <= 2
void WINAPI LEGACY_X3DAudioInitialize(UINT32 chanmask, float speedofsound,
X3DAUDIO_HANDLE handle)
#else
void CDECL LEGACY_X3DAudioInitialize(UINT32 chanmask, float speedofsound, void CDECL LEGACY_X3DAudioInitialize(UINT32 chanmask, float speedofsound,
X3DAUDIO_HANDLE handle) X3DAUDIO_HANDLE handle)
#endif
{ {
TRACE("0x%x, %f, %p\n", chanmask, speedofsound, handle); TRACE("0x%x, %f, %p\n", chanmask, speedofsound, handle);
F3DAudioInitialize(chanmask, speedofsound, handle); F3DAudioInitialize(chanmask, speedofsound, handle);
@ -72,9 +77,15 @@ void CDECL LEGACY_X3DAudioInitialize(UINT32 chanmask, float speedofsound,
#endif /* X3DAUDIO1_VER */ #endif /* X3DAUDIO1_VER */
#if XAUDIO2_VER >= 8 || defined X3DAUDIO1_VER #if XAUDIO2_VER >= 8 || defined X3DAUDIO1_VER
#if defined(X3DAUDIO1_VER) && X3DAUDIO1_VER <= 2
void WINAPI LEGACY_X3DAudioCalculate(const X3DAUDIO_HANDLE handle,
const X3DAUDIO_LISTENER *listener, const X3DAUDIO_EMITTER *emitter,
UINT32 flags, X3DAUDIO_DSP_SETTINGS *out)
#else
void CDECL X3DAudioCalculate(const X3DAUDIO_HANDLE handle, void CDECL X3DAudioCalculate(const X3DAUDIO_HANDLE handle,
const X3DAUDIO_LISTENER *listener, const X3DAUDIO_EMITTER *emitter, const X3DAUDIO_LISTENER *listener, const X3DAUDIO_EMITTER *emitter,
UINT32 flags, X3DAUDIO_DSP_SETTINGS *out) UINT32 flags, X3DAUDIO_DSP_SETTINGS *out)
#endif
{ {
TRACE("%p, %p, %p, 0x%x, %p\n", handle, listener, emitter, flags, out); TRACE("%p, %p, %p, 0x%x, %p\n", handle, listener, emitter, flags, out);
F3DAudioCalculate( F3DAudioCalculate(