- Wine-Commits - list.winehq.org

Michael Stefaniuc : dmime: Remove redundant NULL check before free().
by Alexandre Julliard Nov. 14, 2023

Nov. 14, 2023

Module: wine Branch: master Commit: c3ef2e6efb2ebdd69e021b8518469a775c78c904 URL: https://gitlab.winehq.org/wine/wine/-/commit/c3ef2e6efb2ebdd69e021b8518469a… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Nov 8 19:27:56 2023 +0100 dmime: Remove redundant NULL check before free(). --- dlls/dmime/segment.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c index 126bc44335d..e806a845d37 100644 --- a/dlls/dmime/segment.c +++ b/dlls/dmime/segment.c @@ -112,10 +112,7 @@ static ULONG WINAPI segment_Release(IDirectMusicSegment8 *iface) list_remove(&entry->entry); track_entry_destroy(entry); } - - if (This->wave_data) - free(This->wave_data); - + free(This->wave_data); free(This); }

1 0

Alex Henrie : winmm/tests: Use calloc instead of HeapAlloc.
by Alexandre Julliard Nov. 14, 2023

Nov. 14, 2023

Module: wine Branch: master Commit: 1817d4cc12ef7484b862399fdb52c97b6c1ee432 URL: https://gitlab.winehq.org/wine/wine/-/commit/1817d4cc12ef7484b862399fdb52c9… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sat Nov 11 13:37:22 2023 -0700 winmm/tests: Use calloc instead of HeapAlloc. Fixes: bb6bcaf83e91882e0a523a4455ed7174b3ce3ad4 --- dlls/winmm/tests/wave.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index 8c48e52cb01..673c2c010ac 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -1586,8 +1586,7 @@ static void test_fragmentsize(void) memset(hdr, 0, sizeof(hdr)); hdr[0].dwBufferLength = (fmt.nSamplesPerSec * fmt.nBlockAlign / 4) + 1; hdr[1].dwBufferLength = hdr[0].dwBufferLength - 2; - hdr[1].lpData = hdr[0].lpData = - HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, hdr[0].dwBufferLength); + hdr[1].lpData = hdr[0].lpData = calloc(1, hdr[0].dwBufferLength); rc = waveOutPrepareHeader(wout, &hdr[0], sizeof(hdr[0])); ok(rc == MMSYSERR_NOERROR, "waveOutPrepareHeader failed: %s\n", wave_out_error(rc)); @@ -1694,8 +1693,7 @@ static void test_reentrant_callback(void) memset(hdr, 0, sizeof(hdr)); hdr[0].dwBufferLength = (fmt.nSamplesPerSec * fmt.nBlockAlign / 10); hdr[1].dwBufferLength = hdr[0].dwBufferLength; - hdr[1].lpData = hdr[0].lpData = - HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, hdr[0].dwBufferLength); + hdr[1].lpData = hdr[0].lpData = calloc(1, hdr[0].dwBufferLength); rc = waveOutPrepareHeader(wout, &hdr[0], sizeof(hdr[0])); ok(rc == MMSYSERR_NOERROR, "waveOutPrepareHeader failed: %s\n", wave_out_error(rc));

1 0

Henri Verbeet : build: Make doxygen output slightly less verbose.
by Alexandre Julliard Nov. 14, 2023

Nov. 14, 2023

Module: vkd3d Branch: master Commit: b7480911a88a4d25e4a4d391fb0c71f1065e5337 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/b7480911a88a4d25e4a4d391fb0c7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 13 13:45:13 2023 +0100 build: Make doxygen output slightly less verbose. There is perhaps a bit of a trade-off involved here, but with the current state of things it's fairly hard to notice unexpected issues in the output. --- Doxyfile.in | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Doxyfile.in b/Doxyfile.in index a20e6f02..3ecad918 100644 --- a/Doxyfile.in +++ b/Doxyfile.in @@ -8,6 +8,9 @@ OUTPUT_DIRECTORY = doc JAVADOC_AUTOBRIEF = YES OPTIMIZE_OUTPUT_FOR_C = YES EXTRACT_STATIC = YES +QUIET = YES +WARN_IF_UNDOCUMENTED = NO +LATEX_BATCHMODE = YES INPUT = @srcdir@/include/vkd3d.h \ @srcdir@/include/vkd3d_shader.h \

