wine-commits August 2021

wine-commits@winehq.org

1 participants
1051 discussions

Huw Davies : iphlpapi: Remove no longer needed libraries.
by Alexandre Julliard 19 Aug '21

19 Aug '21

Module: wine Branch: master Commit: e39d5967c74868d1f05b3bde20fbb2c31ad5a5a8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e39d5967c74868d1f05b3bde… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Aug 19 08:53:45 2021 +0100 iphlpapi: Remove no longer needed libraries. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/Makefile.in | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/iphlpapi/Makefile.in b/dlls/iphlpapi/Makefile.in index 326cf8bf75e..9d7345251bd 100644 --- a/dlls/iphlpapi/Makefile.in +++ b/dlls/iphlpapi/Makefile.in @@ -1,7 +1,6 @@ MODULE = iphlpapi.dll IMPORTLIB = iphlpapi IMPORTS = advapi32 dnsapi nsi uuid -EXTRALIBS = $(KSTAT_LIBS) $(PROCSTAT_LIBS) C_SRCS = \ icmp.c \

1 0

Huw Davies : iphlpapi: Use the ANSI codepage for the convert interface name functions.
by Alexandre Julliard 19 Aug '21

19 Aug '21

Module: wine Branch: master Commit: 7992178df58830aa998da58a41df7fcf001fd3fb URL: https://source.winehq.org/git/wine.git/?a=commit;h=7992178df58830aa998da58a… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Aug 19 08:53:44 2021 +0100 iphlpapi: Use the ANSI codepage for the convert interface name functions. The name in these functions is now not the Unix interface name. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/iphlpapi_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index ff6b858d48b..408ac14bd1b 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -4265,7 +4265,7 @@ DWORD WINAPI ConvertInterfaceLuidToNameA(const NET_LUID *luid, char *name, SIZE_ err = ConvertInterfaceLuidToNameW( luid, nameW, ARRAY_SIZE(nameW) ); if (err) return err; - if (!WideCharToMultiByte( CP_UNIXCP, 0, nameW, -1, name, len, NULL, NULL )) + if (!WideCharToMultiByte( CP_ACP, 0, nameW, -1, name, len, NULL, NULL )) err = GetLastError(); return err; } @@ -4340,7 +4340,7 @@ DWORD WINAPI ConvertInterfaceNameToLuidA(const char *name, NET_LUID *luid) TRACE( "(%s %p)\n", debugstr_a(name), luid ); if (!name) return ERROR_INVALID_NAME; - if (!MultiByteToWideChar( CP_UNIXCP, 0, name, -1, nameW, ARRAY_SIZE(nameW) )) + if (!MultiByteToWideChar( CP_ACP, 0, name, -1, nameW, ARRAY_SIZE(nameW) )) return GetLastError(); return ConvertInterfaceNameToLuidW( nameW, luid );

1 0

Huw Davies : iphlpapi: Implement GetAdapterIndex() by parsing the GUID from the name.
by Alexandre Julliard 19 Aug '21

19 Aug '21

