October 2023 - Wine-commits

Rémi Bernon : dmband: Use time_offset to align track start with music time.
by Alexandre Julliard 27 Oct '23

27 Oct '23

Module: wine Branch: master Commit: d330e44521a1959795ae71f95bb8687fbf5bdf88 URL: https://gitlab.winehq.org/wine/wine/-/commit/d330e44521a1959795ae71f95bb868… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Oct 23 11:55:24 2023 +0200 dmband: Use time_offset to align track start with music time. --- dlls/dmband/bandtrack.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dmband/bandtrack.c b/dlls/dmband/bandtrack.c index 0ec14483c33..f2a40c21751 100644 --- a/dlls/dmband/bandtrack.c +++ b/dlls/dmband/bandtrack.c @@ -174,7 +174,6 @@ static HRESULT WINAPI band_track_Play(IDirectMusicTrack8 *iface, void *state_dat 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); @@ -184,8 +183,9 @@ static HRESULT WINAPI band_track_Play(IDirectMusicTrack8 *iface, void *state_dat LIST_FOR_EACH_ENTRY(entry, &This->bands, struct band_entry, entry) { - if (FAILED(hr = band_send_messages(entry->band, performance, graph, - entry->head.lBandTimeLogical, track_id))) + MUSIC_TIME music_time = entry->head.lBandTimeLogical; + if (music_time != -1) music_time += time_offset; + if (FAILED(hr = band_send_messages(entry->band, performance, graph, music_time, track_id))) break; }

1 0

Rémi Bernon : dmime: Use time_offset to align track start with music time.
by Alexandre Julliard 27 Oct '23

27 Oct '23

Module: wine Branch: master Commit: aec78adee9690799f718939d5b1b08421869783d URL: https://gitlab.winehq.org/wine/wine/-/commit/aec78adee9690799f718939d5b1b08… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Oct 23 11:55:24 2023 +0200 dmime: Use time_offset to align track start with music time. --- dlls/dmime/seqtrack.c | 5 ++--- dlls/dmime/wavetrack.c | 3 +-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/dmime/seqtrack.c b/dlls/dmime/seqtrack.c index b532fc48ca6..56c61c02576 100644 --- a/dlls/dmime/seqtrack.c +++ b/dlls/dmime/seqtrack.c @@ -122,7 +122,6 @@ static HRESULT WINAPI sequence_track_Play(IDirectMusicTrack8 *iface, void *state 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); @@ -139,7 +138,7 @@ static HRESULT WINAPI sequence_track_Play(IDirectMusicTrack8 *iface, void *state (DMUS_PMSG **)&msg))) break; - msg->mtTime = item->mtTime; + msg->mtTime = item->mtTime + time_offset; msg->dwFlags = DMUS_PMSGF_MUSICTIME; msg->dwPChannel = item->dwPChannel; msg->dwVirtualTrackID = track_id; @@ -169,7 +168,7 @@ static HRESULT WINAPI sequence_track_Play(IDirectMusicTrack8 *iface, void *state (DMUS_PMSG **)&msg))) break; - msg->mtTime = item->mtStart; + msg->mtTime = item->mtStart + time_offset; msg->dwFlags = DMUS_PMSGF_MUSICTIME; msg->dwPChannel = item->dwPChannel; msg->dwVirtualTrackID = track_id; diff --git a/dlls/dmime/wavetrack.c b/dlls/dmime/wavetrack.c index 5ba9fb675f5..974e656cfe5 100644 --- a/dlls/dmime/wavetrack.c +++ b/dlls/dmime/wavetrack.c @@ -159,7 +159,6 @@ static HRESULT WINAPI wave_track_Play(IDirectMusicTrack8 *iface, void *state_dat 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); @@ -181,7 +180,7 @@ static HRESULT WINAPI wave_track_Play(IDirectMusicTrack8 *iface, void *state_dat (DMUS_PMSG **)&msg))) break; - msg->mtTime = item->header.rtTime; + msg->mtTime = item->header.rtTime + time_offset; msg->dwFlags = DMUS_PMSGF_MUSICTIME; msg->dwPChannel = part->header.dwPChannel; msg->dwVirtualTrackID = track_id;

1 0

Rémi Bernon : dmime: Use an internal performance message for segment end.
by Alexandre Julliard 27 Oct '23

27 Oct '23

