November 2023 - Wine-commits

Connor McAdams : oleaut32: Lock ITypeLib2 interface reference count behind the typelib cache critical section on Release.
by Alexandre Julliard 09 Nov '23

09 Nov '23

Module: wine Branch: master Commit: 3e84b49305930fc74705e2e417851de20489ece8 URL: https://gitlab.winehq.org/wine/wine/-/commit/3e84b49305930fc74705e2e417851d… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Wed Nov 8 08:15:19 2023 -0500 oleaut32: Lock ITypeLib2 interface reference count behind the typelib cache critical section on Release. This prevents an ITypeLib2 interface being returned from the typelib cache that is in the middle of being destroyed. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/oleaut32/typelib.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index fa512184182..1ff84aaa5fb 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -4712,7 +4712,10 @@ static ULONG WINAPI ITypeLib2_fnAddRef( ITypeLib2 *iface) static ULONG WINAPI ITypeLib2_fnRelease( ITypeLib2 *iface) { ITypeLibImpl *This = impl_from_ITypeLib2(iface); - ULONG ref = InterlockedDecrement(&This->ref); + ULONG ref; + + EnterCriticalSection(&cache_section); + ref = InterlockedDecrement(&This->ref); TRACE("%p, refcount %lu.\n", iface, ref); @@ -4728,10 +4731,8 @@ static ULONG WINAPI ITypeLib2_fnRelease( ITypeLib2 *iface) if(This->path) { TRACE("removing from cache list\n"); - EnterCriticalSection(&cache_section); if(This->entry.next) list_remove(&This->entry); - LeaveCriticalSection(&cache_section); free(This->path); } TRACE(" destroying ITypeLib(%p)\n",This); @@ -4783,9 +4784,9 @@ static ULONG WINAPI ITypeLib2_fnRelease( ITypeLib2 *iface) } free(This->typeinfos); free(This); - return 0; } + LeaveCriticalSection(&cache_section); return ref; }

1 0

Yuxuan Shui : include: Add InterlockedExchangeAdd16.
by Alexandre Julliard 09 Nov '23

09 Nov '23

Module: wine Branch: master Commit: 74a3b133fa92fd0402f5698811de030419173d5e URL: https://gitlab.winehq.org/wine/wine/-/commit/74a3b133fa92fd0402f5698811de03… Author: Yuxuan Shui <yshui(a)codeweavers.com> Date: Mon Nov 6 18:31:32 2023 +0000 include: Add InterlockedExchangeAdd16. --- include/winnt.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/include/winnt.h b/include/winnt.h index 4739f9a1a0f..d1c82084f9f 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -6756,6 +6756,7 @@ typedef enum _FIRMWARE_TYPE #define InterlockedDecrement64 _InterlockedDecrement64 #define InterlockedExchange _InterlockedExchange #define InterlockedExchangeAdd _InterlockedExchangeAdd +#define InterlockedExchangeAdd16 _InterlockedExchangeAdd16 #define InterlockedExchangeAdd64 _InterlockedExchangeAdd64 #define InterlockedExchangePointer _InterlockedExchangePointer #define InterlockedIncrement _InterlockedIncrement @@ -6776,6 +6777,7 @@ typedef enum _FIRMWARE_TYPE #pragma intrinsic(_InterlockedCompareExchangePointer) #pragma intrinsic(_InterlockedExchange) #pragma intrinsic(_InterlockedExchangeAdd) +#pragma intrinsic(_InterlockedExchangeAdd16) #pragma intrinsic(_InterlockedExchangePointer) #pragma intrinsic(_InterlockedIncrement) #pragma intrinsic(_InterlockedIncrement16) @@ -6795,6 +6797,7 @@ long _InterlockedDecrement(long volatile*); short _InterlockedDecrement16(short volatile*); long _InterlockedExchange(long volatile*,long); long _InterlockedExchangeAdd(long volatile*,long); +short _InterlockedExchangeAdd16(short volatile*,short); void * _InterlockedExchangePointer(void *volatile*,void*); long _InterlockedIncrement(long volatile*); short _InterlockedIncrement16(short volatile*); @@ -7027,6 +7030,11 @@ static FORCEINLINE LONG WINAPI InterlockedExchangeAdd( LONG volatile *dest, LONG return __sync_fetch_and_add( dest, incr ); } +static FORCEINLINE short WINAPI InterlockedExchangeAdd16( short volatile *dest, short incr ) +{ + return __sync_fetch_and_add( dest, incr ); +} + static FORCEINLINE LONGLONG WINAPI InterlockedExchangeAdd64( LONGLONG volatile *dest, LONGLONG incr ) { return __sync_fetch_and_add( dest, incr );

