From b829697078f057b71042dcf5e0b2fb2d7c1ea2a6 Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Tue, 12 Sep 2023 07:54:37 +1000 Subject: [PATCH] Rebase against 1b987bfde68b75da3b718ba065826b01b5d6736e. --- ...lement-IDirectMusicSegment8-Download.patch | 18 ++++++++--------- ...nd-in-IDirectMusicPerformance8-PlayS.patch | 20 +++++++++---------- staging/upstream-commit | 2 +- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/patches/dmime-load-wave/0002-dmime-Implement-IDirectMusicSegment8-Download.patch b/patches/dmime-load-wave/0002-dmime-Implement-IDirectMusicSegment8-Download.patch index 5b604c97..1fd58926 100644 --- a/patches/dmime-load-wave/0002-dmime-Implement-IDirectMusicSegment8-Download.patch +++ b/patches/dmime-load-wave/0002-dmime-Implement-IDirectMusicSegment8-Download.patch @@ -1,4 +1,4 @@ -From 9eccf33cb881c2e847a22a72f1c8d8b10886d531 Mon Sep 17 00:00:00 2001 +From 87bf08071997f446498bdea2d18d1bb539a1990e Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Fri, 2 Dec 2022 14:41:30 +1100 Subject: [PATCH] dmime: Implement IDirectMusicSegment8 Download @@ -10,7 +10,7 @@ Subject: [PATCH] dmime: Implement IDirectMusicSegment8 Download 3 files changed, 93 insertions(+), 3 deletions(-) diff --git a/dlls/dmime/dmime_private.h b/dlls/dmime/dmime_private.h -index 7cdc1534866..39f6cdce790 100644 +index 6102fd5ec2f..da40b58ad9b 100644 --- a/dlls/dmime/dmime_private.h +++ b/dlls/dmime/dmime_private.h @@ -71,6 +71,8 @@ extern void set_audiopath_perf_pointer(IDirectMusicAudioPath*,IDirectMusicPerfor @@ -23,25 +23,25 @@ index 7cdc1534866..39f6cdce790 100644 * Auxiliary definitions */ diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c -index d69a27540d6..5578c3e523b 100644 +index 1f8de0837d5..622939f3553 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c -@@ -252,6 +252,13 @@ static inline IDirectMusicPerformance8Impl *impl_from_IDirectMusicPerformance8(I - return CONTAINING_RECORD(iface, IDirectMusicPerformance8Impl, IDirectMusicPerformance8_iface); +@@ -253,6 +253,13 @@ static inline struct performance *impl_from_IDirectMusicPerformance8(IDirectMusi + return CONTAINING_RECORD(iface, struct performance, IDirectMusicPerformance8_iface); } +IDirectSound *get_dsound_interface(IDirectMusicPerformance8* iface) +{ -+ IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface); ++ struct performance *This = impl_from_IDirectMusicPerformance8(iface); + return This->dsound; +} + + /* IDirectMusicPerformance8 IUnknown part: */ - static HRESULT WINAPI IDirectMusicPerformance8Impl_QueryInterface(IDirectMusicPerformance8 *iface, - REFIID riid, void **ppv) + static HRESULT WINAPI performance_QueryInterface(IDirectMusicPerformance8 *iface, REFIID riid, void **ret_iface) + { diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c -index 6bf9f3abf0c..0ea0c15c5e0 100644 +index 39a5333fbbb..ce49ddc9940 100644 --- a/dlls/dmime/segment.c +++ b/dlls/dmime/segment.c @@ -37,6 +37,7 @@ typedef struct IDirectMusicSegment8Impl { diff --git a/patches/dmime-load-wave/0003-dmime-Play-a-sound-in-IDirectMusicPerformance8-PlayS.patch b/patches/dmime-load-wave/0003-dmime-Play-a-sound-in-IDirectMusicPerformance8-PlayS.patch index ea1bc1a5..4a6a9cd4 100644 --- a/patches/dmime-load-wave/0003-dmime-Play-a-sound-in-IDirectMusicPerformance8-PlayS.patch +++ b/patches/dmime-load-wave/0003-dmime-Play-a-sound-in-IDirectMusicPerformance8-PlayS.patch @@ -1,4 +1,4 @@ -From 8f92585ece53fbcd940fe028dd7ee24d6b854ec3 Mon Sep 17 00:00:00 2001 +From 43007318a6303312b6226c9ede009e4299826af3 Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Mon, 12 Dec 2022 15:20:10 +1100 Subject: [PATCH] dmime: Play a sound in IDirectMusicPerformance8 PlaySegmentEx @@ -10,7 +10,7 @@ Subject: [PATCH] dmime: Play a sound in IDirectMusicPerformance8 PlaySegmentEx 3 files changed, 26 insertions(+), 6 deletions(-) diff --git a/dlls/dmime/dmime_private.h b/dlls/dmime/dmime_private.h -index 39f6cdce790..6cd45697e2f 100644 +index da40b58ad9b..4532528f535 100644 --- a/dlls/dmime/dmime_private.h +++ b/dlls/dmime/dmime_private.h @@ -72,6 +72,7 @@ extern void set_audiopath_dsound_buffer(IDirectMusicAudioPath*,IDirectSoundBuffe @@ -22,15 +22,15 @@ index 39f6cdce790..6cd45697e2f 100644 /***************************************************************************** * Auxiliary definitions diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c -index 5578c3e523b..03e59e95af3 100644 +index 622939f3553..c7b149f0686 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c -@@ -1043,13 +1043,26 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_PlaySegmentEx(IDirectMusicPer - __int64 i64StartTime, IDirectMusicSegmentState **ppSegmentState, IUnknown *pFrom, - IUnknown *pAudioPath) +@@ -1028,13 +1028,26 @@ static HRESULT WINAPI performance_PlaySegmentEx(IDirectMusicPerformance8 *iface, + WCHAR *pwzSegmentName, IUnknown *pTransition, DWORD dwFlags, __int64 i64StartTime, + IDirectMusicSegmentState **ppSegmentState, IUnknown *pFrom, IUnknown *pAudioPath) { -- IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface); -+ IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface); +- struct performance *This = impl_from_IDirectMusicPerformance8(iface); ++ struct performance *This = impl_from_IDirectMusicPerformance8(iface); + IDirectMusicSegment8 *segment; + IDirectSoundBuffer *buffer; + HRESULT hr; @@ -57,9 +57,9 @@ index 5578c3e523b..03e59e95af3 100644 + return S_OK; } - static HRESULT WINAPI IDirectMusicPerformance8Impl_StopEx(IDirectMusicPerformance8 *iface, + static HRESULT WINAPI performance_StopEx(IDirectMusicPerformance8 *iface, IUnknown *pObjectToStop, diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c -index 0ea0c15c5e0..b21f93bbfc6 100644 +index ce49ddc9940..ad121736acd 100644 --- a/dlls/dmime/segment.c +++ b/dlls/dmime/segment.c @@ -47,6 +47,12 @@ static inline IDirectMusicSegment8Impl *impl_from_IDirectMusicSegment8(IDirectMu diff --git a/staging/upstream-commit b/staging/upstream-commit index c8b8bf16..55a2b9d7 100644 --- a/staging/upstream-commit +++ b/staging/upstream-commit @@ -1 +1 @@ -126363ea5f9056449e8bd22cc69b51bd2d7dd9aa +1b987bfde68b75da3b718ba065826b01b5d6736e