Module: wine Branch: master Commit: 377ba8a7d17ff75a29c6d0f9cae73ed6a6ad01b0 URL: https://gitlab.winehq.org/wine/wine/-/commit/377ba8a7d17ff75a29c6d0f9cae73e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Oct 25 09:34:12 2023 +0200 dmime: Use an internal performance message for segment end. --- dlls/dmime/dmime_private.h | 2 ++ dlls/dmime/performance.c | 50 +++++++++++++++++++++++++++++++--------------- dlls/dmime/segmentstate.c | 5 ++++- 3 files changed, 40 insertions(+), 17 deletions(-) diff --git a/dlls/dmime/dmime_private.h b/dlls/dmime/dmime_private.h index 860b4ef385c..28836694ed9 100644 --- a/dlls/dmime/dmime_private.h +++ b/dlls/dmime/dmime_private.h @@ -81,6 +81,8 @@ extern HRESULT wave_track_create_from_chunk(IStream *stream, struct chunk_entry IDirectMusicTrack8 **ret_iface); extern HRESULT performance_get_dsound(IDirectMusicPerformance8 *iface, IDirectSound **dsound); +extern HRESULT performance_send_segment_end(IDirectMusicPerformance8 *iface, MUSIC_TIME music_time, + IDirectMusicSegmentState *state); /***************************************************************************** * Auxiliary definitions diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index 8459de00b3f..942452d353e 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -24,6 +24,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmime); +enum dmus_internal_message_type +{ + DMUS_PMSGT_INTERNAL_FIRST = 0x10, + DMUS_PMSGT_INTERNAL_SEGMENT_END = DMUS_PMSGT_INTERNAL_FIRST, +}; + struct pchannel_block { DWORD block_num; /* Block 0 is PChannels 0-15, Block 1 is PChannels 16-31, etc */ struct { @@ -158,7 +164,8 @@ static DWORD WINAPI message_thread_proc(void *args) return 0; } -static HRESULT performance_send_dirty_pmsg(struct performance *This, MUSIC_TIME music_time) +static HRESULT performance_send_pmsg(struct performance *This, MUSIC_TIME music_time, DWORD flags, + DWORD type, IUnknown *object) { IDirectMusicPerformance8 *performance = &This->IDirectMusicPerformance8_iface; IDirectMusicGraph *graph = &This->IDirectMusicGraph_iface; @@ -169,10 +176,11 @@ static HRESULT performance_send_dirty_pmsg(struct performance *This, MUSIC_TIME return hr; msg->mtTime = music_time; - msg->dwFlags = DMUS_PMSGF_MUSICTIME | DMUS_PMSGF_TOOL_QUEUE; - msg->dwType = DMUS_PMSGT_DIRTY; + msg->dwFlags = DMUS_PMSGF_MUSICTIME | flags; + msg->dwType = type; + if ((msg->punkUser = object)) IUnknown_AddRef(object); - if (FAILED(hr = IDirectMusicGraph_StampPMsg(graph, msg)) + if ((type < DMUS_PMSGT_INTERNAL_FIRST && FAILED(hr = IDirectMusicGraph_StampPMsg(graph, msg))) || FAILED(hr = IDirectMusicPerformance8_SendPMsg(performance, msg))) IDirectMusicPerformance8_FreePMsg(performance, msg); @@ -252,6 +260,19 @@ static inline struct performance *impl_from_IDirectMusicPerformance8(IDirectMusi return CONTAINING_RECORD(iface, struct performance, IDirectMusicPerformance8_iface); } +HRESULT performance_send_segment_end(IDirectMusicPerformance8 *iface, MUSIC_TIME music_time, + IDirectMusicSegmentState *state) +{ + struct performance *This = impl_from_IDirectMusicPerformance8(iface); + HRESULT hr; + + if (FAILED(hr = performance_send_pmsg(This, music_time, DMUS_PMSGF_TOOL_ATTIME, + DMUS_PMSGT_INTERNAL_SEGMENT_END, (IUnknown *)state))) + return hr; + + return S_OK; +} + /* IDirectMusicPerformance8 IUnknown part: */ static HRESULT WINAPI performance_QueryInterface(IDirectMusicPerformance8 *iface, REFIID riid, void **ret_iface) { @@ -1050,8 +1071,7 @@ static HRESULT WINAPI performance_CloseDown(IDirectMusicPerformance8 *iface) list_remove(&message->entry); list_init(&message->entry); - /* process notifications to end any pending segment states */ - if (message->msg.dwType == DMUS_PMSGT_NOTIFICATION) + if (message->msg.dwType == DMUS_PMSGT_INTERNAL_SEGMENT_END) hr = IDirectMusicTool_ProcessPMsg(&This->IDirectMusicTool_iface, (IDirectMusicPerformance *)iface, &message->msg); else @@ -1210,7 +1230,7 @@ static HRESULT WINAPI performance_PlaySegmentEx(IDirectMusicPerformance8 *iface, hr = performance_send_notification_pmsg(This, start_time, This->notification_segment, GUID_NOTIFICATION_SEGMENT, DMUS_NOTIFICATION_SEGSTART, (IUnknown *)state); if (SUCCEEDED(hr)) - hr = performance_send_dirty_pmsg(This, start_time); + hr = performance_send_pmsg(This, start_time, DMUS_PMSGF_TOOL_QUEUE, DMUS_PMSGT_DIRTY, NULL); if (SUCCEEDED(hr)) hr = segment_state_play(state, iface); @@ -1222,7 +1242,7 @@ static HRESULT WINAPI performance_PlaySegmentEx(IDirectMusicPerformance8 *iface, hr = performance_send_notification_pmsg(This, start_time + length, This->notification_segment, GUID_NOTIFICATION_SEGMENT, DMUS_NOTIFICATION_SEGALMOSTEND, (IUnknown *)state); if (SUCCEEDED(hr)) - hr = performance_send_dirty_pmsg(This, start_time + length); + hr = performance_send_pmsg(This, start_time + length, DMUS_PMSGF_TOOL_QUEUE, DMUS_PMSGT_DIRTY, NULL); if (SUCCEEDED(hr)) hr = performance_send_notification_pmsg(This, start_time + length, This->notification_performance, GUID_NOTIFICATION_PERFORMANCE, DMUS_NOTIFICATION_MUSICSTOPPED, NULL); @@ -1764,14 +1784,6 @@ static HRESULT WINAPI performance_tool_ProcessPMsg(IDirectMusicTool *iface, struct message *previous; BOOL enabled = FALSE; - if (IsEqualGUID(&notif->guidNotificationType, &GUID_NOTIFICATION_SEGMENT) - && notif->dwNotificationOption == DMUS_NOTIFICATION_SEGEND) - { - if (FAILED(hr = segment_state_end_play((IDirectMusicSegmentState *)notif->punkUser, - (IDirectMusicPerformance8 *)performance))) - WARN("Failed to end segment state %p, hr %#lx\n", notif->punkUser, hr); - } - if (IsEqualGUID(&notif->guidNotificationType, &GUID_NOTIFICATION_PERFORMANCE)) enabled = This->notification_performance; if (IsEqualGUID(&notif->guidNotificationType, &GUID_NOTIFICATION_SEGMENT)) @@ -1799,6 +1811,12 @@ static HRESULT WINAPI performance_tool_ProcessPMsg(IDirectMusicTool *iface, WARN("Failed to play wave buffer, hr %#lx\n", hr); break; + case DMUS_PMSGT_INTERNAL_SEGMENT_END: + if (FAILED(hr = segment_state_end_play((IDirectMusicSegmentState *)msg->punkUser, + (IDirectMusicPerformance8 *)performance))) + WARN("Failed to end segment state %p, hr %#lx\n", msg->punkUser, hr); + break; + default: FIXME("Unhandled message type %#lx\n", msg->dwType); break; diff --git a/dlls/dmime/segmentstate.c b/dlls/dmime/segmentstate.c index b4bb784de0d..21b98ccc14c 100644 --- a/dlls/dmime/segmentstate.c +++ b/dlls/dmime/segmentstate.c @@ -214,8 +214,8 @@ HRESULT segment_state_create(IDirectMusicSegment *segment, MUSIC_TIME start_time IDirectMusicSegmentState *iface; struct segment_state *This; IDirectMusicTrack *track; + UINT i, duration; HRESULT hr; - UINT i; TRACE("(%p, %lu, %p)\n", segment, start_time, ret_iface); @@ -263,6 +263,9 @@ HRESULT segment_state_create(IDirectMusicSegment *segment, MUSIC_TIME start_time } } + duration = This->end_point - This->start_point; + if (SUCCEEDED(hr)) hr = performance_send_segment_end(performance, start_time + duration, iface); + if (SUCCEEDED(hr)) *ret_iface = iface; else IDirectMusicSegmentState_Release(iface); return hr;

