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

Martin Storsjo : msvcrt: Fix strtof() error reporting for values out of float range.
by Alexandre Julliard 28 Jul '21

28 Jul '21

Module: wine Branch: master Commit: 057ecd41cc98cc8c18b04058c0f4323495904e07 URL: https://source.winehq.org/git/wine.git/?a=commit;h=057ecd41cc98cc8c18b04058… Author: Martin Storsjo <martin(a)martin.st> Date: Wed Jul 28 17:43:19 2021 +0300 msvcrt: Fix strtof() error reporting for values out of float range. If the values weren't out of range for the internal strtod() call, we still must mark them as out of range when returning as float. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/string.c | 8 +++++++- dlls/msvcrt/wcs.c | 8 +++++++- dlls/ucrtbase/tests/string.c | 37 +++++++++++++++++++++++++++++++++++++ 3 files changed, 51 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 27e3284326a..4d09405094d 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -1065,7 +1065,13 @@ double CDECL strtod( const char *str, char **end ) */ float CDECL _strtof_l( const char *str, char **end, _locale_t locale ) { - return _strtod_l(str, end, locale); + double ret = _strtod_l(str, end, locale); + if (ret && isfinite(ret)) { + float f = ret; + if (!f || !isfinite(f)) + *_errno() = ERANGE; + } + return ret; } /********************************************************************* diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 615b4f36a33..aeab5527db4 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -798,7 +798,13 @@ double CDECL _wtof_l(const wchar_t *str, _locale_t locale) */ float CDECL _wcstof_l( const wchar_t *str, wchar_t **end, _locale_t locale ) { - return _wcstod_l(str, end, locale); + double ret = _wcstod_l(str, end, locale); + if (ret && isfinite(ret)) { + float f = ret; + if (!f || !isfinite(f)) + *_errno() = ERANGE; + } + return ret; } /********************************************************************* diff --git a/dlls/ucrtbase/tests/string.c b/dlls/ucrtbase/tests/string.c index 9b1d21b801c..734dd68db76 100644 --- a/dlls/ucrtbase/tests/string.c +++ b/dlls/ucrtbase/tests/string.c @@ -152,6 +152,42 @@ static void test_strtod(void) test_strtod_str_errno("2.47e-324", 0, 9, ERANGE); } +static void test_strtof(void) +{ + static const struct { + const char *str; + int len; + float ret; + int err; + } tests[] = { + { "12.1", 4, 12.1f }, + { "-13.721", 7, -13.721f }, + { "1.e40", 5, INFINITY, ERANGE }, + { "-1.e40", 6, -INFINITY, ERANGE }, + { "0.0", 3, 0.0f }, + { "-0.0", 4, 0.0f }, + { "1.4e-45", 7, 1.4e-45f }, + { "-1.4e-45", 8, -1.4e-45f }, + { "1.e-60", 6, 0, ERANGE }, + { "-1.e-60", 7, 0, ERANGE }, + }; + + char *end; + float f; + int i; + + for (i=0; i<ARRAY_SIZE(tests); i++) + { + errno = 0xdeadbeef; + f = strtof(tests[i].str, &end); + ok(f == tests[i].ret, "%d) f = %.16e\n", i, f); + ok(end == tests[i].str + tests[i].len, "%d) len = %d\n", + i, (int)(end - tests[i].str)); + ok(errno == tests[i].err || (!tests[i].err && errno == 0xdeadbeef), + "%d) errno = %d\n", i, errno); + } +} + static void test__memicmp(void) { static const char *s1 = "abc"; @@ -558,6 +594,7 @@ START_TEST(string) "Invalid parameter handler was already set\n"); test_strtod(); + test_strtof(); test__memicmp(); test__memicmp_l(); test___strncnt();

1 0

Martin Storsjo : msvcrt: Convert double (numerically) to UINT64 via INT64, fixing pow() on arm.
by Alexandre Julliard 28 Jul '21

28 Jul '21

Module: wine Branch: master Commit: 37b896db48fb049f8d0c7afe2a4ab98786787658 URL: https://source.winehq.org/git/wine.git/?a=commit;h=37b896db48fb049f8d0c7afe… Author: Martin Storsjo <martin(a)martin.st> Date: Tue Jul 27 01:28:01 2021 +0300 msvcrt: Convert double (numerically) to UINT64 via INT64, fixing pow() on arm. If converting a negative double to an UINT64, on arm it's clipped to zero instead of converted to its two's complement form (contrary to x86). This fixes cases like pow(2.0, -2.0) on arm/aarch64. Add similar casts to expf() too which seems to have a similar pattern, even if it's not known if that case can cause issues or not. In the original musl source, the converttoint() function returns a signed int32_t, doing the same double->signed->unsigned conversion, implicitly. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 69b807f722c..124cdf80098 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -1204,7 +1204,7 @@ float CDECL expf( float x ) ideally ties-to-even rule is used, otherwise the magnitude of r can be bigger which gives larger approximation error. */ kd = __round(z); - ki = kd; + ki = (INT64)kd; r = z - kd; /* exp(x) = 2^(k/N) * 2^(r/N) ~= s * (C0*r^3 + C1*r^2 + C2*r + 1) */ @@ -1508,7 +1508,7 @@ static float powf_exp2(double xd, UINT32 sign_bias) /* N*x = k + r with r in [-1/2, 1/2] */ kd = __round(xd); /* k */ - ki = kd; + ki = (INT64)kd; r = xd - kd; /* exp2(x) = 2^(k/N) * 2^r ~= s * (C0*r^3 + C1*r^2 + C2*r + 1) */ @@ -3824,7 +3824,7 @@ static double pow_exp(double argx, double argy, double x, double xtail, UINT32 s /* x = ln2/N*k + r, with int k and r in [-ln2/2N, ln2/2N]. */ z = invln2N * x; kd = __round(z); - ki = kd; + ki = (INT64)kd; r = x + kd * negln2hiN + kd * negln2loN; /* The code assumes 2^-200 < |xtail| < 2^-8/N. */ r += xtail;

