June 2021 - Wine-Commits - list.winehq.org

Austin English : dpnhupnp: Add stub dll.
by Alexandre Julliard June 14, 2021

June 14, 2021

Module: wine Branch: master Commit: 825ebd4e58588595b9f8bc6d0999be0f4f287a5b URL: https://source.winehq.org/git/wine.git/?a=commit;h=825ebd4e58588595b9f8bc6d… Author: Austin English <austinenglish(a)gmail.com> Date: Sat Jun 12 09:05:54 2021 +1000 dpnhupnp: Add stub dll. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/dpnhupnp/Makefile.in | 6 ++++++ dlls/dpnhupnp/dpnhupnp.spec | 6 ++++++ dlls/dpnhupnp/version.rc | 26 ++++++++++++++++++++++++++ 5 files changed, 41 insertions(+) diff --git a/configure b/configure index 4c4ce7e6e20..c38153e53cf 100755 --- a/configure +++ b/configure @@ -1283,6 +1283,7 @@ enable_dplayx enable_dpnaddr enable_dpnet enable_dpnhpast +enable_dpnhupnp enable_dpnlobby enable_dpvoice enable_dpwsockx @@ -20503,6 +20504,7 @@ wine_fn_config_makefile dlls/dpnaddr enable_dpnaddr wine_fn_config_makefile dlls/dpnet enable_dpnet wine_fn_config_makefile dlls/dpnet/tests enable_tests wine_fn_config_makefile dlls/dpnhpast enable_dpnhpast +wine_fn_config_makefile dlls/dpnhupnp enable_dpnhupnp wine_fn_config_makefile dlls/dpnlobby enable_dpnlobby wine_fn_config_makefile dlls/dpvoice enable_dpvoice wine_fn_config_makefile dlls/dpvoice/tests enable_tests diff --git a/configure.ac b/configure.ac index 8c74532dabc..94e586e07b2 100644 --- a/configure.ac +++ b/configure.ac @@ -3174,6 +3174,7 @@ WINE_CONFIG_MAKEFILE(dlls/dpnaddr) WINE_CONFIG_MAKEFILE(dlls/dpnet) WINE_CONFIG_MAKEFILE(dlls/dpnet/tests) WINE_CONFIG_MAKEFILE(dlls/dpnhpast) +WINE_CONFIG_MAKEFILE(dlls/dpnhupnp) WINE_CONFIG_MAKEFILE(dlls/dpnlobby) WINE_CONFIG_MAKEFILE(dlls/dpvoice) WINE_CONFIG_MAKEFILE(dlls/dpvoice/tests) diff --git a/dlls/dpnhupnp/Makefile.in b/dlls/dpnhupnp/Makefile.in new file mode 100644 index 00000000000..566ce038f82 --- /dev/null +++ b/dlls/dpnhupnp/Makefile.in @@ -0,0 +1,6 @@ +MODULE = dpnhupnp.dll + +EXTRADLLFLAGS = -Wb,--prefer-native + + +RC_SRCS = version.rc diff --git a/dlls/dpnhupnp/dpnhupnp.spec b/dlls/dpnhupnp/dpnhupnp.spec new file mode 100644 index 00000000000..2a750e53675 --- /dev/null +++ b/dlls/dpnhupnp/dpnhupnp.spec @@ -0,0 +1,6 @@ +@ stub DirectPlayNATHelpCreate + +@ stdcall -private DllCanUnloadNow() +@ stub DllGetClassObject +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() diff --git a/dlls/dpnhupnp/version.rc b/dlls/dpnhupnp/version.rc new file mode 100644 index 00000000000..21633a49815 --- /dev/null +++ b/dlls/dpnhupnp/version.rc @@ -0,0 +1,26 @@ +/* + * Copyright 2020 Austin English + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define WINE_FILEDESCRIPTION_STR "Wine dpnhupnp" +#define WINE_FILENAME_STR "dpnhupnp.dll" +#define WINE_FILEVERSION 5,3,2600,5512 +#define WINE_FILEVERSION_STR "5.3.2600.5512" +#define WINE_PRODUCTVERSION 5,3,2600,5512 +#define WINE_PRODUCTVERSION_STR "5.3.2600.5512" + +#include "wine/wine_common_ver.rc"

1 0

Alistair Leslie-Hughes : dpnhupnp: Stub DirectPlayNATHelpCreate and DllGetClassObject.
by Alexandre Julliard June 14, 2021

June 14, 2021

