wine-devel October 2021

wine-devel@winehq.org

81 participants
772 discussions

[PATCH 2/4] nsiproxy: Use str(n)casecmp() instead of _strnicmp().
by Huw Davies 01 Oct '21

01 Oct '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/nsiproxy.sys/ip.c | 22 +++++++++++----------- dlls/nsiproxy.sys/ndis.c | 2 +- dlls/nsiproxy.sys/tcp.c | 4 ++-- dlls/nsiproxy.sys/udp.c | 6 +++--- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/dlls/nsiproxy.sys/ip.c b/dlls/nsiproxy.sys/ip.c index 12fae3f2f12..aabf82d4d86 100644 --- a/dlls/nsiproxy.sys/ip.c +++ b/dlls/nsiproxy.sys/ip.c @@ -261,10 +261,10 @@ static NTSTATUS ipv4_icmpstats_get_all_parameters( const void *key, DWORD key_si while ((ptr = fgets( buf, sizeof(buf), fp ))) { - if (_strnicmp( buf, hdr, sizeof(hdr) - 1 )) continue; + if (strncasecmp( buf, hdr, sizeof(hdr) - 1 )) continue; /* last line was a header, get another */ if (!(ptr = fgets( buf, sizeof(buf), fp ))) break; - if (!_strnicmp( buf, hdr, sizeof(hdr) - 1 )) + if (!strncasecmp( 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 %u %u %u", @@ -427,13 +427,13 @@ static NTSTATUS ipv6_icmpstats_get_all_parameters( const void *key, DWORD key_si while (*value == ' ') value++; if ((ptr = strchr( value, '\n' ))) *ptr='\0'; - if (!_strnicmp( buf, "Icmp6InMsgs", -1 )) + if (!strcasecmp( buf, "Icmp6InMsgs" )) { if (sscanf( value, "%d", &res )) dyn.in_msgs = res; continue; } - if (!_strnicmp( buf, "Icmp6InErrors", -1 )) + if (!strcasecmp( buf, "Icmp6InErrors" )) { if (sscanf( value, "%d", &res )) dyn.in_errors = res; continue; @@ -441,7 +441,7 @@ static NTSTATUS ipv6_icmpstats_get_all_parameters( const void *key, DWORD key_si for (i = 0; i < ARRAY_SIZE(in_list); i++) { - if (!_strnicmp( buf, in_list[i].name, -1 )) + if (!strcasecmp( buf, in_list[i].name )) { if (sscanf( value, "%d", &res )) dyn.in_type_counts[in_list[i].pos] = res; @@ -449,13 +449,13 @@ static NTSTATUS ipv6_icmpstats_get_all_parameters( const void *key, DWORD key_si } } - if (!_strnicmp( buf, "Icmp6OutMsgs", -1 )) + if (!strcasecmp( buf, "Icmp6OutMsgs" )) { if (sscanf( value, "%d", &res )) dyn.out_msgs = res; continue; } - if (!_strnicmp( buf, "Icmp6OutErrors", -1 )) + if (!strcasecmp( buf, "Icmp6OutErrors" )) { if (sscanf( value, "%d", &res )) dyn.out_errors = res; continue; @@ -463,7 +463,7 @@ static NTSTATUS ipv6_icmpstats_get_all_parameters( const void *key, DWORD key_si for (i = 0; i < ARRAY_SIZE(out_list); i++) { - if (!_strnicmp( buf, out_list[i].name, -1 )) + if (!strcasecmp( buf, out_list[i].name )) { if (sscanf( value, "%d", &res )) dyn.out_type_counts[out_list[i].pos] = res; @@ -504,10 +504,10 @@ static NTSTATUS ipv4_ipstats_get_all_parameters( const void *key, DWORD key_size while ((ptr = fgets( buf, sizeof(buf), fp ))) { - if (_strnicmp( buf, hdr, sizeof(hdr) - 1 )) continue; + if (strncasecmp( buf, hdr, sizeof(hdr) - 1 )) continue; /* last line was a header, get another */ if (!(ptr = fgets( buf, sizeof(buf), fp ))) break; - if (!_strnicmp( buf, hdr, sizeof(hdr) - 1 )) + if (!strncasecmp( buf, hdr, sizeof(hdr) - 1 )) { DWORD in_recv, in_hdr_errs, fwd_dgrams, in_delivers, out_reqs; ptr += sizeof(hdr); @@ -643,7 +643,7 @@ static NTSTATUS ipv6_ipstats_get_all_parameters( const void *key, DWORD key_size if ((ptr = strchr( value, '\n' ))) *ptr = '\0'; for (i = 0; i < ARRAY_SIZE(ipstatlist); i++) - if (!_strnicmp( buf, ipstatlist[i].name, -1 )) + if (!strcasecmp( buf, ipstatlist[i].name )) { if (ipstatlist[i].size == sizeof(long)) *(long *)ipstatlist[i].elem = strtoul( value, NULL, 10 ); diff --git a/dlls/nsiproxy.sys/ndis.c b/dlls/nsiproxy.sys/ndis.c index 1d0e69c593c..d75855dcf67 100644 --- a/dlls/nsiproxy.sys/ndis.c +++ b/dlls/nsiproxy.sys/ndis.c @@ -354,7 +354,7 @@ static void ifinfo_fill_dynamic( struct if_entry *entry, struct nsi_ndis_ifinfo_ while ((ptr = fgets( buf, sizeof(buf), fp ))) { while (*ptr && isspace( *ptr )) ptr++; - if (!_strnicmp( ptr, entry->if_unix_name, name_len ) && ptr[name_len] == ':') + if (!strncasecmp( ptr, entry->if_unix_name, name_len ) && ptr[name_len] == ':') { unsigned long long values[9]; ptr += name_len + 1; diff --git a/dlls/nsiproxy.sys/tcp.c b/dlls/nsiproxy.sys/tcp.c index f9ddf1a2b23..32939251dbe 100644 --- a/dlls/nsiproxy.sys/tcp.c +++ b/dlls/nsiproxy.sys/tcp.c @@ -147,10 +147,10 @@ static NTSTATUS tcp_stats_get_all_parameters( const void *key, DWORD key_size, v while ((ptr = fgets( buf, sizeof(buf), fp ))) { - if (_strnicmp( buf, hdr, sizeof(hdr) - 1 )) continue; + if (strncasecmp( buf, hdr, sizeof(hdr) - 1 )) continue; /* last line was a header, get another */ if (!(ptr = fgets( buf, sizeof(buf), fp ))) break; - if (!_strnicmp( buf, hdr, sizeof(hdr) - 1 )) + if (!strncasecmp( buf, hdr, sizeof(hdr) - 1 )) { DWORD in_segs, out_segs; ptr += sizeof(hdr); diff --git a/dlls/nsiproxy.sys/udp.c b/dlls/nsiproxy.sys/udp.c index a0ace071753..efd18392a45 100644 --- a/dlls/nsiproxy.sys/udp.c +++ b/dlls/nsiproxy.sys/udp.c @@ -123,10 +123,10 @@ static NTSTATUS udp_stats_get_all_parameters( const void *key, DWORD key_size, v while ((ptr = fgets( buf, sizeof(buf), fp ))) { - if (_strnicmp( buf, hdr, sizeof(hdr) - 1) ) continue; + if (strncasecmp( buf, hdr, sizeof(hdr) - 1 )) continue; /* last line was a header, get another */ if (!(ptr = fgets( buf, sizeof(buf), fp ))) break; - if (!_strnicmp(buf, hdr, sizeof(hdr) - 1)) + if (!strncasecmp( buf, hdr, sizeof(hdr) - 1 )) { unsigned int in_dgrams, out_dgrams; ptr += sizeof(hdr); @@ -176,7 +176,7 @@ static NTSTATUS udp_stats_get_all_parameters( const void *key, DWORD key_size, v if ((ptr = strchr( value, '\n' ))) *ptr='\0'; for (i = 0; i < ARRAY_SIZE(udp_stat_list); i++) - if (!_strnicmp( buf, udp_stat_list[i].name, -1 ) && sscanf( value, "%d", &res )) + if (!strcasecmp( buf, udp_stat_list[i].name ) && sscanf( value, "%d", &res )) *udp_stat_list[i].elem = res; } dyn.in_dgrams = in_dgrams; -- 2.25.1

2 2

[PATCH v2 4/4] nsiproxy: Build with msvcrt.
by Huw Davies 01 Oct '21

