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

Alex Henrie : include: Add IN6_PKTINFO.
by Alexandre Julliard 04 Aug '21

04 Aug '21

Module: wine Branch: master Commit: 42b4061eafb9d2c6e7e1135aeb5fe30e3f0ec420 URL: https://source.winehq.org/git/wine.git/?a=commit;h=42b4061eafb9d2c6e7e1135a… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Aug 2 23:08:36 2021 -0600 include: Add IN6_PKTINFO. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/ws2ipdef.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/include/ws2ipdef.h b/include/ws2ipdef.h index 2f9d4f663ad..0938db2db9f 100644 --- a/include/ws2ipdef.h +++ b/include/ws2ipdef.h @@ -177,6 +177,11 @@ typedef struct WS(in_pktinfo) { UINT ipi_ifindex; } IN_PKTINFO, *PIN_PKTINFO; +typedef struct WS(in6_pktinfo) { + IN6_ADDR ipi6_addr; + ULONG ipi6_ifindex; +} IN6_PKTINFO, *PIN6_PKTINFO; + #ifndef USE_WS_PREFIX #define IPV6_OPTIONS 1 #define IPV6_HDRINCL 2

1 0

Alex Henrie : ws2_32/tests: Add tests for IPv6 control messages.
by Alexandre Julliard 04 Aug '21

04 Aug '21

Module: wine Branch: master Commit: 0e76a54aaed45a99e5c9eb255cb77d2261a34c9b URL: https://source.winehq.org/git/wine.git/?a=commit;h=0e76a54aaed45a99e5c9eb25… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Aug 2 23:08:37 2021 -0600 ws2_32/tests: Add tests for IPv6 control messages. Namely IPV6_HOPLIMIT and IPV6_PKTINFO. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 101 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 100 insertions(+), 1 deletion(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index ca0a3d86174..3aaacfea281 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -155,6 +155,7 @@ static DWORD thread_id[1+MAX_CLIENTS]; static HANDLE server_ready; static HANDLE client_ready[MAX_CLIENTS]; static int client_id; +static GUID WSARecvMsg_GUID = WSAID_WSARECVMSG; /**************** General utility functions ***************/ @@ -1802,7 +1803,6 @@ static void test_ip_pktinfo(void) ULONG addresses[2] = {inet_addr("127.0.0.1"), htonl(INADDR_ANY)}; char recvbuf[10], pktbuf[512], msg[] = "HELLO"; struct sockaddr_in s1addr, s2addr, s3addr; - GUID WSARecvMsg_GUID = WSAID_WSARECVMSG; LPFN_WSARECVMSG pWSARecvMsg = NULL; unsigned int rc, yes = 1; BOOL foundhdr; @@ -1990,6 +1990,104 @@ static void test_ip_pktinfo(void) CloseHandle(ov.hEvent); } +static void test_ipv6_cmsg(void) +{ + static const DWORD off = 0; + static const DWORD on = 1; + SOCKADDR_IN6 localhost = {0}; + SOCKET client, server; + char payload[] = "HELLO"; + char control[100]; + WSABUF payload_buf = {sizeof(payload), payload}; + WSAMSG msg = {NULL, 0, &payload_buf, 1, {sizeof(control), control}, 0}; + WSACMSGHDR *header = (WSACMSGHDR *)control; + LPFN_WSARECVMSG pWSARecvMsg; + INT *hop_limit = (INT *)WSA_CMSG_DATA(header); + IN6_PKTINFO *pkt_info = (IN6_PKTINFO *)WSA_CMSG_DATA(header); + DWORD count, state; + int rc; + + localhost.sin6_family = AF_INET6; + localhost.sin6_port = htons(SERVERPORT); + inet_pton(AF_INET6, "::1", &localhost.sin6_addr); + + client = socket(AF_INET6, SOCK_DGRAM, IPPROTO_UDP); + ok(client != INVALID_SOCKET, "failed to create socket, error %u\n", WSAGetLastError()); + server = socket(AF_INET6, SOCK_DGRAM, IPPROTO_UDP); + ok(server != INVALID_SOCKET, "failed to create socket, error %u\n", WSAGetLastError()); + + rc = bind(server, (SOCKADDR *)&localhost, sizeof(localhost)); + ok(rc != SOCKET_ERROR, "bind failed, error %u\n", WSAGetLastError()); + rc = connect(client, (SOCKADDR *)&localhost, sizeof(localhost)); + ok(rc != SOCKET_ERROR, "connect failed, error %u\n", WSAGetLastError()); + + rc = WSAIoctl(server, SIO_GET_EXTENSION_FUNCTION_POINTER, &WSARecvMsg_GUID, sizeof(WSARecvMsg_GUID), + &pWSARecvMsg, sizeof(pWSARecvMsg), &count, NULL, NULL); + ok(!rc, "failed to get WSARecvMsg, error %u\n", WSAGetLastError()); + + memset(control, 0, sizeof(control)); + msg.Control.len = sizeof(control); + rc = setsockopt(server, IPPROTO_IPV6, IPV6_HOPLIMIT, (const char *)&on, sizeof(on)); +todo_wine + ok(!rc, "failed to set IPV6_HOPLIMIT, error %u\n", WSAGetLastError()); + state = 0; + count = sizeof(state); + rc = getsockopt(server, IPPROTO_IPV6, IPV6_HOPLIMIT, (char *)&state, (INT *)&count); +todo_wine + ok(!rc, "failed to get IPV6_HOPLIMIT, error %u\n", WSAGetLastError()); +todo_wine + ok(state == 1, "expected 1, got %u\n", state); + rc = send(client, payload, sizeof(payload), 0); + ok(rc == sizeof(payload), "send failed, error %u\n", WSAGetLastError()); + rc = pWSARecvMsg(server, &msg, &count, NULL, NULL); + ok(!rc, "WSARecvMsg failed, error %u\n", WSAGetLastError()); + ok(count == sizeof(payload), "expected length %i, got %i\n", (INT)sizeof(payload), count); +todo_wine + ok(header->cmsg_level == IPPROTO_IPV6, "expected IPPROTO_IPV6, got %i\n", header->cmsg_level); +todo_wine + ok(header->cmsg_type == IPV6_HOPLIMIT, "expected IPV6_HOPLIMIT, got %i\n", header->cmsg_type); +todo_wine + ok(header->cmsg_len == sizeof(*header) + sizeof(INT), + "expected length %i, got %i\n", (INT)(sizeof(*header) + sizeof(INT)), (INT)header->cmsg_len); +todo_wine + ok(*hop_limit >= 32, "expected at least 32, got %i\n", *hop_limit); + setsockopt(server, IPPROTO_IPV6, IPV6_HOPLIMIT, (const char *)&off, sizeof(off)); + ok(!rc, "failed to clear IPV6_HOPLIMIT, error %u\n", WSAGetLastError()); + + memset(control, 0, sizeof(control)); + msg.Control.len = sizeof(control); + rc = setsockopt(server, IPPROTO_IPV6, IPV6_PKTINFO, (const char *)&on, sizeof(on)); +todo_wine + ok(!rc, "failed to set IPV6_PKTINFO, error %u\n", WSAGetLastError()); + state = 0; + count = sizeof(state); + rc = getsockopt(server, IPPROTO_IPV6, IPV6_PKTINFO, (char *)&state, (INT *)&count); +todo_wine + ok(!rc, "failed to get IPV6_PKTINFO, error %u\n", WSAGetLastError()); +todo_wine + ok(state == 1, "expected 1, got %u\n", state); + rc = send(client, payload, sizeof(payload), 0); + ok(rc == sizeof(payload), "send failed, error %u\n", WSAGetLastError()); + rc = pWSARecvMsg(server, &msg, &count, NULL, NULL); + ok(!rc, "WSARecvMsg failed, error %u\n", WSAGetLastError()); + ok(count == sizeof(payload), "expected length %i, got %i\n", (INT)sizeof(payload), count); +todo_wine + ok(header->cmsg_level == IPPROTO_IPV6, "expected IPPROTO_IPV6, got %i\n", header->cmsg_level); +todo_wine + ok(header->cmsg_type == IPV6_PKTINFO, "expected IPV6_PKTINFO, got %i\n", header->cmsg_type); +todo_wine + ok(header->cmsg_len == sizeof(*header) + sizeof(IN6_PKTINFO), + "expected length %i, got %i\n", (INT)(sizeof(*header) + sizeof(IN6_PKTINFO)), (INT)header->cmsg_len); +todo_wine + ok(!memcmp(&pkt_info->ipi6_addr, &localhost.sin6_addr, sizeof(IN6_ADDR)), "expected ::1\n"); + rc = setsockopt(server, IPPROTO_IPV6, IPV6_PKTINFO, (const char *)&off, sizeof(off)); +todo_wine + ok(!rc, "failed to clear IPV6_PKTINFO, error %u\n", WSAGetLastError()); + + closesocket(server); + closesocket(client); +} + /************* Array containing the tests to run **********/ #define STD_STREAM_SOCKET \ @@ -11385,6 +11483,7 @@ START_TEST( sock ) test_set_getsockopt(); test_so_reuseaddr(); test_ip_pktinfo(); + test_ipv6_cmsg(); test_extendedSocketOptions(); test_so_debug(); test_set_only_options();

