Module: wine Branch: master Commit: 54222446aabb0920e9d268c229f8460eeb224dc0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=54222446aabb0920e9d268c22...
Author: Alistair Leslie-Hughes leslie_alistair@hotmail.com Date: Thu Aug 6 16:09:35 2020 +1000
xactengine3_0: 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_0/Makefile.in | 11 +++++++++++ dlls/xactengine3_0/xactengine3_0.spec | 4 ++++ dlls/xactengine3_7/xact_classes.idl | 9 ++++++++- 5 files changed, 28 insertions(+), 1 deletion(-)
diff --git a/configure b/configure index 5c88de3e11..0493e2a653 100755 --- a/configure +++ b/configure @@ -1707,6 +1707,7 @@ enable_x3daudio1_4 enable_x3daudio1_5 enable_x3daudio1_6 enable_x3daudio1_7 +enable_xactengine3_0 enable_xactengine3_1 enable_xactengine3_2 enable_xactengine3_3 @@ -16639,6 +16640,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_0=${enable_xactengine3_0:-no} enable_xactengine3_1=${enable_xactengine3_1:-no} enable_xactengine3_2=${enable_xactengine3_2:-no} enable_xactengine3_3=${enable_xactengine3_3:-no} @@ -21375,6 +21377,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_0 enable_xactengine3_0 wine_fn_config_makefile dlls/xactengine3_1 enable_xactengine3_1 wine_fn_config_makefile dlls/xactengine3_2 enable_xactengine3_2 wine_fn_config_makefile dlls/xactengine3_3 enable_xactengine3_3 diff --git a/configure.ac b/configure.ac index bd8b6b2d5a..0a556635a2 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_0=${enable_xactengine3_0:-no} enable_xactengine3_1=${enable_xactengine3_1:-no} enable_xactengine3_2=${enable_xactengine3_2:-no} enable_xactengine3_3=${enable_xactengine3_3:-no} @@ -3911,6 +3912,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_0) WINE_CONFIG_MAKEFILE(dlls/xactengine3_1) WINE_CONFIG_MAKEFILE(dlls/xactengine3_2) WINE_CONFIG_MAKEFILE(dlls/xactengine3_3) diff --git a/dlls/xactengine3_0/Makefile.in b/dlls/xactengine3_0/Makefile.in new file mode 100644 index 0000000000..e5c77dcccd --- /dev/null +++ b/dlls/xactengine3_0/Makefile.in @@ -0,0 +1,11 @@ +MODULE = xactengine3_0.dll +IMPORTS = ole32 uuid +EXTRADEFS = -DXACT3_VER=0x0300 +PARENTSRC = ../xactengine3_7 +EXTRALIBS = $(FAUDIO_LIBS) +EXTRAINCL = $(FAUDIO_CFLAGS) + +C_SRCS = \ + xact_dll.c + +IDL_SRCS = xact_classes.idl diff --git a/dlls/xactengine3_0/xactengine3_0.spec b/dlls/xactengine3_0/xactengine3_0.spec new file mode 100644 index 0000000000..b16365d0c9 --- /dev/null +++ b/dlls/xactengine3_0/xactengine3_0.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 aeac5d4cd3..2ed8d337ac 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 == 0x0301 +#if XACT3_VER == 0x0300 +[ + helpstring("XACT3.0 Class"), + threading(both), + uuid(3b80ee2a-b0f5-4780-9e30-90cb39685b03) +] +coclass XACTEngine30 { interface IXACT30Engine; } +#elif XACT3_VER == 0x0301 [ helpstring("XACT3.1 Class"), threading(both),