01 Oct '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/nsiproxy.sys/Makefile.in | 5 +++-- dlls/nsiproxy.sys/device.c | 30 ++++++++++++++++++++++++++---- dlls/nsiproxy.sys/ip.c | 6 ++++++ dlls/nsiproxy.sys/ndis.c | 9 +++++++-- dlls/nsiproxy.sys/nsi.c | 30 ++++++++++++++++++++++++++++++ dlls/nsiproxy.sys/tcp.c | 4 ++++ dlls/nsiproxy.sys/udp.c | 4 ++++ 7 files changed, 80 insertions(+), 8 deletions(-) diff --git a/dlls/nsiproxy.sys/Makefile.in b/dlls/nsiproxy.sys/Makefile.in index b33ea0e4c8a..95f2a205816 100644 --- a/dlls/nsiproxy.sys/Makefile.in +++ b/dlls/nsiproxy.sys/Makefile.in @@ -1,8 +1,9 @@ MODULE = nsiproxy.sys -IMPORTS = ntoskrnl uuid +UNIXLIB = nsiproxy.so +IMPORTS = ntoskrnl EXTRALIBS = $(PROCSTAT_LIBS) -EXTRADLLFLAGS = -Wl,--subsystem,native -mcygwin +EXTRADLLFLAGS = -Wl,--subsystem,native C_SRCS = \ device.c \ diff --git a/dlls/nsiproxy.sys/device.c b/dlls/nsiproxy.sys/device.c index 80a025acfc9..ee2feec96be 100644 --- a/dlls/nsiproxy.sys/device.c +++ b/dlls/nsiproxy.sys/device.c @@ -32,10 +32,24 @@ #include "netiodef.h" #include "wine/nsi.h" #include "wine/debug.h" -#include "nsiproxy_private.h" +#include "wine/unixlib.h" WINE_DEFAULT_DEBUG_CHANNEL(nsi); +static unixlib_handle_t nsiproxy_handle; + +static NTSTATUS nsiproxy_call( unsigned int code, void *args ) +{ + return __wine_unix_call( nsiproxy_handle, code, args ); +} + +enum unix_calls +{ + nsi_enumerate_all_ex, + nsi_get_all_parameters_ex, + nsi_get_parameter_ex, +}; + static void nsiproxy_enumerate_all( IRP *irp ) { IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp ); @@ -73,7 +87,7 @@ static void nsiproxy_enumerate_all( IRP *irp ) enum_all.static_size = in->static_size; enum_all.count = in->count; - irp->IoStatus.u.Status = nsi_enumerate_all_ex( &enum_all ); + irp->IoStatus.u.Status = nsiproxy_call( nsi_enumerate_all_ex, &enum_all ); if (irp->IoStatus.u.Status == STATUS_SUCCESS || irp->IoStatus.u.Status == STATUS_BUFFER_OVERFLOW) { irp->IoStatus.Information = out_len; @@ -119,7 +133,7 @@ static void nsiproxy_get_all_parameters( IRP *irp ) get_all.static_data = out + in->rw_size + in->dynamic_size; get_all.static_size = in->static_size; - irp->IoStatus.u.Status = nsi_get_all_parameters_ex( &get_all ); + irp->IoStatus.u.Status = nsiproxy_call( nsi_get_all_parameters_ex, &get_all ); irp->IoStatus.Information = (irp->IoStatus.u.Status == STATUS_SUCCESS) ? out_len : 0; } @@ -152,7 +166,7 @@ static void nsiproxy_get_parameter( IRP *irp ) get_param.data_size = out_len; get_param.data_offset = in->data_offset; - irp->IoStatus.u.Status = nsi_get_parameter_ex( &get_param ); + irp->IoStatus.u.Status = nsiproxy_call( nsi_get_parameter_ex, &get_param ); irp->IoStatus.Information = irp->IoStatus.u.Status == STATUS_SUCCESS ? out_len : 0; } @@ -215,8 +229,16 @@ static int add_device( DRIVER_OBJECT *driver ) NTSTATUS WINAPI DriverEntry( DRIVER_OBJECT *driver, UNICODE_STRING *path ) { + HMODULE instance; + NTSTATUS status; + TRACE( "(%p, %s)\n", driver, debugstr_w( path->Buffer ) ); + RtlPcToFileHeader( &DriverEntry, (void *)&instance ); + status = NtQueryVirtualMemory( GetCurrentProcess(), instance, MemoryWineUnixFuncs, + &nsiproxy_handle, sizeof(nsiproxy_handle), NULL ); + if (status) return status; + driver->MajorFunction[IRP_MJ_DEVICE_CONTROL] = nsi_ioctl; add_device( driver ); diff --git a/dlls/nsiproxy.sys/ip.c b/dlls/nsiproxy.sys/ip.c index 90ea7957204..2e69c289c16 100644 --- a/dlls/nsiproxy.sys/ip.c +++ b/dlls/nsiproxy.sys/ip.c @@ -18,6 +18,12 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#if 0 +#pragma makedep unix +#endif + +#define _NTSYSTEM_ + #include "config.h" #include <stdarg.h> diff --git a/dlls/nsiproxy.sys/ndis.c b/dlls/nsiproxy.sys/ndis.c index 90112da31bb..8971b69c2db 100644 --- a/dlls/nsiproxy.sys/ndis.c +++ b/dlls/nsiproxy.sys/ndis.c @@ -18,6 +18,10 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#if 0 +#pragma makedep unix +#endif + #include "config.h" #include <stdarg.h> @@ -85,6 +89,7 @@ #include "wine/nsi.h" #include "wine/list.h" #include "wine/debug.h" +#include "wine/unixlib.h" #include "nsiproxy_private.h" @@ -251,9 +256,9 @@ static WCHAR *strdupAtoW( const char *str ) DWORD len; if (!str) return ret; - len = MultiByteToWideChar( CP_UNIXCP, 0, str, -1, NULL, 0 ); + len = strlen( str ) + 1; ret = malloc( len * sizeof(WCHAR) ); - if (ret) MultiByteToWideChar( CP_UNIXCP, 0, str, -1, ret, len ); + if (ret) ntdll_umbstowcs( str, len, ret, len ); return ret; } diff --git a/dlls/nsiproxy.sys/nsi.c b/dlls/nsiproxy.sys/nsi.c index e29446abb50..ccfc325a085 100644 --- a/dlls/nsiproxy.sys/nsi.c +++ b/dlls/nsiproxy.sys/nsi.c @@ -17,6 +17,9 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#if 0 +#pragma makedep unix +#endif #include <stdarg.h> @@ -28,9 +31,11 @@ #include "winioctl.h" #include "ddk/wdm.h" #include "ifdef.h" +#define __WINE_INIT_NPI_MODULEID #include "netiodef.h" #include "wine/nsi.h" #include "wine/debug.h" +#include "wine/unixlib.h" #include "nsiproxy_private.h" WINE_DEFAULT_DEBUG_CHANNEL(nsi); @@ -121,3 +126,28 @@ NTSTATUS nsi_get_parameter_ex( struct nsi_get_parameter_ex *params ) return entry->get_parameter( params->key, params->key_size, params->param_type, params->data, params->data_size, params->data_offset ); } + +static NTSTATUS unix_nsi_enumerate_all_ex( void *args ) +{ + struct nsi_enumerate_all_ex *params = (struct nsi_enumerate_all_ex *)args; + return nsi_enumerate_all_ex( params ); +} + +static NTSTATUS unix_nsi_get_all_parameters_ex( void *args ) +{ + struct nsi_get_all_parameters_ex *params = (struct nsi_get_all_parameters_ex *)args; + return nsi_get_all_parameters_ex( params ); +} + +static NTSTATUS unix_nsi_get_parameter_ex( void *args ) +{ + struct nsi_get_parameter_ex *params = (struct nsi_get_parameter_ex *)args; + return nsi_get_parameter_ex( params ); +} + +const unixlib_entry_t __wine_unix_call_funcs[] = +{ + unix_nsi_enumerate_all_ex, + unix_nsi_get_all_parameters_ex, + unix_nsi_get_parameter_ex +}; diff --git a/dlls/nsiproxy.sys/tcp.c b/dlls/nsiproxy.sys/tcp.c index b60e53ea15e..55311a4affc 100644 --- a/dlls/nsiproxy.sys/tcp.c +++ b/dlls/nsiproxy.sys/tcp.c @@ -19,6 +19,10 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#if 0 +#pragma makedep unix +#endif + #include "config.h" #include <stdarg.h> diff --git a/dlls/nsiproxy.sys/udp.c b/dlls/nsiproxy.sys/udp.c index f25aac98ba0..0cc2cadbc98 100644 --- a/dlls/nsiproxy.sys/udp.c +++ b/dlls/nsiproxy.sys/udp.c @@ -18,6 +18,10 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#if 0 +#pragma makedep unix +#endif + #include "config.h" #include <stdarg.h> #include <stddef.h> -- 2.25.1

1 0

[PATCH v2 3/4] nsiproxy: Switch memory allocations to malloc().
by Huw Davies 01 Oct '21

