From f90534f9daa7283ac546b26c02f76618c8e87801 Mon Sep 17 00:00:00 2001
From: Zebediah Figura <z.figura12@gmail.com>
Date: Thu, 24 Sep 2020 21:16:37 -0500
Subject: [PATCH] xactengine-initial: Rebase and re-enable.

---
 patches/patchinstall.sh                       | 22 +++++++++++
 ...ys-return-S_OK-in-IXACT34Cue-Destroy.patch | 38 -------------------
 patches/xactengine-initial/definition         |  1 -
 3 files changed, 22 insertions(+), 39 deletions(-)
 delete mode 100644 patches/xactengine-initial/0006-xaudio2_7-Always-return-S_OK-in-IXACT34Cue-Destroy.patch

diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh
index 62f3a7e5..00b43520 100755
--- a/patches/patchinstall.sh
+++ b/patches/patchinstall.sh
@@ -329,6 +329,7 @@ patch_enable_all ()
 	enable_ws2_32_getaddrinfo="$1"
 	enable_ws2_32_getsockopt="$1"
 	enable_wtsapi32_EnumerateProcesses="$1"
+	enable_xactengine_initial="$1"
 	enable_xactengine2_dll="$1"
 	enable_xactengine3_7_PrepareWave="$1"
 }
@@ -1078,6 +1079,9 @@ patch_enable ()
 		wtsapi32-EnumerateProcesses)
 			enable_wtsapi32_EnumerateProcesses="$2"
 			;;
+		xactengine-initial)
+			enable_xactengine_initial="$2"
+			;;
 		xactengine2-dll)
 			enable_xactengine2_dll="$2"
 			;;
@@ -5031,6 +5035,24 @@ if test "$enable_wtsapi32_EnumerateProcesses" -eq 1; then
 	patch_apply wtsapi32-EnumerateProcesses/0001-wtsapi32-Partial-implementation-of-WTSEnumerateProce.patch
 fi
 
+# Patchset xactengine-initial
+# |
+# | This patchset fixes the following Wine bugs:
+# |   *	[#31476] Support Bully Scholarship Edition xactengine3_1.dll.
+# |   *	[#38615] DSA: Drakensang Demo fails on IXACTEngine::Initialize
+# |   *	[#41030] Pac-Man Museum requires xactengine3_7
+# |   *	[#41045] Captain Morgane requires xactengine3_4
+# |   *	[#48684] BlazBlue: Calamity Trigger requires for xactengine 3.3 interface.
+# |
+# | Modified files:
+# |   *	dlls/x3daudio1_7/Makefile.in, dlls/xaudio2_7/tests/Makefile.in, dlls/xaudio2_7/tests/globals.xgs,
+# | 	dlls/xaudio2_7/tests/rsrc.rc, dlls/xaudio2_7/tests/xact.c, dlls/xaudio2_7/tests/xaudio2.c
+# |
+if test "$enable_xactengine_initial" -eq 1; then
+	patch_apply xactengine-initial/0011-xaudio2_7-Initial-IXACT3Engine-tests.patch
+	patch_apply xactengine-initial/0016-xaudio2_7-tests-Add-more-tests.patch
+fi
+
 # Patchset xactengine2-dll
 # |
 # | This patchset fixes the following Wine bugs:
diff --git a/patches/xactengine-initial/0006-xaudio2_7-Always-return-S_OK-in-IXACT34Cue-Destroy.patch b/patches/xactengine-initial/0006-xaudio2_7-Always-return-S_OK-in-IXACT34Cue-Destroy.patch
deleted file mode 100644
index 4b0bf60e..00000000
--- a/patches/xactengine-initial/0006-xaudio2_7-Always-return-S_OK-in-IXACT34Cue-Destroy.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 4963145cb0fd3713de75ac0f0913953980cd7519 Mon Sep 17 00:00:00 2001
-From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
-Date: Wed, 8 Jan 2020 12:34:53 +1100
-Subject: [PATCH] xaudio2_7: Always return S_OK in IXACT34Cue Destroy
-
----
- dlls/xaudio2_7/xact_dll.c | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/dlls/xaudio2_7/xact_dll.c b/dlls/xaudio2_7/xact_dll.c
-index b2cfcfb4068..4900e51802e 100644
---- a/dlls/xaudio2_7/xact_dll.c
-+++ b/dlls/xaudio2_7/xact_dll.c
-@@ -170,6 +170,7 @@ static HRESULT WINAPI IXACT3CueImpl_GetState(IXACT3Cue *iface, DWORD *pdwState)
- static HRESULT WINAPI IXACT3CueImpl_Destroy(IXACT3Cue *iface)
- {
-     XACT3CueImpl *This = impl_from_IXACT3Cue(iface);
-+#if XACT3_VER > 0x0304
-     HRESULT hr;
- 
-     TRACE("(%p)\n", iface);
-@@ -177,6 +178,13 @@ static HRESULT WINAPI IXACT3CueImpl_Destroy(IXACT3Cue *iface)
-     hr = FACTCue_Destroy(This->fact_cue);
-     HeapFree(GetProcessHeap(), 0, This);
-     return hr;
-+#else
-+    TRACE("(%p)\n", iface);
-+
-+    FACTCue_Destroy(This->fact_cue);
-+    HeapFree(GetProcessHeap(), 0, This);
-+    return S_OK;
-+#endif
- }
- 
- static HRESULT WINAPI IXACT3CueImpl_SetMatrixCoefficients(IXACT3Cue *iface,
--- 
-2.27.0
-
diff --git a/patches/xactengine-initial/definition b/patches/xactengine-initial/definition
index d2893d79..2764d366 100644
--- a/patches/xactengine-initial/definition
+++ b/patches/xactengine-initial/definition
@@ -3,4 +3,3 @@ Fixes: [38615] DSA: Drakensang Demo fails on IXACTEngine::Initialize
 Fixes: [41030] Pac-Man Museum requires xactengine3_7
 Fixes: [41045] Captain Morgane requires xactengine3_4
 Fixes: [48684] BlazBlue: Calamity Trigger requires for xactengine 3.3 interface.
-Disabled: True