November 2023 - Wine-commits

Alexandre Julliard : ntdll: Use the generated syscall list.
by Alexandre Julliard 16 Nov '23

16 Nov '23

Module: wine Branch: master Commit: f9f23e109287b86bf3d1703cad374326c1eb4ccd URL: https://gitlab.winehq.org/wine/wine/-/commit/f9f23e109287b86bf3d1703cad3743… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 16 14:08:00 2023 +0100 ntdll: Use the generated syscall list. --- dlls/ntdll/unix/loader.c | 247 ++--------------------------------------------- 1 file changed, 7 insertions(+), 240 deletions(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 5b6098df3bc..42b5aa9d84e 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -88,6 +88,7 @@ #include "winternl.h" #include "unix_private.h" #include "wine/list.h" +#include "ntsyscalls.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(module); @@ -118,247 +119,13 @@ static void *p__wine_syscall_dispatcher; static void * const syscalls[] = { - NtAcceptConnectPort, - NtAccessCheck, - NtAccessCheckAndAuditAlarm, - NtAddAtom, - NtAdjustGroupsToken, - NtAdjustPrivilegesToken, - NtAlertResumeThread, - NtAlertThread, - NtAlertThreadByThreadId, - NtAllocateLocallyUniqueId, - NtAllocateUuids, - NtAllocateVirtualMemory, - NtAllocateVirtualMemoryEx, - NtAreMappedFilesTheSame, - NtAssignProcessToJobObject, - NtCallbackReturn, - NtCancelIoFile, - NtCancelIoFileEx, - NtCancelSynchronousIoFile, - NtCancelTimer, - NtClearEvent, - NtClose, - NtCommitTransaction, - NtCompareObjects, - NtCompleteConnectPort, - NtConnectPort, - NtContinue, - NtCreateDebugObject, - NtCreateDirectoryObject, - NtCreateEvent, - NtCreateFile, - NtCreateIoCompletion, - NtCreateJobObject, - NtCreateKey, - NtCreateKeyTransacted, - NtCreateKeyedEvent, - NtCreateLowBoxToken, - NtCreateMailslotFile, - NtCreateMutant, - NtCreateNamedPipeFile, - NtCreatePagingFile, - NtCreatePort, - NtCreateSection, - NtCreateSemaphore, - NtCreateSymbolicLinkObject, - NtCreateThread, - NtCreateThreadEx, - NtCreateTimer, - NtCreateToken, - NtCreateTransaction, - NtCreateUserProcess, - NtDebugActiveProcess, - NtDebugContinue, - NtDelayExecution, - NtDeleteAtom, - NtDeleteFile, - NtDeleteKey, - NtDeleteValueKey, - NtDeviceIoControlFile, - NtDisplayString, - NtDuplicateObject, - NtDuplicateToken, - NtEnumerateKey, - NtEnumerateValueKey, - NtFilterToken, - NtFindAtom, - NtFlushBuffersFile, - NtFlushInstructionCache, - NtFlushKey, - NtFlushProcessWriteBuffers, - NtFlushVirtualMemory, - NtFreeVirtualMemory, - NtFsControlFile, - NtGetContextThread, - NtGetCurrentProcessorNumber, - NtGetNextThread, - NtGetNlsSectionPtr, - NtGetWriteWatch, - NtImpersonateAnonymousToken, - NtInitializeNlsFiles, - NtInitiatePowerAction, - NtIsProcessInJob, - NtListenPort, - NtLoadDriver, - NtLoadKey, - NtLoadKey2, - NtLoadKeyEx, - NtLockFile, - NtLockVirtualMemory, - NtMakeTemporaryObject, - NtMapViewOfSection, - NtMapViewOfSectionEx, - NtNotifyChangeDirectoryFile, - NtNotifyChangeKey, - NtNotifyChangeMultipleKeys, - NtOpenDirectoryObject, - NtOpenEvent, - NtOpenFile, - NtOpenIoCompletion, - NtOpenJobObject, - NtOpenKey, - NtOpenKeyEx, - NtOpenKeyTransacted, - NtOpenKeyTransactedEx, - NtOpenKeyedEvent, - NtOpenMutant, - NtOpenProcess, - NtOpenProcessToken, - NtOpenProcessTokenEx, - NtOpenSection, - NtOpenSemaphore, - NtOpenSymbolicLinkObject , - NtOpenThread, - NtOpenThreadToken, - NtOpenThreadTokenEx, - NtOpenTimer, - NtPowerInformation, - NtPrivilegeCheck, - NtProtectVirtualMemory, - NtPulseEvent, - NtQueryAttributesFile, - NtQueryDefaultLocale, - NtQueryDefaultUILanguage, - NtQueryDirectoryFile, - NtQueryDirectoryObject, - NtQueryEaFile, - NtQueryEvent, - NtQueryFullAttributesFile, - NtQueryInformationAtom, - NtQueryInformationFile, - NtQueryInformationJobObject, - NtQueryInformationProcess, - NtQueryInformationThread, - NtQueryInformationToken, - NtQueryInstallUILanguage, - NtQueryIoCompletion, - NtQueryKey, - NtQueryLicenseValue, - NtQueryMultipleValueKey, - NtQueryMutant, - NtQueryObject, - NtQueryPerformanceCounter, - NtQuerySection, - NtQuerySecurityObject, - NtQuerySemaphore , - NtQuerySymbolicLinkObject, - NtQuerySystemEnvironmentValue, - NtQuerySystemEnvironmentValueEx, - NtQuerySystemInformation, - NtQuerySystemInformationEx, - NtQuerySystemTime, - NtQueryTimer, - NtQueryTimerResolution, - NtQueryValueKey, - NtQueryVirtualMemory, - NtQueryVolumeInformationFile, - NtQueueApcThread, - NtRaiseException, - NtRaiseHardError, - NtReadFile, - NtReadFileScatter, - NtReadVirtualMemory, - NtRegisterThreadTerminatePort, - NtReleaseKeyedEvent, - NtReleaseMutant, - NtReleaseSemaphore, - NtRemoveIoCompletion, - NtRemoveIoCompletionEx, - NtRemoveProcessDebug, - NtRenameKey, - NtReplaceKey, - NtReplyWaitReceivePort, - NtRequestWaitReplyPort, - NtResetEvent, - NtResetWriteWatch, - NtRestoreKey, - NtResumeProcess, - NtResumeThread, - NtRollbackTransaction, - NtSaveKey, - NtSecureConnectPort, - NtSetContextThread, - NtSetDebugFilterState, - NtSetDefaultLocale, - NtSetDefaultUILanguage, - NtSetEaFile, - NtSetEvent, - NtSetInformationDebugObject, - NtSetInformationFile, - NtSetInformationJobObject, - NtSetInformationKey, - NtSetInformationObject, - NtSetInformationProcess, - NtSetInformationThread, - NtSetInformationToken, - NtSetInformationVirtualMemory, - NtSetIntervalProfile, - NtSetIoCompletion, - NtSetLdtEntries, - NtSetSecurityObject, - NtSetSystemInformation, - NtSetSystemTime, - NtSetThreadExecutionState, - NtSetTimer, - NtSetTimerResolution, - NtSetValueKey, - NtSetVolumeInformationFile, - NtShutdownSystem, - NtSignalAndWaitForSingleObject, - NtSuspendProcess, - NtSuspendThread, - NtSystemDebugControl, - NtTerminateJobObject, - NtTerminateProcess, - NtTerminateThread, - NtTestAlert, - NtTraceControl, - NtUnloadDriver, - NtUnloadKey, - NtUnlockFile, - NtUnlockVirtualMemory, - NtUnmapViewOfSection, - NtUnmapViewOfSectionEx, - NtWaitForAlertByThreadId, - NtWaitForDebugEvent, - NtWaitForKeyedEvent, - NtWaitForMultipleObjects, - NtWaitForSingleObject, -#ifndef _WIN64 - NtWow64AllocateVirtualMemory64, - NtWow64GetNativeSystemInformation, - NtWow64IsProcessorFeaturePresent, - NtWow64ReadVirtualMemory64, - NtWow64WriteVirtualMemory64, +#define SYSCALL_ENTRY(id,name,args) name, +#ifdef _WIN64 + ALL_SYSCALLS64 +#else + ALL_SYSCALLS32 #endif - NtWriteFile, - NtWriteFileGather, - NtWriteVirtualMemory, - NtYieldExecution, - wine_nt_to_unix_file_name, - wine_unix_to_nt_file_name, +#undef SYSCALL_ENTRY }; static BYTE syscall_args[ARRAY_SIZE(syscalls)];

