October 2023 - Wine-Commits

Rémi Bernon : dmsynth: Play some MIDI events in IDirectMusicSynth_Render.
by Alexandre Julliard Oct. 11, 2023

Oct. 11, 2023

Module: wine Branch: master Commit: 07aa6b5dcbfc29d95c3ba0f37249c9432f216c26 URL: https://gitlab.winehq.org/wine/wine/-/commit/07aa6b5dcbfc29d95c3ba0f37249c9… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Sep 4 11:40:15 2023 +0200 dmsynth: Play some MIDI events in IDirectMusicSynth_Render. --- dlls/dmsynth/synth.c | 45 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 44 insertions(+), 1 deletion(-) diff --git a/dlls/dmsynth/synth.c b/dlls/dmsynth/synth.c index e6a6944bbc6..f1719944e51 100644 --- a/dlls/dmsynth/synth.c +++ b/dlls/dmsynth/synth.c @@ -979,9 +979,52 @@ static HRESULT WINAPI synth_Render(IDirectMusicSynth8 *iface, short *buffer, DWORD length, LONGLONG position) { struct synth *This = impl_from_IDirectMusicSynth8(iface); + struct event *event, *next; - FIXME("(%p, %p, %ld, 0x%s): stub\n", This, buffer, length, wine_dbgstr_longlong(position)); + TRACE("(%p, %p, %ld, %I64d)\n", This, buffer, length, position); + EnterCriticalSection(&This->cs); + LIST_FOR_EACH_ENTRY_SAFE(event, next, &This->events, struct event, entry) + { + BYTE status = event->midi[0] & 0xf0, chan = event->midi[0] & 0x0f; + LONGLONG offset = event->position - position; + + if (offset >= length) break; + if (offset > 0) + { + fluid_synth_write_s16(This->fluid_synth, offset, buffer, 0, 2, buffer, 1, 2); + buffer += offset * 2; + position += offset; + length -= offset; + } + + TRACE("status %#x chan %#x midi %#x %#x\n", status, chan, event->midi[1], event->midi[2]); + + switch (status) + { + case 0x80: + fluid_synth_noteoff(This->fluid_synth, chan, event->midi[1]); + break; + case 0x90: + fluid_synth_noteon(This->fluid_synth, chan, event->midi[1], event->midi[2]); + break; + case 0xb0: + fluid_synth_cc(This->fluid_synth, chan, event->midi[1], event->midi[2]); + break; + case 0xc0: + fluid_synth_program_change(This->fluid_synth, chan, event->midi[1]); + break; + default: + FIXME("MIDI event not implemented: %#x %#x %#x\n", event->midi[0], event->midi[1], event->midi[2]); + break; + } + + list_remove(&event->entry); + free(event); + } + LeaveCriticalSection(&This->cs); + + if (length) fluid_synth_write_s16(This->fluid_synth, length, buffer, 0, 2, buffer, 1, 2); return S_OK; }

1 0

Rémi Bernon : dmsynth: Fix synth download of articulations list.
by Alexandre Julliard Oct. 11, 2023

Oct. 11, 2023

Module: wine Branch: master Commit: a1e8352f54153a76b6e2759b58f2f3a15d1b9ca1 URL: https://gitlab.winehq.org/wine/wine/-/commit/a1e8352f54153a76b6e2759b58f2f3… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Sep 23 13:47:39 2023 +0200 dmsynth: Fix synth download of articulations list. --- dlls/dmsynth/synth.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dmsynth/synth.c b/dlls/dmsynth/synth.c index 945889efb6f..b208a0a0736 100644 --- a/dlls/dmsynth/synth.c +++ b/dlls/dmsynth/synth.c @@ -442,7 +442,7 @@ static HRESULT synth_download_articulation2(struct synth *This, ULONG *offsets, { articulation_info = (DMUS_ARTICULATION2 *)(data + offsets[index]); list = (CONNECTIONLIST *)(data + offsets[articulation_info->ulArtIdx]); - connections = (CONNECTION *)list + 1; + connections = (CONNECTION *)(list + 1); if (TRACE_ON(dmsynth)) dump_connectionlist(list); if (articulation_info->ulFirstExtCkIdx) FIXME("Articulation extensions not implemented\n");