1 0

Zebediah Figura : ws2_32: Move the setsockopt(IPV6_ADD_MEMBERSHIP) implementation to ntdll.
by Alexandre Julliard 28 Jul '21

28 Jul '21

Module: wine Branch: master Commit: ef54a8c318a26d08f593bbe5cfdd9c41b3318031 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef54a8c318a26d08f593bbe5… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jul 28 10:17:05 2021 -0500 ws2_32: Move the setsockopt(IPV6_ADD_MEMBERSHIP) implementation to ntdll. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/socket.c | 5 +++++ dlls/ws2_32/socket.c | 4 ++-- include/wine/afd.h | 1 + 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index f33fc014f3b..f0dc00a9651 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -1802,6 +1802,11 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc return do_setsockopt( handle, io, IPPROTO_IP, IP_UNICAST_IF, in_buffer, in_size ); #endif +#ifdef IPV6_ADD_MEMBERSHIP + case IOCTL_AFD_WINE_SET_IPV6_ADD_MEMBERSHIP: + return do_setsockopt( handle, io, IPPROTO_IPV6, IPV6_ADD_MEMBERSHIP, in_buffer, in_size ); +#endif + default: { if ((code >> 16) == FILE_DEVICE_NETWORK) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index d5de709e991..f02d668ece4 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3717,9 +3717,9 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, case WS_IPPROTO_IPV6: switch(optname) { -#ifdef IPV6_ADD_MEMBERSHIP case WS_IPV6_ADD_MEMBERSHIP: -#endif + return server_setsockopt( s, IOCTL_AFD_WINE_SET_IPV6_ADD_MEMBERSHIP, optval, optlen ); + #ifdef IPV6_DROP_MEMBERSHIP case WS_IPV6_DROP_MEMBERSHIP: #endif diff --git a/include/wine/afd.h b/include/wine/afd.h index c150e2ce474..dda07695f75 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -207,6 +207,7 @@ struct afd_get_events_params #define IOCTL_AFD_WINE_SET_IP_UNBLOCK_SOURCE WINE_AFD_IOC(262) #define IOCTL_AFD_WINE_GET_IP_UNICAST_IF WINE_AFD_IOC(263) #define IOCTL_AFD_WINE_SET_IP_UNICAST_IF WINE_AFD_IOC(264) +#define IOCTL_AFD_WINE_SET_IPV6_ADD_MEMBERSHIP WINE_AFD_IOC(265) struct afd_create_params {

1 0

Zebediah Figura : ws2_32: Move the getsockopt(IPV6_DONTFRAG) implementation to ntdll.
by Alexandre Julliard 28 Jul '21

28 Jul '21

Module: wine Branch: master Commit: a615e67792bd5edcf0577f6e176f7095253c558f URL: https://source.winehq.org/git/wine.git/?a=commit;h=a615e67792bd5edcf0577f6e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jul 28 10:17:06 2021 -0500 ws2_32: Move the getsockopt(IPV6_DONTFRAG) implementation to ntdll. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/socket.c | 33 +++++++++++++++++++++++++++ dlls/ws2_32/socket.c | 59 +++--------------------------------------------- include/wine/afd.h | 1 + 3 files changed, 37 insertions(+), 56 deletions(-) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index f0dc00a9651..fbfd873b3b9 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -1807,6 +1807,39 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc return do_setsockopt( handle, io, IPPROTO_IPV6, IPV6_ADD_MEMBERSHIP, in_buffer, in_size ); #endif + case IOCTL_AFD_WINE_GET_IPV6_DONTFRAG: + { + socklen_t len = out_size; + int ret; + + if ((status = server_get_unix_fd( handle, 0, &fd, &needs_close, NULL, NULL ))) + return status; + +#ifdef IPV6_DONTFRAG + ret = getsockopt( fd, IPPROTO_IPV6, IPV6_DONTFRAG, out_buffer, &len ); +#elif defined(IPV6_MTU_DISCOVER) && defined(IPV6_PMTUDISC_DONT) + { + int value; + + len = sizeof(value); + ret = getsockopt( fd, IPPROTO_IPV6, IPV6_MTU_DISCOVER, &value, &len ); + if (!ret) *(DWORD *)out_buffer = (value != IPV6_PMTUDISC_DONT); + } +#else + { + static int once; + + if (!once++) + FIXME( "IPV6_DONTFRAGMENT is not supported on this platform\n" ); + ret = 0; /* fake success */ + } +#endif + if (needs_close) close( fd ); + if (ret) return sock_errno_to_status( errno ); + io->Information = len; + return STATUS_SUCCESS; + } + default: { if ((code >> 16) == FILE_DEVICE_NETWORK) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index f02d668ece4..837e8021248 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -742,60 +742,6 @@ static BOOL set_dont_fragment(SOCKET s, int level, BOOL value) return value; } -static BOOL get_dont_fragment(SOCKET s, int level, BOOL *out) -{ - int fd, optname, value, not_expected; - socklen_t optlen = sizeof(value); - - if (level == IPPROTO_IP) - { -#ifdef IP_DONTFRAG - optname = IP_DONTFRAG; - not_expected = 0; -#elif defined(IP_MTU_DISCOVER) && defined(IP_PMTUDISC_DONT) - optname = IP_MTU_DISCOVER; - not_expected = IP_PMTUDISC_DONT; -#else - static int once; - if (!once++) - FIXME("IP_DONTFRAGMENT for IPv4 not supported in this platform\n"); - return TRUE; /* fake success */ -#endif - } - else - { -#ifdef IPV6_DONTFRAG - optname = IPV6_DONTFRAG; - not_expected = 0; -#elif defined(IPV6_MTU_DISCOVER) && defined(IPV6_PMTUDISC_DONT) - optname = IPV6_MTU_DISCOVER; - not_expected = IPV6_PMTUDISC_DONT; -#else - static int once; - if (!once++) - FIXME("IP_DONTFRAGMENT for IPv6 not supported in this platform\n"); - return TRUE; /* fake success */ -#endif - } - - fd = get_sock_fd(s, 0, NULL); - if (fd == -1) return FALSE; - - if (!getsockopt(fd, level, optname, &value, &optlen)) - { - *out = value != not_expected; - value = TRUE; - } - else - { - WSASetLastError(wsaErrno()); - value = FALSE; - } - - release_sock_fd(s, fd); - return value; -} - struct per_thread_data *get_per_thread_data(void) { struct per_thread_data * ptb = NtCurrentTeb()->WinSockData; @@ -2511,6 +2457,9 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, case WS_IPPROTO_IPV6: switch(optname) { + case WS_IPV6_DONTFRAG: + return server_getsockopt( s, IOCTL_AFD_WINE_GET_IPV6_DONTFRAG, optval, optlen ); + case WS_IPV6_MULTICAST_IF: case WS_IPV6_MULTICAST_HOPS: case WS_IPV6_MULTICAST_LOOP: @@ -2529,8 +2478,6 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, } release_sock_fd( s, fd ); return ret; - case WS_IPV6_DONTFRAG: - return get_dont_fragment(s, IPPROTO_IPV6, (BOOL *)optval) ? 0 : SOCKET_ERROR; default: FIXME( "unrecognized IPv6 option %u\n", optname ); diff --git a/include/wine/afd.h b/include/wine/afd.h index dda07695f75..bb8fd68f059 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -208,6 +208,7 @@ struct afd_get_events_params #define IOCTL_AFD_WINE_GET_IP_UNICAST_IF WINE_AFD_IOC(263) #define IOCTL_AFD_WINE_SET_IP_UNICAST_IF WINE_AFD_IOC(264) #define IOCTL_AFD_WINE_SET_IPV6_ADD_MEMBERSHIP WINE_AFD_IOC(265) +#define IOCTL_AFD_WINE_GET_IPV6_DONTFRAG WINE_AFD_IOC(266) struct afd_create_params {