1 0

Alex Henrie : gdi32/tests: Free what GdiConvertToDevmodeW returns with HeapFree.
by Alexandre Julliard Nov. 14, 2023

Nov. 14, 2023

Module: wine Branch: master Commit: 2fcbfc4ca6bfb39e68cdad9c3c61bc567711ed59 URL: https://gitlab.winehq.org/wine/wine/-/commit/2fcbfc4ca6bfb39e68cdad9c3c61bc… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sat Nov 11 14:27:37 2023 -0700 gdi32/tests: Free what GdiConvertToDevmodeW returns with HeapFree. This partially reverts commit 0b7eed0310a2d1272a97d8a45ec37fa03a9c26c8. --- dlls/gdi32/tests/dc.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index 69cd44107a0..4d09de78d67 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -285,13 +285,13 @@ static void test_GdiConvertToDevmodeW(void) dmW = pGdiConvertToDevmodeW(&dmA); ok(dmW->dmSize >= FIELD_OFFSET(DEVMODEW, dmICMMethod), "dmSize is too small: %04x\n", dmW->dmSize); ok(dmW->dmSize <= sizeof(DEVMODEW), "dmSize is too large: %04x\n", dmW->dmSize); - free(dmW); + HeapFree(GetProcessHeap(), 0, dmW); dmA.dmSize = FIELD_OFFSET(DEVMODEA, dmFields) + sizeof(dmA.dmFields); dmW = pGdiConvertToDevmodeW(&dmA); ok(dmW->dmSize == FIELD_OFFSET(DEVMODEW, dmFields) + sizeof(dmW->dmFields), "wrong size %u\n", dmW->dmSize); - free(dmW); + HeapFree(GetProcessHeap(), 0, dmW); dmA.dmICMMethod = DMICMMETHOD_NONE; dmA.dmSize = FIELD_OFFSET(DEVMODEA, dmICMMethod) + sizeof(dmA.dmICMMethod); @@ -300,13 +300,13 @@ static void test_GdiConvertToDevmodeW(void) "wrong size %u\n", dmW->dmSize); ok(dmW->dmICMMethod == DMICMMETHOD_NONE, "expected DMICMMETHOD_NONE, got %lu\n", dmW->dmICMMethod); - free(dmW); + HeapFree(GetProcessHeap(), 0, dmW); dmA.dmSize = 1024; dmW = pGdiConvertToDevmodeW(&dmA); ok(dmW->dmSize == FIELD_OFFSET(DEVMODEW, dmPanningHeight) + sizeof(dmW->dmPanningHeight), "wrong size %u\n", dmW->dmSize); - free(dmW); + HeapFree(GetProcessHeap(), 0, dmW); SetLastError(0xdeadbeef); dmA.dmSize = 0; @@ -319,7 +319,7 @@ static void test_GdiConvertToDevmodeW(void) dmW = pGdiConvertToDevmodeW(&dmA); ok(dmW->dmSize == FIELD_OFFSET(DEVMODEW, dmFields), "expected %04lx, got %04x\n", FIELD_OFFSET(DEVMODEW, dmFields), dmW->dmSize); - free(dmW); + HeapFree(GetProcessHeap(), 0, dmW); } static void test_device_caps( HDC hdc, HDC ref_dc, const char *descr, int scale )

1 0

Conor McCarthy : vkd3d-shader/dxil: Handle missing flags as zero for BINOP.
by Alexandre Julliard Nov. 14, 2023

Nov. 14, 2023