1 0

Rémi Bernon : dmsynth: Parse MIDI events in IDirectMusicSynth_PlayBuffer.
by Alexandre Julliard Oct. 11, 2023

Oct. 11, 2023

Module: wine Branch: master Commit: d3b5c6bb29e17ab638842be096a6c7b5be93a938 URL: https://gitlab.winehq.org/wine/wine/-/commit/d3b5c6bb29e17ab638842be096a6c7… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Sep 4 11:40:15 2023 +0200 dmsynth: Parse MIDI events in IDirectMusicSynth_PlayBuffer. --- dlls/dmsynth/synth.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 54 insertions(+), 2 deletions(-) diff --git a/dlls/dmsynth/synth.c b/dlls/dmsynth/synth.c index ad5e2e75c09..e6a6944bbc6 100644 --- a/dlls/dmsynth/synth.c +++ b/dlls/dmsynth/synth.c @@ -31,6 +31,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmsynth); +#define ROUND_ADDR(addr, mask) ((void *)((UINT_PTR)(addr) & ~(UINT_PTR)(mask))) + #define CONN_SRC_CC2 0x0082 #define CONN_SRC_RPN0 0x0100 @@ -291,6 +293,13 @@ static void instrument_release(struct instrument *instrument) } } +struct event +{ + struct list entry; + LONGLONG position; + BYTE midi[3]; +}; + struct synth { IDirectMusicSynth8 IDirectMusicSynth8_iface; @@ -306,6 +315,7 @@ struct synth CRITICAL_SECTION cs; struct list instruments; struct list waves; + struct list events; fluid_settings_t *fluid_settings; fluid_sfont_t *fluid_sfont; @@ -366,6 +376,7 @@ static ULONG WINAPI synth_Release(IDirectMusicSynth8 *iface) if (!ref) { struct instrument *instrument; + struct event *event; struct wave *wave; void *next; @@ -381,6 +392,12 @@ static ULONG WINAPI synth_Release(IDirectMusicSynth8 *iface) wave_release(wave); } + LIST_FOR_EACH_ENTRY_SAFE(event, next, &This->events, struct event, entry) + { + list_remove(&event->entry); + free(event); + } + fluid_sfont_set_data(This->fluid_sfont, NULL); delete_fluid_sfont(This->fluid_sfont); This->fluid_sfont = NULL; @@ -815,11 +832,45 @@ static HRESULT WINAPI synth_Unload(IDirectMusicSynth8 *iface, HANDLE handle, } static HRESULT WINAPI synth_PlayBuffer(IDirectMusicSynth8 *iface, - REFERENCE_TIME rt, BYTE *buffer, DWORD size) + REFERENCE_TIME time, BYTE *buffer, DWORD size) { struct synth *This = impl_from_IDirectMusicSynth8(iface); + DMUS_EVENTHEADER *head = (DMUS_EVENTHEADER *)buffer; + BYTE *end = buffer + size, *data; + HRESULT hr; + + TRACE("(%p, %I64d, %p, %lu)\n", This, time, buffer, size); + + while ((data = (BYTE *)(head + 1)) < end) + { + DMUS_EVENTHEADER *next = ROUND_ADDR(data + head->cbEvent + 7, 7); + struct event *event, *next_event; + LONGLONG position; + + if ((BYTE *)next > end) return E_INVALIDARG; + if (FAILED(hr = IDirectMusicSynthSink_RefTimeToSample(This->sink, + time + head->rtDelta, &position))) + return hr; + + if (!(head->dwFlags & DMUS_EVENT_STRUCTURED)) + FIXME("Unstructured events not implemeted\n"); + else if (head->cbEvent > 3) + FIXME("Unexpected MIDI event size %lu\n", head->cbEvent); + else + { + if (!(event = calloc(1, sizeof(*event)))) return E_OUTOFMEMORY; + memcpy(event->midi, data, head->cbEvent); + event->position = position; + + EnterCriticalSection(&This->cs); + LIST_FOR_EACH_ENTRY(next_event, &This->events, struct event, entry) + if (next_event->position >= event->position) break; + list_add_before(&next_event->entry, &event->entry); + LeaveCriticalSection(&This->cs); + } - FIXME("(%p, 0x%s, %p, %lu): stub\n", This, wine_dbgstr_longlong(rt), buffer, size); + head = next; + } return S_OK; } @@ -1244,6 +1295,7 @@ HRESULT synth_create(IUnknown **ret_iface) list_init(&obj->instruments); list_init(&obj->waves); + list_init(&obj->events); if (!(obj->fluid_settings = new_fluid_settings())) goto failed; if (!(obj->fluid_sfont = new_fluid_sfont(synth_sfont_get_name, synth_sfont_get_preset,