1 0

Zebediah Figura : ws2_32: Move the setsockopt(IPV6_DONTFRAG) implementation to ntdll.
by Alexandre Julliard 28 Jul '21

28 Jul '21

Module: wine Branch: master Commit: e1a34ce063d5537e25a251a07c63aa3e733f7bee URL: https://source.winehq.org/git/wine.git/?a=commit;h=e1a34ce063d5537e25a251a0… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jul 28 10:17:07 2021 -0500 ws2_32: Move the setsockopt(IPV6_DONTFRAG) implementation to ntdll. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/socket.c | 19 +++++++++++++++++ dlls/ws2_32/socket.c | 53 +++--------------------------------------------- include/wine/afd.h | 1 + 3 files changed, 23 insertions(+), 50 deletions(-) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index fbfd873b3b9..6a9fcc168a6 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -1840,6 +1840,25 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc return STATUS_SUCCESS; } + case IOCTL_AFD_WINE_SET_IPV6_DONTFRAG: +#ifdef IPV6_DONTFRAG + return do_setsockopt( handle, io, IPPROTO_IPV6, IPV6_DONTFRAG, in_buffer, in_size ); +#elif defined(IPV6_MTU_DISCOVER) && defined(IPV6_PMTUDISC_DO) && defined(IPV6_PMTUDISC_DONT) + { + int value = *(DWORD *)in_buffer ? IPV6_PMTUDISC_DO : IPV6_PMTUDISC_DONT; + + return do_setsockopt( handle, io, IPPROTO_IP, IPV6_MTU_DISCOVER, &value, sizeof(value) ); + } +#else + { + static int once; + + if (!once++) + FIXME( "IPV6_DONTFRAGMENT is not supported on this platform\n" ); + return STATUS_SUCCESS; /* fake success */ + } +#endif + default: { if ((code >> 16) == FILE_DEVICE_NETWORK) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 837e8021248..b436079d709 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -694,54 +694,6 @@ static inline void release_sock_fd( SOCKET s, int fd ) close( fd ); } -static BOOL set_dont_fragment(SOCKET s, int level, BOOL value) -{ - int fd, optname; - - if (level == IPPROTO_IP) - { -#ifdef IP_DONTFRAG - optname = IP_DONTFRAG; -#elif defined(IP_MTU_DISCOVER) && defined(IP_PMTUDISC_DO) && defined(IP_PMTUDISC_DONT) - optname = IP_MTU_DISCOVER; - value = value ? IP_PMTUDISC_DO : IP_PMTUDISC_DONT; -#else - static int once; - if (!once++) - FIXME("IP_DONTFRAGMENT for IPv4 not supported in this platform\n"); - return TRUE; /* fake success */ -#endif - } - else - { -#ifdef IPV6_DONTFRAG - optname = IPV6_DONTFRAG; -#elif defined(IPV6_MTU_DISCOVER) && defined(IPV6_PMTUDISC_DO) && defined(IPV6_PMTUDISC_DONT) - optname = IPV6_MTU_DISCOVER; - value = value ? IPV6_PMTUDISC_DO : IPV6_PMTUDISC_DONT; -#else - static int once; - if (!once++) - FIXME("IP_DONTFRAGMENT for IPv6 not supported in this platform\n"); - return TRUE; /* fake success */ -#endif - } - - fd = get_sock_fd(s, 0, NULL); - if (fd == -1) return FALSE; - - if (!setsockopt(fd, level, optname, &value, sizeof(value))) - value = TRUE; - else - { - WSASetLastError(wsaErrno()); - value = FALSE; - } - - release_sock_fd(s, fd); - return value; -} - struct per_thread_data *get_per_thread_data(void) { struct per_thread_data * ptb = NtCurrentTeb()->WinSockData; @@ -3667,6 +3619,9 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, case WS_IPV6_ADD_MEMBERSHIP: return server_setsockopt( s, IOCTL_AFD_WINE_SET_IPV6_ADD_MEMBERSHIP, optval, optlen ); + case WS_IPV6_DONTFRAG: + return server_setsockopt( s, IOCTL_AFD_WINE_SET_IPV6_DONTFRAG, optval, optlen ); + #ifdef IPV6_DROP_MEMBERSHIP case WS_IPV6_DROP_MEMBERSHIP: #endif @@ -3679,8 +3634,6 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, #endif convert_sockopt(&level, &optname); break; - case WS_IPV6_DONTFRAG: - return set_dont_fragment(s, IPPROTO_IPV6, *(BOOL *)optval) ? 0 : SOCKET_ERROR; case WS_IPV6_PROTECTION_LEVEL: FIXME("IPV6_PROTECTION_LEVEL is ignored!\n"); return 0; diff --git a/include/wine/afd.h b/include/wine/afd.h index bb8fd68f059..e1933184da0 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -209,6 +209,7 @@ struct afd_get_events_params #define IOCTL_AFD_WINE_SET_IP_UNICAST_IF WINE_AFD_IOC(264) #define IOCTL_AFD_WINE_SET_IPV6_ADD_MEMBERSHIP WINE_AFD_IOC(265) #define IOCTL_AFD_WINE_GET_IPV6_DONTFRAG WINE_AFD_IOC(266) +#define IOCTL_AFD_WINE_SET_IPV6_DONTFRAG WINE_AFD_IOC(267) struct afd_create_params {

