From b97718a0a9d5777b0588500e2378041063d56161 Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Fri, 30 Jun 2023 07:59:45 +1000 Subject: [PATCH] Rebase against 3d28f9d362e6d9871747231b210c559536bb6dd4. --- ...lement-IDirectMusicSegment8-Download.patch | 12 ++++++------ ...nd-in-IDirectMusicPerformance8-PlayS.patch | 19 +++++++++---------- staging/upstream-commit | 2 +- 3 files changed, 16 insertions(+), 17 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 209c1daf..5b604c97 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 f58dbcdfedf4d5d78d586d54f507c647e58379c8 Mon Sep 17 00:00:00 2001 +From 9eccf33cb881c2e847a22a72f1c8d8b10886d531 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,14 +10,14 @@ 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 4159abffa99..030aab50094 100644 +index 7cdc1534866..39f6cdce790 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 - extern void set_audiopath_dsound_buffer(IDirectMusicAudioPath*,IDirectSoundBuffer*) DECLSPEC_HIDDEN; - extern void set_audiopath_primary_dsound_buffer(IDirectMusicAudioPath*,IDirectSoundBuffer*) DECLSPEC_HIDDEN; + extern void set_audiopath_dsound_buffer(IDirectMusicAudioPath*,IDirectSoundBuffer*); + extern void set_audiopath_primary_dsound_buffer(IDirectMusicAudioPath*,IDirectSoundBuffer*); -+extern IDirectSound *get_dsound_interface(IDirectMusicPerformance8*) DECLSPEC_HIDDEN; ++extern IDirectSound *get_dsound_interface(IDirectMusicPerformance8*); + /***************************************************************************** * Auxiliary definitions @@ -153,5 +153,5 @@ index 6bf9f3abf0c..0ea0c15c5e0 100644 static HRESULT WINAPI IDirectMusicSegment8Impl_Unload(IDirectMusicSegment8 *iface, -- -2.39.1 +2.40.1 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 412ca481..ea1bc1a5 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,8 +1,7 @@ -From 8ef2197cd4c77bf562ab5b83f2a137ae565bc22d Mon Sep 17 00:00:00 2001 +From 8f92585ece53fbcd940fe028dd7ee24d6b854ec3 Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Mon, 12 Dec 2022 15:20:10 +1100 -Subject: [PATCH 3/3] dmime: Play a sound in IDirectMusicPerformance8 - PlaySegmentEx +Subject: [PATCH] dmime: Play a sound in IDirectMusicPerformance8 PlaySegmentEx --- dlls/dmime/dmime_private.h | 1 + @@ -11,14 +10,14 @@ Subject: [PATCH 3/3] dmime: Play a sound in IDirectMusicPerformance8 3 files changed, 26 insertions(+), 6 deletions(-) diff --git a/dlls/dmime/dmime_private.h b/dlls/dmime/dmime_private.h -index 030aab50094..d09aba02a5c 100644 +index 39f6cdce790..6cd45697e2f 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 - extern void set_audiopath_primary_dsound_buffer(IDirectMusicAudioPath*,IDirectSoundBuffer*) DECLSPEC_HIDDEN; + extern void set_audiopath_primary_dsound_buffer(IDirectMusicAudioPath*,IDirectSoundBuffer*); - extern IDirectSound *get_dsound_interface(IDirectMusicPerformance8*) DECLSPEC_HIDDEN; -+extern IDirectSoundBuffer *get_segment_buffer(IDirectMusicSegment8 *iface) DECLSPEC_HIDDEN; + extern IDirectSound *get_dsound_interface(IDirectMusicPerformance8*); ++extern IDirectSoundBuffer *get_segment_buffer(IDirectMusicSegment8 *iface); /***************************************************************************** * Auxiliary definitions @@ -60,10 +59,10 @@ index 5578c3e523b..03e59e95af3 100644 static HRESULT WINAPI IDirectMusicPerformance8Impl_StopEx(IDirectMusicPerformance8 *iface, diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c -index dbf2f8203d8..9213fbf4a4c 100644 +index 0ea0c15c5e0..b21f93bbfc6 100644 --- a/dlls/dmime/segment.c +++ b/dlls/dmime/segment.c -@@ -45,6 +45,12 @@ static inline IDirectMusicSegment8Impl *impl_from_IDirectMusicSegment8(IDirectMu +@@ -47,6 +47,12 @@ static inline IDirectMusicSegment8Impl *impl_from_IDirectMusicSegment8(IDirectMu return CONTAINING_RECORD(iface, IDirectMusicSegment8Impl, IDirectMusicSegment8_iface); } @@ -77,5 +76,5 @@ index dbf2f8203d8..9213fbf4a4c 100644 REFIID riid, void **ret_iface) { -- -2.38.1 +2.40.1 diff --git a/staging/upstream-commit b/staging/upstream-commit index 6f35271f..4ba66ac0 100644 --- a/staging/upstream-commit +++ b/staging/upstream-commit @@ -1 +1 @@ -fca833678f3b2588cc539d04693e7f9d8bca3278 +3d28f9d362e6d9871747231b210c559536bb6dd4