1 0

Rémi Bernon : server: Send WM_WINE_SETCURSOR with the thread input cursor handle.
by Alexandre Julliard Oct. 11, 2023

Oct. 11, 2023

Module: wine Branch: master Commit: 2581e0b3eab4638b8aa00be9e66543b7e39f3dc6 URL: https://gitlab.winehq.org/wine/wine/-/commit/2581e0b3eab4638b8aa00be9e66543… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Oct 10 18:11:43 2023 +0200 server: Send WM_WINE_SETCURSOR with the thread input cursor handle. Which may be different from the last desktop cursor handle. This makes the behavior better match the old winex11 behavior, which queried the current thread input cursor handle on every mouse move to sync it with X11, although it contradicts MSDN documentation which states that the cursor handle is global. This fixes the X11 cursor being visible in "Deus Ex: GOTY Edition". --- server/queue.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/server/queue.c b/server/queue.c index fcc946ff0cb..0558bd111f9 100644 --- a/server/queue.c +++ b/server/queue.c @@ -436,6 +436,15 @@ static int update_desktop_cursor_window( struct desktop *desktop, user_handle_t desktop->cursor.win = win; if (updated) { + struct thread *thread; + + if ((thread = get_window_thread( win ))) + { + struct thread_input *input = thread->queue->input; + if (input) handle = input->cursor_count < 0 ? 0 : input->cursor; + release_object( thread ); + } + /* when clipping send the message to the foreground window as well, as some driver have an artificial overlay window */ if (is_cursor_clipped( desktop )) queue_cursor_message( desktop, 0, WM_WINE_SETCURSOR, win, handle ); queue_cursor_message( desktop, win, WM_WINE_SETCURSOR, win, handle );

1 0

Rémi Bernon : dmime: Get rid of the IDirectMusicWaveTrack typedef.
by Alexandre Julliard Oct. 11, 2023

Oct. 11, 2023

Module: wine Branch: master Commit: 51c664b2275e93468d3e8c684f84c3939ac86fbc URL: https://gitlab.winehq.org/wine/wine/-/commit/51c664b2275e93468d3e8c684f84c3… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Sep 25 10:48:59 2023 +0200 dmime: Get rid of the IDirectMusicWaveTrack typedef. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=9027 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=34751 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45135 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48220 --- dlls/dmime/wavetrack.c | 105 ++++++++++++++++++++++++------------------------- 1 file changed, 52 insertions(+), 53 deletions(-)

1 0

Rémi Bernon : dmime: Include dmobject.h in dmime_private.h.
by Alexandre Julliard Oct. 11, 2023

Oct. 11, 2023