1 0

Alex Henrie : ws2_32: Hook up IPV6_HOPLIMIT.
by Alexandre Julliard 04 Aug '21

04 Aug '21

Module: wine Branch: master Commit: 71d1bb60f10405fd57e1419d90ed41f6246e9d2d URL: https://source.winehq.org/git/wine.git/?a=commit;h=71d1bb60f10405fd57e1419d… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Aug 2 23:08:38 2021 -0600 ws2_32: Hook up IPV6_HOPLIMIT. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/socket.c | 30 +++++++++++++++++++++++++++++- dlls/ws2_32/socket.c | 7 +++++++ dlls/ws2_32/tests/sock.c | 7 ------- include/wine/afd.h | 2 ++ 4 files changed, 38 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index 9dc697ea959..9b43de17b29 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -39,7 +39,8 @@ #include <sys/socket.h> #endif #ifdef HAVE_NETINET_IN_H -#include <netinet/in.h> +# define __APPLE_USE_RFC_3542 +# include <netinet/in.h> #endif #ifdef HAVE_NETINET_TCP_H # include <netinet/tcp.h> @@ -452,6 +453,25 @@ static int convert_control_headers(struct msghdr *hdr, WSABUF *control) } break; + case IPPROTO_IPV6: + switch (cmsg_unix->cmsg_type) + { +#if defined(IPV6_HOPLIMIT) + case IPV6_HOPLIMIT: + { + ptr = fill_control_message( WS_IPPROTO_IPV6, WS_IPV6_HOPLIMIT, ptr, &ctlsize, + CMSG_DATA(cmsg_unix), sizeof(INT) ); + if (!ptr) goto error; + break; + } +#endif /* IPV6_HOPLIMIT */ + + default: + FIXME("Unhandled IPPROTO_IPV6 message header type %d\n", cmsg_unix->cmsg_type); + break; + } + break; + default: FIXME("Unhandled message header level %d\n", cmsg_unix->cmsg_level); break; @@ -1882,6 +1902,14 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc case IOCTL_AFD_WINE_SET_IPV6_MULTICAST_LOOP: return do_setsockopt( handle, io, IPPROTO_IPV6, IPV6_MULTICAST_LOOP, in_buffer, in_size ); +#ifdef IPV6_RECVHOPLIMIT + case IOCTL_AFD_WINE_GET_IPV6_RECVHOPLIMIT: + return do_getsockopt( handle, io, IPPROTO_IPV6, IPV6_RECVHOPLIMIT, out_buffer, out_size ); + + case IOCTL_AFD_WINE_SET_IPV6_RECVHOPLIMIT: + return do_setsockopt( handle, io, IPPROTO_IPV6, IPV6_RECVHOPLIMIT, in_buffer, in_size ); +#endif + case IOCTL_AFD_WINE_GET_IPV6_UNICAST_HOPS: return do_getsockopt( handle, io, IPPROTO_IPV6, IPV6_UNICAST_HOPS, out_buffer, out_size ); diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index b52e0d37e90..4babd888473 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -314,6 +314,7 @@ static inline const char *debugstr_sockopt(int level, int optname) { DEBUG_SOCKOPT(WS_IPV6_ADD_MEMBERSHIP); DEBUG_SOCKOPT(WS_IPV6_DROP_MEMBERSHIP); + DEBUG_SOCKOPT(WS_IPV6_HOPLIMIT); DEBUG_SOCKOPT(WS_IPV6_MULTICAST_IF); DEBUG_SOCKOPT(WS_IPV6_MULTICAST_HOPS); DEBUG_SOCKOPT(WS_IPV6_MULTICAST_LOOP); @@ -1925,6 +1926,9 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, case WS_IPV6_DONTFRAG: return server_getsockopt( s, IOCTL_AFD_WINE_GET_IPV6_DONTFRAG, optval, optlen ); + case WS_IPV6_HOPLIMIT: + return server_getsockopt( s, IOCTL_AFD_WINE_GET_IPV6_RECVHOPLIMIT, optval, optlen ); + case WS_IPV6_MULTICAST_HOPS: return server_getsockopt( s, IOCTL_AFD_WINE_GET_IPV6_MULTICAST_HOPS, optval, optlen ); @@ -3131,6 +3135,9 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, case WS_IPV6_DROP_MEMBERSHIP: return server_setsockopt( s, IOCTL_AFD_WINE_SET_IPV6_DROP_MEMBERSHIP, optval, optlen ); + case WS_IPV6_HOPLIMIT: + return server_setsockopt( s, IOCTL_AFD_WINE_SET_IPV6_RECVHOPLIMIT, optval, optlen ); + case WS_IPV6_MULTICAST_HOPS: return server_setsockopt( s, IOCTL_AFD_WINE_SET_IPV6_MULTICAST_HOPS, optval, optlen ); diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 3aaacfea281..12c1a859336 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -2028,28 +2028,21 @@ static void test_ipv6_cmsg(void) memset(control, 0, sizeof(control)); msg.Control.len = sizeof(control); rc = setsockopt(server, IPPROTO_IPV6, IPV6_HOPLIMIT, (const char *)&on, sizeof(on)); -todo_wine ok(!rc, "failed to set IPV6_HOPLIMIT, error %u\n", WSAGetLastError()); state = 0; count = sizeof(state); rc = getsockopt(server, IPPROTO_IPV6, IPV6_HOPLIMIT, (char *)&state, (INT *)&count); -todo_wine ok(!rc, "failed to get IPV6_HOPLIMIT, error %u\n", WSAGetLastError()); -todo_wine ok(state == 1, "expected 1, got %u\n", state); rc = send(client, payload, sizeof(payload), 0); ok(rc == sizeof(payload), "send failed, error %u\n", WSAGetLastError()); rc = pWSARecvMsg(server, &msg, &count, NULL, NULL); ok(!rc, "WSARecvMsg failed, error %u\n", WSAGetLastError()); ok(count == sizeof(payload), "expected length %i, got %i\n", (INT)sizeof(payload), count); -todo_wine ok(header->cmsg_level == IPPROTO_IPV6, "expected IPPROTO_IPV6, got %i\n", header->cmsg_level); -todo_wine ok(header->cmsg_type == IPV6_HOPLIMIT, "expected IPV6_HOPLIMIT, got %i\n", header->cmsg_type); -todo_wine ok(header->cmsg_len == sizeof(*header) + sizeof(INT), "expected length %i, got %i\n", (INT)(sizeof(*header) + sizeof(INT)), (INT)header->cmsg_len); -todo_wine ok(*hop_limit >= 32, "expected at least 32, got %i\n", *hop_limit); setsockopt(server, IPPROTO_IPV6, IPV6_HOPLIMIT, (const char *)&off, sizeof(off)); ok(!rc, "failed to clear IPV6_HOPLIMIT, error %u\n", WSAGetLastError()); diff --git a/include/wine/afd.h b/include/wine/afd.h index 1c5f8020c2c..0be0678606d 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -228,6 +228,8 @@ struct afd_get_events_params #define IOCTL_AFD_WINE_GET_IRLMP_ENUMDEVICES WINE_AFD_IOC(283) #define IOCTL_AFD_WINE_GET_TCP_NODELAY WINE_AFD_IOC(284) #define IOCTL_AFD_WINE_SET_TCP_NODELAY WINE_AFD_IOC(285) +#define IOCTL_AFD_WINE_GET_IPV6_RECVHOPLIMIT WINE_AFD_IOC(286) +#define IOCTL_AFD_WINE_SET_IPV6_RECVHOPLIMIT WINE_AFD_IOC(287) struct afd_create_params {