01 Oct '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/nsiproxy.sys/ip.c | 13 ++++++------- dlls/nsiproxy.sys/ndis.c | 11 +++++------ dlls/nsiproxy.sys/tcp.c | 33 ++++++++++++++++----------------- dlls/nsiproxy.sys/udp.c | 9 ++++----- 4 files changed, 31 insertions(+), 35 deletions(-) diff --git a/dlls/nsiproxy.sys/ip.c b/dlls/nsiproxy.sys/ip.c index 7308e4a687e..90ea7957204 100644 --- a/dlls/nsiproxy.sys/ip.c +++ b/dlls/nsiproxy.sys/ip.c @@ -94,7 +94,6 @@ #include "ifdef.h" #include "ipmib.h" #include "netiodef.h" -#include "wine/heap.h" #include "wine/nsi.h" #include "wine/debug.h" @@ -933,12 +932,12 @@ static NTSTATUS ipv4_neighbour_enumerate_all( void *key_data, DWORD key_size, vo if (sysctl( mib, ARRAY_SIZE(mib), NULL, &needed, NULL, 0 ) == -1) return STATUS_NOT_SUPPORTED; - buf = heap_alloc( needed ); + buf = malloc( needed ); if (!buf) return STATUS_NO_MEMORY; if (sysctl( mib, ARRAY_SIZE(mib), buf, &needed, NULL, 0 ) == -1) { - heap_free( buf ); + free( buf ); return STATUS_NOT_SUPPORTED; } @@ -982,7 +981,7 @@ static NTSTATUS ipv4_neighbour_enumerate_all( void *key_data, DWORD key_size, vo } next += rtm->rtm_msglen; } - heap_free( buf ); + free( buf ); } #else FIXME( "not implemented\n" ); @@ -1122,12 +1121,12 @@ static NTSTATUS ipv4_forward_enumerate_all( void *key_data, DWORD key_size, void if (sysctl( mib, ARRAY_SIZE(mib), NULL, &needed, NULL, 0 ) < 0) return STATUS_NOT_SUPPORTED; - buf = heap_alloc( needed ); + buf = malloc( needed ); if (!buf) return STATUS_NO_MEMORY; if (sysctl( mib, 6, buf, &needed, NULL, 0 ) < 0) { - heap_free( buf ); + free( buf ); return STATUS_NOT_SUPPORTED; } @@ -1225,7 +1224,7 @@ static NTSTATUS ipv4_forward_enumerate_all( void *key_data, DWORD key_size, void } num++; } - HeapFree( GetProcessHeap (), 0, buf ); + free( buf ); } #else FIXME( "not implemented\n" ); diff --git a/dlls/nsiproxy.sys/ndis.c b/dlls/nsiproxy.sys/ndis.c index b46b53b536c..90112da31bb 100644 --- a/dlls/nsiproxy.sys/ndis.c +++ b/dlls/nsiproxy.sys/ndis.c @@ -84,7 +84,6 @@ #include "ddk/wdm.h" #include "wine/nsi.h" #include "wine/list.h" -#include "wine/heap.h" #include "wine/debug.h" #include "nsiproxy_private.h" @@ -253,7 +252,7 @@ static WCHAR *strdupAtoW( const char *str ) if (!str) return ret; len = MultiByteToWideChar( CP_UNIXCP, 0, str, -1, NULL, 0 ); - ret = heap_alloc( len * sizeof(WCHAR) ); + ret = malloc( len * sizeof(WCHAR) ); if (ret) MultiByteToWideChar( CP_UNIXCP, 0, str, -1, ret, len ); return ret; } @@ -264,7 +263,7 @@ static struct if_entry *add_entry( DWORD index, char *name ) int name_len = strlen( name ); if (name_len >= IFNAMSIZ - 1) return NULL; - entry = heap_alloc( sizeof(*entry) ); + entry = malloc( sizeof(*entry) ); if (!entry) return NULL; entry->if_index = index; @@ -272,7 +271,7 @@ static struct if_entry *add_entry( DWORD index, char *name ) entry->if_name = strdupAtoW( name ); if (!entry->if_name) { - heap_free( entry ); + free( entry ); return NULL; } @@ -385,7 +384,7 @@ static void ifinfo_fill_dynamic( struct if_entry *entry, struct nsi_ndis_ifinfo_ struct if_data ifdata; if (sysctl( mib, ARRAY_SIZE(mib), NULL, &needed, NULL, 0 ) == -1) goto done; - buf = heap_alloc( needed ); + buf = malloc( needed ); if (!buf) goto done; if (sysctl( mib, ARRAY_SIZE(mib), buf, &needed, NULL, 0 ) == -1) goto done; for (end = buf + needed; buf < end; buf += ifm->ifm_msglen) @@ -408,7 +407,7 @@ static void ifinfo_fill_dynamic( struct if_entry *entry, struct nsi_ndis_ifinfo_ } } done: - heap_free( buf ); + free( buf ); } #endif } diff --git a/dlls/nsiproxy.sys/tcp.c b/dlls/nsiproxy.sys/tcp.c index 6b431e93c8e..b60e53ea15e 100644 --- a/dlls/nsiproxy.sys/tcp.c +++ b/dlls/nsiproxy.sys/tcp.c @@ -97,7 +97,6 @@ #include "netiodef.h" #include "ws2ipdef.h" #include "tcpmib.h" -#include "wine/heap.h" #include "wine/nsi.h" #include "wine/debug.h" #include "wine/server.h" @@ -269,7 +268,7 @@ struct ipv6_addr_scope *get_ipv6_addr_scope_table( unsigned int *size ) { if (!table_size) table_size = 4; else table_size *= 2; - if (!(table = heap_realloc( table, table_size * sizeof(table[0]) ))) + if (!(table = realloc( table, table_size * sizeof(table[0]) ))) { fclose( fp ); goto failed; @@ -301,7 +300,7 @@ struct ipv6_addr_scope *get_ipv6_addr_scope_table( unsigned int *size ) { if (!table_size) table_size = 4; else table_size *= 2; - if (!(table = heap_realloc( table, table_size * sizeof(table[0]) ))) + if (!(table = realloc( table, table_size * sizeof(table[0]) ))) { freeifaddrs( addrs ); goto failed; @@ -325,7 +324,7 @@ struct ipv6_addr_scope *get_ipv6_addr_scope_table( unsigned int *size ) return table; failed: - heap_free( table ); + free( table ); return NULL; } @@ -356,7 +355,7 @@ struct pid_map *get_pid_map( unsigned int *num_entries ) NTSTATUS ret; char *buffer = NULL, *new_buffer; - if (!(buffer = heap_alloc( buffer_len ))) return NULL; + if (!(buffer = malloc( buffer_len ))) return NULL; for (;;) { @@ -371,17 +370,17 @@ struct pid_map *get_pid_map( unsigned int *num_entries ) if (ret != STATUS_INFO_LENGTH_MISMATCH) break; - if (!(new_buffer = heap_realloc( buffer, buffer_len ))) + if (!(new_buffer = realloc( buffer, buffer_len ))) { - heap_free( buffer ); + free( buffer ); return NULL; } buffer = new_buffer; } - if (!(map = heap_alloc( process_count * sizeof(*map) ))) + if (!(map = malloc( process_count * sizeof(*map) ))) { - heap_free( buffer ); + free( buffer ); return NULL; } @@ -400,7 +399,7 @@ struct pid_map *get_pid_map( unsigned int *num_entries ) pos += process->thread_count * sizeof(struct thread_info); } - heap_free( buffer ); + free( buffer ); *num_entries = process_count; return map; } @@ -495,7 +494,7 @@ unsigned int find_owning_pid( struct pid_map *map, unsigned int num_entries, UIN int fd_len = proc_pidinfo( map[i].unix_pid, PROC_PIDLISTFDS, 0, NULL, 0 ); if (fd_len <= 0) continue; - fds = heap_alloc( fd_len ); + fds = malloc( fd_len ); if (!fds) continue; proc_pidinfo( map[i].unix_pid, PROC_PIDLISTFDS, 0, fds, fd_len ); @@ -507,12 +506,12 @@ unsigned int find_owning_pid( struct pid_map *map, unsigned int num_entries, UIN proc_pidfdinfo( map[i].unix_pid, fds[j].proc_fd, PROC_PIDFDSOCKETINFO, &sock, sizeof(sock) ); if (sock.psi.soi_pcb == inode) { - heap_free( fds ); + free( fds ); return map[i].pid; } } - heap_free( fds ); + free( fds ); } return 0; #else @@ -638,7 +637,7 @@ static NTSTATUS tcp_conns_enumerate_all( DWORD filter, struct nsi_tcp_conn_key * goto err; } - buf = heap_alloc( len ); + buf = malloc( len ); if (!buf) { status = STATUS_NO_MEMORY; @@ -728,7 +727,7 @@ static NTSTATUS tcp_conns_enumerate_all( DWORD filter, struct nsi_tcp_conn_key * num++; } err: - heap_free( buf ); + free( buf ); } #else FIXME( "not implemented\n" ); @@ -738,8 +737,8 @@ static NTSTATUS tcp_conns_enumerate_all( DWORD filter, struct nsi_tcp_conn_key * if (!want_data || num <= *count) *count = num; else status = STATUS_BUFFER_OVERFLOW; - heap_free( pid_map ); - heap_free( addr_scopes ); + free( pid_map ); + free( addr_scopes ); return status; } diff --git a/dlls/nsiproxy.sys/udp.c b/dlls/nsiproxy.sys/udp.c index c2dcc2c38e8..f25aac98ba0 100644 --- a/dlls/nsiproxy.sys/udp.c +++ b/dlls/nsiproxy.sys/udp.c @@ -77,7 +77,6 @@ #include "netiodef.h" #include "ws2ipdef.h" #include "udpmib.h" -#include "wine/heap.h" #include "wine/nsi.h" #include "wine/debug.h" #include "wine/server.h" @@ -309,7 +308,7 @@ static NTSTATUS udp_endpoint_enumerate_all( void *key_data, DWORD key_size, void goto err; } - buf = heap_alloc( len ); + buf = malloc( len ); if (!buf) { status = STATUS_NO_MEMORY; @@ -386,7 +385,7 @@ static NTSTATUS udp_endpoint_enumerate_all( void *key_data, DWORD key_size, void num++; } err: - heap_free( buf ); + free( buf ); } #else FIXME( "not implemented\n" ); @@ -396,8 +395,8 @@ static NTSTATUS udp_endpoint_enumerate_all( void *key_data, DWORD key_size, void if (!want_data || num <= *count) *count = num; else status = STATUS_BUFFER_OVERFLOW; - heap_free( pid_map ); - heap_free( addr_scopes ); + free( pid_map ); + free( addr_scopes ); return status; } -- 2.25.1

1 0

[PATCH v2 2/4] nsiproxy: Use an ascii version of str(n)casecmp() instead of _strnicmp().
by Huw Davies 01 Oct '21