Module: wine Branch: master Commit: 6c1bf1f3a95fdf1398cc21eb163873d9e41108e3 URL: https://gitlab.winehq.org/wine/wine/-/commit/6c1bf1f3a95fdf1398cc21eb163873… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Oct 10 23:01:41 2023 +0200 dmime: Include dmobject.h in dmime_private.h. --- dlls/dmime/audiopath.c | 1 - dlls/dmime/dmime_main.c | 1 - dlls/dmime/dmime_private.h | 2 ++ dlls/dmime/graph.c | 1 - dlls/dmime/lyricstrack.c | 1 - dlls/dmime/markertrack.c | 1 - dlls/dmime/paramcontroltrack.c | 1 - dlls/dmime/performance.c | 1 - dlls/dmime/segment.c | 1 - dlls/dmime/segmentstate.c | 1 - dlls/dmime/segtriggertrack.c | 1 - dlls/dmime/seqtrack.c | 1 - dlls/dmime/sysextrack.c | 1 - dlls/dmime/tempotrack.c | 1 - dlls/dmime/timesigtrack.c | 1 - dlls/dmime/wavetrack.c | 1 - 16 files changed, 2 insertions(+), 15 deletions(-) diff --git a/dlls/dmime/audiopath.c b/dlls/dmime/audiopath.c index aef48a5d2db..3310624eb00 100644 --- a/dlls/dmime/audiopath.c +++ b/dlls/dmime/audiopath.c @@ -18,7 +18,6 @@ */ #include "dmime_private.h" -#include "dmobject.h" WINE_DEFAULT_DEBUG_CHANNEL(dmime); diff --git a/dlls/dmime/dmime_main.c b/dlls/dmime/dmime_main.c index c0aa4e31cfb..89e70bcd1bd 100644 --- a/dlls/dmime/dmime_main.c +++ b/dlls/dmime/dmime_main.c @@ -34,7 +34,6 @@ #include "dmusici.h" #include "dmime_private.h" -#include "dmobject.h" WINE_DEFAULT_DEBUG_CHANNEL(dmime); diff --git a/dlls/dmime/dmime_private.h b/dlls/dmime/dmime_private.h index e67797def30..94e0efbe771 100644 --- a/dlls/dmime/dmime_private.h +++ b/dlls/dmime/dmime_private.h @@ -42,6 +42,8 @@ #include "dmusics.h" #include "dmusicc.h" +#include "dmobject.h" + /***************************************************************************** * Interfaces */ diff --git a/dlls/dmime/graph.c b/dlls/dmime/graph.c index d8f6bb88701..e0aa94833ae 100644 --- a/dlls/dmime/graph.c +++ b/dlls/dmime/graph.c @@ -18,7 +18,6 @@ */ #include "dmime_private.h" -#include "dmobject.h" WINE_DEFAULT_DEBUG_CHANNEL(dmime); diff --git a/dlls/dmime/lyricstrack.c b/dlls/dmime/lyricstrack.c index a1b299e9a7c..f7da1132867 100644 --- a/dlls/dmime/lyricstrack.c +++ b/dlls/dmime/lyricstrack.c @@ -18,7 +18,6 @@ */ #include "dmime_private.h" -#include "dmobject.h" WINE_DEFAULT_DEBUG_CHANNEL(dmime); diff --git a/dlls/dmime/markertrack.c b/dlls/dmime/markertrack.c index 460e708bc5d..8d36a4cdd01 100644 --- a/dlls/dmime/markertrack.c +++ b/dlls/dmime/markertrack.c @@ -18,7 +18,6 @@ */ #include "dmime_private.h" -#include "dmobject.h" WINE_DEFAULT_DEBUG_CHANNEL(dmime); diff --git a/dlls/dmime/paramcontroltrack.c b/dlls/dmime/paramcontroltrack.c index 9d32484bfd7..4abcf614c3a 100644 --- a/dlls/dmime/paramcontroltrack.c +++ b/dlls/dmime/paramcontroltrack.c @@ -18,7 +18,6 @@ */ #include "dmime_private.h" -#include "dmobject.h" WINE_DEFAULT_DEBUG_CHANNEL(dmime); diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index 7d077db16cb..327f7d88c3b 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -20,7 +20,6 @@ #include "dmime_private.h" #include "wine/rbtree.h" -#include "dmobject.h" WINE_DEFAULT_DEBUG_CHANNEL(dmime); diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c index af7729f34b9..1194f81b09a 100644 --- a/dlls/dmime/segment.c +++ b/dlls/dmime/segment.c @@ -19,7 +19,6 @@ */ #include "dmime_private.h" -#include "dmobject.h" WINE_DEFAULT_DEBUG_CHANNEL(dmime); diff --git a/dlls/dmime/segmentstate.c b/dlls/dmime/segmentstate.c index de47d85e9b8..1cb9daac69a 100644 --- a/dlls/dmime/segmentstate.c +++ b/dlls/dmime/segmentstate.c @@ -17,7 +17,6 @@ */ #include "dmime_private.h" -#include "dmobject.h" WINE_DEFAULT_DEBUG_CHANNEL(dmime); diff --git a/dlls/dmime/segtriggertrack.c b/dlls/dmime/segtriggertrack.c index dc29ede4963..3f8e628b259 100644 --- a/dlls/dmime/segtriggertrack.c +++ b/dlls/dmime/segtriggertrack.c @@ -19,7 +19,6 @@ */ #include "dmime_private.h" -#include "dmobject.h" WINE_DEFAULT_DEBUG_CHANNEL(dmime); diff --git a/dlls/dmime/seqtrack.c b/dlls/dmime/seqtrack.c index ae2f002da92..21b78ff26cd 100644 --- a/dlls/dmime/seqtrack.c +++ b/dlls/dmime/seqtrack.c @@ -17,7 +17,6 @@ */ #include "dmime_private.h" -#include "dmobject.h" WINE_DEFAULT_DEBUG_CHANNEL(dmime); diff --git a/dlls/dmime/sysextrack.c b/dlls/dmime/sysextrack.c index f9c71abf08a..2c55d0dbe07 100644 --- a/dlls/dmime/sysextrack.c +++ b/dlls/dmime/sysextrack.c @@ -18,7 +18,6 @@ */ #include "dmime_private.h" -#include "dmobject.h" WINE_DEFAULT_DEBUG_CHANNEL(dmime); diff --git a/dlls/dmime/tempotrack.c b/dlls/dmime/tempotrack.c index 6704448b71e..07f410118fe 100644 --- a/dlls/dmime/tempotrack.c +++ b/dlls/dmime/tempotrack.c @@ -19,7 +19,6 @@ */ #include "dmime_private.h" -#include "dmobject.h" WINE_DEFAULT_DEBUG_CHANNEL(dmime); WINE_DECLARE_DEBUG_CHANNEL(dmfile); diff --git a/dlls/dmime/timesigtrack.c b/dlls/dmime/timesigtrack.c index e98807b7503..0ebf5e4256e 100644 --- a/dlls/dmime/timesigtrack.c +++ b/dlls/dmime/timesigtrack.c @@ -18,7 +18,6 @@ */ #include "dmime_private.h" -#include "dmobject.h" WINE_DEFAULT_DEBUG_CHANNEL(dmime); diff --git a/dlls/dmime/wavetrack.c b/dlls/dmime/wavetrack.c index 279cfb5c768..27e4d656163 100644 --- a/dlls/dmime/wavetrack.c +++ b/dlls/dmime/wavetrack.c @@ -17,7 +17,6 @@ */ #include "dmime_private.h" -#include "dmobject.h" WINE_DEFAULT_DEBUG_CHANNEL(dmime);