1 0

Alex Henrie : ws2_32: Hook up IPV6_PKTINFO.
by Alexandre Julliard 04 Aug '21

04 Aug '21

Module: wine Branch: master Commit: cade5944be82ac7dead3dd68e6d00871b3d41ac1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cade5944be82ac7dead3dd68… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Aug 2 23:08:39 2021 -0600 ws2_32: Hook up IPV6_PKTINFO. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 15 +++++++++++++++ configure.ac | 7 +++++++ dlls/ntdll/unix/socket.c | 23 +++++++++++++++++++++++ dlls/ws2_32/socket.c | 7 +++++++ dlls/ws2_32/tests/sock.c | 8 -------- include/config.h.in | 3 +++ include/wine/afd.h | 2 ++ 7 files changed, 57 insertions(+), 8 deletions(-) diff --git a/configure b/configure index c159b12ad6d..8b1cbf407b1 100755 --- a/configure +++ b/configure @@ -19366,6 +19366,21 @@ _ACEOF fi +ac_fn_c_check_member "$LINENO" "struct in6_pktinfo" "ipi6_addr" "ac_cv_member_struct_in6_pktinfo_ipi6_addr" "#ifdef HAVE_NETINET_IN_H +#define _GNU_SOURCE +#include <netinet/in.h> +#endif +" +if test "x$ac_cv_member_struct_in6_pktinfo_ipi6_addr" = xyes; then : + +cat >>confdefs.h <<_ACEOF +#define HAVE_STRUCT_IN6_PKTINFO_IPI6_ADDR 1 +_ACEOF + + +fi + + ac_fn_c_check_member "$LINENO" "struct ipstat" "ips_total" "ac_cv_member_struct_ipstat_ips_total" "#ifdef HAVE_SYS_TYPES_H #include <sys/types.h> #endif diff --git a/configure.ac b/configure.ac index b5d3217f2a0..a42c2aff272 100644 --- a/configure.ac +++ b/configure.ac @@ -2546,6 +2546,13 @@ AC_CHECK_MEMBERS([struct icmpstat.icps_outhist],,, #include <netinet/icmp_var.h> #endif]) +dnl Check for struct in6_pktinfo +AC_CHECK_MEMBERS([struct in6_pktinfo.ipi6_addr],,, +[#ifdef HAVE_NETINET_IN_H +#define _GNU_SOURCE +#include <netinet/in.h> +#endif]) + dnl Check for struct ipstat AC_CHECK_MEMBERS([struct ipstat.ips_total],,, [#ifdef HAVE_SYS_TYPES_H diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index 9b43de17b29..cc8d1426bb5 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -23,6 +23,7 @@ #endif #include "config.h" +#define _GNU_SOURCE /* for struct in6_pktinfo */ #include <errno.h> #include <sys/types.h> #include <unistd.h> @@ -466,6 +467,20 @@ static int convert_control_headers(struct msghdr *hdr, WSABUF *control) } #endif /* IPV6_HOPLIMIT */ +#if defined(IPV6_PKTINFO) && defined(HAVE_STRUCT_IN6_PKTINFO_IPI6_ADDR) + case IPV6_PKTINFO: + { + struct in6_pktinfo *data_unix = (struct in6_pktinfo *)CMSG_DATA(cmsg_unix); + struct WS_in6_pktinfo data_win; + + memcpy(&data_win.ipi6_addr, &data_unix->ipi6_addr.s6_addr, 16); + data_win.ipi6_ifindex = data_unix->ipi6_ifindex; + ptr = fill_control_message( WS_IPPROTO_IPV6, WS_IPV6_PKTINFO, ptr, &ctlsize, + (void *)&data_win, sizeof(data_win) ); + if (!ptr) goto error; + } +#endif /* IPV6_PKTINFO */ + default: FIXME("Unhandled IPPROTO_IPV6 message header type %d\n", cmsg_unix->cmsg_type); break; @@ -1910,6 +1925,14 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc return do_setsockopt( handle, io, IPPROTO_IPV6, IPV6_RECVHOPLIMIT, in_buffer, in_size ); #endif +#ifdef IPV6_RECVPKTINFO + case IOCTL_AFD_WINE_GET_IPV6_RECVPKTINFO: + return do_getsockopt( handle, io, IPPROTO_IPV6, IPV6_RECVPKTINFO, out_buffer, out_size ); + + case IOCTL_AFD_WINE_SET_IPV6_RECVPKTINFO: + return do_setsockopt( handle, io, IPPROTO_IPV6, IPV6_RECVPKTINFO, in_buffer, in_size ); +#endif + case IOCTL_AFD_WINE_GET_IPV6_UNICAST_HOPS: return do_getsockopt( handle, io, IPPROTO_IPV6, IPV6_UNICAST_HOPS, out_buffer, out_size ); diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 4babd888473..b7c1571b8b6 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -318,6 +318,7 @@ static inline const char *debugstr_sockopt(int level, int optname) DEBUG_SOCKOPT(WS_IPV6_MULTICAST_IF); DEBUG_SOCKOPT(WS_IPV6_MULTICAST_HOPS); DEBUG_SOCKOPT(WS_IPV6_MULTICAST_LOOP); + DEBUG_SOCKOPT(WS_IPV6_PKTINFO); DEBUG_SOCKOPT(WS_IPV6_UNICAST_HOPS); DEBUG_SOCKOPT(WS_IPV6_V6ONLY); DEBUG_SOCKOPT(WS_IPV6_UNICAST_IF); @@ -1938,6 +1939,9 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, case WS_IPV6_MULTICAST_LOOP: return server_getsockopt( s, IOCTL_AFD_WINE_GET_IPV6_MULTICAST_LOOP, optval, optlen ); + case WS_IPV6_PKTINFO: + return server_getsockopt( s, IOCTL_AFD_WINE_GET_IPV6_RECVPKTINFO, optval, optlen ); + case WS_IPV6_UNICAST_HOPS: return server_getsockopt( s, IOCTL_AFD_WINE_GET_IPV6_UNICAST_HOPS, optval, optlen ); @@ -3147,6 +3151,9 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, case WS_IPV6_MULTICAST_LOOP: return server_setsockopt( s, IOCTL_AFD_WINE_SET_IPV6_MULTICAST_LOOP, optval, optlen ); + case WS_IPV6_PKTINFO: + return server_setsockopt( s, IOCTL_AFD_WINE_SET_IPV6_RECVPKTINFO, optval, optlen ); + case WS_IPV6_PROTECTION_LEVEL: FIXME("IPV6_PROTECTION_LEVEL is ignored!\n"); return 0; diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 12c1a859336..dd8c83374d0 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -2050,31 +2050,23 @@ static void test_ipv6_cmsg(void) memset(control, 0, sizeof(control)); msg.Control.len = sizeof(control); rc = setsockopt(server, IPPROTO_IPV6, IPV6_PKTINFO, (const char *)&on, sizeof(on)); -todo_wine ok(!rc, "failed to set IPV6_PKTINFO, error %u\n", WSAGetLastError()); state = 0; count = sizeof(state); rc = getsockopt(server, IPPROTO_IPV6, IPV6_PKTINFO, (char *)&state, (INT *)&count); -todo_wine ok(!rc, "failed to get IPV6_PKTINFO, error %u\n", WSAGetLastError()); -todo_wine ok(state == 1, "expected 1, got %u\n", state); rc = send(client, payload, sizeof(payload), 0); ok(rc == sizeof(payload), "send failed, error %u\n", WSAGetLastError()); rc = pWSARecvMsg(server, &msg, &count, NULL, NULL); ok(!rc, "WSARecvMsg failed, error %u\n", WSAGetLastError()); ok(count == sizeof(payload), "expected length %i, got %i\n", (INT)sizeof(payload), count); -todo_wine ok(header->cmsg_level == IPPROTO_IPV6, "expected IPPROTO_IPV6, got %i\n", header->cmsg_level); -todo_wine ok(header->cmsg_type == IPV6_PKTINFO, "expected IPV6_PKTINFO, got %i\n", header->cmsg_type); -todo_wine ok(header->cmsg_len == sizeof(*header) + sizeof(IN6_PKTINFO), "expected length %i, got %i\n", (INT)(sizeof(*header) + sizeof(IN6_PKTINFO)), (INT)header->cmsg_len); -todo_wine ok(!memcmp(&pkt_info->ipi6_addr, &localhost.sin6_addr, sizeof(IN6_ADDR)), "expected ::1\n"); rc = setsockopt(server, IPPROTO_IPV6, IPV6_PKTINFO, (const char *)&off, sizeof(off)); -todo_wine ok(!rc, "failed to clear IPV6_PKTINFO, error %u\n", WSAGetLastError()); closesocket(server); diff --git a/include/config.h.in b/include/config.h.in index c1a68104fb8..ad770281471 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -645,6 +645,9 @@ /* Define to 1 if `ifr_hwaddr' is a member of `struct ifreq'. */ #undef HAVE_STRUCT_IFREQ_IFR_HWADDR +/* Define to 1 if `ipi6_addr' is a member of `struct in6_pktinfo'. */ +#undef HAVE_STRUCT_IN6_PKTINFO_IPI6_ADDR + /* Define to 1 if `ips_total' is a member of `struct ipstat'. */ #undef HAVE_STRUCT_IPSTAT_IPS_TOTAL diff --git a/include/wine/afd.h b/include/wine/afd.h index 0be0678606d..caa86eabf83 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -230,6 +230,8 @@ struct afd_get_events_params #define IOCTL_AFD_WINE_SET_TCP_NODELAY WINE_AFD_IOC(285) #define IOCTL_AFD_WINE_GET_IPV6_RECVHOPLIMIT WINE_AFD_IOC(286) #define IOCTL_AFD_WINE_SET_IPV6_RECVHOPLIMIT WINE_AFD_IOC(287) +#define IOCTL_AFD_WINE_GET_IPV6_RECVPKTINFO WINE_AFD_IOC(288) +#define IOCTL_AFD_WINE_SET_IPV6_RECVPKTINFO WINE_AFD_IOC(289) struct afd_create_params {

