From a87a889dca024f1af6a1c547587e23f600e3f643 Mon Sep 17 00:00:00 2001
From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
Date: Thu, 6 Aug 2020 16:09:34 +1000
Subject: [PATCH] xactengine3_1: 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_1/Makefile.in        | 11 +++++++++++
 dlls/xactengine3_1/xactengine3_1.spec |  4 ++++
 dlls/xactengine3_7/xact_classes.idl   |  9 ++++++++-
 5 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 dlls/xactengine3_1/Makefile.in
 create mode 100644 dlls/xactengine3_1/xactengine3_1.spec

diff --git a/configure b/configure
index 494ba36e68b..5c88de3e11f 100755
--- a/configure
+++ b/configure
@@ -1707,6 +1707,7 @@ enable_x3daudio1_4
 enable_x3daudio1_5
 enable_x3daudio1_6
 enable_x3daudio1_7
+enable_xactengine3_1
 enable_xactengine3_2
 enable_xactengine3_3
 enable_xactengine3_4
@@ -16638,6 +16639,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_1=${enable_xactengine3_1:-no}
     enable_xactengine3_2=${enable_xactengine3_2:-no}
     enable_xactengine3_3=${enable_xactengine3_3:-no}
     enable_xactengine3_4=${enable_xactengine3_4:-no}
@@ -21373,6 +21375,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_1 enable_xactengine3_1
 wine_fn_config_makefile dlls/xactengine3_2 enable_xactengine3_2
 wine_fn_config_makefile dlls/xactengine3_3 enable_xactengine3_3
 wine_fn_config_makefile dlls/xactengine3_4 enable_xactengine3_4
diff --git a/configure.ac b/configure.ac
index 32a6d3c71f7..bd8b6b2d5ac 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_1=${enable_xactengine3_1:-no}
     enable_xactengine3_2=${enable_xactengine3_2:-no}
     enable_xactengine3_3=${enable_xactengine3_3:-no}
     enable_xactengine3_4=${enable_xactengine3_4:-no}
@@ -3910,6 +3911,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_1)
 WINE_CONFIG_MAKEFILE(dlls/xactengine3_2)
 WINE_CONFIG_MAKEFILE(dlls/xactengine3_3)
 WINE_CONFIG_MAKEFILE(dlls/xactengine3_4)
diff --git a/dlls/xactengine3_1/Makefile.in b/dlls/xactengine3_1/Makefile.in
new file mode 100644
index 00000000000..f95ea04624c
--- /dev/null
+++ b/dlls/xactengine3_1/Makefile.in
@@ -0,0 +1,11 @@
+MODULE    = xactengine3_1.dll
+IMPORTS   = ole32 uuid
+EXTRADEFS = -DXACT3_VER=0x0301
+PARENTSRC = ../xactengine3_7
+EXTRALIBS = $(FAUDIO_LIBS)
+EXTRAINCL = $(FAUDIO_CFLAGS)
+
+C_SRCS = \
+	xact_dll.c
+
+IDL_SRCS = xact_classes.idl
diff --git a/dlls/xactengine3_1/xactengine3_1.spec b/dlls/xactengine3_1/xactengine3_1.spec
new file mode 100644
index 00000000000..b16365d0c9f
--- /dev/null
+++ b/dlls/xactengine3_1/xactengine3_1.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 aa8aede3657..aeac5d4cd37 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 == 0x0302
+#if XACT3_VER == 0x0301
+[
+    helpstring("XACT3.1 Class"),
+    threading(both),
+    uuid(962f5027-99be-4692-a468-85802cf8de61)
+]
+coclass XACTEngine31 { interface IXACT32Engine; }
+#elif XACT3_VER == 0x0302
 [
     helpstring("XACT3.2 Class"),
     threading(both),