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

Alex Henrie : ws2_32: Hook up IPV6_PKTINFO.
by Alexandre Julliard Aug. 4, 2021

Aug. 4, 2021

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

Alex Henrie : ws2_32/tests: Add tests for IPv6 control messages.
by Alexandre Julliard Aug. 4, 2021

Aug. 4, 2021

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 : include: Add IN6_PKTINFO.
by Alexandre Julliard Aug. 4, 2021

Aug. 4, 2021

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

Austin English : kernel32: Add GetCurrentPackagePath stub.
by Alexandre Julliard Aug. 4, 2021

Aug. 4, 2021

Module: wine Branch: master Commit: 06104aec963f827ddd4f9d41d1ae72983779859f URL: https://source.winehq.org/git/wine.git/?a=commit;h=06104aec963f827ddd4f9d41… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Jul 30 02:50:08 2021 -0500 kernel32: Add GetCurrentPackagePath stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51374 Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-appmodel-runtime-l1-1-1.spec | 2 +- dlls/kernel32/kernel32.spec | 1 + dlls/kernelbase/kernelbase.spec | 2 +- dlls/kernelbase/version.c | 10 ++++++++++ 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-appmodel-runtime-l1-1-1/api-ms-win-appmodel-runtime-l1-1-1.spec b/dlls/api-ms-win-appmodel-runtime-l1-1-1/api-ms-win-appmodel-runtime-l1-1-1.spec index 99d1d9f3835..9d5546ed315 100644 --- a/dlls/api-ms-win-appmodel-runtime-l1-1-1/api-ms-win-appmodel-runtime-l1-1-1.spec +++ b/dlls/api-ms-win-appmodel-runtime-l1-1-1/api-ms-win-appmodel-runtime-l1-1-1.spec @@ -7,7 +7,7 @@ @ stdcall GetCurrentPackageFullName(ptr ptr) kernel32.GetCurrentPackageFullName @ stdcall GetCurrentPackageId(ptr ptr) kernel32.GetCurrentPackageId @ stub GetCurrentPackageInfo -@ stub GetCurrentPackagePath +@ stdcall GetCurrentPackagePath(ptr ptr) kernel32.GetCurrentPackagePath @ stub GetPackageApplicationIds @ stdcall GetPackageFamilyName(long ptr ptr) kernel32.GetPackageFamilyName @ stdcall GetPackageFullName(long ptr ptr) kernel32.GetPackageFullName diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 0f474504bfe..6c02b17c7cf 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -630,6 +630,7 @@ @ stdcall GetCurrentPackageFamilyName(ptr ptr) kernelbase.GetCurrentPackageFamilyName @ stdcall GetCurrentPackageFullName(ptr ptr) kernelbase.GetCurrentPackageFullName @ stdcall GetCurrentPackageId(ptr ptr) kernelbase.GetCurrentPackageId +@ stdcall GetCurrentPackagePath(ptr ptr) kernelbase.GetCurrentPackagePath @ stdcall -norelay GetCurrentProcess() KERNEL32_GetCurrentProcess @ stdcall -norelay GetCurrentProcessId() KERNEL32_GetCurrentProcessId @ stdcall GetCurrentProcessorNumber() ntdll.NtGetCurrentProcessorNumber diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 94a648f65aa..e1fb19eceb0 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -463,7 +463,7 @@ @ stdcall GetCurrentPackageFullName(ptr ptr) @ stdcall GetCurrentPackageId(ptr ptr) # @ stub GetCurrentPackageInfo -# @ stub GetCurrentPackagePath +@ stdcall GetCurrentPackagePath(ptr ptr) # @ stub GetCurrentPackageResourcesContext # @ stub GetCurrentPackageSecurityContext @ stdcall -norelay GetCurrentProcess() kernelbase_GetCurrentProcess diff --git a/dlls/kernelbase/version.c b/dlls/kernelbase/version.c index 96349708989..a5a1f67087f 100644 --- a/dlls/kernelbase/version.c +++ b/dlls/kernelbase/version.c @@ -1551,6 +1551,16 @@ LONG WINAPI /* DECLSPEC_HOTPATCH */ GetCurrentPackageId( UINT32 *len, BYTE *buff } +/*********************************************************************** + * GetCurrentPackagePath (kernelbase.@) + */ +LONG WINAPI /* DECLSPEC_HOTPATCH */ GetCurrentPackagePath( UINT32 *length, WCHAR *path ) +{ + FIXME( "(%p %p): stub\n", length, path ); + return APPMODEL_ERROR_NO_PACKAGE; +} + + /*********************************************************************** * GetPackageFullName (kernelbase.@) */