01 Oct '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/nsiproxy.sys/ip.c | 22 +++++++++++----------- dlls/nsiproxy.sys/ndis.c | 2 +- dlls/nsiproxy.sys/nsiproxy_private.h | 21 +++++++++++++++++++++ dlls/nsiproxy.sys/tcp.c | 4 ++-- dlls/nsiproxy.sys/udp.c | 6 +++--- 5 files changed, 38 insertions(+), 17 deletions(-) diff --git a/dlls/nsiproxy.sys/ip.c b/dlls/nsiproxy.sys/ip.c index 12fae3f2f12..7308e4a687e 100644 --- a/dlls/nsiproxy.sys/ip.c +++ b/dlls/nsiproxy.sys/ip.c @@ -261,10 +261,10 @@ static NTSTATUS ipv4_icmpstats_get_all_parameters( const void *key, DWORD key_si while ((ptr = fgets( buf, sizeof(buf), fp ))) { - if (_strnicmp( buf, hdr, sizeof(hdr) - 1 )) continue; + if (ascii_strncasecmp( buf, hdr, sizeof(hdr) - 1 )) continue; /* last line was a header, get another */ if (!(ptr = fgets( buf, sizeof(buf), fp ))) break; - if (!_strnicmp( buf, hdr, sizeof(hdr) - 1 )) + if (!ascii_strncasecmp( 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 %u %u %u", @@ -427,13 +427,13 @@ static NTSTATUS ipv6_icmpstats_get_all_parameters( const void *key, DWORD key_si while (*value == ' ') value++; if ((ptr = strchr( value, '\n' ))) *ptr='\0'; - if (!_strnicmp( buf, "Icmp6InMsgs", -1 )) + if (!ascii_strcasecmp( buf, "Icmp6InMsgs" )) { if (sscanf( value, "%d", &res )) dyn.in_msgs = res; continue; } - if (!_strnicmp( buf, "Icmp6InErrors", -1 )) + if (!ascii_strcasecmp( buf, "Icmp6InErrors" )) { if (sscanf( value, "%d", &res )) dyn.in_errors = res; continue; @@ -441,7 +441,7 @@ static NTSTATUS ipv6_icmpstats_get_all_parameters( const void *key, DWORD key_si for (i = 0; i < ARRAY_SIZE(in_list); i++) { - if (!_strnicmp( buf, in_list[i].name, -1 )) + if (!ascii_strcasecmp( buf, in_list[i].name )) { if (sscanf( value, "%d", &res )) dyn.in_type_counts[in_list[i].pos] = res; @@ -449,13 +449,13 @@ static NTSTATUS ipv6_icmpstats_get_all_parameters( const void *key, DWORD key_si } } - if (!_strnicmp( buf, "Icmp6OutMsgs", -1 )) + if (!ascii_strcasecmp( buf, "Icmp6OutMsgs" )) { if (sscanf( value, "%d", &res )) dyn.out_msgs = res; continue; } - if (!_strnicmp( buf, "Icmp6OutErrors", -1 )) + if (!ascii_strcasecmp( buf, "Icmp6OutErrors" )) { if (sscanf( value, "%d", &res )) dyn.out_errors = res; continue; @@ -463,7 +463,7 @@ static NTSTATUS ipv6_icmpstats_get_all_parameters( const void *key, DWORD key_si for (i = 0; i < ARRAY_SIZE(out_list); i++) { - if (!_strnicmp( buf, out_list[i].name, -1 )) + if (!ascii_strcasecmp( buf, out_list[i].name )) { if (sscanf( value, "%d", &res )) dyn.out_type_counts[out_list[i].pos] = res; @@ -504,10 +504,10 @@ static NTSTATUS ipv4_ipstats_get_all_parameters( const void *key, DWORD key_size while ((ptr = fgets( buf, sizeof(buf), fp ))) { - if (_strnicmp( buf, hdr, sizeof(hdr) - 1 )) continue; + if (ascii_strncasecmp( buf, hdr, sizeof(hdr) - 1 )) continue; /* last line was a header, get another */ if (!(ptr = fgets( buf, sizeof(buf), fp ))) break; - if (!_strnicmp( buf, hdr, sizeof(hdr) - 1 )) + if (!ascii_strncasecmp( buf, hdr, sizeof(hdr) - 1 )) { DWORD in_recv, in_hdr_errs, fwd_dgrams, in_delivers, out_reqs; ptr += sizeof(hdr); @@ -643,7 +643,7 @@ static NTSTATUS ipv6_ipstats_get_all_parameters( const void *key, DWORD key_size if ((ptr = strchr( value, '\n' ))) *ptr = '\0'; for (i = 0; i < ARRAY_SIZE(ipstatlist); i++) - if (!_strnicmp( buf, ipstatlist[i].name, -1 )) + if (!ascii_strcasecmp( buf, ipstatlist[i].name )) { if (ipstatlist[i].size == sizeof(long)) *(long *)ipstatlist[i].elem = strtoul( value, NULL, 10 ); diff --git a/dlls/nsiproxy.sys/ndis.c b/dlls/nsiproxy.sys/ndis.c index 1d0e69c593c..b46b53b536c 100644 --- a/dlls/nsiproxy.sys/ndis.c +++ b/dlls/nsiproxy.sys/ndis.c @@ -354,7 +354,7 @@ static void ifinfo_fill_dynamic( struct if_entry *entry, struct nsi_ndis_ifinfo_ while ((ptr = fgets( buf, sizeof(buf), fp ))) { while (*ptr && isspace( *ptr )) ptr++; - if (!_strnicmp( ptr, entry->if_unix_name, name_len ) && ptr[name_len] == ':') + if (!ascii_strncasecmp( ptr, entry->if_unix_name, name_len ) && ptr[name_len] == ':') { unsigned long long values[9]; ptr += name_len + 1; diff --git a/dlls/nsiproxy.sys/nsiproxy_private.h b/dlls/nsiproxy.sys/nsiproxy_private.h index 7dd8748e3f7..acc60ce4806 100644 --- a/dlls/nsiproxy.sys/nsiproxy_private.h +++ b/dlls/nsiproxy.sys/nsiproxy_private.h @@ -135,3 +135,24 @@ extern const struct module ipv4_module DECLSPEC_HIDDEN; extern const struct module ipv6_module DECLSPEC_HIDDEN; extern const struct module tcp_module DECLSPEC_HIDDEN; extern const struct module udp_module DECLSPEC_HIDDEN; + +static inline int ascii_strncasecmp( const char *s1, const char *s2, size_t n ) +{ + int l1, l2; + + while (n--) + { + l1 = (unsigned char)((*s1 >= 'A' && *s1 <= 'Z') ? *s1 + ('a' - 'A') : *s1); + l2 = (unsigned char)((*s2 >= 'A' && *s2 <= 'Z') ? *s2 + ('a' - 'A') : *s2); + if (l1 != l2) return l1 - l2; + if (!l1) return 0; + s1++; + s2++; + } + return 0; +} + +static inline int ascii_strcasecmp( const char *s1, const char *s2 ) +{ + return ascii_strncasecmp( s1, s2, -1 ); +} diff --git a/dlls/nsiproxy.sys/tcp.c b/dlls/nsiproxy.sys/tcp.c index f9ddf1a2b23..6b431e93c8e 100644 --- a/dlls/nsiproxy.sys/tcp.c +++ b/dlls/nsiproxy.sys/tcp.c @@ -147,10 +147,10 @@ static NTSTATUS tcp_stats_get_all_parameters( const void *key, DWORD key_size, v while ((ptr = fgets( buf, sizeof(buf), fp ))) { - if (_strnicmp( buf, hdr, sizeof(hdr) - 1 )) continue; + if (ascii_strncasecmp( buf, hdr, sizeof(hdr) - 1 )) continue; /* last line was a header, get another */ if (!(ptr = fgets( buf, sizeof(buf), fp ))) break; - if (!_strnicmp( buf, hdr, sizeof(hdr) - 1 )) + if (!ascii_strncasecmp( buf, hdr, sizeof(hdr) - 1 )) { DWORD in_segs, out_segs; ptr += sizeof(hdr); diff --git a/dlls/nsiproxy.sys/udp.c b/dlls/nsiproxy.sys/udp.c index a0ace071753..c2dcc2c38e8 100644 --- a/dlls/nsiproxy.sys/udp.c +++ b/dlls/nsiproxy.sys/udp.c @@ -123,10 +123,10 @@ static NTSTATUS udp_stats_get_all_parameters( const void *key, DWORD key_size, v while ((ptr = fgets( buf, sizeof(buf), fp ))) { - if (_strnicmp( buf, hdr, sizeof(hdr) - 1) ) continue; + if (ascii_strncasecmp( buf, hdr, sizeof(hdr) - 1 )) continue; /* last line was a header, get another */ if (!(ptr = fgets( buf, sizeof(buf), fp ))) break; - if (!_strnicmp(buf, hdr, sizeof(hdr) - 1)) + if (!ascii_strncasecmp( buf, hdr, sizeof(hdr) - 1 )) { unsigned int in_dgrams, out_dgrams; ptr += sizeof(hdr); @@ -176,7 +176,7 @@ static NTSTATUS udp_stats_get_all_parameters( const void *key, DWORD key_size, v if ((ptr = strchr( value, '\n' ))) *ptr='\0'; for (i = 0; i < ARRAY_SIZE(udp_stat_list); i++) - if (!_strnicmp( buf, udp_stat_list[i].name, -1 ) && sscanf( value, "%d", &res )) + if (!ascii_strcasecmp( buf, udp_stat_list[i].name ) && sscanf( value, "%d", &res )) *udp_stat_list[i].elem = res; } dyn.in_dgrams = in_dgrams; -- 2.25.1

1 0

[PATCH v2 1/4] nsiproxy: Use a pthread_mutex to guard the interface list.
by Huw Davies 01 Oct '21

01 Oct '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/nsiproxy.sys/ndis.c | 36 +++++++++++++++--------------------- 1 file changed, 15 insertions(+), 21 deletions(-) diff --git a/dlls/nsiproxy.sys/ndis.c b/dlls/nsiproxy.sys/ndis.c index bf237ea16db..1d0e69c593c 100644 --- a/dlls/nsiproxy.sys/ndis.c +++ b/dlls/nsiproxy.sys/ndis.c @@ -66,6 +66,8 @@ #include <net/if_types.h> #endif +#include <pthread.h> + #define NONAMELESSUNION #include "ntstatus.h" #define WIN32_NO_STATUS @@ -102,15 +104,7 @@ struct if_entry }; static struct list if_list = LIST_INIT( if_list ); - -static CRITICAL_SECTION if_list_cs; -static CRITICAL_SECTION_DEBUG if_list_cs_debug = -{ - 0, 0, &if_list_cs, - { &if_list_cs_debug.ProcessLocksList, &if_list_cs_debug.ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": if_list_cs") } -}; -static CRITICAL_SECTION if_list_cs = { &if_list_cs_debug, -1, 0, 0, 0, 0 }; +static pthread_mutex_t if_list_lock = PTHREAD_MUTEX_INITIALIZER; static struct if_entry *find_entry_from_index( DWORD index ) { @@ -468,7 +462,7 @@ static NTSTATUS ifinfo_enumerate_all( void *key_data, DWORD key_size, void *rw_d TRACE( "%p %d %p %d %p %d %p %d %p\n", key_data, key_size, rw_data, rw_size, dynamic_data, dynamic_size, static_data, static_size, count ); - EnterCriticalSection( &if_list_cs ); + pthread_mutex_lock( &if_list_lock ); update_if_table(); @@ -485,7 +479,7 @@ static NTSTATUS ifinfo_enumerate_all( void *key_data, DWORD key_size, void *rw_d num++; } - LeaveCriticalSection( &if_list_cs ); + pthread_mutex_unlock( &if_list_lock ); if (!want_data || num <= *count) *count = num; else status = STATUS_BUFFER_OVERFLOW; @@ -503,7 +497,7 @@ static NTSTATUS ifinfo_get_all_parameters( const void *key, DWORD key_size, void 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 ); - EnterCriticalSection( &if_list_cs ); + pthread_mutex_lock( &if_list_lock ); update_if_table(); @@ -514,7 +508,7 @@ static NTSTATUS ifinfo_get_all_parameters( const void *key, DWORD key_size, void status = STATUS_SUCCESS; } - LeaveCriticalSection( &if_list_cs ); + pthread_mutex_unlock( &if_list_lock ); return status; } @@ -565,7 +559,7 @@ static NTSTATUS ifinfo_get_parameter( const void *key, DWORD key_size, DWORD par TRACE( "%p %d %d %p %d %d\n", key, key_size, param_type, data, data_size, data_offset ); - EnterCriticalSection( &if_list_cs ); + pthread_mutex_lock( &if_list_lock ); update_if_table(); @@ -583,7 +577,7 @@ static NTSTATUS ifinfo_get_parameter( const void *key, DWORD key_size, DWORD par } } - LeaveCriticalSection( &if_list_cs ); + pthread_mutex_unlock( &if_list_lock ); return status; } @@ -599,7 +593,7 @@ static NTSTATUS index_luid_get_parameter( const void *key, DWORD key_size, DWORD if (param_type != NSI_PARAM_TYPE_STATIC || data_size != sizeof(NET_LUID) || data_offset != 0) return STATUS_INVALID_PARAMETER; - EnterCriticalSection( &if_list_cs ); + pthread_mutex_lock( &if_list_lock ); update_if_table(); @@ -609,7 +603,7 @@ static NTSTATUS index_luid_get_parameter( const void *key, DWORD key_size, DWORD *(NET_LUID *)data = entry->if_luid; status = STATUS_SUCCESS; } - LeaveCriticalSection( &if_list_cs ); + pthread_mutex_unlock( &if_list_lock ); return status; } @@ -618,7 +612,7 @@ BOOL convert_unix_name_to_luid( const char *unix_name, NET_LUID *luid ) struct if_entry *entry; BOOL ret = FALSE; - EnterCriticalSection( &if_list_cs ); + pthread_mutex_lock( &if_list_lock ); update_if_table(); @@ -629,7 +623,7 @@ BOOL convert_unix_name_to_luid( const char *unix_name, NET_LUID *luid ) ret = TRUE; break; } - LeaveCriticalSection( &if_list_cs ); + pthread_mutex_unlock( &if_list_lock ); return ret; } @@ -639,7 +633,7 @@ BOOL convert_luid_to_unix_name( const NET_LUID *luid, const char **unix_name ) struct if_entry *entry; BOOL ret = FALSE; - EnterCriticalSection( &if_list_cs ); + pthread_mutex_lock( &if_list_lock ); update_if_table(); @@ -650,7 +644,7 @@ BOOL convert_luid_to_unix_name( const NET_LUID *luid, const char **unix_name ) ret = TRUE; } - LeaveCriticalSection( &if_list_cs ); + pthread_mutex_unlock( &if_list_lock ); return ret; } -- 2.25.1

