- Wine-Commits - list.winehq.org

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

Bartosz Kosiorek : gdiplus: Improve performance of units_to_pixels by not using division.
by Alexandre Julliard Oct. 26, 2023

Oct. 26, 2023

Module: wine Branch: master Commit: 012f61067591c53a5d2508d8721223ae9a835383 URL: https://gitlab.winehq.org/wine/wine/-/commit/012f61067591c53a5d2508d8721223… Author: Bartosz Kosiorek <gang65(a)poczta.onet.pl> Date: Tue Oct 24 22:12:21 2023 +0200 gdiplus: Improve performance of units_to_pixels by not using division. Single float division (divss) is at least four time slower, than multiplication (mulss). More information: https://www.agner.org/optimize/instruction_tables.pdf The units_to_pixels was optimized to use only multiplication (mulss), and avoid using divisions (divss). --- dlls/gdiplus/gdiplus.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/gdiplus.c b/dlls/gdiplus/gdiplus.c index a3c85986ffc..3c4ecdeab5f 100644 --- a/dlls/gdiplus/gdiplus.c +++ b/dlls/gdiplus/gdiplus.c @@ -36,7 +36,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(gdiplus); static const REAL mm_per_inch = 25.4; +static const REAL inch_per_mm = 1.0 / 25.4; static const REAL point_per_inch = 72.0; +static const REAL inch_per_point = 1.0 / 72.0; static Status WINAPI NotificationHook(ULONG_PTR *token) { @@ -333,17 +335,17 @@ REAL units_to_pixels(REAL units, GpUnit unit, REAL dpi, BOOL printer_display) return units; case UnitDisplay: if (printer_display) - return units * dpi / 100.0; + return units * dpi * 0.01f; else return units; case UnitPoint: - return units * dpi / point_per_inch; + return units * dpi * inch_per_point; case UnitInch: return units * dpi; case UnitDocument: - return units * dpi / 300.0; /* Per MSDN */ + return units * dpi * (1.0f / 300.0f); /* Per MSDN */ case UnitMillimeter: - return units * dpi / mm_per_inch; + return units * dpi * inch_per_mm; default: FIXME("Unhandled unit type: %d\n", unit); return 0;

1 0

Rémi Bernon : dmime/tests: Remove flaky track playing state test.
by Alexandre Julliard Oct. 26, 2023

Oct. 26, 2023

Module: wine Branch: master Commit: 3e31e29d653c6593ea4d18558a6c1946f3d13eca URL: https://gitlab.winehq.org/wine/wine/-/commit/3e31e29d653c6593ea4d18558a6c19… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Oct 23 22:49:46 2023 +0200 dmime/tests: Remove flaky track playing state test. This fails regularly on Win7. --- dlls/dmime/tests/dmime.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index 6dc9d8e0f5e..151dbead3c1 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -3971,11 +3971,6 @@ static void test_segment_state(void) ok(hr == S_OK, "got %#lx\n", hr); - /* This might be timing dependent and if PlaySegment is already - * late, the tracks are played synchronously and right away. - */ - todo_wine check_track_state(track, playing, FALSE); - ret = test_track_wait_playing(track, 50); ok(ret == 0, "got %#lx\n", ret);

1 0

Rémi Bernon : dmime/tests: Avoid checking message segment state reference count.
by Alexandre Julliard Oct. 26, 2023

Oct. 26, 2023