1 0

Piotr Caban : msvcrt: Don't check x87 status word in x86_64 _statusfp.
by Alexandre Julliard 04 Aug '21

04 Aug '21

Module: wine Branch: master Commit: ab3afe8347d55e2f0fed39da9277ae29192260e6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab3afe8347d55e2f0fed39da… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Aug 4 18:04:46 2021 +0200 msvcrt: Don't check x87 status word in x86_64 _statusfp. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index c8a666568de..ce85cb0da43 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -5236,11 +5236,9 @@ static BOOL _setfp_sse( unsigned int *cw, unsigned int cw_mask, #endif /********************************************************************** - * _statusfp2 (MSVCRT.@) - * - * Not exported by native msvcrt, added in msvcr80. + * _statusfp2 (MSVCR80.@) */ -#if defined(__i386__) || defined(__x86_64__) +#if defined(__i386__) void CDECL _statusfp2( unsigned int *x86_sw, unsigned int *sse2_sw ) { #if defined(__GNUC__) || defined(__clang__) @@ -5277,12 +5275,14 @@ void CDECL _statusfp2( unsigned int *x86_sw, unsigned int *sse2_sw ) unsigned int CDECL _statusfp(void) { unsigned int flags = 0; -#if defined(__i386__) || defined(__x86_64__) +#if defined(__i386__) unsigned int x86_sw, sse2_sw; _statusfp2( &x86_sw, &sse2_sw ); /* FIXME: there's no definition for ambiguous status, just return all status bits for now */ flags = x86_sw | sse2_sw; +#elif defined(__x86_64__) + _setfp_sse(NULL, 0, &flags, 0); #elif defined(__aarch64__) ULONG_PTR fpsr;

