x3daudio1_7: Use shared source.

Signed-off-by: Andrew Eikum <aeikum@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Andrew Eikum 2016-01-14 11:38:19 -06:00 committed by Alexandre Julliard
parent 40827cbb2d
commit 63ef6b9a7d
7 changed files with 37 additions and 53 deletions

3
configure vendored
View File

@ -13719,6 +13719,7 @@ fi
if test "x$ac_cv_have_openalsoft" != xyes
then
as_fn_append wine_notices "|openal-soft ${notice_platform}development files not found (or too old), XAudio2 won't be supported"
enable_x3daudio1_7=${enable_x3daudio1_7:-no}
enable_xapofx1_1=${enable_xapofx1_1:-no}
enable_xapofx1_2=${enable_xapofx1_2:-no}
enable_xapofx1_3=${enable_xapofx1_3:-no}
@ -18047,7 +18048,7 @@ wine_fn_config_dll xaudio2_5 enable_xaudio2_5 clean
wine_fn_config_dll xaudio2_6 enable_xaudio2_6 clean
wine_fn_config_dll xaudio2_7 enable_xaudio2_7 clean
wine_fn_config_test dlls/xaudio2_7/tests xaudio2_7_test
wine_fn_config_dll xaudio2_8 enable_xaudio2_8 clean,implib
wine_fn_config_dll xaudio2_8 enable_xaudio2_8 clean
wine_fn_config_dll xinput1_1 enable_xinput1_1
wine_fn_config_dll xinput1_2 enable_xinput1_2
wine_fn_config_dll xinput1_3 enable_xinput1_3 implib xinput

View File

@ -1662,6 +1662,7 @@ fi
if test "x$ac_cv_have_openalsoft" != xyes
then
WINE_NOTICE([openal-soft ${notice_platform}development files not found (or too old), XAudio2 won't be supported])
enable_x3daudio1_7=${enable_x3daudio1_7:-no}
enable_xapofx1_1=${enable_xapofx1_1:-no}
enable_xapofx1_2=${enable_xapofx1_2:-no}
enable_xapofx1_3=${enable_xapofx1_3:-no}
@ -3391,7 +3392,7 @@ WINE_CONFIG_DLL(xaudio2_5,,[clean])
WINE_CONFIG_DLL(xaudio2_6,,[clean])
WINE_CONFIG_DLL(xaudio2_7,,[clean])
WINE_CONFIG_TEST(dlls/xaudio2_7/tests)
WINE_CONFIG_DLL(xaudio2_8,,[clean,implib])
WINE_CONFIG_DLL(xaudio2_8,,[clean])
WINE_CONFIG_DLL(xinput1_1)
WINE_CONFIG_DLL(xinput1_2)
WINE_CONFIG_DLL(xinput1_3,,[implib],[xinput])

View File

@ -1,5 +1,6 @@
EXTRADEFS = -DX3DAUDIO1_VER=7 -DXAUDIO2_VER=7
MODULE = x3daudio1_7.dll
IMPORTS = xaudio2_8
PARENTSRC = ../xaudio2_7
C_SRCS = \
main.c
x3daudio.c

View File

@ -1,45 +0,0 @@
/*
* Copyright 2014 Alex Henrie
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "config.h"
#include <stdarg.h>
#include "windef.h"
#include "winbase.h"
#include "x3daudio.h"
BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved)
{
switch (reason)
{
case DLL_WINE_PREATTACH:
return FALSE; /* prefer native version */
case DLL_PROCESS_ATTACH:
DisableThreadLibraryCalls(instance);
break;
}
return TRUE;
}
void CDECL X3DA17_X3DAudioInitialize(UINT32 chanmask, float speedofsound,
X3DAUDIO_HANDLE handle)
{
/* forward to xaudio2_8 */
X3DAudioInitialize(chanmask, speedofsound, handle);
}

View File

@ -1,2 +1,2 @@
@ cdecl X3DAudioCalculate(ptr ptr ptr long ptr) xaudio2_8.X3DAudioCalculate
@ cdecl X3DAudioInitialize(long float ptr) X3DA17_X3DAudioInitialize
@ cdecl X3DAudioCalculate(ptr ptr ptr long ptr)
@ cdecl X3DAudioInitialize(long float ptr) LEGACY_X3DAudioInitialize

View File

@ -25,6 +25,23 @@
WINE_DEFAULT_DEBUG_CHANNEL(xaudio2);
#ifdef X3DAUDIO1_VER
BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD reason, void *pReserved)
{
TRACE("(%p, %d, %p)\n", hinstDLL, reason, pReserved);
switch (reason)
{
case DLL_WINE_PREATTACH:
return FALSE; /* prefer native version */
case DLL_PROCESS_ATTACH:
DisableThreadLibraryCalls( hinstDLL );
break;
}
return TRUE;
}
#endif /* X3DAUDIO1_VER */
#if XAUDIO2_VER >= 8
HRESULT CDECL X3DAudioInitialize(UINT32 chanmask, float speedofsound,
X3DAUDIO_HANDLE handle)
@ -32,7 +49,17 @@ HRESULT CDECL X3DAudioInitialize(UINT32 chanmask, float speedofsound,
FIXME("0x%x, %f, %p: Stub!\n", chanmask, speedofsound, handle);
return S_OK;
}
#endif /* XAUDIO2_VER >= 8 */
#ifdef X3DAUDIO1_VER
void CDECL LEGACY_X3DAudioInitialize(UINT32 chanmask, float speedofsound,
X3DAUDIO_HANDLE handle)
{
FIXME("0x%x, %f, %p: Stub!\n", chanmask, speedofsound, handle);
}
#endif /* X3DAUDIO1_VER */
#if XAUDIO2_VER >= 8 || defined X3DAUDIO1_VER
void CDECL X3DAudioCalculate(const X3DAUDIO_HANDLE handle,
const X3DAUDIO_LISTENER *listener, const X3DAUDIO_EMITTER *emitter,
UINT32 flags, X3DAUDIO_DSP_SETTINGS *out)
@ -52,4 +79,4 @@ void CDECL X3DAudioCalculate(const X3DAUDIO_HANDLE handle,
out->EmitterVelocityComponent = 0;
out->ListenerVelocityComponent = 0;
}
#endif /* XAUDIO2_VER >= 8 */
#endif /* XAUDIO2_VER >= 8 || defined X3DAUDIO1_VER */

View File

@ -1,6 +1,5 @@
EXTRADEFS = -DXAUDIO2_VER=8
MODULE = xaudio2_8.dll
IMPORTLIB = xaudio2_8
IMPORTS = advapi32 kernel32 ole32 user32 uuid
EXTRALIBS = $(OPENAL_LIBS)
PARENTSRC = ../xaudio2_7