Module: wine Branch: master Commit: 9ea58cbfb55950c4ee0f97018f8eefd54dafc951 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9ea58cbfb55950c4ee0f9701… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sat Jun 12 09:05:55 2021 +1000 dpnhupnp: Stub DirectPlayNATHelpCreate and DllGetClassObject. Stop crash in "STAR WARS Galactic Battlegrounds Saga" Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dpnhupnp/Makefile.in | 2 ++ dlls/dpnhupnp/dpnhupnp.spec | 4 ++-- dlls/dpnhupnp/main.c | 39 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 43 insertions(+), 2 deletions(-) diff --git a/dlls/dpnhupnp/Makefile.in b/dlls/dpnhupnp/Makefile.in index 566ce038f82..6aa9ef1dd80 100644 --- a/dlls/dpnhupnp/Makefile.in +++ b/dlls/dpnhupnp/Makefile.in @@ -2,5 +2,7 @@ MODULE = dpnhupnp.dll EXTRADLLFLAGS = -Wb,--prefer-native +C_SRCS = \ + main.c RC_SRCS = version.rc diff --git a/dlls/dpnhupnp/dpnhupnp.spec b/dlls/dpnhupnp/dpnhupnp.spec index 2a750e53675..7dd3b6961a9 100644 --- a/dlls/dpnhupnp/dpnhupnp.spec +++ b/dlls/dpnhupnp/dpnhupnp.spec @@ -1,6 +1,6 @@ -@ stub DirectPlayNATHelpCreate +@ stdcall DirectPlayNATHelpCreate(ptr ptr) @ stdcall -private DllCanUnloadNow() -@ stub DllGetClassObject +@ stdcall -private DllGetClassObject(ptr ptr ptr) @ stdcall -private DllRegisterServer() @ stdcall -private DllUnregisterServer() diff --git a/dlls/dpnhupnp/main.c b/dlls/dpnhupnp/main.c new file mode 100644 index 00000000000..10bca6e7c23 --- /dev/null +++ b/dlls/dpnhupnp/main.c @@ -0,0 +1,39 @@ +/* + * + * Copyright (C) 2021 Alistair Leslie-Hughes + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "objbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(dpnhupnp); + +HRESULT WINAPI DirectPlayNATHelpCreate(LPCGUID pIID, void **ppv) +{ + FIXME("(%p, %p) stub\n", pIID, ppv); + return E_NOTIMPL; +} + +HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv) +{ + FIXME("(%s, %s, %p)\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); + return E_FAIL; +}

1 0

Zebediah Figura : server: Store the socket errors as an array of Unix errno values.
by Alexandre Julliard June 14, 2021

June 14, 2021

Module: wine Branch: master Commit: e6258c544de29aa2664195a54cc3d1b9b67bb2e0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e6258c544de29aa2664195a5… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jun 14 00:41:48 2021 -0500 server: Store the socket errors as an array of Unix errno values. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/sock.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/server/sock.c b/server/sock.c index 2a22bb2340b..026188e79af 100644 --- a/server/sock.c +++ b/server/sock.c @@ -167,7 +167,7 @@ struct sock user_handle_t window; /* window to send the message to */ unsigned int message; /* message to send */ obj_handle_t wparam; /* message wparam (socket handle) */ - unsigned int errors[AFD_POLL_BIT_COUNT]; /* event errors */ + int errors[AFD_POLL_BIT_COUNT]; /* event errors */ timeout_t connect_time;/* time the socket was connected */ struct sock *deferred; /* socket that waits for a deferred accept */ struct async_queue read_q; /* queue for asynchronous reads */ @@ -486,7 +486,7 @@ static void sock_wake_up( struct sock *sock ) enum afd_poll_bit event = event_bitorder[i]; if (events & (1 << event)) { - lparam_t lparam = afd_poll_flag_to_win32(1 << event) | (sock->errors[event] << 16); + lparam_t lparam = afd_poll_flag_to_win32(1 << event) | (sock_get_error( sock->errors[event] ) << 16); post_message( sock->window, sock->message, sock->wparam, lparam ); } } @@ -851,7 +851,7 @@ static int sock_dispatch_asyncs( struct sock *sock, int event, int error ) return event; } -static void post_socket_event( struct sock *sock, enum afd_poll_bit event_bit, unsigned int error ) +static void post_socket_event( struct sock *sock, enum afd_poll_bit event_bit, int error ) { unsigned int event = (1 << event_bit); @@ -874,12 +874,12 @@ static void sock_dispatch_events( struct sock *sock, enum connection_state prevs if (event & POLLOUT) post_socket_event( sock, AFD_POLL_BIT_CONNECT, 0 ); if (event & (POLLERR | POLLHUP)) - post_socket_event( sock, AFD_POLL_BIT_CONNECT_ERR, sock_get_error( error ) ); + post_socket_event( sock, AFD_POLL_BIT_CONNECT_ERR, error ); break; case SOCK_LISTENING: if (event & (POLLIN | POLLERR | POLLHUP)) - post_socket_event( sock, AFD_POLL_BIT_ACCEPT, sock_get_error( error ) ); + post_socket_event( sock, AFD_POLL_BIT_ACCEPT, error ); break; case SOCK_CONNECTED: @@ -894,7 +894,7 @@ static void sock_dispatch_events( struct sock *sock, enum connection_state prevs post_socket_event( sock, AFD_POLL_BIT_OOB, 0 ); if (event & (POLLERR | POLLHUP)) - post_socket_event( sock, AFD_POLL_BIT_HUP, sock_get_error( error ) ); + post_socket_event( sock, AFD_POLL_BIT_HUP, error ); break; } @@ -2457,13 +2457,13 @@ DECL_HANDLER(get_socket_event) reply->mask = afd_poll_flag_to_win32( sock->mask ); reply->pmask = afd_poll_flag_to_win32( sock->pending_events ); - errors[FD_READ_BIT] = sock->errors[AFD_POLL_BIT_READ]; - errors[FD_WRITE_BIT] = sock->errors[AFD_POLL_BIT_WRITE]; - errors[FD_OOB_BIT] = sock->errors[AFD_POLL_BIT_OOB]; - errors[FD_ACCEPT_BIT] = sock->errors[AFD_POLL_BIT_ACCEPT]; - errors[FD_CONNECT_BIT] = sock->errors[AFD_POLL_BIT_CONNECT_ERR]; - if (!(errors[FD_CLOSE_BIT] = sock->errors[AFD_POLL_BIT_HUP])) - errors[FD_CLOSE_BIT] = sock->errors[AFD_POLL_BIT_RESET]; + errors[FD_READ_BIT] = sock_get_error( sock->errors[AFD_POLL_BIT_READ] ); + errors[FD_WRITE_BIT] = sock_get_error( sock->errors[AFD_POLL_BIT_WRITE] ); + errors[FD_OOB_BIT] = sock_get_error( sock->errors[AFD_POLL_BIT_OOB] ); + errors[FD_ACCEPT_BIT] = sock_get_error( sock->errors[AFD_POLL_BIT_ACCEPT] ); + errors[FD_CONNECT_BIT] = sock_get_error( sock->errors[AFD_POLL_BIT_CONNECT_ERR] ); + if (!(errors[FD_CLOSE_BIT] = sock_get_error( sock->errors[AFD_POLL_BIT_HUP] ))) + errors[FD_CLOSE_BIT] = sock_get_error( sock->errors[AFD_POLL_BIT_RESET] ); set_reply_data( errors, min( get_reply_max_size(), sizeof(errors) )); if (req->service)

1 0

Zebediah Figura : ws2_32/tests: Add some tests for IOCTL_AFD_EVENT_SELECT.
by Alexandre Julliard June 14, 2021

June 14, 2021

Module: wine Branch: master Commit: fd9a521c615fca11c0886564f366d8324f4d38ef URL: https://source.winehq.org/git/wine.git/?a=commit;h=fd9a521c615fca11c0886564… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jun 14 00:41:51 2021 -0500 ws2_32/tests: Add some tests for IOCTL_AFD_EVENT_SELECT. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/afd.c | 94 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 94 insertions(+) diff --git a/dlls/ws2_32/tests/afd.c b/dlls/ws2_32/tests/afd.c index 87e4779b980..e08fc977ad4 100644 --- a/dlls/ws2_32/tests/afd.c +++ b/dlls/ws2_32/tests/afd.c @@ -1136,6 +1136,99 @@ static void test_recv(void) CloseHandle(event); } +static void test_event_select(void) +{ + struct afd_event_select_params params; + WSANETWORKEVENTS events; + SOCKET client, server; + IO_STATUS_BLOCK io; + HANDLE event; + int ret; + + event = CreateEventW(NULL, TRUE, FALSE, NULL); + + tcp_socketpair(&client, &server); + + memset(&io, 0xcc, sizeof(io)); + ret = NtDeviceIoControlFile((HANDLE)client, NULL, NULL, NULL, &io, + IOCTL_AFD_EVENT_SELECT, NULL, 0, NULL, 0); + ok(ret == STATUS_INVALID_PARAMETER, "got %#x\n", ret); + ok(io.Status == STATUS_INVALID_PARAMETER, "got status %#x\n", io.Status); + ok(!io.Information, "got information %#Ix\n", io.Information); + + params.event = 0; + params.mask = ~0; + memset(&io, 0xcc, sizeof(io)); + ret = NtDeviceIoControlFile((HANDLE)client, NULL, NULL, NULL, &io, + IOCTL_AFD_EVENT_SELECT, &params, sizeof(params), NULL, 0); + ok(ret == STATUS_INVALID_PARAMETER, "got %#x\n", ret); + ok(io.Status == STATUS_INVALID_PARAMETER, "got status %#x\n", io.Status); + ok(!io.Information, "got information %#Ix\n", io.Information); + + params.event = event; + params.mask = ~0; + memset(&io, 0xcc, sizeof(io)); + ret = NtDeviceIoControlFile((HANDLE)client, NULL, NULL, NULL, &io, + IOCTL_AFD_EVENT_SELECT, &params, sizeof(params), NULL, 0); + ok(!ret, "got %#x\n", ret); + ok(!io.Status, "got status %#x\n", io.Status); + ok(!io.Information, "got information %#Ix\n", io.Information); + + ret = WSAEnumNetworkEvents(client, event, &events); + ok(!ret, "got error %u\n", WSAGetLastError()); + ok(events.lNetworkEvents == (FD_CONNECT | FD_WRITE), "got events %#x\n", events.lNetworkEvents); + + closesocket(client); + closesocket(server); + + tcp_socketpair(&client, &server); + + params.event = event; + params.mask = AFD_POLL_CONNECT; + memset(&io, 0xcc, sizeof(io)); + ret = NtDeviceIoControlFile((HANDLE)client, NULL, NULL, NULL, &io, + IOCTL_AFD_EVENT_SELECT, &params, sizeof(params), NULL, 0); + ok(!ret, "got %#x\n", ret); + ok(!io.Status, "got status %#x\n", io.Status); + ok(!io.Information, "got information %#Ix\n", io.Information); + + ret = WSAEnumNetworkEvents(client, event, &events); + ok(!ret, "got error %u\n", WSAGetLastError()); + ok(events.lNetworkEvents == FD_CONNECT, "got events %#x\n", events.lNetworkEvents); + + closesocket(client); + closesocket(server); + + tcp_socketpair(&client, &server); + + params.event = event; + params.mask = ~0; + memset(&io, 0xcc, sizeof(io)); + ret = NtDeviceIoControlFile((HANDLE)client, NULL, NULL, NULL, &io, + IOCTL_AFD_EVENT_SELECT, &params, sizeof(params), NULL, 0); + ok(!ret, "got %#x\n", ret); + ok(!io.Status, "got status %#x\n", io.Status); + ok(!io.Information, "got information %#Ix\n", io.Information); + + params.event = 0; + params.mask = 0; + memset(&io, 0xcc, sizeof(io)); + ret = NtDeviceIoControlFile((HANDLE)client, NULL, NULL, NULL, &io, + IOCTL_AFD_EVENT_SELECT, &params, sizeof(params), NULL, 0); + ok(!ret, "got %#x\n", ret); + ok(!io.Status, "got status %#x\n", io.Status); + ok(!io.Information, "got information %#Ix\n", io.Information); + + ret = WSAEnumNetworkEvents(client, event, &events); + ok(!ret, "got error %u\n", WSAGetLastError()); + ok(!events.lNetworkEvents, "got events %#x\n", events.lNetworkEvents); + + closesocket(client); + closesocket(server); + + CloseHandle(event); +} + START_TEST(afd) { WSADATA data; @@ -1146,6 +1239,7 @@ START_TEST(afd) test_poll(); test_poll_completion_port(); test_recv(); + test_event_select(); WSACleanup(); }

1 0

Zebediah Figura : ws2_32: Use IOCTL_AFD_EVENT_SELECT.
by Alexandre Julliard June 14, 2021

June 14, 2021

Module: wine Branch: master Commit: 6e4f03d745e4453f02ee0d3356d289a5c58a7e1b URL: https://source.winehq.org/git/wine.git/?a=commit;h=6e4f03d745e4453f02ee0d33… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jun 14 00:41:50 2021 -0500 ws2_32: Use IOCTL_AFD_EVENT_SELECT. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 55 ++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 38 insertions(+), 17 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index f4e3a6c9e43..69dec158e5a 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -4379,30 +4379,51 @@ int WINAPI WSAEnumNetworkEvents(SOCKET s, WSAEVENT hEvent, LPWSANETWORKEVENTS lp return SOCKET_ERROR; } -/*********************************************************************** - * WSAEventSelect (WS2_32.39) - */ -int WINAPI WSAEventSelect(SOCKET s, WSAEVENT hEvent, LONG lEvent) + +static unsigned int afd_poll_flag_from_win32( unsigned int flags ) { - int ret; + static const unsigned int map[] = + { + AFD_POLL_READ, + AFD_POLL_WRITE, + AFD_POLL_OOB, + AFD_POLL_ACCEPT, + AFD_POLL_CONNECT | AFD_POLL_CONNECT_ERR, + AFD_POLL_RESET | AFD_POLL_HUP, + }; - TRACE("%04lx, hEvent %p, event %08x\n", s, hEvent, lEvent); + unsigned int i, ret = 0; - SERVER_START_REQ( set_socket_event ) + for (i = 0; i < ARRAY_SIZE(map); ++i) { - req->handle = wine_server_obj_handle( SOCKET2HANDLE(s) ); - req->mask = lEvent; - req->event = wine_server_obj_handle( hEvent ); - req->window = 0; - req->msg = 0; - ret = wine_server_call( req ); + if (flags & (1 << i)) ret |= map[i]; } - SERVER_END_REQ; - if (!ret) return 0; - SetLastError(WSAEINVAL); - return SOCKET_ERROR; + + return ret; } + +/*********************************************************************** + * WSAEventSelect (ws2_32.@) + */ +int WINAPI WSAEventSelect( SOCKET s, WSAEVENT event, LONG mask ) +{ + struct afd_event_select_params params; + IO_STATUS_BLOCK io; + NTSTATUS status; + + TRACE( "socket %#lx, event %p, mask %#x\n", s, event, mask ); + + params.event = event; + params.mask = afd_poll_flag_from_win32( mask ); + + status = NtDeviceIoControlFile( (HANDLE)s, NULL, NULL, NULL, &io, IOCTL_AFD_EVENT_SELECT, + &params, sizeof(params), NULL, 0 ); + SetLastError( NtStatusToWSAError( status ) ); + return status ? -1 : 0; +} + + /********************************************************************** * WSAGetOverlappedResult (WS2_32.40) */

1 0

Alexandre Julliard : ntdll: Move the XSTATE definitions to the platform-specific files.
by Alexandre Julliard June 14, 2021

June 14, 2021

Module: wine Branch: master Commit: 2849ca9db42d7c2dad57f987fd595c3cb2050eb1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2849ca9db42d7c2dad57f987… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 14 12:55:39 2021 +0200 ntdll: Move the XSTATE definitions to the platform-specific files. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_i386.c | 35 +++++++++++++++++++++++++++++++ dlls/ntdll/unix/signal_x86_64.c | 34 ++++++++++++++++++++++++++++++ dlls/ntdll/unix/unix_private.h | 46 ----------------------------------------- 3 files changed, 69 insertions(+), 46 deletions(-) diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index 1ffaa543124..cb90eade4c6 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -580,6 +580,41 @@ static BOOL is_inside_syscall( ucontext_t *sigcontext ) (char *)ESP_sig(sigcontext) <= (char *)x86_thread_data()->syscall_frame); } + +struct xcontext +{ + CONTEXT c; + CONTEXT_EX c_ex; + ULONG64 host_compaction_mask; +}; + +extern BOOL xstate_compaction_enabled DECLSPEC_HIDDEN; + +static inline XSTATE *xstate_from_context( const CONTEXT *context ) +{ + CONTEXT_EX *xctx = (CONTEXT_EX *)(context + 1); + + if ((context->ContextFlags & CONTEXT_XSTATE) != CONTEXT_XSTATE) return NULL; + return (XSTATE *)((char *)xctx + xctx->XState.Offset); +} + +static inline void context_init_xstate( CONTEXT *context, void *xstate_buffer ) +{ + CONTEXT_EX *xctx; + + xctx = (CONTEXT_EX *)(context + 1); + xctx->Legacy.Length = sizeof(CONTEXT); + xctx->Legacy.Offset = -(LONG)sizeof(CONTEXT); + + xctx->XState.Length = sizeof(XSTATE); + xctx->XState.Offset = (BYTE *)xstate_buffer - (BYTE *)xctx; + + xctx->All.Length = sizeof(CONTEXT) + xctx->XState.Offset + xctx->XState.Length; + xctx->All.Offset = -(LONG)sizeof(CONTEXT); + context->ContextFlags |= CONTEXT_XSTATE; +} + + #ifdef __sun /* We have to workaround two Solaris breakages: diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 404006d22d1..46243ea00d4 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -329,6 +329,40 @@ static BOOL is_inside_syscall( ucontext_t *sigcontext ) } +struct xcontext +{ + CONTEXT c; + CONTEXT_EX c_ex; + ULONG64 host_compaction_mask; +}; + +extern BOOL xstate_compaction_enabled DECLSPEC_HIDDEN; + +static inline XSTATE *xstate_from_context( const CONTEXT *context ) +{ + CONTEXT_EX *xctx = (CONTEXT_EX *)(context + 1); + + if ((context->ContextFlags & CONTEXT_XSTATE) != CONTEXT_XSTATE) return NULL; + return (XSTATE *)((char *)xctx + xctx->XState.Offset); +} + +static inline void context_init_xstate( CONTEXT *context, void *xstate_buffer ) +{ + CONTEXT_EX *xctx; + + xctx = (CONTEXT_EX *)(context + 1); + xctx->Legacy.Length = sizeof(CONTEXT); + xctx->Legacy.Offset = -(LONG)sizeof(CONTEXT); + + xctx->XState.Length = sizeof(XSTATE); + xctx->XState.Offset = (BYTE *)xstate_buffer - (BYTE *)xctx; + + xctx->All.Length = sizeof(CONTEXT) + xctx->XState.Offset + xctx->XState.Length; + xctx->All.Offset = -(LONG)sizeof(CONTEXT); + context->ContextFlags |= CONTEXT_XSTATE; +} + + /*********************************************************************** * Definitions for Dwarf unwind tables */ diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index f6934ae9e91..28ba07ceac1 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -335,52 +335,6 @@ static inline TEB64 *NtCurrentTeb64(void) { return NULL; } static inline TEB64 *NtCurrentTeb64(void) { return (TEB64 *)NtCurrentTeb()->GdiBatchCount; } #endif -struct xcontext -{ - CONTEXT c; - CONTEXT_EX c_ex; - ULONG64 host_compaction_mask; -}; - -#if defined(__i386__) || defined(__x86_64__) -extern BOOL xstate_compaction_enabled DECLSPEC_HIDDEN; - -static inline XSTATE *xstate_from_context( const CONTEXT *context ) -{ - CONTEXT_EX *xctx = (CONTEXT_EX *)(context + 1); - - if ((context->ContextFlags & CONTEXT_XSTATE) != CONTEXT_XSTATE) - return NULL; - - return (XSTATE *)((char *)(context + 1) + xctx->XState.Offset); -} - -static inline void context_init_xstate( CONTEXT *context, void *xstate_buffer ) -{ - CONTEXT_EX *xctx; - - xctx = (CONTEXT_EX *)(context + 1); - xctx->Legacy.Length = sizeof(CONTEXT); - xctx->Legacy.Offset = -(LONG)sizeof(CONTEXT); - - xctx->XState.Length = sizeof(XSTATE); - xctx->XState.Offset = (BYTE *)xstate_buffer - (BYTE *)xctx; - - xctx->All.Length = sizeof(CONTEXT) + xctx->XState.Offset + xctx->XState.Length; - xctx->All.Offset = -(LONG)sizeof(CONTEXT); - context->ContextFlags |= 0x40; -} - -#else -static inline XSTATE *xstate_from_context( const CONTEXT *context ) -{ - return NULL; -} -static inline void context_init_xstate( CONTEXT *context, void *xstate_buffer ) -{ -} -#endif - enum loadorder { LO_INVALID,