1 0

Rémi Bernon : dmime: Create a wave track when loading a segment from a .wav.
by Alexandre Julliard Oct. 11, 2023

Oct. 11, 2023

Module: wine Branch: master Commit: 7bbd4be52a424e38495fa132885730bd4823a33e URL: https://gitlab.winehq.org/wine/wine/-/commit/7bbd4be52a424e38495fa132885730… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Oct 10 23:03:37 2023 +0200 dmime: Create a wave track when loading a segment from a .wav. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=9027 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=34751 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45135 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48220 --- dlls/dmime/Makefile.in | 1 + dlls/dmime/dmime_private.h | 3 ++ dlls/dmime/segment.c | 111 +++++++++++++++++---------------------------- dlls/dmime/tests/dmime.c | 2 +- dlls/dmime/wavetrack.c | 43 ++++++++++++++++-- dlls/dmusic/dmusic_wave.h | 1 + dlls/dmusic/wave.c | 7 +++ 7 files changed, 94 insertions(+), 74 deletions(-)

1 0

Rémi Bernon : dmusic: Split wave entry points to dmusic_wave.h.
by Alexandre Julliard Oct. 11, 2023

Oct. 11, 2023

Module: wine Branch: master Commit: 15c4c02eeba45d35c4c00dd5a2f8c16a2fe952e2 URL: https://gitlab.winehq.org/wine/wine/-/commit/15c4c02eeba45d35c4c00dd5a2f8c1… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Oct 10 22:59:32 2023 +0200 dmusic: Split wave entry points to dmusic_wave.h. --- dlls/dmusic/dmusic_private.h | 6 +----- dlls/dmusic/dmusic_wave.h | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 5 deletions(-) diff --git a/dlls/dmusic/dmusic_private.h b/dlls/dmusic/dmusic_private.h index 2317ffa57c6..0bb3d5aaf83 100644 --- a/dlls/dmusic/dmusic_private.h +++ b/dlls/dmusic/dmusic_private.h @@ -42,6 +42,7 @@ #include "dmksctrl.h" #include "dmobject.h" +#include "dmusic_wave.h" /***************************************************************************** * Interfaces @@ -91,7 +92,6 @@ extern HRESULT DMUSIC_CreateReferenceClockImpl (LPCGUID lpcGUID, LPVOID* ppobj, extern HRESULT download_create(DWORD size, IDirectMusicDownload **ret_iface); -struct soundfont; extern HRESULT instrument_create_from_soundfont(struct soundfont *soundfont, UINT index, struct collection *collection, DMUS_OBJECTDESC *desc, IDirectMusicInstrument **ret_iface); extern HRESULT instrument_create_from_chunk(IStream *stream, struct chunk_entry *parent, @@ -100,10 +100,6 @@ extern HRESULT instrument_download_to_port(IDirectMusicInstrument *iface, IDirec IDirectMusicDownloadedInstrument **downloaded); extern HRESULT instrument_unload_from_port(IDirectMusicDownloadedInstrument *iface, IDirectMusicPortDownload *port); -extern HRESULT wave_create_from_soundfont(struct soundfont *soundfont, UINT index, IUnknown **out); -extern HRESULT wave_create_from_chunk(IStream *stream, struct chunk_entry *parent, IUnknown **out); -extern HRESULT wave_download_to_port(IUnknown *iface, IDirectMusicPortDownload *port, DWORD *id); - /***************************************************************************** * IDirectMusic8Impl implementation structure */ diff --git a/dlls/dmusic/dmusic_wave.h b/dlls/dmusic/dmusic_wave.h new file mode 100644 index 00000000000..0db0134ae17 --- /dev/null +++ b/dlls/dmusic/dmusic_wave.h @@ -0,0 +1,34 @@ +/* + * Copyright 2023 Rémi Bernon for CodeWeavers + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> +#include <stddef.h> + +#define COBJMACROS +#include "windef.h" +#include "winbase.h" + +#include "objbase.h" +#include "dmusici.h" + +struct soundfont; +struct chunk_entry; + +extern HRESULT wave_create_from_soundfont(struct soundfont *soundfont, UINT index, IUnknown **out); +extern HRESULT wave_create_from_chunk(IStream *stream, struct chunk_entry *parent, IUnknown **out); +extern HRESULT wave_download_to_port(IUnknown *iface, IDirectMusicPortDownload *port, DWORD *id);