1 0

Yuxuan Shui : ntdll: Tweak the binary representation of SRWLOCK.
by Alexandre Julliard 09 Nov '23

09 Nov '23

Module: wine Branch: master Commit: d1e02148b6f2ed7ffe3c57452aba9900f0434c9a URL: https://gitlab.winehq.org/wine/wine/-/commit/d1e02148b6f2ed7ffe3c57452aba99… Author: Yuxuan Shui <yshui(a)codeweavers.com> Date: Mon Nov 6 16:05:38 2023 +0000 ntdll: Tweak the binary representation of SRWLOCK. There are applications that uses SRWLOCK in an invalid way and then checks its binary representation. Tweak our representation a bit so they are happy. --- dlls/kernel32/tests/sync.c | 17 +++++++++++++++++ dlls/ntdll/sync.c | 24 ++++++++++++++---------- 2 files changed, 31 insertions(+), 10 deletions(-) diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index 10765765bc5..56a9d6e4859 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -2535,6 +2535,22 @@ static void test_srwlock_example(void) trace("number of total exclusive accesses is %ld\n", srwlock_protected_value); } +static void test_srwlock_quirk(void) +{ + union { SRWLOCK *s; LONG *l; } u = { &srwlock_example }; + + if (!pInitializeSRWLock) { + /* function is not yet in XP, only in newer Windows */ + win_skip("no srw lock support.\n"); + return; + } + + /* WeCom 4.x checks releasing a lock with value 0x1 results in it becoming 0x0. */ + *u.l = 1; + pReleaseSRWLockExclusive(&srwlock_example); + ok(*u.l == 0, "expected 0x0, got %lx\n", *u.l); +} + static DWORD WINAPI alertable_wait_thread(void *param) { HANDLE *semaphores = param; @@ -2887,6 +2903,7 @@ START_TEST(sync) test_condvars_base(&unaligned_cv.cv); test_condvars_consumer_producer(); test_srwlock_base(&aligned_srwlock); + test_srwlock_quirk(); #if defined(__i386__) || defined(__x86_64__) /* unaligned locks only work on x86 platforms */ test_srwlock_base(&unaligned_srwlock.lock); diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index fa64917029a..bb5dcbb66e6 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -473,9 +473,10 @@ DWORD WINAPI RtlRunOnceExecuteOnce( RTL_RUN_ONCE *once, PRTL_RUN_ONCE_INIT_FN fu struct srw_lock { + /* bit 0 - if the lock is held exclusive. bit 1.. - number of exclusive waiters. */ short exclusive_waiters; - /* Number of shared owners, or -1 if owned exclusive. + /* Number of owners. * * Sadly Windows has no equivalent to FUTEX_WAIT_BITSET, so in order to wake * up *only* exclusive or *only* shared waiters (and thus avoid spurious @@ -486,7 +487,7 @@ struct srw_lock * the latter waits only on the "owners" member. Note then that "owners" * must not be the first element in the structure. */ - short owners; + unsigned short owners; }; C_ASSERT( sizeof(struct srw_lock) == 4 ); @@ -517,7 +518,7 @@ void WINAPI RtlAcquireSRWLockExclusive( RTL_SRWLOCK *lock ) { union { RTL_SRWLOCK *rtl; struct srw_lock *s; LONG *l; } u = { lock }; - InterlockedIncrement16( &u.s->exclusive_waiters ); + InterlockedExchangeAdd16( &u.s->exclusive_waiters, 2 ); for (;;) { @@ -532,8 +533,9 @@ void WINAPI RtlAcquireSRWLockExclusive( RTL_SRWLOCK *lock ) if (!old.s.owners) { /* Not locked exclusive or shared. We can try to grab it. */ - new.s.owners = -1; - --new.s.exclusive_waiters; + new.s.owners = 1; + new.s.exclusive_waiters -= 2; + new.s.exclusive_waiters |= 1; wait = FALSE; } else @@ -568,7 +570,7 @@ void WINAPI RtlAcquireSRWLockShared( RTL_SRWLOCK *lock ) old.s = *u.s; new = old; - if (old.s.owners != -1 && !old.s.exclusive_waiters) + if (!old.s.exclusive_waiters) { /* Not locked exclusive, and no exclusive waiters. * We can try to grab it. */ @@ -599,9 +601,10 @@ void WINAPI RtlReleaseSRWLockExclusive( RTL_SRWLOCK *lock ) old.s = *u.s; new = old; - if (old.s.owners != -1) ERR("Lock %p is not owned exclusive!\n", lock); + if (!(old.s.exclusive_waiters & 1)) ERR("Lock %p is not owned exclusive!\n", lock); new.s.owners = 0; + new.s.exclusive_waiters &= ~1; } while (InterlockedCompareExchange( u.l, new.l, old.l ) != old.l); if (new.s.exclusive_waiters) @@ -623,7 +626,7 @@ void WINAPI RtlReleaseSRWLockShared( RTL_SRWLOCK *lock ) old.s = *u.s; new = old; - if (old.s.owners == -1) ERR("Lock %p is owned exclusive!\n", lock); + if (old.s.exclusive_waiters & 1) ERR("Lock %p is owned exclusive!\n", lock); else if (!old.s.owners) ERR("Lock %p is not owned shared!\n", lock); --new.s.owners; @@ -654,7 +657,8 @@ BOOLEAN WINAPI RtlTryAcquireSRWLockExclusive( RTL_SRWLOCK *lock ) if (!old.s.owners) { /* Not locked exclusive or shared. We can try to grab it. */ - new.s.owners = -1; + new.s.owners = 1; + new.s.exclusive_waiters |= 1; ret = TRUE; } else @@ -680,7 +684,7 @@ BOOLEAN WINAPI RtlTryAcquireSRWLockShared( RTL_SRWLOCK *lock ) old.s = *u.s; new.s = old.s; - if (old.s.owners != -1 && !old.s.exclusive_waiters) + if (!old.s.exclusive_waiters) { /* Not locked exclusive, and no exclusive waiters. * We can try to grab it. */