1 0

Piotr Caban : msvcrt: Import pow implementation from musl.
by Alexandre Julliard June 14, 2021

June 14, 2021

Module: wine Branch: master Commit: ff4d7edc338b35dce3274dd6887dbaf55cf86513 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ff4d7edc338b35dce3274dd6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jun 14 17:40:33 2021 +0200 msvcrt: Import pow implementation from musl. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crtdll/Makefile.in | 1 - dlls/msvcr100/Makefile.in | 1 - dlls/msvcr110/Makefile.in | 1 - dlls/msvcr120/Makefile.in | 1 - dlls/msvcr70/Makefile.in | 1 - dlls/msvcr71/Makefile.in | 1 - dlls/msvcr80/Makefile.in | 1 - dlls/msvcr90/Makefile.in | 1 - dlls/msvcrt/Makefile.in | 1 - dlls/msvcrt/math.c | 423 ++++++++++++++++++++++++++++++++++++++++++++-- dlls/msvcrt/unixlib.c | 64 ------- dlls/msvcrt/unixlib.h | 29 ---- dlls/msvcrtd/Makefile.in | 1 - dlls/ucrtbase/Makefile.in | 1 - 14 files changed, 412 insertions(+), 115 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ff4d7edc338b35dce327…

1 0

Jactry Zeng : riched20/tests: Add more tests for testing EM_GETTEXTEX with OLE objects.
by Alexandre Julliard June 14, 2021