1 0

Alexandre Julliard : win32u: Use the generated syscall list.
by Alexandre Julliard 16 Nov '23

16 Nov '23

Module: wine Branch: master Commit: ade158ea7df3719ada29aefec06e8f615a30446e URL: https://gitlab.winehq.org/wine/wine/-/commit/ade158ea7df3719ada29aefec06e8f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 16 14:08:24 2023 +0100 win32u: Use the generated syscall list. --- dlls/win32u/syscall.c | 409 +------------------------------------------------- 1 file changed, 8 insertions(+), 401 deletions(-)

1 0

Alexandre Julliard : wow64: Use the generated syscall list.
by Alexandre Julliard 16 Nov '23

16 Nov '23

Module: wine Branch: master Commit: 4adf3bc0bb31fed012af12ab54875162d4273ed4 URL: https://gitlab.winehq.org/wine/wine/-/commit/4adf3bc0bb31fed012af12ab548751… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 16 14:09:16 2023 +0100 wow64: Use the generated syscall list. --- dlls/wow64/syscall.c | 8 +- dlls/wow64/syscall.h | 265 --------------------------------------------- dlls/wow64/wow64_private.h | 6 +- 3 files changed, 7 insertions(+), 272 deletions(-)

1 0

Jactry Zeng : msvcp140: Add codecvt<char32> class stub.
by Alexandre Julliard 16 Nov '23