1 0

Floris Renaud : po: Update Dutch translation.
by Alexandre Julliard 09 Nov '23

09 Nov '23

Module: wine Branch: master Commit: ad6e87c63f11af6b0b74630350b2748807038337 URL: https://gitlab.winehq.org/wine/wine/-/commit/ad6e87c63f11af6b0b74630350b274… Author: Floris Renaud <jkfloris(a)dds.nl> Date: Thu Nov 9 19:55:38 2023 +0100 po: Update Dutch translation. --- po/nl.po | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/po/nl.po b/po/nl.po index c3178722e5b..f392938e315 100644 --- a/po/nl.po +++ b/po/nl.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2023-08-10 22:50+0200\n" +"PO-Revision-Date: 2023-11-09 19:50+0100\n" "Last-Translator: Floris Renaud <jkfloris(a)dds.nl>\n" "Language-Team: Dutch\n" "Language: nl\n" @@ -18582,13 +18582,11 @@ msgstr "Uiterlijk" #: programs/winecfg/winecfg.rc:293 msgid "&Theme:" -msgstr "Thema:" +msgstr "&Thema:" #: programs/winecfg/winecfg.rc:295 -#, fuzzy -#| msgid "&WinRT app theme:" msgid "&WinRT theme:" -msgstr "Thema voor &WinRT programma's:" +msgstr "&WinRT thema:" #: programs/winecfg/winecfg.rc:297 msgid "&Install theme..." @@ -18604,13 +18602,11 @@ msgstr "Kleur:" #: programs/winecfg/winecfg.rc:310 msgid "MIME types" -msgstr "Bestandassociaties" +msgstr "Bestandsassociaties" #: programs/winecfg/winecfg.rc:311 -#, fuzzy -#| msgid "Manage file &associations" msgid "Manage file and protocol &associations" -msgstr "Toestaan dat bestandassociaties worden gemaakt" +msgstr "&Bestands- en protocolassociaties toestaan" #: programs/winecfg/winecfg.rc:314 msgid "Folders"