Module: wine Branch: master Commit: b971c55a3a180d77132cbfe4156de4928ce447c4 URL: https://gitlab.winehq.org/wine/wine/-/commit/b971c55a3a180d77132cbfe4156de4… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Oct 25 14:19:31 2023 +0200 dmime/tests: Avoid checking message segment state reference count. --- dlls/dmime/tests/dmime.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index 151dbead3c1..7ed6568ecd4 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -38,8 +38,8 @@ static ULONG get_refcount(void *iface) return IUnknown_Release(unknown); } -#define check_interface(a, b, c) check_interface_(__LINE__, a, b, c) -static void check_interface_(unsigned int line, void *iface_ptr, REFIID iid, BOOL supported) +#define check_interface(a, b, c) check_interface_(__LINE__, a, b, c, FALSE) +static void check_interface_(unsigned int line, void *iface_ptr, REFIID iid, BOOL supported, BOOL check_refs) { ULONG expect_ref = get_refcount(iface_ptr); IUnknown *iface = iface_ptr; @@ -52,10 +52,10 @@ static void check_interface_(unsigned int line, void *iface_ptr, REFIID iid, BOO if (SUCCEEDED(hr)) { LONG ref = get_refcount(unk); - ok_(__FILE__, line)(ref == expect_ref + 1, "got %ld\n", ref); + if (check_refs) ok_(__FILE__, line)(ref == expect_ref + 1, "got %ld\n", ref); IUnknown_Release(unk); ref = get_refcount(iface_ptr); - ok_(__FILE__, line)(ref == expect_ref, "got %ld\n", ref); + if (check_refs) ok_(__FILE__, line)(ref == expect_ref, "got %ld\n", ref); } } @@ -3024,8 +3024,8 @@ static void check_dmus_notification_pmsg_(int line, DMUS_NOTIFICATION_PMSG *msg, ok_(__FILE__, line)(!msg->punkUser, "got punkUser %p\n", msg->punkUser); else { - check_interface_(line, msg->punkUser, &IID_IDirectMusicSegmentState, TRUE); - check_interface_(line, msg->punkUser, &IID_IDirectMusicSegmentState8, TRUE); + check_interface_(line, msg->punkUser, &IID_IDirectMusicSegmentState, TRUE, FALSE); + check_interface_(line, msg->punkUser, &IID_IDirectMusicSegmentState8, TRUE, FALSE); } }

1 0

Hans Leidekker : kernelbase: Trace global memory counters in decimal.
by Alexandre Julliard Oct. 26, 2023

Oct. 26, 2023

Module: wine Branch: master Commit: 3f6510c1d6b9bca6594f22693faed1a3b0fc80c9 URL: https://gitlab.winehq.org/wine/wine/-/commit/3f6510c1d6b9bca6594f22693faed1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Sep 20 16:00:19 2023 +0200 kernelbase: Trace global memory counters in decimal. --- dlls/kernelbase/memory.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/kernelbase/memory.c b/dlls/kernelbase/memory.c index 05d521da321..4f4bba9a13b 100644 --- a/dlls/kernelbase/memory.c +++ b/dlls/kernelbase/memory.c @@ -1247,12 +1247,10 @@ BOOL WINAPI DECLSPEC_HOTPATCH GlobalMemoryStatusEx( MEMORYSTATUSEX *status ) if (status->ullTotalPhys) status->dwMemoryLoad = (status->ullTotalPhys - status->ullAvailPhys) / (status->ullTotalPhys / 100); - TRACE_(virtual)( "MemoryLoad %ld, TotalPhys %s, AvailPhys %s, TotalPageFile %s," - "AvailPageFile %s, TotalVirtual %s, AvailVirtual %s\n", - status->dwMemoryLoad, wine_dbgstr_longlong(status->ullTotalPhys), - wine_dbgstr_longlong(status->ullAvailPhys), wine_dbgstr_longlong(status->ullTotalPageFile), - wine_dbgstr_longlong(status->ullAvailPageFile), wine_dbgstr_longlong(status->ullTotalVirtual), - wine_dbgstr_longlong(status->ullAvailVirtual) ); + TRACE_(virtual)( "MemoryLoad %lu, TotalPhys %I64u, AvailPhys %I64u, TotalPageFile %I64u, " + "AvailPageFile %I64u, TotalVirtual %I64u, AvailVirtual %I64u\n", + status->dwMemoryLoad, status->ullTotalPhys, status->ullAvailPhys, status->ullTotalPageFile, + status->ullAvailPageFile, status->ullTotalVirtual, status->ullAvailVirtual ); cached_status = *status; return TRUE;

1 0

Zebediah Figura : include: Convert d3d10shader.h to an IDL.
by Alexandre Julliard Oct. 24, 2023

Oct. 24, 2023

Module: wine Branch: master Commit: d78ca75c566679f6c03aa6a545e5b5216d797bb5 URL: https://gitlab.winehq.org/wine/wine/-/commit/d78ca75c566679f6c03aa6a545e5b5… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed May 3 17:30:22 2023 -0500 include: Convert d3d10shader.h to an IDL. --- include/Makefile.in | 2 +- include/d3d10shader.h | 233 ------------------------------------------------ include/d3d10shader.idl | 217 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 218 insertions(+), 234 deletions(-)

1 0