16 Nov '23

Module: wine Branch: master Commit: 49547f8bb90644bb8c41ca71c30bf9227df4e36e URL: https://gitlab.winehq.org/wine/wine/-/commit/49547f8bb90644bb8c41ca71c30bf9… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Wed Nov 15 08:00:56 2023 +0100 msvcp140: Add codecvt<char32> class stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47609 --- dlls/msvcp140/msvcp140.spec | 108 +++++++++--------- dlls/msvcp90/locale.c | 255 ++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.h | 14 +++ dlls/msvcp_win/msvcp_win.spec | 108 +++++++++--------- 4 files changed, 377 insertions(+), 108 deletions(-)

1 0

Anton Baskanov : dmsynth: Move instrument search to synth_preset_noteon().
by Alexandre Julliard 15 Nov '23

15 Nov '23

Module: wine Branch: master Commit: 24c00250c4a5e95a1b7b30e6ce396ee05a1bccbb URL: https://gitlab.winehq.org/wine/wine/-/commit/24c00250c4a5e95a1b7b30e6ce396e… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Thu Nov 2 14:16:50 2023 +0700 dmsynth: Move instrument search to synth_preset_noteon(). This allows loaded instruments to take effect without a subsequent program change. In particular, when there is no program change at all, this allows the default Acoustic Grand Piano or Standard drum set to play. As a side effect, this disables FluidSynth fallback logic for missing presets. --- dlls/dmsynth/synth.c | 53 ++++++++++++++++++++++++++-------------------------- 1 file changed, 27 insertions(+), 26 deletions(-) diff --git a/dlls/dmsynth/synth.c b/dlls/dmsynth/synth.c index 51271e48b2a..d11ca0f2f5d 100644 --- a/dlls/dmsynth/synth.c +++ b/dlls/dmsynth/synth.c @@ -288,11 +288,6 @@ struct instrument struct synth *synth; }; -static void instrument_addref(struct instrument *instrument) -{ - InterlockedIncrement(&instrument->ref); -} - static void instrument_release(struct instrument *instrument) { ULONG ref = InterlockedDecrement(&instrument->ref); @@ -327,7 +322,7 @@ struct preset fluid_preset_t *fluid_preset; - struct instrument *instrument; + struct synth *synth; }; struct event @@ -637,7 +632,6 @@ static HRESULT WINAPI synth_Close(IDirectMusicSynth8 *iface) 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); } @@ -1785,13 +1779,28 @@ 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 preset *preset = fluid_preset_get_data(fluid_preset); - struct instrument *instrument = preset->instrument; - struct synth *synth = instrument->synth; + struct synth *synth = preset->synth; + struct instrument *instrument; fluid_voice_t *fluid_voice; struct region *region; TRACE("(%p, %p, %u, %u, %u)\n", fluid_preset, fluid_synth, chan, key, vel); + EnterCriticalSection(&synth->cs); + + LIST_FOR_EACH_ENTRY(instrument, &synth->instruments, struct instrument, entry) + { + if (preset->bank == 128 && instrument->patch == (0x80000000 | preset->patch)) break; + else if (instrument->patch == ((preset->bank << 8) | preset->patch)) break; + } + + if (&instrument->entry == &synth->instruments) + { + WARN("Could not find instrument with patch %#x\n", preset->patch); + LeaveCriticalSection(&synth->cs); + return FLUID_FAILED; + } + LIST_FOR_EACH_ENTRY(region, &instrument->regions, struct region, entry) { struct articulation *articulation; @@ -1804,6 +1813,7 @@ static int synth_preset_noteon(fluid_preset_t *fluid_preset, fluid_synth_t *flui if (!(fluid_voice = fluid_synth_alloc_voice(synth->fluid_synth, wave->fluid_sample, chan, key, vel))) { WARN("Failed to allocate FluidSynth voice\n"); + LeaveCriticalSection(&synth->cs); return FLUID_FAILED; } @@ -1819,7 +1829,10 @@ 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)))) + { + LeaveCriticalSection(&synth->cs); return FLUID_FAILED; + } voice->fluid_voice = fluid_voice; list_add_tail(&synth->voices, &voice->entry); } @@ -1852,9 +1865,12 @@ static int synth_preset_noteon(fluid_preset_t *fluid_preset, fluid_synth_t *flui LIST_FOR_EACH_ENTRY(articulation, &region->articulations, struct articulation, entry) add_voice_connections(fluid_voice, &articulation->list, articulation->connections); fluid_synth_start_voice(synth->fluid_synth, fluid_voice); + LeaveCriticalSection(&synth->cs); return FLUID_OK; } + LeaveCriticalSection(&synth->cs); + WARN("Failed to find instrument matching note / velocity\n"); return FLUID_FAILED; } @@ -1871,7 +1887,6 @@ static const char *synth_sfont_get_name(fluid_sfont_t *fluid_sfont) static fluid_preset_t *synth_sfont_get_preset(fluid_sfont_t *fluid_sfont, int bank, int patch) { struct synth *synth = fluid_sfont_get_data(fluid_sfont); - struct instrument *instrument; fluid_preset_t *fluid_preset; struct preset *preset; @@ -1888,19 +1903,6 @@ static fluid_preset_t *synth_sfont_get_preset(fluid_sfont_t *fluid_sfont, int ba } } - LIST_FOR_EACH_ENTRY(instrument, &synth->instruments, struct instrument, entry) - { - if (bank == 128 && instrument->patch == (0x80000000 | patch)) break; - else if (instrument->patch == ((bank << 8) | patch)) break; - } - - if (&instrument->entry == &synth->instruments) - { - WARN("Could not find instrument with patch %#x\n", patch); - LeaveCriticalSection(&synth->cs); - return NULL; - } - 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))) { @@ -1918,12 +1920,11 @@ static fluid_preset_t *synth_sfont_get_preset(fluid_sfont_t *fluid_sfont, int ba preset->bank = bank; preset->patch = patch; preset->fluid_preset = fluid_preset; - preset->instrument = instrument; + preset->synth = synth; 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); + TRACE("Created fluid_preset %p\n", fluid_preset); LeaveCriticalSection(&synth->cs);