June 14, 2021

Module: wine Branch: master Commit: 40988d6c3886d0f7a914c45ea68264bfc8540859 URL: https://source.winehq.org/git/wine.git/?a=commit;h=40988d6c3886d0f7a914c45e… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Tue Jun 8 13:45:50 2021 +0800 riched20/tests: Add more tests for testing EM_GETTEXTEX with OLE objects. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/tests/richole.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index a8c48994613..d5a9844b1fc 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -3403,6 +3403,26 @@ static void test_InsertObject(void) ok(result == lstrlenW(expected_string), "Got wrong length: %d.\n", result); todo_wine ok(!lstrcmpW(buffer, expected_string), "Got wrong content: %s.\n", debugstr_w(buffer)); + gettextex.flags = GT_NOHIDDENTEXT; + memset(buffer, 0, sizeof(buffer)); + result = SendMessageW(hwnd, EM_GETTEXTEX, (WPARAM)&gettextex, (LPARAM)buffer); + ok(result == lstrlenW(expected_string), "Got wrong length: %d.\n", result); + todo_wine ok(!lstrcmpW(buffer, expected_string), "Got wrong content: %s.\n", debugstr_w(buffer)); + + gettextex.flags = GT_SELECTION; + memset(buffer, 0, sizeof(buffer)); + SendMessageW(hwnd, EM_SETSEL, 0, -1); + result = SendMessageW(hwnd, EM_GETTEXTEX, (WPARAM)&gettextex, (LPARAM)buffer); + ok(result == lstrlenW(expected_string), "Got wrong length: %d.\n", result); + todo_wine ok(!lstrcmpW(buffer, expected_string), "Got wrong content: %s.\n", debugstr_w(buffer)); + + expected_string = L"abc d efg"; + gettextex.flags = GT_USECRLF; + memset(buffer, 0, sizeof(buffer)); + result = SendMessageW(hwnd, EM_GETTEXTEX, (WPARAM)&gettextex, (LPARAM)buffer); + ok(result == lstrlenW(expected_string), "Got wrong length: %d.\n", result); + ok(!lstrcmpW(buffer, expected_string), "Got wrong content: %s.\n", debugstr_w(buffer)); + expected_stringA = "abc d efg"; memset(bufferA, 0, sizeof(bufferA)); SendMessageA(hwnd, EM_SETSEL, 0, -1);