1 0

[PATCH] po: Update Finnish translation.
by Lauri Kenttä 01 Oct '21

01 Oct '21

Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> --- po/fi.po | 222 +++++++++++++++++-------------------------------------- 1 file changed, 66 insertions(+), 156 deletions(-) diff --git a/po/fi.po b/po/fi.po index 6349aa70e7b..05288ee3542 100644 --- a/po/fi.po +++ b/po/fi.po @@ -3702,30 +3702,24 @@ msgid "&Disable" msgstr "&Poista käytöstä" #: dlls/joy.cpl/joy.rc:41 -#, fuzzy -#| msgid "Reset" msgid "&Reset" -msgstr "Nollaa" +msgstr "&Nollaa" #: dlls/joy.cpl/joy.rc:42 msgid "&Enable" -msgstr "&Ota käyttöön" +msgstr "&Käytä" #: dlls/joy.cpl/joy.rc:43 -#, fuzzy -#| msgid "Edit Override" msgid "&Override" -msgstr "Muokkaa ohitusta" +msgstr "&Ohita" #: dlls/joy.cpl/joy.rc:44 msgid "Connected" msgstr "Yhdistetty" #: dlls/joy.cpl/joy.rc:46 -#, fuzzy -#| msgid "Voice input device:" msgid "Connected (xinput device)" -msgstr "Äänen sisääntulolaite:" +msgstr "Liitetty (xinput-laite)" #: dlls/joy.cpl/joy.rc:48 msgid "Disabled" @@ -10346,13 +10340,11 @@ msgstr "" #: dlls/tzres/tzres.rc:390 dlls/tzres/tzres.rc:391 msgid "UTC+12" -msgstr "" +msgstr "UTC+12" #: dlls/tzres/tzres.rc:392 -#, fuzzy -#| msgid "Coordinated Universal Time" msgid "(UTC+12:00) Coordinated Universal Time+12" -msgstr "UTC-aika" +msgstr "(UTC+12:00) Koordinoitu yleisaika +12" #: dlls/tzres/tzres.rc:252 msgid "Nepal Standard Time" @@ -10388,7 +10380,7 @@ msgstr "Haitin kesäaika" #: dlls/tzres/tzres.rc:185 msgid "(UTC-05:00) Haiti" -msgstr "" +msgstr "(UTC-05:00) Haiti" #: dlls/tzres/tzres.rc:111 msgid "Central European Standard Time" @@ -10416,25 +10408,19 @@ msgstr "" #: dlls/tzres/tzres.rc:399 dlls/tzres/tzres.rc:400 msgid "UTC-08" -msgstr "" +msgstr "UTC-08" #: dlls/tzres/tzres.rc:401 -#, fuzzy -#| msgid "Coordinated Universal Time" msgid "(UTC-08:00) Coordinated Universal Time-08" -msgstr "UTC-aika" +msgstr "(UTC-08:00) Koordinoitu yleisaika -08" #: dlls/tzres/tzres.rc:39 -#, fuzzy -#| msgid "Atlantic Standard Time" msgid "Altai Standard Time" -msgstr "Atlantin normaaliaika" +msgstr "Altain normaaliaika" #: dlls/tzres/tzres.rc:40 -#, fuzzy -#| msgid "Atlantic Daylight Time" msgid "Altai Daylight Time" -msgstr "Atlantin kesäaika" +msgstr "Altain kesäaika" #: dlls/tzres/tzres.rc:41 msgid "(UTC+07:00) Barnaul, Gorno-Altaysk" @@ -10473,26 +10459,20 @@ msgid "Saint Pierre Daylight Time" msgstr "Saint-Pierren kesäaika" #: dlls/tzres/tzres.rc:320 -#, fuzzy -#| msgid "Saint Pierre Standard Time" msgid "(UTC-03:00) Saint Pierre and Miquelon" -msgstr "Saint-Pierren normaaliaika" +msgstr "(UTC-03:00) Saint-Pierre ja Miquelon" #: dlls/tzres/tzres.rc:327 -#, fuzzy -#| msgid "Samoa Standard Time" msgid "Sao Tome Standard Time" -msgstr "Samoan normaaliaika" +msgstr "Sao Tomen normaaliaika" #: dlls/tzres/tzres.rc:328 -#, fuzzy -#| msgid "Samoa Daylight Time" msgid "Sao Tome Daylight Time" -msgstr "Samoan kesäaika" +msgstr "Sao Tomen kesäaika" #: dlls/tzres/tzres.rc:329 msgid "(UTC+00:00) Sao Tome" -msgstr "" +msgstr "(UTC+00:00) Sao Tome" #: dlls/tzres/tzres.rc:249 msgid "Namibia Standard Time" @@ -10580,13 +10560,11 @@ msgstr "" #: dlls/tzres/tzres.rc:393 dlls/tzres/tzres.rc:394 msgid "UTC+13" -msgstr "" +msgstr "UTC+13" #: dlls/tzres/tzres.rc:395 -#, fuzzy -#| msgid "Coordinated Universal Time" msgid "(UTC+13:00) Coordinated Universal Time+13" -msgstr "UTC-aika" +msgstr "(UTC+13:00) Koordinoitu yleisaika +13" #: dlls/tzres/tzres.rc:216 msgid "Magadan Standard Time" @@ -10613,16 +10591,12 @@ msgid "(UTC-03:30) Newfoundland" msgstr "" #: dlls/tzres/tzres.rc:345 -#, fuzzy -#| msgid "Jordan Standard Time" msgid "Sudan Standard Time" -msgstr "Jordanian normaaliaika" +msgstr "Sudanin normaaliaika" #: dlls/tzres/tzres.rc:346 -#, fuzzy -#| msgid "Jordan Daylight Time" msgid "Sudan Daylight Time" -msgstr "Jordanian kesäaika" +msgstr "Sudanin kesäaika" #: dlls/tzres/tzres.rc:347 msgid "(UTC+02:00) Khartoum" @@ -10793,16 +10767,12 @@ msgid "(UTC+04:00) Izhevsk, Samara" msgstr "" #: dlls/tzres/tzres.rc:414 -#, fuzzy -#| msgid "Tonga Standard Time" msgid "Volgograd Standard Time" -msgstr "Tongan normaaliaika" +msgstr "Volgogradin normaaliaika" #: dlls/tzres/tzres.rc:415 -#, fuzzy -#| msgid "Tonga Daylight Time" msgid "Volgograd Daylight Time" -msgstr "Tongan kesäaika" +msgstr "Volgogradin kesäaika" #: dlls/tzres/tzres.rc:416 msgid "(UTC+04:00) Volgograd" @@ -10834,13 +10804,11 @@ msgstr "" #: dlls/tzres/tzres.rc:405 dlls/tzres/tzres.rc:406 msgid "UTC-11" -msgstr "" +msgstr "UTC-11" #: dlls/tzres/tzres.rc:407 -#, fuzzy -#| msgid "Coordinated Universal Time" msgid "(UTC-11:00) Coordinated Universal Time-11" -msgstr "UTC-aika" +msgstr "(UTC-11:00) Koordinoitu yleisaika -11" #: dlls/tzres/tzres.rc:51 msgid "Argentina Standard Time" @@ -10855,20 +10823,16 @@ msgid "(UTC-03:00) City of Buenos Aires" msgstr "" #: dlls/tzres/tzres.rc:375 -#, fuzzy -#| msgid "Turkey Standard Time" msgid "Turks And Caicos Standard Time" -msgstr "Turkin normaaliaika" +msgstr "Turks- ja Caicossaarten normaaliaika" #: dlls/tzres/tzres.rc:376 -#, fuzzy -#| msgid "Turkey Daylight Time" msgid "Turks And Caicos Daylight Time" -msgstr "Turkin kesäaika" +msgstr "Turks- ja Caicossaarten kesäaika" #: dlls/tzres/tzres.rc:377 msgid "(UTC-05:00) Turks and Caicos" -msgstr "" +msgstr "(UTC-05:00) Turks- ja Caicossaaret" #: dlls/tzres/tzres.rc:222 msgid "Marquesas Standard Time" @@ -10896,13 +10860,11 @@ msgstr "" #: dlls/tzres/tzres.rc:387 dlls/tzres/tzres.rc:388 msgid "Coordinated Universal Time" -msgstr "UTC-aika" +msgstr "Koordinoitu yleisaika" #: dlls/tzres/tzres.rc:389 -#, fuzzy -#| msgid "Coordinated Universal Time" msgid "(UTC) Coordinated Universal Time" -msgstr "UTC-aika" +msgstr "(UTC) Koordinoitu yleisaika" #: dlls/tzres/tzres.rc:189 msgid "India Standard Time" @@ -10941,20 +10903,16 @@ msgid "(UTC+03:00) Istanbul" msgstr "" #: dlls/tzres/tzres.rc:54 -#, fuzzy -#| msgid "Arabian Standard Time" msgid "Astrakhan Standard Time" -msgstr "Arabian normaaliaika" +msgstr "Astrahanin normaaliaika" #: dlls/tzres/tzres.rc:55 -#, fuzzy -#| msgid "Arabian Daylight Time" msgid "Astrakhan Daylight Time" -msgstr "Arabian kesäaika" +msgstr "Astrahanin kesäaika" #: dlls/tzres/tzres.rc:56 msgid "(UTC+04:00) Astrakhan, Ulyanovsk" -msgstr "" +msgstr "(UTC+04:00) Astrahan, Uljanovsk" #: dlls/tzres/tzres.rc:162 msgid "Fiji Standard Time" @@ -10966,7 +10924,7 @@ msgstr "Fidžin kesäaika" #: dlls/tzres/tzres.rc:164 msgid "(UTC+12:00) Fiji" -msgstr "" +msgstr "(UTC+12:00) Fidži" #: dlls/tzres/tzres.rc:87 msgid "Canada Central Standard Time" @@ -10981,20 +10939,16 @@ msgid "(UTC-06:00) Saskatchewan" msgstr "" #: dlls/tzres/tzres.rc:441 -#, fuzzy -#| msgid "Yakutsk Standard Time" msgid "Yukon Standard Time" -msgstr "Jakutskin normaaliaika" +msgstr "Yukonin normaaliaika" #: dlls/tzres/tzres.rc:442 -#, fuzzy -#| msgid "Yakutsk Daylight Time" msgid "Yukon Daylight Time" -msgstr "Jakutskin kesäaika" +msgstr "Yukonin kesäaika" #: dlls/tzres/tzres.rc:443 msgid "(UTC-07:00) Yukon" -msgstr "" +msgstr "(UTC-07:00) Yukon" #: dlls/tzres/tzres.rc:351 msgid "Taipei Standard Time" @@ -11045,20 +10999,16 @@ msgid "(UTC+05:00) Islamabad, Karachi" msgstr "" #: dlls/tzres/tzres.rc:363 -#, fuzzy -#| msgid "Tokyo Standard Time" msgid "Tomsk Standard Time" -msgstr "Tokion normaaliaika" +msgstr "Tomskin normaaliaika" #: dlls/tzres/tzres.rc:364 -#, fuzzy -#| msgid "Tokyo Daylight Time" msgid "Tomsk Daylight Time" -msgstr "Tokion kesäaika" +msgstr "Tomskin kesäaika" #: dlls/tzres/tzres.rc:365 msgid "(UTC+07:00) Tomsk" -msgstr "" +msgstr "(UTC+07:00) Tomsk" #: dlls/tzres/tzres.rc:93 msgid "Caucasus Standard Time" @@ -11070,7 +11020,7 @@ msgstr "Kaukasuksen kesäaika" #: dlls/tzres/tzres.rc:95 msgid "(UTC+04:00) Yerevan" -msgstr "" +msgstr "(UTC+04:00) Jerevan" #: dlls/tzres/tzres.rc:66 msgid "AUS Eastern Standard Time" @@ -11109,32 +11059,24 @@ msgid "(UTC-05:00) Eastern Time (US & Canada)" msgstr "" #: dlls/tzres/tzres.rc:369 -#, fuzzy -#| msgid "Tasmania Standard Time" msgid "Transbaikal Standard Time" -msgstr "Tasmanian normaaliaika" +msgstr "Taka-Baikalian normaaliaika" #: dlls/tzres/tzres.rc:370 -#, fuzzy -#| msgid "Tasmania Daylight Time" msgid "Transbaikal Daylight Time" -msgstr "Tasmanian kesäaika" +msgstr "Taka-Baikalian kesäaika" #: dlls/tzres/tzres.rc:371 msgid "(UTC+09:00) Chita" -msgstr "" +msgstr "(UTC+09:00) Tšita" #: dlls/tzres/tzres.rc:141 -#, fuzzy -#| msgid "W. Europe Standard Time" msgid "E. Europe Standard Time" -msgstr "Länsi-Euroopan normaaliaika" +msgstr "Itä-Euroopan normaaliaika" #: dlls/tzres/tzres.rc:142 -#, fuzzy -#| msgid "W. Europe Daylight Time" msgid "E. Europe Daylight Time" -msgstr "Länsi-Euroopan kesäaika" +msgstr "Itä-Euroopan kesäaika" #: dlls/tzres/tzres.rc:143 msgid "(UTC+02:00) Chisinau" @@ -11153,16 +11095,12 @@ msgid "(UTC-06:00) Guadalajara, Mexico City, Monterrey" msgstr "" #: dlls/tzres/tzres.rc:330 -#, fuzzy -#| msgid "Samoa Standard Time" msgid "Saratov Standard Time" -msgstr "Samoan normaaliaika" +msgstr "Saratovin normaaliaika" #: dlls/tzres/tzres.rc:331 -#, fuzzy -#| msgid "Samoa Daylight Time" msgid "Saratov Daylight Time" -msgstr "Samoan kesäaika" +msgstr "Saratovin kesäaika" #: dlls/tzres/tzres.rc:332 msgid "(UTC+04:00) Saratov" @@ -11205,20 +11143,16 @@ msgid "(UTC-05:00) Indiana (East)" msgstr "" #: dlls/tzres/tzres.rc:321 -#, fuzzy -#| msgid "Alaskan Standard Time" msgid "Sakhalin Standard Time" -msgstr "Alaskan normaaliaika" +msgstr "Sahalinin normaaliaika" #: dlls/tzres/tzres.rc:322 -#, fuzzy -#| msgid "Alaskan Daylight Time" msgid "Sakhalin Daylight Time" -msgstr "Alaskan kesäaika" +msgstr "Sahalinin kesäaika" #: dlls/tzres/tzres.rc:323 msgid "(UTC+11:00) Sakhalin" -msgstr "" +msgstr "(UTC+11:00) Sahalin" #: dlls/tzres/tzres.rc:270 msgid "North Korea Standard Time" @@ -11258,13 +11192,11 @@ msgstr "" #: dlls/tzres/tzres.rc:396 dlls/tzres/tzres.rc:397 msgid "UTC-02" -msgstr "" +msgstr "UTC-02" #: dlls/tzres/tzres.rc:398 -#, fuzzy -#| msgid "Coordinated Universal Time" msgid "(UTC-02:00) Coordinated Universal Time-02" -msgstr "UTC-aika" +msgstr "(UTC-02:00) Koordinoitu yleisaika -02" #: dlls/tzres/tzres.rc:384 msgid "US Mountain Standard Time" @@ -11304,13 +11236,11 @@ msgstr "" #: dlls/tzres/tzres.rc:402 dlls/tzres/tzres.rc:403 msgid "UTC-09" -msgstr "" +msgstr "UTC-09" #: dlls/tzres/tzres.rc:404 -#, fuzzy -#| msgid "Coordinated Universal Time" msgid "(UTC-09:00) Coordinated Universal Time-09" -msgstr "UTC-aika" +msgstr "(UTC-09:00) Koordinoitu yleisaika -09" #: dlls/tzres/tzres.rc:342 msgid "Sri Lanka Standard Time" @@ -11453,16 +11383,12 @@ msgid "(UTC+12:00) Anadyr, Petropavlovsk-Kamchatsky" msgstr "" #: dlls/tzres/tzres.rc:432 -#, fuzzy -#| msgid "West Asia Standard Time" msgid "West Bank Standard Time" -msgstr "Länsi-Aasian normaaliaika" +msgstr "Länsirannikon normaaliaika" #: dlls/tzres/tzres.rc:433 -#, fuzzy -#| msgid "West Asia Daylight Time" msgid "West Bank Daylight Time" -msgstr "Länsi-Aasian kesäaika" +msgstr "Länsirannikon kesäaika" #: dlls/tzres/tzres.rc:434 msgid "(UTC+02:00) Gaza, Hebron" @@ -11517,20 +11443,16 @@ msgid "(UTC+08:00) Ulaanbaatar" msgstr "" #: dlls/tzres/tzres.rc:261 -#, fuzzy -#| msgid "Morocco Standard Time" msgid "Norfolk Standard Time" -msgstr "Marokon normaaliaika" +msgstr "Norfolkinsaaren normaaliaika" #: dlls/tzres/tzres.rc:262 -#, fuzzy -#| msgid "Morocco Daylight Time" msgid "Norfolk Daylight Time" -msgstr "Marokon kesäaika" +msgstr "Norfolkinsaaren kesäaika" #: dlls/tzres/tzres.rc:263 msgid "(UTC+11:00) Norfolk Island" -msgstr "" +msgstr "(UTC+11:00) Norfolkinsaari" #: dlls/tzres/tzres.rc:195 msgid "Israel Standard Time" @@ -11689,32 +11611,24 @@ msgid "(UTC+07:00) Bangkok, Hanoi, Jakarta" msgstr "" #: dlls/tzres/tzres.rc:291 -#, fuzzy -#| msgid "Jordan Standard Time" msgid "Qyzylorda Standard Time" -msgstr "Jordanian normaaliaika" +msgstr "Qızılordan normaaliaika" #: dlls/tzres/tzres.rc:292 -#, fuzzy -#| msgid "Jordan Daylight Time" msgid "Qyzylorda Daylight Time" -msgstr "Jordanian kesäaika" +msgstr "Qızılordan kesäaika" #: dlls/tzres/tzres.rc:293 msgid "(UTC+05:00) Qyzylorda" -msgstr "" +msgstr "(UTC+05:00) Qızılorda" #: dlls/tzres/tzres.rc:426 -#, fuzzy -#| msgid "Tonga Standard Time" msgid "W. Mongolia Standard Time" -msgstr "Tongan normaaliaika" +msgstr "Länsi-Mongolian normaaliaika" #: dlls/tzres/tzres.rc:427 -#, fuzzy -#| msgid "Tonga Daylight Time" msgid "W. Mongolia Daylight Time" -msgstr "Tongan kesäaika" +msgstr "Länsi-Mongolian kesäaika" #: dlls/tzres/tzres.rc:428 msgid "(UTC+07:00) Hovd" @@ -11745,20 +11659,16 @@ msgid "(UTC-10:00) Aleutian Islands" msgstr "" #: dlls/tzres/tzres.rc:273 -#, fuzzy -#| msgid "Yakutsk Standard Time" msgid "Omsk Standard Time" -msgstr "Jakutskin normaaliaika" +msgstr "Omskin normaaliaika" #: dlls/tzres/tzres.rc:274 -#, fuzzy -#| msgid "Yakutsk Daylight Time" msgid "Omsk Daylight Time" -msgstr "Jakutskin kesäaika" +msgstr "Omskin kesäaika" #: dlls/tzres/tzres.rc:275 msgid "(UTC+06:00) Omsk" -msgstr "" +msgstr "(UTC+06:00) Omsk" #: dlls/tzres/tzres.rc:105 msgid "Central Brazilian Standard Time" -- 2.33.0