1 0

Anton Baskanov : dmsynth: Keep track of voice/wave mapping.
by Alexandre Julliard 09 Nov '23

09 Nov '23

Module: wine Branch: master Commit: a303bb395fa3c6e73d06bbf5e0403e849ac97b67 URL: https://gitlab.winehq.org/wine/wine/-/commit/a303bb395fa3c6e73d06bbf5e0403e… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Mon Nov 6 14:11:43 2023 +0700 dmsynth: Keep track of voice/wave mapping. --- dlls/dmsynth/synth.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/dlls/dmsynth/synth.c b/dlls/dmsynth/synth.c index a4196f29a8a..aee76af5302 100644 --- a/dlls/dmsynth/synth.c +++ b/dlls/dmsynth/synth.c @@ -320,6 +320,13 @@ struct event BYTE midi[3]; }; +struct voice +{ + struct list entry; + fluid_voice_t *fluid_voice; + struct wave *wave; +}; + struct synth { IDirectMusicSynth8 IDirectMusicSynth8_iface; @@ -336,6 +343,7 @@ struct synth struct list instruments; struct list waves; struct list events; + struct list voices; fluid_settings_t *fluid_settings; fluid_sfont_t *fluid_sfont; @@ -584,6 +592,8 @@ static HRESULT WINAPI synth_Open(IDirectMusicSynth8 *iface, DMUS_PORTPARAMS *par static HRESULT WINAPI synth_Close(IDirectMusicSynth8 *iface) { struct synth *This = impl_from_IDirectMusicSynth8(iface); + struct voice *voice; + void *next; TRACE("(%p)\n", This); @@ -597,6 +607,14 @@ static HRESULT WINAPI synth_Close(IDirectMusicSynth8 *iface) fluid_synth_remove_sfont(This->fluid_synth, This->fluid_sfont); delete_fluid_synth(This->fluid_synth); This->fluid_synth = NULL; + + LIST_FOR_EACH_ENTRY_SAFE(voice, next, &This->voices, struct voice, entry) + { + list_remove(&voice->entry); + wave_release(voice->wave); + free(voice); + } + This->open = FALSE; LeaveCriticalSection(&This->cs); @@ -1742,6 +1760,7 @@ static int synth_preset_noteon(fluid_preset_t *fluid_preset, fluid_synth_t *flui { struct articulation *articulation; struct wave *wave = region->wave; + struct voice *voice; if (key < region->key_range.usLow || key > region->key_range.usHigh) continue; if (vel < region->vel_range.usLow || vel > region->vel_range.usHigh) continue; @@ -1763,6 +1782,29 @@ static int synth_preset_noteon(fluid_preset_t *fluid_preset, fluid_synth_t *flui return FLUID_FAILED; } + LIST_FOR_EACH_ENTRY(voice, &synth->voices, struct voice, entry) + { + if (voice->fluid_voice == fluid_voice) + { + wave_release(voice->wave); + break; + } + } + + if (&voice->entry == &synth->voices) + { + if (!(voice = calloc(1, sizeof(struct voice)))) + { + delete_fluid_sample(fluid_sample); + return FLUID_FAILED; + } + voice->fluid_voice = fluid_voice; + list_add_tail(&synth->voices, &voice->entry); + } + + voice->wave = wave; + wave_addref(voice->wave); + set_default_voice_connections(fluid_voice); if (region->wave_sample.cSampleLoops) { @@ -1885,6 +1927,7 @@ HRESULT synth_create(IUnknown **ret_iface) list_init(&obj->instruments); list_init(&obj->waves); list_init(&obj->events); + list_init(&obj->voices); 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