1 0

Alexandre Julliard : ntdll: Also pass the TEB to signal_exit_thread().
by Alexandre Julliard June 14, 2021

June 14, 2021

Module: wine Branch: master Commit: 9a430dc6db30b2530e355204fd5907c50791d3df URL: https://source.winehq.org/git/wine.git/?a=commit;h=9a430dc6db30b2530e355204… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 14 12:56:38 2021 +0200 ntdll: Also pass the TEB to signal_exit_thread(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_arm.c | 14 ++++---------- dlls/ntdll/unix/signal_arm64.c | 16 ++++------------ dlls/ntdll/unix/signal_i386.c | 5 +++-- dlls/ntdll/unix/signal_x86_64.c | 9 ++++----- dlls/ntdll/unix/thread.c | 6 +++--- dlls/ntdll/unix/unix_private.h | 2 +- 6 files changed, 19 insertions(+), 33 deletions(-) diff --git a/dlls/ntdll/unix/signal_arm.c b/dlls/ntdll/unix/signal_arm.c index 8a45d0ba086..a0d826ea178 100644 --- a/dlls/ntdll/unix/signal_arm.c +++ b/dlls/ntdll/unix/signal_arm.c @@ -973,8 +973,10 @@ __ASM_GLOBAL_FUNC( signal_start_thread, "bx r5" ) -extern void DECLSPEC_NORETURN call_thread_exit_func( int status, void (*func)(int), TEB *teb ); -__ASM_GLOBAL_FUNC( call_thread_exit_func, +/*********************************************************************** + * signal_exit_thread + */ +__ASM_GLOBAL_FUNC( signal_exit_thread, "ldr r3, [r2, #0x1d4]\n\t" /* arm_thread_data()->exit_frame */ "mov ip, #0\n\t" "str ip, [r2, #0x1d4]\n\t" @@ -983,12 +985,4 @@ __ASM_GLOBAL_FUNC( call_thread_exit_func, "movne sp, r3\n\t" "blx r1" ) -/*********************************************************************** - * signal_exit_thread - */ -void signal_exit_thread( int status, void (*func)(int) ) -{ - call_thread_exit_func( status, func, NtCurrentTeb() ); -} - #endif /* __arm__ */ diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c index 0cb1bde1d55..669e44aaa2b 100644 --- a/dlls/ntdll/unix/signal_arm64.c +++ b/dlls/ntdll/unix/signal_arm64.c @@ -1146,9 +1146,10 @@ __ASM_GLOBAL_FUNC( signal_start_thread, "mov lr, #0\n\t" "br x19" ) - -extern void DECLSPEC_NORETURN call_thread_exit_func( int status, void (*func)(int), TEB *teb ); -__ASM_GLOBAL_FUNC( call_thread_exit_func, +/*********************************************************************** + * signal_exit_thread + */ +__ASM_GLOBAL_FUNC( signal_exit_thread, "stp x29, x30, [sp,#-16]!\n\t" "ldr x3, [x2, #0x2f0]\n\t" /* arm64_thread_data()->exit_frame */ "str xzr, [x2, #0x2f0]\n\t" @@ -1157,15 +1158,6 @@ __ASM_GLOBAL_FUNC( call_thread_exit_func, "1:\tldp x29, x30, [sp], #16\n\t" "br x1" ) -/*********************************************************************** - * signal_exit_thread - */ -void signal_exit_thread( int status, void (*func)(int) ) -{ - call_thread_exit_func( status, func, NtCurrentTeb() ); -} - - /********************************************************************** * NtCurrentTeb (NTDLL.@) */ diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index cb90eade4c6..4ce1b519da3 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -2436,14 +2436,15 @@ __ASM_GLOBAL_FUNC( signal_start_thread, */ __ASM_GLOBAL_FUNC( signal_exit_thread, "movl 8(%esp),%ecx\n\t" + "movl 12(%esp),%esi\n\t" + "xorl %edx,%edx\n\t" /* fetch exit frame */ - "movl %fs:0x1f4,%edx\n\t" /* x86_thread_data()->exit_frame */ + "xchgl %edx,0x1f4(%esi)\n\t" /* x86_thread_data()->exit_frame */ "testl %edx,%edx\n\t" "jnz 1f\n\t" "jmp *%ecx\n\t" /* switch to exit frame stack */ "1:\tmovl 4(%esp),%eax\n\t" - "movl $0,%fs:0x1f4\n\t" "movl %edx,%ebp\n\t" __ASM_CFI(".cfi_def_cfa %ebp,4\n\t") __ASM_CFI(".cfi_rel_offset %ebp,0\n\t") diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 46243ea00d4..04442a012a2 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -2691,14 +2691,13 @@ __ASM_GLOBAL_FUNC( signal_start_thread, */ __ASM_GLOBAL_FUNC( signal_exit_thread, /* fetch exit frame */ - "movq %gs:0x30,%rax\n\t" - "movq 0x320(%rax),%rdx\n\t" /* amd64_thread_data()->exit_frame */ - "testq %rdx,%rdx\n\t" + "xorl %ecx,%ecx\n\t" + "xchgq %rcx,0x320(%rdx)\n\t" /* amd64_thread_data()->exit_frame */ + "testq %rcx,%rcx\n\t" "jnz 1f\n\t" "jmp *%rsi\n" /* switch to exit frame stack */ - "1:\tmovq $0,0x320(%rax)\n\t" - "movq %rdx,%rsp\n\t" + "1:\tmovq %rcx,%rsp\n\t" __ASM_CFI(".cfi_adjust_cfa_offset 56\n\t") __ASM_CFI(".cfi_rel_offset %rbp,48\n\t") __ASM_CFI(".cfi_rel_offset %rbx,40\n\t") diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index ce72cc8b6cb..1c3c77cf24d 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -1017,7 +1017,7 @@ void abort_thread( int status ) { pthread_sigmask( SIG_BLOCK, &server_block_set, NULL ); if (InterlockedDecrement( &nb_threads ) <= 0) abort_process( status ); - signal_exit_thread( status, pthread_exit_wrapper ); + signal_exit_thread( status, pthread_exit_wrapper, NtCurrentTeb() ); } @@ -1050,7 +1050,7 @@ static DECLSPEC_NORETURN void exit_thread( int status ) virtual_free_teb( teb ); } } - signal_exit_thread( status, pthread_exit_wrapper ); + signal_exit_thread( status, pthread_exit_wrapper, NtCurrentTeb() ); } @@ -1060,7 +1060,7 @@ static DECLSPEC_NORETURN void exit_thread( int status ) void exit_process( int status ) { pthread_sigmask( SIG_BLOCK, &server_block_set, NULL ); - signal_exit_thread( get_unix_exit_code( status ), process_exit_wrapper ); + signal_exit_thread( get_unix_exit_code( status ), process_exit_wrapper, NtCurrentTeb() ); } diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 28ba07ceac1..2392b2ea274 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -246,7 +246,7 @@ extern void signal_init_thread( TEB *teb ) DECLSPEC_HIDDEN; extern void signal_init_process(void) DECLSPEC_HIDDEN; extern void DECLSPEC_NORETURN signal_start_thread( PRTL_THREAD_START_ROUTINE entry, void *arg, BOOL suspend, void *thunk, TEB *teb ) DECLSPEC_HIDDEN; -extern void DECLSPEC_NORETURN signal_exit_thread( int status, void (*func)(int) ) DECLSPEC_HIDDEN; +extern void DECLSPEC_NORETURN signal_exit_thread( int status, void (*func)(int), TEB *teb ) DECLSPEC_HIDDEN; extern void __wine_syscall_dispatcher(void) DECLSPEC_HIDDEN; extern unsigned int __wine_syscall_flags DECLSPEC_HIDDEN; extern NTSTATUS signal_set_full_context( CONTEXT *context ) DECLSPEC_HIDDEN;

1 0

Zebediah Figura : server: Free the old process image name if a second process image is mapped (Valgrind).
by Alexandre Julliard June 14, 2021

June 14, 2021

Module: wine Branch: master Commit: aa61e519d57d534df51a8b42df6f853c305615a1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa61e519d57d534df51a8b42… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Jun 12 16:42:53 2021 -0500 server: Free the old process image name if a second process image is mapped (Valgrind). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/mapping.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/server/mapping.c b/server/mapping.c index 9cb24a4213f..cd918224caa 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -376,6 +376,9 @@ static void add_process_view( struct thread *thread, struct memory_view *view ) /* main exe */ set_process_machine( process, view ); list_add_head( &process->views, &view->entry ); + + free( process->image ); + process->image = NULL; if (get_view_nt_name( view, &name ) && (process->image = memdup( name.str, name.len ))) process->imagelen = name.len; return;

1 0