1 0

Anton Baskanov : dmsynth: Get rid of instrument reference counting.
by Alexandre Julliard 15 Nov '23

15 Nov '23

Module: wine Branch: master Commit: 3fd64a726a383b9e12b0cae8897f44ce15b6c69b URL: https://gitlab.winehq.org/wine/wine/-/commit/3fd64a726a383b9e12b0cae8897f44… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Mon Nov 6 17:39:07 2023 +0700 dmsynth: Get rid of instrument reference counting. --- dlls/dmsynth/synth.c | 43 ++++++++++++++++++------------------------- 1 file changed, 18 insertions(+), 25 deletions(-) diff --git a/dlls/dmsynth/synth.c b/dlls/dmsynth/synth.c index d11ca0f2f5d..05f5b0e354e 100644 --- a/dlls/dmsynth/synth.c +++ b/dlls/dmsynth/synth.c @@ -277,7 +277,6 @@ static void region_destroy(struct region *region) struct instrument { struct list entry; - LONG ref; UINT id; UINT patch; @@ -288,30 +287,25 @@ struct instrument struct synth *synth; }; -static void instrument_release(struct instrument *instrument) +static void instrument_destroy(struct instrument *instrument) { - ULONG ref = InterlockedDecrement(&instrument->ref); + struct articulation *articulation; + struct region *region; + void *next; - if (!ref) + LIST_FOR_EACH_ENTRY_SAFE(region, next, &instrument->regions, struct region, entry) { - struct articulation *articulation; - struct region *region; - void *next; - - LIST_FOR_EACH_ENTRY_SAFE(region, next, &instrument->regions, struct region, entry) - { - list_remove(&region->entry); - region_destroy(region); - } - - LIST_FOR_EACH_ENTRY_SAFE(articulation, next, &instrument->articulations, struct articulation, entry) - { - list_remove(&articulation->entry); - free(articulation); - } + list_remove(&region->entry); + region_destroy(region); + } - free(instrument); + LIST_FOR_EACH_ENTRY_SAFE(articulation, next, &instrument->articulations, struct articulation, entry) + { + list_remove(&articulation->entry); + free(articulation); } + + free(instrument); } struct preset @@ -424,7 +418,7 @@ static ULONG WINAPI synth_Release(IDirectMusicSynth8 *iface) LIST_FOR_EACH_ENTRY_SAFE(instrument, next, &This->instruments, struct instrument, entry) { list_remove(&instrument->entry); - instrument_release(instrument); + instrument_destroy(instrument); } LIST_FOR_EACH_ENTRY_SAFE(wave, next, &This->waves, struct wave, entry) @@ -736,7 +730,6 @@ static HRESULT synth_download_instrument(struct synth *This, DMUS_DOWNLOADINFO * if (instrument_info->ulFirstExtCkIdx) FIXME("Instrument extensions not implemented\n"); if (!(instrument = calloc(1, sizeof(*instrument)))) return E_OUTOFMEMORY; - instrument->ref = 1; instrument->id = info->dwDLId; instrument->patch = instrument_info->ulPatch; instrument->flags = instrument_info->ulFlags; @@ -763,7 +756,7 @@ static HRESULT synth_download_instrument(struct synth *This, DMUS_DOWNLOADINFO * if (!(region->wave = synth_find_wave_from_id(This, region->wave_link.ulTableIndex))) { free(region); - instrument_release(instrument); + instrument_destroy(instrument); return DMUS_E_BADWAVELINK; } @@ -786,7 +779,7 @@ static HRESULT synth_download_instrument(struct synth *This, DMUS_DOWNLOADINFO * return S_OK; error: - instrument_release(instrument); + instrument_destroy(instrument); return E_OUTOFMEMORY; } @@ -930,7 +923,7 @@ static HRESULT WINAPI synth_Unload(IDirectMusicSynth8 *iface, HANDLE handle, list_remove(&instrument->entry); LeaveCriticalSection(&This->cs); - instrument_release(instrument); + instrument_destroy(instrument); return S_OK; } }

