wine-commits August 2021

wine-commits@winehq.org

1 participants
1051 discussions

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/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 : 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

Austin English : kernel32: Add GetCurrentPackagePath stub.
by Alexandre Julliard 04 Aug '21

04 Aug '21

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 04 Aug '21

04 Aug '21

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

Gabriel Ivăncescu : jscript: Fix GetIDsOfNames for more than one name.
by Alexandre Julliard 04 Aug '21

04 Aug '21

Module: wine Branch: master Commit: 678789c72f20ba9a85bfb78ad62be2634b5a8cac URL: https://source.winehq.org/git/wine.git/?a=commit;h=678789c72f20ba9a85bfb78a… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Aug 4 18:51:46 2021 +0300 jscript: 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/jscript/dispex.c | 18 ++++++++---- dlls/jscript/tests/jscript.c | 68 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 81 insertions(+), 5 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 3955ed34cd2..345bcd22020 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -1489,13 +1489,21 @@ static HRESULT WINAPI DispatchEx_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 = jsdisp_get_id(This, 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 DispatchEx_Invoke(IDispatchEx *iface, DISPID dispIdMember, diff --git a/dlls/jscript/tests/jscript.c b/dlls/jscript/tests/jscript.c index e96127fbc5e..b5803aed87d 100644 --- a/dlls/jscript/tests/jscript.c +++ b/dlls/jscript/tests/jscript.c @@ -924,6 +924,73 @@ static void test_aggregation(void) ok(!unk || broken(unk != NULL), "unk = %p\n", unk); } +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 *script; + IDispatchEx *disp; + HRESULT hr; + + script = create_jscript(); + + hr = IActiveScript_QueryInterface(script, &IID_IActiveScriptParse, (void**)&parser); + ok(hr == S_OK, "Could not get IActiveScriptParse iface: %08x\n", hr); + + SET_EXPECT(GetLCID); + hr = IActiveScript_SetScriptSite(script, &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(script, SCRIPTSTATE_CONNECTED); + ok(hr == S_OK, "SetScriptState(SCRIPTSTATE_CONNECTED) failed: %08x\n", hr); + CHECK_CALLED(OnStateChange_CONNECTED); + + parse_script(parser, L"function test(a, b, c, foo) { return a + b + c - foo; }\nfunction bar() { }"); + disp = get_script_dispatch(script, NULL); + + hr = IDispatchEx_GetIDsOfNames(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(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(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(disp); + IActiveScriptParse_Release(parser); + + SET_EXPECT(OnStateChange_DISCONNECTED); + SET_EXPECT(OnStateChange_INITIALIZED); + SET_EXPECT(OnStateChange_CLOSED); + hr = IActiveScript_Close(script); + ok(hr == S_OK, "Close failed: %08x\n", hr); + CHECK_CALLED(OnStateChange_DISCONNECTED); + CHECK_CALLED(OnStateChange_INITIALIZED); + CHECK_CALLED(OnStateChange_CLOSED); + + IActiveScript_Release(script); +} + static void test_code_persistence(void) { IActiveScriptParse *parse; @@ -2251,6 +2318,7 @@ START_TEST(jscript) test_jscript2(); test_jscript_uninitializing(); test_aggregation(); + test_param_ids(); test_code_persistence(); test_named_items(); test_typeinfo(NULL);

1 0

Rémi Bernon : hidclass.sys: Return irp->IoStatus.Information from minidriver.
by Alexandre Julliard 04 Aug '21

04 Aug '21

