- Wine-Devel - list.winehq.org

[PATCH 1/3] msvcp140_atomic_wait: Add __std_atomic_notify_one_direct implementation.
by Piotr Caban April 27, 2022

April 27, 2022

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp140_atomic_wait/Makefile.in | 2 +- dlls/msvcp140_atomic_wait/main.c | 6 ++++++ dlls/msvcp140_atomic_wait/msvcp140_atomic_wait.spec | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-)

1 0

[PATCH 0/1] MR8: wineboot: Don't use ai_canonname for ComputerName if it is "localhost".
by Jinoh Kang (＠iamahuman) April 27, 2022

April 27, 2022

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/8

2 1

[PATCH 0/10] MR6: Avoid performance degradation due to vDSO unmapping (BZ#52313)
by Jinoh Kang (＠iamahuman) April 27, 2022

April 27, 2022

Commit f558741fabc116534fa598aa890ffed683a7153b removes vDSO if it conflicts with reserved ranges: > Remove the AT_SYSINFO and AT_SYSINFO_EHDR values if the sysinfo page > is in one of our reserved ranges. However, missing vDSO leads to performance issues on some syscalls (e.g. clock_gettime, gettimeofday) and may even lead to crash when run with some ancient C libraries that does not supply a custom signal restorer. vDSO pages can clash with reserved ranges especially in a 32-bit address space with address space layout randomization (ASLR) turned on. Recent versions of the Linux kernel introduced support for mremap()-ping vDSO pages, partly in an effort to support checkpoint restore in userspace (CRIU). Special programs that require specific memory layout constraints (such as Wine preloader) can take advantage of this support to modify the address space to meet its requirements. The following test script has been used to test each changes (use with `git rebase --exec=...`): ```sh set -e make -C ../wine64-build -j5 make -C ../wine32-build -j5 cd ../wine64-build export WINEPRELOADREMAPSTACK export WINEPRELOADREMAPVDSO for WINEPRELOADREMAPSTACK in skip never always force auto on-demand '' do for WINEPRELOADREMAPVDSO in skip never always force auto on-demand '' do ./loader/wine64 wineboot ./loader/wine wineboot done done ``` -- https://gitlab.winehq.org/wine/wine/-/merge_requests/6

2 10

[PATCH v2] ieframe: Initialize new history log entry.
by Dmitry Timoshkov April 27, 2022

April 27, 2022

In addition to 41cfc86d8dd65c71a7c81b826d02ac0a99050d6a. This fixes another crash when browsing help file that I have here. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/ieframe/dochost.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ieframe/dochost.c b/dlls/ieframe/dochost.c index 7717f786d52..e73659f1736 100644 --- a/dlls/ieframe/dochost.c +++ b/dlls/ieframe/dochost.c @@ -469,6 +469,8 @@ static void update_travellog(DocHost *This) if(This->travellog.loading_pos == -1) { This->travellog.position++; + This->travellog.log[This->travellog.position].stream = NULL; + This->travellog.log[This->travellog.position].url = NULL; }else { This->travellog.position = This->travellog.loading_pos; This->travellog.loading_pos = -1; -- 2.35.3

2 1

[PATCH] po: Mark an incomplete Dutch translation as fuzzy.
by Francois Gouget April 27, 2022

April 27, 2022

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- It does not translate the usage exemples section and the trailing empty line is a hint that this is likely accidental. --- po/nl.po | 1 + 1 file changed, 1 insertion(+)

2 1

[PATCH 1/2] msvcp140/tests: Add a broken last error result in test_Copy_file().
by Paul Gofman April 27, 2022

April 27, 2022

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52857 Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/msvcp140/tests/msvcp140.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp140/tests/msvcp140.c b/dlls/msvcp140/tests/msvcp140.c index 1df2f058424..640e44e5b7c 100644 --- a/dlls/msvcp140/tests/msvcp140.c +++ b/dlls/msvcp140/tests/msvcp140.c @@ -1614,12 +1614,14 @@ static void test_Copy_file(void) SetLastError(0xdeadbeef); ret = p_Copy_file(L"wine_test_dir/f1", L"wine_test_dir/f3"); ok(ret == ERROR_SUCCESS, "Got unexpected ret %lu.\n", ret); - ok(GetLastError() == ret, "Got unexpected err %lu.\n", GetLastError()); + ok(GetLastError() == ret || broken(GetLastError() == ERROR_INVALID_PARAMETER) /* some win8 machines */, + "Got unexpected err %lu.\n", GetLastError()); SetLastError(0xdeadbeef); ret = p_Copy_file(L"wine_test_dir/f1", L"wine_test_dir/f3"); ok(ret == ERROR_SUCCESS, "Got unexpected ret %lu.\n", ret); - ok(GetLastError() == ret, "Got unexpected err %lu.\n", GetLastError()); + ok(GetLastError() == ret || broken(GetLastError() == ERROR_INVALID_PARAMETER) /* some win8 machines */, + "Got unexpected err %lu.\n", GetLastError()); SetLastError(0xdeadbeef); ret = p_Copy_file(L"wine_test_dir/missing", L"wine_test_dir/f3"); -- 2.35.1

2 2

[PATCH 4/4] wineoss: Move MIDM_STOP to the unixlib.
by Huw Davies April 27, 2022

April 27, 2022

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/wineoss.drv/midi.c | 16 ---------------- dlls/wineoss.drv/ossmidi.c | 17 +++++++++++++++++ 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/dlls/wineoss.drv/midi.c b/dlls/wineoss.drv/midi.c index 9df97530865..fe73d97f5ab 100644 --- a/dlls/wineoss.drv/midi.c +++ b/dlls/wineoss.drv/midi.c @@ -490,20 +490,6 @@ static DWORD midClose(WORD wDevID) return ret; } -/************************************************************************** - * midStop [internal] - */ -static DWORD midStop(WORD wDevID) -{ - TRACE("(%04X);\n", wDevID); - - if (wDevID >= MIDM_NumDevs) return MMSYSERR_BADDEVICEID; - if (MidiInDev[wDevID].state == -1) return MIDIERR_NODEVICE; - - MidiInDev[wDevID].state = 0; - return MMSYSERR_NOERROR; -} - /*======================================================================* * MIDI entry points * *======================================================================*/ @@ -529,8 +515,6 @@ DWORD WINAPI OSS_midMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, return midOpen(wDevID, (LPMIDIOPENDESC)dwParam1, dwParam2); case MIDM_CLOSE: return midClose(wDevID); - case MIDM_STOP: - return midStop(wDevID); } params.dev_id = wDevID; diff --git a/dlls/wineoss.drv/ossmidi.c b/dlls/wineoss.drv/ossmidi.c index 091eccd6d53..86d766eceaf 100644 --- a/dlls/wineoss.drv/ossmidi.c +++ b/dlls/wineoss.drv/ossmidi.c @@ -1225,6 +1225,20 @@ static UINT midi_in_start(WORD dev_id) return MMSYSERR_NOERROR; } +static UINT midi_in_stop(WORD dev_id) +{ + struct midi_src *src; + + TRACE("(%04X);\n", dev_id); + + if (dev_id >= num_srcs) return MMSYSERR_BADDEVICEID; + src = srcs + dev_id; + if (src->state == -1) return MIDIERR_NODEVICE; + + src->state = 0; + return MMSYSERR_NOERROR; +} + static UINT midi_in_reset(WORD dev_id, struct notify_context *notify) { UINT cur_time = NtGetTickCount(); @@ -1340,6 +1354,9 @@ NTSTATUS midi_in_message(void *args) case MIDM_START: *params->err = midi_in_start(params->dev_id); break; + case MIDM_STOP: + *params->err = midi_in_stop(params->dev_id); + break; case MIDM_RESET: *params->err = midi_in_reset(params->dev_id, params->notify); break; -- 2.25.1

2 1

[PATCH 3/4] wineoss: Move MIDM_START to the unixlib.
by Huw Davies April 27, 2022

April 27, 2022

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/wineoss.drv/midi.c | 17 ----------------- dlls/wineoss.drv/ossmidi.c | 18 ++++++++++++++++++ 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/dlls/wineoss.drv/midi.c b/dlls/wineoss.drv/midi.c index 8d4c9bab68c..9df97530865 100644 --- a/dlls/wineoss.drv/midi.c +++ b/dlls/wineoss.drv/midi.c @@ -490,21 +490,6 @@ static DWORD midClose(WORD wDevID) return ret; } -/************************************************************************** - * midStart [internal] - */ -static DWORD midStart(WORD wDevID) -{ - TRACE("(%04X);\n", wDevID); - - if (wDevID >= MIDM_NumDevs) return MMSYSERR_BADDEVICEID; - if (MidiInDev[wDevID].state == -1) return MIDIERR_NODEVICE; - - MidiInDev[wDevID].state = 1; - MidiInDev[wDevID].startTime = GetTickCount(); - return MMSYSERR_NOERROR; -} - /************************************************************************** * midStop [internal] */ @@ -544,8 +529,6 @@ DWORD WINAPI OSS_midMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, return midOpen(wDevID, (LPMIDIOPENDESC)dwParam1, dwParam2); case MIDM_CLOSE: return midClose(wDevID); - case MIDM_START: - return midStart(wDevID); case MIDM_STOP: return midStop(wDevID); } diff --git a/dlls/wineoss.drv/ossmidi.c b/dlls/wineoss.drv/ossmidi.c index d63ba936239..091eccd6d53 100644 --- a/dlls/wineoss.drv/ossmidi.c +++ b/dlls/wineoss.drv/ossmidi.c @@ -1210,6 +1210,21 @@ static UINT midi_in_get_devcaps(WORD dev_id, MIDIINCAPSW *caps, UINT size) return MMSYSERR_NOERROR; } +static UINT midi_in_start(WORD dev_id) +{ + struct midi_src *src; + + TRACE("(%04X);\n", dev_id); + + if (dev_id >= num_srcs) return MMSYSERR_BADDEVICEID; + src = srcs + dev_id; + if (src->state == -1) return MIDIERR_NODEVICE; + + src->state = 1; + src->startTime = NtGetTickCount(); + return MMSYSERR_NOERROR; +} + static UINT midi_in_reset(WORD dev_id, struct notify_context *notify) { UINT cur_time = NtGetTickCount(); @@ -1322,6 +1337,9 @@ NTSTATUS midi_in_message(void *args) case MIDM_GETNUMDEVS: *params->err = num_srcs; break; + case MIDM_START: + *params->err = midi_in_start(params->dev_id); + break; case MIDM_RESET: *params->err = midi_in_reset(params->dev_id, params->notify); break; -- 2.25.1

2 1

[PATCH 2/4] wineoss: Move MIDM_RESET to the unixlib.
by Huw Davies April 27, 2022

April 27, 2022

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/wineoss.drv/midi.c | 35 ++++++--------------------- dlls/wineoss.drv/ossmidi.c | 49 ++++++++++++++++++++++++++++++++++++++ dlls/wineoss.drv/unixlib.h | 1 + 3 files changed, 57 insertions(+), 28 deletions(-) diff --git a/dlls/wineoss.drv/midi.c b/dlls/wineoss.drv/midi.c index 44491a98cfa..8d4c9bab68c 100644 --- a/dlls/wineoss.drv/midi.c +++ b/dlls/wineoss.drv/midi.c @@ -490,31 +490,6 @@ static DWORD midClose(WORD wDevID) return ret; } -/************************************************************************** - * midReset [internal] - */ -static DWORD midReset(WORD wDevID) -{ - DWORD dwTime = GetTickCount(); - - TRACE("(%04X);\n", wDevID); - - if (wDevID >= MIDM_NumDevs) return MMSYSERR_BADDEVICEID; - if (MidiInDev[wDevID].state == -1) return MIDIERR_NODEVICE; - - in_buffer_lock(); - while (MidiInDev[wDevID].lpQueueHdr) { - LPMIDIHDR lpMidiHdr = MidiInDev[wDevID].lpQueueHdr; - MidiInDev[wDevID].lpQueueHdr = lpMidiHdr->lpNext; - lpMidiHdr->dwFlags &= ~MHDR_INQUEUE; - lpMidiHdr->dwFlags |= MHDR_DONE; - MIDI_NotifyClient(wDevID, MIM_LONGDATA, (DWORD_PTR)lpMidiHdr, dwTime - MidiInDev[wDevID].startTime); - } - in_buffer_unlock(); - - return MMSYSERR_NOERROR; -} - /************************************************************************** * midStart [internal] */ @@ -555,6 +530,7 @@ DWORD WINAPI OSS_midMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, DWORD_PTR dwParam1, DWORD_PTR dwParam2) { struct midi_in_message_params params; + struct notify_context notify; UINT err; TRACE("(%04X, %04X, %08lX, %08lX, %08lX);\n", @@ -568,8 +544,6 @@ DWORD WINAPI OSS_midMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, return midOpen(wDevID, (LPMIDIOPENDESC)dwParam1, dwParam2); case MIDM_CLOSE: return midClose(wDevID); - case MIDM_RESET: - return midReset(wDevID); case MIDM_START: return midStart(wDevID); case MIDM_STOP: @@ -582,8 +556,13 @@ DWORD WINAPI OSS_midMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, params.param_1 = dwParam1; params.param_2 = dwParam2; params.err = &err; + params.notify = &notify; - OSS_CALL(midi_in_message, &params); + do + { + OSS_CALL(midi_in_message, &params); + if ((!err || err == ERROR_RETRY) && notify.send_notify) notify_client(&notify); + } while (err == ERROR_RETRY); return err; } diff --git a/dlls/wineoss.drv/ossmidi.c b/dlls/wineoss.drv/ossmidi.c index 8fca6e32c41..d63ba936239 100644 --- a/dlls/wineoss.drv/ossmidi.c +++ b/dlls/wineoss.drv/ossmidi.c @@ -155,6 +155,20 @@ NTSTATUS midi_in_lock(void *args) return STATUS_SUCCESS; } +static void set_in_notify(struct notify_context *notify, struct midi_src *src, WORD dev_id, WORD msg, + UINT_PTR param_1, UINT_PTR param_2) +{ + notify->send_notify = TRUE; + notify->dev_id = dev_id; + notify->msg = msg; + notify->param_1 = param_1; + notify->param_2 = param_2; + notify->callback = src->midiDesc.dwCallback; + notify->flags = src->wFlags; + notify->device = src->midiDesc.hMidi; + notify->instance = src->midiDesc.dwInstance; +} + static int seq_open(void) { static int midi_warn = 1; @@ -1196,6 +1210,36 @@ static UINT midi_in_get_devcaps(WORD dev_id, MIDIINCAPSW *caps, UINT size) return MMSYSERR_NOERROR; } +static UINT midi_in_reset(WORD dev_id, struct notify_context *notify) +{ + UINT cur_time = NtGetTickCount(); + UINT err = MMSYSERR_NOERROR; + struct midi_src *src; + MIDIHDR *hdr; + + TRACE("(%04X);\n", dev_id); + + if (dev_id >= num_srcs) return MMSYSERR_BADDEVICEID; + src = srcs + dev_id; + if (src->state == -1) return MIDIERR_NODEVICE; + + in_buffer_lock(); + + if (src->lpQueueHdr) + { + hdr = src->lpQueueHdr; + src->lpQueueHdr = hdr->lpNext; + hdr->dwFlags &= ~MHDR_INQUEUE; + hdr->dwFlags |= MHDR_DONE; + set_in_notify(notify, src, dev_id, MIM_LONGDATA, (UINT_PTR)hdr, cur_time - src->startTime); + if (src->lpQueueHdr) err = ERROR_RETRY; /* ask the client to call again */ + } + + in_buffer_unlock(); + + return err; +} + NTSTATUS midi_out_message(void *args) { struct midi_out_message_params *params = args; @@ -1254,6 +1298,8 @@ NTSTATUS midi_in_message(void *args) { struct midi_in_message_params *params = args; + params->notify->send_notify = FALSE; + switch (params->msg) { case DRVM_ENABLE: @@ -1276,6 +1322,9 @@ NTSTATUS midi_in_message(void *args) case MIDM_GETNUMDEVS: *params->err = num_srcs; break; + case MIDM_RESET: + *params->err = midi_in_reset(params->dev_id, params->notify); + break; default: TRACE("Unsupported message\n"); *params->err = MMSYSERR_NOTSUPPORTED; diff --git a/dlls/wineoss.drv/unixlib.h b/dlls/wineoss.drv/unixlib.h index 544a462dcc4..867e1ff656e 100644 --- a/dlls/wineoss.drv/unixlib.h +++ b/dlls/wineoss.drv/unixlib.h @@ -264,6 +264,7 @@ struct midi_in_message_params UINT_PTR param_1; UINT_PTR param_2; UINT *err; + struct notify_context *notify; }; struct midi_seq_open_params -- 2.25.1

2 1

[PATCH 1/4] wineoss: Pass the time relative to the start time to the callback.
by Huw Davies April 27, 2022

April 27, 2022

This is equivalent to commits 01ad503004cf8ea6b0bd8f544ee131fc86abc580 and bce11840bd5f56c70e1290d302556c97ba3b1389 in the coreaudio and alsa drivers. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/wineoss.drv/midi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wineoss.drv/midi.c b/dlls/wineoss.drv/midi.c index e796c9a7085..44491a98cfa 100644 --- a/dlls/wineoss.drv/midi.c +++ b/dlls/wineoss.drv/midi.c @@ -508,7 +508,7 @@ static DWORD midReset(WORD wDevID) MidiInDev[wDevID].lpQueueHdr = lpMidiHdr->lpNext; lpMidiHdr->dwFlags &= ~MHDR_INQUEUE; lpMidiHdr->dwFlags |= MHDR_DONE; - MIDI_NotifyClient(wDevID, MIM_LONGDATA, (DWORD_PTR)lpMidiHdr, dwTime); + MIDI_NotifyClient(wDevID, MIM_LONGDATA, (DWORD_PTR)lpMidiHdr, dwTime - MidiInDev[wDevID].startTime); } in_buffer_unlock(); -- 2.25.1

2 1