October 2023 - Wine-Commits

Rémi Bernon : dmime: Ignore badly formed wave if format and data have been found.
by Alexandre Julliard Oct. 26, 2023

Oct. 26, 2023

Module: wine Branch: master Commit: 17416be982c73f4ba9e99b718db56759ee3c7512 URL: https://gitlab.winehq.org/wine/wine/-/commit/17416be982c73f4ba9e99b718db567… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Oct 26 14:38:06 2023 +0200 dmime: Ignore badly formed wave if format and data have been found. --- dlls/dmusic/wave.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/dmusic/wave.c b/dlls/dmusic/wave.c index dd0b8a44779..8ee713bd4f0 100644 --- a/dlls/dmusic/wave.c +++ b/dlls/dmusic/wave.c @@ -167,6 +167,7 @@ static HRESULT parse_wave_chunk(struct wave *This, IStream *stream, struct chunk if (FAILED(hr)) break; } + if (This->format && This->data) return S_OK; return hr; }

1 0

Rémi Bernon : dmime: Skip segment chunk on parsing failure (or success).
by Alexandre Julliard Oct. 26, 2023

Oct. 26, 2023

Module: wine Branch: master Commit: bff73016993f8c9439b88fb158ad801ce5ef15d0 URL: https://gitlab.winehq.org/wine/wine/-/commit/bff73016993f8c9439b88fb158ad80… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Oct 26 14:39:03 2023 +0200 dmime: Skip segment chunk on parsing failure (or success). --- dlls/dmime/segment.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c index d7402911f00..5f409b3cb5a 100644 --- a/dlls/dmime/segment.c +++ b/dlls/dmime/segment.c @@ -833,6 +833,7 @@ static HRESULT WINAPI segment_persist_stream_Load(IPersistStream *iface, IStream } } + stream_skip_chunk(stream, &chunk); if (FAILED(hr)) { WARN("Failed to load segment from stream %p, hr %#lx\n", stream, hr);

1 0

Rémi Bernon : dmusic: Ignore some known wave chunks.
by Alexandre Julliard Oct. 26, 2023

Oct. 26, 2023

Module: wine Branch: master Commit: 347fb8bc8e8005ccb397995426f8d12c0c941b8d URL: https://gitlab.winehq.org/wine/wine/-/commit/347fb8bc8e8005ccb397995426f8d1… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Sep 19 08:56:18 2023 +0200 dmusic: Ignore some known wave chunks. --- dlls/dmusic/wave.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/dmusic/wave.c b/dlls/dmusic/wave.c index 8ee713bd4f0..27f7224af49 100644 --- a/dlls/dmusic/wave.c +++ b/dlls/dmusic/wave.c @@ -159,6 +159,11 @@ static HRESULT parse_wave_chunk(struct wave *This, IStream *stream, struct chunk hr = parse_wsmp_chunk(This, stream, &chunk); break; + case mmioFOURCC('w','a','v','u'): + case mmioFOURCC('s','m','p','l'): + case MAKE_IDTYPE(FOURCC_LIST, DMUS_FOURCC_INFO_LIST): + break; + default: FIXME("Ignoring chunk %s %s\n", debugstr_fourcc(chunk.id), debugstr_fourcc(chunk.type)); break;

1 0

Rémi Bernon : dmband: Skip band / band track chunk on parsing failure.
by Alexandre Julliard Oct. 26, 2023

Oct. 26, 2023

Module: wine Branch: master Commit: f5c8d273b68517b86b49db17d9ce12d3958b7fae URL: https://gitlab.winehq.org/wine/wine/-/commit/f5c8d273b68517b86b49db17d9ce12… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Oct 26 14:36:33 2023 +0200 dmband: Skip band / band track chunk on parsing failure. --- dlls/dmband/band.c | 2 +- dlls/dmband/bandtrack.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dmband/band.c b/dlls/dmband/band.c index 4c593741516..78ec68ae035 100644 --- a/dlls/dmband/band.c +++ b/dlls/dmband/band.c @@ -422,6 +422,7 @@ static HRESULT WINAPI band_persist_stream_Load(IPersistStream *iface, IStream *s } } + stream_skip_chunk(stream, &chunk); if (FAILED(hr)) return hr; if (TRACE_ON(dmband)) @@ -439,7 +440,6 @@ static HRESULT WINAPI band_persist_stream_Load(IPersistStream *iface, IStream *s } } - stream_skip_chunk(stream, &chunk); return S_OK; } diff --git a/dlls/dmband/bandtrack.c b/dlls/dmband/bandtrack.c index 5229204b284..0ec14483c33 100644 --- a/dlls/dmband/bandtrack.c +++ b/dlls/dmband/bandtrack.c @@ -568,6 +568,7 @@ static HRESULT WINAPI band_track_persist_stream_Load(IPersistStream *iface, IStr } } + stream_skip_chunk(stream, &chunk); if (FAILED(hr)) return hr; if (TRACE_ON(dmband)) @@ -590,7 +591,6 @@ static HRESULT WINAPI band_track_persist_stream_Load(IPersistStream *iface, IStr } } - stream_skip_chunk(stream, &chunk); return S_OK; }