1 0

Zebediah Figura : ws2_32: Move the setsockopt(IPV6_DROP_MEMBERSHIP) implementation to ntdll.
by Alexandre Julliard 28 Jul '21

28 Jul '21

Module: wine Branch: master Commit: 6d2fb6f135a9a65818cf401a02d67794927620dd URL: https://source.winehq.org/git/wine.git/?a=commit;h=6d2fb6f135a9a65818cf401a… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jul 28 10:17:08 2021 -0500 ws2_32: Move the setsockopt(IPV6_DROP_MEMBERSHIP) implementation to ntdll. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/socket.c | 5 +++++ dlls/ws2_32/socket.c | 4 ++-- include/wine/afd.h | 1 + 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index 6a9fcc168a6..2beb4f1778f 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -1859,6 +1859,11 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc } #endif +#ifdef IPV6_DROP_MEMBERSHIP + case IOCTL_AFD_WINE_SET_IPV6_DROP_MEMBERSHIP: + return do_setsockopt( handle, io, IPPROTO_IPV6, IPV6_DROP_MEMBERSHIP, in_buffer, in_size ); +#endif + default: { if ((code >> 16) == FILE_DEVICE_NETWORK) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index b436079d709..cd8bd63b88c 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3622,9 +3622,9 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, case WS_IPV6_DONTFRAG: return server_setsockopt( s, IOCTL_AFD_WINE_SET_IPV6_DONTFRAG, optval, optlen ); -#ifdef IPV6_DROP_MEMBERSHIP case WS_IPV6_DROP_MEMBERSHIP: -#endif + return server_setsockopt( s, IOCTL_AFD_WINE_SET_IPV6_DROP_MEMBERSHIP, optval, optlen ); + case WS_IPV6_MULTICAST_IF: case WS_IPV6_MULTICAST_HOPS: case WS_IPV6_MULTICAST_LOOP: diff --git a/include/wine/afd.h b/include/wine/afd.h index e1933184da0..ad12c55af12 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -210,6 +210,7 @@ struct afd_get_events_params #define IOCTL_AFD_WINE_SET_IPV6_ADD_MEMBERSHIP WINE_AFD_IOC(265) #define IOCTL_AFD_WINE_GET_IPV6_DONTFRAG WINE_AFD_IOC(266) #define IOCTL_AFD_WINE_SET_IPV6_DONTFRAG WINE_AFD_IOC(267) +#define IOCTL_AFD_WINE_SET_IPV6_DROP_MEMBERSHIP WINE_AFD_IOC(268) struct afd_create_params {

1 0

Zebediah Figura : ws2_32: Move the getsockopt(IPV6_MULTICAST_HOPS) implementation to ntdll.
by Alexandre Julliard 28 Jul '21

28 Jul '21

Module: wine Branch: master Commit: 5dffe2263de41e76100ba0acd7c717267dc4c878 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5dffe2263de41e76100ba0ac… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jul 28 10:17:09 2021 -0500 ws2_32: Move the getsockopt(IPV6_MULTICAST_HOPS) implementation to ntdll. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/socket.c | 3 +++ dlls/ws2_32/socket.c | 4 +++- include/wine/afd.h | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index 2beb4f1778f..85763d032ed 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -1864,6 +1864,9 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc return do_setsockopt( handle, io, IPPROTO_IPV6, IPV6_DROP_MEMBERSHIP, in_buffer, in_size ); #endif + case IOCTL_AFD_WINE_GET_IPV6_MULTICAST_HOPS: + return do_getsockopt( handle, io, IPPROTO_IPV6, IPV6_MULTICAST_HOPS, out_buffer, out_size ); + default: { if ((code >> 16) == FILE_DEVICE_NETWORK) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index cd8bd63b88c..9c2d58827ba 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2412,8 +2412,10 @@ 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_MULTICAST_IF: case WS_IPV6_MULTICAST_HOPS: + return server_getsockopt( s, IOCTL_AFD_WINE_GET_IPV6_MULTICAST_HOPS, optval, optlen ); + + case WS_IPV6_MULTICAST_IF: case WS_IPV6_MULTICAST_LOOP: case WS_IPV6_UNICAST_HOPS: case WS_IPV6_V6ONLY: diff --git a/include/wine/afd.h b/include/wine/afd.h index ad12c55af12..0f04cc824a8 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -211,6 +211,7 @@ struct afd_get_events_params #define IOCTL_AFD_WINE_GET_IPV6_DONTFRAG WINE_AFD_IOC(266) #define IOCTL_AFD_WINE_SET_IPV6_DONTFRAG WINE_AFD_IOC(267) #define IOCTL_AFD_WINE_SET_IPV6_DROP_MEMBERSHIP WINE_AFD_IOC(268) +#define IOCTL_AFD_WINE_GET_IPV6_MULTICAST_HOPS WINE_AFD_IOC(269) struct afd_create_params {