Anton Baskanov : dmsynth: Use generators to set root key and fine tune.
by Alexandre Julliard 09 Nov '23

09 Nov '23

Module: wine Branch: master Commit: 840923eed6ce0051bd0f411b5e7aa0ed56cafb1e URL: https://gitlab.winehq.org/wine/wine/-/commit/840923eed6ce0051bd0f411b5e7aa0… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Mon Nov 6 15:02:39 2023 +0700 dmsynth: Use generators to set root key and fine tune. --- dlls/dmsynth/synth.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dmsynth/synth.c b/dlls/dmsynth/synth.c index aee76af5302..556947fc30a 100644 --- a/dlls/dmsynth/synth.c +++ b/dlls/dmsynth/synth.c @@ -1739,7 +1739,6 @@ static void set_default_voice_connections(fluid_voice_t *fluid_voice) fluid_voice_gen_set(fluid_voice, GEN_KEYNUM, -1.); fluid_voice_gen_set(fluid_voice, GEN_VELOCITY, -1.); fluid_voice_gen_set(fluid_voice, GEN_SCALETUNE, 100.0); - fluid_voice_gen_set(fluid_voice, GEN_OVERRIDEROOTKEY, -1.); add_voice_connections(fluid_voice, &list, connections); } @@ -1773,7 +1772,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); - 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))) { @@ -1823,6 +1821,8 @@ static int synth_preset_noteon(fluid_preset_t *fluid_preset, fluid_synth_t *flui fluid_voice_gen_set(fluid_voice, GEN_STARTLOOPADDROFS, 8 + loop->ulStart); fluid_voice_gen_set(fluid_voice, GEN_ENDLOOPADDROFS, 8 + loop->ulStart + loop->ulLength); } + fluid_voice_gen_set(fluid_voice, GEN_OVERRIDEROOTKEY, region->wave_sample.usUnityNote); + fluid_voice_gen_set(fluid_voice, GEN_FINETUNE, region->wave_sample.sFineTune); 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

Anton Baskanov : dmsynth: Create one FluidSynth sample per wave.
by Alexandre Julliard 09 Nov '23

09 Nov '23

