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

Alexandre Julliard : netapi32: Avoid process heap allocations.
by Alexandre Julliard Aug. 12, 2021

Aug. 12, 2021

Module: wine Branch: master Commit: fe6c25167f9a22109a26119941d3e27c6423884c URL: https://source.winehq.org/git/wine.git/?a=commit;h=fe6c25167f9a22109a261199… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 12 13:59:30 2021 +0200 netapi32: Avoid process heap allocations. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/netapi32/netapi32.c | 26 ++++++++++++- dlls/netapi32/unixlib.c | 96 +++++++++++++++++++++++++----------------------- dlls/netapi32/unixlib.h | 4 +- 3 files changed, 77 insertions(+), 49 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=fe6c25167f9a22109a26…

1 0

Alexandre Julliard : msv1_0: Convert the Unix library to the __wine_unix_call interface.
by Alexandre Julliard Aug. 12, 2021

Aug. 12, 2021

Module: wine Branch: master Commit: d6d32434a7fd63875a7283dd855ac069b4bc5ed2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d6d32434a7fd63875a7283dd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 11 19:49:05 2021 +0200 msv1_0: Convert the Unix library to the __wine_unix_call interface. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msv1_0/Makefile.in | 1 + dlls/msv1_0/main.c | 73 +++++++++++++++++++++++++++++++++---------------- dlls/msv1_0/unixlib.c | 52 ++++++++++++++++++----------------- dlls/msv1_0/unixlib.h | 31 +++++++++++++++++---- 4 files changed, 103 insertions(+), 54 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d6d32434a7fd63875a72…

1 0

Alexandre Julliard : msv1_0: Move context allocation to the PE side.
by Alexandre Julliard Aug. 12, 2021

Aug. 12, 2021