1 0

Anton Baskanov : dmsynth: Factor out instrument and region search.
by Alexandre Julliard 15 Nov '23

15 Nov '23

Module: wine Branch: master Commit: f58bdd865d427af71812de605358d89a43872757 URL: https://gitlab.winehq.org/wine/wine/-/commit/f58bdd865d427af71812de605358d8… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Wed Nov 15 15:12:08 2023 +0700 dmsynth: Factor out instrument and region search. --- dlls/dmsynth/synth.c | 149 +++++++++++++++++++++++++++++---------------------- 1 file changed, 86 insertions(+), 63 deletions(-) diff --git a/dlls/dmsynth/synth.c b/dlls/dmsynth/synth.c index 05f5b0e354e..c4a19607544 100644 --- a/dlls/dmsynth/synth.c +++ b/dlls/dmsynth/synth.c @@ -1411,6 +1411,35 @@ static int synth_preset_get_num(fluid_preset_t *fluid_preset) return preset->patch; } +static void find_region(struct synth *synth, int bank, int patch, int key, int vel, + struct instrument **out_instrument, struct region **out_region) +{ + struct instrument *instrument; + struct region *region; + + *out_instrument = NULL; + *out_region = NULL; + + LIST_FOR_EACH_ENTRY(instrument, &synth->instruments, struct instrument, entry) + { + if (bank == 128 && instrument->patch == (0x80000000 | patch)) break; + else if (instrument->patch == ((bank << 8) | patch)) break; + } + + if (&instrument->entry == &synth->instruments) + return; + + *out_instrument = instrument; + + LIST_FOR_EACH_ENTRY(region, &instrument->regions, struct region, entry) + { + if (key < region->key_range.usLow || key > region->key_range.usHigh) continue; + if (vel < region->vel_range.usLow || vel > region->vel_range.usHigh) continue; + *out_region = region; + break; + } +} + static BOOL gen_from_connection(const CONNECTION *conn, UINT *gen) { switch (conn->usDestination) @@ -1773,99 +1802,93 @@ static int synth_preset_noteon(fluid_preset_t *fluid_preset, fluid_synth_t *flui { struct preset *preset = fluid_preset_get_data(fluid_preset); struct synth *synth = preset->synth; + struct articulation *articulation; struct instrument *instrument; fluid_voice_t *fluid_voice; struct region *region; + struct voice *voice; + struct wave *wave; TRACE("(%p, %p, %u, %u, %u)\n", fluid_preset, fluid_synth, chan, key, vel); EnterCriticalSection(&synth->cs); - LIST_FOR_EACH_ENTRY(instrument, &synth->instruments, struct instrument, entry) - { - if (preset->bank == 128 && instrument->patch == (0x80000000 | preset->patch)) break; - else if (instrument->patch == ((preset->bank << 8) | preset->patch)) break; - } + find_region(synth, preset->bank, preset->patch, key, vel, &instrument, &region); - if (&instrument->entry == &synth->instruments) + if (!instrument) { WARN("Could not find instrument with patch %#x\n", preset->patch); LeaveCriticalSection(&synth->cs); return FLUID_FAILED; } + if (!region) + { + WARN("Failed to find instrument matching note / velocity\n"); + LeaveCriticalSection(&synth->cs); + return FLUID_FAILED; + } - LIST_FOR_EACH_ENTRY(region, &instrument->regions, struct region, entry) + wave = region->wave; + + if (!(fluid_voice = fluid_synth_alloc_voice(synth->fluid_synth, wave->fluid_sample, chan, key, vel))) { - struct articulation *articulation; - struct wave *wave = region->wave; - struct voice *voice; + WARN("Failed to allocate FluidSynth voice\n"); + LeaveCriticalSection(&synth->cs); + return FLUID_FAILED; + } - if (key < region->key_range.usLow || key > region->key_range.usHigh) continue; - if (vel < region->vel_range.usLow || vel > region->vel_range.usHigh) continue; + LIST_FOR_EACH_ENTRY(voice, &synth->voices, struct voice, entry) + { + if (voice->fluid_voice == fluid_voice) + { + wave_release(voice->wave); + break; + } + } - if (!(fluid_voice = fluid_synth_alloc_voice(synth->fluid_synth, wave->fluid_sample, chan, key, vel))) + if (&voice->entry == &synth->voices) + { + if (!(voice = calloc(1, sizeof(struct voice)))) { - WARN("Failed to allocate FluidSynth voice\n"); LeaveCriticalSection(&synth->cs); return FLUID_FAILED; } + voice->fluid_voice = fluid_voice; + list_add_tail(&synth->voices, &voice->entry); + } - LIST_FOR_EACH_ENTRY(voice, &synth->voices, struct voice, entry) - { - if (voice->fluid_voice == fluid_voice) - { - wave_release(voice->wave); - break; - } - } + voice->wave = wave; + wave_addref(voice->wave); - if (&voice->entry == &synth->voices) - { - if (!(voice = calloc(1, sizeof(struct voice)))) - { - LeaveCriticalSection(&synth->cs); - return FLUID_FAILED; - } - voice->fluid_voice = fluid_voice; - list_add_tail(&synth->voices, &voice->entry); - } + set_default_voice_connections(fluid_voice); + if (region->wave_sample.cSampleLoops) + { + WLOOP *loop = region->wave_loops; - voice->wave = wave; - wave_addref(voice->wave); + 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); - 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); - - /* When copy_data is TRUE, fluid_sample_set_sound_data() adds - * 8-frame padding around the sample data. Offset the loop points - * to compensate for this. */ - 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) - add_voice_connections(fluid_voice, &articulation->list, articulation->connections); - fluid_synth_start_voice(synth->fluid_synth, fluid_voice); - LeaveCriticalSection(&synth->cs); - return FLUID_OK; + /* When copy_data is TRUE, fluid_sample_set_sound_data() adds + * 8-frame padding around the sample data. Offset the loop points + * to compensate for this. */ + 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) + add_voice_connections(fluid_voice, &articulation->list, articulation->connections); + fluid_synth_start_voice(synth->fluid_synth, fluid_voice); LeaveCriticalSection(&synth->cs); - WARN("Failed to find instrument matching note / velocity\n"); - return FLUID_FAILED; + return FLUID_OK; } static void synth_preset_free(fluid_preset_t *fluid_preset)