1 0

Piotr Caban : msvcrt: Don't clear x87 status word x86_64 _clearfp.
by Alexandre Julliard 04 Aug '21

04 Aug '21

Module: wine Branch: master Commit: f46ef017cd6bf47c69c122e206ef0f4872f566a2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f46ef017cd6bf47c69c122e2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Aug 4 18:04:48 2021 +0200 msvcrt: Don't clear x87 status word x86_64 _clearfp. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index ce85cb0da43..d45327b8f1f 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -5315,7 +5315,7 @@ unsigned int CDECL _statusfp(void) unsigned int CDECL _clearfp(void) { unsigned int flags = 0; -#if (defined(__GNUC__) || defined(__clang__)) && (defined(__i386__) || defined(__x86_64__)) +#if (defined(__GNUC__) || defined(__clang__)) && defined(__i386__) unsigned long fpword; __asm__ __volatile__( "fnstsw %0; fnclex" : "=m" (fpword) ); @@ -5333,6 +5333,8 @@ unsigned int CDECL _clearfp(void) _setfp_sse(NULL, 0, &sse_sw, _MCW_EM); flags |= sse_sw; } +#elif defined(__x86_64__) + _setfp_sse(NULL, 0, &flags, _MCW_EM); #elif defined(__aarch64__) ULONG_PTR fpsr;

1 0

Piotr Caban : msvcrt: Don't reset x87 in x86_64 fpreset.
by Alexandre Julliard 04 Aug '21

04 Aug '21

Module: wine Branch: master Commit: f53b2095f36f1753b9a50d4dcb2eeab6c8c796cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=f53b2095f36f1753b9a50d4d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Aug 4 18:04:56 2021 +0200 msvcrt: Don't reset x87 in x86_64 fpreset. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index d45327b8f1f..c385dd036b7 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -5901,7 +5901,7 @@ int CDECL _finite(double num) */ void CDECL _fpreset(void) { -#if (defined(__GNUC__) || defined(__clang__)) && (defined(__i386__) || defined(__x86_64__)) +#if (defined(__GNUC__) || defined(__clang__)) && defined(__i386__) const unsigned int x86_cw = 0x27f; __asm__ __volatile__( "fninit; fldcw %0" : : "m" (x86_cw) ); if (sse2_supported) @@ -5909,6 +5909,9 @@ void CDECL _fpreset(void) unsigned int cw = _MCW_EM, sw = 0; _setfp_sse(&cw, ~0, &sw, ~0); } +#elif defined(__x86_64__) + unsigned int cw = _MCW_EM, sw = 0; + _setfp_sse(&cw, ~0, &sw, ~0); #else FIXME( "not implemented\n" ); #endif

1 0

Piotr Caban : msvcrt: Introduce _setfp helper to access floating point status and control words.
by Alexandre Julliard 04 Aug '21

04 Aug '21

Module: wine Branch: master Commit: f1ef14dc177b23c908e4dd2d47846cb673e3feac URL: https://source.winehq.org/git/wine.git/?a=commit;h=f1ef14dc177b23c908e4dd2d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Aug 4 18:05:03 2021 +0200 msvcrt: Introduce _setfp helper to access floating point status and control words. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 320 ++++++++++++++++++++++++++--------------------------- 1 file changed, 160 insertions(+), 160 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f1ef14dc177b23c908e4…

1 0

Piotr Caban : msvcrt: Introduce _setfp helper on aarch64.
by Alexandre Julliard 04 Aug '21

04 Aug '21