Module: wine Branch: master Commit: 9a51a9c44ef58db93e0adcc32e4e59814ca749c2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9a51a9c44ef58db93e0adcc3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 11 18:11:58 2021 +0200 msv1_0: Move context allocation to the PE side. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msv1_0/main.c | 21 +++++++++++++++++---- dlls/msv1_0/unixlib.c | 29 +++++++++-------------------- dlls/msv1_0/unixlib.h | 2 +- 3 files changed, 27 insertions(+), 25 deletions(-) diff --git a/dlls/msv1_0/main.c b/dlls/msv1_0/main.c index df9d0dd0f1a..6d0af9e1ec3 100644 --- a/dlls/msv1_0/main.c +++ b/dlls/msv1_0/main.c @@ -655,7 +655,9 @@ static NTSTATUS NTAPI ntlm_SpInitLsaModeContext( LSA_SEC_HANDLE cred_handle, LSA argv[4] = NULL; } - if ((status = ntlm_funcs->fork( argv, &ctx )) != SEC_E_OK) goto done; + if (!(ctx = calloc( 1, sizeof(*ctx) ))) goto done; + + if ((status = ntlm_funcs->fork( ctx, argv )) != SEC_E_OK) goto done; status = SEC_E_INSUFFICIENT_MEMORY; ctx->mode = MODE_CLIENT; @@ -838,7 +840,11 @@ static NTSTATUS NTAPI ntlm_SpInitLsaModeContext( LSA_SEC_HANDLE cred_handle, LSA } done: - if (status != SEC_E_OK && status != SEC_I_CONTINUE_NEEDED) ntlm_funcs->cleanup( ctx ); + if (status != SEC_E_OK && status != SEC_I_CONTINUE_NEEDED) + { + ntlm_funcs->cleanup( ctx ); + free( ctx ); + } free( username ); free( domain ); free( password ); @@ -892,10 +898,12 @@ static NTSTATUS NTAPI ntlm_SpAcceptLsaModeContext( LSA_SEC_HANDLE cred_handle, L } else bin_len = input->pBuffers[0].cbBuffer; + if (!(ctx = calloc( 1, sizeof(*ctx) ))) goto done; + argv[0] = (char *)"ntlm_auth"; argv[1] = (char *)"--helper-protocol=squid-2.5-ntlmssp"; argv[2] = NULL; - if ((status = ntlm_funcs->fork( argv, &ctx )) != SEC_E_OK) goto done; + if ((status = ntlm_funcs->fork( ctx, argv )) != SEC_E_OK) goto done; ctx->mode = MODE_SERVER; if (!(want_flags = malloc( 73 ))) @@ -1048,7 +1056,11 @@ static NTSTATUS NTAPI ntlm_SpAcceptLsaModeContext( LSA_SEC_HANDLE cred_handle, L } done: - if (status != SEC_E_OK && status != SEC_I_CONTINUE_NEEDED) ntlm_funcs->cleanup( ctx ); + if (status != SEC_E_OK && status != SEC_I_CONTINUE_NEEDED) + { + ntlm_funcs->cleanup( ctx ); + free( ctx ); + } free( buf ); free( bin ); free( want_flags ); @@ -1065,6 +1077,7 @@ static NTSTATUS NTAPI ntlm_SpDeleteContext( LSA_SEC_HANDLE handle ) if (!ctx) return SEC_E_INVALID_HANDLE; ntlm_funcs->cleanup( ctx ); + free( ctx ); return SEC_E_OK; } diff --git a/dlls/msv1_0/unixlib.c b/dlls/msv1_0/unixlib.c index 83975803aa2..d9482c4857a 100644 --- a/dlls/msv1_0/unixlib.c +++ b/dlls/msv1_0/unixlib.c @@ -24,6 +24,7 @@ #endif #include <stdarg.h> +#include <stdlib.h> #include <unistd.h> #include <fcntl.h> #include <errno.h> @@ -49,7 +50,7 @@ static SECURITY_STATUS read_line( struct ntlm_ctx *ctx, unsigned int *offset ) if (!ctx->com_buf) { - if (!(ctx->com_buf = RtlAllocateHeap( GetProcessHeap(), 0, INITIAL_BUFFER_SIZE ))) + if (!(ctx->com_buf = malloc( INITIAL_BUFFER_SIZE ))) return SEC_E_INSUFFICIENT_MEMORY; ctx->com_buf_size = INITIAL_BUFFER_SIZE; ctx->com_buf_offset = 0; @@ -60,7 +61,7 @@ static SECURITY_STATUS read_line( struct ntlm_ctx *ctx, unsigned int *offset ) ssize_t size; if (ctx->com_buf_offset + INITIAL_BUFFER_SIZE > ctx->com_buf_size) { - char *buf = RtlReAllocateHeap( GetProcessHeap(), 0, ctx->com_buf, ctx->com_buf_size + INITIAL_BUFFER_SIZE ); + char *buf = realloc( ctx->com_buf, ctx->com_buf_size + INITIAL_BUFFER_SIZE ); if (!buf) return SEC_E_INSUFFICIENT_MEMORY; ctx->com_buf_size += INITIAL_BUFFER_SIZE; ctx->com_buf = buf; @@ -125,14 +126,12 @@ static void CDECL ntlm_cleanup( struct ntlm_ctx *ctx ) } while (ret < 0 && errno == EINTR); } - RtlFreeHeap( GetProcessHeap(), 0, ctx->com_buf ); - RtlFreeHeap( GetProcessHeap(), 0, ctx ); + free( ctx->com_buf ); } -static SECURITY_STATUS CDECL ntlm_fork( char **argv, struct ntlm_ctx **ret_ctx ) +static SECURITY_STATUS CDECL ntlm_fork( struct ntlm_ctx *ctx, char **argv ) { int pipe_in[2], pipe_out[2]; - struct ntlm_ctx *ctx; #ifdef HAVE_PIPE2 if (pipe2( pipe_in, O_CLOEXEC ) < 0) @@ -156,15 +155,6 @@ static SECURITY_STATUS CDECL ntlm_fork( char **argv, struct ntlm_ctx **ret_ctx ) fcntl( pipe_out[1], F_SETFD, FD_CLOEXEC ); } - if (!(ctx = RtlAllocateHeap( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*ctx) ))) - { - close( pipe_in[0] ); - close( pipe_in[1] ); - close( pipe_out[0] ); - close( pipe_out[1] ); - return SEC_E_INSUFFICIENT_MEMORY; - } - if (!(ctx->pid = fork())) /* child */ { dup2( pipe_out[0], 0 ); @@ -186,7 +176,6 @@ static SECURITY_STATUS CDECL ntlm_fork( char **argv, struct ntlm_ctx **ret_ctx ) close( pipe_in[1] ); ctx->pipe_out = pipe_out[1]; close( pipe_out[0] ); - *ret_ctx = ctx; } return SEC_E_OK; @@ -198,7 +187,7 @@ static SECURITY_STATUS CDECL ntlm_fork( char **argv, struct ntlm_ctx **ret_ctx ) static BOOL check_version( void ) { - struct ntlm_ctx *ctx; + struct ntlm_ctx ctx = { 0 }; char *argv[3], buf[80]; BOOL ret = FALSE; int len; @@ -206,9 +195,9 @@ static BOOL check_version( void ) argv[0] = (char *)"ntlm_auth"; argv[1] = (char *)"--version"; argv[2] = NULL; - if (ntlm_fork( argv, &ctx ) != SEC_E_OK) return FALSE; + if (ntlm_fork( &ctx, argv ) != SEC_E_OK) return FALSE; - if ((len = read( ctx->pipe_in, buf, sizeof(buf) - 1 )) > 8) + if ((len = read( ctx.pipe_in, buf, sizeof(buf) - 1 )) > 8) { char *newline; int major = 0, minor = 0, micro = 0; @@ -233,7 +222,7 @@ static BOOL check_version( void ) "Make sure that ntlm_auth >= %d.%d.%d is in your path. " "Usually, you can find it in the winbind package of your distribution.\n", NTLM_AUTH_MAJOR_VERSION, NTLM_AUTH_MINOR_VERSION, NTLM_AUTH_MICRO_VERSION ); - ntlm_cleanup( ctx ); + ntlm_cleanup( &ctx ); return ret; } diff --git a/dlls/msv1_0/unixlib.h b/dlls/msv1_0/unixlib.h index 92f42f4b0bd..77d1296dcd2 100644 --- a/dlls/msv1_0/unixlib.h +++ b/dlls/msv1_0/unixlib.h @@ -92,7 +92,7 @@ struct ntlm_funcs { SECURITY_STATUS (CDECL *chat)( struct ntlm_ctx *, char *, unsigned int, unsigned int * ); void (CDECL *cleanup)( struct ntlm_ctx * ); - SECURITY_STATUS (CDECL *fork)( char **, struct ntlm_ctx ** ); + SECURITY_STATUS (CDECL *fork)( struct ntlm_ctx *, char ** ); }; extern const struct ntlm_funcs *ntlm_funcs;