1 0

Anton Baskanov : dmsynth: Fall back to the Standard drum set when there is no matching instrument or region.
by Alexandre Julliard 15 Nov '23

15 Nov '23

Module: wine Branch: master Commit: 02853687c204d63877294482427f3f98b62346bb URL: https://gitlab.winehq.org/wine/wine/-/commit/02853687c204d63877294482427f3f… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Wed Nov 15 15:16:28 2023 +0700 dmsynth: Fall back to the Standard drum set when there is no matching instrument or region. --- dlls/dmsynth/synth.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/dmsynth/synth.c b/dlls/dmsynth/synth.c index c4a19607544..ec9785c4218 100644 --- a/dlls/dmsynth/synth.c +++ b/dlls/dmsynth/synth.c @@ -1814,6 +1814,8 @@ static int synth_preset_noteon(fluid_preset_t *fluid_preset, fluid_synth_t *flui EnterCriticalSection(&synth->cs); find_region(synth, preset->bank, preset->patch, key, vel, &instrument, &region); + if (!region && preset->bank == 128) + find_region(synth, preset->bank, 0, key, vel, &instrument, &region); if (!instrument) {

1 0

Anton Baskanov : dmsynth: Use FLUID_MOD_KEY for CONN_SRC_KEYNUMBER.
by Alexandre Julliard 15 Nov '23

