x3daudio: Forward older DLLs to x3daudio1_7.

Signed-off-by: Andrew Eikum <aeikum@codeweavers.com>
This commit is contained in:
Andrew Eikum 2015-10-06 13:01:24 -05:00 committed by Alexandre Julliard
parent 7e6b52e88b
commit b2b5a085b5
14 changed files with 70 additions and 14 deletions

4
configure vendored
View File

@ -1364,6 +1364,7 @@ enable_wsock32
enable_wtsapi32
enable_wuapi
enable_wuaueng
enable_x3daudio1_0
enable_x3daudio1_1
enable_x3daudio1_2
enable_x3daudio1_3
@ -17935,13 +17936,14 @@ wine_fn_config_dll wtsapi32 enable_wtsapi32 implib
wine_fn_config_test dlls/wtsapi32/tests wtsapi32_test
wine_fn_config_dll wuapi enable_wuapi clean
wine_fn_config_dll wuaueng enable_wuaueng
wine_fn_config_dll x3daudio1_0 enable_x3daudio1_0
wine_fn_config_dll x3daudio1_1 enable_x3daudio1_1
wine_fn_config_dll x3daudio1_2 enable_x3daudio1_2
wine_fn_config_dll x3daudio1_3 enable_x3daudio1_3
wine_fn_config_dll x3daudio1_4 enable_x3daudio1_4
wine_fn_config_dll x3daudio1_5 enable_x3daudio1_5
wine_fn_config_dll x3daudio1_6 enable_x3daudio1_6
wine_fn_config_dll x3daudio1_7 enable_x3daudio1_7
wine_fn_config_dll x3daudio1_7 enable_x3daudio1_7 implib
wine_fn_config_dll xapofx1_1 enable_xapofx1_1
wine_fn_config_dll xapofx1_2 enable_xapofx1_2
wine_fn_config_dll xapofx1_3 enable_xapofx1_3

View File

@ -3450,13 +3450,14 @@ WINE_CONFIG_DLL(wtsapi32,,[implib])
WINE_CONFIG_TEST(dlls/wtsapi32/tests)
WINE_CONFIG_DLL(wuapi,,[clean])
WINE_CONFIG_DLL(wuaueng)
WINE_CONFIG_DLL(x3daudio1_0)
WINE_CONFIG_DLL(x3daudio1_1)
WINE_CONFIG_DLL(x3daudio1_2)
WINE_CONFIG_DLL(x3daudio1_3)
WINE_CONFIG_DLL(x3daudio1_4)
WINE_CONFIG_DLL(x3daudio1_5)
WINE_CONFIG_DLL(x3daudio1_6)
WINE_CONFIG_DLL(x3daudio1_7)
WINE_CONFIG_DLL(x3daudio1_7,,[implib])
WINE_CONFIG_DLL(xapofx1_1)
WINE_CONFIG_DLL(xapofx1_2)
WINE_CONFIG_DLL(xapofx1_3)

View File

@ -0,0 +1,4 @@
MODULE = x3daudio1_0.dll
C_SRCS = \
main.c

36
dlls/x3daudio1_0/main.c Normal file
View File

@ -0,0 +1,36 @@
/*
* Copyright 2015 Andrew Eikum for CodeWeavers
*
* 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"
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;
}

View File

@ -0,0 +1,2 @@
@ cdecl X3DAudioCalculate(ptr ptr ptr long ptr) x3daudio1_6.X3DAudioCalculate
@ cdecl X3DAudioInitialize(long float ptr) x3daudio1_6.X3DAudioInitialize

View File

@ -1,2 +1,2 @@
@ stub X3DAudioCalculate
@ stub X3DAudioInitialize
@ cdecl X3DAudioCalculate(ptr ptr ptr long ptr) x3daudio1_6.X3DAudioCalculate
@ cdecl X3DAudioInitialize(long float ptr) x3daudio1_6.X3DAudioInitialize

View File

@ -1,2 +1,2 @@
@ stub X3DAudioCalculate
@ stub X3DAudioInitialize
@ cdecl X3DAudioCalculate(ptr ptr ptr long ptr) x3daudio1_6.X3DAudioCalculate
@ cdecl X3DAudioInitialize(long float ptr) x3daudio1_6.X3DAudioInitialize

View File

@ -1,2 +1,2 @@
@ stub X3DAudioCalculate
@ stub X3DAudioInitialize
@ cdecl X3DAudioCalculate(ptr ptr ptr long ptr) x3daudio1_6.X3DAudioCalculate
@ cdecl X3DAudioInitialize(long float ptr) x3daudio1_6.X3DAudioInitialize

View File

@ -1,2 +1,2 @@
@ stub X3DAudioCalculate
@ stub X3DAudioInitialize
@ cdecl X3DAudioCalculate(ptr ptr ptr long ptr) x3daudio1_6.X3DAudioCalculate
@ cdecl X3DAudioInitialize(long float ptr) x3daudio1_6.X3DAudioInitialize

View File

@ -1,2 +1,2 @@
@ stub X3DAudioCalculate
@ stub X3DAudioInitialize
@ cdecl X3DAudioCalculate(ptr ptr ptr long ptr) x3daudio1_6.X3DAudioCalculate
@ cdecl X3DAudioInitialize(long float ptr) x3daudio1_6.X3DAudioInitialize

View File

@ -1,4 +1,5 @@
MODULE = x3daudio1_6.dll
IMPORTS = x3daudio1_7
C_SRCS = \
main.c

View File

@ -23,6 +23,8 @@
#include "windef.h"
#include "winbase.h"
#include "x3daudio.h"
BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
{
switch (fdwReason)
@ -38,3 +40,10 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
return TRUE;
}
void CDECL X3DA16_X3DAudioInitialize(UINT32 chanmask, float speedofsound,
X3DAUDIO_HANDLE handle)
{
/* forward to 1.7 */
X3DAudioInitialize(chanmask, speedofsound, handle);
}

View File

@ -1,2 +1,2 @@
@ stub X3DAudioCalculate
@ stub X3DAudioInitialize
@ cdecl X3DAudioCalculate(ptr ptr ptr long ptr) x3daudio1_7.X3DAudioCalculate
@ cdecl X3DAudioInitialize(long float ptr) X3DA16_X3DAudioInitialize

View File

@ -1,4 +1,5 @@
MODULE = x3daudio1_7.dll
IMPORTLIB = x3daudio1_7
C_SRCS = \
main.c