Module: vkd3d Branch: master Commit: f1e9f400612d6b573ec927044fb295a5f5ea67f8 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/f1e9f400612d6b573ec927044fb29… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Mon Nov 13 13:10:33 2023 +1000 vkd3d-shader/dxil: Handle missing flags as zero for BINOP. The flag operand is omitted if IEEE strictness is specified. --- libs/vkd3d-shader/dxil.c | 82 +++++++++++++++++++++++------------------------- 1 file changed, 40 insertions(+), 42 deletions(-) diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index 82308ff6..0297be37 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -2821,8 +2821,9 @@ static void sm6_parser_emit_binop(struct sm6_parser *sm6, const struct dxil_reco struct vkd3d_shader_src_param *src_params; enum vkd3d_shader_opcode handler_idx; const struct sm6_value *a, *b; + uint64_t code, flags; + bool silence_warning; unsigned int i = 0; - uint64_t code; a = sm6_parser_get_value_by_ref(sm6, record, NULL, &i); b = sm6_parser_get_value_by_ref(sm6, record, a->type, &i); @@ -2838,48 +2839,45 @@ static void sm6_parser_emit_binop(struct sm6_parser *sm6, const struct dxil_reco vsir_instruction_init(ins, &sm6->p.location, handler_idx); - if (record->operand_count > i && record->operands[i]) - { - uint64_t flags = record->operands[i]; - bool silence_warning = false; + flags = (record->operand_count > i) ? record->operands[i] : 0; + silence_warning = false; - switch (handler_idx) - { - case VKD3DSIH_ADD: - case VKD3DSIH_MUL: - case VKD3DSIH_DIV: - case VKD3DSIH_FREM: - if (!(flags & FP_ALLOW_UNSAFE_ALGEBRA)) - ins->flags |= VKD3DSI_PRECISE_X; - flags &= ~FP_ALLOW_UNSAFE_ALGEBRA; - /* SPIR-V FPFastMathMode is only available in the Kernel executon model. */ - silence_warning = !(flags & ~(FP_NO_NAN | FP_NO_INF | FP_NO_SIGNED_ZEROS | FP_ALLOW_RECIPROCAL)); - break; - case VKD3DSIH_IADD: - case VKD3DSIH_UMUL: - case VKD3DSIH_ISHL: - silence_warning = !(flags & ~(OB_NO_UNSIGNED_WRAP | OB_NO_SIGNED_WRAP)); - break; - case VKD3DSIH_ISHR: - case VKD3DSIH_USHR: - case VKD3DSIH_IDIV: - case VKD3DSIH_UDIV: - silence_warning = !(flags & ~PEB_EXACT); - break; - default: - break; - } - /* The above flags are very common and cause warning spam. */ - if (flags && silence_warning) - { - TRACE("Ignoring flags %#"PRIx64".\n", flags); - } - else if (flags) - { - WARN("Ignoring flags %#"PRIx64".\n", flags); - vkd3d_shader_parser_warning(&sm6->p, VKD3D_SHADER_WARNING_DXIL_IGNORING_OPERANDS, - "Ignoring flags %#"PRIx64" for a binary operation.", flags); - } + switch (handler_idx) + { + case VKD3DSIH_ADD: + case VKD3DSIH_MUL: + case VKD3DSIH_DIV: + case VKD3DSIH_FREM: + if (!(flags & FP_ALLOW_UNSAFE_ALGEBRA)) + ins->flags |= VKD3DSI_PRECISE_X; + flags &= ~FP_ALLOW_UNSAFE_ALGEBRA; + /* SPIR-V FPFastMathMode is only available in the Kernel executon model. */ + silence_warning = !(flags & ~(FP_NO_NAN | FP_NO_INF | FP_NO_SIGNED_ZEROS | FP_ALLOW_RECIPROCAL)); + break; + case VKD3DSIH_IADD: + case VKD3DSIH_UMUL: + case VKD3DSIH_ISHL: + silence_warning = !(flags & ~(OB_NO_UNSIGNED_WRAP | OB_NO_SIGNED_WRAP)); + break; + case VKD3DSIH_ISHR: + case VKD3DSIH_USHR: + case VKD3DSIH_IDIV: + case VKD3DSIH_UDIV: + silence_warning = !(flags & ~PEB_EXACT); + break; + default: + break; + } + /* The above flags are very common and cause warning spam. */ + if (flags && silence_warning) + { + TRACE("Ignoring flags %#"PRIx64".\n", flags); + } + else if (flags) + { + WARN("Ignoring flags %#"PRIx64".\n", flags); + vkd3d_shader_parser_warning(&sm6->p, VKD3D_SHADER_WARNING_DXIL_IGNORING_OPERANDS, + "Ignoring flags %#"PRIx64" for a binary operation.", flags); } src_params = instruction_src_params_alloc(ins, 2, sm6);

1 0

Conor McCarthy : vkd3d-shader/dxil: Handle missing flags as zero for CMP2.
by Alexandre Julliard Nov. 14, 2023

Nov. 14, 2023

Module: vkd3d Branch: master Commit: 408f67c69c32744fcdb940957dbf077301e87703 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/408f67c69c32744fcdb940957dbf0… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Mon Nov 13 13:13:53 2023 +1000 vkd3d-shader/dxil: Handle missing flags as zero for CMP2. The flag operand is omitted if IEEE strictness is specified. --- libs/vkd3d-shader/dxil.c | 45 +++++++++++++++++++++------------------------ 1 file changed, 21 insertions(+), 24 deletions(-) diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index 0297be37..04dfdf57 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -3494,11 +3494,11 @@ static void sm6_parser_emit_cmp2(struct sm6_parser *sm6, const struct dxil_recor { struct vkd3d_shader_src_param *src_params; const struct sm6_type *type_a, *type_b; + bool is_int, is_fp, silence_warning; const struct sm6_cmp_info *cmp; const struct sm6_value *a, *b; + uint64_t code, flags; unsigned int i = 0; - bool is_int, is_fp; - uint64_t code; if (!(dst->type = sm6->bool_type)) { @@ -3549,29 +3549,26 @@ static void sm6_parser_emit_cmp2(struct sm6_parser *sm6, const struct dxil_recor vsir_instruction_init(ins, &sm6->p.location, cmp->handler_idx); - if (record->operand_count > i) - { - uint64_t flags = record->operands[i]; - bool silence_warning = false; + flags = (record->operand_count > i) ? record->operands[i] : 0; + silence_warning = false; - if (is_fp) - { - if (!(flags & FP_ALLOW_UNSAFE_ALGEBRA)) - ins->flags |= VKD3DSI_PRECISE_X; - flags &= ~FP_ALLOW_UNSAFE_ALGEBRA; - /* SPIR-V FPFastMathMode is only available in the Kernel execution model. */ - silence_warning = !(flags & ~(FP_NO_NAN | FP_NO_INF | FP_NO_SIGNED_ZEROS | FP_ALLOW_RECIPROCAL)); - } - if (flags && silence_warning) - { - TRACE("Ignoring fast FP modifier %#"PRIx64".\n", flags); - } - else if (flags) - { - WARN("Ignoring flags %#"PRIx64".\n", flags); - vkd3d_shader_parser_warning(&sm6->p, VKD3D_SHADER_WARNING_DXIL_IGNORING_OPERANDS, - "Ignoring flags %#"PRIx64" for a comparison operation.", flags); - } + if (is_fp) + { + if (!(flags & FP_ALLOW_UNSAFE_ALGEBRA)) + ins->flags |= VKD3DSI_PRECISE_X; + flags &= ~FP_ALLOW_UNSAFE_ALGEBRA; + /* SPIR-V FPFastMathMode is only available in the Kernel execution model. */ + silence_warning = !(flags & ~(FP_NO_NAN | FP_NO_INF | FP_NO_SIGNED_ZEROS | FP_ALLOW_RECIPROCAL)); + } + if (flags && silence_warning) + { + TRACE("Ignoring fast FP modifier %#"PRIx64".\n", flags); + } + else if (flags) + { + WARN("Ignoring flags %#"PRIx64".\n", flags); + vkd3d_shader_parser_warning(&sm6->p, VKD3D_SHADER_WARNING_DXIL_IGNORING_OPERANDS, + "Ignoring flags %#"PRIx64" for a comparison operation.", flags); } src_params = instruction_src_params_alloc(ins, 2, sm6);

1 0

Rémi Bernon : dmime: Split segment_state_play_chunk helper.
by Alexandre Julliard Nov. 13, 2023

Nov. 13, 2023

Module: wine Branch: master Commit: eada40789d09feb19825e17c7c00dd94ddc901fe URL: https://gitlab.winehq.org/wine/wine/-/commit/eada40789d09feb19825e17c7c00dd… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Nov 13 10:46:18 2023 +0100 dmime: Split segment_state_play_chunk helper. --- dlls/dmime/segmentstate.c | 36 ++++++++++++++++++++++++------------ 1 file changed, 24 insertions(+), 12 deletions(-) diff --git a/dlls/dmime/segmentstate.c b/dlls/dmime/segmentstate.c index 544620b0045..0f0851d16c2 100644 --- a/dlls/dmime/segmentstate.c +++ b/dlls/dmime/segmentstate.c @@ -269,22 +269,15 @@ HRESULT segment_state_create(IDirectMusicSegment *segment, MUSIC_TIME start_time return hr; } -static HRESULT segment_state_play_chunk(struct segment_state *This, IDirectMusicPerformance8 *performance, - REFERENCE_TIME duration, DWORD track_flags) +static HRESULT segment_state_play_until(struct segment_state *This, IDirectMusicPerformance8 *performance, + MUSIC_TIME end_time, DWORD track_flags) { IDirectMusicSegmentState *iface = (IDirectMusicSegmentState *)&This->IDirectMusicSegmentState8_iface; - MUSIC_TIME next_time, played; struct track_entry *entry; - REFERENCE_TIME time; HRESULT hr = S_OK; + MUSIC_TIME played; - if (FAILED(hr = IDirectMusicPerformance8_MusicToReferenceTime(performance, - This->start_time + This->played, &time))) - return hr; - if (FAILED(hr = IDirectMusicPerformance8_ReferenceToMusicTime(performance, - time + duration, &next_time))) - return hr; - played = min(next_time - This->start_time, This->end_point - This->start_point); + played = min(end_time - This->start_time, This->end_point - This->start_point); LIST_FOR_EACH_ENTRY(entry, &This->tracks, struct track_entry, entry) { @@ -299,7 +292,26 @@ static HRESULT segment_state_play_chunk(struct segment_state *This, IDirectMusic } This->played = played; - if (This->start_point + This->played >= This->end_point) + if (This->start_point + This->played >= This->end_point) return S_FALSE; + return S_OK; +} + +static HRESULT segment_state_play_chunk(struct segment_state *This, IDirectMusicPerformance8 *performance, + REFERENCE_TIME duration, DWORD track_flags) +{ + IDirectMusicSegmentState *iface = (IDirectMusicSegmentState *)&This->IDirectMusicSegmentState8_iface; + MUSIC_TIME next_time; + REFERENCE_TIME time; + HRESULT hr; + + if (FAILED(hr = IDirectMusicPerformance8_MusicToReferenceTime(performance, + This->start_time + This->played, &time))) + return hr; + if (FAILED(hr = IDirectMusicPerformance8_ReferenceToMusicTime(performance, + time + duration, &next_time))) + return hr; + + if ((hr = segment_state_play_until(This, performance, next_time, track_flags)) == S_FALSE) { MUSIC_TIME end_time = This->start_time + This->played;

1 0

Rémi Bernon : dmime: Implement segment state repeat and looping.
by Alexandre Julliard Nov. 13, 2023

Nov. 13, 2023

Module: wine Branch: master Commit: 99aa613f26cfb047e3ac7e73140387fe0bb912c9 URL: https://gitlab.winehq.org/wine/wine/-/commit/99aa613f26cfb047e3ac7e73140387… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Nov 13 14:32:38 2023 +0100 dmime: Implement segment state repeat and looping. --- dlls/dmime/segmentstate.c | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/dlls/dmime/segmentstate.c b/dlls/dmime/segmentstate.c index 0f0851d16c2..3b939bc95ca 100644 --- a/dlls/dmime/segmentstate.c +++ b/dlls/dmime/segmentstate.c @@ -53,6 +53,7 @@ struct segment_state MUSIC_TIME end_point; MUSIC_TIME played; BOOL auto_download; + DWORD repeats; struct list tracks; }; @@ -234,6 +235,7 @@ HRESULT segment_state_create(IDirectMusicSegment *segment, MUSIC_TIME start_time This->start_time = start_time; if (SUCCEEDED(hr)) hr = IDirectMusicSegment_GetStartPoint(segment, &This->start_point); if (SUCCEEDED(hr)) hr = IDirectMusicSegment_GetLength(segment, &This->end_point); + if (SUCCEEDED(hr)) hr = IDirectMusicSegment_GetRepeats(segment, &This->repeats); for (i = 0; SUCCEEDED(hr); i++) { @@ -311,17 +313,28 @@ static HRESULT segment_state_play_chunk(struct segment_state *This, IDirectMusic time + duration, &next_time))) return hr; - if ((hr = segment_state_play_until(This, performance, next_time, track_flags)) == S_FALSE) + while ((hr = segment_state_play_until(This, performance, next_time, track_flags)) == S_FALSE) { - MUSIC_TIME end_time = This->start_time + This->played; - - if (FAILED(hr = performance_send_segment_end(performance, end_time, iface, FALSE))) + if (!This->repeats) { - ERR("Failed to send segment end, hr %#lx\n", hr); - return hr; + MUSIC_TIME end_time = This->start_time + This->played; + + if (FAILED(hr = performance_send_segment_end(performance, end_time, iface, FALSE))) + { + ERR("Failed to send segment end, hr %#lx\n", hr); + return hr; + } + + return S_FALSE; } - return S_FALSE; + if (FAILED(hr = IDirectMusicSegment_GetLoopPoints(This->segment, &This->played, + &This->end_point))) + break; + This->start_time += This->end_point - This->start_point; + This->repeats--; + + if (next_time <= This->start_time || This->end_point <= This->start_point) break; } return S_OK;

1 0

Rémi Bernon : dmsynth: Reset synthesizer defaults on MIDI_SYSTEM_RESET.
by Alexandre Julliard Nov. 13, 2023

Nov. 13, 2023

Module: wine Branch: master Commit: 8f3980fc85d128842619badc8e81bdde35794a0e URL: https://gitlab.winehq.org/wine/wine/-/commit/8f3980fc85d128842619badc8e81bd… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Oct 25 10:57:54 2023 +0200 dmsynth: Reset synthesizer defaults on MIDI_SYSTEM_RESET. --- dlls/dmsynth/synth.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/dmsynth/synth.c b/dlls/dmsynth/synth.c index 410fb59089e..51271e48b2a 100644 --- a/dlls/dmsynth/synth.c +++ b/dlls/dmsynth/synth.c @@ -1125,7 +1125,9 @@ static HRESULT WINAPI synth_Render(IDirectMusicSynth8 *iface, short *buffer, TRACE("status %#x chan %#x midi %#x %#x\n", status, chan, event->midi[1], event->midi[2]); - switch (status) + if (event->midi[0] == MIDI_SYSTEM_RESET) + synth_reset_default_values(This); + else switch (status) { case MIDI_NOTE_OFF: fluid_synth_noteoff(This->fluid_synth, chan, event->midi[1]);

1 0

Rémi Bernon : dmime/tests: Avoid discarding old notifications in test.
by Alexandre Julliard Nov. 13, 2023

Nov. 13, 2023

Module: wine Branch: master Commit: ddd877d1c778adae47fd1a593a806d1531a037ae URL: https://gitlab.winehq.org/wine/wine/-/commit/ddd877d1c778adae47fd1a593a806d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Nov 10 15:04:17 2023 +0100 dmime/tests: Avoid discarding old notifications in test. --- dlls/dmime/tests/dmime.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index 7613b82c893..e181a6b1299 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -3176,6 +3176,10 @@ static void test_notification_pmsg(void) hr = IDirectMusicPerformance_AddNotificationType(performance, &GUID_NOTIFICATION_SEGMENT); ok(hr == S_FALSE, "got %#lx\n", hr); + /* avoid discarding older notifications */ + hr = IDirectMusicPerformance_SetNotificationHandle(performance, 0, 100000000); + ok(hr == S_OK, "got %#lx\n", hr); + hr = IDirectMusicPerformance_PlaySegment(performance, segment, 0, 0, &state); ok(hr == S_OK, "got %#lx\n", hr); hr = IDirectMusicPerformance_GetTime(performance, NULL, &music_time);

1 0