Module: wine Branch: master Commit: 63f3f4283f89366d8c83857e4c93666fa60ac73b URL: https://source.winehq.org/git/wine.git/?a=commit;h=63f3f4283f89366d8c83857e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Aug 4 18:05:06 2021 +0200 msvcrt: Introduce _setfp helper on aarch64. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 169 +++++++++++++++++++++++++++-------------------------- 1 file changed, 85 insertions(+), 84 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index b27b6391a6f..ff945ff4bae 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -5235,7 +5235,7 @@ static BOOL _setfp_sse( unsigned int *cw, unsigned int cw_mask, } #endif -#if defined(__i386__) || defined(__x86_64__) +#if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__) static BOOL _setfp( unsigned int *cw, unsigned int cw_mask, unsigned int *sw, unsigned int sw_mask ) { @@ -5355,6 +5355,86 @@ static BOOL _setfp( unsigned int *cw, unsigned int cw_mask, return TRUE; #elif defined(__x86_64__) return _setfp_sse(cw, cw_mask, sw, sw_mask); +#elif defined(__aarch64__) + ULONG_PTR old_fpsr = 0, fpsr = 0, old_fpcr = 0, fpcr = 0; + unsigned int flags; + + cw_mask &= _MCW_EM | _MCW_RC; + sw_mask &= _MCW_EM; + + if (sw) + { + __asm__ __volatile__( "mrs %0, fpsr" : "=r" (fpsr) ); + old_fpsr = fpsr; + + flags = 0; + if (fpsr & 0x1) flags |= _SW_INVALID; + if (fpsr & 0x2) flags |= _SW_ZERODIVIDE; + if (fpsr & 0x4) flags |= _SW_OVERFLOW; + if (fpsr & 0x8) flags |= _SW_UNDERFLOW; + if (fpsr & 0x10) flags |= _SW_INEXACT; + if (fpsr & 0x80) flags |= _SW_DENORMAL; + + *sw = (flags & ~sw_mask) | (*sw & sw_mask); + TRACE("aarch64 update sw %08x to %08x\n", flags, *sw); + fpsr &= ~0x9f; + if (*sw & _SW_INVALID) fpsr |= 0x1; + if (*sw & _SW_ZERODIVIDE) fpsr |= 0x2; + if (*sw & _SW_OVERFLOW) fpsr |= 0x4; + if (*sw & _SW_UNDERFLOW) fpsr |= 0x8; + if (*sw & _SW_INEXACT) fpsr |= 0x10; + if (*sw & _SW_DENORMAL) fpsr |= 0x80; + *sw = flags; + } + + if (cw) + { + __asm__ __volatile__( "mrs %0, fpcr" : "=r" (fpcr) ); + old_fpcr = fpcr; + + flags = 0; + if (!(fpcr & 0x100)) flags |= _EM_INVALID; + if (!(fpcr & 0x200)) flags |= _EM_ZERODIVIDE; + if (!(fpcr & 0x400)) flags |= _EM_OVERFLOW; + if (!(fpcr & 0x800)) flags |= _EM_UNDERFLOW; + if (!(fpcr & 0x1000)) flags |= _EM_INEXACT; + if (!(fpcr & 0x8000)) flags |= _EM_DENORMAL; + switch (fpcr & 0xc00000) + { + case 0x400000: flags |= _RC_UP; break; + case 0x800000: flags |= _RC_DOWN; break; + case 0xc00000: flags |= _RC_CHOP; break; + } + + *cw = (flags & ~cw_mask) | (*cw & cw_mask); + TRACE("aarch64 update cw %08x to %08x\n", flags, *cw); + fpcr &= ~0xc09f00ul; + if (!(*cw & _EM_INVALID)) fpcr |= 0x100; + if (!(*cw & _EM_ZERODIVIDE)) fpcr |= 0x200; + if (!(*cw & _EM_OVERFLOW)) fpcr |= 0x400; + if (!(*cw & _EM_UNDERFLOW)) fpcr |= 0x800; + if (!(*cw & _EM_INEXACT)) fpcr |= 0x1000; + if (!(*cw & _EM_DENORMAL)) fpcr |= 0x8000; + switch (*cw & _MCW_RC) + { + case _RC_CHOP: fpcr |= 0xc00000; break; + case _RC_UP: fpcr |= 0x400000; break; + case _RC_DOWN: fpcr |= 0x800000; break; + } + } + + /* mask exceptions if needed */ + if (old_fpcr != fpcr && ~(old_fpcr >> 8) & fpsr & 0x9f != fpsr & 0x9f) + { + ULONG_PTR mask = fpcr & ~0x9f00; + __asm__ __volatile__( "msr fpcr, %0" :: "r" (mask) ); + } + + if (old_fpsr != fpsr) + __asm__ __volatile__( "msr fpsr, %0" :: "r" (fpsr) ); + if (old_fpcr != fpcr) + __asm__ __volatile__( "msr fpcr, %0" :: "r" (fpcr) ); + return TRUE; #endif #else FIXME("not implemented\n"); @@ -5392,18 +5472,8 @@ unsigned int CDECL _statusfp(void) _statusfp2( &x86_sw, &sse2_sw ); /* FIXME: there's no definition for ambiguous status, just return all status bits for now */ flags = x86_sw | sse2_sw; -#elif defined(__x86_64__) +#elif defined(__x86_64__) || defined(__aarch64__) _setfp(NULL, 0, &flags, 0); -#elif defined(__aarch64__) - ULONG_PTR fpsr; - - __asm__ __volatile__( "mrs %0, fpsr" : "=r" (fpsr) ); - if (fpsr & 0x1) flags |= _SW_INVALID; - if (fpsr & 0x2) flags |= _SW_ZERODIVIDE; - if (fpsr & 0x4) flags |= _SW_OVERFLOW; - if (fpsr & 0x8) flags |= _SW_UNDERFLOW; - if (fpsr & 0x10) flags |= _SW_INEXACT; - if (fpsr & 0x80) flags |= _SW_DENORMAL; #elif defined(__arm__) && !defined(__SOFTFP__) DWORD fpscr; @@ -5435,20 +5505,8 @@ unsigned int CDECL _clearfp(void) _setfp_sse(NULL, 0, &sse_sw, _MCW_EM); flags |= sse_sw; } -#elif defined(__x86_64__) +#elif defined(__x86_64__) || defined(__aarch64__) _setfp(NULL, 0, &flags, _MCW_EM); -#elif defined(__aarch64__) - ULONG_PTR fpsr; - - __asm__ __volatile__( "mrs %0, fpsr" : "=r" (fpsr) ); - if (fpsr & 0x1) flags |= _SW_INVALID; - if (fpsr & 0x2) flags |= _SW_ZERODIVIDE; - if (fpsr & 0x4) flags |= _SW_OVERFLOW; - if (fpsr & 0x8) flags |= _SW_UNDERFLOW; - if (fpsr & 0x10) flags |= _SW_INEXACT; - if (fpsr & 0x80) flags |= _SW_DENORMAL; - fpsr &= ~0x9f; - __asm__ __volatile__( "msr fpsr, %0" :: "r" (fpsr) ); #elif defined(__arm__) && !defined(__SOFTFP__) DWORD fpscr; @@ -5550,40 +5608,9 @@ unsigned int CDECL _control87(unsigned int newval, unsigned int mask) if ((flags ^ sse2_cw) & (_MCW_EM | _MCW_RC)) flags |= _EM_AMBIGUOUS; flags |= sse2_cw; -#elif defined(__x86_64__) +#elif defined(__x86_64__) || defined(__aarch64__) flags = newval; _setfp(&flags, mask, NULL, 0); -#elif defined(__aarch64__) - ULONG_PTR fpcr; - - __asm__ __volatile__( "mrs %0, fpcr" : "=r" (fpcr) ); - if (!(fpcr & 0x100)) flags |= _EM_INVALID; - if (!(fpcr & 0x200)) flags |= _EM_ZERODIVIDE; - if (!(fpcr & 0x400)) flags |= _EM_OVERFLOW; - if (!(fpcr & 0x800)) flags |= _EM_UNDERFLOW; - if (!(fpcr & 0x1000)) flags |= _EM_INEXACT; - if (!(fpcr & 0x8000)) flags |= _EM_DENORMAL; - switch (fpcr & 0xc00000) - { - case 0x400000: flags |= _RC_UP; break; - case 0x800000: flags |= _RC_DOWN; break; - case 0xc00000: flags |= _RC_CHOP; break; - } - flags = (flags & ~mask) | (newval & mask); - fpcr &= ~0xc09f00ul; - if (!(flags & _EM_INVALID)) fpcr |= 0x100; - if (!(flags & _EM_ZERODIVIDE)) fpcr |= 0x200; - if (!(flags & _EM_OVERFLOW)) fpcr |= 0x400; - if (!(flags & _EM_UNDERFLOW)) fpcr |= 0x800; - if (!(flags & _EM_INEXACT)) fpcr |= 0x1000; - if (!(flags & _EM_DENORMAL)) fpcr |= 0x8000; - switch (flags & _MCW_RC) - { - case _RC_CHOP: fpcr |= 0xc00000; break; - case _RC_UP: fpcr |= 0x400000; break; - case _RC_DOWN: fpcr |= 0x800000; break; - } - __asm__ __volatile__( "msr fpcr, %0" :: "r" (fpcr) ); #elif defined(__arm__) && !defined(__SOFTFP__) DWORD fpscr; @@ -5966,7 +5993,7 @@ void CDECL _fpreset(void) */ int CDECL fesetenv(const fenv_t *env) { -#if defined(__i386__) || defined(__x86_64__) +#if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__) unsigned int x87_cw, cw, x87_stat, stat; unsigned int mask; @@ -6003,32 +6030,6 @@ int CDECL fesetenv(const fenv_t *env) return 1; return 0; #endif -#elif defined(__aarch64__) - ULONG_PTR fpsr; - unsigned int tmp, fp_cw, fp_stat; - - if (!env->_Fe_ctl && !env->_Fe_stat) { - _fpreset(); - return 0; - } - - if (!fenv_decode(env->_Fe_ctl, &tmp, &fp_cw)) - return 1; - if (!fenv_decode(env->_Fe_stat, &tmp, &fp_stat)) - return 1; - - _control87(_MCW_EM, _MCW_EM); - __asm__ __volatile__( "mrs %0, fpsr" : "=r" (fpsr) ); - fpsr &= ~0x9f; - if (fp_stat & _SW_INVALID) fpsr |= 0x1; - if (fp_stat & _SW_ZERODIVIDE) fpsr |= 0x2; - if (fp_stat & _SW_OVERFLOW) fpsr |= 0x4; - if (fp_stat & _SW_UNDERFLOW) fpsr |= 0x8; - if (fp_stat & _SW_INEXACT) fpsr |= 0x10; - if (fp_stat & _SW_DENORMAL) fpsr |= 0x80; - __asm__ __volatile__( "msr fpsr, %0" :: "r" (fpsr) ); - _control87(fp_cw, 0xffffffff); - return 0; #elif defined(__arm__) && !defined(__SOFTFP__) DWORD fpscr; unsigned int tmp, fp_cw, fp_stat;

