wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-09-12 18:50:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against adda27cdb82fd40ef71e554b8ba17244cb871710.

Browse Source
This commit is contained in:
Alistair Leslie-Hughes
2022-02-03 11:11:23 +11:00
parent ecf05ee19e
commit 136d5e3400
5 changed files with 31 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
patches/xactengine3_7-PrepareWave/0002-xactengine3_7-Implement-IXACT3Engine-PrepareStreamin.patch
View File

@@ -1,18 +1,17 @@
From ff3d57ac0bc2f08ab955c3ae734cb488566246c8 Mon Sep 17 00:00:00 2001
From f4ade3b6ec20410e3ee49ea195c5e219669b2077 Mon Sep 17 00:00:00 2001
From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
Date: Sat, 15 Aug 2020 17:36:23 +1000
Subject: [PATCH 2/3] xactengine3_7: Implement IXACT3Engine
PrepareStreamingWave
Subject: [PATCH] xactengine3_7: Implement IXACT3Engine PrepareStreamingWave
---
dlls/xactengine3_7/xact_dll.c | 55 +++++++++++++++++++++++++++++++++--
1 file changed, 53 insertions(+), 2 deletions(-)
diff --git a/dlls/xactengine3_7/xact_dll.c b/dlls/xactengine3_7/xact_dll.c
index 5bcd8a6202c..99e4bd19049 100644
index 98c3cf8f076..ef70516361a 100644
--- a/dlls/xactengine3_7/xact_dll.c
+++ b/dlls/xactengine3_7/xact_dll.c
@@ -976,8 +976,59 @@ static HRESULT WINAPI IXACT3EngineImpl_PrepareStreamingWave(IXACT3Engine *iface,
@@ -1068,8 +1068,59 @@ static HRESULT WINAPI IXACT3EngineImpl_PrepareStreamingWave(IXACT3Engine *iface,
IXACT3Wave **ppWave)
{
XACT3EngineImpl *This = impl_from_IXACT3Engine(iface);
@@ -25,7 +24,7 @@ index 5bcd8a6202c..99e4bd19049 100644
+ FACTWaveBankEntry fact_wavebank;
+ UINT ret;
+
+ TRACE("(%p)->(0x%08x, %p, %p, %d, %p, %d, %d, %p)\n", This, dwFlags, &entry, &streamingParams,
+ TRACE("(%p)->(0x%08lx, %p, %p, %ld, %p, %ld, %d, %p)\n", This, dwFlags, &entry, &streamingParams,
+ dwAlignment, pdwSeekTable, dwPlayOffset, nLoopCount, ppWave);
+
+ fake = (wrap_readfile_struct*) CoTaskMemAlloc(
@@ -48,7 +47,7 @@ index 5bcd8a6202c..99e4bd19049 100644
+ * passing through NULL to ensure it's not used.
+ */
+ ret = FACTAudioEngine_PrepareStreamingWave(This->fact_engine, dwFlags, fact_wavebank, fakeParms,
+ dwAlignment, pdwSeekTable, NULL, dwPlayOffset, nLoopCount, &fwave);
+ dwAlignment, (uint32_t *)pdwSeekTable, NULL, dwPlayOffset, nLoopCount, &fwave);
+
+ if(ret != 0 || !fwave)
+ {
@@ -75,5 +74,5 @@ index 5bcd8a6202c..99e4bd19049 100644
static HRESULT WINAPI IXACT3EngineImpl_PrepareWave(IXACT3Engine *iface,
--
2.28.0
2.34.1

16
patches/xactengine3_7-PrepareWave/0003-xactengine3_7-Implement-IXACT3Engine-PrepareInMemory.patch
View File

@@ -1,17 +1,17 @@
From 8387b1a1a4a07b66246015e3791518cbe1a69244 Mon Sep 17 00:00:00 2001
From 38a38afe8996c020f6cdab5f96c06beed0a5b1ae Mon Sep 17 00:00:00 2001
From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
Date: Mon, 15 Aug 2020 17:49:23 +1000
Subject: [PATCH 3/3] xactengine3_7: Implement IXACT3Engine PrepareInMemoryWave
Date: Sat, 15 Aug 2020 17:49:23 +1000
Subject: [PATCH] xactengine3_7: Implement IXACT3Engine PrepareInMemoryWave
---
dlls/xactengine3_7/xact_dll.c | 40 +++++++++++++++++++++++++++++++++--
1 file changed, 38 insertions(+), 2 deletions(-)
diff --git a/dlls/xactengine3_7/xact_dll.c b/dlls/xactengine3_7/xact_dll.c
index 99e4bd19049..e6c3863b9ee 100644
index ef70516361a..e712f6e40fd 100644
--- a/dlls/xactengine3_7/xact_dll.c
+++ b/dlls/xactengine3_7/xact_dll.c
@@ -965,8 +965,44 @@ static HRESULT WINAPI IXACT3EngineImpl_PrepareInMemoryWave(IXACT3Engine *iface,
@@ -1057,8 +1057,44 @@ static HRESULT WINAPI IXACT3EngineImpl_PrepareInMemoryWave(IXACT3Engine *iface,
IXACT3Wave **ppWave)
{
XACT3EngineImpl *This = impl_from_IXACT3Engine(iface);
@@ -22,7 +22,7 @@ index 99e4bd19049..e6c3863b9ee 100644
+ FACTWaveBankEntry fact_wavebank;
+ UINT ret;
+
+ TRACE("(%p)->(0x%08x, %p, %p, %p, %d, %d, %p)\n", This, dwFlags, &entry, pdwSeekTable,
+ TRACE("(%p)->(0x%08lx, %p, %p, %p, %ld, %d, %p)\n", This, dwFlags, &entry, pdwSeekTable,
+ pbWaveData, dwPlayOffset, nLoopCount, ppWave);
+
+ fact_wavebank.dwFlagsAndDuration = entry.dwFlagsAndDuration;
@@ -33,7 +33,7 @@ index 99e4bd19049..e6c3863b9ee 100644
+ fact_wavebank.LoopRegion.dwTotalSamples = entry.LoopRegion.dwTotalSamples;
+
+ ret = FACTAudioEngine_PrepareInMemoryWave(This->fact_engine, dwFlags, fact_wavebank,
+ pdwSeekTable, pbWaveData, dwPlayOffset, nLoopCount, &fwave);
+ (uint32_t *)pdwSeekTable, pbWaveData, dwPlayOffset, nLoopCount, &fwave);
+ if(ret != 0 || !fwave)
+ {
+ ERR("Failed to CreateWave: %d (%p)\n", ret, fwave);
@@ -59,5 +59,5 @@ index 99e4bd19049..e6c3863b9ee 100644
static HRESULT WINAPI IXACT3EngineImpl_PrepareStreamingWave(IXACT3Engine *iface,
--
2.28.0
2.34.1