1 0

Alexandre Julliard : wow64: Add thunks for the file query information syscalls.
by Alexandre Julliard 28 Jul '21

28 Jul '21

Module: wine Branch: master Commit: f1d888413fb8bb71253f4a5cf72bf88edc01d47d URL: https://source.winehq.org/git/wine.git/?a=commit;h=f1d888413fb8bb71253f4a5c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 28 16:27:10 2021 +0200 wow64: Add thunks for the file query information syscalls. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wow64/file.c | 122 +++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/wow64/syscall.h | 6 +++ 2 files changed, 128 insertions(+) diff --git a/dlls/wow64/file.c b/dlls/wow64/file.c index b1081735ea5..18c65de05d0 100644 --- a/dlls/wow64/file.c +++ b/dlls/wow64/file.c @@ -143,6 +143,128 @@ NTSTATUS WINAPI wow64_NtOpenFile( UINT *args ) } +/********************************************************************** + * wow64_NtQueryAttributesFile + */ +NTSTATUS WINAPI wow64_NtQueryAttributesFile( UINT *args ) +{ + OBJECT_ATTRIBUTES32 *attr32 = get_ptr( &args ); + FILE_BASIC_INFORMATION *info = get_ptr( &args ); + + struct object_attr64 attr; + + return NtQueryAttributesFile( objattr_32to64( &attr, attr32 ), info ); +} + + +/********************************************************************** + * wow64_NtQueryDirectoryFile + */ +NTSTATUS WINAPI wow64_NtQueryDirectoryFile( UINT *args ) +{ + HANDLE handle = get_handle( &args ); + HANDLE event = get_handle( &args ); + ULONG apc = get_ulong( &args ); + ULONG apc_param = get_ulong( &args ); + IO_STATUS_BLOCK32 *io32 = get_ptr( &args ); + void *buffer = get_ptr( &args ); + ULONG len = get_ulong( &args ); + FILE_INFORMATION_CLASS class = get_ulong( &args ); + BOOLEAN single_entry = get_ulong( &args ); + UNICODE_STRING32 *mask32 = get_ptr( &args ); + BOOLEAN restart_scan = get_ulong( &args ); + + UNICODE_STRING mask; + IO_STATUS_BLOCK io; + NTSTATUS status; + + status = NtQueryDirectoryFile( handle, event, apc_32to64( apc ), apc_param_32to64( apc, apc_param ), + iosb_32to64( &io, io32 ), buffer, len, class, single_entry, + unicode_str_32to64( &mask, mask32 ), restart_scan ); + put_iosb( io32, &io ); + return status; +} + + +/********************************************************************** + * wow64_NtQueryEaFile + */ +NTSTATUS WINAPI wow64_NtQueryEaFile( UINT *args ) +{ + HANDLE handle = get_handle( &args ); + IO_STATUS_BLOCK32 *io32 = get_ptr( &args ); + void *buffer = get_ptr( &args ); + ULONG len = get_ulong( &args ); + BOOLEAN single_entry = get_ulong( &args ); + void *list = get_ptr( &args ); + ULONG list_len = get_ulong( &args ); + ULONG *index = get_ptr( &args ); + BOOLEAN restart = get_ulong( &args ); + + IO_STATUS_BLOCK io; + NTSTATUS status; + + status = NtQueryEaFile( handle, iosb_32to64( &io, io32 ), buffer, len, + single_entry, list, list_len, index, restart ); + put_iosb( io32, &io ); + return status; +} + + +/********************************************************************** + * wow64_NtQueryFullAttributesFile + */ +NTSTATUS WINAPI wow64_NtQueryFullAttributesFile( UINT *args ) +{ + OBJECT_ATTRIBUTES32 *attr32 = get_ptr( &args ); + FILE_NETWORK_OPEN_INFORMATION *info = get_ptr( &args ); + + struct object_attr64 attr; + + return NtQueryFullAttributesFile( objattr_32to64( &attr, attr32 ), info ); +} + + +/********************************************************************** + * wow64_NtQueryInformationFile + */ +NTSTATUS WINAPI wow64_NtQueryInformationFile( UINT *args ) +{ + HANDLE handle = get_handle( &args ); + IO_STATUS_BLOCK32 *io32 = get_ptr( &args ); + void *info = get_ptr( &args ); + ULONG len = get_ulong( &args ); + FILE_INFORMATION_CLASS class = get_ulong( &args ); + + IO_STATUS_BLOCK io; + NTSTATUS status; + + status = NtQueryInformationFile( handle, iosb_32to64( &io, io32 ), info, len, class ); + put_iosb( io32, &io ); + return status; +} + + +/********************************************************************** + * wow64_NtQueryVolumeInformationFile + */ +NTSTATUS WINAPI wow64_NtQueryVolumeInformationFile( UINT *args ) +{ + HANDLE handle = get_handle( &args ); + IO_STATUS_BLOCK32 *io32 = get_ptr( &args ); + void *buffer = get_ptr( &args ); + ULONG len = get_ulong( &args ); + FS_INFORMATION_CLASS class = get_ulong( &args ); + + IO_STATUS_BLOCK io; + NTSTATUS status; + + status = NtQueryVolumeInformationFile( handle, iosb_32to64( &io, io32 ), buffer, len, class ); + put_iosb( io32, &io ); + return status; +} + + /********************************************************************** * wow64_NtReadFile */ diff --git a/dlls/wow64/syscall.h b/dlls/wow64/syscall.h index 870cb3b77b8..d147014c3be 100644 --- a/dlls/wow64/syscall.h +++ b/dlls/wow64/syscall.h @@ -92,11 +92,16 @@ SYSCALL_ENTRY( NtOpenTimer ) \ SYSCALL_ENTRY( NtProtectVirtualMemory ) \ SYSCALL_ENTRY( NtPulseEvent ) \ + SYSCALL_ENTRY( NtQueryAttributesFile ) \ SYSCALL_ENTRY( NtQueryDefaultLocale ) \ SYSCALL_ENTRY( NtQueryDefaultUILanguage ) \ + SYSCALL_ENTRY( NtQueryDirectoryFile ) \ SYSCALL_ENTRY( NtQueryDirectoryObject ) \ + SYSCALL_ENTRY( NtQueryEaFile ) \ SYSCALL_ENTRY( NtQueryEvent ) \ + SYSCALL_ENTRY( NtQueryFullAttributesFile ) \ SYSCALL_ENTRY( NtQueryInformationAtom ) \ + SYSCALL_ENTRY( NtQueryInformationFile ) \ SYSCALL_ENTRY( NtQueryInstallUILanguage ) \ SYSCALL_ENTRY( NtQueryIoCompletion ) \ SYSCALL_ENTRY( NtQueryKey ) \ @@ -111,6 +116,7 @@ SYSCALL_ENTRY( NtQueryTimerResolution ) \ SYSCALL_ENTRY( NtQueryValueKey ) \ SYSCALL_ENTRY( NtQueryVirtualMemory ) \ + SYSCALL_ENTRY( NtQueryVolumeInformationFile ) \ SYSCALL_ENTRY( NtReadFile ) \ SYSCALL_ENTRY( NtReadFileScatter ) \ SYSCALL_ENTRY( NtReadVirtualMemory ) \