Module: wine Branch: master Commit: 502fd1a4baee3a16d5102b53eedc9b07e3ad5a20 URL: https://source.winehq.org/git/wine.git/?a=commit;h=502fd1a4baee3a16d5102b53… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Aug 19 08:53:43 2021 +0100 iphlpapi: Implement GetAdapterIndex() by parsing the GUID from the name. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/iphlpapi_main.c | 35 +++++++++++------------------------ 1 file changed, 11 insertions(+), 24 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index ab72f766e97..ff6b858d48b 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -69,7 +69,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(iphlpapi); static const WCHAR device_tcpip[] = {'\\','D','E','V','I','C','E','\\','T','C','P','I','P','_',0}; -DWORD WINAPI AllocateAndGetIfTableFromStack( MIB_IFTABLE **table, BOOL sort, HANDLE heap, DWORD flags ); DWORD WINAPI AllocateAndGetIpAddrTableFromStack( MIB_IPADDRTABLE **table, BOOL sort, HANDLE heap, DWORD flags ); static const NPI_MODULEID *ip_module_id( USHORT family ) @@ -533,10 +532,10 @@ DWORD WINAPI FlushIpNetTable(DWORD dwIfIndex) * ptr [In] pointer to the buffer to free * */ -void WINAPI FreeMibTable(void *ptr) +void WINAPI FreeMibTable( void *ptr ) { - TRACE("(%p)\n", ptr); - HeapFree(GetProcessHeap(), 0, ptr); + TRACE( "(%p)\n", ptr ); + heap_free( ptr ); } /****************************************************************** @@ -547,33 +546,21 @@ void WINAPI FreeMibTable(void *ptr) * PARAMS * adapter_name [In] unicode string with the adapter name * index [Out] returns found interface index - * - * RETURNS - * Success: NO_ERROR - * Failure: error code from winerror.h */ DWORD WINAPI GetAdapterIndex( WCHAR *adapter_name, ULONG *index ) { - MIB_IFTABLE *if_table; - DWORD err, i; + NET_LUID luid; + GUID guid; + DWORD err; TRACE( "name %s, index %p\n", debugstr_w( adapter_name ), index ); - err = AllocateAndGetIfTableFromStack( &if_table, 0, GetProcessHeap(), 0 ); + if (strlenW( adapter_name ) < strlenW( device_tcpip )) return ERROR_INVALID_PARAMETER; + err = ConvertStringToGuidW( adapter_name + strlenW( device_tcpip ), &guid ); if (err) return err; - - err = ERROR_INVALID_PARAMETER; - for (i = 0; i < if_table->dwNumEntries; i++) - { - if (!strcmpW( adapter_name, if_table->table[i].wszName )) - { - *index = if_table->table[i].dwIndex; - err = ERROR_SUCCESS; - break; - } - } - heap_free( if_table ); - return err; + err = ConvertInterfaceGuidToLuid( &guid, &luid ); + if (err) return err; + return ConvertInterfaceLuidToIndex( &luid, index ); } static DWORD get_wins_servers( SOCKADDR_INET **servers )

1 0

Huw Davies : iphlpapi: Don't enumerate loopback interfaces in GetInterfaceInfo().
by Alexandre Julliard 19 Aug '21

19 Aug '21

Module: wine Branch: master Commit: 8d7720b0ed39aa628afc7073df65a64e49c27078 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8d7720b0ed39aa628afc7073… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Aug 19 08:53:42 2021 +0100 iphlpapi: Don't enumerate loopback interfaces in GetInterfaceInfo(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/iphlpapi_main.c | 2 ++ dlls/iphlpapi/tests/iphlpapi.c | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 494df48752b..ab72f766e97 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -1936,6 +1936,7 @@ DWORD WINAPI GetInterfaceInfo( IP_INTERFACE_INFO *table, ULONG *size ) for (i = 0; i < count; i++) { + if (stat[i].type == IF_TYPE_SOFTWARE_LOOPBACK) continue; num++; } @@ -1952,6 +1953,7 @@ DWORD WINAPI GetInterfaceInfo( IP_INTERFACE_INFO *table, ULONG *size ) { IP_ADAPTER_INDEX_MAP *row; + if (stat[i].type == IF_TYPE_SOFTWARE_LOOPBACK) continue; row = table->Adapter + num++; row->Index = stat[i].if_index; memcpy( row->Name, device_tcpip, sizeof(device_tcpip) ); diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 5ec2f2eaba2..d1881616d30 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -1109,7 +1109,6 @@ static void testGetInterfaceInfo(void) GetIfEntry( &row ); ok( !wcscmp( buf->Adapter[i].Name, row.wszName ), "got %s vs %s\n", debugstr_w( buf->Adapter[i].Name ), debugstr_w( row.wszName ) ); -todo_wine_if( row.dwType == IF_TYPE_SOFTWARE_LOOPBACK) ok( row.dwType != IF_TYPE_SOFTWARE_LOOPBACK, "got loopback\n" ); } HeapFree(GetProcessHeap(), 0, buf);

