Module: wine Branch: master Commit: 13f9a842c79fffd2437641bb7cf7cf1ba09ee423 URL: https://source.winehq.org/git/wine.git/?a=commit;h=13f9a842c79fffd2437641bb7...
Author: Alistair Leslie-Hughes leslie_alistair@hotmail.com Date: Thu Aug 6 16:09:31 2020 +1000
xactengine3_4: New DLL.
Signed-off-by: Alistair Leslie-Hughes leslie_alistair@hotmail.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
configure | 3 +++ configure.ac | 2 ++ dlls/xactengine3_4/Makefile.in | 11 +++++++++++ dlls/xactengine3_4/xactengine3_4.spec | 4 ++++ dlls/xactengine3_7/xact_classes.idl | 9 ++++++++- 5 files changed, 28 insertions(+), 1 deletion(-)
diff --git a/configure b/configure index 69bdebbfba..12bfd8e07e 100755 --- a/configure +++ b/configure @@ -1707,6 +1707,7 @@ enable_x3daudio1_4 enable_x3daudio1_5 enable_x3daudio1_6 enable_x3daudio1_7 +enable_xactengine3_4 enable_xactengine3_5 enable_xactengine3_6 enable_xactengine3_7 @@ -16635,6 +16636,7 @@ then enable_x3daudio1_5=${enable_x3daudio1_5:-no} enable_x3daudio1_6=${enable_x3daudio1_6:-no} enable_x3daudio1_7=${enable_x3daudio1_7:-no} + enable_xactengine3_4=${enable_xactengine3_4:-no} enable_xactengine3_5=${enable_xactengine3_5:-no} enable_xactengine3_6=${enable_xactengine3_6:-no} enable_xactengine3_7=${enable_xactengine3_7:-no} @@ -21367,6 +21369,7 @@ wine_fn_config_makefile dlls/x3daudio1_4 enable_x3daudio1_4 wine_fn_config_makefile dlls/x3daudio1_5 enable_x3daudio1_5 wine_fn_config_makefile dlls/x3daudio1_6 enable_x3daudio1_6 wine_fn_config_makefile dlls/x3daudio1_7 enable_x3daudio1_7 +wine_fn_config_makefile dlls/xactengine3_4 enable_xactengine3_4 wine_fn_config_makefile dlls/xactengine3_5 enable_xactengine3_5 wine_fn_config_makefile dlls/xactengine3_6 enable_xactengine3_6 wine_fn_config_makefile dlls/xactengine3_7 enable_xactengine3_7 diff --git a/configure.ac b/configure.ac index dc4514e2ae..af6513274c 100644 --- a/configure.ac +++ b/configure.ac @@ -1958,6 +1958,7 @@ then enable_x3daudio1_5=${enable_x3daudio1_5:-no} enable_x3daudio1_6=${enable_x3daudio1_6:-no} enable_x3daudio1_7=${enable_x3daudio1_7:-no} + enable_xactengine3_4=${enable_xactengine3_4:-no} enable_xactengine3_5=${enable_xactengine3_5:-no} enable_xactengine3_6=${enable_xactengine3_6:-no} enable_xactengine3_7=${enable_xactengine3_7:-no} @@ -3907,6 +3908,7 @@ WINE_CONFIG_MAKEFILE(dlls/x3daudio1_4) WINE_CONFIG_MAKEFILE(dlls/x3daudio1_5) WINE_CONFIG_MAKEFILE(dlls/x3daudio1_6) WINE_CONFIG_MAKEFILE(dlls/x3daudio1_7) +WINE_CONFIG_MAKEFILE(dlls/xactengine3_4) WINE_CONFIG_MAKEFILE(dlls/xactengine3_5) WINE_CONFIG_MAKEFILE(dlls/xactengine3_6) WINE_CONFIG_MAKEFILE(dlls/xactengine3_7) diff --git a/dlls/xactengine3_4/Makefile.in b/dlls/xactengine3_4/Makefile.in new file mode 100644 index 0000000000..f90ca3d32c --- /dev/null +++ b/dlls/xactengine3_4/Makefile.in @@ -0,0 +1,11 @@ +MODULE = xactengine3_4.dll +IMPORTS = ole32 uuid +EXTRADEFS = -DXACT3_VER=0x0304 +PARENTSRC = ../xactengine3_7 +EXTRALIBS = $(FAUDIO_LIBS) +EXTRAINCL = $(FAUDIO_CFLAGS) + +C_SRCS = \ + xact_dll.c + +IDL_SRCS = xact_classes.idl diff --git a/dlls/xactengine3_4/xactengine3_4.spec b/dlls/xactengine3_4/xactengine3_4.spec new file mode 100644 index 0000000000..b16365d0c9 --- /dev/null +++ b/dlls/xactengine3_4/xactengine3_4.spec @@ -0,0 +1,4 @@ +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() diff --git a/dlls/xactengine3_7/xact_classes.idl b/dlls/xactengine3_7/xact_classes.idl index 186bc06537..2a8eee8fac 100644 --- a/dlls/xactengine3_7/xact_classes.idl +++ b/dlls/xactengine3_7/xact_classes.idl @@ -20,7 +20,14 @@
#pragma makedep register
-#if XACT3_VER == 0x0305 +#if XACT3_VER == 0x0304 +[ + helpstring("XACT3.4 Class"), + threading(both), + uuid(0977d092-2d95-4e43-8d42-9ddcc2545ed5) +] +coclass XACTEngine34 { interface IXACT37Engine; } +#elif XACT3_VER == 0x0305 [ helpstring("XACT3.5 Class"), threading(both),