1 0

Rémi Bernon : dmstyle: Rename IDirectMusicStyle8Impl method prefix to style.
by Alexandre Julliard 27 Oct '23

27 Oct '23

Module: wine Branch: master Commit: 717c278b6be46531549f533ef6353192cb01bd12 URL: https://gitlab.winehq.org/wine/wine/-/commit/717c278b6be46531549f533ef63531… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Sep 11 11:25:18 2023 +0200 dmstyle: Rename IDirectMusicStyle8Impl method prefix to style. --- dlls/dmstyle/style.c | 65 ++++++++++++++++++++++++---------------------------- 1 file changed, 30 insertions(+), 35 deletions(-) diff --git a/dlls/dmstyle/style.c b/dlls/dmstyle/style.c index 6d4cf2e3b07..bac5a2ba839 100644 --- a/dlls/dmstyle/style.c +++ b/dlls/dmstyle/style.c @@ -63,8 +63,7 @@ static inline IDirectMusicStyle8Impl *impl_from_IDirectMusicStyle8(IDirectMusicS return CONTAINING_RECORD(iface, IDirectMusicStyle8Impl, IDirectMusicStyle8_iface); } -/* DirectMusicStyle8Impl IDirectMusicStyle8 part: */ -static HRESULT WINAPI IDirectMusicStyle8Impl_QueryInterface(IDirectMusicStyle8 *iface, REFIID riid, +static HRESULT WINAPI style_QueryInterface(IDirectMusicStyle8 *iface, REFIID riid, void **ret_iface) { IDirectMusicStyle8Impl *This = impl_from_IDirectMusicStyle8(iface); @@ -89,7 +88,7 @@ static HRESULT WINAPI IDirectMusicStyle8Impl_QueryInterface(IDirectMusicStyle8 * return S_OK; } -static ULONG WINAPI IDirectMusicStyle8Impl_AddRef(IDirectMusicStyle8 *iface) +static ULONG WINAPI style_AddRef(IDirectMusicStyle8 *iface) { IDirectMusicStyle8Impl *This = impl_from_IDirectMusicStyle8(iface); LONG ref = InterlockedIncrement(&This->ref); @@ -99,7 +98,7 @@ static ULONG WINAPI IDirectMusicStyle8Impl_AddRef(IDirectMusicStyle8 *iface) return ref; } -static ULONG WINAPI IDirectMusicStyle8Impl_Release(IDirectMusicStyle8 *iface) +static ULONG WINAPI style_Release(IDirectMusicStyle8 *iface) { IDirectMusicStyle8Impl *This = impl_from_IDirectMusicStyle8(iface); LONG ref = InterlockedDecrement(&This->ref); @@ -131,8 +130,7 @@ static ULONG WINAPI IDirectMusicStyle8Impl_Release(IDirectMusicStyle8 *iface) return ref; } -/* IDirectMusicStyle8Impl IDirectMusicStyle(8) part: */ -static HRESULT WINAPI IDirectMusicStyle8Impl_GetBand(IDirectMusicStyle8 *iface, WCHAR *name, +static HRESULT WINAPI style_GetBand(IDirectMusicStyle8 *iface, WCHAR *name, IDirectMusicBand **band) { IDirectMusicStyle8Impl *This = impl_from_IDirectMusicStyle8(iface); @@ -167,7 +165,7 @@ static HRESULT WINAPI IDirectMusicStyle8Impl_GetBand(IDirectMusicStyle8 *iface, return S_FALSE; } -static HRESULT WINAPI IDirectMusicStyle8Impl_EnumBand(IDirectMusicStyle8 *iface, DWORD dwIndex, +static HRESULT WINAPI style_EnumBand(IDirectMusicStyle8 *iface, DWORD dwIndex, WCHAR *pwszName) { IDirectMusicStyle8Impl *This = impl_from_IDirectMusicStyle8(iface); @@ -175,7 +173,7 @@ static HRESULT WINAPI IDirectMusicStyle8Impl_EnumBand(IDirectMusicStyle8 *iface, return S_OK; } -static HRESULT WINAPI IDirectMusicStyle8Impl_GetDefaultBand(IDirectMusicStyle8 *iface, +static HRESULT WINAPI style_GetDefaultBand(IDirectMusicStyle8 *iface, IDirectMusicBand **band) { IDirectMusicStyle8Impl *This = impl_from_IDirectMusicStyle8(iface); @@ -189,7 +187,7 @@ static HRESULT WINAPI IDirectMusicStyle8Impl_GetDefaultBand(IDirectMusicStyle8 * return S_FALSE; } -static HRESULT WINAPI IDirectMusicStyle8Impl_EnumMotif(IDirectMusicStyle8 *iface, DWORD index, +static HRESULT WINAPI style_EnumMotif(IDirectMusicStyle8 *iface, DWORD index, WCHAR *name) { IDirectMusicStyle8Impl *This = impl_from_IDirectMusicStyle8(iface); @@ -222,7 +220,7 @@ static HRESULT WINAPI IDirectMusicStyle8Impl_EnumMotif(IDirectMusicStyle8 *iface return S_OK; } -static HRESULT WINAPI IDirectMusicStyle8Impl_GetMotif(IDirectMusicStyle8 *iface, WCHAR *pwszName, +static HRESULT WINAPI style_GetMotif(IDirectMusicStyle8 *iface, WCHAR *pwszName, IDirectMusicSegment **ppSegment) { IDirectMusicStyle8Impl *This = impl_from_IDirectMusicStyle8(iface); @@ -230,7 +228,7 @@ static HRESULT WINAPI IDirectMusicStyle8Impl_GetMotif(IDirectMusicStyle8 *iface, return S_FALSE; } -static HRESULT WINAPI IDirectMusicStyle8Impl_GetDefaultChordMap(IDirectMusicStyle8 *iface, +static HRESULT WINAPI style_GetDefaultChordMap(IDirectMusicStyle8 *iface, IDirectMusicChordMap **ppChordMap) { IDirectMusicStyle8Impl *This = impl_from_IDirectMusicStyle8(iface); @@ -238,7 +236,7 @@ static HRESULT WINAPI IDirectMusicStyle8Impl_GetDefaultChordMap(IDirectMusicStyl return S_OK; } -static HRESULT WINAPI IDirectMusicStyle8Impl_EnumChordMap(IDirectMusicStyle8 *iface, DWORD dwIndex, +static HRESULT WINAPI style_EnumChordMap(IDirectMusicStyle8 *iface, DWORD dwIndex, WCHAR *pwszName) { IDirectMusicStyle8Impl *This = impl_from_IDirectMusicStyle8(iface); @@ -246,7 +244,7 @@ static HRESULT WINAPI IDirectMusicStyle8Impl_EnumChordMap(IDirectMusicStyle8 *if return S_OK; } -static HRESULT WINAPI IDirectMusicStyle8Impl_GetChordMap(IDirectMusicStyle8 *iface, WCHAR *pwszName, +static HRESULT WINAPI style_GetChordMap(IDirectMusicStyle8 *iface, WCHAR *pwszName, IDirectMusicChordMap **ppChordMap) { IDirectMusicStyle8Impl *This = impl_from_IDirectMusicStyle8(iface); @@ -254,7 +252,7 @@ static HRESULT WINAPI IDirectMusicStyle8Impl_GetChordMap(IDirectMusicStyle8 *ifa return S_OK; } -static HRESULT WINAPI IDirectMusicStyle8Impl_GetTimeSignature(IDirectMusicStyle8 *iface, +static HRESULT WINAPI style_GetTimeSignature(IDirectMusicStyle8 *iface, DMUS_TIMESIGNATURE *pTimeSig) { IDirectMusicStyle8Impl *This = impl_from_IDirectMusicStyle8(iface); @@ -262,7 +260,7 @@ static HRESULT WINAPI IDirectMusicStyle8Impl_GetTimeSignature(IDirectMusicStyle8 return S_OK; } -static HRESULT WINAPI IDirectMusicStyle8Impl_GetEmbellishmentLength(IDirectMusicStyle8 *iface, +static HRESULT WINAPI style_GetEmbellishmentLength(IDirectMusicStyle8 *iface, DWORD dwType, DWORD dwLevel, DWORD *pdwMin, DWORD *pdwMax) { IDirectMusicStyle8Impl *This = impl_from_IDirectMusicStyle8(iface); @@ -270,14 +268,14 @@ static HRESULT WINAPI IDirectMusicStyle8Impl_GetEmbellishmentLength(IDirectMusic return S_OK; } -static HRESULT WINAPI IDirectMusicStyle8Impl_GetTempo(IDirectMusicStyle8 *iface, double *pTempo) +static HRESULT WINAPI style_GetTempo(IDirectMusicStyle8 *iface, double *pTempo) { IDirectMusicStyle8Impl *This = impl_from_IDirectMusicStyle8(iface); FIXME("(%p, %p): stub\n", This, pTempo); return S_OK; } -static HRESULT WINAPI IDirectMusicStyle8Impl_EnumPattern(IDirectMusicStyle8 *iface, DWORD dwIndex, +static HRESULT WINAPI style_EnumPattern(IDirectMusicStyle8 *iface, DWORD dwIndex, DWORD dwPatternType, WCHAR *pwszName) { IDirectMusicStyle8Impl *This = impl_from_IDirectMusicStyle8(iface); @@ -286,24 +284,23 @@ static HRESULT WINAPI IDirectMusicStyle8Impl_EnumPattern(IDirectMusicStyle8 *ifa } static const IDirectMusicStyle8Vtbl dmstyle8_vtbl = { - IDirectMusicStyle8Impl_QueryInterface, - IDirectMusicStyle8Impl_AddRef, - IDirectMusicStyle8Impl_Release, - IDirectMusicStyle8Impl_GetBand, - IDirectMusicStyle8Impl_EnumBand, - IDirectMusicStyle8Impl_GetDefaultBand, - IDirectMusicStyle8Impl_EnumMotif, - IDirectMusicStyle8Impl_GetMotif, - IDirectMusicStyle8Impl_GetDefaultChordMap, - IDirectMusicStyle8Impl_EnumChordMap, - IDirectMusicStyle8Impl_GetChordMap, - IDirectMusicStyle8Impl_GetTimeSignature, - IDirectMusicStyle8Impl_GetEmbellishmentLength, - IDirectMusicStyle8Impl_GetTempo, - IDirectMusicStyle8Impl_EnumPattern + style_QueryInterface, + style_AddRef, + style_Release, + style_GetBand, + style_EnumBand, + style_GetDefaultBand, + style_EnumMotif, + style_GetMotif, + style_GetDefaultChordMap, + style_EnumChordMap, + style_GetChordMap, + style_GetTimeSignature, + style_GetEmbellishmentLength, + style_GetTempo, + style_EnumPattern }; -/* IDirectMusicStyle8Impl IDirectMusicObject part: */ static HRESULT WINAPI style_IDirectMusicObject_ParseDescriptor(IDirectMusicObject *iface, IStream *stream, DMUS_OBJECTDESC *desc) { @@ -344,7 +341,6 @@ static const IDirectMusicObjectVtbl dmobject_vtbl = { style_IDirectMusicObject_ParseDescriptor }; -/* IDirectMusicStyle8Impl IPersistStream part: */ static inline IDirectMusicStyle8Impl *impl_from_IPersistStream(IPersistStream *iface) { return CONTAINING_RECORD(iface, IDirectMusicStyle8Impl, dmobj.IPersistStream_iface); @@ -958,7 +954,6 @@ static const IPersistStreamVtbl persiststream_vtbl = { unimpl_IPersistStream_GetSizeMax }; -/* for ClassFactory */ HRESULT create_dmstyle(REFIID lpcGUID, void **ppobj) { IDirectMusicStyle8Impl* obj;