1 0

Gabriel Ivăncescu : vbscript: Fix GetIDsOfNames for more than one name.
by Alexandre Julliard Aug. 4, 2021

Aug. 4, 2021

Module: wine Branch: master Commit: 3559fe7366037defaaaaeed0f308eb00b4d4be1f URL: https://source.winehq.org/git/wine.git/?a=commit;h=3559fe7366037defaaaaeed0… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Aug 4 18:51:47 2021 +0300 vbscript: Fix GetIDsOfNames for more than one name. Names after the first one are supposed to retrieve DISPIDs for parameters, but it doesn't seem to be implemented on Windows. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/tests/vbscript.c | 69 ++++++++++++++++++++++++++++++++++++++++++ dlls/vbscript/vbdisp.c | 18 ++++++++--- 2 files changed, 82 insertions(+), 5 deletions(-) diff --git a/dlls/vbscript/tests/vbscript.c b/dlls/vbscript/tests/vbscript.c index 8e6f0995c59..a3cd77c13e8 100644 --- a/dlls/vbscript/tests/vbscript.c +++ b/dlls/vbscript/tests/vbscript.c @@ -751,6 +751,74 @@ static void test_scriptdisp(void) ok(!ref, "ref = %d\n", ref); } +static void test_param_ids(void) +{ + static const WCHAR *const names1[] = { L"test", L"c", L"foo", L"b", L"a" }; + static const WCHAR *const names2[] = { L"test", L"bar" }; + static const WCHAR *const names3[] = { L"bar", L"test" }; + DISPID id[ARRAY_SIZE(names1)]; + IActiveScriptParse *parser; + IActiveScript *vbscript; + IDispatchEx *script_disp; + HRESULT hr; + + vbscript = create_vbscript(); + + hr = IActiveScript_QueryInterface(vbscript, &IID_IActiveScriptParse, (void**)&parser); + ok(hr == S_OK, "Could not get IActiveScriptParse iface: %08x\n", hr); + + SET_EXPECT(GetLCID); + hr = IActiveScript_SetScriptSite(vbscript, &ActiveScriptSite); + ok(hr == S_OK, "SetScriptSite failed: %08x\n", hr); + CHECK_CALLED(GetLCID); + + SET_EXPECT(OnStateChange_INITIALIZED); + hr = IActiveScriptParse_InitNew(parser); + ok(hr == S_OK, "InitNew failed: %08x\n", hr); + CHECK_CALLED(OnStateChange_INITIALIZED); + + SET_EXPECT(OnStateChange_CONNECTED); + hr = IActiveScript_SetScriptState(vbscript, SCRIPTSTATE_CONNECTED); + ok(hr == S_OK, "SetScriptState(SCRIPTSTATE_CONNECTED) failed: %08x\n", hr); + CHECK_CALLED(OnStateChange_CONNECTED); + + parse_script(parser, "function test(byval a, byval b, byval c, byval foo)\ntest = a + b + c - foo\nend function\n" + "function bar\nend function"); + script_disp = get_script_dispatch(vbscript, NULL); + + hr = IDispatchEx_GetIDsOfNames(script_disp, &IID_NULL, (WCHAR**)names1, ARRAY_SIZE(names1), 0, id); + ok(hr == DISP_E_UNKNOWNNAME, "GetIDsOfNames returned %08x, expected %08x\n", hr, DISP_E_UNKNOWNNAME); + ok(id[0] > 0, "Unexpected DISPID for \"test\": %d\n", id[0]); + ok(id[4] == DISPID_UNKNOWN, "Unexpected DISPID for \"a\" parameter: %d\n", id[4]); + ok(id[3] == DISPID_UNKNOWN, "Unexpected DISPID for \"b\" parameter: %d\n", id[3]); + ok(id[1] == DISPID_UNKNOWN, "Unexpected DISPID for \"c\" parameter: %d\n", id[1]); + ok(id[2] == DISPID_UNKNOWN, "Unexpected DISPID for \"foo\" parameter: %d\n", id[2]); + + hr = IDispatchEx_GetIDsOfNames(script_disp, &IID_NULL, (WCHAR**)names2, ARRAY_SIZE(names2), 0, id); + ok(hr == DISP_E_UNKNOWNNAME, "GetIDsOfNames returned %08x, expected %08x\n", hr, DISP_E_UNKNOWNNAME); + ok(id[0] > 0, "Unexpected DISPID for \"test\": %d\n", id[0]); + ok(id[1] == DISPID_UNKNOWN, "Unexpected DISPID for \"bar\": %d\n", id[1]); + + hr = IDispatchEx_GetIDsOfNames(script_disp, &IID_NULL, (WCHAR**)names3, ARRAY_SIZE(names3), 0, id); + ok(hr == DISP_E_UNKNOWNNAME, "GetIDsOfNames returned %08x, expected %08x\n", hr, DISP_E_UNKNOWNNAME); + ok(id[0] > 0, "Unexpected DISPID for \"bar\": %d\n", id[0]); + ok(id[1] == DISPID_UNKNOWN, "Unexpected DISPID for \"test\": %d\n", id[1]); + + IDispatchEx_Release(script_disp); + IActiveScriptParse_Release(parser); + + SET_EXPECT(OnStateChange_DISCONNECTED); + SET_EXPECT(OnStateChange_INITIALIZED); + SET_EXPECT(OnStateChange_CLOSED); + hr = IActiveScript_Close(vbscript); + ok(hr == S_OK, "Close failed: %08x\n", hr); + CHECK_CALLED(OnStateChange_DISCONNECTED); + CHECK_CALLED(OnStateChange_INITIALIZED); + CHECK_CALLED(OnStateChange_CLOSED); + + IActiveScript_Release(vbscript); +} + static void test_code_persistence(void) { IActiveScriptParse *parser; @@ -2641,6 +2709,7 @@ START_TEST(vbscript) test_vbscript_release(); test_vbscript_simplecreate(); test_vbscript_initializing(); + test_param_ids(); test_named_items(); test_scriptdisp(); test_code_persistence(); diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index ee4875f4e01..6b9a1a0a5d0 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -1344,13 +1344,21 @@ static HRESULT WINAPI ScriptDisp_GetIDsOfNames(IDispatchEx *iface, REFIID riid, TRACE("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); - for(i=0; i < cNames; i++) { - hres = IDispatchEx_GetDispID(&This->IDispatchEx_iface, rgszNames[i], 0, rgDispId+i); - if(FAILED(hres)) - return hres; + if(cNames == 0) + return S_OK; + + hres = IDispatchEx_GetDispID(&This->IDispatchEx_iface, rgszNames[0], 0, rgDispId); + if(FAILED(hres)) + return hres; + + /* DISPIDs for parameters don't seem to be supported */ + if(cNames > 1) { + for(i = 1; i < cNames; i++) + rgDispId[i] = DISPID_UNKNOWN; + hres = DISP_E_UNKNOWNNAME; } - return S_OK; + return hres; } static HRESULT WINAPI ScriptDisp_Invoke(IDispatchEx *iface, DISPID dispIdMember, REFIID riid, LCID lcid,