1 0

Huw Davies : iphlpapi: Implement GetIcmpStatisticsEx() on top of nsi.
by Alexandre Julliard Aug. 12, 2021

Aug. 12, 2021

Module: wine Branch: master Commit: 1cc49258f7d22602cad9cb0cb271d6f1e48f068a URL: https://source.winehq.org/git/wine.git/?a=commit;h=1cc49258f7d22602cad9cb0c… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Aug 12 10:38:16 2021 +0100 iphlpapi: Implement GetIcmpStatisticsEx() on top of nsi. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/iphlpapi_main.c | 36 +++++++++ dlls/iphlpapi/ipstats.c | 175 ------------------------------------------ 2 files changed, 36 insertions(+), 175 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1cc49258f7d22602cad9…

1 0

Alexandre Julliard : ws2_32: Avoid using wineserver definitions.
by Alexandre Julliard Aug. 12, 2021

Aug. 12, 2021

Module: wine Branch: master Commit: 948e79192835247706aaf1b95c12c082fc42cc89 URL: https://source.winehq.org/git/wine.git/?a=commit;h=948e79192835247706aaf1b9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 11 20:13:01 2021 +0200 ws2_32: Avoid using wineserver definitions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 12 +++++++----- dlls/ws2_32/ws2_32_private.h | 1 - include/wine/afd.h | 7 +++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 933aff9a99c..6324fc742e0 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -33,6 +33,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(winsock); WINE_DECLARE_DEBUG_CHANNEL(winediag); +#define TIMEOUT_INFINITE _I64_MAX + const struct unix_funcs *unix_funcs = NULL; static const WSAPROTOCOL_INFOW supported_protocols[] = @@ -718,7 +720,7 @@ SOCKET WINAPI accept( SOCKET s, struct sockaddr *addr, int *len ) { IO_STATUS_BLOCK io; NTSTATUS status; - obj_handle_t accept_handle; + ULONG accept_handle; HANDLE sync_event; SOCKET ret; @@ -740,7 +742,7 @@ SOCKET WINAPI accept( SOCKET s, struct sockaddr *addr, int *len ) return INVALID_SOCKET; } - ret = HANDLE2SOCKET(wine_server_ptr_handle( accept_handle )); + ret = accept_handle; if (!socket_list_add( ret )) { CloseHandle( SOCKET2HANDLE(ret) ); @@ -3138,8 +3140,8 @@ int WINAPI WSAAsyncSelect( SOCKET s, HWND window, UINT message, LONG mask ) TRACE( "socket %#lx, window %p, message %#x, mask %#x\n", s, window, message, mask ); - params.handle = wine_server_obj_handle( (HANDLE)s ); - params.window = wine_server_user_handle( window ); + params.handle = s; + params.window = HandleToULong( window ); params.message = message; params.mask = afd_poll_flag_from_win32( mask ); @@ -3500,7 +3502,7 @@ SOCKET WINAPI WSAAccept( SOCKET s, struct sockaddr *addr, int *addrlen, case CF_DEFER: { - obj_handle_t server_handle = cs; + ULONG server_handle = cs; IO_STATUS_BLOCK io; NTSTATUS status; diff --git a/dlls/ws2_32/ws2_32_private.h b/dlls/ws2_32/ws2_32_private.h index 6c04785b258..f417c8975f4 100644 --- a/dlls/ws2_32/ws2_32_private.h +++ b/dlls/ws2_32/ws2_32_private.h @@ -48,7 +48,6 @@ #include "iphlpapi.h" #include "ip2string.h" #include "wine/afd.h" -#include "wine/server.h" #include "wine/debug.h" #include "wine/exception.h" #include "wine/heap.h" diff --git a/include/wine/afd.h b/include/wine/afd.h index caa86eabf83..3936dbd87b1 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -24,7 +24,6 @@ #include <winternl.h> #include <winioctl.h> #include <mswsock.h> -#include "wine/server_protocol.h" #ifdef USE_WS_PREFIX # define WS(x) WS_##x @@ -241,7 +240,7 @@ struct afd_create_params struct afd_accept_into_params { - obj_handle_t accept_handle; + ULONG accept_handle; unsigned int recv_len, local_len; }; @@ -286,8 +285,8 @@ struct afd_transmit_params struct afd_message_select_params { - obj_handle_t handle; - user_handle_t window; + ULONG handle; + ULONG window; unsigned int message; int mask; };