1 0

Rémi Bernon : dmstyle: Get rid of the IDirectMusicStyle8Impl typedef.
by Alexandre Julliard 27 Oct '23

27 Oct '23

Module: wine Branch: master Commit: 7996bc2c0b7f6a853d2ab0f16cbeb411ab35b994 URL: https://gitlab.winehq.org/wine/wine/-/commit/7996bc2c0b7f6a853d2ab0f16cbeb4… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Sep 11 11:25:45 2023 +0200 dmstyle: Get rid of the IDirectMusicStyle8Impl typedef. --- dlls/dmstyle/style.c | 121 ++++++++++++++++++++++++--------------------------- 1 file changed, 58 insertions(+), 63 deletions(-)

1 0

Rémi Bernon : dmstyle: Rewrite style part list parsing.
by Alexandre Julliard 27 Oct '23

27 Oct '23

Module: wine Branch: master Commit: 8e596f4ddba3d19d6eea645e59d54101f93aa2bc URL: https://gitlab.winehq.org/wine/wine/-/commit/8e596f4ddba3d19d6eea645e59d541… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Sep 11 11:35:32 2023 +0200 dmstyle: Rewrite style part list parsing. --- dlls/dmstyle/style.c | 223 +++++++++++++++++++++++---------------------------- 1 file changed, 99 insertions(+), 124 deletions(-)