1 0

Rémi Bernon : hidclass.sys: Return STATUS_INVALID_USER_BUFFER when appropriate.
by Alexandre Julliard Aug. 4, 2021

Aug. 4, 2021

Module: wine Branch: master Commit: 9c5ab964e9c85c588e8d588765ec3a52fc09381a URL: https://source.winehq.org/git/wine.git/?a=commit;h=9c5ab964e9c85c588e8d5887… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Aug 3 18:55:19 2021 +0200 hidclass.sys: Return STATUS_INVALID_USER_BUFFER when appropriate. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/device.c | 7 ++++++- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index 6ae4a0ce6aa..4d34c0d53d9 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -499,7 +499,12 @@ NTSTATUS WINAPI pdo_ioctl(DEVICE_OBJECT *device, IRP *irp) BYTE *buffer = MmGetSystemAddressForMdlSafe(irp->MdlAddress, NormalPagePriority); ULONG out_length; - if (!irpsp->Parameters.DeviceIoControl.OutputBufferLength || !buffer) + if (!buffer) + { + irp->IoStatus.Status = STATUS_INVALID_USER_BUFFER; + break; + } + if (!irpsp->Parameters.DeviceIoControl.OutputBufferLength) { irp->IoStatus.Status = STATUS_BUFFER_TOO_SMALL; break; diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 892e839fa56..3c883edb7c8 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -2441,7 +2441,7 @@ static void test_hidp(HANDLE file, HANDLE async_file, int report_id, BOOL polled SetLastError(0xdeadbeef); ret = HidD_GetInputReport(file, report, 0); ok(!ret, "HidD_GetInputReport succeeded\n"); - todo_wine ok(GetLastError() == ERROR_INVALID_USER_BUFFER, "HidD_GetInputReport returned error %u\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_USER_BUFFER, "HidD_GetInputReport returned error %u\n", GetLastError()); SetLastError(0xdeadbeef); ret = HidD_GetInputReport(file, report, caps.InputReportByteLength - 1);