15 Nov '23

Module: wine Branch: master Commit: b0ad8b8cfb6e664cc6cfdd87ddb28af077149417 URL: https://gitlab.winehq.org/wine/wine/-/commit/b0ad8b8cfb6e664cc6cfdd87ddb28a… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Wed Nov 15 15:25:32 2023 +0700 dmsynth: Use FLUID_MOD_KEY for CONN_SRC_KEYNUMBER. Fixes incorrect EG key number scale and offset that caused missing lower notes of some instruments (e.g. Acoustic Grand Piano). --- dlls/dmsynth/synth.c | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/dlls/dmsynth/synth.c b/dlls/dmsynth/synth.c index ec9785c4218..bbe77e43cc9 100644 --- a/dlls/dmsynth/synth.c +++ b/dlls/dmsynth/synth.c @@ -1483,17 +1483,6 @@ static BOOL set_gen_from_connection(fluid_voice_t *fluid_voice, const CONNECTION { if (!gen_from_connection(conn, &gen)) return FALSE; } - else if (conn->usSource == CONN_SRC_KEYNUMBER) - { - switch (conn->usDestination) - { - case CONN_DST_EG2_HOLDTIME: gen = GEN_KEYTOMODENVHOLD; break; - case CONN_DST_EG2_DECAYTIME: gen = GEN_KEYTOMODENVDECAY; break; - case CONN_DST_EG1_HOLDTIME: gen = GEN_KEYTOVOLENVHOLD; break; - case CONN_DST_EG1_DECAYTIME: gen = GEN_KEYTOVOLENVDECAY; break; - default: return FALSE; - } - } else if (conn->usSource == CONN_SRC_LFO) { switch (conn->usDestination) @@ -1588,10 +1577,6 @@ static void add_mod_from_connection(fluid_voice_t *fluid_voice, const CONNECTION case MAKELONG(CONN_SRC_LFO, CONN_DST_FILTER_CUTOFF): gen = GEN_MODLFOTOFILTERFC; break; case MAKELONG(CONN_SRC_EG2, CONN_DST_FILTER_CUTOFF): gen = GEN_MODENVTOFILTERFC; break; case MAKELONG(CONN_SRC_LFO, CONN_DST_GAIN): gen = GEN_MODLFOTOVOL; break; - case MAKELONG(CONN_SRC_KEYNUMBER, CONN_DST_EG2_HOLDTIME): gen = GEN_KEYTOMODENVHOLD; break; - case MAKELONG(CONN_SRC_KEYNUMBER, CONN_DST_EG2_DECAYTIME): gen = GEN_KEYTOMODENVDECAY; break; - case MAKELONG(CONN_SRC_KEYNUMBER, CONN_DST_EG1_HOLDTIME): gen = GEN_KEYTOVOLENVHOLD; break; - case MAKELONG(CONN_SRC_KEYNUMBER, CONN_DST_EG1_DECAYTIME): gen = GEN_KEYTOVOLENVDECAY; break; } if (conn->usControl != CONN_SRC_NONE && gen != -1)

1 0

Alexandre Julliard : ntdll: Redirect PE function pointers through the ARM64EC redirection map.
by Alexandre Julliard 15 Nov '23

15 Nov '23