1 0

Zebediah Figura : ws2_32/tests: Make sure that WSARecv() completes synchronously in test_WSARecv().
by Alexandre Julliard 27 Oct '23

27 Oct '23

Module: wine Branch: master Commit: 9d330d81a6af73220e08a93efa18a7cbf0cc9408 URL: https://gitlab.winehq.org/wine/wine/-/commit/9d330d81a6af73220e08a93efa18a7… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Jul 22 16:40:24 2023 -0500 ws2_32/tests: Make sure that WSARecv() completes synchronously in test_WSARecv(). Wine-Bug: https://bugs.winehq.org//show_bug.cgi?id=54342 --- dlls/ws2_32/tests/sock.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index fc3c7053aa1..9f6cd487777 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -7626,24 +7626,29 @@ static void test_WSARecv(void) memset(&ov, 0, sizeof(ov)); flags = 0; - bufs[0].len = 2; + bufs[0].len = 1; bufs[0].buf = buf; - /* Send 4 bytes and receive in two calls of 2 */ + /* Send 2 bytes and receive in two calls of 1 */ SetLastError(0xdeadbeef); - iret = send(src, "test", 4, 0); - ok(iret == 4, "Expected 4, got %d\n", iret); + iret = send(src, "ab", 2, 0); + ok(iret == 2, "got %d\n", iret); ok(GetLastError() == ERROR_SUCCESS, "Expected 0, got %ld\n", GetLastError()); SetLastError(0xdeadbeef); bytesReturned = 0xdeadbeef; + /* Non-overlapped WSARecv() performs an alertable wait (tested below), but + * not if it completes synchronously. Make sure it completes synchronously + * by polling for input. */ + check_poll_mask(dest, POLLRDNORM, POLLRDNORM); + apc_count = 0; dwret = QueueUserAPC(apc_func, GetCurrentThread(), (ULONG_PTR)&apc_count); ok(dwret, "QueueUserAPC returned %lu\n", dwret); iret = WSARecv(dest, bufs, 1, &bytesReturned, &flags, NULL, NULL); ok(!iret, "Expected 0, got %d\n", iret); - ok(bytesReturned == 2, "Expected 2, got %ld\n", bytesReturned); + ok(bytesReturned == 1, "got %ld\n", bytesReturned); ok(GetLastError() == ERROR_SUCCESS, "Expected 0, got %ld\n", GetLastError()); ok(!apc_count, "got apc_count %u.\n", apc_count); @@ -7654,7 +7659,7 @@ static void test_WSARecv(void) bytesReturned = 0xdeadbeef; iret = WSARecv(dest, bufs, 1, &bytesReturned, &flags, NULL, NULL); ok(!iret, "Expected 0, got %d\n", iret); - ok(bytesReturned == 2, "Expected 2, got %ld\n", bytesReturned); + ok(bytesReturned == 1, "got %ld\n", bytesReturned); ok(GetLastError() == ERROR_SUCCESS, "Expected 0, got %ld\n", GetLastError()); bufs[0].len = 4;