1 0

Rémi Bernon : hidclass.sys: Return irp->IoStatus.Status consistently.
by Alexandre Julliard Aug. 4, 2021

Aug. 4, 2021

Module: wine Branch: master Commit: 6f4ccd04cdaebdc92a7c7747a8b821a8baaa81b8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f4ccd04cdaebdc92a7c7747… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Aug 3 18:55:18 2021 +0200 hidclass.sys: Return irp->IoStatus.Status consistently. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/device.c | 126 ++++++++++++++++++--------------------------- 1 file changed, 51 insertions(+), 75 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6f4ccd04cdaebdc92a7c…

1 0

Rémi Bernon : hidclass.sys: Implement button array value caps.
by Alexandre Julliard Aug. 4, 2021

Aug. 4, 2021

Module: wine Branch: master Commit: 7096c26a2e48089424fe90956c80c29617bce9f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7096c26a2e48089424fe9095… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Aug 3 18:55:17 2021 +0200 hidclass.sys: Implement button array value caps. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hid/hidp.c | 62 ++++++++++++++++++++++++++++++++++++-- dlls/hidclass.sys/descriptor.c | 11 +++++-- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 16 ++++------ include/wine/hid.h | 1 + 4 files changed, 75 insertions(+), 15 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7096c26a2e48089424fe…

1 0

Piotr Caban : msvcrt: Introduce _setfp_sse helper to access mxcsr register.
by Alexandre Julliard Aug. 4, 2021

Aug. 4, 2021

Module: wine Branch: master Commit: 24fb503e2f9d3c87c6bcaeb6e02043873c5a8294 URL: https://source.winehq.org/git/wine.git/?a=commit;h=24fb503e2f9d3c87c6bcaeb6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Aug 4 18:04:42 2021 +0200 msvcrt: Introduce _setfp_sse helper to access mxcsr register. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 275 ++++++++++++++++++++++------------------------------- 1 file changed, 115 insertions(+), 160 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=24fb503e2f9d3c87c6bc…

1 0

Gabriel Ivăncescu : ntdll: Fix offsetof syntax for IOCTL_AFD_WINE_GET_IRLMP_ENUMDEVICES.
by Alexandre Julliard Aug. 4, 2021

Aug. 4, 2021

Module: wine Branch: master Commit: 26724c3ef40b9ef874b5b6baa28f3572c73946d3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=26724c3ef40b9ef874b5b6ba… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Aug 4 17:43:50 2021 +0300 ntdll: Fix offsetof syntax for IOCTL_AFD_WINE_GET_IRLMP_ENUMDEVICES. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/socket.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index 0e52db178d8..9dc697ea959 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -1976,7 +1976,7 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc if (needs_close) close( fd ); if (ret) return sock_errno_to_status( errno ); - io->Information = offsetof( DEVICELIST, unix_list->len ); + io->Information = offsetof( DEVICELIST, Device[unix_list->len] ); if (out_size < io->Information) return STATUS_BUFFER_TOO_SMALL;

1 0