1 0

Huw Davies : iphlpapi: Implement GetInterfaceInfo() on top of nsi.
by Alexandre Julliard 19 Aug '21

19 Aug '21

Module: wine Branch: master Commit: 203350e0307beee55479e857771e9ece29b3c401 URL: https://source.winehq.org/git/wine.git/?a=commit;h=203350e0307beee55479e857… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Aug 19 08:53:41 2021 +0100 iphlpapi: Implement GetInterfaceInfo() 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 | 49 +++++++++++++++++++++++++++---------------- 1 file changed, 31 insertions(+), 18 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 8a8b6b3e7cf..494df48752b 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -67,6 +67,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(iphlpapi); #define CHARS_IN_GUID 39 +static const WCHAR device_tcpip[] = {'\\','D','E','V','I','C','E','\\','T','C','P','I','P','_',0}; + DWORD WINAPI AllocateAndGetIfTableFromStack( MIB_IFTABLE **table, BOOL sort, HANDLE heap, DWORD flags ); DWORD WINAPI AllocateAndGetIpAddrTableFromStack( MIB_IPADDRTABLE **table, BOOL sort, HANDLE heap, DWORD flags ); @@ -1573,10 +1575,8 @@ DWORD WINAPI GetIcmpStatisticsEx( MIB_ICMP_EX *stats, DWORD family ) static void if_row_fill( MIB_IFROW *row, struct nsi_ndis_ifinfo_rw *rw, struct nsi_ndis_ifinfo_dynamic *dyn, struct nsi_ndis_ifinfo_static *stat ) { - static const WCHAR name_prefix[] = {'\\','D','E','V','I','C','E','\\','T','C','P','I','P','_',0}; - - memcpy( row->wszName, name_prefix, sizeof(name_prefix) ); - ConvertGuidToStringW( &stat->if_guid, row->wszName + ARRAY_SIZE(name_prefix) - 1, CHARS_IN_GUID ); + memcpy( row->wszName, device_tcpip, sizeof(device_tcpip) ); + ConvertGuidToStringW( &stat->if_guid, row->wszName + ARRAY_SIZE(device_tcpip) - 1, CHARS_IN_GUID ); row->dwIndex = stat->if_index; row->dwType = stat->type; row->dwMtu = dyn->mtu; @@ -1922,31 +1922,44 @@ DWORD WINAPI GetIfTable2( MIB_IF_TABLE2 **table ) */ DWORD WINAPI GetInterfaceInfo( IP_INTERFACE_INFO *table, ULONG *size ) { - MIB_IFTABLE *if_table; - DWORD err, needed, i; + NET_LUID *keys; + struct nsi_ndis_ifinfo_static *stat; + DWORD err, count, num = 0, needed, i; - TRACE("table %p, size %p\n", table, size ); + TRACE( "table %p, size %p\n", table, size ); if (!size) return ERROR_INVALID_PARAMETER; - err = AllocateAndGetIfTableFromStack( &if_table, 0, GetProcessHeap(), 0 ); + err = NsiAllocateAndGetTable( 1, &NPI_MS_NDIS_MODULEID, NSI_NDIS_IFINFO_TABLE, + (void **)&keys, sizeof(*keys), NULL, 0, NULL, 0, + (void **)&stat, sizeof(*stat), &count, 0 ); if (err) return err; - needed = FIELD_OFFSET(IP_INTERFACE_INFO, Adapter[if_table->dwNumEntries]); + for (i = 0; i < count; i++) + { + num++; + } + + needed = FIELD_OFFSET(IP_INTERFACE_INFO, Adapter[num]); if (!table || *size < needed) { *size = needed; - heap_free( if_table ); - return ERROR_INSUFFICIENT_BUFFER; + err = ERROR_INSUFFICIENT_BUFFER; + goto done; } - table->NumAdapters = if_table->dwNumEntries; - for (i = 0; i < if_table->dwNumEntries; i++) + table->NumAdapters = num; + for (i = 0, num = 0; i < count; i++) { - table->Adapter[i].Index = if_table->table[i].dwIndex; - strcpyW( table->Adapter[i].Name, if_table->table[i].wszName ); + IP_ADAPTER_INDEX_MAP *row; + + row = table->Adapter + num++; + row->Index = stat[i].if_index; + memcpy( row->Name, device_tcpip, sizeof(device_tcpip) ); + ConvertGuidToStringW( &stat[i].if_guid, row->Name + ARRAY_SIZE(device_tcpip) - 1, CHARS_IN_GUID ); } - heap_free( if_table ); - return ERROR_SUCCESS; +done: + NsiFreeTable( keys, NULL, NULL, stat ); + return err; } static int ipaddrrow_cmp( const void *a, const void *b ) @@ -1957,7 +1970,7 @@ static int ipaddrrow_cmp( const void *a, const void *b ) /****************************************************************** * GetIpAddrTable (IPHLPAPI.@) * - * Get interface-to-IP address mapping table. + * Get interface-to-IP address mapping table. * * PARAMS * table [Out] buffer for mapping table