1 0

[PATCH 4/4] nsiproxy: Build with msvcrt.
by Huw Davies 01 Oct '21

01 Oct '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/nsiproxy.sys/Makefile.in | 5 +++-- dlls/nsiproxy.sys/device.c | 30 ++++++++++++++++++++++++++---- dlls/nsiproxy.sys/ip.c | 6 ++++++ dlls/nsiproxy.sys/ndis.c | 9 +++++++-- dlls/nsiproxy.sys/nsi.c | 30 ++++++++++++++++++++++++++++++ dlls/nsiproxy.sys/tcp.c | 4 ++++ dlls/nsiproxy.sys/udp.c | 4 ++++ 7 files changed, 80 insertions(+), 8 deletions(-) diff --git a/dlls/nsiproxy.sys/Makefile.in b/dlls/nsiproxy.sys/Makefile.in index b33ea0e4c8a..95f2a205816 100644 --- a/dlls/nsiproxy.sys/Makefile.in +++ b/dlls/nsiproxy.sys/Makefile.in @@ -1,8 +1,9 @@ MODULE = nsiproxy.sys -IMPORTS = ntoskrnl uuid +UNIXLIB = nsiproxy.so +IMPORTS = ntoskrnl EXTRALIBS = $(PROCSTAT_LIBS) -EXTRADLLFLAGS = -Wl,--subsystem,native -mcygwin +EXTRADLLFLAGS = -Wl,--subsystem,native C_SRCS = \ device.c \ diff --git a/dlls/nsiproxy.sys/device.c b/dlls/nsiproxy.sys/device.c index 80a025acfc9..ee2feec96be 100644 --- a/dlls/nsiproxy.sys/device.c +++ b/dlls/nsiproxy.sys/device.c @@ -32,10 +32,24 @@ #include "netiodef.h" #include "wine/nsi.h" #include "wine/debug.h" -#include "nsiproxy_private.h" +#include "wine/unixlib.h" WINE_DEFAULT_DEBUG_CHANNEL(nsi); +static unixlib_handle_t nsiproxy_handle; + +static NTSTATUS nsiproxy_call( unsigned int code, void *args ) +{ + return __wine_unix_call( nsiproxy_handle, code, args ); +} + +enum unix_calls +{ + nsi_enumerate_all_ex, + nsi_get_all_parameters_ex, + nsi_get_parameter_ex, +}; + static void nsiproxy_enumerate_all( IRP *irp ) { IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp ); @@ -73,7 +87,7 @@ static void nsiproxy_enumerate_all( IRP *irp ) enum_all.static_size = in->static_size; enum_all.count = in->count; - irp->IoStatus.u.Status = nsi_enumerate_all_ex( &enum_all ); + irp->IoStatus.u.Status = nsiproxy_call( nsi_enumerate_all_ex, &enum_all ); if (irp->IoStatus.u.Status == STATUS_SUCCESS || irp->IoStatus.u.Status == STATUS_BUFFER_OVERFLOW) { irp->IoStatus.Information = out_len; @@ -119,7 +133,7 @@ static void nsiproxy_get_all_parameters( IRP *irp ) get_all.static_data = out + in->rw_size + in->dynamic_size; get_all.static_size = in->static_size; - irp->IoStatus.u.Status = nsi_get_all_parameters_ex( &get_all ); + irp->IoStatus.u.Status = nsiproxy_call( nsi_get_all_parameters_ex, &get_all ); irp->IoStatus.Information = (irp->IoStatus.u.Status == STATUS_SUCCESS) ? out_len : 0; } @@ -152,7 +166,7 @@ static void nsiproxy_get_parameter( IRP *irp ) get_param.data_size = out_len; get_param.data_offset = in->data_offset; - irp->IoStatus.u.Status = nsi_get_parameter_ex( &get_param ); + irp->IoStatus.u.Status = nsiproxy_call( nsi_get_parameter_ex, &get_param ); irp->IoStatus.Information = irp->IoStatus.u.Status == STATUS_SUCCESS ? out_len : 0; } @@ -215,8 +229,16 @@ static int add_device( DRIVER_OBJECT *driver ) NTSTATUS WINAPI DriverEntry( DRIVER_OBJECT *driver, UNICODE_STRING *path ) { + HMODULE instance; + NTSTATUS status; + TRACE( "(%p, %s)\n", driver, debugstr_w( path->Buffer ) ); + RtlPcToFileHeader( &DriverEntry, (void *)&instance ); + status = NtQueryVirtualMemory( GetCurrentProcess(), instance, MemoryWineUnixFuncs, + &nsiproxy_handle, sizeof(nsiproxy_handle), NULL ); + if (status) return status; + driver->MajorFunction[IRP_MJ_DEVICE_CONTROL] = nsi_ioctl; add_device( driver ); diff --git a/dlls/nsiproxy.sys/ip.c b/dlls/nsiproxy.sys/ip.c index fe2bf29d7aa..7d734567c5b 100644 --- a/dlls/nsiproxy.sys/ip.c +++ b/dlls/nsiproxy.sys/ip.c @@ -18,6 +18,12 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#if 0 +#pragma makedep unix +#endif + +#define _NTSYSTEM_ + #include "config.h" #include <stdarg.h> diff --git a/dlls/nsiproxy.sys/ndis.c b/dlls/nsiproxy.sys/ndis.c index 73159a89805..7de343f00fe 100644 --- a/dlls/nsiproxy.sys/ndis.c +++ b/dlls/nsiproxy.sys/ndis.c @@ -18,6 +18,10 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#if 0 +#pragma makedep unix +#endif + #include "config.h" #include <stdarg.h> @@ -85,6 +89,7 @@ #include "wine/nsi.h" #include "wine/list.h" #include "wine/debug.h" +#include "wine/unixlib.h" #include "nsiproxy_private.h" @@ -251,9 +256,9 @@ static WCHAR *strdupAtoW( const char *str ) DWORD len; if (!str) return ret; - len = MultiByteToWideChar( CP_UNIXCP, 0, str, -1, NULL, 0 ); + len = strlen( str ) + 1; ret = malloc( len * sizeof(WCHAR) ); - if (ret) MultiByteToWideChar( CP_UNIXCP, 0, str, -1, ret, len ); + if (ret) ntdll_umbstowcs( str, len, ret, len ); return ret; } diff --git a/dlls/nsiproxy.sys/nsi.c b/dlls/nsiproxy.sys/nsi.c index e29446abb50..ccfc325a085 100644 --- a/dlls/nsiproxy.sys/nsi.c +++ b/dlls/nsiproxy.sys/nsi.c @@ -17,6 +17,9 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#if 0 +#pragma makedep unix +#endif #include <stdarg.h> @@ -28,9 +31,11 @@ #include "winioctl.h" #include "ddk/wdm.h" #include "ifdef.h" +#define __WINE_INIT_NPI_MODULEID #include "netiodef.h" #include "wine/nsi.h" #include "wine/debug.h" +#include "wine/unixlib.h" #include "nsiproxy_private.h" WINE_DEFAULT_DEBUG_CHANNEL(nsi); @@ -121,3 +126,28 @@ NTSTATUS nsi_get_parameter_ex( struct nsi_get_parameter_ex *params ) return entry->get_parameter( params->key, params->key_size, params->param_type, params->data, params->data_size, params->data_offset ); } + +static NTSTATUS unix_nsi_enumerate_all_ex( void *args ) +{ + struct nsi_enumerate_all_ex *params = (struct nsi_enumerate_all_ex *)args; + return nsi_enumerate_all_ex( params ); +} + +static NTSTATUS unix_nsi_get_all_parameters_ex( void *args ) +{ + struct nsi_get_all_parameters_ex *params = (struct nsi_get_all_parameters_ex *)args; + return nsi_get_all_parameters_ex( params ); +} + +static NTSTATUS unix_nsi_get_parameter_ex( void *args ) +{ + struct nsi_get_parameter_ex *params = (struct nsi_get_parameter_ex *)args; + return nsi_get_parameter_ex( params ); +} + +const unixlib_entry_t __wine_unix_call_funcs[] = +{ + unix_nsi_enumerate_all_ex, + unix_nsi_get_all_parameters_ex, + unix_nsi_get_parameter_ex +}; diff --git a/dlls/nsiproxy.sys/tcp.c b/dlls/nsiproxy.sys/tcp.c index fcb57a5e6b2..f98ae3955b8 100644 --- a/dlls/nsiproxy.sys/tcp.c +++ b/dlls/nsiproxy.sys/tcp.c @@ -19,6 +19,10 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#if 0 +#pragma makedep unix +#endif + #include "config.h" #include <stdarg.h> diff --git a/dlls/nsiproxy.sys/udp.c b/dlls/nsiproxy.sys/udp.c index 87a4d487e0a..1c42912655e 100644 --- a/dlls/nsiproxy.sys/udp.c +++ b/dlls/nsiproxy.sys/udp.c @@ -18,6 +18,10 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#if 0 +#pragma makedep unix +#endif + #include "config.h" #include <stdarg.h> #include <stddef.h> -- 2.25.1

