Alistair Leslie-Hughes : xactengine3_6: New DLL.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 7362ebcaafc65658d155699b1f4c9c336ef6b8ea
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=7362ebcaafc65658d155699b1f4c9c336ef6b8ea

Author: Alistair Leslie-Hughes <leslie_alistair at hotmail.com>
Date:   Thu Aug  6 16:09:29 2020 +1000

xactengine3_6: New DLL.

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

---

 configure                             |  3 +++
 configure.ac                          |  2 ++
 dlls/xactengine3_6/Makefile.in        | 11 +++++++++++
 dlls/xactengine3_6/xactengine3_6.spec |  4 ++++
 dlls/xactengine3_7/xact_classes.idl   | 11 ++++++++++-
 5 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/configure b/configure
index 13c2078221..fd67234faa 100755
--- 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
diff --git a/configure.ac b/configure.ac
index d54857181e..9c481d2b0a 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_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)
diff --git a/dlls/xactengine3_6/Makefile.in b/dlls/xactengine3_6/Makefile.in
new file mode 100644
index 0000000000..fad71a2fd5
--- /dev/null
+++ b/dlls/xactengine3_6/Makefile.in
@@ -0,0 +1,11 @@
+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
diff --git a/dlls/xactengine3_6/xactengine3_6.spec b/dlls/xactengine3_6/xactengine3_6.spec
new file mode 100644
index 0000000000..b16365d0c9
--- /dev/null
+++ b/dlls/xactengine3_6/xactengine3_6.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 24c792e2f0..a6abeb773c 100644
--- 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