Module: wine Branch: master Commit: 6de4ec0cae0330c2a32dca383a3be2892a2057b5 URL: https://gitlab.winehq.org/wine/wine/-/commit/6de4ec0cae0330c2a32dca383a3be2… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Mon Nov 6 15:33:01 2023 +0700 dmsynth: Create one FluidSynth sample per wave. --- dlls/dmsynth/synth.c | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/dlls/dmsynth/synth.c b/dlls/dmsynth/synth.c index 556947fc30a..f936d51e02e 100644 --- a/dlls/dmsynth/synth.c +++ b/dlls/dmsynth/synth.c @@ -209,6 +209,8 @@ struct wave LONG ref; UINT id; + fluid_sample_t *fluid_sample; + WAVEFORMATEX format; UINT sample_count; short samples[]; @@ -224,7 +226,11 @@ static void wave_addref(struct wave *wave) static void wave_release(struct wave *wave) { ULONG ref = InterlockedDecrement(&wave->ref); - if (!ref) free(wave); + if (!ref) + { + delete_fluid_sample(wave->fluid_sample); + free(wave); + } } struct articulation @@ -825,6 +831,16 @@ static HRESULT synth_download_wave(struct synth *This, DMUS_DOWNLOADINFO *info, } } + if (!(wave->fluid_sample = new_fluid_sample())) + { + WARN("Failed to allocate FluidSynth sample\n"); + free(wave); + return FLUID_FAILED; + } + + fluid_sample_set_sound_data(wave->fluid_sample, wave->samples, NULL, wave->sample_count, + wave->format.nSamplesPerSec, TRUE); + EnterCriticalSection(&This->cs); list_add_tail(&This->waves, &wave->entry); LeaveCriticalSection(&This->cs); @@ -1747,7 +1763,6 @@ static int synth_preset_noteon(fluid_preset_t *fluid_preset, fluid_synth_t *flui { struct instrument *instrument = fluid_preset_get_data(fluid_preset); struct synth *synth = instrument->synth; - fluid_sample_t *fluid_sample; fluid_voice_t *fluid_voice; struct region *region; @@ -1764,19 +1779,9 @@ static int synth_preset_noteon(fluid_preset_t *fluid_preset, fluid_synth_t *flui if (key < region->key_range.usLow || key > region->key_range.usHigh) continue; if (vel < region->vel_range.usLow || vel > region->vel_range.usHigh) continue; - if (!(fluid_sample = new_fluid_sample())) - { - WARN("Failed to allocate FluidSynth sample\n"); - return FLUID_FAILED; - } - - fluid_sample_set_sound_data(fluid_sample, wave->samples, NULL, wave->sample_count, - wave->format.nSamplesPerSec, TRUE); - - if (!(fluid_voice = fluid_synth_alloc_voice(synth->fluid_synth, fluid_sample, chan, key, vel))) + if (!(fluid_voice = fluid_synth_alloc_voice(synth->fluid_synth, wave->fluid_sample, chan, key, vel))) { WARN("Failed to allocate FluidSynth voice\n"); - delete_fluid_sample(fluid_sample); return FLUID_FAILED; } @@ -1792,10 +1797,7 @@ static int synth_preset_noteon(fluid_preset_t *fluid_preset, fluid_synth_t *flui if (&voice->entry == &synth->voices) { if (!(voice = calloc(1, sizeof(struct voice)))) - { - delete_fluid_sample(fluid_sample); return FLUID_FAILED; - } voice->fluid_voice = fluid_voice; list_add_tail(&synth->voices, &voice->entry); }

1 0

Anton Baskanov : dmsynth: Remove useless private data checks.
by Alexandre Julliard 09 Nov '23

09 Nov '23

Module: wine Branch: master Commit: ed7564304d4bfef9fb53d421ab0ca363881c36cc URL: https://gitlab.winehq.org/wine/wine/-/commit/ed7564304d4bfef9fb53d421ab0ca3… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Wed Nov 8 17:20:29 2023 +0700 dmsynth: Remove useless private data checks. We always set the data. --- dlls/dmsynth/synth.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlls/dmsynth/synth.c b/dlls/dmsynth/synth.c index f936d51e02e..6d747980cbd 100644 --- a/dlls/dmsynth/synth.c +++ b/dlls/dmsynth/synth.c @@ -1398,7 +1398,6 @@ static int synth_preset_get_num(fluid_preset_t *fluid_preset) TRACE("(%p)\n", fluid_preset); - if (!instrument) return 0; return instrument->patch; } @@ -1768,8 +1767,6 @@ static int synth_preset_noteon(fluid_preset_t *fluid_preset, fluid_synth_t *flui TRACE("(%p, %p, %u, %u, %u)\n", fluid_preset, fluid_synth, chan, key, vel); - if (!instrument) return FLUID_FAILED; - LIST_FOR_EACH_ENTRY(region, &instrument->regions, struct region, entry) { struct articulation *articulation; @@ -1857,8 +1854,6 @@ static fluid_preset_t *synth_sfont_get_preset(fluid_sfont_t *fluid_sfont, int ba TRACE("(%p, %d, %d)\n", fluid_sfont, bank, patch); - if (!synth) return NULL; - EnterCriticalSection(&synth->cs); LIST_FOR_EACH_ENTRY(instrument, &synth->instruments, struct instrument, entry)