1 0

Gerald Pfeifer : ntdll: Always return a value in get_builtin_init_funcs.
by Alexandre Julliard 19 Aug '21

19 Aug '21

Module: wine Branch: master Commit: 6468e445bd29b4c2eb006cd64623e21127ed0151 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6468e445bd29b4c2eb006cd6… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Thu Aug 19 01:36:39 2021 +0200 ntdll: Always return a value in get_builtin_init_funcs. This only showed up in the #ifdef __FreeBSD__ case, so did not appear on other platforms during testing. Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/loader.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index a8e145de16e..2dde2332a6a 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1729,7 +1729,8 @@ NTSTATUS get_builtin_init_funcs( void *handle, void **funcs, SIZE_T len, SIZE_T #ifdef __FreeBSD__ /* On older FreeBSD versions, l_addr was the absolute load address, now it's the relocation offset. */ if (offsetof(struct link_map, l_addr) == 0) - if (!get_relocbase(map->l_addr, &relocbase)) return; + if (!get_relocbase(map->l_addr, &relocbase)) + return STATUS_NOT_SUPPORTED; #endif switch (dyn->d_tag) {

1 0

Gerald Pfeifer : nsiproxy: Include stddef.h.
by Alexandre Julliard 19 Aug '21

19 Aug '21

Module: wine Branch: master Commit: b13c024d64068a314d0cec80c84561a3f3b2bd03 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b13c024d64068a314d0cec80… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Thu Aug 19 01:28:54 2021 +0200 nsiproxy: Include stddef.h. This is needed for size_t, which on FreeBSD is used by sys/sysctl.h. Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/nsiproxy.sys/udp.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/nsiproxy.sys/udp.c b/dlls/nsiproxy.sys/udp.c index 49acedcf214..b6109ef9592 100644 --- a/dlls/nsiproxy.sys/udp.c +++ b/dlls/nsiproxy.sys/udp.c @@ -20,6 +20,7 @@ */ #include "config.h" #include <stdarg.h> +#include <stddef.h> #ifdef HAVE_SYS_SYSCTL_H #include <sys/sysctl.h>

1 0

Gerald Pfeifer : nsiproxy: Include netinet/in_pcb.h.
by Alexandre Julliard 19 Aug '21

19 Aug '21