1 0

Piotr Caban : msvcrt: Introduce _setfp helper on arm.
by Alexandre Julliard 04 Aug '21

04 Aug '21

Module: wine Branch: master Commit: b28b409bb51ea361b8da0ff9d9cf27d06d795761 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b28b409bb51ea361b8da0ff9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Aug 4 18:05:13 2021 +0200 msvcrt: Introduce _setfp helper on arm. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 157 +++++++++++++++++++++++++---------------------------- 1 file changed, 73 insertions(+), 84 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index ff945ff4bae..61ca51d0b1f 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -5235,7 +5235,7 @@ static BOOL _setfp_sse( unsigned int *cw, unsigned int cw_mask, } #endif -#if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__) +#if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__) || (defined(__arm__) && !defined(__SOFTFP__)) static BOOL _setfp( unsigned int *cw, unsigned int cw_mask, unsigned int *sw, unsigned int sw_mask ) { @@ -5435,6 +5435,74 @@ static BOOL _setfp( unsigned int *cw, unsigned int cw_mask, if (old_fpcr != fpcr) __asm__ __volatile__( "msr fpcr, %0" :: "r" (fpcr) ); return TRUE; +#elif defined(__arm__) && !defined(__SOFTFP__) + DWORD old_fpscr, fpscr; + unsigned int flags; + + __asm__ __volatile__( "vmrs %0, fpscr" : "=r" (fpscr) ); + old_fpscr = fpscr; + + cw_mask &= _MCW_EM | _MCW_RC; + sw_mask &= _MCW_EM; + + if (sw) + { + flags = 0; + if (fpscr & 0x1) flags |= _SW_INVALID; + if (fpscr & 0x2) flags |= _SW_ZERODIVIDE; + if (fpscr & 0x4) flags |= _SW_OVERFLOW; + if (fpscr & 0x8) flags |= _SW_UNDERFLOW; + if (fpscr & 0x10) flags |= _SW_INEXACT; + if (fpscr & 0x80) flags |= _SW_DENORMAL; + + *sw = (flags & ~sw_mask) | (*sw & sw_mask); + TRACE("arm update sw %08x to %08x\n", flags, *sw); + fpscr &= ~0x9f; + if (*sw & _SW_INVALID) fpscr |= 0x1; + if (*sw & _SW_ZERODIVIDE) fpscr |= 0x2; + if (*sw & _SW_OVERFLOW) fpscr |= 0x4; + if (*sw & _SW_UNDERFLOW) fpscr |= 0x8; + if (*sw & _SW_INEXACT) fpscr |= 0x10; + if (*sw & _SW_DENORMAL) fpscr |= 0x80; + *sw = flags; + } + + if (cw) + { + flags = 0; + if (!(fpscr & 0x100)) flags |= _EM_INVALID; + if (!(fpscr & 0x200)) flags |= _EM_ZERODIVIDE; + if (!(fpscr & 0x400)) flags |= _EM_OVERFLOW; + if (!(fpscr & 0x800)) flags |= _EM_UNDERFLOW; + if (!(fpscr & 0x1000)) flags |= _EM_INEXACT; + if (!(fpscr & 0x8000)) flags |= _EM_DENORMAL; + switch (fpscr & 0xc00000) + { + case 0x400000: flags |= _RC_UP; break; + case 0x800000: flags |= _RC_DOWN; break; + case 0xc00000: flags |= _RC_CHOP; break; + } + + *cw = (flags & ~cw_mask) | (*cw & cw_mask); + TRACE("arm update cw %08x to %08x\n", flags, *cw); + fpscr &= ~0xc09f00ul; + if (!(*cw & _EM_INVALID)) fpscr |= 0x100; + if (!(*cw & _EM_ZERODIVIDE)) fpscr |= 0x200; + if (!(*cw & _EM_OVERFLOW)) fpscr |= 0x400; + if (!(*cw & _EM_UNDERFLOW)) fpscr |= 0x800; + if (!(*cw & _EM_INEXACT)) fpscr |= 0x1000; + if (!(*cw & _EM_DENORMAL)) fpscr |= 0x8000; + switch (*cw & _MCW_RC) + { + case _RC_CHOP: fpscr |= 0xc00000; break; + case _RC_UP: fpscr |= 0x400000; break; + case _RC_DOWN: fpscr |= 0x800000; break; + } + } + + if (old_fpscr != fpscr) + __asm__ __volatile__( "vmsr fpscr, %0" :: "r" (fpscr) ); + return TRUE; #endif #else FIXME("not implemented\n"); @@ -5472,18 +5540,8 @@ unsigned int CDECL _statusfp(void) _statusfp2( &x86_sw, &sse2_sw ); /* FIXME: there's no definition for ambiguous status, just return all status bits for now */ flags = x86_sw | sse2_sw; -#elif defined(__x86_64__) || defined(__aarch64__) +#elif defined(__x86_64__) || defined(__aarch64__) || (defined(__arm__) && !defined(__SOFTFP__)) _setfp(NULL, 0, &flags, 0); -#elif defined(__arm__) && !defined(__SOFTFP__) - DWORD fpscr; - - __asm__ __volatile__( "vmrs %0, fpscr" : "=r" (fpscr) ); - if (fpscr & 0x1) flags |= _SW_INVALID; - if (fpscr & 0x2) flags |= _SW_ZERODIVIDE; - if (fpscr & 0x4) flags |= _SW_OVERFLOW; - if (fpscr & 0x8) flags |= _SW_UNDERFLOW; - if (fpscr & 0x10) flags |= _SW_INEXACT; - if (fpscr & 0x80) flags |= _SW_DENORMAL; #else FIXME( "not implemented\n" ); #endif @@ -5505,20 +5563,8 @@ unsigned int CDECL _clearfp(void) _setfp_sse(NULL, 0, &sse_sw, _MCW_EM); flags |= sse_sw; } -#elif defined(__x86_64__) || defined(__aarch64__) +#elif defined(__x86_64__) || defined(__aarch64__) || (defined(__arm__) && !defined(__SOFTFP__)) _setfp(NULL, 0, &flags, _MCW_EM); -#elif defined(__arm__) && !defined(__SOFTFP__) - DWORD fpscr; - - __asm__ __volatile__( "vmrs %0, fpscr" : "=r" (fpscr) ); - if (fpscr & 0x1) flags |= _SW_INVALID; - if (fpscr & 0x2) flags |= _SW_ZERODIVIDE; - if (fpscr & 0x4) flags |= _SW_OVERFLOW; - if (fpscr & 0x8) flags |= _SW_UNDERFLOW; - if (fpscr & 0x10) flags |= _SW_INEXACT; - if (fpscr & 0x80) flags |= _SW_DENORMAL; - fpscr &= ~0x9f; - __asm__ __volatile__( "vmsr fpscr, %0" :: "r" (fpscr) ); #else FIXME( "not implemented\n" ); #endif @@ -5608,40 +5654,9 @@ unsigned int CDECL _control87(unsigned int newval, unsigned int mask) if ((flags ^ sse2_cw) & (_MCW_EM | _MCW_RC)) flags |= _EM_AMBIGUOUS; flags |= sse2_cw; -#elif defined(__x86_64__) || defined(__aarch64__) +#elif defined(__x86_64__) || defined(__aarch64__) || (defined(__arm__) && !defined(__SOFTFP__)) flags = newval; _setfp(&flags, mask, NULL, 0); -#elif defined(__arm__) && !defined(__SOFTFP__) - DWORD fpscr; - - __asm__ __volatile__( "vmrs %0, fpscr" : "=r" (fpscr) ); - if (!(fpscr & 0x100)) flags |= _EM_INVALID; - if (!(fpscr & 0x200)) flags |= _EM_ZERODIVIDE; - if (!(fpscr & 0x400)) flags |= _EM_OVERFLOW; - if (!(fpscr & 0x800)) flags |= _EM_UNDERFLOW; - if (!(fpscr & 0x1000)) flags |= _EM_INEXACT; - if (!(fpscr & 0x8000)) flags |= _EM_DENORMAL; - switch (fpscr & 0xc00000) - { - case 0x400000: flags |= _RC_UP; break; - case 0x800000: flags |= _RC_DOWN; break; - case 0xc00000: flags |= _RC_CHOP; break; - } - flags = (flags & ~mask) | (newval & mask); - fpscr &= ~0xc09f00ul; - if (!(flags & _EM_INVALID)) fpscr |= 0x100; - if (!(flags & _EM_ZERODIVIDE)) fpscr |= 0x200; - if (!(flags & _EM_OVERFLOW)) fpscr |= 0x400; - if (!(flags & _EM_UNDERFLOW)) fpscr |= 0x800; - if (!(flags & _EM_INEXACT)) fpscr |= 0x1000; - if (!(flags & _EM_DENORMAL)) fpscr |= 0x8000; - switch (flags & _MCW_RC) - { - case _RC_CHOP: fpscr |= 0xc00000; break; - case _RC_UP: fpscr |= 0x400000; break; - case _RC_DOWN: fpscr |= 0x800000; break; - } - __asm__ __volatile__( "vmsr fpscr, %0" :: "r" (fpscr) ); #else FIXME( "not implemented\n" ); #endif @@ -5993,7 +6008,7 @@ void CDECL _fpreset(void) */ int CDECL fesetenv(const fenv_t *env) { -#if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__) +#if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__) || (defined(__arm__) && !defined(__SOFTFP__)) unsigned int x87_cw, cw, x87_stat, stat; unsigned int mask; @@ -6030,32 +6045,6 @@ int CDECL fesetenv(const fenv_t *env) return 1; return 0; #endif -#elif defined(__arm__) && !defined(__SOFTFP__) - DWORD fpscr; - unsigned int tmp, fp_cw, fp_stat; - - if (!env->_Fe_ctl && !env->_Fe_stat) { - _fpreset(); - return 0; - } - - if (!fenv_decode(env->_Fe_ctl, &tmp, &fp_cw)) - return 1; - if (!fenv_decode(env->_Fe_stat, &tmp, &fp_stat)) - return 1; - - _control87(_MCW_EM, _MCW_EM); - __asm__ __volatile__( "vmrs %0, fpscr" : "=r" (fpscr) ); - fpscr &= ~0x9f; - if (fp_stat & _SW_INVALID) fpscr |= 0x1; - if (fp_stat & _SW_ZERODIVIDE) fpscr |= 0x2; - if (fp_stat & _SW_OVERFLOW) fpscr |= 0x4; - if (fp_stat & _SW_UNDERFLOW) fpscr |= 0x8; - if (fp_stat & _SW_INEXACT) fpscr |= 0x10; - if (fp_stat & _SW_DENORMAL) fpscr |= 0x80; - __asm__ __volatile__( "vmsr fpscr, %0" :: "r" (fpscr) ); - _control87(fp_cw, 0xffffffff); - return 0; #else FIXME( "not implemented\n" ); return 1;

1 0