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>

x3daudio: Fix lib exports.
a53a9a98 · Rafał Mużyło · Alexandre Julliard · 2199be1c · a53a9a98 · a53a9a98
Commit a53a9a98 authored Oct 04, 2019 by Rafał Mużyło Committed by Alexandre Julliard Oct 16, 2019
4 changed files
--- a/dlls/x3daudio1_0/x3daudio1_0.spec
+++ b/dlls/x3daudio1_0/x3daudio1_0.spec
-@ 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
--- a/dlls/x3daudio1_1/x3daudio1_1.spec
+++ b/dlls/x3daudio1_1/x3daudio1_1.spec
-@ 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
--- a/dlls/x3daudio1_2/x3daudio1_2.spec
+++ b/dlls/x3daudio1_2/x3daudio1_2.spec
-@ 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
--- a/dlls/xaudio2_7/x3daudio.c
+++ b/dlls/xaudio2_7/x3daudio.c
@@ -63,8 +63,13 @@ HRESULT CDECL X3DAudioInitialize(UINT32 chanmask, float speedofsound,
 #endif /* XAUDIO2_VER >= 8 */
 #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,
        X3DAUDIO_HANDLE handle)
+#endif
 {
    TRACE("0x%x, %f, %p\n", chanmask, speedofsound, handle);
    F3DAudioInitialize(chanmask, speedofsound, handle);
@@ -72,9 +77,15 @@ void CDECL LEGACY_X3DAudioInitialize(UINT32 chanmask, float speedofsound,
 #endif /* 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,
        const X3DAUDIO_LISTENER *listener, const X3DAUDIO_EMITTER *emitter,
        UINT32 flags, X3DAUDIO_DSP_SETTINGS *out)
+#endif
 {
    TRACE("%p, %p, %p, 0x%x, %p\n", handle, listener, emitter, flags, out);
    F3DAudioCalculate(