July 2021 - Wine-commits - list.winehq.org

Giovanni Mascellani : mf/sar: Allow requesting more than a sample per period.
by Alexandre Julliard 06 Jul '21

06 Jul '21

Module: wine Branch: master Commit: adffa11609093c3c21cf43970bbecda1b2c43eb1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=adffa11609093c3c21cf4397… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Mon Jun 28 11:06:44 2021 +0200 mf/sar: Allow requesting more than a sample per period. The IAudioClient implementation from both Windows and winepulse.drv never sets the event more than once per period, which is usually around 10 ms long. Some codecs produce audio samples shorter than 10 ms, so it is critical that the SAR is able to process more than a sample per period. This is not currently the case: a new sample is requested only in audio_renderer_render, which is executed (at most) once per period. This results in the SAR not being able to keep up with the audio client, and eventually underrunning. With this patch the SAR keeps a count of how many frames are currently queued, and a new sample is immediately requested if the internal queue has less than a buffer worth of frames. This patch fixes audio stuttering problems in the logo videos of Borderlands 3, Deep Rock Galactic and Mutant Year Zero. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/sar.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/dlls/mf/sar.c b/dlls/mf/sar.c index eba822ae0fe..e35531acb71 100644 --- a/dlls/mf/sar.c +++ b/dlls/mf/sar.c @@ -101,6 +101,8 @@ struct audio_renderer HANDLE buffer_ready_event; MFWORKITEM_KEY buffer_ready_key; unsigned int frame_size; + unsigned int queued_frames; + unsigned int max_frames; struct list queue; enum stream_state state; unsigned int flags; @@ -234,6 +236,7 @@ static void audio_renderer_release_audio_client(struct audio_renderer *renderer) { release_pending_object(obj); } + renderer->queued_frames = 0; renderer->buffer_ready_key = 0; if (renderer->audio_client) { @@ -1330,6 +1333,13 @@ static HRESULT WINAPI audio_renderer_stream_GetMediaTypeHandler(IMFStreamSink *i static HRESULT stream_queue_sample(struct audio_renderer *renderer, IMFSample *sample) { struct queued_object *object; + DWORD sample_len, sample_frames; + HRESULT hr; + + if (FAILED(hr = IMFSample_GetTotalLength(sample, &sample_len))) + return hr; + + sample_frames = sample_len / renderer->frame_size; if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; @@ -1339,6 +1349,7 @@ static HRESULT stream_queue_sample(struct audio_renderer *renderer, IMFSample *s IMFSample_AddRef(object->u.sample.sample); list_add_tail(&renderer->queue, &object->entry); + renderer->queued_frames += sample_frames; return S_OK; } @@ -1357,9 +1368,17 @@ static HRESULT WINAPI audio_renderer_stream_ProcessSample(IMFStreamSink *iface, return MF_E_STREAMSINK_REMOVED; EnterCriticalSection(&renderer->cs); + if (renderer->state == STREAM_STATE_RUNNING) hr = stream_queue_sample(renderer, sample); renderer->flags &= ~SAR_SAMPLE_REQUESTED; + + if (renderer->queued_frames < renderer->max_frames && renderer->state == STREAM_STATE_RUNNING) + { + IMFMediaEventQueue_QueueEventParamVar(renderer->stream_event_queue, MEStreamSinkRequestSample, &GUID_NULL, S_OK, NULL); + renderer->flags |= SAR_SAMPLE_REQUESTED; + } + LeaveCriticalSection(&renderer->cs); return hr; @@ -1428,6 +1447,7 @@ static HRESULT WINAPI audio_renderer_stream_Flush(IMFStreamSink *iface) release_pending_object(obj); } } + renderer->queued_frames = 0; LeaveCriticalSection(&renderer->cs); return hr; @@ -1576,6 +1596,12 @@ static HRESULT audio_renderer_create_audio_client(struct audio_renderer *rendere return hr; } + if (FAILED(hr = IAudioClient_GetBufferSize(renderer->audio_client, &renderer->max_frames))) + { + WARN("Failed to get buffer size, hr %#x.\n", hr); + return hr; + } + if (SUCCEEDED(hr = MFCreateAsyncResult(NULL, &renderer->render_callback, NULL, &result))) { if (FAILED(hr = MFPutWaitingWorkItem(renderer->buffer_ready_event, 0, result, &renderer->buffer_ready_key))) @@ -1789,6 +1815,7 @@ static void audio_renderer_render(struct audio_renderer *renderer, IMFAsyncResul IAudioRenderClient_ReleaseBuffer(renderer->audio_render_client, dst_frames, 0); obj->u.sample.frame_offset += dst_frames; + renderer->queued_frames -= dst_frames; } keep_sample = FAILED(hr) || src_frames > max_frames;

1 0

Zebediah Figura : server: Return a Win32 error code from IOCTL_AFD_WINE_GET_SO_ERROR.
by Alexandre Julliard 06 Jul '21

06 Jul '21

Module: wine Branch: master Commit: 026b192018e254c74c6a1f07d82637716ff48e8d URL: https://source.winehq.org/git/wine.git/?a=commit;h=026b192018e254c74c6a1f07… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jul 5 19:14:17 2021 -0500 server: Return a Win32 error code from IOCTL_AFD_WINE_GET_SO_ERROR. Fixes: fb3956fcf94397bed53598943a9524520bc23e08 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 10 +++++----- server/sock.c | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 1b697423e27..df5a69b4564 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -3271,13 +3271,13 @@ static void test_select(void) id = 0xdeadbeef; ret = getsockopt(fdWrite, SOL_SOCKET, SO_ERROR, (char *)&id, &len); ok(!ret, "getsockopt failed with %d\n", WSAGetLastError()); - todo_wine ok(id == WSAECONNREFUSED, "got error %u\n", id); + ok(id == WSAECONNREFUSED, "got error %u\n", id); len = sizeof(id); id = 0xdeadbeef; ret = getsockopt(fdWrite, SOL_SOCKET, SO_ERROR, (char *)&id, &len); ok(!ret, "getsockopt failed with %d\n", WSAGetLastError()); - todo_wine ok(id == WSAECONNREFUSED, "got error %u\n", id); + ok(id == WSAECONNREFUSED, "got error %u\n", id); FD_ZERO_ALL(); FD_SET(fdWrite, &readfds); @@ -3307,7 +3307,7 @@ static void test_select(void) id = 0xdeadbeef; ret = getsockopt(fdWrite, SOL_SOCKET, SO_ERROR, (char *)&id, &len); ok(!ret, "getsockopt failed with %d\n", WSAGetLastError()); - todo_wine ok(id == WSAECONNREFUSED, "got error %u\n", id); + ok(id == WSAECONNREFUSED, "got error %u\n", id); FD_ZERO_ALL(); FD_SET(fdWrite, &readfds); @@ -6515,13 +6515,13 @@ static void test_WSAPoll(void) err = 0xdeadbeef; ret = getsockopt(client, SOL_SOCKET, SO_ERROR, (char *)&err, &len); ok(!ret, "getsockopt failed with %d\n", WSAGetLastError()); - todo_wine ok(err == WSAECONNREFUSED, "got error %u\n", err); + ok(err == WSAECONNREFUSED, "got error %u\n", err); len = sizeof(err); err = 0xdeadbeef; ret = getsockopt(client, SOL_SOCKET, SO_ERROR, (char *)&err, &len); ok(!ret, "getsockopt failed with %d\n", WSAGetLastError()); - todo_wine ok(err == WSAECONNREFUSED, "got error %u\n", err); + ok(err == WSAECONNREFUSED, "got error %u\n", err); check_poll_todo(client, POLLWRNORM | POLLHUP | POLLERR); diff --git a/server/sock.c b/server/sock.c index befa9117c13..2b5915c87fe 100644 --- a/server/sock.c +++ b/server/sock.c @@ -2587,7 +2587,7 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) { if (sock->errors[i]) { - error = sock->errors[i]; + error = sock_get_error( sock->errors[i] ); break; } }

1 0

Zebediah Figura : server: Separate a poll_single_socket() helper.
by Alexandre Julliard 06 Jul '21

06 Jul '21

Module: wine Branch: master Commit: c86ba5d09dc6aff244f051bca5abd43943351438 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c86ba5d09dc6aff244f051bc… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jul 5 19:14:18 2021 -0500 server: Separate a poll_single_socket() helper. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/sock.c | 44 +++++++++++++++++++++++++------------------- 1 file changed, 25 insertions(+), 19 deletions(-) diff --git a/server/sock.c b/server/sock.c index 2b5915c87fe..b1cf628abae 100644 --- a/server/sock.c +++ b/server/sock.c @@ -2734,6 +2734,29 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) } } +static int poll_single_socket( struct sock *sock, int mask ) +{ + struct pollfd pollfd; + + pollfd.fd = get_unix_fd( sock->fd ); + pollfd.events = poll_flags_from_afd( sock, mask ); + if (pollfd.events < 0 || poll( &pollfd, 1, 0 ) < 0) + return 0; + + if ((mask & AFD_POLL_HUP) && (pollfd.revents & POLLIN) && sock->type == WS_SOCK_STREAM) + { + char dummy; + + if (!recv( get_unix_fd( sock->fd ), &dummy, 1, MSG_PEEK )) + { + pollfd.revents &= ~POLLIN; + pollfd.revents |= POLLHUP; + } + } + + return get_poll_flags( sock, pollfd.revents ) & mask; +} + static int poll_socket( struct sock *poll_sock, struct async *async, timeout_t timeout, unsigned int count, const struct poll_socket_input *input ) { @@ -2788,26 +2811,9 @@ static int poll_socket( struct sock *poll_sock, struct async *async, timeout_t t for (i = 0; i < count; ++i) { struct sock *sock = req->sockets[i].sock; - struct pollfd pollfd; - int flags; - - pollfd.fd = get_unix_fd( sock->fd ); - pollfd.events = poll_flags_from_afd( sock, req->sockets[i].flags ); - if (pollfd.events < 0 || poll( &pollfd, 1, 0 ) < 0) continue; - - if ((req->sockets[i].flags & AFD_POLL_HUP) && (pollfd.revents & POLLIN) && - sock->type == WS_SOCK_STREAM) - { - char dummy; - - if (!recv( get_unix_fd( sock->fd ), &dummy, 1, MSG_PEEK )) - { - pollfd.revents &= ~POLLIN; - pollfd.revents |= POLLHUP; - } - } + int mask = req->sockets[i].flags; + int flags = poll_single_socket( sock, mask ); - flags = get_poll_flags( sock, pollfd.revents ) & req->sockets[i].flags; if (flags) { req->iosb->status = STATUS_SUCCESS;

1 0

Zebediah Figura : server: Report AFD_POLL_CONNECT_ERR if a previous connection attempt failed.
by Alexandre Julliard 06 Jul '21

06 Jul '21

Module: wine Branch: master Commit: 53e69130cce85bf59830c1f6f3c9f21084216ab7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=53e69130cce85bf59830c1f6… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jul 5 19:14:19 2021 -0500 server: Report AFD_POLL_CONNECT_ERR if a previous connection attempt failed. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51331 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51366 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/afd.c | 51 ++++++++++++++++++++---------------------------- dlls/ws2_32/tests/sock.c | 16 +++++++-------- server/sock.c | 8 ++++++++ 3 files changed, 37 insertions(+), 38 deletions(-) diff --git a/dlls/ws2_32/tests/afd.c b/dlls/ws2_32/tests/afd.c index 9afb8e86dc9..4b8796157aa 100644 --- a/dlls/ws2_32/tests/afd.c +++ b/dlls/ws2_32/tests/afd.c @@ -464,30 +464,24 @@ static void test_poll(void) memset(out_params, 0xcc, sizeof(out_buffer)); ret = NtDeviceIoControlFile((HANDLE)client, event, NULL, NULL, &io, IOCTL_AFD_POLL, in_params, params_size, out_params, params_size); - todo_wine - { - ok(!ret, "got %#x\n", ret); - ok(!io.Status, "got %#x\n", io.Status); - ok(io.Information == offsetof(struct afd_poll_params, sockets[1]), "got %#Ix\n", io.Information); - ok(out_params->count == 1, "got count %u\n", out_params->count); - ok(out_params->sockets[0].socket == client, "got socket %#Ix\n", out_params->sockets[0].socket); - ok(out_params->sockets[0].flags == AFD_POLL_CONNECT_ERR, "got flags %#x\n", out_params->sockets[0].flags); - ok(out_params->sockets[0].status == STATUS_CONNECTION_REFUSED, "got status %#x\n", out_params->sockets[0].status); - } + ok(!ret, "got %#x\n", ret); + ok(!io.Status, "got %#x\n", io.Status); + ok(io.Information == offsetof(struct afd_poll_params, sockets[1]), "got %#Ix\n", io.Information); + ok(out_params->count == 1, "got count %u\n", out_params->count); + ok(out_params->sockets[0].socket == client, "got socket %#Ix\n", out_params->sockets[0].socket); + ok(out_params->sockets[0].flags == AFD_POLL_CONNECT_ERR, "got flags %#x\n", out_params->sockets[0].flags); + ok(out_params->sockets[0].status == STATUS_CONNECTION_REFUSED, "got status %#x\n", out_params->sockets[0].status); memset(out_params, 0xcc, sizeof(out_buffer)); ret = NtDeviceIoControlFile((HANDLE)client, event, NULL, NULL, &io, IOCTL_AFD_POLL, in_params, params_size, out_params, params_size); - todo_wine - { - ok(!ret, "got %#x\n", ret); - ok(!io.Status, "got %#x\n", io.Status); - ok(io.Information == offsetof(struct afd_poll_params, sockets[1]), "got %#Ix\n", io.Information); - ok(out_params->count == 1, "got count %u\n", out_params->count); - ok(out_params->sockets[0].socket == client, "got socket %#Ix\n", out_params->sockets[0].socket); - ok(out_params->sockets[0].flags == AFD_POLL_CONNECT_ERR, "got flags %#x\n", out_params->sockets[0].flags); - ok(out_params->sockets[0].status == STATUS_CONNECTION_REFUSED, "got status %#x\n", out_params->sockets[0].status); - } + ok(!ret, "got %#x\n", ret); + ok(!io.Status, "got %#x\n", io.Status); + ok(io.Information == offsetof(struct afd_poll_params, sockets[1]), "got %#Ix\n", io.Information); + ok(out_params->count == 1, "got count %u\n", out_params->count); + ok(out_params->sockets[0].socket == client, "got socket %#Ix\n", out_params->sockets[0].socket); + ok(out_params->sockets[0].flags == AFD_POLL_CONNECT_ERR, "got flags %#x\n", out_params->sockets[0].flags); + ok(out_params->sockets[0].status == STATUS_CONNECTION_REFUSED, "got status %#x\n", out_params->sockets[0].status); ret = connect(client, (struct sockaddr *)&addr, sizeof(addr)); ok(ret == -1, "got %d\n", ret); @@ -514,16 +508,13 @@ static void test_poll(void) memset(out_params, 0xcc, sizeof(out_buffer)); ret = NtDeviceIoControlFile((HANDLE)client, event, NULL, NULL, &io, IOCTL_AFD_POLL, in_params, params_size, out_params, params_size); - todo_wine - { - ok(!ret, "got %#x\n", ret); - ok(!io.Status, "got %#x\n", io.Status); - ok(io.Information == offsetof(struct afd_poll_params, sockets[1]), "got %#Ix\n", io.Information); - ok(out_params->count == 1, "got count %u\n", out_params->count); - ok(out_params->sockets[0].socket == client, "got socket %#Ix\n", out_params->sockets[0].socket); - ok(out_params->sockets[0].flags == AFD_POLL_CONNECT_ERR, "got flags %#x\n", out_params->sockets[0].flags); - ok(out_params->sockets[0].status == STATUS_CONNECTION_REFUSED, "got status %#x\n", out_params->sockets[0].status); - } + ok(!ret, "got %#x\n", ret); + ok(!io.Status, "got %#x\n", io.Status); + ok(io.Information == offsetof(struct afd_poll_params, sockets[1]), "got %#Ix\n", io.Information); + ok(out_params->count == 1, "got count %u\n", out_params->count); + ok(out_params->sockets[0].socket == client, "got socket %#Ix\n", out_params->sockets[0].socket); + ok(out_params->sockets[0].flags == AFD_POLL_CONNECT_ERR, "got flags %#x\n", out_params->sockets[0].flags); + ok(out_params->sockets[0].status == STATUS_CONNECTION_REFUSED, "got status %#x\n", out_params->sockets[0].status); closesocket(client); } diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index df5a69b4564..9e7cd3a1d39 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -3263,8 +3263,8 @@ static void test_select(void) FD_SET(fdWrite, &exceptfds); select_timeout.tv_sec = 10; ret = select(0, &readfds, &writefds, &exceptfds, &select_timeout); - todo_wine ok(ret == 1, "expected 1, got %d\n", ret); - todo_wine ok(FD_ISSET(fdWrite, &exceptfds), "fdWrite socket is not in the set\n"); + ok(ret == 1, "expected 1, got %d\n", ret); + ok(FD_ISSET(fdWrite, &exceptfds), "fdWrite socket is not in the set\n"); ok(select_timeout.tv_usec == 250000, "select timeout should not have changed\n"); len = sizeof(id); @@ -3285,8 +3285,8 @@ static void test_select(void) FD_SET(fdWrite, &exceptfds); select_timeout.tv_sec = 10; ret = select(0, &readfds, &writefds, &exceptfds, &select_timeout); - todo_wine ok(ret == 1, "got %d\n", ret); - todo_wine ok(FD_ISSET(fdWrite, &exceptfds), "fdWrite socket is not in the set\n"); + ok(ret == 1, "got %d\n", ret); + ok(FD_ISSET(fdWrite, &exceptfds), "fdWrite socket is not in the set\n"); /* Calling connect() doesn't reset the socket error, but a successful * connection does. This is kind of tricky to test, because while @@ -3315,8 +3315,8 @@ static void test_select(void) FD_SET(fdWrite, &exceptfds); select_timeout.tv_sec = 10; ret = select(0, &readfds, &writefds, &exceptfds, &select_timeout); - todo_wine ok(ret == 1, "got %d\n", ret); - todo_wine ok(FD_ISSET(fdWrite, &exceptfds), "fdWrite socket is not in the set\n"); + ok(ret == 1, "got %d\n", ret); + ok(FD_ISSET(fdWrite, &exceptfds), "fdWrite socket is not in the set\n"); len = sizeof(address); ret = getsockname(fdListen, (struct sockaddr *)&address, &len); @@ -3362,8 +3362,8 @@ static void test_select(void) FD_SET(fdWrite, &exceptfds); select_timeout.tv_sec = 0; ret = select(0, &readfds, &writefds, &exceptfds, &select_timeout); - todo_wine ok(ret == 1, "expected 1, got %d\n", ret); - todo_wine ok(FD_ISSET(fdWrite, &exceptfds), "fdWrite socket is not in the set\n"); + ok(ret == 1, "expected 1, got %d\n", ret); + ok(FD_ISSET(fdWrite, &exceptfds), "fdWrite socket is not in the set\n"); len = sizeof(id); id = 0xdeadbeef; diff --git a/server/sock.c b/server/sock.c index b1cf628abae..58e9cf4302a 100644 --- a/server/sock.c +++ b/server/sock.c @@ -2820,6 +2820,14 @@ static int poll_socket( struct sock *poll_sock, struct async *async, timeout_t t output[i].flags = flags; output[i].status = sock_get_ntstatus( sock_error( sock->fd ) ); } + + /* FIXME: do other error conditions deserve a similar treatment? */ + if (sock->state != SOCK_CONNECTING && sock->errors[AFD_POLL_BIT_CONNECT_ERR] && (mask & AFD_POLL_CONNECT_ERR)) + { + req->iosb->status = STATUS_SUCCESS; + output[i].flags |= AFD_POLL_CONNECT_ERR; + output[i].status = sock_get_ntstatus( sock->errors[AFD_POLL_BIT_CONNECT_ERR] ); + } } if (req->iosb->status != STATUS_PENDING)

1 0

Francois Gouget : kernel32: Fix the formatting of an NLS_IsUnicodeOnlyLcid() trace.
by Alexandre Julliard 06 Jul '21

06 Jul '21

Module: wine Branch: master Commit: ea236aa9817f89f4aea7393b366248584027cae7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea236aa9817f89f4aea7393b… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Jul 5 23:40:05 2021 +0200 kernel32: Fix the formatting of an NLS_IsUnicodeOnlyLcid() trace. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/lcformat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/lcformat.c b/dlls/kernel32/lcformat.c index 47f55b4b27d..a9dfbf09be2 100644 --- a/dlls/kernel32/lcformat.c +++ b/dlls/kernel32/lcformat.c @@ -333,7 +333,7 @@ static BOOL NLS_IsUnicodeOnlyLcid(LCID lcid) case LANG_MARATHI: case LANG_PUNJABI: case LANG_SANSKRIT: - TRACE("lcid 0x%08x: langid 0x%4x is Unicode Only\n", lcid, PRIMARYLANGID(lcid)); + TRACE("lcid 0x%08x: langid 0x%04x is Unicode Only\n", lcid, PRIMARYLANGID(lcid)); return TRUE; default: return FALSE;

1 0

Alexandre Julliard : wow64: Add stub dll.
by Alexandre Julliard 06 Jul '21

06 Jul '21

Module: wine Branch: master Commit: 7144e630d57fb47fe977be24f29a25d9226116ea URL: https://source.winehq.org/git/wine.git/?a=commit;h=7144e630d57fb47fe977be24… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 6 10:42:52 2021 +0200 wow64: Add stub dll. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 5 +++++ configure.ac | 4 ++++ dlls/wow64/Makefile.in | 2 ++ dlls/wow64/wow64.spec | 27 +++++++++++++++++++++++++++ 4 files changed, 38 insertions(+) diff --git a/configure b/configure index c5a0e4d177c..eaab3b2ef35 100755 --- a/configure +++ b/configure @@ -1720,6 +1720,7 @@ enable_wmp enable_wmphoto enable_wmvcore enable_wnaspi32 +enable_wow64 enable_wow64cpu enable_wpc enable_wpcap @@ -5748,6 +5749,7 @@ $as_echo "$wine_cv_builtin_ms_va_list" >&6; } host_cpu="x86_64" notice_platform="64-bit " TARGETFLAGS="$TARGETFLAGS -m64" + enable_wow64=${enable_wow64:-yes} enable_wow64cpu=${enable_wow64cpu:-yes} fi ;; @@ -5862,6 +5864,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $wine_cv_builtin_ms_va_list" >&5 $as_echo "$wine_cv_builtin_ms_va_list" >&6; } test $wine_cv_builtin_ms_va_list != no || as_fn_error $? "You need clang >= 5.0 to build Wine for arm64." "$LINENO" 5 + enable_wow64=${enable_wow64:-yes} ;; i[3456789]86*) enable_win16=${enable_win16:-yes} @@ -5871,6 +5874,7 @@ esac enable_win16=${enable_win16:-no} enable_win64=${enable_win64:-no} +enable_wow64=${enable_wow64:-no} enable_wow64cpu=${enable_wow64cpu:-no} enable_winetest=${enable_winetest:-$enable_tests} @@ -21146,6 +21150,7 @@ wine_fn_config_makefile dlls/wmvcore enable_wmvcore wine_fn_config_makefile dlls/wmvcore/tests enable_tests wine_fn_config_makefile dlls/wnaspi32 enable_wnaspi32 wine_fn_config_makefile dlls/wow32 enable_win16 +wine_fn_config_makefile dlls/wow64 enable_wow64 wine_fn_config_makefile dlls/wow64cpu enable_wow64cpu wine_fn_config_makefile dlls/wpc enable_wpc wine_fn_config_makefile dlls/wpc/tests enable_tests diff --git a/configure.ac b/configure.ac index f0a42cf3b0a..84c3137f2dd 100644 --- a/configure.ac +++ b/configure.ac @@ -170,6 +170,7 @@ case $host in host_cpu="x86_64" notice_platform="64-bit " TARGETFLAGS="$TARGETFLAGS -m64" + enable_wow64=${enable_wow64:-yes} enable_wow64cpu=${enable_wow64cpu:-yes} fi ;; @@ -215,6 +216,7 @@ case $host in [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdarg.h>]], [[void func(__builtin_ms_va_list *args);]])], [wine_cv_builtin_ms_va_list=yes],[wine_cv_builtin_ms_va_list=no])]) test $wine_cv_builtin_ms_va_list != no || AC_MSG_ERROR([You need clang >= 5.0 to build Wine for arm64.]) + enable_wow64=${enable_wow64:-yes} ;; i[[3456789]]86*) enable_win16=${enable_win16:-yes} @@ -225,6 +227,7 @@ esac dnl enable_win16 defaults to yes on x86, to no on other CPUs enable_win16=${enable_win16:-no} enable_win64=${enable_win64:-no} +enable_wow64=${enable_wow64:-no} enable_wow64cpu=${enable_wow64cpu:-no} dnl Disable winetest too if tests are disabled @@ -3820,6 +3823,7 @@ WINE_CONFIG_MAKEFILE(dlls/wmvcore) WINE_CONFIG_MAKEFILE(dlls/wmvcore/tests) WINE_CONFIG_MAKEFILE(dlls/wnaspi32) WINE_CONFIG_MAKEFILE(dlls/wow32,enable_win16) +WINE_CONFIG_MAKEFILE(dlls/wow64) WINE_CONFIG_MAKEFILE(dlls/wow64cpu) WINE_CONFIG_MAKEFILE(dlls/wpc) WINE_CONFIG_MAKEFILE(dlls/wpc/tests) diff --git a/dlls/wow64/Makefile.in b/dlls/wow64/Makefile.in new file mode 100644 index 00000000000..9d0618f8e3e --- /dev/null +++ b/dlls/wow64/Makefile.in @@ -0,0 +1,2 @@ +MODULE = wow64.dll +IMPORTLIB = wow64 diff --git a/dlls/wow64/wow64.spec b/dlls/wow64/wow64.spec new file mode 100644 index 00000000000..f9230ced19a --- /dev/null +++ b/dlls/wow64/wow64.spec @@ -0,0 +1,27 @@ +@ stub Wow64AllocThreadHeap +@ stub Wow64AllocateHeap +@ stub Wow64AllocateTemp +@ stub Wow64ApcRoutine +@ stub Wow64CheckIfNXEnabled +@ stub Wow64EmulateAtlThunk +@ stub Wow64FreeHeap +@ stub Wow64FreeThreadHeap +@ stub Wow64GetWow64ImageOption +@ stub Wow64IsControlFlowGuardEnforced +@ stub Wow64IsStackExtentsCheckEnforced +@ stub Wow64KiUserCallbackDispatcher +@ stub Wow64LdrpInitialize +@ stub Wow64LogPrint +@ stub Wow64NotifyUnsimulateComplete +@ stub Wow64PassExceptionToGuest +@ stub Wow64PrepareForDebuggerAttach +@ stub Wow64PrepareForException +@ stub Wow64RaiseException +@ stub Wow64ShallowThunkAllocObjectAttributes32TO64_FNC +@ stub Wow64ShallowThunkAllocSecurityQualityOfService32TO64_FNC +@ stub Wow64ShallowThunkSIZE_T32TO64 +@ stub Wow64ShallowThunkSIZE_T64TO32 +@ stub Wow64SuspendLocalThread +@ stub Wow64SystemServiceEx +@ stub Wow64ValidateUserCallTarget +@ stub Wow64ValidateUserCallTargetFilter

1 0

Alexandre Julliard : wow64win: Add stub dll.
by Alexandre Julliard 06 Jul '21

06 Jul '21

Module: wine Branch: master Commit: 5388a80e1821568b02f66e795bcb67090d1590b6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5388a80e1821568b02f66e79… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 6 10:46:50 2021 +0200 wow64win: Add stub dll. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 5 +++++ configure.ac | 4 ++++ dlls/wow64win/Makefile.in | 1 + dlls/wow64win/wow64win.spec | 2 ++ 4 files changed, 12 insertions(+) diff --git a/configure b/configure index eaab3b2ef35..f9dce332f63 100755 --- a/configure +++ b/configure @@ -1722,6 +1722,7 @@ enable_wmvcore enable_wnaspi32 enable_wow64 enable_wow64cpu +enable_wow64win enable_wpc enable_wpcap enable_ws2_32 @@ -5750,6 +5751,7 @@ $as_echo "$wine_cv_builtin_ms_va_list" >&6; } notice_platform="64-bit " TARGETFLAGS="$TARGETFLAGS -m64" enable_wow64=${enable_wow64:-yes} + enable_wow64win=${enable_wow64win:-yes} enable_wow64cpu=${enable_wow64cpu:-yes} fi ;; @@ -5865,6 +5867,7 @@ fi $as_echo "$wine_cv_builtin_ms_va_list" >&6; } test $wine_cv_builtin_ms_va_list != no || as_fn_error $? "You need clang >= 5.0 to build Wine for arm64." "$LINENO" 5 enable_wow64=${enable_wow64:-yes} + enable_wow64win=${enable_wow64win:-yes} ;; i[3456789]86*) enable_win16=${enable_win16:-yes} @@ -5875,6 +5878,7 @@ esac enable_win16=${enable_win16:-no} enable_win64=${enable_win64:-no} enable_wow64=${enable_wow64:-no} +enable_wow64win=${enable_wow64win:-no} enable_wow64cpu=${enable_wow64cpu:-no} enable_winetest=${enable_winetest:-$enable_tests} @@ -21152,6 +21156,7 @@ wine_fn_config_makefile dlls/wnaspi32 enable_wnaspi32 wine_fn_config_makefile dlls/wow32 enable_win16 wine_fn_config_makefile dlls/wow64 enable_wow64 wine_fn_config_makefile dlls/wow64cpu enable_wow64cpu +wine_fn_config_makefile dlls/wow64win enable_wow64win wine_fn_config_makefile dlls/wpc enable_wpc wine_fn_config_makefile dlls/wpc/tests enable_tests wine_fn_config_makefile dlls/wpcap enable_wpcap diff --git a/configure.ac b/configure.ac index 84c3137f2dd..1d0f09ad7e1 100644 --- a/configure.ac +++ b/configure.ac @@ -171,6 +171,7 @@ case $host in notice_platform="64-bit " TARGETFLAGS="$TARGETFLAGS -m64" enable_wow64=${enable_wow64:-yes} + enable_wow64win=${enable_wow64win:-yes} enable_wow64cpu=${enable_wow64cpu:-yes} fi ;; @@ -217,6 +218,7 @@ case $host in [wine_cv_builtin_ms_va_list=yes],[wine_cv_builtin_ms_va_list=no])]) test $wine_cv_builtin_ms_va_list != no || AC_MSG_ERROR([You need clang >= 5.0 to build Wine for arm64.]) enable_wow64=${enable_wow64:-yes} + enable_wow64win=${enable_wow64win:-yes} ;; i[[3456789]]86*) enable_win16=${enable_win16:-yes} @@ -228,6 +230,7 @@ dnl enable_win16 defaults to yes on x86, to no on other CPUs enable_win16=${enable_win16:-no} enable_win64=${enable_win64:-no} enable_wow64=${enable_wow64:-no} +enable_wow64win=${enable_wow64win:-no} enable_wow64cpu=${enable_wow64cpu:-no} dnl Disable winetest too if tests are disabled @@ -3825,6 +3828,7 @@ WINE_CONFIG_MAKEFILE(dlls/wnaspi32) WINE_CONFIG_MAKEFILE(dlls/wow32,enable_win16) WINE_CONFIG_MAKEFILE(dlls/wow64) WINE_CONFIG_MAKEFILE(dlls/wow64cpu) +WINE_CONFIG_MAKEFILE(dlls/wow64win) WINE_CONFIG_MAKEFILE(dlls/wpc) WINE_CONFIG_MAKEFILE(dlls/wpc/tests) WINE_CONFIG_MAKEFILE(dlls/wpcap) diff --git a/dlls/wow64win/Makefile.in b/dlls/wow64win/Makefile.in new file mode 100644 index 00000000000..3107ce5e537 --- /dev/null +++ b/dlls/wow64win/Makefile.in @@ -0,0 +1 @@ +MODULE = wow64win.dll diff --git a/dlls/wow64win/wow64win.spec b/dlls/wow64win/wow64win.spec new file mode 100644 index 00000000000..8ca119ffb34 --- /dev/null +++ b/dlls/wow64win/wow64win.spec @@ -0,0 +1,2 @@ +#@ extern sdwhcon +#@ extern sdwhwin32