1 0

Zebediah Figura : ws2_32/tests: Wait for AFD_POLL_RESET in test_get_events_reset().
by Alexandre Julliard 27 Oct '23

27 Oct '23

Module: wine Branch: master Commit: 2ca895cb5f5a82057e6babfb9b1e810bc284829a URL: https://gitlab.winehq.org/wine/wine/-/commit/2ca895cb5f5a82057e6babfb9b1e81… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Jul 22 21:24:10 2023 -0500 ws2_32/tests: Wait for AFD_POLL_RESET in test_get_events_reset(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54113 --- dlls/ws2_32/tests/afd.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/ws2_32/tests/afd.c b/dlls/ws2_32/tests/afd.c index b856caee853..b011c0da69f 100644 --- a/dlls/ws2_32/tests/afd.c +++ b/dlls/ws2_32/tests/afd.c @@ -2058,17 +2058,20 @@ static void test_get_events_reset(void) tcp_socketpair(&client, &server); - ret = WSAEventSelect(client, event, FD_ACCEPT | FD_CONNECT | FD_CLOSE | FD_OOB | FD_READ | FD_WRITE); + ret = WSAEventSelect(client, event, FD_ACCEPT | FD_CLOSE | FD_OOB | FD_READ); ok(!ret, "got error %lu\n", GetLastError()); close_with_rst(server); + ret = WaitForSingleObject(event, 1000); + ok(!ret, "got %d\n", ret); + memset(&params, 0xcc, sizeof(params)); memset(&io, 0xcc, sizeof(io)); ret = NtDeviceIoControlFile((HANDLE)client, NULL, NULL, NULL, &io, IOCTL_AFD_GET_EVENTS, NULL, 0, &params, sizeof(params)); ok(!ret, "got %#x\n", ret); - ok(params.flags == (AFD_POLL_RESET | AFD_POLL_CONNECT | AFD_POLL_WRITE), "got flags %#x\n", params.flags); + ok(params.flags == AFD_POLL_RESET, "got flags %#x\n", params.flags); for (i = 0; i < ARRAY_SIZE(params.status); ++i) ok(!params.status[i], "got status[%u] %#x\n", i, params.status[i]); @@ -2076,17 +2079,21 @@ static void test_get_events_reset(void) tcp_socketpair(&client, &server); - ret = WSAEventSelect(server, event, FD_ACCEPT | FD_CONNECT | FD_CLOSE | FD_OOB | FD_READ | FD_WRITE); + ResetEvent(event); + ret = WSAEventSelect(server, event, FD_ACCEPT | FD_CLOSE | FD_OOB | FD_READ); ok(!ret, "got error %lu\n", GetLastError()); close_with_rst(client); + ret = WaitForSingleObject(event, 1000); + ok(!ret, "got %d\n", ret); + memset(&params, 0xcc, sizeof(params)); memset(&io, 0xcc, sizeof(io)); ret = NtDeviceIoControlFile((HANDLE)server, NULL, NULL, NULL, &io, IOCTL_AFD_GET_EVENTS, NULL, 0, &params, sizeof(params)); ok(!ret, "got %#x\n", ret); - ok(params.flags == (AFD_POLL_RESET | AFD_POLL_WRITE), "got flags %#x\n", params.flags); + ok(params.flags == AFD_POLL_RESET, "got flags %#x\n", params.flags); for (i = 0; i < ARRAY_SIZE(params.status); ++i) ok(!params.status[i], "got status[%u] %#x\n", i, params.status[i]);