1 0

Alexandre Julliard : wow64: Add thunks for the file set information syscalls.
by Alexandre Julliard 28 Jul '21

28 Jul '21

Module: wine Branch: master Commit: c12abcc2d82538eeec66617c3986672f9a61db63 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c12abcc2d82538eeec66617c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 28 17:25:59 2021 +0200 wow64: Add thunks for the file set information syscalls. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wow64/file.c | 112 ++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/wow64/struct32.h | 14 +++++++ dlls/wow64/syscall.h | 3 ++ 3 files changed, 129 insertions(+) diff --git a/dlls/wow64/file.c b/dlls/wow64/file.c index 18c65de05d0..bf11ee4b2e2 100644 --- a/dlls/wow64/file.c +++ b/dlls/wow64/file.c @@ -27,6 +27,9 @@ #include "winnt.h" #include "winternl.h" #include "wow64_private.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wow); /********************************************************************** @@ -315,6 +318,115 @@ NTSTATUS WINAPI wow64_NtReadFileScatter( UINT *args ) } +/********************************************************************** + * wow64_NtSetEaFile + */ +NTSTATUS WINAPI wow64_NtSetEaFile( UINT *args ) +{ + HANDLE handle = get_handle( &args ); + IO_STATUS_BLOCK32 *io32 = get_ptr( &args ); + void *ptr = get_ptr( &args ); + ULONG len = get_ulong( &args ); + + IO_STATUS_BLOCK io; + NTSTATUS status; + + status = NtSetEaFile( handle, iosb_32to64( &io, io32 ), ptr, len ); + put_iosb( io32, &io ); + return status; +} + + +/********************************************************************** + * wow64_NtSetInformationFile + */ +NTSTATUS WINAPI wow64_NtSetInformationFile( UINT *args ) +{ + HANDLE handle = get_handle( &args ); + IO_STATUS_BLOCK32 *io32 = get_ptr( &args ); + void *ptr = get_ptr( &args ); + ULONG len = get_ulong( &args ); + FILE_INFORMATION_CLASS class = get_ulong( &args ); + + IO_STATUS_BLOCK io; + NTSTATUS status; + + switch (class) + { + case FileBasicInformation: /* FILE_BASIC_INFORMATION */ + case FilePositionInformation: /* FILE_POSITION_INFORMATION */ + case FileEndOfFileInformation: /* FILE_END_OF_FILE_INFORMATION */ + case FilePipeInformation: /* FILE_PIPE_INFORMATION */ + case FileMailslotSetInformation: /* FILE_MAILSLOT_SET_INFORMATION */ + case FileIoCompletionNotificationInformation: /* FILE_IO_COMPLETION_NOTIFICATION_INFORMATION */ + case FileIoPriorityHintInformation: /* FILE_IO_PRIORITY_HINT_INFO */ + case FileValidDataLengthInformation: /* FILE_VALID_DATA_LENGTH_INFORMATION */ + case FileDispositionInformation: /* FILE_DISPOSITION_INFORMATION */ + status = NtSetInformationFile( handle, iosb_32to64( &io, io32 ), ptr, len, class ); + break; + + case FileRenameInformation: /* FILE_RENAME_INFORMATION */ + case FileLinkInformation: /* FILE_LINK_INFORMATION */ + if (len >= sizeof(FILE_RENAME_INFORMATION32)) + { + FILE_RENAME_INFORMATION32 *info32 = ptr; + FILE_RENAME_INFORMATION *info; + ULONG size; + + size = offsetof( FILE_RENAME_INFORMATION, FileName[info32->FileNameLength/sizeof(WCHAR)] ); + info = Wow64AllocateTemp( size ); + info->ReplaceIfExists = info32->ReplaceIfExists; + info->RootDirectory = LongToHandle( info32->RootDirectory ); + info->FileNameLength = info32->FileNameLength; + memcpy( info->FileName, info32->FileName, info->FileNameLength ); + status = NtSetInformationFile( handle, iosb_32to64( &io, io32 ), info, size, class ); + } + else status = io.Status = STATUS_INVALID_PARAMETER_3; + break; + + case FileCompletionInformation: /* FILE_COMPLETION_INFORMATION */ + if (len >= sizeof(FILE_COMPLETION_INFORMATION32)) + { + FILE_COMPLETION_INFORMATION32 *info32 = ptr; + FILE_COMPLETION_INFORMATION info; + + info.CompletionPort = LongToHandle( info32->CompletionPort ); + info.CompletionKey = info32->CompletionKey; + status = NtSetInformationFile( handle, iosb_32to64( &io, io32 ), &info, sizeof(info), class ); + } + else status = io.Status = STATUS_INVALID_PARAMETER_3; + break; + + default: + FIXME( "unsupported class %u\n", class ); + status = io.Status = STATUS_INVALID_INFO_CLASS; + break; + } + put_iosb( io32, &io ); + return status; +} + + +/********************************************************************** + * wow64_NtSetVolumeInformationFile + */ +NTSTATUS WINAPI wow64_NtSetVolumeInformationFile( UINT *args ) +{ + HANDLE handle = get_handle( &args ); + IO_STATUS_BLOCK32 *io32 = get_ptr( &args ); + void *ptr = get_ptr( &args ); + ULONG len = get_ulong( &args ); + FS_INFORMATION_CLASS class = get_ulong( &args ); + + IO_STATUS_BLOCK io; + NTSTATUS status; + + status = NtSetVolumeInformationFile( handle, iosb_32to64( &io, io32 ), ptr, len, class ); + put_iosb( io32, &io ); + return status; +} + + /********************************************************************** * wow64_NtUnlockFile */ diff --git a/dlls/wow64/struct32.h b/dlls/wow64/struct32.h index 76055115b08..168519b18da 100644 --- a/dlls/wow64/struct32.h +++ b/dlls/wow64/struct32.h @@ -79,6 +79,20 @@ typedef struct UNICODE_STRING32 ObjectTypeName; } DIRECTORY_BASIC_INFORMATION32; +typedef struct +{ + ULONG CompletionPort; + ULONG CompletionKey; +} FILE_COMPLETION_INFORMATION32; + +typedef struct +{ + BOOLEAN ReplaceIfExists; + ULONG RootDirectory; + ULONG FileNameLength; + WCHAR FileName[1]; +} FILE_RENAME_INFORMATION32; + typedef struct { ULONG BaseAddress; diff --git a/dlls/wow64/syscall.h b/dlls/wow64/syscall.h index d147014c3be..38eca6b744e 100644 --- a/dlls/wow64/syscall.h +++ b/dlls/wow64/syscall.h @@ -134,8 +134,10 @@ SYSCALL_ENTRY( NtSecureConnectPort ) \ SYSCALL_ENTRY( NtSetDefaultLocale ) \ SYSCALL_ENTRY( NtSetDefaultUILanguage ) \ + SYSCALL_ENTRY( NtSetEaFile ) \ SYSCALL_ENTRY( NtSetEvent ) \ SYSCALL_ENTRY( NtSetInformationDebugObject ) \ + SYSCALL_ENTRY( NtSetInformationFile ) \ SYSCALL_ENTRY( NtSetInformationKey ) \ SYSCALL_ENTRY( NtSetInformationObject ) \ SYSCALL_ENTRY( NtSetIoCompletion ) \ @@ -143,6 +145,7 @@ SYSCALL_ENTRY( NtSetTimer ) \ SYSCALL_ENTRY( NtSetTimerResolution ) \ SYSCALL_ENTRY( NtSetValueKey ) \ + SYSCALL_ENTRY( NtSetVolumeInformationFile ) \ SYSCALL_ENTRY( NtSignalAndWaitForSingleObject ) \ SYSCALL_ENTRY( NtTerminateJobObject ) \ SYSCALL_ENTRY( NtUnloadKey ) \