1 0

Alexandre Julliard : ntdll: Store the pthread TEB value on thread init.
by Alexandre Julliard 06 Jul '21

06 Jul '21

Module: wine Branch: master Commit: cec3db10f4e5af4aec8782423b1d4d05bb71b7e4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cec3db10f4e5af4aec878242… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 6 12:31:53 2021 +0200 ntdll: Store the pthread TEB value on thread init. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_x86_64.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 56dc640e082..6175bb9b230 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -311,11 +311,13 @@ struct amd64_thread_data DWORD_PTR dr7; /* 0318 */ void *exit_frame; /* 0320 exit frame pointer */ struct syscall_frame *syscall_frame; /* 0328 syscall frame pointer */ + void *pthread_teb; /* 0330 thread data for pthread */ }; C_ASSERT( sizeof(struct amd64_thread_data) <= sizeof(((struct ntdll_thread_data *)0)->cpu_data) ); C_ASSERT( offsetof( TEB, GdiTebBatch ) + offsetof( struct amd64_thread_data, exit_frame ) == 0x320 ); C_ASSERT( offsetof( TEB, GdiTebBatch ) + offsetof( struct amd64_thread_data, syscall_frame ) == 0x328 ); +C_ASSERT( offsetof( TEB, GdiTebBatch ) + offsetof( struct amd64_thread_data, pthread_teb ) == 0x330 ); static inline struct amd64_thread_data *amd64_thread_data(void) { @@ -2740,6 +2742,7 @@ void signal_init_thread( TEB *teb ) #if defined __linux__ arch_prctl( ARCH_SET_GS, teb ); + arch_prctl( ARCH_GET_FS, &amd64_thread_data()->pthread_teb ); #elif defined (__FreeBSD__) || defined (__FreeBSD_kernel__) amd64_set_gsbase( teb ); #elif defined(__NetBSD__) @@ -2751,11 +2754,12 @@ void signal_init_thread( TEB *teb ) __asm__ volatile (".byte 0x65\n\tmovq %0,%c1" : : "r" (teb->ThreadLocalStoragePointer), "n" (FIELD_OFFSET(TEB, ThreadLocalStoragePointer))); + amd64_thread_data()->pthread_teb = mac_thread_gsbase(); /* alloc_tls_slot() needs to poke a value to an address relative to each thread's gsbase. Have each thread record its gsbase pointer into its TEB so alloc_tls_slot() can find it. */ - teb->Reserved5[0] = mac_thread_gsbase(); + teb->Reserved5[0] = amd64_thread_data()->pthread_teb; #else # error Please define setting %gs for your architecture #endif

1 0

Alexandre Julliard : ntdll: Allocate a 32-bit %fs selector on Linux in Wow64 mode.
by Alexandre Julliard 06 Jul '21

06 Jul '21

Module: wine Branch: master Commit: a7b6b4f0d06127526addc4dba7c0b6b09821542b URL: https://source.winehq.org/git/wine.git/?a=commit;h=a7b6b4f0d06127526addc4db… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 6 12:38:07 2021 +0200 ntdll: Allocate a 32-bit %fs selector on Linux in Wow64 mode. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_x86_64.c | 37 ++++++++++++++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 6175bb9b230..b94ad9c4d91 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -88,6 +88,30 @@ WINE_DEFAULT_DEBUG_CHANNEL(seh); #include <asm/prctl.h> static inline int arch_prctl( int func, void *ptr ) { return syscall( __NR_arch_prctl, func, ptr ); } +extern int CDECL alloc_fs_sel( int sel, void *base ); +__ASM_GLOBAL_FUNC( alloc_fs_sel, + /* switch to 32-bit stack */ + "pushq %rbx\n\t" + "pushq %rdi\n\t" + "movq %rsp,%rdi\n\t" + "movq %gs:0x8,%rsp\n\t" /* NtCurrentTeb()->Tib.StackBase */ + "subl $0x10,%esp\n\t" + /* setup modify_ldt struct on 32-bit stack */ + "movl %ecx,(%rsp)\n\t" /* entry_number */ + "movl %edx,4(%rsp)\n\t" /* base */ + "movl $~0,8(%rsp)\n\t" /* limit */ + "movl $0x41,12(%rsp)\n\t" /* seg_32bit | usable */ + /* invoke 32-bit syscall */ + "movl %esp,%ebx\n\t" + "movl $0xf3,%eax\n\t" /* SYS_set_thread_area */ + "int $0x80\n\t" + /* restore stack */ + "movl (%rsp),%eax\n\t" /* entry_number */ + "movq %rdi,%rsp\n\t" + "popq %rdi\n\t" + "popq %rbx\n\t" + "ret" ); + #ifndef FP_XSTATE_MAGIC1 #define FP_XSTATE_MAGIC1 0x46505853 #endif @@ -367,6 +391,7 @@ static inline void context_init_xstate( CONTEXT *context, void *xstate_buffer ) static USHORT cs32_sel; /* selector for %cs in 32-bit mode */ static USHORT cs64_sel; /* selector for %cs in 64-bit mode */ static USHORT ds64_sel; /* selector for %ds/%es/%ss in 64-bit mode */ +static USHORT fs32_sel; /* selector for %fs in 32-bit mode */ /*********************************************************************** * Definitions for Dwarf unwind tables @@ -1911,7 +1936,7 @@ NTSTATUS set_thread_wow64_context( HANDLE handle, const void *ctx, ULONG size ) { wow_frame->SegDs = ds64_sel; wow_frame->SegEs = ds64_sel; - wow_frame->SegFs = 0; /* FIXME */ + wow_frame->SegFs = fs32_sel; wow_frame->SegGs = ds64_sel; } if (flags & CONTEXT_I386_DEBUG_REGISTERS) @@ -2743,6 +2768,7 @@ void signal_init_thread( TEB *teb ) #if defined __linux__ arch_prctl( ARCH_SET_GS, teb ); arch_prctl( ARCH_GET_FS, &amd64_thread_data()->pthread_teb ); + if (fs32_sel) alloc_fs_sel( fs32_sel >> 3, (char *)teb + teb->WowTebOffset ); #elif defined (__FreeBSD__) || defined (__FreeBSD_kernel__) amd64_set_gsbase( teb ); #elif defined(__NetBSD__) @@ -2793,7 +2819,15 @@ void signal_init_process(void) #ifdef __linux__ if (NtCurrentTeb()->WowTebOffset) { + void *teb32 = (char *)NtCurrentTeb() + NtCurrentTeb()->WowTebOffset; + int sel; + cs32_sel = 0x23; + if ((sel = alloc_fs_sel( -1, teb32 )) != -1) + { + fs32_sel = (sel << 3) | 3; + } + else ERR( "failed to allocate %%fs selector\n" ); } #endif @@ -2842,6 +2876,7 @@ void DECLSPEC_HIDDEN call_init_thunk( LPTHREAD_START_ROUTINE entry, void *arg, B context.SegCs = cs64_sel; context.SegDs = ds64_sel; context.SegEs = ds64_sel; + context.SegFs = fs32_sel; context.SegGs = ds64_sel; context.SegSs = ds64_sel; context.EFlags = 0x200;

1 0

Alexandre Julliard : ntdll: Switch back to the pthread %fs register in signal handlers.
by Alexandre Julliard 06 Jul '21

06 Jul '21

Module: wine Branch: master Commit: c42384b5a117ef818313cb023333c89f9810e124 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c42384b5a117ef818313cb02… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 6 12:41:27 2021 +0200 ntdll: Switch back to the pthread %fs register in signal handlers. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_x86_64.c | 35 ++++++++++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index b94ad9c4d91..dab22c67021 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -1520,6 +1520,28 @@ static inline void set_sigcontext( const CONTEXT *context, ucontext_t *sigcontex } +/*********************************************************************** + * init_handler + */ +static inline void init_handler( const ucontext_t *sigcontext ) +{ +#ifdef __linux__ + if (fs32_sel) arch_prctl( ARCH_SET_FS, amd64_thread_data()->pthread_teb ); +#endif +} + + +/*********************************************************************** + * leave_handler + */ +static inline void leave_handler( const ucontext_t *sigcontext ) +{ +#ifdef __linux__ + if (fs32_sel) __asm__ volatile( "movw %0,%%fs" :: "r" (fs32_sel) ); +#endif +} + + /*********************************************************************** * save_context * @@ -1529,6 +1551,8 @@ static void save_context( struct xcontext *xcontext, const ucontext_t *sigcontex { CONTEXT *context = &xcontext->c; + init_handler( sigcontext ); + context->ContextFlags = CONTEXT_CONTROL | CONTEXT_INTEGER | CONTEXT_SEGMENTS | CONTEXT_DEBUG_REGISTERS; context->Rax = RAX_sig(sigcontext); context->Rcx = RCX_sig(sigcontext); @@ -1611,6 +1635,7 @@ static void restore_context( const struct xcontext *xcontext, ucontext_t *sigcon if (FPU_sig(sigcontext)) *FPU_sig(sigcontext) = context->u.FltSave; if ((cpu_info.ProcessorFeatureBits & CPU_FEATURE_AVX) && (xs = XState_sig(FPU_sig(sigcontext)))) xs->CompactionMask = xcontext->host_compaction_mask; + leave_handler( sigcontext ); } @@ -2139,6 +2164,7 @@ static void setup_raise_exception( ucontext_t *sigcontext, EXCEPTION_RECORD *rec RSP_sig(sigcontext) = (ULONG_PTR)stack; /* clear single-step, direction, and align check flag */ EFL_sig(sigcontext) &= ~(0x100|0x400|0x40000); + leave_handler( sigcontext ); } @@ -2343,6 +2369,7 @@ static inline BOOL handle_interrupt( ucontext_t *sigcontext, EXCEPTION_RECORD *r case 4: /* BREAKPOINT_UNLOAD_SYMBOLS */ case 5: /* BREAKPOINT_COMMAND_STRING (>= Win2003) */ RIP_sig(sigcontext) += 3; + leave_handler( sigcontext ); return TRUE; } context->Rip += 3; @@ -2479,12 +2506,17 @@ static void segv_handler( int signal, siginfo_t *siginfo, void *sigcontext ) rec.ExceptionInformation[1] = (ULONG_PTR)siginfo->si_addr; rec.ExceptionCode = virtual_handle_fault( siginfo->si_addr, rec.ExceptionInformation[0], (void *)RSP_sig(ucontext) ); - if (!rec.ExceptionCode) return; + if (!rec.ExceptionCode) + { + leave_handler( sigcontext ); + return; + } break; case TRAP_x86_ALIGNFLT: /* Alignment check exception */ if (EFL_sig(ucontext) & 0x00040000) { EFL_sig(ucontext) &= ~0x00040000; /* reset AC flag */ + leave_handler( sigcontext ); return; } rec.ExceptionCode = EXCEPTION_DATATYPE_MISALIGNMENT; @@ -2627,6 +2659,7 @@ static void abrt_handler( int signal, siginfo_t *siginfo, void *sigcontext ) */ static void quit_handler( int signal, siginfo_t *siginfo, void *ucontext ) { + init_handler( ucontext ); abort_thread(0); }

1 0