1 0

Huw Davies : nsiproxy: Implement IPv6 icmpstats get_all_parameters on linux.
by Alexandre Julliard Aug. 12, 2021

Aug. 12, 2021

Module: wine Branch: master Commit: cf434fa31346d3e362b152b045986941bf8ba53f URL: https://source.winehq.org/git/wine.git/?a=commit;h=cf434fa31346d3e362b152b0… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Aug 12 10:38:15 2021 +0100 nsiproxy: Implement IPv6 icmpstats get_all_parameters on linux. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/nsi/tests/nsi.c | 1 - dlls/nsiproxy.sys/ip.c | 135 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 135 insertions(+), 1 deletion(-) diff --git a/dlls/nsi/tests/nsi.c b/dlls/nsi/tests/nsi.c index 3b1e757fa23..a21ac897e2c 100644 --- a/dlls/nsi/tests/nsi.c +++ b/dlls/nsi/tests/nsi.c @@ -456,7 +456,6 @@ static void test_ip_icmpstats( int family ) winetest_push_context( family == AF_INET ? "AF_INET" : "AF_INET6" ); err = NsiGetAllParameters( 1, mod, NSI_IP_ICMPSTATS_TABLE, NULL, 0, NULL, 0, &nsi_stats, sizeof(nsi_stats), NULL, 0 ); -todo_wine_if( family == AF_INET6) ok( !err, "got %d\n", err ); if (err) goto err; diff --git a/dlls/nsiproxy.sys/ip.c b/dlls/nsiproxy.sys/ip.c index 8b7b41a291c..ae3e23960de 100644 --- a/dlls/nsiproxy.sys/ip.c +++ b/dlls/nsiproxy.sys/ip.c @@ -355,6 +355,132 @@ static NTSTATUS ipv4_icmpstats_get_all_parameters( const void *key, DWORD key_si #endif } +static NTSTATUS ipv6_icmpstats_get_all_parameters( const void *key, DWORD key_size, void *rw_data, DWORD rw_size, + void *dynamic_data, DWORD dynamic_size, void *static_data, DWORD static_size ) +{ + struct nsi_ip_icmpstats_dynamic dyn; + + TRACE( "%p %d %p %d %p %d %p %d\n", key, key_size, rw_data, rw_size, dynamic_data, dynamic_size, + static_data, static_size ); + + memset( &dyn, 0, sizeof(dyn) ); + +#ifdef __linux__ + { + struct data + { + const char *name; + DWORD pos; + }; + static const struct data in_list[] = + { + { "Icmp6InDestUnreachs", ICMP6_DST_UNREACH }, + { "Icmp6InPktTooBigs", ICMP6_PACKET_TOO_BIG }, + { "Icmp6InTimeExcds", ICMP6_TIME_EXCEEDED }, + { "Icmp6InParmProblems", ICMP6_PARAM_PROB }, + { "Icmp6InEchos", ICMP6_ECHO_REQUEST }, + { "Icmp6InEchoReplies", ICMP6_ECHO_REPLY }, + { "Icmp6InGroupMembQueries", ICMP6_MEMBERSHIP_QUERY }, + { "Icmp6InGroupMembResponses", ICMP6_MEMBERSHIP_REPORT }, + { "Icmp6InGroupMembReductions", ICMP6_MEMBERSHIP_REDUCTION }, + { "Icmp6InRouterSolicits", ND_ROUTER_SOLICIT }, + { "Icmp6InRouterAdvertisements", ND_ROUTER_ADVERT }, + { "Icmp6InNeighborSolicits", ND_NEIGHBOR_SOLICIT }, + { "Icmp6InNeighborAdvertisements", ND_NEIGHBOR_ADVERT }, + { "Icmp6InRedirects", ND_REDIRECT }, + { "Icmp6InMLDv2Reports", ICMP6_V2_MEMBERSHIP_REPORT }, + }; + static const struct data out_list[] = + { + { "Icmp6OutDestUnreachs", ICMP6_DST_UNREACH }, + { "Icmp6OutPktTooBigs", ICMP6_PACKET_TOO_BIG }, + { "Icmp6OutTimeExcds", ICMP6_TIME_EXCEEDED }, + { "Icmp6OutParmProblems", ICMP6_PARAM_PROB }, + { "Icmp6OutEchos", ICMP6_ECHO_REQUEST }, + { "Icmp6OutEchoReplies", ICMP6_ECHO_REPLY }, + { "Icmp6OutGroupMembQueries", ICMP6_MEMBERSHIP_QUERY }, + { "Icmp6OutGroupMembResponses", ICMP6_MEMBERSHIP_REPORT }, + { "Icmp6OutGroupMembReductions", ICMP6_MEMBERSHIP_REDUCTION }, + { "Icmp6OutRouterSolicits", ND_ROUTER_SOLICIT }, + { "Icmp6OutRouterAdvertisements", ND_ROUTER_ADVERT }, + { "Icmp6OutNeighborSolicits", ND_NEIGHBOR_SOLICIT }, + { "Icmp6OutNeighborAdvertisements", ND_NEIGHBOR_ADVERT }, + { "Icmp6OutRedirects", ND_REDIRECT }, + { "Icmp6OutMLDv2Reports", ICMP6_V2_MEMBERSHIP_REPORT }, + }; + char buf[512], *ptr, *value; + DWORD res, i; + FILE *fp; + + if (!(fp = fopen( "/proc/net/snmp6", "r" ))) return STATUS_NOT_SUPPORTED; + + while ((ptr = fgets( buf, sizeof(buf), fp ))) + { + if (!(value = strchr( buf, ' ' ))) continue; + + /* terminate the valuename */ + ptr = value - 1; + *(ptr + 1) = '\0'; + + /* and strip leading spaces from value */ + value += 1; + while (*value == ' ') value++; + if ((ptr = strchr( value, '\n' ))) *ptr='\0'; + + if (!_strnicmp( buf, "Icmp6InMsgs", -1 )) + { + if (sscanf( value, "%d", &res )) dyn.in_msgs = res; + continue; + } + + if (!_strnicmp( buf, "Icmp6InErrors", -1 )) + { + if (sscanf( value, "%d", &res )) dyn.in_errors = res; + continue; + } + + for (i = 0; i < ARRAY_SIZE(in_list); i++) + { + if (!_strnicmp( buf, in_list[i].name, -1 )) + { + if (sscanf( value, "%d", &res )) + dyn.in_type_counts[in_list[i].pos] = res; + break; + } + } + + if (!_strnicmp( buf, "Icmp6OutMsgs", -1 )) + { + if (sscanf( value, "%d", &res )) dyn.out_msgs = res; + continue; + } + + if (!_strnicmp( buf, "Icmp6OutErrors", -1 )) + { + if (sscanf( value, "%d", &res )) dyn.out_errors = res; + continue; + } + + for (i = 0; i < ARRAY_SIZE(out_list); i++) + { + if (!_strnicmp( buf, out_list[i].name, -1 )) + { + if (sscanf( value, "%d", &res )) + dyn.out_type_counts[out_list[i].pos] = res; + break; + } + } + } + fclose( fp ); + if (dynamic_data) *(struct nsi_ip_icmpstats_dynamic *)dynamic_data = dyn; + return STATUS_SUCCESS; + } +#else + FIXME( "not implemented\n" ); + return STATUS_NOT_IMPLEMENTED; +#endif +} + static NTSTATUS ipv4_ipstats_get_all_parameters( const void *key, DWORD key_size, void *rw_data, DWORD rw_size, void *dynamic_data, DWORD dynamic_size, void *static_data, DWORD static_size ) { @@ -1178,6 +1304,15 @@ static struct module_table ipv6_tables[] = NULL, ipv6_cmpt_get_all_parameters, }, + { + NSI_IP_ICMPSTATS_TABLE, + { + 0, 0, + sizeof(struct nsi_ip_icmpstats_dynamic), 0 + }, + NULL, + ipv6_icmpstats_get_all_parameters, + }, { NSI_IP_IPSTATS_TABLE, {