1 0

Rémi Bernon : dmusic/tests: Skip test_default_gm_collection if gm.dls is missing.
by Alexandre Julliard 26 Oct '23

26 Oct '23

Module: wine Branch: master Commit: c8b9a2dcfdb7edde41d8cd0e6e3917a72ece9c99 URL: https://gitlab.winehq.org/wine/wine/-/commit/c8b9a2dcfdb7edde41d8cd0e6e3917… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Oct 23 22:57:25 2023 +0200 dmusic/tests: Skip test_default_gm_collection if gm.dls is missing. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55688 --- dlls/dmusic/tests/dmusic.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/dmusic/tests/dmusic.c b/dlls/dmusic/tests/dmusic.c index 51a6b0d8774..f71c0600366 100644 --- a/dlls/dmusic/tests/dmusic.c +++ b/dlls/dmusic/tests/dmusic.c @@ -1608,6 +1608,11 @@ static void test_default_gm_collection(void) ok(hr == S_OK, "got %#lx\n", hr); hr = IDirectMusicLoader_GetObject(loader, &desc, &IID_IDirectMusicCollection, (void **)&collection); + if (hr == DMUS_E_LOADER_NOFILENAME) + { + skip("Failed to open default GM collection, skipping tests. Missing system SoundFont?\n"); + goto skip_tests; + } ok(hr == S_OK, "got %#lx\n", hr); for (i = 0; hr == S_OK && i < ARRAY_SIZE(results); i++) @@ -1635,6 +1640,8 @@ static void test_default_gm_collection(void) } IDirectMusicCollection_Release(collection); + +skip_tests: IDirectMusicLoader_Release(loader); }