1 0

Rémi Bernon : dmime: Play direct sound buffer from DMUS_PMSGT_WAVE message.
by Alexandre Julliard Oct. 11, 2023

Oct. 11, 2023

Module: wine Branch: master Commit: 16f9bfd23f3ca245a73722e9ab0028bf7d1b311d URL: https://gitlab.winehq.org/wine/wine/-/commit/16f9bfd23f3ca245a73722e9ab0028… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Sep 25 11:30:42 2023 +0200 dmime: Play direct sound buffer from DMUS_PMSGT_WAVE message. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=9027 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=34751 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45135 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48220 --- dlls/dmime/performance.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index 84b4b4b8575..2018fa013de 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -1631,6 +1631,7 @@ static HRESULT WINAPI performance_tool_ProcessPMsg(IDirectMusicTool *iface, { struct performance *This = impl_from_IDirectMusicTool(iface); struct message *message = message_from_DMUS_PMSG(msg); + HRESULT hr; FIXME("(%p, %p, %p): semi-stub\n", This, performance, msg); @@ -1641,7 +1642,6 @@ static HRESULT WINAPI performance_tool_ProcessPMsg(IDirectMusicTool *iface, DMUS_NOTIFICATION_PMSG *notif = (DMUS_NOTIFICATION_PMSG *)msg; struct message *previous; BOOL enabled = FALSE; - HRESULT hr; if (IsEqualGUID(&notif->guidNotificationType, &GUID_NOTIFICATION_SEGMENT) && notif->dwNotificationOption == DMUS_NOTIFICATION_SEGEND) @@ -1671,6 +1671,11 @@ static HRESULT WINAPI performance_tool_ProcessPMsg(IDirectMusicTool *iface, return S_OK; } + case DMUS_PMSGT_WAVE: + if (FAILED(hr = IDirectSoundBuffer_Play((IDirectSoundBuffer *)msg->punkUser, 0, 0, 0))) + WARN("Failed to play wave buffer, hr %#lx\n", hr); + break; + default: FIXME("Unhandled message type %#lx\n", msg->dwType); break;