1 0

Huw Davies : iphlpapi: Update the echo request and reply counts.
by Alexandre Julliard Aug. 12, 2021

Aug. 12, 2021

Module: wine Branch: master Commit: 2586bbb21202a3c0addfb4212464fbc69b847f31 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2586bbb21202a3c0addfb421… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Aug 12 10:38:13 2021 +0100 iphlpapi: Update the echo request and reply counts. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/ipstats.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index 8335e4871c1..7d0011a1231 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -312,7 +312,7 @@ DWORD WINAPI GetIcmpStatistics(PMIB_ICMP stats) if (!_strnicmp(buf, hdr, sizeof(hdr) - 1)) { ptr += sizeof(hdr); - sscanf( ptr, "%u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u", + sscanf( ptr, "%u %u %*u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u", &stats->stats.icmpInStats.dwMsgs, &stats->stats.icmpInStats.dwErrors, &stats->stats.icmpInStats.dwDestUnreachs, @@ -320,6 +320,7 @@ DWORD WINAPI GetIcmpStatistics(PMIB_ICMP stats) &stats->stats.icmpInStats.dwParmProbs, &stats->stats.icmpInStats.dwSrcQuenchs, &stats->stats.icmpInStats.dwRedirects, + &stats->stats.icmpInStats.dwEchos, &stats->stats.icmpInStats.dwEchoReps, &stats->stats.icmpInStats.dwTimestamps, &stats->stats.icmpInStats.dwTimestampReps, @@ -332,6 +333,7 @@ DWORD WINAPI GetIcmpStatistics(PMIB_ICMP stats) &stats->stats.icmpOutStats.dwParmProbs, &stats->stats.icmpOutStats.dwSrcQuenchs, &stats->stats.icmpOutStats.dwRedirects, + &stats->stats.icmpOutStats.dwEchos, &stats->stats.icmpOutStats.dwEchoReps, &stats->stats.icmpOutStats.dwTimestamps, &stats->stats.icmpOutStats.dwTimestampReps, @@ -594,6 +596,7 @@ DWORD WINAPI GetIcmpStatisticsEx(PMIB_ICMP_EX stats, DWORD family) stats->icmpInStats.rgdwTypeCount[ICMP4_SOURCE_QUENCH] = ipv4stats.stats.icmpInStats.dwSrcQuenchs; stats->icmpInStats.rgdwTypeCount[ICMP4_REDIRECT] = ipv4stats.stats.icmpInStats.dwRedirects; stats->icmpInStats.rgdwTypeCount[ICMP4_ECHO_REQUEST] = ipv4stats.stats.icmpInStats.dwEchos; + stats->icmpInStats.rgdwTypeCount[ICMP4_ECHO_REPLY] = ipv4stats.stats.icmpInStats.dwEchoReps; stats->icmpInStats.rgdwTypeCount[ICMP4_TIME_EXCEEDED] = ipv4stats.stats.icmpInStats.dwTimeExcds; stats->icmpInStats.rgdwTypeCount[ICMP4_PARAM_PROB] = ipv4stats.stats.icmpInStats.dwParmProbs; stats->icmpInStats.rgdwTypeCount[ICMP4_TIMESTAMP_REQUEST] = ipv4stats.stats.icmpInStats.dwTimestamps; @@ -607,6 +610,7 @@ DWORD WINAPI GetIcmpStatisticsEx(PMIB_ICMP_EX stats, DWORD family) stats->icmpOutStats.rgdwTypeCount[ICMP4_SOURCE_QUENCH] = ipv4stats.stats.icmpOutStats.dwSrcQuenchs; stats->icmpOutStats.rgdwTypeCount[ICMP4_REDIRECT] = ipv4stats.stats.icmpOutStats.dwRedirects; stats->icmpOutStats.rgdwTypeCount[ICMP4_ECHO_REQUEST] = ipv4stats.stats.icmpOutStats.dwEchos; + stats->icmpOutStats.rgdwTypeCount[ICMP4_ECHO_REPLY] = ipv4stats.stats.icmpOutStats.dwEchoReps; stats->icmpOutStats.rgdwTypeCount[ICMP4_TIME_EXCEEDED] = ipv4stats.stats.icmpOutStats.dwTimeExcds; stats->icmpOutStats.rgdwTypeCount[ICMP4_PARAM_PROB] = ipv4stats.stats.icmpOutStats.dwParmProbs; stats->icmpOutStats.rgdwTypeCount[ICMP4_TIMESTAMP_REQUEST] = ipv4stats.stats.icmpOutStats.dwTimestamps;

1 0

Rémi Bernon : winebus.sys: Return STATUS_SUCCESS from IRP_MN_SURPRISE_REMOVAL.
by Alexandre Julliard Aug. 12, 2021

Aug. 12, 2021

Module: wine Branch: master Commit: 199f689ff1e0f7c7fe318c2273aa378710a94e78 URL: https://source.winehq.org/git/wine.git/?a=commit;h=199f689ff1e0f7c7fe318c22… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Aug 12 09:46:59 2021 +0200 winebus.sys: Return STATUS_SUCCESS from IRP_MN_SURPRISE_REMOVAL. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index 23195dfa75a..713db9c7f27 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -704,6 +704,7 @@ static NTSTATUS pdo_pnp_dispatch(DEVICE_OBJECT *device, IRP *irp) remove_pending_irps(device); ext->removed = TRUE; LeaveCriticalSection(&ext->cs); + status = STATUS_SUCCESS; break; case IRP_MN_REMOVE_DEVICE:

1 0

Alexandre Julliard : netapi32: Convert the Unix library to the __wine_unix_call interface.
by Alexandre Julliard Aug. 12, 2021

Aug. 12, 2021

Module: wine Branch: master Commit: 5d869cad7ac6fa36352540adc627b3feece8310e URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d869cad7ac6fa36352540ad… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 12 16:16:36 2021 +0200 netapi32: Convert the Unix library to the __wine_unix_call interface. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/netapi32/Makefile.in | 1 + dlls/netapi32/netapi32.c | 46 +++++++----- dlls/netapi32/unixlib.c | 179 ++++++++++++---------------------------------- dlls/netapi32/unixlib.h | 55 ++++++++++++-- 4 files changed, 122 insertions(+), 159 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5d869cad7ac6fa363525…

1 0

Damjan Jovanovic : msxml3: Use XSD regex quantifier format S{0, m} instead of S{, m}.
by Alexandre Julliard Aug. 12, 2021

Aug. 12, 2021

Module: wine Branch: master Commit: 53f3cad7fbb19b489419afae4e1e73486384f98d URL: https://source.winehq.org/git/wine.git/?a=commit;h=53f3cad7fbb19b489419afae… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Wed Aug 11 07:16:53 2021 +0200 msxml3: Use XSD regex quantifier format S{0, m} instead of S{, m}. S{,m} is invalid in libxml2 2.9.11 and later, and was never valid in the XSD specification or any XML implementation tested. We should only use S{0,m} for our internal XSD schema used in XDR validation. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51358 Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/datatypes.xsd | 4 ++-- dlls/msxml3/tests/schema.c | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/msxml3/datatypes.xsd b/dlls/msxml3/datatypes.xsd index 9e0479d8ca2..ffbe0e2f858 100644 --- a/dlls/msxml3/datatypes.xsd +++ b/dlls/msxml3/datatypes.xsd @@ -200,7 +200,7 @@ </xsd:annotation> <xsd:restriction base="xsd:decimal"> - <xsd:pattern value="([0-9]{,14})([.][0-9]{,4})?"/> + <xsd:pattern value="([0-9]{0,14})([.][0-9]{0,4})?"/> </xsd:restriction> </xsd:simpleType> @@ -539,7 +539,7 @@ </xsd:annotation> <xsd:restriction base="xsd:string"> - <xsd:pattern value="([0-9A-Fa-f]{4})([-]{,1}[0-9A-Fa-f]{4})*"/> + <xsd:pattern value="([0-9A-Fa-f]{4})([-]{0,1}[0-9A-Fa-f]{4})*"/> </xsd:restriction> </xsd:simpleType> diff --git a/dlls/msxml3/tests/schema.c b/dlls/msxml3/tests/schema.c index b66be76c159..8dc9dcd7e22 100644 --- a/dlls/msxml3/tests/schema.c +++ b/dlls/msxml3/tests/schema.c @@ -1115,7 +1115,9 @@ static void test_regex(void) { L"\\~", L"~", TRUE }, { L"\\uCAFE", L"\xCAFE", TRUE }, /* non-BMP character in surrogate pairs: */ - { L"\\uD83D\\uDE00", L"\xD83D\xDE00", TRUE } + { L"\\uD83D\\uDE00", L"\xD83D\xDE00", TRUE }, + /* "x{,2}" is non-standard and only works on libxml2 <= v2.9.10 */ + { L"x{0,2}", L"x", FALSE } }; int i;

1 0