1 0

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

Oct. 26, 2023

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 Oct. 26, 2023

Oct. 26, 2023

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

Alistair Leslie-Hughes : msxml: Always increase error count when detected.
by Alexandre Julliard Oct. 26, 2023

Oct. 26, 2023

Module: wine Branch: master Commit: 60e8b78e4d232c09818b4a2b7977a3841df84338 URL: https://gitlab.winehq.org/wine/wine/-/commit/60e8b78e4d232c09818b4a2b7977a3… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Oct 20 16:23:08 2023 +1100 msxml: Always increase error count when detected. The error count wasn't be increased if tracing was disabled. eg CI. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55720 --- dlls/msxml3/xslpattern.y | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/msxml3/xslpattern.y b/dlls/msxml3/xslpattern.y index 9abf43cad35..b308c3150b0 100644 --- a/dlls/msxml3/xslpattern.y +++ b/dlls/msxml3/xslpattern.y @@ -40,6 +40,7 @@ static inline BOOL is_literal(xmlChar const* tok) static void xslpattern_error(parser_param* param, void const* scanner, char const* msg) { + param->err++; FIXME("%s:\n" " param {\n" " yyscanner=%p\n" @@ -52,7 +53,7 @@ static void xslpattern_error(parser_param* param, void const* scanner, char cons " }\n" " scanner=%p\n", msg, param->yyscanner, param->ctx, param->in, param->pos, - param->len, param->out, ++param->err, scanner); + param->len, param->out, param->err, scanner); } %}

1 0

Rémi Bernon : dmime: Force recompute MIDI message reference time.
by Alexandre Julliard Oct. 26, 2023

Oct. 26, 2023

Module: wine Branch: master Commit: 9ad97f69b4b25e439284925aca927d25a4c9dfde URL: https://gitlab.winehq.org/wine/wine/-/commit/9ad97f69b4b25e439284925aca927d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun Oct 22 15:51:05 2023 +0200 dmime: Force recompute MIDI message reference time. Fixes 65e388137c6117aaf8f99cef808d32afa29c7639, which is otherwise no-op without this change. --- dlls/dmime/performance.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index a2e611523a6..e0da0516c79 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -1706,7 +1706,7 @@ static HRESULT WINAPI performance_tool_ProcessPMsg(IDirectMusicTool *iface, DMUS_NOTE_PMSG *note = (DMUS_NOTE_PMSG *)msg; msg->mtTime += note->nOffset; - if (FAILED(hr = performance_send_midi_pmsg(This, msg, DMUS_PMSGF_REFTIME | DMUS_PMSGF_MUSICTIME | DMUS_PMSGF_TOOL_IMMEDIATE, + if (FAILED(hr = performance_send_midi_pmsg(This, msg, DMUS_PMSGF_MUSICTIME | DMUS_PMSGF_TOOL_IMMEDIATE, MIDI_NOTE_ON, note->bMidiValue, note->bVelocity))) WARN("Failed to translate message to MIDI, hr %#lx\n", hr);

1 0

Rémi Bernon : dmime/tests: Ignore failure on missing gm.dls in test_band_track_play.
by Alexandre Julliard Oct. 26, 2023

Oct. 26, 2023