1 0

Alexandre Julliard : wow64: Add thunks for the file async I/O syscalls.
by Alexandre Julliard 28 Jul '21

28 Jul '21

Module: wine Branch: master Commit: 011ce0b2ada2cededa1cab410347836ae3b7cab3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=011ce0b2ada2cededa1cab41… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 28 18:09:20 2021 +0200 wow64: Add thunks for the file async I/O syscalls. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wow64/file.c | 115 ++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/wow64/struct32.h | 7 +++ dlls/wow64/syscall.h | 5 +++ 3 files changed, 127 insertions(+) diff --git a/dlls/wow64/file.c b/dlls/wow64/file.c index bf11ee4b2e2..5fb0fe97699 100644 --- a/dlls/wow64/file.c +++ b/dlls/wow64/file.c @@ -32,6 +32,41 @@ WINE_DEFAULT_DEBUG_CHANNEL(wow); +/********************************************************************** + * wow64_NtCancelIoFile + */ +NTSTATUS WINAPI wow64_NtCancelIoFile( UINT *args ) +{ + HANDLE handle = get_handle( &args ); + IO_STATUS_BLOCK32 *io32 = get_ptr( &args ); + + IO_STATUS_BLOCK io; + NTSTATUS status; + + status = NtCancelIoFile( handle, iosb_32to64( &io, io32 )); + put_iosb( io32, &io ); + return status; +} + + +/********************************************************************** + * wow64_NtCancelIoFileEx + */ +NTSTATUS WINAPI wow64_NtCancelIoFileEx( UINT *args ) +{ + HANDLE handle = get_handle( &args ); + IO_STATUS_BLOCK32 *io_ptr = get_ptr( &args ); + IO_STATUS_BLOCK32 *io32 = get_ptr( &args ); + + IO_STATUS_BLOCK io; + NTSTATUS status; + + status = NtCancelIoFileEx( handle, (IO_STATUS_BLOCK *)io_ptr, iosb_32to64( &io, io32 )); + put_iosb( io32, &io ); + return status; +} + + /********************************************************************** * wow64_NtCreateFile */ @@ -120,6 +155,32 @@ NTSTATUS WINAPI wow64_NtLockFile( UINT *args ) } +/********************************************************************** + * wow64_NtNotifyChangeDirectoryFile + */ +NTSTATUS WINAPI wow64_NtNotifyChangeDirectoryFile( UINT *args ) +{ + HANDLE handle = get_handle( &args ); + HANDLE event = get_handle( &args ); + ULONG apc = get_ulong( &args ); + ULONG apc_param = get_ulong( &args ); + IO_STATUS_BLOCK32 *io32 = get_ptr( &args ); + void *buffer = get_ptr( &args ); + ULONG len = get_ulong( &args ); + ULONG filter = get_ulong( &args ); + BOOLEAN subtree = get_ulong( &args ); + + IO_STATUS_BLOCK io; + NTSTATUS status; + + status = NtNotifyChangeDirectoryFile( handle, event, apc_32to64( apc ), + apc_param_32to64( apc, apc_param ), iosb_32to64( &io, io32 ), + buffer, len, filter, subtree ); + put_iosb( io32, &io ); + return status; +} + + /********************************************************************** * wow64_NtOpenFile */ @@ -318,6 +379,60 @@ NTSTATUS WINAPI wow64_NtReadFileScatter( UINT *args ) } +/********************************************************************** + * wow64_NtRemoveIoCompletion + */ +NTSTATUS WINAPI wow64_NtRemoveIoCompletion( UINT *args ) +{ + HANDLE handle = get_handle( &args ); + ULONG *key_ptr = get_ptr( &args ); + ULONG *value_ptr = get_ptr( &args ); + IO_STATUS_BLOCK32 *io32 = get_ptr( &args ); + LARGE_INTEGER *timeout = get_ptr( &args ); + + IO_STATUS_BLOCK io; + ULONG_PTR key, value; + NTSTATUS status; + + status = NtRemoveIoCompletion( handle, &key, &value, iosb_32to64( &io, io32 ), timeout ); + if (!status) + { + *key_ptr = key; + *value_ptr = value; + } + put_iosb( io32, &io ); + return status; +} + + +/********************************************************************** + * wow64_NtRemoveIoCompletionEx + */ +NTSTATUS WINAPI wow64_NtRemoveIoCompletionEx( UINT *args ) +{ + HANDLE handle = get_handle( &args ); + FILE_IO_COMPLETION_INFORMATION32 *info32 = get_ptr( &args ); + ULONG count = get_ulong( &args ); + ULONG *written = get_ptr( &args ); + LARGE_INTEGER *timeout = get_ptr( &args ); + BOOLEAN alertable = get_ulong( &args ); + + NTSTATUS status; + ULONG i; + FILE_IO_COMPLETION_INFORMATION *info = Wow64AllocateTemp( count * sizeof(*info) ); + + status = NtRemoveIoCompletionEx( handle, info, count, written, timeout, alertable ); + for (i = 0; i < *written; i++) + { + info32[i].CompletionKey = info[i].CompletionKey; + info32[i].CompletionValue = info[i].CompletionValue; + info32[i].IoStatusBlock.Status = info[i].IoStatusBlock.Status; + info32[i].IoStatusBlock.Information = info[i].IoStatusBlock.Information; + } + return status; +} + + /********************************************************************** * wow64_NtSetEaFile */ diff --git a/dlls/wow64/struct32.h b/dlls/wow64/struct32.h index 168519b18da..258fa9f74c1 100644 --- a/dlls/wow64/struct32.h +++ b/dlls/wow64/struct32.h @@ -85,6 +85,13 @@ typedef struct ULONG CompletionKey; } FILE_COMPLETION_INFORMATION32; +typedef struct +{ + ULONG CompletionKey; + ULONG CompletionValue; + IO_STATUS_BLOCK32 IoStatusBlock; +} FILE_IO_COMPLETION_INFORMATION32; + typedef struct { BOOLEAN ReplaceIfExists; diff --git a/dlls/wow64/syscall.h b/dlls/wow64/syscall.h index 38eca6b744e..1990dc335f3 100644 --- a/dlls/wow64/syscall.h +++ b/dlls/wow64/syscall.h @@ -29,6 +29,8 @@ SYSCALL_ENTRY( NtAllocateVirtualMemory ) \ SYSCALL_ENTRY( NtAllocateVirtualMemoryEx ) \ SYSCALL_ENTRY( NtAreMappedFilesTheSame ) \ + SYSCALL_ENTRY( NtCancelIoFile ) \ + SYSCALL_ENTRY( NtCancelIoFileEx ) \ SYSCALL_ENTRY( NtCancelTimer ) \ SYSCALL_ENTRY( NtClearEvent ) \ SYSCALL_ENTRY( NtClearPowerRequest ) \ @@ -75,6 +77,7 @@ SYSCALL_ENTRY( NtLockVirtualMemory ) \ SYSCALL_ENTRY( NtMakeTemporaryObject ) \ SYSCALL_ENTRY( NtMapViewOfSection ) \ + SYSCALL_ENTRY( NtNotifyChangeDirectoryFile ) \ SYSCALL_ENTRY( NtOpenDirectoryObject ) \ SYSCALL_ENTRY( NtOpenEvent ) \ SYSCALL_ENTRY( NtOpenFile ) \ @@ -123,6 +126,8 @@ SYSCALL_ENTRY( NtReleaseKeyedEvent ) \ SYSCALL_ENTRY( NtReleaseMutant ) \ SYSCALL_ENTRY( NtReleaseSemaphore ) \ + SYSCALL_ENTRY( NtRemoveIoCompletion ) \ + SYSCALL_ENTRY( NtRemoveIoCompletionEx ) \ SYSCALL_ENTRY( NtRenameKey ) \ SYSCALL_ENTRY( NtReplaceKey ) \ SYSCALL_ENTRY( NtReplyWaitReceivePort ) \

1 0