Module: wine Branch: master Commit: ecf6a16b8e9e983f0bc55d1acfe40abfe157f33b URL: https://source.winehq.org/git/wine.git/?a=commit;h=ecf6a16b8e9e983f0bc55d1a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Aug 3 18:55:22 2021 +0200 hidclass.sys: Return irp->IoStatus.Information from minidriver. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/device.c | 5 ----- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index 76d8898f00e..61126571ac6 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -526,12 +526,7 @@ NTSTATUS WINAPI pdo_ioctl(DEVICE_OBJECT *device, IRP *irp) sizeof(*packet), &irp->IoStatus ); if (irp->IoStatus.Status == STATUS_SUCCESS) - { irp->IoStatus.Status = copy_packet_into_buffer( packet, buffer, buffer_len, &out_length ); - irp->IoStatus.Information = out_length; - } - else - irp->IoStatus.Information = 0; free(packet); break; } diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 91fa7e73c88..02f37773c67 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -2475,7 +2475,7 @@ static void test_hidp(HANDLE file, HANDLE async_file, int report_id, BOOL polled value = caps.InputReportByteLength * 2; ret = sync_ioctl(file, IOCTL_HID_GET_INPUT_REPORT, NULL, 0, report, &value); ok(ret, "IOCTL_HID_GET_INPUT_REPORT failed, last error %u\n", GetLastError()); - todo_wine ok(value == 3, "got length %u, expected 3\n", value); + ok(value == 3, "got length %u, expected 3\n", value); ok(report[0] == report_id, "got report[0] %02x, expected %02x\n", report[0], report_id);

1 0

Rémi Bernon : hidclass.sys: Pass IO_STATUS_BLOCK parameter to call_minidriver.
by Alexandre Julliard 04 Aug '21

04 Aug '21