Module: wine Branch: master Commit: 406016536703f084b950b62f0dae714c1c11bb53 URL: https://gitlab.winehq.org/wine/wine/-/commit/406016536703f084b950b62f0dae71… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 15 15:00:29 2023 +0100 ntdll: Redirect PE function pointers through the ARM64EC redirection map. --- dlls/ntdll/unix/loader.c | 50 ++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/unix/unix_private.h | 8 ++++++- 2 files changed, 57 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index b7a18f94950..5b6098df3bc 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1819,6 +1819,55 @@ static void load_ntdll_wow64_functions( HMODULE module ) } +/*********************************************************************** + * redirect_arm64ec_ptr + * + * Redirect a function pointer through the arm64ec redirection table. + */ +static void *redirect_arm64ec_ptr( void *module, void *ptr, + const IMAGE_ARM64EC_REDIRECTION_ENTRY *map, ULONG map_count ) +{ + int min = 0, max = map_count - 1; + ULONG_PTR rva = (char *)ptr - (char *)module; + + while (min <= max) + { + int pos = (min + max) / 2; + if (map[pos].Source == rva) return get_rva( module, map[pos].Destination ); + if (map[pos].Source < rva) min = pos + 1; + else max = pos - 1; + } + return ptr; +} + + +/*********************************************************************** + * redirect_ntdll_functions + * + * Redirect ntdll functions on arm64ec. + */ +static void redirect_ntdll_functions( HMODULE module ) +{ + const IMAGE_LOAD_CONFIG_DIRECTORY *loadcfg; + const IMAGE_ARM64EC_METADATA *metadata; + const IMAGE_ARM64EC_REDIRECTION_ENTRY *map; + + if (!(loadcfg = get_module_data_dir( module, IMAGE_DIRECTORY_ENTRY_LOAD_CONFIG, NULL ))) return; + if (!(metadata = (void *)loadcfg->CHPEMetadataPointer)) return; + if (!(map = get_rva( module, metadata->RedirectionMetadata ))) return; +#define REDIRECT(name) \ + p##name = redirect_arm64ec_ptr( module, p##name, map, metadata->RedirectionMetadataCount ) + REDIRECT( DbgUiRemoteBreakin ); + REDIRECT( KiRaiseUserExceptionDispatcher ); + REDIRECT( KiUserExceptionDispatcher ); + REDIRECT( KiUserApcDispatcher ); + REDIRECT( KiUserCallbackDispatcher ); + REDIRECT( LdrInitializeThunk ); + REDIRECT( RtlUserThreadStart ); +#undef REDIRECT +} + + /*********************************************************************** * load_ntdll */ @@ -1851,6 +1900,7 @@ static void load_ntdll(void) if (status) fatal_error( "failed to load %s error %x\n", name, status ); free( name ); load_ntdll_functions( module ); + if (is_arm64ec()) redirect_ntdll_functions( module ); } diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index d9d830a7462..f15efa45d14 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -64,6 +64,7 @@ static inline TEB64 *NtCurrentTeb64(void) { return (TEB64 *)NtCurrentTeb()->GdiB extern WOW_PEB *wow_peb DECLSPEC_HIDDEN; extern ULONG_PTR user_space_wow_limit DECLSPEC_HIDDEN; +extern SECTION_IMAGE_INFORMATION main_image_info DECLSPEC_HIDDEN; static inline WOW_TEB *get_wow_teb( TEB *teb ) { @@ -81,6 +82,12 @@ static inline BOOL is_old_wow64(void) return !is_win64 && wow_peb; } +static inline BOOL is_arm64ec(void) +{ + return (current_machine == IMAGE_FILE_MACHINE_ARM64 && + main_image_info.Machine == IMAGE_FILE_MACHINE_AMD64); +} + /* thread private data, stored in NtCurrentTeb()->GdiTebBatch */ struct ntdll_thread_data { @@ -152,7 +159,6 @@ extern USHORT *uctable DECLSPEC_HIDDEN; extern USHORT *lctable DECLSPEC_HIDDEN; extern SIZE_T startup_info_size DECLSPEC_HIDDEN; extern BOOL is_prefix_bootstrap DECLSPEC_HIDDEN; -extern SECTION_IMAGE_INFORMATION main_image_info DECLSPEC_HIDDEN; extern int main_argc DECLSPEC_HIDDEN; extern char **main_argv DECLSPEC_HIDDEN; extern char **main_envp DECLSPEC_HIDDEN;

1 0