1 0

Anton Baskanov : dmsynth: Free the allocated presets manually.
by Alexandre Julliard 09 Nov '23

09 Nov '23

Module: wine Branch: master Commit: 157ffca64df4eb50f7444ba644467f9f62ddba4b URL: https://gitlab.winehq.org/wine/wine/-/commit/157ffca64df4eb50f7444ba644467f… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Wed Nov 8 14:43:09 2023 +0700 dmsynth: Free the allocated presets manually. FluidSynth never calls synth_preset_free(), causing preset and instrument leaks. --- dlls/dmsynth/synth.c | 69 +++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 58 insertions(+), 11 deletions(-) diff --git a/dlls/dmsynth/synth.c b/dlls/dmsynth/synth.c index 6d747980cbd..b3c624b5b6b 100644 --- a/dlls/dmsynth/synth.c +++ b/dlls/dmsynth/synth.c @@ -319,6 +319,17 @@ static void instrument_release(struct instrument *instrument) } } +struct preset +{ + struct list entry; + int bank; + int patch; + + fluid_preset_t *fluid_preset; + + struct instrument *instrument; +}; + struct event { struct list entry; @@ -350,6 +361,7 @@ struct synth struct list waves; struct list events; struct list voices; + struct list presets; fluid_settings_t *fluid_settings; fluid_sfont_t *fluid_sfont; @@ -598,6 +610,7 @@ static HRESULT WINAPI synth_Open(IDirectMusicSynth8 *iface, DMUS_PORTPARAMS *par static HRESULT WINAPI synth_Close(IDirectMusicSynth8 *iface) { struct synth *This = impl_from_IDirectMusicSynth8(iface); + struct preset *preset; struct voice *voice; void *next; @@ -621,6 +634,14 @@ static HRESULT WINAPI synth_Close(IDirectMusicSynth8 *iface) free(voice); } + LIST_FOR_EACH_ENTRY_SAFE(preset, next, &This->presets, struct preset, entry) + { + list_remove(&preset->entry); + instrument_release(preset->instrument); + delete_fluid_preset(preset->fluid_preset); + free(preset); + } + This->open = FALSE; LeaveCriticalSection(&This->cs); @@ -1394,11 +1415,11 @@ static int synth_preset_get_bank(fluid_preset_t *fluid_preset) static int synth_preset_get_num(fluid_preset_t *fluid_preset) { - struct instrument *instrument = fluid_preset_get_data(fluid_preset); + struct preset *preset = fluid_preset_get_data(fluid_preset); TRACE("(%p)\n", fluid_preset); - return instrument->patch; + return preset->patch; } static BOOL gen_from_connection(const CONNECTION *conn, UINT *gen) @@ -1760,7 +1781,8 @@ static void set_default_voice_connections(fluid_voice_t *fluid_voice) static int synth_preset_noteon(fluid_preset_t *fluid_preset, fluid_synth_t *fluid_synth, int chan, int key, int vel) { - struct instrument *instrument = fluid_preset_get_data(fluid_preset); + struct preset *preset = fluid_preset_get_data(fluid_preset); + struct instrument *instrument = preset->instrument; struct synth *synth = instrument->synth; fluid_voice_t *fluid_voice; struct region *region; @@ -1836,9 +1858,6 @@ static int synth_preset_noteon(fluid_preset_t *fluid_preset, fluid_synth_t *flui static void synth_preset_free(fluid_preset_t *fluid_preset) { - struct instrument *instrument = fluid_preset_get_data(fluid_preset); - fluid_preset_set_data(fluid_preset, NULL); - if (instrument) instrument_release(instrument); } static const char *synth_sfont_get_name(fluid_sfont_t *fluid_sfont) @@ -1851,11 +1870,21 @@ static fluid_preset_t *synth_sfont_get_preset(fluid_sfont_t *fluid_sfont, int ba struct synth *synth = fluid_sfont_get_data(fluid_sfont); struct instrument *instrument; fluid_preset_t *fluid_preset; + struct preset *preset; TRACE("(%p, %d, %d)\n", fluid_sfont, bank, patch); EnterCriticalSection(&synth->cs); + LIST_FOR_EACH_ENTRY(preset, &synth->presets, struct preset, entry) + { + if (preset->bank == bank && preset->patch == patch) + { + LeaveCriticalSection(&synth->cs); + return preset->fluid_preset; + } + } + LIST_FOR_EACH_ENTRY(instrument, &synth->instruments, struct instrument, entry) { if (bank == 128 && instrument->patch == (0x80000000 | patch)) break; @@ -1864,18 +1893,35 @@ static fluid_preset_t *synth_sfont_get_preset(fluid_sfont_t *fluid_sfont, int ba if (&instrument->entry == &synth->instruments) { - fluid_preset = NULL; WARN("Could not find instrument with patch %#x\n", patch); + LeaveCriticalSection(&synth->cs); + return NULL; } - else if ((fluid_preset = new_fluid_preset(fluid_sfont, synth_preset_get_name, synth_preset_get_bank, + + if (!(fluid_preset = new_fluid_preset(fluid_sfont, synth_preset_get_name, synth_preset_get_bank, synth_preset_get_num, synth_preset_noteon, synth_preset_free))) { - fluid_preset_set_data(fluid_preset, instrument); - instrument_addref(instrument); + LeaveCriticalSection(&synth->cs); + return NULL; + } - TRACE("Created fluid_preset %p for instrument %p\n", fluid_preset, instrument); + if (!(preset = calloc(1, sizeof(struct preset)))) + { + delete_fluid_preset(fluid_preset); + LeaveCriticalSection(&synth->cs); + return NULL; } + preset->bank = bank; + preset->patch = patch; + preset->fluid_preset = fluid_preset; + preset->instrument = instrument; + fluid_preset_set_data(fluid_preset, preset); + instrument_addref(instrument); + list_add_tail(&synth->presets, &preset->entry); + + TRACE("Created fluid_preset %p for instrument %p\n", fluid_preset, instrument); + LeaveCriticalSection(&synth->cs); return fluid_preset; @@ -1925,6 +1971,7 @@ HRESULT synth_create(IUnknown **ret_iface) list_init(&obj->waves); list_init(&obj->events); list_init(&obj->voices); + list_init(&obj->presets); 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

Anton Baskanov : dmsynth: Don't leak modulators.
by Alexandre Julliard 09 Nov '23

09 Nov '23

Module: wine Branch: master Commit: dbda5b52d38a507d90e86cf2f204fa7f4391948c URL: https://gitlab.winehq.org/wine/wine/-/commit/dbda5b52d38a507d90e86cf2f204fa… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Wed Nov 8 15:36:47 2023 +0700 dmsynth: Don't leak modulators. --- dlls/dmsynth/synth.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/dmsynth/synth.c b/dlls/dmsynth/synth.c index b3c624b5b6b..410fb59089e 100644 --- a/dlls/dmsynth/synth.c +++ b/dlls/dmsynth/synth.c @@ -1607,6 +1607,7 @@ static void add_mod_from_connection(fluid_voice_t *fluid_voice, const CONNECTION fluid_mod_set_amount(mod, value); fluid_voice_add_mod(fluid_voice, mod, FLUID_VOICE_OVERWRITE); + delete_fluid_mod(mod); } static void add_voice_connections(fluid_voice_t *fluid_voice, const CONNECTIONLIST *list,

1 0