1 0

Rémi Bernon : dmime: Implement IDirectMusicTrack_Play for the wave track.
by Alexandre Julliard Oct. 11, 2023

Oct. 11, 2023

Module: wine Branch: master Commit: edad7809227642fadc187a00b2df5f3326c567c8 URL: https://gitlab.winehq.org/wine/wine/-/commit/edad7809227642fadc187a00b2df5f… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Sep 25 11:28:51 2023 +0200 dmime: Implement IDirectMusicTrack_Play for the wave track. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=9027 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=34751 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45135 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48220 --- dlls/dmime/tests/dmime.c | 8 +----- dlls/dmime/wavetrack.c | 68 +++++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 63 insertions(+), 13 deletions(-) diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index 8c42398eadc..412cccce781 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -3320,8 +3320,6 @@ static void test_wave_pmsg(void) ret = test_tool_wait_message(tool, 500, (DMUS_PMSG **)&wave); ok(!ret, "got %#lx\n", ret); - if (wave->dwType == DMUS_PMSGT_WAVE) - { ok(wave->dwType == DMUS_PMSGT_WAVE, "got %p\n", wave); ok(!!wave->punkUser, "got %p\n", wave->punkUser); ok(wave->rtStartOffset == 0, "got %I64d\n", wave->rtStartOffset); @@ -3330,18 +3328,14 @@ static void test_wave_pmsg(void) ok(wave->lVolume == 0, "got %lu\n", wave->lVolume); ok(wave->lPitch == 0, "got %lu\n", wave->lPitch); ok(wave->bFlags == 0, "got %#x\n", wave->bFlags); - } hr = IDirectMusicPerformance_FreePMsg(performance, (DMUS_PMSG *)wave); ok(hr == S_OK, "got %#lx\n", hr); ret = test_tool_wait_message(tool, 500, &msg); - todo_wine ok(!ret, "got %#lx\n", ret); - if (!ret) - { + ok(!ret, "got %#lx\n", ret); ok(msg->dwType == DMUS_PMSGT_DIRTY, "got %p\n", msg); hr = IDirectMusicPerformance_FreePMsg(performance, msg); ok(hr == S_OK, "got %#lx\n", hr); - } hr = IDirectMusicSegment8_Unload((IDirectMusicSegment8 *)segment, (IUnknown *)performance); ok(hr == S_OK, "got %#lx\n", hr); diff --git a/dlls/dmime/wavetrack.c b/dlls/dmime/wavetrack.c index 7c72065520a..def1e59fb23 100644 --- a/dlls/dmime/wavetrack.c +++ b/dlls/dmime/wavetrack.c @@ -143,14 +143,70 @@ static HRESULT WINAPI wave_track_EndPlay(IDirectMusicTrack8 *iface, void *pState return S_OK; } -static HRESULT WINAPI wave_track_Play(IDirectMusicTrack8 *iface, void *pStateData, - MUSIC_TIME mtStart, MUSIC_TIME mtEnd, MUSIC_TIME mtOffset, DWORD dwFlags, - IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID) +static HRESULT WINAPI wave_track_Play(IDirectMusicTrack8 *iface, void *state_data, + MUSIC_TIME start_time, MUSIC_TIME end_time, MUSIC_TIME time_offset, DWORD segment_flags, + IDirectMusicPerformance *performance, IDirectMusicSegmentState *segment_state, DWORD track_id) { struct wave_track *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %p, %ld, %ld, %ld, %ld, %p, %p, %ld): stub\n", This, pStateData, mtStart, mtEnd, - mtOffset, dwFlags, pPerf, pSegSt, dwVirtualID); - return S_OK; + LONG volume = This->header.lVolume; + IDirectMusicGraph *graph; + struct wave_part *part; + struct wave_item *item; + HRESULT hr; + + TRACE("(%p, %p, %ld, %ld, %ld, %#lx, %p, %p, %ld)\n", This, state_data, start_time, end_time, + time_offset, segment_flags, performance, segment_state, track_id); + + if (start_time != 0) FIXME("start_time %ld not implemented\n", start_time); + if (end_time != -1) FIXME("end_time %ld not implemented\n", end_time); + if (time_offset != 0) FIXME("time_offset %ld not implemented\n", time_offset); + if (segment_flags) FIXME("segment_flags %#lx not implemented\n", segment_flags); + if (segment_state) FIXME("segment_state %p not implemented\n", segment_state); + + if (FAILED(hr = IDirectMusicPerformance_QueryInterface(performance, + &IID_IDirectMusicGraph, (void **)&graph))) + return hr; + + LIST_FOR_EACH_ENTRY(part, &This->parts, struct wave_part, entry) + { + volume += part->header.lVolume; + + LIST_FOR_EACH_ENTRY(item, &part->items, struct wave_item, entry) + { + DMUS_WAVE_PMSG *msg; + + if (!item->buffer) continue; + + if (FAILED(hr = IDirectMusicPerformance_AllocPMsg(performance, sizeof(*msg), + (DMUS_PMSG **)&msg))) + break; + + msg->mtTime = item->header.rtTime; + msg->dwFlags = DMUS_PMSGF_MUSICTIME; + msg->dwPChannel = part->header.dwPChannel; + msg->dwVirtualTrackID = track_id; + msg->dwType = DMUS_PMSGT_WAVE; + msg->punkUser = (IUnknown *)item->buffer; + IDirectSoundBuffer_AddRef(item->buffer); + + msg->rtStartOffset = item->header.rtStartOffset; + msg->rtDuration = item->header.rtDuration; + msg->lVolume = volume + item->header.lVolume; + msg->lPitch = item->header.lPitch; + + if (FAILED(hr = IDirectMusicGraph_StampPMsg(graph, (DMUS_PMSG *)msg)) + || FAILED(hr = IDirectMusicPerformance_SendPMsg(performance, (DMUS_PMSG *)msg))) + { + IDirectMusicPerformance_FreePMsg(performance, (DMUS_PMSG *)msg); + break; + } + } + + volume -= part->header.lVolume; + } + + IDirectMusicGraph_Release(graph); + return hr; } static HRESULT WINAPI wave_track_GetParam(IDirectMusicTrack8 *iface, REFGUID type, MUSIC_TIME time,

1 0