Module: wine Branch: master Commit: 823532bd3ae36c99c0c5befdd6ef3341ba26914a URL: https://source.winehq.org/git/wine.git/?a=commit;h=823532bd3ae36c99c0c5befd… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Thu Aug 19 01:18:01 2021 +0200 nsiproxy: Include netinet/in_pcb.h. Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/nsiproxy.sys/tcp.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/nsiproxy.sys/tcp.c b/dlls/nsiproxy.sys/tcp.c index eda438318f0..8567330be99 100644 --- a/dlls/nsiproxy.sys/tcp.c +++ b/dlls/nsiproxy.sys/tcp.c @@ -50,6 +50,10 @@ #include <netinet/in.h> #endif +#ifdef HAVE_NETINET_IN_PCB_H +#include <netinet/in_pcb.h> +#endif + #ifdef HAVE_NETINET_IP_VAR_H #include <netinet/ip_var.h> #endif

1 0

Gerald Pfeifer : nsiproxy: Include sys/param.h.
by Alexandre Julliard 19 Aug '21

19 Aug '21

Module: wine Branch: master Commit: 20c4149e7241d413d16b70b6cf058d52145c15cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=20c4149e7241d413d16b70b6… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Wed Aug 18 23:13:33 2021 +0200 nsiproxy: Include sys/param.h. This fixes In file included from dlls/nsiproxy.sys/tcp.c:70: /usr/include/libprocstat.h:130:36: error: 'SPECNAMELEN' undeclared here 130 | char vn_devname[SPECNAMELEN + 1]; on FreeBSD 11 and presumably other targets. Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/nsiproxy.sys/tcp.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/nsiproxy.sys/tcp.c b/dlls/nsiproxy.sys/tcp.c index 3d0f3a67dd7..eda438318f0 100644 --- a/dlls/nsiproxy.sys/tcp.c +++ b/dlls/nsiproxy.sys/tcp.c @@ -22,6 +22,10 @@ #include "config.h" #include <stdarg.h> +#ifdef HAVE_SYS_PARAM_H +#include <sys/param.h> +#endif + #ifdef HAVE_SYS_TYPES_H #include <sys/types.h> #endif

1 0

Conor McCarthy : vkd3d: Calculate shader visibility once per root signature table.
by Alexandre Julliard 19 Aug '21

19 Aug '21

Module: vkd3d Branch: master Commit: 04a08088ec54317dd0ccf13e7a39fdb9349fb31a URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=04a08088ec54317dd0ccf13… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Sat Aug 14 00:55:40 2021 +1000 vkd3d: Calculate shader visibility once per root signature table. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/state.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index f9efeee..58463e5 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -664,6 +664,7 @@ static HRESULT d3d12_root_signature_init_root_descriptor_tables(struct d3d12_roo for (i = 0; i < desc->NumParameters; ++i) { const D3D12_ROOT_PARAMETER *p = &desc->pParameters[i]; + enum vkd3d_shader_visibility shader_visibility; unsigned int offset = 0; if (p->ParameterType != D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE) @@ -673,6 +674,7 @@ static HRESULT d3d12_root_signature_init_root_descriptor_tables(struct d3d12_roo table = &root_signature->parameters[i].u.descriptor_table; range_count = p->u.DescriptorTable.NumDescriptorRanges; + shader_visibility = vkd3d_shader_visibility_from_d3d12(p->ShaderVisibility); root_signature->parameters[i].parameter_type = p->ParameterType; table->range_count = range_count; @@ -723,7 +725,7 @@ static HRESULT d3d12_root_signature_init_root_descriptor_tables(struct d3d12_roo vk_binding = d3d12_root_signature_assign_vk_bindings(root_signature, range->type, range->register_space, range->base_register_idx, range->descriptor_count, false, true, - vkd3d_shader_visibility_from_d3d12(p->ShaderVisibility), context); + shader_visibility, context); /* Unroll descriptor range. */ for (k = 0; k < range->descriptor_count; ++k)

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2021