1 0

Rémi Bernon : dmsynth: Set loop and sample generators on the fluid_voice.
by Alexandre Julliard 26 Oct '23

26 Oct '23

Module: wine Branch: master Commit: dd9d37375b1fb760c4e8b63df2f4fedd4e71b050 URL: https://gitlab.winehq.org/wine/wine/-/commit/dd9d37375b1fb760c4e8b63df2f4fe… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun Oct 22 16:21:41 2023 +0200 dmsynth: Set loop and sample generators on the fluid_voice. --- dlls/dmsynth/synth.c | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/dlls/dmsynth/synth.c b/dlls/dmsynth/synth.c index 2e9b6b48245..4fabdcdda87 100644 --- a/dlls/dmsynth/synth.c +++ b/dlls/dmsynth/synth.c @@ -46,6 +46,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmsynth); #define CONN_TRANSFORM(src, ctrl, dst) (((src) & 0x3f) << 10) | (((ctrl) & 0x3f) << 4) | ((dst) & 0xf) +/* from src/rvoice/fluid_rvoice.h */ +#define FLUID_LOOP_DURING_RELEASE 1 +#define FLUID_LOOP_UNTIL_RELEASE 3 + static const char *debugstr_conn_src(UINT src) { switch (src) @@ -1747,11 +1751,6 @@ static int synth_preset_noteon(fluid_preset_t *fluid_preset, fluid_synth_t *flui fluid_sample_set_sound_data(fluid_sample, wave->samples, NULL, wave->sample_count, wave->format.nSamplesPerSec, TRUE); - if (region->wave_sample.cSampleLoops) - { - WLOOP *loop = region->wave_loops; - fluid_sample_set_loop(fluid_sample, loop->ulStart, loop->ulStart + loop->ulLength); - } fluid_sample_set_pitch(fluid_sample, region->wave_sample.usUnityNote, region->wave_sample.sFineTune); if (!(fluid_voice = fluid_synth_alloc_voice(synth->fluid_synth, fluid_sample, chan, key, vel))) @@ -1762,6 +1761,20 @@ static int synth_preset_noteon(fluid_preset_t *fluid_preset, fluid_synth_t *flui } set_default_voice_connections(fluid_voice); + if (region->wave_sample.cSampleLoops) + { + WLOOP *loop = region->wave_loops; + + if (loop->ulType == WLOOP_TYPE_FORWARD) + fluid_voice_gen_set(fluid_voice, GEN_SAMPLEMODE, FLUID_LOOP_DURING_RELEASE); + else if (loop->ulType == WLOOP_TYPE_RELEASE) + fluid_voice_gen_set(fluid_voice, GEN_SAMPLEMODE, FLUID_LOOP_UNTIL_RELEASE); + else + FIXME("Unsupported loop type %lu\n", loop->ulType); + + fluid_voice_gen_set(fluid_voice, GEN_STARTLOOPADDROFS, loop->ulStart); + fluid_voice_gen_set(fluid_voice, GEN_ENDLOOPADDROFS, loop->ulStart + loop->ulLength); + } LIST_FOR_EACH_ENTRY(articulation, &instrument->articulations, struct articulation, entry) add_voice_connections(fluid_voice, &articulation->list, articulation->connections); LIST_FOR_EACH_ENTRY(articulation, &region->articulations, struct articulation, entry)

1 0