Module: wine Branch: master Commit: bbdea3afc3ad3e92c67a05dac359b3f445cf39e8 URL: https://gitlab.winehq.org/wine/wine/-/commit/bbdea3afc3ad3e92c67a05dac359b3… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Oct 23 22:53:41 2023 +0200 dmime/tests: Ignore failure on missing gm.dls in test_band_track_play. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55722 --- dlls/dmime/tests/dmime.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index 7ed6568ecd4..85ea8fcfeff 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -3722,7 +3722,10 @@ static void test_band_track_play(void) &IID_IDirectMusicLoader8, (void **)&loader); ok(hr == S_OK, "got %#lx\n", hr); hr = IDirectMusicLoader_SetObject(loader, &desc); - ok(hr == S_OK, "got %#lx\n", hr); + if (hr == DMUS_E_LOADER_FAILEDOPEN) + skip("Failed to open gm.dls, missing system SoundFont?\n"); + else + ok(hr == S_OK, "got %#lx\n", hr); hr = test_loader_stream_create(stream, loader, &loader_stream); ok(hr == S_OK, "got %#lx\n", hr);

1 0

Paul Gofman : ntdll: Define heap block's BLOCK_FLAG_LFH as 0x80.
by Alexandre Julliard Oct. 26, 2023

Oct. 26, 2023

Module: wine Branch: master Commit: 059094c1c18ddc33b04eac53a72fd0eb7510be94 URL: https://gitlab.winehq.org/wine/wine/-/commit/059094c1c18ddc33b04eac53a72fd0… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Oct 19 18:46:13 2023 -0600 ntdll: Define heap block's BLOCK_FLAG_LFH as 0x80. --- dlls/ntdll/heap.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 5ce7f8fad2f..b5e2076ffae 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -103,12 +103,12 @@ C_ASSERT( sizeof(struct block) == 8 ); #define BLOCK_FLAG_PREV_FREE 0x02 #define BLOCK_FLAG_FREE_LINK 0x03 #define BLOCK_FLAG_LARGE 0x04 -#define BLOCK_FLAG_LFH 0x08 /* block is handled by the LFH frontend */ -#define BLOCK_FLAG_USER_INFO 0x10 /* user flags up to 0xf0 */ -#define BLOCK_FLAG_USER_MASK 0xf0 +#define BLOCK_FLAG_LFH 0x80 /* block is handled by the LFH frontend */ +#define BLOCK_FLAG_USER_INFO 0x08 /* user flags bits 3-6 */ +#define BLOCK_FLAG_USER_MASK 0x78 -#define BLOCK_USER_FLAGS( heap_flags ) (((heap_flags) >> 4) & BLOCK_FLAG_USER_MASK) -#define HEAP_USER_FLAGS( block_flags ) (((block_flags) & BLOCK_FLAG_USER_MASK) << 4) +#define BLOCK_USER_FLAGS( heap_flags ) (((heap_flags) >> 5) & BLOCK_FLAG_USER_MASK) +#define HEAP_USER_FLAGS( block_flags ) (((block_flags) & BLOCK_FLAG_USER_MASK) << 5) /* entry to link free blocks in free lists */ @@ -1946,7 +1946,7 @@ static NTSTATUS heap_allocate_block_lfh( struct heap *heap, ULONG flags, SIZE_T if ((block = find_free_bin_block( heap, flags, block_size, bin ))) { block_set_type( block, BLOCK_TYPE_USED ); - block_set_flags( block, ~BLOCK_FLAG_LFH, BLOCK_USER_FLAGS( flags ) ); + block_set_flags( block, (BYTE)~BLOCK_FLAG_LFH, BLOCK_USER_FLAGS( flags ) ); block->tail_size = block_size - sizeof(*block) - size; initialize_block( block, 0, size, flags ); mark_block_tail( block, flags ); @@ -1971,7 +1971,7 @@ static NTSTATUS heap_free_block_lfh( struct heap *heap, ULONG flags, struct bloc i = block_get_group_index( block ); valgrind_make_writable( block, sizeof(*block) ); block_set_type( block, BLOCK_TYPE_FREE ); - block_set_flags( block, ~BLOCK_FLAG_LFH, BLOCK_FLAG_FREE ); + block_set_flags( block, (BYTE)~BLOCK_FLAG_LFH, BLOCK_FLAG_FREE ); mark_block_free( block + 1, (char *)block + block_size - (char *)(block + 1), flags ); /* if this was the last used block in a group and GROUP_FLAG_FREE was set */

1 0