Module: wine Branch: master Commit: 00008c9d48e16f43cfd048b9ea73b470fca8a4c1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=00008c9d48e16f43cfd048b9… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Aug 3 18:55:21 2021 +0200 hidclass.sys: Pass IO_STATUS_BLOCK parameter to call_minidriver. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/device.c | 20 ++++++++++++-------- dlls/hidclass.sys/hid.h | 3 ++- dlls/hidclass.sys/pnp.c | 28 +++++++++++++--------------- 3 files changed, 27 insertions(+), 24 deletions(-) diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index 1ebe44f3f14..76d8898f00e 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -312,8 +312,8 @@ static void handle_minidriver_string( BASE_DEVICE_EXTENSION *ext, IRP *irp, SHOR InputBuffer = MAKELONG(index, 0); - irp->IoStatus.Status = call_minidriver( IOCTL_HID_GET_STRING, ext->u.pdo.parent_fdo, ULongToPtr( InputBuffer ), - sizeof(InputBuffer), buffer, sizeof(buffer) ); + call_minidriver( IOCTL_HID_GET_STRING, ext->u.pdo.parent_fdo, ULongToPtr( InputBuffer ), + sizeof(InputBuffer), buffer, sizeof(buffer), &irp->IoStatus ); if (irp->IoStatus.Status == STATUS_SUCCESS) { @@ -351,7 +351,8 @@ static void HID_get_feature( BASE_DEVICE_EXTENSION *ext, IRP *irp ) TRACE_(hid_report)("(id %i, len %i buffer %p)\n", packet->reportId, packet->reportBufferLen, packet->reportBuffer); - irp->IoStatus.Status = call_minidriver( IOCTL_HID_GET_FEATURE, ext->u.pdo.parent_fdo, NULL, 0, packet, sizeof(*packet) ); + call_minidriver( IOCTL_HID_GET_FEATURE, ext->u.pdo.parent_fdo, NULL, 0, packet, sizeof(*packet), + &irp->IoStatus ); if (irp->IoStatus.Status == STATUS_SUCCESS) { @@ -400,8 +401,8 @@ static void HID_set_to_device( DEVICE_OBJECT *device, IRP *irp ) TRACE_(hid_report)("(id %i, len %i buffer %p)\n", packet.reportId, packet.reportBufferLen, packet.reportBuffer); - irp->IoStatus.Status = call_minidriver( irpsp->Parameters.DeviceIoControl.IoControlCode, - ext->u.pdo.parent_fdo, NULL, 0, &packet, sizeof(packet) ); + call_minidriver( irpsp->Parameters.DeviceIoControl.IoControlCode, ext->u.pdo.parent_fdo, NULL, + 0, &packet, sizeof(packet), &irp->IoStatus ); if (irp->IoStatus.Status == STATUS_SUCCESS) irp->IoStatus.Information = irpsp->Parameters.DeviceIoControl.InputBufferLength; @@ -521,7 +522,8 @@ NTSTATUS WINAPI pdo_ioctl(DEVICE_OBJECT *device, IRP *irp) packet->reportBuffer = (BYTE *)packet + sizeof(*packet); packet->reportBufferLen = buffer_len - 1; - irp->IoStatus.Status = call_minidriver( IOCTL_HID_GET_INPUT_REPORT, ext->u.pdo.parent_fdo, NULL, 0, packet, sizeof(*packet) ); + call_minidriver( IOCTL_HID_GET_INPUT_REPORT, ext->u.pdo.parent_fdo, NULL, 0, packet, + sizeof(*packet), &irp->IoStatus ); if (irp->IoStatus.Status == STATUS_SUCCESS) { @@ -658,7 +660,8 @@ NTSTATUS WINAPI pdo_read(DEVICE_OBJECT *device, IRP *irp) packet.reportBuffer = &((BYTE*)irp->AssociatedIrp.SystemBuffer)[1]; packet.reportBufferLen = irpsp->Parameters.Read.Length - 1; - irp->IoStatus.Status = call_minidriver( IOCTL_HID_GET_INPUT_REPORT, ext->u.pdo.parent_fdo, NULL, 0, &packet, sizeof(packet) ); + call_minidriver( IOCTL_HID_GET_INPUT_REPORT, ext->u.pdo.parent_fdo, NULL, 0, &packet, + sizeof(packet), &irp->IoStatus ); if (irp->IoStatus.Status == STATUS_SUCCESS) { @@ -731,7 +734,8 @@ NTSTATUS WINAPI pdo_write(DEVICE_OBJECT *device, IRP *irp) TRACE_(hid_report)("(id %i, len %i buffer %p)\n", packet.reportId, packet.reportBufferLen, packet.reportBuffer); - irp->IoStatus.Status = call_minidriver( IOCTL_HID_WRITE_REPORT, ext->u.pdo.parent_fdo, NULL, 0, &packet, sizeof(packet) ); + call_minidriver( IOCTL_HID_WRITE_REPORT, ext->u.pdo.parent_fdo, NULL, 0, &packet, + sizeof(packet), &irp->IoStatus ); if (irp->IoStatus.Status == STATUS_SUCCESS) irp->IoStatus.Information = irpsp->Parameters.Write.Length; diff --git a/dlls/hidclass.sys/hid.h b/dlls/hidclass.sys/hid.h index 19ac7091065..f0982d508e3 100644 --- a/dlls/hidclass.sys/hid.h +++ b/dlls/hidclass.sys/hid.h @@ -108,7 +108,8 @@ typedef struct _minidriver PDRIVER_DISPATCH PNPDispatch; } minidriver; -NTSTATUS call_minidriver(ULONG code, DEVICE_OBJECT *device, void *in_buff, ULONG in_size, void *out_buff, ULONG out_size) DECLSPEC_HIDDEN; +void call_minidriver( ULONG code, DEVICE_OBJECT *device, void *in_buff, ULONG in_size, + void *out_buff, ULONG out_size, IO_STATUS_BLOCK *io ) DECLSPEC_HIDDEN; /* Internal device functions */ void HID_StartDeviceThread(DEVICE_OBJECT *device) DECLSPEC_HIDDEN; diff --git a/dlls/hidclass.sys/pnp.c b/dlls/hidclass.sys/pnp.c index 2f5fe5de4eb..e5a38dafc1c 100644 --- a/dlls/hidclass.sys/pnp.c +++ b/dlls/hidclass.sys/pnp.c @@ -188,14 +188,15 @@ static void create_child(minidriver *minidriver, DEVICE_OBJECT *fdo) BYTE *reportDescriptor; UNICODE_STRING string; WCHAR pdo_name[255]; + IO_STATUS_BLOCK io; USAGE page, usage; NTSTATUS status; INT i; - status = call_minidriver(IOCTL_HID_GET_DEVICE_ATTRIBUTES, fdo, NULL, 0, &attr, sizeof(attr)); - if (status != STATUS_SUCCESS) + call_minidriver( IOCTL_HID_GET_DEVICE_ATTRIBUTES, fdo, NULL, 0, &attr, sizeof(attr), &io ); + if (io.Status != STATUS_SUCCESS) { - ERR("Minidriver failed to get Attributes(%x)\n",status); + ERR( "Minidriver failed to get attributes, status %#x.\n", io.Status ); return; } @@ -204,7 +205,7 @@ static void create_child(minidriver *minidriver, DEVICE_OBJECT *fdo) RtlInitUnicodeString(&string, pdo_name); if ((status = IoCreateDevice(fdo->DriverObject, sizeof(*pdo_ext), &string, 0, 0, FALSE, &child_pdo))) { - ERR("Failed to create child PDO, status %#x.\n", status); + ERR( "Failed to create child PDO, status %#x.\n", io.Status ); return; } fdo_ext->u.fdo.child_pdo = child_pdo; @@ -221,8 +222,8 @@ static void create_child(minidriver *minidriver, DEVICE_OBJECT *fdo) pdo_ext->u.pdo.information.VersionNumber = attr.VersionNumber; pdo_ext->u.pdo.information.Polled = minidriver->minidriver.DevicesArePolled; - status = call_minidriver(IOCTL_HID_GET_DEVICE_DESCRIPTOR, fdo, NULL, 0, &descriptor, sizeof(descriptor)); - if (status != STATUS_SUCCESS) + call_minidriver( IOCTL_HID_GET_DEVICE_DESCRIPTOR, fdo, NULL, 0, &descriptor, sizeof(descriptor), &io ); + if (io.Status != STATUS_SUCCESS) { ERR("Cannot get Device Descriptor(%x)\n",status); IoDeleteDevice(child_pdo); @@ -240,9 +241,9 @@ static void create_child(minidriver *minidriver, DEVICE_OBJECT *fdo) } reportDescriptor = malloc(descriptor.DescriptorList[i].wReportLength); - status = call_minidriver(IOCTL_HID_GET_REPORT_DESCRIPTOR, fdo, NULL, 0, - reportDescriptor, descriptor.DescriptorList[i].wReportLength); - if (status != STATUS_SUCCESS) + call_minidriver( IOCTL_HID_GET_REPORT_DESCRIPTOR, fdo, NULL, 0, reportDescriptor, + descriptor.DescriptorList[i].wReportLength, &io ); + if (io.Status != STATUS_SUCCESS) { ERR("Cannot get Report Descriptor(%x)\n",status); free(reportDescriptor); @@ -606,19 +607,16 @@ NTSTATUS WINAPI HidRegisterMinidriver(HID_MINIDRIVER_REGISTRATION *registration) return STATUS_SUCCESS; } -NTSTATUS call_minidriver(ULONG code, DEVICE_OBJECT *device, void *in_buff, ULONG in_size, void *out_buff, ULONG out_size) +void call_minidriver( ULONG code, DEVICE_OBJECT *device, void *in_buff, ULONG in_size, + void *out_buff, ULONG out_size, IO_STATUS_BLOCK *io ) { IRP *irp; - IO_STATUS_BLOCK io; KEVENT event; KeInitializeEvent(&event, NotificationEvent, FALSE); - irp = IoBuildDeviceIoControlRequest(code, device, in_buff, in_size, - out_buff, out_size, TRUE, &event, &io); + irp = IoBuildDeviceIoControlRequest( code, device, in_buff, in_size, out_buff, out_size, TRUE, &event, io ); if (IoCallDriver(device, irp) == STATUS_PENDING) KeWaitForSingleObject(&event, Executive, KernelMode, FALSE, NULL); - - return io.Status; }

1 0

Rémi Bernon : hidclass.sys: Return STATUS_INVALID_PARAMETER when appropriate.
by Alexandre Julliard 04 Aug '21

04 Aug '21

Module: wine Branch: master Commit: a8ab0fe08f02edd52432bb8f2440a47c7ad6ccbc URL: https://source.winehq.org/git/wine.git/?a=commit;h=a8ab0fe08f02edd52432bb8f… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Aug 3 18:55:20 2021 +0200 hidclass.sys: Return STATUS_INVALID_PARAMETER when appropriate. Instead of STATUS_BUFFER_TOO_SMALL when input report buffer length is less than InputReportByteLength. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/device.c | 12 +++++++----- dlls/ntoskrnl.exe/tests/driver_hid.c | 2 +- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 2 -- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index 4d34c0d53d9..1ebe44f3f14 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -415,6 +415,7 @@ NTSTATUS WINAPI pdo_ioctl(DEVICE_OBJECT *device, IRP *irp) { IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp ); BASE_DEVICE_EXTENSION *ext = device->DeviceExtension; + const WINE_HIDP_PREPARSED_DATA *data = ext->u.pdo.preparsed_data; NTSTATUS status; BOOL removed; KIRQL irql; @@ -495,7 +496,8 @@ NTSTATUS WINAPI pdo_ioctl(DEVICE_OBJECT *device, IRP *irp) case IOCTL_HID_GET_INPUT_REPORT: { HID_XFER_PACKET *packet; - UINT packet_size = sizeof(*packet) + irpsp->Parameters.DeviceIoControl.OutputBufferLength; + ULONG buffer_len = irpsp->Parameters.DeviceIoControl.OutputBufferLength; + UINT packet_size = sizeof(*packet) + buffer_len; BYTE *buffer = MmGetSystemAddressForMdlSafe(irp->MdlAddress, NormalPagePriority); ULONG out_length; @@ -504,9 +506,9 @@ NTSTATUS WINAPI pdo_ioctl(DEVICE_OBJECT *device, IRP *irp) irp->IoStatus.Status = STATUS_INVALID_USER_BUFFER; break; } - if (!irpsp->Parameters.DeviceIoControl.OutputBufferLength) + if (buffer_len < data->caps.InputReportByteLength) { - irp->IoStatus.Status = STATUS_BUFFER_TOO_SMALL; + irp->IoStatus.Status = STATUS_INVALID_PARAMETER; break; } @@ -517,13 +519,13 @@ NTSTATUS WINAPI pdo_ioctl(DEVICE_OBJECT *device, IRP *irp) else packet->reportId = 0; packet->reportBuffer = (BYTE *)packet + sizeof(*packet); - packet->reportBufferLen = irpsp->Parameters.DeviceIoControl.OutputBufferLength - 1; + packet->reportBufferLen = buffer_len - 1; irp->IoStatus.Status = call_minidriver( IOCTL_HID_GET_INPUT_REPORT, ext->u.pdo.parent_fdo, NULL, 0, packet, sizeof(*packet) ); if (irp->IoStatus.Status == STATUS_SUCCESS) { - irp->IoStatus.Status = copy_packet_into_buffer( packet, buffer, irpsp->Parameters.DeviceIoControl.OutputBufferLength, &out_length ); + irp->IoStatus.Status = copy_packet_into_buffer( packet, buffer, buffer_len, &out_length ); irp->IoStatus.Information = out_length; } else diff --git a/dlls/ntoskrnl.exe/tests/driver_hid.c b/dlls/ntoskrnl.exe/tests/driver_hid.c index f1289b8a1bb..a45e5f56928 100644 --- a/dlls/ntoskrnl.exe/tests/driver_hid.c +++ b/dlls/ntoskrnl.exe/tests/driver_hid.c @@ -535,7 +535,7 @@ static NTSTATUS WINAPI driver_internal_ioctl(DEVICE_OBJECT *device, IRP *irp) todo_wine_if(packet->reportId == 0x5a || (polled && report_id && packet->reportId == 0)) ok(packet->reportId == report_id, "got id %u\n", packet->reportId); - todo_wine_if(packet->reportBufferLen == 21 || packet->reportBufferLen == 22) + todo_wine_if(packet->reportBufferLen == 22) ok(packet->reportBufferLen >= expected_size, "got len %u\n", packet->reportBufferLen); ok(!!packet->reportBuffer, "got buffer %p\n", packet->reportBuffer); diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 3c883edb7c8..91fa7e73c88 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -2445,9 +2445,7 @@ static void test_hidp(HANDLE file, HANDLE async_file, int report_id, BOOL polled SetLastError(0xdeadbeef); ret = HidD_GetInputReport(file, report, caps.InputReportByteLength - 1); - todo_wine ok(!ret, "HidD_GetInputReport succeeded\n"); - todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER || broken(GetLastError() == ERROR_CRC), "HidD_GetInputReport returned error %u\n", GetLastError());

1 0

Rémi Bernon : hidclass.sys: Return STATUS_INVALID_USER_BUFFER when appropriate.
by Alexandre Julliard 04 Aug '21

04 Aug '21

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2021