xactengine3_6: New DLL.

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

xactengine3_6: New DLL.
7362ebca · Alistair Leslie-Hughes · Alexandre Julliard · 81b5e2d1 · 7362ebca · 7362ebca
Commit 7362ebca authored Aug 06, 2020 by Alistair Leslie-Hughes Committed by Alexandre Julliard Aug 06, 2020
5 changed files
--- a/configure
+++ b/configure
@@ -1707,6 +1707,7 @@ enable_x3daudio1_4
 enable_x3daudio1_5
 enable_x3daudio1_6
 enable_x3daudio1_7
+enable_xactengine3_6
 enable_xactengine3_7
 enable_xapofx1_1
 enable_xapofx1_2
@@ -16633,6 +16634,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_6=${enable_xactengine3_6:-no}
    enable_xactengine3_7=${enable_xactengine3_7:-no}
    enable_xapofx1_1=${enable_xapofx1_1:-no}
    enable_xapofx1_2=${enable_xapofx1_2:-no}
@@ -21363,6 +21365,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_6 enable_xactengine3_6
 wine_fn_config_makefile dlls/xactengine3_7 enable_xactengine3_7
 wine_fn_config_makefile dlls/xapofx1_1 enable_xapofx1_1
 wine_fn_config_makefile dlls/xapofx1_2 enable_xapofx1_2

--- 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_6=${enable_xactengine3_6:-no}
    enable_xactengine3_7=${enable_xactengine3_7:-no}
    enable_xapofx1_1=${enable_xapofx1_1:-no}
    enable_xapofx1_2=${enable_xapofx1_2:-no}
@@ -3905,6 +3906,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_6)
 WINE_CONFIG_MAKEFILE(dlls/xactengine3_7)
 WINE_CONFIG_MAKEFILE(dlls/xapofx1_1)
 WINE_CONFIG_MAKEFILE(dlls/xapofx1_2)

--- a/dlls/xactengine3_6/Makefile.in
+++ b/dlls/xactengine3_6/Makefile.in
+MODULE    = xactengine3_6.dll
+IMPORTS   = ole32 uuid
+EXTRADEFS = -DXACT3_VER=0x0306
+PARENTSRC = ../xactengine3_7
+EXTRALIBS = $(FAUDIO_LIBS)
+EXTRAINCL = $(FAUDIO_CFLAGS)
+
+C_SRCS = \
+	xact_dll.c
+
+IDL_SRCS = xact_classes.idl
--- a/dlls/xactengine3_6/xactengine3_6.spec
+++ b/dlls/xactengine3_6/xactengine3_6.spec
+@ stdcall -private DllCanUnloadNow()
+@ stdcall -private DllGetClassObject(ptr ptr ptr)
+@ stdcall -private DllRegisterServer()
+@ stdcall -private DllUnregisterServer()
--- a/dlls/xactengine3_7/xact_classes.idl
+++ b/dlls/xactengine3_7/xact_classes.idl
@@ -20,9 +20,18 @@

 #pragma makedep register

+#if XACT3_VER == 0x0306
 [
-    helpstring("XACT3 Class"),
+    helpstring("XACT3.6 Class"),
+    threading(both),
+    uuid(248d8a3b-6256-44d3-a018-2ac96c459f47)
+]
+coclass XACTEngine36 { interface IXACT37Engine; }
+#else /* XACT3_VER == 0x0307 or not defined */
+[
+    helpstring("XACT3.7 Class"),
    threading(both),
    uuid(bcc782bc-6492-4c22-8c35-f5d72fe73c6e)
 ]
 coclass XACTEngine37 { interface IXACT37Engine; }
+#endif