1 0

[PATCH 3/4] nsiproxy: Switch memory allocations to malloc().
by Huw Davies 01 Oct '21

01 Oct '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/nsiproxy.sys/ip.c | 13 ++++++------- dlls/nsiproxy.sys/ndis.c | 11 +++++------ dlls/nsiproxy.sys/tcp.c | 33 ++++++++++++++++----------------- dlls/nsiproxy.sys/udp.c | 9 ++++----- 4 files changed, 31 insertions(+), 35 deletions(-) diff --git a/dlls/nsiproxy.sys/ip.c b/dlls/nsiproxy.sys/ip.c index aabf82d4d86..fe2bf29d7aa 100644 --- a/dlls/nsiproxy.sys/ip.c +++ b/dlls/nsiproxy.sys/ip.c @@ -94,7 +94,6 @@ #include "ifdef.h" #include "ipmib.h" #include "netiodef.h" -#include "wine/heap.h" #include "wine/nsi.h" #include "wine/debug.h" @@ -933,12 +932,12 @@ static NTSTATUS ipv4_neighbour_enumerate_all( void *key_data, DWORD key_size, vo if (sysctl( mib, ARRAY_SIZE(mib), NULL, &needed, NULL, 0 ) == -1) return STATUS_NOT_SUPPORTED; - buf = heap_alloc( needed ); + buf = malloc( needed ); if (!buf) return STATUS_NO_MEMORY; if (sysctl( mib, ARRAY_SIZE(mib), buf, &needed, NULL, 0 ) == -1) { - heap_free( buf ); + free( buf ); return STATUS_NOT_SUPPORTED; } @@ -982,7 +981,7 @@ static NTSTATUS ipv4_neighbour_enumerate_all( void *key_data, DWORD key_size, vo } next += rtm->rtm_msglen; } - heap_free( buf ); + free( buf ); } #else FIXME( "not implemented\n" ); @@ -1122,12 +1121,12 @@ static NTSTATUS ipv4_forward_enumerate_all( void *key_data, DWORD key_size, void if (sysctl( mib, ARRAY_SIZE(mib), NULL, &needed, NULL, 0 ) < 0) return STATUS_NOT_SUPPORTED; - buf = heap_alloc( needed ); + buf = malloc( needed ); if (!buf) return STATUS_NO_MEMORY; if (sysctl( mib, 6, buf, &needed, NULL, 0 ) < 0) { - heap_free( buf ); + free( buf ); return STATUS_NOT_SUPPORTED; } @@ -1225,7 +1224,7 @@ static NTSTATUS ipv4_forward_enumerate_all( void *key_data, DWORD key_size, void } num++; } - HeapFree( GetProcessHeap (), 0, buf ); + free( buf ); } #else FIXME( "not implemented\n" ); diff --git a/dlls/nsiproxy.sys/ndis.c b/dlls/nsiproxy.sys/ndis.c index d75855dcf67..73159a89805 100644 --- a/dlls/nsiproxy.sys/ndis.c +++ b/dlls/nsiproxy.sys/ndis.c @@ -84,7 +84,6 @@ #include "ddk/wdm.h" #include "wine/nsi.h" #include "wine/list.h" -#include "wine/heap.h" #include "wine/debug.h" #include "nsiproxy_private.h" @@ -253,7 +252,7 @@ static WCHAR *strdupAtoW( const char *str ) if (!str) return ret; len = MultiByteToWideChar( CP_UNIXCP, 0, str, -1, NULL, 0 ); - ret = heap_alloc( len * sizeof(WCHAR) ); + ret = malloc( len * sizeof(WCHAR) ); if (ret) MultiByteToWideChar( CP_UNIXCP, 0, str, -1, ret, len ); return ret; } @@ -264,7 +263,7 @@ static struct if_entry *add_entry( DWORD index, char *name ) int name_len = strlen( name ); if (name_len >= IFNAMSIZ - 1) return NULL; - entry = heap_alloc( sizeof(*entry) ); + entry = malloc( sizeof(*entry) ); if (!entry) return NULL; entry->if_index = index; @@ -272,7 +271,7 @@ static struct if_entry *add_entry( DWORD index, char *name ) entry->if_name = strdupAtoW( name ); if (!entry->if_name) { - heap_free( entry ); + free( entry ); return NULL; } @@ -385,7 +384,7 @@ static void ifinfo_fill_dynamic( struct if_entry *entry, struct nsi_ndis_ifinfo_ struct if_data ifdata; if (sysctl( mib, ARRAY_SIZE(mib), NULL, &needed, NULL, 0 ) == -1) goto done; - buf = heap_alloc( needed ); + buf = malloc( needed ); if (!buf) goto done; if (sysctl( mib, ARRAY_SIZE(mib), buf, &needed, NULL, 0 ) == -1) goto done; for (end = buf + needed; buf < end; buf += ifm->ifm_msglen) @@ -408,7 +407,7 @@ static void ifinfo_fill_dynamic( struct if_entry *entry, struct nsi_ndis_ifinfo_ } } done: - heap_free( buf ); + free( buf ); } #endif } diff --git a/dlls/nsiproxy.sys/tcp.c b/dlls/nsiproxy.sys/tcp.c index 32939251dbe..fcb57a5e6b2 100644 --- a/dlls/nsiproxy.sys/tcp.c +++ b/dlls/nsiproxy.sys/tcp.c @@ -97,7 +97,6 @@ #include "netiodef.h" #include "ws2ipdef.h" #include "tcpmib.h" -#include "wine/heap.h" #include "wine/nsi.h" #include "wine/debug.h" #include "wine/server.h" @@ -269,7 +268,7 @@ struct ipv6_addr_scope *get_ipv6_addr_scope_table( unsigned int *size ) { if (!table_size) table_size = 4; else table_size *= 2; - if (!(table = heap_realloc( table, table_size * sizeof(table[0]) ))) + if (!(table = realloc( table, table_size * sizeof(table[0]) ))) { fclose( fp ); goto failed; @@ -301,7 +300,7 @@ struct ipv6_addr_scope *get_ipv6_addr_scope_table( unsigned int *size ) { if (!table_size) table_size = 4; else table_size *= 2; - if (!(table = heap_realloc( table, table_size * sizeof(table[0]) ))) + if (!(table = realloc( table, table_size * sizeof(table[0]) ))) { freeifaddrs( addrs ); goto failed; @@ -325,7 +324,7 @@ struct ipv6_addr_scope *get_ipv6_addr_scope_table( unsigned int *size ) return table; failed: - heap_free( table ); + free( table ); return NULL; } @@ -356,7 +355,7 @@ struct pid_map *get_pid_map( unsigned int *num_entries ) NTSTATUS ret; char *buffer = NULL, *new_buffer; - if (!(buffer = heap_alloc( buffer_len ))) return NULL; + if (!(buffer = malloc( buffer_len ))) return NULL; for (;;) { @@ -371,17 +370,17 @@ struct pid_map *get_pid_map( unsigned int *num_entries ) if (ret != STATUS_INFO_LENGTH_MISMATCH) break; - if (!(new_buffer = heap_realloc( buffer, buffer_len ))) + if (!(new_buffer = realloc( buffer, buffer_len ))) { - heap_free( buffer ); + free( buffer ); return NULL; } buffer = new_buffer; } - if (!(map = heap_alloc( process_count * sizeof(*map) ))) + if (!(map = malloc( process_count * sizeof(*map) ))) { - heap_free( buffer ); + free( buffer ); return NULL; } @@ -400,7 +399,7 @@ struct pid_map *get_pid_map( unsigned int *num_entries ) pos += process->thread_count * sizeof(struct thread_info); } - heap_free( buffer ); + free( buffer ); *num_entries = process_count; return map; } @@ -495,7 +494,7 @@ unsigned int find_owning_pid( struct pid_map *map, unsigned int num_entries, UIN int fd_len = proc_pidinfo( map[i].unix_pid, PROC_PIDLISTFDS, 0, NULL, 0 ); if (fd_len <= 0) continue; - fds = heap_alloc( fd_len ); + fds = malloc( fd_len ); if (!fds) continue; proc_pidinfo( map[i].unix_pid, PROC_PIDLISTFDS, 0, fds, fd_len ); @@ -507,12 +506,12 @@ unsigned int find_owning_pid( struct pid_map *map, unsigned int num_entries, UIN proc_pidfdinfo( map[i].unix_pid, fds[j].proc_fd, PROC_PIDFDSOCKETINFO, &sock, sizeof(sock) ); if (sock.psi.soi_pcb == inode) { - heap_free( fds ); + free( fds ); return map[i].pid; } } - heap_free( fds ); + free( fds ); } return 0; #else @@ -638,7 +637,7 @@ static NTSTATUS tcp_conns_enumerate_all( DWORD filter, struct nsi_tcp_conn_key * goto err; } - buf = heap_alloc( len ); + buf = malloc( len ); if (!buf) { status = STATUS_NO_MEMORY; @@ -728,7 +727,7 @@ static NTSTATUS tcp_conns_enumerate_all( DWORD filter, struct nsi_tcp_conn_key * num++; } err: - heap_free( buf ); + free( buf ); } #else FIXME( "not implemented\n" ); @@ -738,8 +737,8 @@ static NTSTATUS tcp_conns_enumerate_all( DWORD filter, struct nsi_tcp_conn_key * if (!want_data || num <= *count) *count = num; else status = STATUS_BUFFER_OVERFLOW; - heap_free( pid_map ); - heap_free( addr_scopes ); + free( pid_map ); + free( addr_scopes ); return status; } diff --git a/dlls/nsiproxy.sys/udp.c b/dlls/nsiproxy.sys/udp.c index efd18392a45..87a4d487e0a 100644 --- a/dlls/nsiproxy.sys/udp.c +++ b/dlls/nsiproxy.sys/udp.c @@ -77,7 +77,6 @@ #include "netiodef.h" #include "ws2ipdef.h" #include "udpmib.h" -#include "wine/heap.h" #include "wine/nsi.h" #include "wine/debug.h" #include "wine/server.h" @@ -309,7 +308,7 @@ static NTSTATUS udp_endpoint_enumerate_all( void *key_data, DWORD key_size, void goto err; } - buf = heap_alloc( len ); + buf = malloc( len ); if (!buf) { status = STATUS_NO_MEMORY; @@ -386,7 +385,7 @@ static NTSTATUS udp_endpoint_enumerate_all( void *key_data, DWORD key_size, void num++; } err: - heap_free( buf ); + free( buf ); } #else FIXME( "not implemented\n" ); @@ -396,8 +395,8 @@ static NTSTATUS udp_endpoint_enumerate_all( void *key_data, DWORD key_size, void if (!want_data || num <= *count) *count = num; else status = STATUS_BUFFER_OVERFLOW; - heap_free( pid_map ); - heap_free( addr_scopes ); + free( pid_map ); + free( addr_scopes ); return status; } -- 2.25.1

1 0

[PATCH 1/4] nsiproxy: Use a pthread_mutex to guard the interface list.
by Huw Davies 01 Oct '21

01 Oct '21

1 0

[PATCH v2 3/3] gdi32: Use NtAllocateVirtualMemory to allocate GDI_SHARED_MEMORY.
by Jacek Caban 01 Oct '21

01 Oct '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/gdiobj.c | 35 ++++++++++++++++++++++------------- 1 file changed, 22 insertions(+), 13 deletions(-)

2 1

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-devel October 2021