- wine-devel - winehq.org

[PATCH 5/6] iphlpapi: Remove no longer needed libraries.
by Huw Davies 19 Aug '21

19 Aug '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- 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 \ -- 2.23.0

1 0

[PATCH 4/6] iphlpapi: Use the ANSI codepage for the convert interface name functions.
by Huw Davies 19 Aug '21

19 Aug '21

The name in these functions is now not the Unix interface name. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- 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 ); -- 2.23.0

1 0

[PATCH 3/6] iphlpapi: Implement GetAdapterIndex() by parsing the GUID from the name.
by Huw Davies 19 Aug '21

19 Aug '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- 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 ) -- 2.23.0

1 0

[PATCH 2/6] iphlpapi: Don't enumerate loopback interfaces in GetInterfaceInfo().
by Huw Davies 19 Aug '21

19 Aug '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- 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); -- 2.23.0

1 0

[PATCH 1/6] iphlpapi: Implement GetInterfaceInfo() on top of nsi.
by Huw Davies 19 Aug '21

19 Aug '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- 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 -- 2.23.0

1 0

[PATCH] cmd: Check for correct number of parameters to if command
by Alex Henrie 19 Aug '21

19 Aug '21

WCMD_ReadAndParseLine assumes that if evaluate_if_condition does not return -1 then the command pointer is valid. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51598 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- programs/cmd/builtins.c | 37 ++++++++++++++++++++----------------- 1 file changed, 20 insertions(+), 17 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index c7df724ae00..dfcec83ff5d 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -2792,24 +2792,27 @@ int evaluate_if_condition(WCHAR *p, WCHAR **command, int *test, int *negate) { WCHAR condition[MAX_PATH]; int caseInsensitive = (wcsstr(quals, L"/I") != NULL); + WCHAR *param; *negate = !lstrcmpiW(param1,L"not"); lstrcpyW(condition, (*negate ? param2 : param1)); WINE_TRACE("Condition: %s\n", wine_dbgstr_w(condition)); if (!lstrcmpiW(condition, L"errorlevel")) { - WCHAR *param = WCMD_parameter(p, 1+(*negate), NULL, FALSE, FALSE); WCHAR *endptr; - long int param_int = wcstol(param, &endptr, 10); + long int param_int; + param = WCMD_parameter(p, 1+(*negate), NULL, FALSE, FALSE); + param_int = wcstol(param, &endptr, 10); if (*endptr) goto syntax_err; *test = ((long int)errorlevel >= param_int); - WCMD_parameter(p, 2+(*negate), command, FALSE, FALSE); + param = WCMD_parameter(p, 2+(*negate), command, FALSE, FALSE); } else if (!lstrcmpiW(condition, L"exist")) { WIN32_FIND_DATAW fd; HANDLE hff; - WCHAR *param = WCMD_parameter(p, 1+(*negate), NULL, FALSE, FALSE); - int len = lstrlenW(param); + int len; + param = WCMD_parameter(p, 1+(*negate), NULL, FALSE, FALSE); + len = lstrlenW(param); /* FindFirstFile does not like a directory path ending in '\', append a '.' */ if (len && param[len-1] == '\\') lstrcatW(param, L"."); @@ -2818,35 +2821,34 @@ int evaluate_if_condition(WCHAR *p, WCHAR **command, int *test, int *negate) *test = (hff != INVALID_HANDLE_VALUE ); if (*test) FindClose(hff); - WCMD_parameter(p, 2+(*negate), command, FALSE, FALSE); + param = WCMD_parameter(p, 2+(*negate), command, FALSE, FALSE); } else if (!lstrcmpiW(condition, L"defined")) { - *test = (GetEnvironmentVariableW(WCMD_parameter(p, 1+(*negate), NULL, FALSE, FALSE), - NULL, 0) > 0); - WCMD_parameter(p, 2+(*negate), command, FALSE, FALSE); + param = WCMD_parameter(p, 1+(*negate), NULL, FALSE, FALSE); + *test = (GetEnvironmentVariableW(param, NULL, 0) > 0); + param = WCMD_parameter(p, 2+(*negate), command, FALSE, FALSE); } else { /* comparison operation */ WCHAR leftOperand[MAXSTRING], rightOperand[MAXSTRING], operator[MAXSTRING]; - WCHAR *paramStart; - lstrcpyW(leftOperand, WCMD_parameter(p, (*negate)+caseInsensitive, &paramStart, TRUE, FALSE)); + lstrcpyW(leftOperand, WCMD_parameter(p, (*negate)+caseInsensitive, &param, TRUE, FALSE)); if (!*leftOperand) goto syntax_err; /* Note: '==' can't be returned by WCMD_parameter since '=' is a separator */ - p = paramStart + lstrlenW(leftOperand); + p = param + lstrlenW(leftOperand); while (*p == ' ' || *p == '\t') p++; if (!wcsncmp(p, L"==", lstrlenW(L"=="))) lstrcpyW(operator, L"=="); else { - lstrcpyW(operator, WCMD_parameter(p, 0, &paramStart, FALSE, FALSE)); + lstrcpyW(operator, WCMD_parameter(p, 0, &param, FALSE, FALSE)); if (!*operator) goto syntax_err; } p += lstrlenW(operator); - lstrcpyW(rightOperand, WCMD_parameter(p, 0, &paramStart, TRUE, FALSE)); + lstrcpyW(rightOperand, WCMD_parameter(p, 0, &param, TRUE, FALSE)); if (!*rightOperand) goto syntax_err; @@ -2854,11 +2856,12 @@ int evaluate_if_condition(WCHAR *p, WCHAR **command, int *test, int *negate) if (*test == -1) goto syntax_err; - p = paramStart + lstrlenW(rightOperand); - WCMD_parameter(p, 0, command, FALSE, FALSE); + p = param + lstrlenW(rightOperand); + param = WCMD_parameter(p, 0, command, FALSE, FALSE); } - return 1; + if (*param) + return 1; syntax_err: return -1; -- 2.33.0

2 1

[PATCH 1/6] winebus.sys: Introduce a new unixlib interface.
by Rémi Bernon 19 Aug '21

19 Aug '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/winebus.sys/Makefile.in | 3 ++- dlls/winebus.sys/main.c | 9 ++++++++ dlls/winebus.sys/unixlib.c | 45 ++++++++++++++++++++++++++++++++++++ dlls/winebus.sys/unixlib.h | 34 +++++++++++++++++++++++++++ 4 files changed, 90 insertions(+), 1 deletion(-) create mode 100644 dlls/winebus.sys/unixlib.c create mode 100644 dlls/winebus.sys/unixlib.h diff --git a/dlls/winebus.sys/Makefile.in b/dlls/winebus.sys/Makefile.in index 8cde3c7b422..658d27b70fd 100644 --- a/dlls/winebus.sys/Makefile.in +++ b/dlls/winebus.sys/Makefile.in @@ -9,6 +9,7 @@ C_SRCS = \ bus_sdl.c \ bus_udev.c \ hid.c \ - main.c + main.c \ + unixlib.c RC_SRCS = winebus.rc diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index e372ec6db3f..fe0f6dc60cc 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -34,10 +34,14 @@ #include "wine/list.h" #include "bus.h" +#include "unixlib.h" WINE_DEFAULT_DEBUG_CHANNEL(plugplay); WINE_DECLARE_DEBUG_CHANNEL(hid_report); +static HMODULE instance; +static struct unix_funcs *unix_funcs; + #if defined(__i386__) && !defined(_WIN32) extern void * WINAPI wrap_fastcall_func1( void *func, const void *a ); @@ -1071,6 +1075,7 @@ static NTSTATUS WINAPI driver_add_device(DRIVER_OBJECT *driver, DEVICE_OBJECT *p static void WINAPI driver_unload(DRIVER_OBJECT *driver) { + __wine_init_unix_lib(instance, DLL_PROCESS_DETACH, NULL, NULL); NtClose(driver_key); } @@ -1081,6 +1086,10 @@ NTSTATUS WINAPI DriverEntry( DRIVER_OBJECT *driver, UNICODE_STRING *path ) TRACE( "(%p, %s)\n", driver, debugstr_w(path->Buffer) ); + RtlPcToFileHeader(&DriverEntry, (void *)&instance); + if ((ret = __wine_init_unix_lib(instance, DLL_PROCESS_ATTACH, NULL, &unix_funcs))) + return ret; + attr.Length = sizeof(attr); attr.ObjectName = path; attr.Attributes = OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE; diff --git a/dlls/winebus.sys/unixlib.c b/dlls/winebus.sys/unixlib.c new file mode 100644 index 00000000000..1be740b34b8 --- /dev/null +++ b/dlls/winebus.sys/unixlib.c @@ -0,0 +1,45 @@ +/* + * Copyright 2021 Rémi Bernon for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" + +#include <stdarg.h> +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "windef.h" +#include "winbase.h" +#include "winternl.h" + +#include "wine/debug.h" + +#include "unixlib.h" + +WINE_DEFAULT_DEBUG_CHANNEL(plugplay); + +static const struct unix_funcs unix_funcs = +{ +}; + +NTSTATUS CDECL __wine_init_unix_lib(HMODULE module, DWORD reason, const void *ptr_in, void *ptr_out) +{ + TRACE("module %p, reason %u, ptr_in %p, ptr_out %p\n", module, reason, ptr_in, ptr_out); + + if (reason != DLL_PROCESS_ATTACH) return STATUS_SUCCESS; + *(const struct unix_funcs **)ptr_out = &unix_funcs; + return STATUS_SUCCESS; +} diff --git a/dlls/winebus.sys/unixlib.h b/dlls/winebus.sys/unixlib.h new file mode 100644 index 00000000000..c220629ea87 --- /dev/null +++ b/dlls/winebus.sys/unixlib.h @@ -0,0 +1,34 @@ +/* + * Copyright 2021 Rémi Bernon for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINEBUS_UNIXLIB_H +#define __WINEBUS_UNIXLIB_H + +#include <stdarg.h> + +#include <windef.h> +#include <winbase.h> +#include <winternl.h> +#include <ddk/wdm.h> +#include <hidusage.h> + +struct unix_funcs +{ +}; + +#endif /* __WINEBUS_UNIXLIB_H */ -- 2.32.0

1 5

[PATCH] nsiproxy: Include stddef.h
by Gerald Pfeifer 19 Aug '21

19 Aug '21

This is needed for size_t, which on FreeBSD is used by sys/sysctl.h. Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> --- 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> -- 2.31.1

2 1

[PATCH] nsiproxy: Include netinet/in_pcb.h
by Gerald Pfeifer 19 Aug '21

19 Aug '21

This is necessary to define struct xinpgen; otherwise we see dlls/nsiproxy.sys/tcp.c: In function ‘tcp_conns_enumerate_all’: dlls/nsiproxy.sys/tcp.c:660:27: error: invalid application of ‘sizeof’ to incomplete type ‘struct xinpgen’ on FreeBSD 11 and likely others. Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> --- 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 -- 2.31.1

2 1

[PATCH] nsiproxy: Include sys/param.h
by Gerald Pfeifer 19 Aug '21

19 Aug '21

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> --- 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 27f85ee3104..2e147935151 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 -- 2.31.1

2 1

[PATCH v2 1/3] ws2_32: Use malloc() instead of HeapAlloc().
by Zebediah Figura 19 Aug '21

19 Aug '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/ws2_32/async.c | 26 +++---- dlls/ws2_32/protocol.c | 141 +++++++++++++++++------------------ dlls/ws2_32/socket.c | 72 +++++++++--------- dlls/ws2_32/ws2_32_private.h | 2 +- 4 files changed, 116 insertions(+), 125 deletions(-) diff --git a/dlls/ws2_32/async.c b/dlls/ws2_32/async.c index 5eecddda062..ffa61149094 100644 --- a/dlls/ws2_32/async.c +++ b/dlls/ws2_32/async.c @@ -34,15 +34,7 @@ * whole stuff did not work anyway to other changes). */ -#include <stdarg.h> -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "winsock2.h" -#include "ws2spi.h" - -#include "wine/debug.h" +#include "ws2_32_private.h" WINE_DEFAULT_DEBUG_CHANNEL(winsock); @@ -253,7 +245,7 @@ static void WINAPI async_worker( TP_CALLBACK_INSTANCE *instance, void *context ) struct async_query_header *query = context; LPARAM lparam = query->func( query ); PostMessageW( query->hWnd, query->uMsg, (WPARAM)query->handle, lparam ); - HeapFree( GetProcessHeap(), 0, query ); + free( query ); } @@ -283,7 +275,7 @@ static HANDLE run_query( HWND hWnd, UINT uMsg, LPARAM (*func)(struct async_query if (!TrySubmitThreadpoolCallback( async_worker, query, NULL )) { SetLastError( WSAEWOULDBLOCK ); - HeapFree( GetProcessHeap(), 0, query ); + free( query ); return 0; } return UlongToHandle( handle ); @@ -300,7 +292,7 @@ HANDLE WINAPI WSAAsyncGetHostByAddr(HWND hWnd, UINT uMsg, LPCSTR addr, TRACE("hwnd %p, msg %04x, addr %p[%i]\n", hWnd, uMsg, addr, len ); - if (!(aq = HeapAlloc( GetProcessHeap(), 0, sizeof(*aq) + len ))) + if (!(aq = malloc( sizeof(*aq) + len ))) { SetLastError( WSAEWOULDBLOCK ); return 0; @@ -323,7 +315,7 @@ HANDLE WINAPI WSAAsyncGetHostByName(HWND hWnd, UINT uMsg, LPCSTR name, TRACE("hwnd %p, msg %04x, host %s, buffer %i\n", hWnd, uMsg, debugstr_a(name), buflen ); - if (!(aq = HeapAlloc( GetProcessHeap(), 0, sizeof(*aq) + len ))) + if (!(aq = malloc( sizeof(*aq) + len ))) { SetLastError( WSAEWOULDBLOCK ); return 0; @@ -344,7 +336,7 @@ HANDLE WINAPI WSAAsyncGetProtoByName(HWND hWnd, UINT uMsg, LPCSTR name, TRACE("hwnd %p, msg %04x, proto %s, buffer %i\n", hWnd, uMsg, debugstr_a(name), buflen ); - if (!(aq = HeapAlloc( GetProcessHeap(), 0, sizeof(*aq) + len ))) + if (!(aq = malloc( sizeof(*aq) + len ))) { SetLastError( WSAEWOULDBLOCK ); return 0; @@ -365,7 +357,7 @@ HANDLE WINAPI WSAAsyncGetProtoByNumber(HWND hWnd, UINT uMsg, INT number, TRACE("hwnd %p, msg %04x, num %i\n", hWnd, uMsg, number ); - if (!(aq = HeapAlloc( GetProcessHeap(), 0, sizeof(*aq) ))) + if (!(aq = malloc( sizeof(*aq) ))) { SetLastError( WSAEWOULDBLOCK ); return 0; @@ -386,7 +378,7 @@ HANDLE WINAPI WSAAsyncGetServByName(HWND hWnd, UINT uMsg, LPCSTR name, TRACE("hwnd %p, msg %04x, name %s, proto %s\n", hWnd, uMsg, debugstr_a(name), debugstr_a(proto)); - if (!(aq = HeapAlloc( GetProcessHeap(), 0, sizeof(*aq) + len1 + len2 ))) + if (!(aq = malloc( sizeof(*aq) + len1 + len2 ))) { SetLastError( WSAEWOULDBLOCK ); return 0; @@ -417,7 +409,7 @@ HANDLE WINAPI WSAAsyncGetServByPort(HWND hWnd, UINT uMsg, INT port, TRACE("hwnd %p, msg %04x, port %i, proto %s\n", hWnd, uMsg, port, debugstr_a(proto)); - if (!(aq = HeapAlloc( GetProcessHeap(), 0, sizeof(*aq) + len ))) + if (!(aq = malloc( sizeof(*aq) + len ))) { SetLastError( WSAEWOULDBLOCK ); return 0; diff --git a/dlls/ws2_32/protocol.c b/dlls/ws2_32/protocol.c index 733ef102eea..93464232d32 100644 --- a/dlls/ws2_32/protocol.c +++ b/dlls/ws2_32/protocol.c @@ -38,10 +38,10 @@ static char *get_fqdn(void) GetComputerNameExA( ComputerNamePhysicalDnsFullyQualified, NULL, &size ); if (GetLastError() != ERROR_MORE_DATA) return NULL; - if (!(ret = HeapAlloc( GetProcessHeap(), 0, size ))) return NULL; + if (!(ret = malloc( size ))) return NULL; if (!GetComputerNameExA( ComputerNamePhysicalDnsFullyQualified, ret, &size )) { - HeapFree( GetProcessHeap(), 0, ret ); + free( ret ); return NULL; } return ret; @@ -57,14 +57,14 @@ static int do_getaddrinfo( const char *node, const char *service, for (;;) { - if (!(params.info = HeapAlloc( GetProcessHeap(), 0, size ))) + if (!(params.info = malloc( size ))) return WSA_NOT_ENOUGH_MEMORY; if (!(ret = WS_CALL( getaddrinfo, &params ))) { *info = params.info; return ret; } - HeapFree( GetProcessHeap(), 0, params.info ); + free( params.info ); if (ret != ERROR_INSUFFICIENT_BUFFER) return ret; } } @@ -103,8 +103,8 @@ int WINAPI getaddrinfo( const char *node, const char *service, if (node[0] == '[' && (close_bracket = strchr(node + 1, ']'))) { - nodev6 = HeapAlloc( GetProcessHeap(), 0, close_bracket - node ); - if (!nodev6) return WSA_NOT_ENOUGH_MEMORY; + if (!(nodev6 = malloc( close_bracket - node ))) + return WSA_NOT_ENOUGH_MEMORY; lstrcpynA( nodev6, node + 1, close_bracket - node ); node = nodev6; } @@ -117,7 +117,7 @@ int WINAPI getaddrinfo( const char *node, const char *service, { if (!fqdn && !(fqdn = get_fqdn())) { - HeapFree( GetProcessHeap(), 0, nodev6 ); + free( nodev6 ); return WSA_NOT_ENOUGH_MEMORY; } if (!strcmp( fqdn, node ) || (!strncmp( fqdn, node, strlen( node ) ) && fqdn[strlen( node )] == '.')) @@ -136,8 +136,8 @@ int WINAPI getaddrinfo( const char *node, const char *service, } } - HeapFree( GetProcessHeap(), 0, fqdn ); - HeapFree( GetProcessHeap(), 0, nodev6 ); + free( fqdn ); + free( nodev6 ); if (!ret && TRACE_ON(winsock)) { @@ -160,7 +160,7 @@ static ADDRINFOEXW *addrinfo_AtoW( const struct addrinfo *ai ) { ADDRINFOEXW *ret; - if (!(ret = HeapAlloc( GetProcessHeap(), 0, sizeof(ADDRINFOEXW) ))) return NULL; + if (!(ret = malloc( sizeof(ADDRINFOEXW) ))) return NULL; ret->ai_flags = ai->ai_flags; ret->ai_family = ai->ai_family; ret->ai_socktype = ai->ai_socktype; @@ -175,19 +175,19 @@ static ADDRINFOEXW *addrinfo_AtoW( const struct addrinfo *ai ) if (ai->ai_canonname) { int len = MultiByteToWideChar( CP_ACP, 0, ai->ai_canonname, -1, NULL, 0 ); - if (!(ret->ai_canonname = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) + if (!(ret->ai_canonname = malloc( len * sizeof(WCHAR) ))) { - HeapFree( GetProcessHeap(), 0, ret ); + free( ret ); return NULL; } MultiByteToWideChar( CP_ACP, 0, ai->ai_canonname, -1, ret->ai_canonname, len ); } if (ai->ai_addr) { - if (!(ret->ai_addr = HeapAlloc( GetProcessHeap(), 0, ai->ai_addrlen ))) + if (!(ret->ai_addr = malloc( ai->ai_addrlen ))) { - HeapFree( GetProcessHeap(), 0, ret->ai_canonname ); - HeapFree( GetProcessHeap(), 0, ret ); + free( ret->ai_canonname ); + free( ret ); return NULL; } memcpy( ret->ai_addr, ai->ai_addr, ai->ai_addrlen ); @@ -217,7 +217,7 @@ static struct addrinfo *addrinfo_WtoA( const struct addrinfoW *ai ) { struct addrinfo *ret; - if (!(ret = HeapAlloc( GetProcessHeap(), 0, sizeof(struct addrinfo) ))) return NULL; + if (!(ret = malloc( sizeof(struct addrinfo) ))) return NULL; ret->ai_flags = ai->ai_flags; ret->ai_family = ai->ai_family; ret->ai_socktype = ai->ai_socktype; @@ -229,19 +229,19 @@ static struct addrinfo *addrinfo_WtoA( const struct addrinfoW *ai ) if (ai->ai_canonname) { int len = WideCharToMultiByte( CP_ACP, 0, ai->ai_canonname, -1, NULL, 0, NULL, NULL ); - if (!(ret->ai_canonname = HeapAlloc( GetProcessHeap(), 0, len ))) + if (!(ret->ai_canonname = malloc( len ))) { - HeapFree( GetProcessHeap(), 0, ret ); + free( ret ); return NULL; } WideCharToMultiByte( CP_ACP, 0, ai->ai_canonname, -1, ret->ai_canonname, len, NULL, NULL ); } if (ai->ai_addr) { - if (!(ret->ai_addr = HeapAlloc( GetProcessHeap(), 0, sizeof(struct sockaddr) ))) + if (!(ret->ai_addr = malloc( sizeof(struct sockaddr) ))) { - HeapFree( GetProcessHeap(), 0, ret->ai_canonname ); - HeapFree( GetProcessHeap(), 0, ret ); + free( ret->ai_canonname ); + free( ret ); return NULL; } memcpy( ret->ai_addr, ai->ai_addr, sizeof(struct sockaddr) ); @@ -276,9 +276,9 @@ static void WINAPI getaddrinfo_callback(TP_CALLBACK_INSTANCE *instance, void *co freeaddrinfo(res); } - HeapFree( GetProcessHeap(), 0, args->nodename ); - HeapFree( GetProcessHeap(), 0, args->servname ); - HeapFree( GetProcessHeap(), 0, args ); + free( args->nodename ); + free( args->servname ); + free( args ); overlapped->Internal = ret; if (completion_routine) completion_routine( ret, 0, overlapped ); @@ -322,20 +322,20 @@ static int getaddrinfoW( const WCHAR *nodename, const WCHAR *servname, ret = EAI_FAIL; goto end; } - if (!(local_nodenameW = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) goto end; + if (!(local_nodenameW = malloc( len * sizeof(WCHAR) ))) goto end; IdnToAscii( 0, nodename, -1, local_nodenameW, len ); } } if (local_nodenameW) { len = WideCharToMultiByte( CP_ACP, 0, local_nodenameW, -1, NULL, 0, NULL, NULL ); - if (!(nodenameA = HeapAlloc( GetProcessHeap(), 0, len ))) goto end; + if (!(nodenameA = malloc( len ))) goto end; WideCharToMultiByte( CP_ACP, 0, local_nodenameW, -1, nodenameA, len, NULL, NULL ); } if (servname) { len = WideCharToMultiByte( CP_ACP, 0, servname, -1, NULL, 0, NULL, NULL ); - if (!(servnameA = HeapAlloc( GetProcessHeap(), 0, len ))) goto end; + if (!(servnameA = malloc( len ))) goto end; WideCharToMultiByte( CP_ACP, 0, servname, -1, servnameA, len, NULL, NULL ); } @@ -349,7 +349,7 @@ static int getaddrinfoW( const WCHAR *nodename, const WCHAR *servname, goto end; } - if (!(args = HeapAlloc( GetProcessHeap(), 0, sizeof(*args) + sizeof(*args->hints) ))) goto end; + if (!(args = malloc( sizeof(*args) + sizeof(*args->hints) ))) goto end; args->overlapped = overlapped; args->completion_routine = completion_routine; args->result = res; @@ -368,13 +368,13 @@ static int getaddrinfoW( const WCHAR *nodename, const WCHAR *servname, overlapped->Internal = WSAEINPROGRESS; if (!TrySubmitThreadpoolCallback( getaddrinfo_callback, args, NULL )) { - HeapFree( GetProcessHeap(), 0, args ); + free( args ); ret = GetLastError(); goto end; } if (local_nodenameW != nodename) - HeapFree( GetProcessHeap(), 0, local_nodenameW ); + free( local_nodenameW ); SetLastError( ERROR_IO_PENDING ); return ERROR_IO_PENDING; } @@ -388,9 +388,9 @@ static int getaddrinfoW( const WCHAR *nodename, const WCHAR *servname, end: if (local_nodenameW != nodename) - HeapFree( GetProcessHeap(), 0, local_nodenameW ); - HeapFree( GetProcessHeap(), 0, nodenameA ); - HeapFree( GetProcessHeap(), 0, servnameA ); + free( local_nodenameW ); + free( nodenameA ); + free( servnameA ); return ret; } @@ -484,7 +484,7 @@ void WINAPI freeaddrinfo( struct addrinfo *info ) { TRACE( "%p\n", info ); - HeapFree( GetProcessHeap(), 0, info ); + free( info ); } @@ -496,10 +496,10 @@ void WINAPI FreeAddrInfoW( ADDRINFOW *ai ) while (ai) { ADDRINFOW *next; - HeapFree( GetProcessHeap(), 0, ai->ai_canonname ); - HeapFree( GetProcessHeap(), 0, ai->ai_addr ); + free( ai->ai_canonname ); + free( ai->ai_addr ); next = ai->ai_next; - HeapFree( GetProcessHeap(), 0, ai ); + free( ai ); ai = next; } } @@ -515,10 +515,10 @@ void WINAPI FreeAddrInfoEx( ADDRINFOEXA *ai ) while (ai) { ADDRINFOEXA *next; - HeapFree( GetProcessHeap(), 0, ai->ai_canonname ); - HeapFree( GetProcessHeap(), 0, ai->ai_addr ); + free( ai->ai_canonname ); + free( ai->ai_addr ); next = ai->ai_next; - HeapFree( GetProcessHeap(), 0, ai ); + free( ai ); ai = next; } } @@ -534,10 +534,10 @@ void WINAPI FreeAddrInfoExW( ADDRINFOEXW *ai ) while (ai) { ADDRINFOEXW *next; - HeapFree( GetProcessHeap(), 0, ai->ai_canonname ); - HeapFree( GetProcessHeap(), 0, ai->ai_addr ); + free( ai->ai_canonname ); + free( ai->ai_addr ); next = ai->ai_next; - HeapFree( GetProcessHeap(), 0, ai ); + free( ai ); ai = next; } } @@ -567,11 +567,11 @@ int WINAPI GetNameInfoW( const SOCKADDR *addr, socklen_t addr_len, WCHAR *host, int ret; char *hostA = NULL, *servA = NULL; - if (host && (!(hostA = HeapAlloc( GetProcessHeap(), 0, host_len )))) + if (host && !(hostA = malloc( host_len ))) return EAI_MEMORY; - if (serv && (!(servA = HeapAlloc( GetProcessHeap(), 0, serv_len )))) + if (serv && !(servA = malloc( serv_len ))) { - HeapFree( GetProcessHeap(), 0, hostA ); + free( hostA ); return EAI_MEMORY; } @@ -582,8 +582,8 @@ int WINAPI GetNameInfoW( const SOCKADDR *addr, socklen_t addr_len, WCHAR *host, if (serv) MultiByteToWideChar( CP_ACP, 0, servA, -1, serv, serv_len ); } - HeapFree( GetProcessHeap(), 0, hostA ); - HeapFree( GetProcessHeap(), 0, servA ); + free( hostA ); + free( servA ); return ret; } @@ -594,9 +594,9 @@ static struct hostent *get_hostent_buffer( unsigned int size ) if (data->he_buffer) { if (data->he_len >= size) return data->he_buffer; - HeapFree( GetProcessHeap(), 0, data->he_buffer ); + free( data->he_buffer ); } - data->he_buffer = HeapAlloc( GetProcessHeap(), 0, (data->he_len = size) ); + data->he_buffer = malloc( (data->he_len = size) ); if (!data->he_buffer) SetLastError(WSAENOBUFS); return data->he_buffer; } @@ -722,8 +722,8 @@ static struct hostent *get_local_ips( char *hostname ) if (GetIpForwardTable( NULL, &route_size, FALSE ) != ERROR_INSUFFICIENT_BUFFER) return NULL; - adapters = HeapAlloc( GetProcessHeap(), 0, adap_size ); - routes = HeapAlloc( GetProcessHeap(), 0, route_size ); + adapters = malloc( adap_size ); + routes = malloc( route_size ); if (!adapters || !routes) goto cleanup; @@ -759,7 +759,7 @@ static struct hostent *get_local_ips( char *hostname ) } if (exists) continue; - route_addrs = heap_realloc( route_addrs, (numroutes + 1) * sizeof(struct route) ); + route_addrs = realloc( route_addrs, (numroutes + 1) * sizeof(struct route) ); if (!route_addrs) goto cleanup; route_addrs[numroutes].interface = ifindex; @@ -808,9 +808,9 @@ static struct hostent *get_local_ips( char *hostname ) *(struct in_addr *)hostlist->h_addr_list[i] = route_addrs[i].addr; cleanup: - HeapFree( GetProcessHeap(), 0, route_addrs ); - HeapFree( GetProcessHeap(), 0, adapters ); - HeapFree( GetProcessHeap(), 0, routes ); + free( route_addrs ); + free( adapters ); + free( routes ); return hostlist; } @@ -974,11 +974,10 @@ static char *read_etc_file( const WCHAR *filename, DWORD *ret_size ) } size = GetFileSize( file, NULL ); - if (!(data = HeapAlloc( GetProcessHeap(), 0, size )) || - !ReadFile( file, data, size, ret_size, NULL )) + if (!(data = malloc( size )) || !ReadFile( file, data, size, ret_size, NULL )) { WARN( "failed to read file, error %u\n", GetLastError() ); - HeapFree( GetProcessHeap(), 0, data ); + free( data ); data = NULL; } CloseHandle( file ); @@ -1009,10 +1008,10 @@ static struct protoent *get_protoent_buffer( unsigned int size ) if (data->pe_buffer) { if (data->pe_len >= size) return data->pe_buffer; - HeapFree( GetProcessHeap(), 0, data->pe_buffer ); + free( data->pe_buffer ); } data->pe_len = size; - data->pe_buffer = HeapAlloc( GetProcessHeap(), 0, size ); + data->pe_buffer = malloc( size ); if (!data->pe_buffer) SetLastError( WSAENOBUFS ); return data->pe_buffer; } @@ -1150,7 +1149,7 @@ struct protoent * WINAPI getprotobyname( const char *name ) break; } - HeapFree( GetProcessHeap(), 0, file ); + free( file ); return proto; } @@ -1180,7 +1179,7 @@ struct protoent * WINAPI getprotobynumber( int number ) break; } - HeapFree( GetProcessHeap(), 0, file ); + free( file ); return proto; } @@ -1191,10 +1190,10 @@ static struct servent *get_servent_buffer( int size ) if (data->se_buffer) { if (data->se_len >= size) return data->se_buffer; - HeapFree( GetProcessHeap(), 0, data->se_buffer ); + free( data->se_buffer ); } data->se_len = size; - data->se_buffer = HeapAlloc( GetProcessHeap(), 0, size ); + data->se_buffer = malloc( size ); if (!data->se_buffer) SetLastError( WSAENOBUFS ); return data->se_buffer; } @@ -1341,7 +1340,7 @@ struct servent * WINAPI getservbyname( const char *name, const char *proto ) break; } - HeapFree( GetProcessHeap(), 0, file ); + free( file ); return serv; } @@ -1371,7 +1370,7 @@ struct servent * WINAPI getservbyport( int port, const char *proto ) break; } - HeapFree( GetProcessHeap(), 0, file ); + free( file ); return serv; } @@ -1481,7 +1480,7 @@ int WINAPI InetPtonW( int family, const WCHAR *addr, void *buffer ) } len = WideCharToMultiByte( CP_ACP, 0, addr, -1, NULL, 0, NULL, NULL ); - if (!(addrA = HeapAlloc( GetProcessHeap(), 0, len ))) + if (!(addrA = malloc( len ))) { SetLastError( WSA_NOT_ENOUGH_MEMORY ); return -1; @@ -1491,7 +1490,7 @@ int WINAPI InetPtonW( int family, const WCHAR *addr, void *buffer ) ret = inet_pton( family, addrA, buffer ); if (!ret) SetLastError( WSAEINVAL ); - HeapFree( GetProcessHeap(), 0, addrA ); + free( addrA ); return ret; } @@ -1627,14 +1626,14 @@ int WINAPI WSAStringToAddressW( WCHAR *string, int family, WSAPROTOCOL_INFOW *pr } sizeA = WideCharToMultiByte( CP_ACP, 0, string, -1, NULL, 0, NULL, NULL ); - if (!(stringA = HeapAlloc( GetProcessHeap(), 0, sizeA ))) + if (!(stringA = malloc( sizeA ))) { SetLastError( WSA_NOT_ENOUGH_MEMORY ); return -1; } WideCharToMultiByte( CP_ACP, 0, string, -1, stringA, sizeA, NULL, NULL ); ret = WSAStringToAddressA( stringA, family, protocol_infoA, addr, addr_len ); - HeapFree( GetProcessHeap(), 0, stringA ); + free( stringA ); return ret; } diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 83904f29626..fd6ea25c751 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -361,7 +361,7 @@ static BOOL socket_list_add(SOCKET socket) } } new_size = max(socket_list_size * 2, 8); - if (!(new_array = heap_realloc(socket_list, new_size * sizeof(*socket_list)))) + if (!(new_array = realloc( socket_list, new_size * sizeof(*socket_list) ))) { LeaveCriticalSection(&cs_socket_list); return FALSE; @@ -508,30 +508,30 @@ static DWORD NtStatusToWSAError( NTSTATUS status ) struct per_thread_data *get_per_thread_data(void) { - struct per_thread_data * ptb = NtCurrentTeb()->WinSockData; - /* lazy initialization */ - if (!ptb) + struct per_thread_data *data = NtCurrentTeb()->WinSockData; + + if (!data) { - ptb = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*ptb) ); - NtCurrentTeb()->WinSockData = ptb; + data = calloc( 1, sizeof(*data) ); + NtCurrentTeb()->WinSockData = data; } - return ptb; + return data; } static void free_per_thread_data(void) { - struct per_thread_data * ptb = NtCurrentTeb()->WinSockData; + struct per_thread_data *data = NtCurrentTeb()->WinSockData; - if (!ptb) return; + if (!data) return; - CloseHandle( ptb->sync_event ); + CloseHandle( data->sync_event ); /* delete scratch buffers */ - HeapFree( GetProcessHeap(), 0, ptb->he_buffer ); - HeapFree( GetProcessHeap(), 0, ptb->se_buffer ); - HeapFree( GetProcessHeap(), 0, ptb->pe_buffer ); + free( data->he_buffer ); + free( data->se_buffer ); + free( data->pe_buffer ); - HeapFree( GetProcessHeap(), 0, ptb ); + free( data ); NtCurrentTeb()->WinSockData = NULL; } @@ -1108,12 +1108,12 @@ int WINAPI bind( SOCKET s, const struct sockaddr *addr, int len ) if (!(sync_event = get_sync_event())) return -1; - params = HeapAlloc( GetProcessHeap(), 0, sizeof(int) + len ); - ret_addr = HeapAlloc( GetProcessHeap(), 0, len ); + params = malloc( sizeof(int) + len ); + ret_addr = malloc( len ); if (!params || !ret_addr) { - HeapFree( GetProcessHeap(), 0, params ); - HeapFree( GetProcessHeap(), 0, ret_addr ); + free( params ); + free( ret_addr ); SetLastError( WSAENOBUFS ); return -1; } @@ -1129,8 +1129,8 @@ int WINAPI bind( SOCKET s, const struct sockaddr *addr, int len ) status = io.u.Status; } - HeapFree( GetProcessHeap(), 0, params ); - HeapFree( GetProcessHeap(), 0, ret_addr ); + free( params ); + free( ret_addr ); SetLastError( NtStatusToWSAError( status ) ); return status ? -1 : 0; @@ -1175,7 +1175,7 @@ int WINAPI connect( SOCKET s, const struct sockaddr *addr, int len ) if (!(sync_event = get_sync_event())) return -1; - if (!(params = HeapAlloc( GetProcessHeap(), 0, sizeof(*params) + len ))) + if (!(params = malloc( sizeof(*params) + len ))) { SetLastError( ERROR_NOT_ENOUGH_MEMORY ); return -1; @@ -1186,7 +1186,7 @@ int WINAPI connect( SOCKET s, const struct sockaddr *addr, int len ) status = NtDeviceIoControlFile( (HANDLE)s, sync_event, NULL, NULL, &io, IOCTL_AFD_WINE_CONNECT, params, sizeof(*params) + len, NULL, 0 ); - HeapFree( GetProcessHeap(), 0, params ); + free( params ); if (status == STATUS_PENDING) { if (WaitForSingleObject( sync_event, INFINITE ) == WAIT_FAILED) return -1; @@ -1235,7 +1235,7 @@ static BOOL WINAPI WS2_ConnectEx( SOCKET s, const struct sockaddr *name, int nam overlapped->Internal = STATUS_PENDING; overlapped->InternalHigh = 0; - if (!(params = HeapAlloc( GetProcessHeap(), 0, sizeof(*params) + namelen + send_len ))) + if (!(params = malloc( sizeof(*params) + namelen + send_len ))) { SetLastError( ERROR_NOT_ENOUGH_MEMORY ); return SOCKET_ERROR; @@ -1248,7 +1248,7 @@ static BOOL WINAPI WS2_ConnectEx( SOCKET s, const struct sockaddr *name, int nam status = NtDeviceIoControlFile( SOCKET2HANDLE(s), overlapped->hEvent, NULL, cvalue, (IO_STATUS_BLOCK *)overlapped, IOCTL_AFD_WINE_CONNECT, params, sizeof(*params) + namelen + send_len, NULL, 0 ); - HeapFree( GetProcessHeap(), 0, params ); + free( params ); if (ret_len) *ret_len = overlapped->InternalHigh; SetLastError( NtStatusToWSAError( status ) ); return !status; @@ -2028,7 +2028,7 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID if (GetAdaptersInfo(NULL, &size) == ERROR_BUFFER_OVERFLOW) { - IP_ADAPTER_INFO *p, *table = HeapAlloc(GetProcessHeap(), 0, size); + IP_ADAPTER_INFO *p, *table = malloc( size ); NTSTATUS status = STATUS_SUCCESS; SOCKET_ADDRESS_LIST *sa_list; SOCKADDR_IN *sockaddr; @@ -2039,7 +2039,7 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID if (!table || GetAdaptersInfo(table, &size)) { - HeapFree(GetProcessHeap(), 0, table); + free( table ); SetLastError( WSAEINVAL ); return -1; } @@ -2051,7 +2051,7 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID if (total > out_size || !out_buff) { *ret_size = total; - HeapFree(GetProcessHeap(), 0, table); + free( table ); SetLastError( WSAEFAULT ); return -1; } @@ -2074,7 +2074,7 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID i++; } - HeapFree(GetProcessHeap(), 0, table); + free( table ); ret = server_ioctl_sock( s, IOCTL_AFD_WINE_COMPLETE_ASYNC, &status, sizeof(status), NULL, 0, ret_size, overlapped, completion ); @@ -2173,10 +2173,10 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID SetLastError( WSAEFAULT ); return -1; } - ipAddrTable = HeapAlloc( GetProcessHeap(), 0, size ); + ipAddrTable = malloc( size ); if (GetIpAddrTable( ipAddrTable, &size, FALSE )) { - HeapFree( GetProcessHeap(), 0, ipAddrTable ); + free( ipAddrTable ); SetLastError( WSAEFAULT ); return -1; } @@ -2190,14 +2190,14 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID { ERR("no matching IP address for interface %d\n", row.dwForwardIfIndex); - HeapFree( GetProcessHeap(), 0, ipAddrTable ); + free( ipAddrTable ); SetLastError( WSAEFAULT ); return -1; } saddr_in->sin_family = AF_INET; saddr_in->sin_addr.S_un.S_addr = ipAddrTable->table[found_index].dwAddr; saddr_in->sin_port = 0; - HeapFree( GetProcessHeap(), 0, ipAddrTable ); + free( ipAddrTable ); ret = server_ioctl_sock( s, IOCTL_AFD_WINE_COMPLETE_ASYNC, &status, sizeof(status), NULL, 0, ret_size, overlapped, completion ); @@ -2530,7 +2530,7 @@ int WINAPI WSAPoll( WSAPOLLFD *fds, ULONG count, int timeout ) if (!(sync_event = get_sync_event())) return -1; params_size = offsetof( struct afd_poll_params, sockets[count] ); - if (!(params = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, params_size ))) + if (!(params = calloc( params_size, 1 ))) { SetLastError(WSAENOBUFS); return SOCKET_ERROR; @@ -2566,7 +2566,7 @@ int WINAPI WSAPoll( WSAPOLLFD *fds, ULONG count, int timeout ) if (!poll_socket) { SetLastError( WSAENOTSOCK ); - HeapFree( GetProcessHeap(), 0, params ); + free( params ); return -1; } @@ -2576,7 +2576,7 @@ int WINAPI WSAPoll( WSAPOLLFD *fds, ULONG count, int timeout ) { if (WaitForSingleObject( sync_event, INFINITE ) == WAIT_FAILED) { - HeapFree( GetProcessHeap(), 0, params ); + free( params ); return -1; } status = io.u.Status; @@ -2614,7 +2614,7 @@ int WINAPI WSAPoll( WSAPOLLFD *fds, ULONG count, int timeout ) } if (status == STATUS_TIMEOUT) status = STATUS_SUCCESS; - HeapFree( GetProcessHeap(), 0, params ); + free( params ); SetLastError( NtStatusToWSAError( status ) ); return status ? -1 : ret_count; diff --git a/dlls/ws2_32/ws2_32_private.h b/dlls/ws2_32/ws2_32_private.h index 5e2075b5c9c..85f6b4dbc1c 100644 --- a/dlls/ws2_32/ws2_32_private.h +++ b/dlls/ws2_32/ws2_32_private.h @@ -21,6 +21,7 @@ #include <stdarg.h> #include <stdio.h> +#include <stdlib.h> #include <string.h> #include <limits.h> @@ -50,7 +51,6 @@ #include "wine/afd.h" #include "wine/debug.h" #include "wine/exception.h" -#include "wine/heap.h" #include "wine/unixlib.h" #define DECLARE_CRITICAL_SECTION(cs) \ -- 2.32.0

2 3

[PATCH 1/3] ws2_32: Use malloc() instead of HeapAlloc().
by Zebediah Figura 19 Aug '21

19 Aug '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/ws2_32/async.c | 26 +++---- dlls/ws2_32/protocol.c | 128 +++++++++++++++++------------------ dlls/ws2_32/socket.c | 70 +++++++++---------- dlls/ws2_32/ws2_32_private.h | 2 +- 4 files changed, 109 insertions(+), 117 deletions(-) diff --git a/dlls/ws2_32/async.c b/dlls/ws2_32/async.c index 5eecddda062..ffa61149094 100644 --- a/dlls/ws2_32/async.c +++ b/dlls/ws2_32/async.c @@ -34,15 +34,7 @@ * whole stuff did not work anyway to other changes). */ -#include <stdarg.h> -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "winsock2.h" -#include "ws2spi.h" - -#include "wine/debug.h" +#include "ws2_32_private.h" WINE_DEFAULT_DEBUG_CHANNEL(winsock); @@ -253,7 +245,7 @@ static void WINAPI async_worker( TP_CALLBACK_INSTANCE *instance, void *context ) struct async_query_header *query = context; LPARAM lparam = query->func( query ); PostMessageW( query->hWnd, query->uMsg, (WPARAM)query->handle, lparam ); - HeapFree( GetProcessHeap(), 0, query ); + free( query ); } @@ -283,7 +275,7 @@ static HANDLE run_query( HWND hWnd, UINT uMsg, LPARAM (*func)(struct async_query if (!TrySubmitThreadpoolCallback( async_worker, query, NULL )) { SetLastError( WSAEWOULDBLOCK ); - HeapFree( GetProcessHeap(), 0, query ); + free( query ); return 0; } return UlongToHandle( handle ); @@ -300,7 +292,7 @@ HANDLE WINAPI WSAAsyncGetHostByAddr(HWND hWnd, UINT uMsg, LPCSTR addr, TRACE("hwnd %p, msg %04x, addr %p[%i]\n", hWnd, uMsg, addr, len ); - if (!(aq = HeapAlloc( GetProcessHeap(), 0, sizeof(*aq) + len ))) + if (!(aq = malloc( sizeof(*aq) + len ))) { SetLastError( WSAEWOULDBLOCK ); return 0; @@ -323,7 +315,7 @@ HANDLE WINAPI WSAAsyncGetHostByName(HWND hWnd, UINT uMsg, LPCSTR name, TRACE("hwnd %p, msg %04x, host %s, buffer %i\n", hWnd, uMsg, debugstr_a(name), buflen ); - if (!(aq = HeapAlloc( GetProcessHeap(), 0, sizeof(*aq) + len ))) + if (!(aq = malloc( sizeof(*aq) + len ))) { SetLastError( WSAEWOULDBLOCK ); return 0; @@ -344,7 +336,7 @@ HANDLE WINAPI WSAAsyncGetProtoByName(HWND hWnd, UINT uMsg, LPCSTR name, TRACE("hwnd %p, msg %04x, proto %s, buffer %i\n", hWnd, uMsg, debugstr_a(name), buflen ); - if (!(aq = HeapAlloc( GetProcessHeap(), 0, sizeof(*aq) + len ))) + if (!(aq = malloc( sizeof(*aq) + len ))) { SetLastError( WSAEWOULDBLOCK ); return 0; @@ -365,7 +357,7 @@ HANDLE WINAPI WSAAsyncGetProtoByNumber(HWND hWnd, UINT uMsg, INT number, TRACE("hwnd %p, msg %04x, num %i\n", hWnd, uMsg, number ); - if (!(aq = HeapAlloc( GetProcessHeap(), 0, sizeof(*aq) ))) + if (!(aq = malloc( sizeof(*aq) ))) { SetLastError( WSAEWOULDBLOCK ); return 0; @@ -386,7 +378,7 @@ HANDLE WINAPI WSAAsyncGetServByName(HWND hWnd, UINT uMsg, LPCSTR name, TRACE("hwnd %p, msg %04x, name %s, proto %s\n", hWnd, uMsg, debugstr_a(name), debugstr_a(proto)); - if (!(aq = HeapAlloc( GetProcessHeap(), 0, sizeof(*aq) + len1 + len2 ))) + if (!(aq = malloc( sizeof(*aq) + len1 + len2 ))) { SetLastError( WSAEWOULDBLOCK ); return 0; @@ -417,7 +409,7 @@ HANDLE WINAPI WSAAsyncGetServByPort(HWND hWnd, UINT uMsg, INT port, TRACE("hwnd %p, msg %04x, port %i, proto %s\n", hWnd, uMsg, port, debugstr_a(proto)); - if (!(aq = HeapAlloc( GetProcessHeap(), 0, sizeof(*aq) + len ))) + if (!(aq = malloc( sizeof(*aq) + len ))) { SetLastError( WSAEWOULDBLOCK ); return 0; diff --git a/dlls/ws2_32/protocol.c b/dlls/ws2_32/protocol.c index 733ef102eea..0b48515091b 100644 --- a/dlls/ws2_32/protocol.c +++ b/dlls/ws2_32/protocol.c @@ -38,10 +38,10 @@ static char *get_fqdn(void) GetComputerNameExA( ComputerNamePhysicalDnsFullyQualified, NULL, &size ); if (GetLastError() != ERROR_MORE_DATA) return NULL; - if (!(ret = HeapAlloc( GetProcessHeap(), 0, size ))) return NULL; + if (!(ret = malloc( size ))) return NULL; if (!GetComputerNameExA( ComputerNamePhysicalDnsFullyQualified, ret, &size )) { - HeapFree( GetProcessHeap(), 0, ret ); + free( ret ); return NULL; } return ret; @@ -57,14 +57,14 @@ static int do_getaddrinfo( const char *node, const char *service, for (;;) { - if (!(params.info = HeapAlloc( GetProcessHeap(), 0, size ))) + if (!(params.info = malloc( size ))) return WSA_NOT_ENOUGH_MEMORY; if (!(ret = WS_CALL( getaddrinfo, &params ))) { *info = params.info; return ret; } - HeapFree( GetProcessHeap(), 0, params.info ); + free( params.info ); if (ret != ERROR_INSUFFICIENT_BUFFER) return ret; } } @@ -103,8 +103,8 @@ int WINAPI getaddrinfo( const char *node, const char *service, if (node[0] == '[' && (close_bracket = strchr(node + 1, ']'))) { - nodev6 = HeapAlloc( GetProcessHeap(), 0, close_bracket - node ); - if (!nodev6) return WSA_NOT_ENOUGH_MEMORY; + if (!(nodev6 = malloc( close_bracket - node ))) + return WSA_NOT_ENOUGH_MEMORY; lstrcpynA( nodev6, node + 1, close_bracket - node ); node = nodev6; } @@ -117,7 +117,7 @@ int WINAPI getaddrinfo( const char *node, const char *service, { if (!fqdn && !(fqdn = get_fqdn())) { - HeapFree( GetProcessHeap(), 0, nodev6 ); + free( nodev6 ); return WSA_NOT_ENOUGH_MEMORY; } if (!strcmp( fqdn, node ) || (!strncmp( fqdn, node, strlen( node ) ) && fqdn[strlen( node )] == '.')) @@ -136,8 +136,8 @@ int WINAPI getaddrinfo( const char *node, const char *service, } } - HeapFree( GetProcessHeap(), 0, fqdn ); - HeapFree( GetProcessHeap(), 0, nodev6 ); + free( fqdn ); + free( nodev6 ); if (!ret && TRACE_ON(winsock)) { @@ -160,7 +160,7 @@ static ADDRINFOEXW *addrinfo_AtoW( const struct addrinfo *ai ) { ADDRINFOEXW *ret; - if (!(ret = HeapAlloc( GetProcessHeap(), 0, sizeof(ADDRINFOEXW) ))) return NULL; + if (!(ret = malloc( sizeof(ADDRINFOEXW) ))) return NULL; ret->ai_flags = ai->ai_flags; ret->ai_family = ai->ai_family; ret->ai_socktype = ai->ai_socktype; @@ -175,19 +175,19 @@ static ADDRINFOEXW *addrinfo_AtoW( const struct addrinfo *ai ) if (ai->ai_canonname) { int len = MultiByteToWideChar( CP_ACP, 0, ai->ai_canonname, -1, NULL, 0 ); - if (!(ret->ai_canonname = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) + if (!(ret->ai_canonname = malloc( len * sizeof(WCHAR) ))) { - HeapFree( GetProcessHeap(), 0, ret ); + free( ret ); return NULL; } MultiByteToWideChar( CP_ACP, 0, ai->ai_canonname, -1, ret->ai_canonname, len ); } if (ai->ai_addr) { - if (!(ret->ai_addr = HeapAlloc( GetProcessHeap(), 0, ai->ai_addrlen ))) + if (!(ret->ai_addr = malloc( ai->ai_addrlen ))) { - HeapFree( GetProcessHeap(), 0, ret->ai_canonname ); - HeapFree( GetProcessHeap(), 0, ret ); + free( ret->ai_canonname ); + free( ret ); return NULL; } memcpy( ret->ai_addr, ai->ai_addr, ai->ai_addrlen ); @@ -217,7 +217,7 @@ static struct addrinfo *addrinfo_WtoA( const struct addrinfoW *ai ) { struct addrinfo *ret; - if (!(ret = HeapAlloc( GetProcessHeap(), 0, sizeof(struct addrinfo) ))) return NULL; + if (!(ret = malloc( sizeof(struct addrinfo) ))) return NULL; ret->ai_flags = ai->ai_flags; ret->ai_family = ai->ai_family; ret->ai_socktype = ai->ai_socktype; @@ -229,19 +229,19 @@ static struct addrinfo *addrinfo_WtoA( const struct addrinfoW *ai ) if (ai->ai_canonname) { int len = WideCharToMultiByte( CP_ACP, 0, ai->ai_canonname, -1, NULL, 0, NULL, NULL ); - if (!(ret->ai_canonname = HeapAlloc( GetProcessHeap(), 0, len ))) + if (!(ret->ai_canonname = malloc( len ))) { - HeapFree( GetProcessHeap(), 0, ret ); + free( ret ); return NULL; } WideCharToMultiByte( CP_ACP, 0, ai->ai_canonname, -1, ret->ai_canonname, len, NULL, NULL ); } if (ai->ai_addr) { - if (!(ret->ai_addr = HeapAlloc( GetProcessHeap(), 0, sizeof(struct sockaddr) ))) + if (!(ret->ai_addr = malloc( sizeof(struct sockaddr) ))) { - HeapFree( GetProcessHeap(), 0, ret->ai_canonname ); - HeapFree( GetProcessHeap(), 0, ret ); + free( ret->ai_canonname ); + free( ret ); return NULL; } memcpy( ret->ai_addr, ai->ai_addr, sizeof(struct sockaddr) ); @@ -276,9 +276,9 @@ static void WINAPI getaddrinfo_callback(TP_CALLBACK_INSTANCE *instance, void *co freeaddrinfo(res); } - HeapFree( GetProcessHeap(), 0, args->nodename ); - HeapFree( GetProcessHeap(), 0, args->servname ); - HeapFree( GetProcessHeap(), 0, args ); + free( args->nodename ); + free( args->servname ); + free( args ); overlapped->Internal = ret; if (completion_routine) completion_routine( ret, 0, overlapped ); @@ -322,20 +322,20 @@ static int getaddrinfoW( const WCHAR *nodename, const WCHAR *servname, ret = EAI_FAIL; goto end; } - if (!(local_nodenameW = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) goto end; + if (!(local_nodenameW = malloc( len * sizeof(WCHAR) ))) goto end; IdnToAscii( 0, nodename, -1, local_nodenameW, len ); } } if (local_nodenameW) { len = WideCharToMultiByte( CP_ACP, 0, local_nodenameW, -1, NULL, 0, NULL, NULL ); - if (!(nodenameA = HeapAlloc( GetProcessHeap(), 0, len ))) goto end; + if (!(nodenameA = malloc( len ))) goto end; WideCharToMultiByte( CP_ACP, 0, local_nodenameW, -1, nodenameA, len, NULL, NULL ); } if (servname) { len = WideCharToMultiByte( CP_ACP, 0, servname, -1, NULL, 0, NULL, NULL ); - if (!(servnameA = HeapAlloc( GetProcessHeap(), 0, len ))) goto end; + if (!(servnameA = malloc( len ))) goto end; WideCharToMultiByte( CP_ACP, 0, servname, -1, servnameA, len, NULL, NULL ); } @@ -349,7 +349,7 @@ static int getaddrinfoW( const WCHAR *nodename, const WCHAR *servname, goto end; } - if (!(args = HeapAlloc( GetProcessHeap(), 0, sizeof(*args) + sizeof(*args->hints) ))) goto end; + if (!(args = malloc( sizeof(*args) + sizeof(*args->hints) ))) goto end; args->overlapped = overlapped; args->completion_routine = completion_routine; args->result = res; @@ -368,13 +368,13 @@ static int getaddrinfoW( const WCHAR *nodename, const WCHAR *servname, overlapped->Internal = WSAEINPROGRESS; if (!TrySubmitThreadpoolCallback( getaddrinfo_callback, args, NULL )) { - HeapFree( GetProcessHeap(), 0, args ); + free( args ); ret = GetLastError(); goto end; } if (local_nodenameW != nodename) - HeapFree( GetProcessHeap(), 0, local_nodenameW ); + free( local_nodenameW ); SetLastError( ERROR_IO_PENDING ); return ERROR_IO_PENDING; } @@ -388,9 +388,9 @@ static int getaddrinfoW( const WCHAR *nodename, const WCHAR *servname, end: if (local_nodenameW != nodename) - HeapFree( GetProcessHeap(), 0, local_nodenameW ); - HeapFree( GetProcessHeap(), 0, nodenameA ); - HeapFree( GetProcessHeap(), 0, servnameA ); + free( local_nodenameW ); + free( nodenameA ); + free( servnameA ); return ret; } @@ -484,7 +484,7 @@ void WINAPI freeaddrinfo( struct addrinfo *info ) { TRACE( "%p\n", info ); - HeapFree( GetProcessHeap(), 0, info ); + free( info ); } @@ -496,10 +496,10 @@ void WINAPI FreeAddrInfoW( ADDRINFOW *ai ) while (ai) { ADDRINFOW *next; - HeapFree( GetProcessHeap(), 0, ai->ai_canonname ); - HeapFree( GetProcessHeap(), 0, ai->ai_addr ); + free( ai->ai_canonname ); + free( ai->ai_addr ); next = ai->ai_next; - HeapFree( GetProcessHeap(), 0, ai ); + free( ai ); ai = next; } } @@ -515,10 +515,10 @@ void WINAPI FreeAddrInfoEx( ADDRINFOEXA *ai ) while (ai) { ADDRINFOEXA *next; - HeapFree( GetProcessHeap(), 0, ai->ai_canonname ); - HeapFree( GetProcessHeap(), 0, ai->ai_addr ); + free( ai->ai_canonname ); + free( ai->ai_addr ); next = ai->ai_next; - HeapFree( GetProcessHeap(), 0, ai ); + free( ai ); ai = next; } } @@ -534,10 +534,10 @@ void WINAPI FreeAddrInfoExW( ADDRINFOEXW *ai ) while (ai) { ADDRINFOEXW *next; - HeapFree( GetProcessHeap(), 0, ai->ai_canonname ); - HeapFree( GetProcessHeap(), 0, ai->ai_addr ); + free( ai->ai_canonname ); + free( ai->ai_addr ); next = ai->ai_next; - HeapFree( GetProcessHeap(), 0, ai ); + free( ai ); ai = next; } } @@ -567,11 +567,11 @@ int WINAPI GetNameInfoW( const SOCKADDR *addr, socklen_t addr_len, WCHAR *host, int ret; char *hostA = NULL, *servA = NULL; - if (host && (!(hostA = HeapAlloc( GetProcessHeap(), 0, host_len )))) + if (host && !(hostA = malloc( host_len ))) return EAI_MEMORY; - if (serv && (!(servA = HeapAlloc( GetProcessHeap(), 0, serv_len )))) + if (serv && !(servA = malloc( serv_len ))) { - HeapFree( GetProcessHeap(), 0, hostA ); + free( hostA ); return EAI_MEMORY; } @@ -582,8 +582,8 @@ int WINAPI GetNameInfoW( const SOCKADDR *addr, socklen_t addr_len, WCHAR *host, if (serv) MultiByteToWideChar( CP_ACP, 0, servA, -1, serv, serv_len ); } - HeapFree( GetProcessHeap(), 0, hostA ); - HeapFree( GetProcessHeap(), 0, servA ); + free( hostA ); + free( servA ); return ret; } @@ -594,9 +594,9 @@ static struct hostent *get_hostent_buffer( unsigned int size ) if (data->he_buffer) { if (data->he_len >= size) return data->he_buffer; - HeapFree( GetProcessHeap(), 0, data->he_buffer ); + free( data->he_buffer ); } - data->he_buffer = HeapAlloc( GetProcessHeap(), 0, (data->he_len = size) ); + data->he_buffer = malloc( (data->he_len = size) ); if (!data->he_buffer) SetLastError(WSAENOBUFS); return data->he_buffer; } @@ -722,8 +722,8 @@ static struct hostent *get_local_ips( char *hostname ) if (GetIpForwardTable( NULL, &route_size, FALSE ) != ERROR_INSUFFICIENT_BUFFER) return NULL; - adapters = HeapAlloc( GetProcessHeap(), 0, adap_size ); - routes = HeapAlloc( GetProcessHeap(), 0, route_size ); + adapters = malloc( adap_size ); + routes = malloc( route_size ); if (!adapters || !routes) goto cleanup; @@ -759,7 +759,7 @@ static struct hostent *get_local_ips( char *hostname ) } if (exists) continue; - route_addrs = heap_realloc( route_addrs, (numroutes + 1) * sizeof(struct route) ); + route_addrs = realloc( route_addrs, (numroutes + 1) * sizeof(struct route) ); if (!route_addrs) goto cleanup; route_addrs[numroutes].interface = ifindex; @@ -808,9 +808,9 @@ static struct hostent *get_local_ips( char *hostname ) *(struct in_addr *)hostlist->h_addr_list[i] = route_addrs[i].addr; cleanup: - HeapFree( GetProcessHeap(), 0, route_addrs ); - HeapFree( GetProcessHeap(), 0, adapters ); - HeapFree( GetProcessHeap(), 0, routes ); + free( route_addrs ); + free( adapters ); + free( routes ); return hostlist; } @@ -1009,10 +1009,10 @@ static struct protoent *get_protoent_buffer( unsigned int size ) if (data->pe_buffer) { if (data->pe_len >= size) return data->pe_buffer; - HeapFree( GetProcessHeap(), 0, data->pe_buffer ); + free( data->pe_buffer ); } data->pe_len = size; - data->pe_buffer = HeapAlloc( GetProcessHeap(), 0, size ); + data->pe_buffer = malloc( size ); if (!data->pe_buffer) SetLastError( WSAENOBUFS ); return data->pe_buffer; } @@ -1191,10 +1191,10 @@ static struct servent *get_servent_buffer( int size ) if (data->se_buffer) { if (data->se_len >= size) return data->se_buffer; - HeapFree( GetProcessHeap(), 0, data->se_buffer ); + free( data->se_buffer ); } data->se_len = size; - data->se_buffer = HeapAlloc( GetProcessHeap(), 0, size ); + data->se_buffer = malloc( size ); if (!data->se_buffer) SetLastError( WSAENOBUFS ); return data->se_buffer; } @@ -1481,7 +1481,7 @@ int WINAPI InetPtonW( int family, const WCHAR *addr, void *buffer ) } len = WideCharToMultiByte( CP_ACP, 0, addr, -1, NULL, 0, NULL, NULL ); - if (!(addrA = HeapAlloc( GetProcessHeap(), 0, len ))) + if (!(addrA = malloc( len ))) { SetLastError( WSA_NOT_ENOUGH_MEMORY ); return -1; @@ -1491,7 +1491,7 @@ int WINAPI InetPtonW( int family, const WCHAR *addr, void *buffer ) ret = inet_pton( family, addrA, buffer ); if (!ret) SetLastError( WSAEINVAL ); - HeapFree( GetProcessHeap(), 0, addrA ); + free( addrA ); return ret; } @@ -1627,14 +1627,14 @@ int WINAPI WSAStringToAddressW( WCHAR *string, int family, WSAPROTOCOL_INFOW *pr } sizeA = WideCharToMultiByte( CP_ACP, 0, string, -1, NULL, 0, NULL, NULL ); - if (!(stringA = HeapAlloc( GetProcessHeap(), 0, sizeA ))) + if (!(stringA = malloc( sizeA ))) { SetLastError( WSA_NOT_ENOUGH_MEMORY ); return -1; } WideCharToMultiByte( CP_ACP, 0, string, -1, stringA, sizeA, NULL, NULL ); ret = WSAStringToAddressA( stringA, family, protocol_infoA, addr, addr_len ); - HeapFree( GetProcessHeap(), 0, stringA ); + free( stringA ); return ret; } diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index c991d212a07..a5461ae9327 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -361,7 +361,7 @@ static BOOL socket_list_add(SOCKET socket) } } new_size = max(socket_list_size * 2, 8); - if (!(new_array = heap_realloc(socket_list, new_size * sizeof(*socket_list)))) + if (!(new_array = realloc( socket_list, new_size * sizeof(*socket_list) ))) { LeaveCriticalSection(&cs_socket_list); return FALSE; @@ -508,30 +508,30 @@ static DWORD NtStatusToWSAError( NTSTATUS status ) struct per_thread_data *get_per_thread_data(void) { - struct per_thread_data * ptb = NtCurrentTeb()->WinSockData; - /* lazy initialization */ - if (!ptb) + struct per_thread_data *data = NtCurrentTeb()->WinSockData; + + if (!data) { - ptb = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*ptb) ); - NtCurrentTeb()->WinSockData = ptb; + data = calloc( 1, sizeof(*data) ); + NtCurrentTeb()->WinSockData = data; } - return ptb; + return data; } static void free_per_thread_data(void) { - struct per_thread_data * ptb = NtCurrentTeb()->WinSockData; + struct per_thread_data *data = NtCurrentTeb()->WinSockData; - if (!ptb) return; + if (!data) return; - CloseHandle( ptb->sync_event ); + CloseHandle( data->sync_event ); /* delete scratch buffers */ - HeapFree( GetProcessHeap(), 0, ptb->he_buffer ); - HeapFree( GetProcessHeap(), 0, ptb->se_buffer ); - HeapFree( GetProcessHeap(), 0, ptb->pe_buffer ); + free( data->he_buffer ); + free( data->se_buffer ); + free( data->pe_buffer ); - HeapFree( GetProcessHeap(), 0, ptb ); + free( data ); NtCurrentTeb()->WinSockData = NULL; } @@ -1108,12 +1108,12 @@ int WINAPI bind( SOCKET s, const struct sockaddr *addr, int len ) if (!(sync_event = get_sync_event())) return -1; - params = HeapAlloc( GetProcessHeap(), 0, sizeof(int) + len ); - ret_addr = HeapAlloc( GetProcessHeap(), 0, len ); + params = malloc( sizeof(int) + len ); + ret_addr = malloc( len ); if (!params || !ret_addr) { - HeapFree( GetProcessHeap(), 0, params ); - HeapFree( GetProcessHeap(), 0, ret_addr ); + free( params ); + free( ret_addr ); SetLastError( WSAENOBUFS ); return -1; } @@ -1129,8 +1129,8 @@ int WINAPI bind( SOCKET s, const struct sockaddr *addr, int len ) status = io.u.Status; } - HeapFree( GetProcessHeap(), 0, params ); - HeapFree( GetProcessHeap(), 0, ret_addr ); + free( params ); + free( ret_addr ); SetLastError( NtStatusToWSAError( status ) ); return status ? -1 : 0; @@ -1175,7 +1175,7 @@ int WINAPI connect( SOCKET s, const struct sockaddr *addr, int len ) if (!(sync_event = get_sync_event())) return -1; - if (!(params = HeapAlloc( GetProcessHeap(), 0, sizeof(*params) + len ))) + if (!(params = malloc( sizeof(*params) + len ))) { SetLastError( ERROR_NOT_ENOUGH_MEMORY ); return -1; @@ -1186,7 +1186,7 @@ int WINAPI connect( SOCKET s, const struct sockaddr *addr, int len ) status = NtDeviceIoControlFile( (HANDLE)s, sync_event, NULL, NULL, &io, IOCTL_AFD_WINE_CONNECT, params, sizeof(*params) + len, NULL, 0 ); - HeapFree( GetProcessHeap(), 0, params ); + free( params ); if (status == STATUS_PENDING) { if (WaitForSingleObject( sync_event, INFINITE ) == WAIT_FAILED) return -1; @@ -1235,7 +1235,7 @@ static BOOL WINAPI WS2_ConnectEx( SOCKET s, const struct sockaddr *name, int nam overlapped->Internal = STATUS_PENDING; overlapped->InternalHigh = 0; - if (!(params = HeapAlloc( GetProcessHeap(), 0, sizeof(*params) + namelen + send_len ))) + if (!(params = malloc( sizeof(*params) + namelen + send_len ))) { SetLastError( ERROR_NOT_ENOUGH_MEMORY ); return SOCKET_ERROR; @@ -1248,7 +1248,7 @@ static BOOL WINAPI WS2_ConnectEx( SOCKET s, const struct sockaddr *name, int nam status = NtDeviceIoControlFile( SOCKET2HANDLE(s), overlapped->hEvent, NULL, cvalue, (IO_STATUS_BLOCK *)overlapped, IOCTL_AFD_WINE_CONNECT, params, sizeof(*params) + namelen + send_len, NULL, 0 ); - HeapFree( GetProcessHeap(), 0, params ); + free( params ); if (ret_len) *ret_len = overlapped->InternalHigh; SetLastError( NtStatusToWSAError( status ) ); return !status; @@ -2018,7 +2018,7 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID if (GetAdaptersInfo(NULL, &size) == ERROR_BUFFER_OVERFLOW) { - IP_ADAPTER_INFO *p, *table = HeapAlloc(GetProcessHeap(), 0, size); + IP_ADAPTER_INFO *p, *table = malloc( size ); NTSTATUS status = STATUS_SUCCESS; SOCKET_ADDRESS_LIST *sa_list; SOCKADDR_IN *sockaddr; @@ -2029,7 +2029,7 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID if (!table || GetAdaptersInfo(table, &size)) { - HeapFree(GetProcessHeap(), 0, table); + free( table ); SetLastError( WSAEINVAL ); return -1; } @@ -2041,7 +2041,7 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID if (total > out_size || !out_buff) { *ret_size = total; - HeapFree(GetProcessHeap(), 0, table); + free( table ); SetLastError( WSAEFAULT ); return -1; } @@ -2064,7 +2064,7 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID i++; } - HeapFree(GetProcessHeap(), 0, table); + free( table ); ret = server_ioctl_sock( s, IOCTL_AFD_WINE_COMPLETE_ASYNC, &status, sizeof(status), NULL, 0, ret_size, overlapped, completion ); @@ -2163,10 +2163,10 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID SetLastError( WSAEFAULT ); return -1; } - ipAddrTable = HeapAlloc( GetProcessHeap(), 0, size ); + ipAddrTable = malloc( size ); if (GetIpAddrTable( ipAddrTable, &size, FALSE )) { - HeapFree( GetProcessHeap(), 0, ipAddrTable ); + free( ipAddrTable ); SetLastError( WSAEFAULT ); return -1; } @@ -2180,14 +2180,14 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID { ERR("no matching IP address for interface %d\n", row.dwForwardIfIndex); - HeapFree( GetProcessHeap(), 0, ipAddrTable ); + free( ipAddrTable ); SetLastError( WSAEFAULT ); return -1; } saddr_in->sin_family = AF_INET; saddr_in->sin_addr.S_un.S_addr = ipAddrTable->table[found_index].dwAddr; saddr_in->sin_port = 0; - HeapFree( GetProcessHeap(), 0, ipAddrTable ); + free( ipAddrTable ); ret = server_ioctl_sock( s, IOCTL_AFD_WINE_COMPLETE_ASYNC, &status, sizeof(status), NULL, 0, ret_size, overlapped, completion ); @@ -2520,7 +2520,7 @@ int WINAPI WSAPoll( WSAPOLLFD *fds, ULONG count, int timeout ) if (!(sync_event = get_sync_event())) return -1; params_size = offsetof( struct afd_poll_params, sockets[count] ); - if (!(params = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, params_size ))) + if (!(params = calloc( params_size, 1 ))) { SetLastError(WSAENOBUFS); return SOCKET_ERROR; @@ -2566,7 +2566,7 @@ int WINAPI WSAPoll( WSAPOLLFD *fds, ULONG count, int timeout ) { if (WaitForSingleObject( sync_event, INFINITE ) == WAIT_FAILED) { - HeapFree( GetProcessHeap(), 0, params ); + free( params ); return -1; } status = io.u.Status; @@ -2604,7 +2604,7 @@ int WINAPI WSAPoll( WSAPOLLFD *fds, ULONG count, int timeout ) } if (status == STATUS_TIMEOUT) status = STATUS_SUCCESS; - HeapFree( GetProcessHeap(), 0, params ); + free( params ); SetLastError( NtStatusToWSAError( status ) ); return status ? -1 : ret_count; diff --git a/dlls/ws2_32/ws2_32_private.h b/dlls/ws2_32/ws2_32_private.h index 5e2075b5c9c..85f6b4dbc1c 100644 --- a/dlls/ws2_32/ws2_32_private.h +++ b/dlls/ws2_32/ws2_32_private.h @@ -21,6 +21,7 @@ #include <stdarg.h> #include <stdio.h> +#include <stdlib.h> #include <string.h> #include <limits.h> @@ -50,7 +51,6 @@ #include "wine/afd.h" #include "wine/debug.h" #include "wine/exception.h" -#include "wine/heap.h" #include "wine/unixlib.h" #define DECLARE_CRITICAL_SECTION(cs) \ -- 2.30.2

2 5

[PATCH] ntdll: Always return a value in get_builtin_init_funcs
by Gerald Pfeifer 18 Aug '21

18 Aug '21

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> --- 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) { -- 2.31.1

1 0

[PATCH] configure: Improve resolv lib test for glibc 2.34
by Fabian Maurer 18 Aug '21

18 Aug '21

res_init and res_query don't need lresolv on glibc 2.34. Added another test for ns_initparse and friends. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51635 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index a143f6d3d2a..b4e66435f92 100644 --- a/configure.ac +++ b/configure.ac @@ -1499,7 +1499,7 @@ then AC_LINK_IFELSE([AC_LANG_PROGRAM([[#ifdef HAVE_NETINET_IN_H #include <netinet/in.h> #endif -#include <resolv.h>]],[[if (!(_res.options & RES_INIT)) res_init(); res_query("foo",ns_c_in,0,0,0)]])], +#include <resolv.h>]],[[if (!(_res.options & RES_INIT)) res_init(); res_query("foo",ns_c_in,0,0,0); ns_initparse(0,0,0)]])], [ac_cv_have_resolv=${lib:-"none required"}],[ac_cv_have_resolv="not found"]) test "x$ac_cv_have_resolv" = "xnot found" || break done -- 2.33.0

1 0

[PATCH v5 1/5] ntdll: Check for unsupported socket protocol+option combinations
by Alex Henrie 18 Aug '21

18 Aug '21

Windows supports none of these options on TCP. Linux supports all of them on TCP. Mac OS supports some of them on TCP, but sets EOPNOTSUPP instead of EINVAL for the ones that it doesn't support. So, Wine needs to do its own check for whether the option may be used with the socket. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- v5: - Allow these options to work with raw sockets in addition to UDP sockets - Whether getting or setting the option, always do the check - Don't touch the IO status block --- dlls/ntdll/unix/socket.c | 99 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 98 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index 1ac4365c012..2382794a830 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -1179,7 +1179,7 @@ static NTSTATUS do_getsockopt( HANDLE handle, IO_STATUS_BLOCK *io, int level, ret = getsockopt( fd, level, option, out_buffer, &len ); if (needs_close) close( fd ); if (ret) return sock_errno_to_status( errno ); - io->Information = len; + if (io) io->Information = len; return STATUS_SUCCESS; } @@ -1200,6 +1200,15 @@ static NTSTATUS do_setsockopt( HANDLE handle, IO_STATUS_BLOCK *io, int level, } +static int get_sock_type( HANDLE handle ) +{ + int sock_type; + if (do_getsockopt( handle, NULL, SOL_SOCKET, SO_TYPE, &sock_type, sizeof(sock_type) ) != STATUS_SUCCESS) + return -1; + return sock_type; +} + + NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc_user, IO_STATUS_BLOCK *io, ULONG code, void *in_buffer, ULONG in_size, void *out_buffer, ULONG out_size ) { @@ -1767,22 +1776,46 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc #endif case IOCTL_AFD_WINE_GET_IP_MULTICAST_IF: + { + int sock_type = get_sock_type( handle ); + if (sock_type != SOCK_DGRAM && sock_type != SOCK_RAW) return STATUS_INVALID_PARAMETER; return do_getsockopt( handle, io, IPPROTO_IP, IP_MULTICAST_IF, out_buffer, out_size ); + } case IOCTL_AFD_WINE_SET_IP_MULTICAST_IF: + { + int sock_type = get_sock_type( handle ); + if (sock_type != SOCK_DGRAM && sock_type != SOCK_RAW) return STATUS_INVALID_PARAMETER; return do_setsockopt( handle, io, IPPROTO_IP, IP_MULTICAST_IF, in_buffer, in_size ); + } case IOCTL_AFD_WINE_GET_IP_MULTICAST_LOOP: + { + int sock_type = get_sock_type( handle ); + if (sock_type != SOCK_DGRAM && sock_type != SOCK_RAW) return STATUS_INVALID_PARAMETER; return do_getsockopt( handle, io, IPPROTO_IP, IP_MULTICAST_LOOP, out_buffer, out_size ); + } case IOCTL_AFD_WINE_SET_IP_MULTICAST_LOOP: + { + int sock_type = get_sock_type( handle ); + if (sock_type != SOCK_DGRAM && sock_type != SOCK_RAW) return STATUS_INVALID_PARAMETER; return do_setsockopt( handle, io, IPPROTO_IP, IP_MULTICAST_LOOP, in_buffer, in_size ); + } case IOCTL_AFD_WINE_GET_IP_MULTICAST_TTL: + { + int sock_type = get_sock_type( handle ); + if (sock_type != SOCK_DGRAM && sock_type != SOCK_RAW) return STATUS_INVALID_PARAMETER; return do_getsockopt( handle, io, IPPROTO_IP, IP_MULTICAST_TTL, out_buffer, out_size ); + } case IOCTL_AFD_WINE_SET_IP_MULTICAST_TTL: + { + int sock_type = get_sock_type( handle ); + if (sock_type != SOCK_DGRAM && sock_type != SOCK_RAW) return STATUS_INVALID_PARAMETER; return do_setsockopt( handle, io, IPPROTO_IP, IP_MULTICAST_TTL, in_buffer, in_size ); + } case IOCTL_AFD_WINE_GET_IP_OPTIONS: return do_getsockopt( handle, io, IPPROTO_IP, IP_OPTIONS, out_buffer, out_size ); @@ -1792,16 +1825,32 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc #ifdef IP_PKTINFO case IOCTL_AFD_WINE_GET_IP_PKTINFO: + { + int sock_type = get_sock_type( handle ); + if (sock_type != SOCK_DGRAM && sock_type != SOCK_RAW) return STATUS_INVALID_PARAMETER; return do_getsockopt( handle, io, IPPROTO_IP, IP_PKTINFO, out_buffer, out_size ); + } case IOCTL_AFD_WINE_SET_IP_PKTINFO: + { + int sock_type = get_sock_type( handle ); + if (sock_type != SOCK_DGRAM && sock_type != SOCK_RAW) return STATUS_INVALID_PARAMETER; return do_setsockopt( handle, io, IPPROTO_IP, IP_PKTINFO, in_buffer, in_size ); + } #elif defined(IP_RECVDSTADDR) case IOCTL_AFD_WINE_GET_IP_PKTINFO: + { + int sock_type = get_sock_type( handle ); + if (sock_type != SOCK_DGRAM && sock_type != SOCK_RAW) return STATUS_INVALID_PARAMETER; return do_getsockopt( handle, io, IPPROTO_IP, IP_RECVDSTADDR, out_buffer, out_size ); + } case IOCTL_AFD_WINE_SET_IP_PKTINFO: + { + int sock_type = get_sock_type( handle ); + if (sock_type != SOCK_DGRAM && sock_type != SOCK_RAW) return STATUS_INVALID_PARAMETER; return do_setsockopt( handle, io, IPPROTO_IP, IP_RECVDSTADDR, in_buffer, in_size ); + } #endif case IOCTL_AFD_WINE_GET_IP_TOS: @@ -1890,45 +1939,93 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc #endif case IOCTL_AFD_WINE_GET_IPV6_MULTICAST_HOPS: + { + int sock_type = get_sock_type( handle ); + if (sock_type != SOCK_DGRAM && sock_type != SOCK_RAW) return STATUS_INVALID_PARAMETER; return do_getsockopt( handle, io, IPPROTO_IPV6, IPV6_MULTICAST_HOPS, out_buffer, out_size ); + } case IOCTL_AFD_WINE_SET_IPV6_MULTICAST_HOPS: + { + int sock_type = get_sock_type( handle ); + if (sock_type != SOCK_DGRAM && sock_type != SOCK_RAW) return STATUS_INVALID_PARAMETER; return do_setsockopt( handle, io, IPPROTO_IPV6, IPV6_MULTICAST_HOPS, in_buffer, in_size ); + } case IOCTL_AFD_WINE_GET_IPV6_MULTICAST_IF: + { + int sock_type = get_sock_type( handle ); + if (sock_type != SOCK_DGRAM && sock_type != SOCK_RAW) return STATUS_INVALID_PARAMETER; return do_getsockopt( handle, io, IPPROTO_IPV6, IPV6_MULTICAST_IF, out_buffer, out_size ); + } case IOCTL_AFD_WINE_SET_IPV6_MULTICAST_IF: + { + int sock_type = get_sock_type( handle ); + if (sock_type != SOCK_DGRAM && sock_type != SOCK_RAW) return STATUS_INVALID_PARAMETER; return do_setsockopt( handle, io, IPPROTO_IPV6, IPV6_MULTICAST_IF, in_buffer, in_size ); + } case IOCTL_AFD_WINE_GET_IPV6_MULTICAST_LOOP: + { + int sock_type = get_sock_type( handle ); + if (sock_type != SOCK_DGRAM && sock_type != SOCK_RAW) return STATUS_INVALID_PARAMETER; return do_getsockopt( handle, io, IPPROTO_IPV6, IPV6_MULTICAST_LOOP, out_buffer, out_size ); + } case IOCTL_AFD_WINE_SET_IPV6_MULTICAST_LOOP: + { + int sock_type = get_sock_type( handle ); + if (sock_type != SOCK_DGRAM && sock_type != SOCK_RAW) return STATUS_INVALID_PARAMETER; return do_setsockopt( handle, io, IPPROTO_IPV6, IPV6_MULTICAST_LOOP, in_buffer, in_size ); + } #ifdef IPV6_RECVHOPLIMIT case IOCTL_AFD_WINE_GET_IPV6_RECVHOPLIMIT: + { + int sock_type = get_sock_type( handle ); + if (sock_type != SOCK_DGRAM && sock_type != SOCK_RAW) return STATUS_INVALID_PARAMETER; return do_getsockopt( handle, io, IPPROTO_IPV6, IPV6_RECVHOPLIMIT, out_buffer, out_size ); + } case IOCTL_AFD_WINE_SET_IPV6_RECVHOPLIMIT: + { + int sock_type = get_sock_type( handle ); + if (sock_type != SOCK_DGRAM && sock_type != SOCK_RAW) return STATUS_INVALID_PARAMETER; return do_setsockopt( handle, io, IPPROTO_IPV6, IPV6_RECVHOPLIMIT, in_buffer, in_size ); + } #endif #ifdef IPV6_RECVPKTINFO case IOCTL_AFD_WINE_GET_IPV6_RECVPKTINFO: + { + int sock_type = get_sock_type( handle ); + if (sock_type != SOCK_DGRAM && sock_type != SOCK_RAW) return STATUS_INVALID_PARAMETER; return do_getsockopt( handle, io, IPPROTO_IPV6, IPV6_RECVPKTINFO, out_buffer, out_size ); + } case IOCTL_AFD_WINE_SET_IPV6_RECVPKTINFO: + { + int sock_type = get_sock_type( handle ); + if (sock_type != SOCK_DGRAM && sock_type != SOCK_RAW) return STATUS_INVALID_PARAMETER; return do_setsockopt( handle, io, IPPROTO_IPV6, IPV6_RECVPKTINFO, in_buffer, in_size ); + } #endif #ifdef IPV6_RECVTCLASS case IOCTL_AFD_WINE_GET_IPV6_RECVTCLASS: + { + int sock_type = get_sock_type( handle ); + if (sock_type != SOCK_DGRAM && sock_type != SOCK_RAW) return STATUS_INVALID_PARAMETER; return do_getsockopt( handle, io, IPPROTO_IPV6, IPV6_RECVTCLASS, out_buffer, out_size ); + } case IOCTL_AFD_WINE_SET_IPV6_RECVTCLASS: + { + int sock_type = get_sock_type( handle ); + if (sock_type != SOCK_DGRAM && sock_type != SOCK_RAW) return STATUS_INVALID_PARAMETER; return do_setsockopt( handle, io, IPPROTO_IPV6, IPV6_RECVTCLASS, in_buffer, in_size ); + } #endif case IOCTL_AFD_WINE_GET_IPV6_UNICAST_HOPS: -- 2.32.0

3 11

[PATCH v2 1/3] setupapi: Use a struct driver instead of individual local variables.
by Rémi Bernon 18 Aug '21

18 Aug '21

In enum_compat_drivers_from_file. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v2: Rewording PATCH 1 (hopefully it's better). dlls/setupapi/devinst.c | 37 ++++++++++++++++++++----------------- 1 file changed, 20 insertions(+), 17 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 91001976edd..baef28ac130 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -4644,9 +4644,10 @@ static BOOL version_is_compatible(const WCHAR *version) static void enum_compat_drivers_from_file(struct device *device, const WCHAR *path) { static const WCHAR manufacturerW[] = {'M','a','n','u','f','a','c','t','u','r','e','r',0}; - WCHAR mfg_name[LINE_LEN], mfg_key[LINE_LEN], mfg_key_ext[LINE_LEN], id[MAX_DEVICE_ID_LEN], version[MAX_DEVICE_ID_LEN]; + WCHAR mfg_key[LINE_LEN], id[MAX_DEVICE_ID_LEN], version[MAX_DEVICE_ID_LEN]; + DWORD i, j, k, driver_count = device->driver_count; + struct driver driver, *drivers = device->drivers; INFCONTEXT ctx; - DWORD i, j, k; HINF hinf; TRACE("Enumerating drivers from %s.\n", debugstr_w(path)); @@ -4654,11 +4655,13 @@ static void enum_compat_drivers_from_file(struct device *device, const WCHAR *pa if ((hinf = SetupOpenInfFileW(path, NULL, INF_STYLE_WIN4, NULL)) == INVALID_HANDLE_VALUE) return; + lstrcpyW(driver.inf_path, path); + for (i = 0; SetupGetLineByIndexW(hinf, manufacturerW, i, &ctx); ++i) { - SetupGetStringFieldW(&ctx, 0, mfg_name, ARRAY_SIZE(mfg_name), NULL); + SetupGetStringFieldW(&ctx, 0, driver.manufacturer, ARRAY_SIZE(driver.manufacturer), NULL); if (!SetupGetStringFieldW(&ctx, 1, mfg_key, ARRAY_SIZE(mfg_key), NULL)) - lstrcpyW(mfg_key, mfg_name); + lstrcpyW(mfg_key, driver.manufacturer); if (SetupGetFieldCount(&ctx) >= 2) { @@ -4675,37 +4678,37 @@ static void enum_compat_drivers_from_file(struct device *device, const WCHAR *pa continue; } - if (!SetupDiGetActualSectionToInstallW(hinf, mfg_key, mfg_key_ext, ARRAY_SIZE(mfg_key_ext), NULL, NULL)) + if (!SetupDiGetActualSectionToInstallW(hinf, mfg_key, driver.mfg_key, + ARRAY_SIZE(driver.mfg_key), NULL, NULL)) { WARN("Failed to find section for %s, skipping.\n", debugstr_w(mfg_key)); continue; } - for (j = 0; SetupGetLineByIndexW(hinf, mfg_key_ext, j, &ctx); ++j) + for (j = 0; SetupGetLineByIndexW(hinf, driver.mfg_key, j, &ctx); ++j) { for (k = 2; SetupGetStringFieldW(&ctx, k, id, ARRAY_SIZE(id), NULL); ++k) { if (device_matches_id(device, HardwareId, id) || device_matches_id(device, CompatibleIDs, id)) { - unsigned int count = ++device->driver_count; - - device->drivers = heap_realloc(device->drivers, count * sizeof(*device->drivers)); - lstrcpyW(device->drivers[count - 1].inf_path, path); - lstrcpyW(device->drivers[count - 1].manufacturer, mfg_name); - lstrcpyW(device->drivers[count - 1].mfg_key, mfg_key_ext); - SetupGetStringFieldW(&ctx, 0, device->drivers[count - 1].description, - ARRAY_SIZE(device->drivers[count - 1].description), NULL); - SetupGetStringFieldW(&ctx, 1, device->drivers[count - 1].section, - ARRAY_SIZE(device->drivers[count - 1].section), NULL); + SetupGetStringFieldW(&ctx, 0, driver.description, ARRAY_SIZE(driver.description), NULL); + SetupGetStringFieldW(&ctx, 1, driver.section, ARRAY_SIZE(driver.section), NULL); TRACE("Found compatible driver: manufacturer %s, desc %s.\n", - debugstr_w(mfg_name), debugstr_w(device->drivers[count - 1].description)); + debugstr_w(driver.manufacturer), debugstr_w(driver.description)); + + driver_count++; + drivers = heap_realloc(drivers, driver_count * sizeof(*drivers)); + drivers[driver_count - 1] = driver; } } } } SetupCloseInfFile(hinf); + + device->drivers = drivers; + device->driver_count = driver_count; } /*********************************************************************** -- 2.32.0

2 5

[PATCH v2 1/2] dsound: Commit next audio chunk between play cursor and write cursor to playing.
by Eduard Permyakov 18 Aug '21

18 Aug '21

This region of the audio buffer is forbidden to be written to by the DirectSound specification. The documentation states: "The write cursor is the point after which it is safe to write data into the buffer. The block between the play cursor and the write cursor is already committed to be played, and cannot be changed safely." However, some applications still do this, which has lead to audio glitches only when using the Wine DirectSound implementation. Experiments showed that the native DirctSound implementation will still play the old audio the first time around when the buffer region gets overwritten. Use an approach of copying the next forbidden region into a "committed buffer" to add the same behavior to the Wine implementation. Signed-off-by: Eduard Permyakov <epermyakov(a)codeweavers.com> --- dlls/dsound/buffer.c | 8 ++++++++ dlls/dsound/dsound_convert.c | 30 ++++++++++++++++++++---------- dlls/dsound/dsound_private.h | 5 ++++- dlls/dsound/mixer.c | 19 +++++++++++++++++++ 4 files changed, 51 insertions(+), 11 deletions(-) diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c index dc3b54906ce..df8962f1c0f 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -1081,6 +1081,13 @@ HRESULT secondarybuffer_create(DirectSoundDevice *device, const DSBUFFERDESC *ds /* calculate fragment size and write lead */ DSOUND_RecalcFormat(dsb); + dsb->committedbuff = HeapAlloc(GetProcessHeap(), 0, dsb->writelead); + if(!dsb->committedbuff) { + IDirectSoundBuffer8_Release(&dsb->IDirectSoundBuffer8_iface); + return DSERR_OUTOFMEMORY; + } + FillMemory(dsb->committedbuff, dsb->writelead, dsbd->lpwfxFormat->wBitsPerSample == 8 ? 128 : 0); + if (dsb->dsbd.dwFlags & DSBCAPS_CTRL3D) { dsb->ds3db_ds3db.dwSize = sizeof(DS3DBUFFER); dsb->ds3db_ds3db.vPosition.x = 0.0; @@ -1135,6 +1142,7 @@ void secondarybuffer_destroy(IDirectSoundBufferImpl *This) HeapFree(GetProcessHeap(), 0, This->notifies); HeapFree(GetProcessHeap(), 0, This->pwfx); + HeapFree(GetProcessHeap(), 0, This->committedbuff); if (This->filters) { int i; diff --git a/dlls/dsound/dsound_convert.c b/dlls/dsound/dsound_convert.c index 4735178a9a8..fc2b0cd0797 100644 --- a/dlls/dsound/dsound_convert.c +++ b/dlls/dsound/dsound_convert.c @@ -55,17 +55,27 @@ WINE_DEFAULT_DEBUG_CHANNEL(dsound); #define le32(x) (x) #endif +static BYTE *buff_byte(const IDirectSoundBufferImpl *dsb, DWORD offset) +{ + if(offset >= dsb->sec_mixpos && offset < dsb->sec_mixpos + dsb->writelead) { + return (BYTE*)dsb->committedbuff + (offset - dsb->sec_mixpos); + }else if(offset < (dsb->sec_mixpos + dsb->writelead) % dsb->buflen) { + return (BYTE*)dsb->committedbuff + (dsb->buflen - dsb->sec_mixpos + offset); + }else{ + return dsb->buffer->memory + offset; + } +} + static float get8(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel) { - const BYTE* buf = dsb->buffer->memory; - buf += pos + channel; + const BYTE *buf = buff_byte(dsb, pos + channel); return (buf[0] - 0x80) / (float)0x80; } static float get16(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel) { - const BYTE* buf = dsb->buffer->memory; - const SHORT *sbuf = (const SHORT*)(buf + pos + 2 * channel); + const BYTE *buf = buff_byte(dsb, pos + 2 * channel); + const SHORT *sbuf = (const SHORT*)(buf); SHORT sample = (SHORT)le16(*sbuf); return sample / (float)0x8000; } @@ -73,8 +83,8 @@ static float get16(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel) static float get24(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel) { LONG sample; - const BYTE* buf = dsb->buffer->memory; - buf += pos + 3 * channel; + const BYTE *buf = buff_byte(dsb, pos + 3 * channel); + /* The next expression deliberately has an overflow for buf[2] >= 0x80, this is how negative values are made. */ @@ -84,16 +94,16 @@ static float get24(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel) static float get32(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel) { - const BYTE* buf = dsb->buffer->memory; - const LONG *sbuf = (const LONG*)(buf + pos + 4 * channel); + const BYTE *buf = buff_byte(dsb, pos + 4 * channel); + const LONG *sbuf = (const LONG*)(buf); LONG sample = le32(*sbuf); return sample / (float)0x80000000U; } static float getieee32(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel) { - const BYTE* buf = dsb->buffer->memory; - const float *sbuf = (const float*)(buf + pos + 4 * channel); + const BYTE *buf = buff_byte(dsb, pos + 4 * channel); + const float *sbuf = (const float*)(buf); /* The value will be clipped later, when put into some non-float buffer */ return *sbuf; } diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index bdb9ebee544..a79d62c54da 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -153,7 +153,10 @@ struct IDirectSoundBufferImpl LONG64 freqAccNum; /* used for mixing */ DWORD sec_mixpos; - + /* Holds a copy of the next 'writelead' bytes, to be used for mixing. This makes it + * so that these bytes get played once even if this region of the buffer gets overwritten, + * which is more in-line with native DirectSound behavior. */ + LPVOID committedbuff; /* IDirectSoundNotify fields */ LPDSBPOSITIONNOTIFY notifies; int nrofnotifies; diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c index 124d1e4fba1..32656fbd618 100644 --- a/dlls/dsound/mixer.c +++ b/dlls/dsound/mixer.c @@ -391,6 +391,18 @@ static void cp_fields(IDirectSoundBufferImpl *dsb, UINT count, LONG64 *freqAccNu dsb->sec_mixpos = ipos; } +static void copy_circular(VOID *dstbuff, VOID *srcbuff, DWORD srcoff, DWORD srcsize, DWORD cpysize) +{ + DWORD overflow; + if(cpysize > srcsize - srcoff) { + overflow = cpysize - (srcsize - srcoff); + memcpy(dstbuff, (BYTE*)srcbuff + srcoff, srcsize - srcoff); + memcpy((BYTE*)dstbuff + (srcsize - srcoff), srcbuff, overflow); + }else{ + memcpy(dstbuff, (BYTE*)srcbuff + srcoff, cpysize); + } +} + /** * Calculate the distance between two buffer offsets, taking wraparound * into account. @@ -518,6 +530,8 @@ static DWORD DSOUND_MixInBuffer(IDirectSoundBufferImpl *dsb, float *mix_buffer, INT ilen = DSOUND_BufPtrDiff(dsb->buflen, dsb->sec_mixpos, oldpos); DSOUND_CheckEvent(dsb, oldpos, ilen); } + TRACE("committing %u bytes from offset %u\n", dsb->writelead, dsb->sec_mixpos); + copy_circular(dsb->committedbuff, dsb->buffer->memory, dsb->sec_mixpos, dsb->buflen, dsb->writelead); return frames; } @@ -551,6 +565,11 @@ static DWORD DSOUND_MixOne(IDirectSoundBufferImpl *dsb, float *mix_buffer, DWORD } } + if(dsb->leadin) { + TRACE("committing %u bytes from offset %u\n", dsb->writelead, dsb->sec_mixpos); + copy_circular(dsb->committedbuff, dsb->buffer->memory, dsb->sec_mixpos, dsb->buflen, dsb->writelead); + } + dsb->leadin = FALSE; TRACE("frames (primary) = %i\n", frames); -- 2.17.1

2 2

[PATCH vkd3d 1/8] vkd3d-shader: Implement VKD3D_SHADER_TARGET_GLSL.
by Atharva Nimbalkar 18 Aug '21

18 Aug '21

Signed-off-by: Atharva Nimbalkar <atharvakn(a)gmail.com> --- include/vkd3d_shader.h | 4 ++++ libs/vkd3d-shader/vkd3d_shader_main.c | 10 ++++++++++ libs/vkd3d-shader/vkd3d_shader_private.h | 2 ++ programs/vkd3d-compiler/main.c | 3 +++ 4 files changed, 19 insertions(+) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 5092fac..58e507b 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -491,6 +491,10 @@ enum vkd3d_shader_target_type * the format used for Direct3D shader model 4 and 5 shaders. */ VKD3D_SHADER_TARGET_DXBC_TPF, + /** + * An 'OpenGL Shading Language' shader. + */ + VKD3D_SHADER_TARGET_GLSL, VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_TARGET_TYPE), }; diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 78312a1..a9b5d0a 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -1032,6 +1032,15 @@ static int compile_dxbc_tpf(const struct vkd3d_shader_compile_info *compile_info return ret; } + if (compile_info->target_type == VKD3D_SHADER_TARGET_GLSL) + { + vkd3d_shader_error(message_context, NULL, VKD3D_SHADER_ERROR_GLSL_INTERNAL, + "Internal compiler error: Unhandled instruction."); + vkd3d_shader_parser_destroy(&parser); + vkd3d_shader_free_scan_descriptor_info(&scan_descriptor_info); + return VKD3D_ERROR; + } + if (!(spirv_compiler = vkd3d_dxbc_compiler_create(&parser.shader_version, &parser.shader_desc, compile_info, &scan_descriptor_info, message_context))) { @@ -1280,6 +1289,7 @@ const enum vkd3d_shader_target_type *vkd3d_shader_get_supported_target_types( VKD3D_SHADER_TARGET_SPIRV_TEXT, #endif VKD3D_SHADER_TARGET_D3D_ASM, + VKD3D_SHADER_TARGET_GLSL, }; static const enum vkd3d_shader_target_type hlsl_types[] = diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 8550380..b490b9c 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -115,6 +115,8 @@ enum vkd3d_shader_error VKD3D_SHADER_ERROR_HLSL_NOT_IMPLEMENTED = 5017, VKD3D_SHADER_WARNING_HLSL_IMPLICIT_TRUNCATION = 5300, + + VKD3D_SHADER_ERROR_GLSL_INTERNAL = 6000, }; enum vkd3d_shader_opcode diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index fb19a70..71f90f8 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -90,6 +90,9 @@ target_type_info[] = "dxbc-tpf", "A 'Tokenized Program Format' shader embedded in a DXBC container.\n" " This is the format used for Direct3D shader model 4 and 5 shaders.\n", true}, + {VKD3D_SHADER_TARGET_GLSL, + "glsl", "An 'OpenGL Shading Language' shader.\n", + false} }; static bool read_shader(struct vkd3d_shader_code *shader, FILE *f) -- 2.32.0

5 21

[PATCH] msgsm32.acm: msgsm32 should not perform PCM-to-PCM conversion.
by Hiroki Awata 18 Aug '21

18 Aug '21

If the source and destination are both in a specific PCM format (1 channel, 16bit), acmStreamOpen will select the GSM 6.10 driver in preference to the built-in, causing incorrect conversion. Signed-off-by: Hiroki Awata <castaneai(a)by.black> --- dlls/msacm32/tests/msacm.c | 1 + dlls/msgsm32.acm/msgsm32.c | 3 +++ 2 files changed, 4 insertions(+) diff --git a/dlls/msacm32/tests/msacm.c b/dlls/msacm32/tests/msacm.c index 04b4e090820..82ddb430cd7 100644 --- a/dlls/msacm32/tests/msacm.c +++ b/dlls/msacm32/tests/msacm.c @@ -1056,6 +1056,7 @@ struct stream_output static const struct stream_output expected_output[] = { /* #0: Identical conversion */ {{WAVE_FORMAT_PCM, 1, 8000, 8000, 1, 8}, {WAVE_FORMAT_PCM, 1, 8000, 8000, 1, 8}, {0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63}, 64, FALSE}, + {{WAVE_FORMAT_PCM, 1, 44100, 88200, 2, 16}, {WAVE_FORMAT_PCM, 1, 44100, 88200, 2, 16}, {0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63}, 64, FALSE}, /* #1: 1 -> 2 channels */ {{WAVE_FORMAT_PCM, 1, 8000, 8000, 1, 8}, {WAVE_FORMAT_PCM, 2, 8000, 16000, 2, 8}, {0,0,1,1,2,2,3,3,4,4,5,5,6,6,7,7,8,8,9,9,10,10,11,11,12,12,13,13,14,14,15,15,16,16,17,17,18,18,19,19,20,20,21,21,22,22,23,23,24,24,25,25,26,26,27,27,28,28,29,29,30,30,31,31,32,32,33,33,34,34,35,35,36,36,37,37,38,38,39,39,40,40,41,41,42,42,43,43,44,44,45,45,46,46,47,47,48,48,49,49,50,50,51,51,52,52,53,53,54,54,55,55,56,56,57,57,58,58,59,59,60,60,61,61,62,62,63,63}, 128, FALSE}, diff --git a/dlls/msgsm32.acm/msgsm32.c b/dlls/msgsm32.acm/msgsm32.c index bd54aa4fb36..d1d4c01d0e7 100644 --- a/dlls/msgsm32.acm/msgsm32.c +++ b/dlls/msgsm32.acm/msgsm32.c @@ -364,6 +364,9 @@ static LRESULT GSM_StreamOpen(PACMDRVSTREAMINSTANCE adsi) { int used = 1; gsm r; + if (adsi->pwfxSrc->wFormatTag != WAVE_FORMAT_GSM610 && adsi->pwfxDst->wFormatTag != WAVE_FORMAT_GSM610) + return MMSYSERR_NOTSUPPORTED; + if (!GSM_FormatValidate(adsi->pwfxSrc) || !GSM_FormatValidate(adsi->pwfxDst)) return MMSYSERR_NOTSUPPORTED; -- 2.27.0

2 1

[PATCH 8/8] msvcrt: Move _Trace_ppl_function to concurrency.c.
by Piotr Caban 18 Aug '21

18 Aug '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcr100/msvcr100.spec | 4 ++-- dlls/msvcr110/msvcr110.spec | 4 ++-- dlls/msvcr120/msvcr120.spec | 4 ++-- dlls/msvcrt/concurrency.c | 19 +++++++++++++++++++ dlls/msvcrt/cpp.c | 23 ----------------------- 5 files changed, 25 insertions(+), 29 deletions(-)

1 0

[PATCH 7/8] msvcrt: Move _Trace_agents function to concurrency.c.
by Piotr Caban 18 Aug '21

18 Aug '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/concurrency.c | 8 ++++++++ dlls/msvcrt/misc.c | 6 ------ 2 files changed, 8 insertions(+), 6 deletions(-)

1 0

[PATCH 6/8] msvcrt: Move lock Concurrency functions to concurrency.c.
by Piotr Caban 18 Aug '21

18 Aug '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/concurrency.c | 1307 ++++++++++++++++++++++++++++++++++++ dlls/msvcrt/lock.c | 1310 ------------------------------------- 2 files changed, 1307 insertions(+), 1310 deletions(-)

1 0

[PATCH 5/8] msvcrt: Rename scheduler.c file to concurrency.c.
by Piotr Caban 18 Aug '21

18 Aug '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcr100/Makefile.in | 2 +- dlls/msvcr110/Makefile.in | 2 +- dlls/msvcr120/Makefile.in | 2 +- dlls/msvcrt/Makefile.in | 2 +- dlls/msvcrt/{scheduler.c => concurrency.c} | 6 +++--- dlls/msvcrt/main.c | 4 ++-- dlls/msvcrt/msvcrt.h | 4 ++-- 7 files changed, 11 insertions(+), 11 deletions(-) rename dlls/msvcrt/{scheduler.c => concurrency.c} (99%)

1 0

[PATCH 4/8] msvcrt: Add macro that defines type_info vtable.
by Piotr Caban 18 Aug '21

18 Aug '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/cpp.c | 27 ++------------------------- dlls/msvcrt/cxx.h | 31 ++++++++++++++++++++++++++++++- dlls/msvcrt/lock.c | 1 - dlls/msvcrt/scheduler.c | 2 -- 4 files changed, 32 insertions(+), 29 deletions(-)

1 0

[PATCH 3/8] msvcp90: Remove type_info_dtor helper from CREATE_TYPE_INFO_VTABLE macro.
by Piotr Caban 18 Aug '21

18 Aug '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp90/cxx.h | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-)

1 0

[PATCH 2/8] msvcrt: Allow specifying destructor in DEFINE_CXX_DATA macro.
by Piotr Caban 18 Aug '21

18 Aug '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/cpp.c | 80 +++++++---------------------------------- dlls/msvcrt/cppexcept.h | 53 +++++++++++++++++---------- 2 files changed, 48 insertions(+), 85 deletions(-)

1 0

[PATCH 1/8] msvcrt: Use new() for allocations returning BadAlloc exception.
by Piotr Caban 18 Aug '21

18 Aug '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/lock.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-)

1 0

[PATCH] dwrite/tests: Use winetest context for some tests.
by Nikolay Sivov 18 Aug '21

18 Aug '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/tests/analyzer.c | 77 +++--- dlls/dwrite/tests/font.c | 443 +++++++++++++++++++---------------- 2 files changed, 285 insertions(+), 235 deletions(-) diff --git a/dlls/dwrite/tests/analyzer.c b/dlls/dwrite/tests/analyzer.c index 0294bbfb719..358e3e4780d 100644 --- a/dlls/dwrite/tests/analyzer.c +++ b/dlls/dwrite/tests/analyzer.c @@ -2164,7 +2164,8 @@ static void test_ApplyCharacterSpacing(void) return; } - for (i = 0; i < ARRAY_SIZE(spacing_tests); i++) { + for (i = 0; i < ARRAY_SIZE(spacing_tests); ++i) + { const struct spacing_test *ptr = spacing_tests + i; DWRITE_GLYPH_OFFSET offsets[3]; UINT32 glyph_count; @@ -2196,6 +2197,8 @@ static void test_ApplyCharacterSpacing(void) props[0].isClusterStart = props[1].isClusterStart = 1; } + winetest_push_context("Test %u", i); + hr = IDWriteTextAnalyzer1_ApplyCharacterSpacing(analyzer1, ptr->leading, ptr->trailing, @@ -2208,35 +2211,35 @@ static void test_ApplyCharacterSpacing(void) props, advances, offsets); - ok(hr == (ptr->min_advance < 0.0f ? E_INVALIDARG : S_OK), "%d: got 0x%08x\n", i, hr); + ok(hr == (ptr->min_advance < 0.0f ? E_INVALIDARG : S_OK), "Unexpected hr %#x.\n", hr); if (hr == S_OK) { - ok(ptr->modified_advances[0] == advances[0], "%d: got advance[0] %.2f, expected %.2f\n", i, advances[0], ptr->modified_advances[0]); - ok(ptr->modified_advances[1] == advances[1], "%d: got advance[1] %.2f, expected %.2f\n", i, advances[1], ptr->modified_advances[1]); + ok(ptr->modified_advances[0] == advances[0], "Got advance[0] %.2f, expected %.2f.\n", advances[0], ptr->modified_advances[0]); + ok(ptr->modified_advances[1] == advances[1], "Got advance[1] %.2f, expected %.2f.\n", advances[1], ptr->modified_advances[1]); if (glyph_count > 2) - ok(ptr->modified_advances[2] == advances[2], "%d: got advance[2] %.2f, expected %.2f\n", i, advances[2], ptr->modified_advances[2]); + ok(ptr->modified_advances[2] == advances[2], "Got advance[2] %.2f, expected %.2f.\n", advances[2], ptr->modified_advances[2]); - ok(ptr->modified_offsets[0] == offsets[0].advanceOffset, "%d: got offset[0] %.2f, expected %.2f\n", i, + ok(ptr->modified_offsets[0] == offsets[0].advanceOffset, "Got offset[0] %.2f, expected %.2f.\n", offsets[0].advanceOffset, ptr->modified_offsets[0]); - ok(ptr->modified_offsets[1] == offsets[1].advanceOffset, "%d: got offset[1] %.2f, expected %.2f\n", i, + ok(ptr->modified_offsets[1] == offsets[1].advanceOffset, "Got offset[1] %.2f, expected %.2f.\n", offsets[1].advanceOffset, ptr->modified_offsets[1]); if (glyph_count > 2) - ok(ptr->modified_offsets[2] == offsets[2].advanceOffset, "%d: got offset[2] %.2f, expected %.2f\n", i, + ok(ptr->modified_offsets[2] == offsets[2].advanceOffset, "Got offset[2] %.2f, expected %.2f.\n", offsets[2].advanceOffset, ptr->modified_offsets[2]); - ok(offsets[0].ascenderOffset == 23.0, "%d: unexpected ascenderOffset %.2f\n", i, offsets[0].ascenderOffset); - ok(offsets[1].ascenderOffset == 32.0, "%d: unexpected ascenderOffset %.2f\n", i, offsets[1].ascenderOffset); - ok(offsets[2].ascenderOffset == 31.0, "%d: unexpected ascenderOffset %.2f\n", i, offsets[2].ascenderOffset); + ok(offsets[0].ascenderOffset == 23.0, "Unexpected ascenderOffset %.2f.\n", offsets[0].ascenderOffset); + ok(offsets[1].ascenderOffset == 32.0, "Unexpected ascenderOffset %.2f.\n", offsets[1].ascenderOffset); + ok(offsets[2].ascenderOffset == 31.0, "Unexpected ascenderOffset %.2f.\n", offsets[2].ascenderOffset); } else { - ok(ptr->modified_advances[0] == advances[0], "%d: got advance[0] %.2f, expected %.2f\n", i, advances[0], ptr->modified_advances[0]); - ok(ptr->modified_advances[1] == advances[1], "%d: got advance[1] %.2f, expected %.2f\n", i, advances[1], ptr->modified_advances[1]); - ok(ptr->offsets[0] == offsets[0].advanceOffset, "%d: got offset[0] %.2f, expected %.2f\n", i, + ok(ptr->modified_advances[0] == advances[0], "Got advance[0] %.2f, expected %.2f.\n", advances[0], ptr->modified_advances[0]); + ok(ptr->modified_advances[1] == advances[1], "Got advance[1] %.2f, expected %.2f.\n", advances[1], ptr->modified_advances[1]); + ok(ptr->offsets[0] == offsets[0].advanceOffset, "Got offset[0] %.2f, expected %.2f.\n", offsets[0].advanceOffset, ptr->modified_offsets[0]); - ok(ptr->offsets[1] == offsets[1].advanceOffset, "%d: got offset[1] %.2f, expected %.2f\n", i, + ok(ptr->offsets[1] == offsets[1].advanceOffset, "Got offset[1] %.2f, expected %.2f.\n", offsets[1].advanceOffset, ptr->modified_offsets[1]); - ok(offsets[0].ascenderOffset == 23.0, "%d: unexpected ascenderOffset %.2f\n", i, offsets[0].ascenderOffset); - ok(offsets[1].ascenderOffset == 32.0, "%d: unexpected ascenderOffset %.2f\n", i, offsets[1].ascenderOffset); + ok(offsets[0].ascenderOffset == 23.0, "Unexpected ascenderOffset %.2f.\n", offsets[0].ascenderOffset); + ok(offsets[1].ascenderOffset == 32.0, "Unexpected ascenderOffset %.2f.\n", offsets[1].ascenderOffset); } /* same, with argument aliasing */ @@ -2262,37 +2265,41 @@ static void test_ApplyCharacterSpacing(void) props, advances, offsets); - ok(hr == (ptr->min_advance < 0.0f ? E_INVALIDARG : S_OK), "%d: got 0x%08x\n", i, hr); + ok(hr == (ptr->min_advance < 0.0f ? E_INVALIDARG : S_OK), "Unexpected hr %#x.\n", hr); - if (hr == S_OK) { - ok(ptr->modified_advances[0] == advances[0], "%d: got advance[0] %.2f, expected %.2f\n", i, advances[0], ptr->modified_advances[0]); - ok(ptr->modified_advances[1] == advances[1], "%d: got advance[1] %.2f, expected %.2f\n", i, advances[1], ptr->modified_advances[1]); + if (hr == S_OK) + { + ok(ptr->modified_advances[0] == advances[0], "Got advance[0] %.2f, expected %.2f.\n", advances[0], ptr->modified_advances[0]); + ok(ptr->modified_advances[1] == advances[1], "Got advance[1] %.2f, expected %.2f.\n", advances[1], ptr->modified_advances[1]); if (glyph_count > 2) - ok(ptr->modified_advances[2] == advances[2], "%d: got advance[2] %.2f, expected %.2f\n", i, advances[2], ptr->modified_advances[2]); + ok(ptr->modified_advances[2] == advances[2], "Got advance[2] %.2f, expected %.2f.\n", advances[2], ptr->modified_advances[2]); - ok(ptr->modified_offsets[0] == offsets[0].advanceOffset, "%d: got offset[0] %.2f, expected %.2f\n", i, + ok(ptr->modified_offsets[0] == offsets[0].advanceOffset, "Got offset[0] %.2f, expected %.2f.\n", offsets[0].advanceOffset, ptr->modified_offsets[0]); - ok(ptr->modified_offsets[1] == offsets[1].advanceOffset, "%d: got offset[1] %.2f, expected %.2f\n", i, + ok(ptr->modified_offsets[1] == offsets[1].advanceOffset, "Got offset[1] %.2f, expected %.2f.\n", offsets[1].advanceOffset, ptr->modified_offsets[1]); if (glyph_count > 2) - ok(ptr->modified_offsets[2] == offsets[2].advanceOffset, "%d: got offset[2] %.2f, expected %.2f\n", i, + ok(ptr->modified_offsets[2] == offsets[2].advanceOffset, "Got offset[2] %.2f, expected %.2f.\n", offsets[2].advanceOffset, ptr->modified_offsets[2]); - ok(offsets[0].ascenderOffset == 23.0f, "%d: unexpected ascenderOffset %.2f\n", i, offsets[0].ascenderOffset); - ok(offsets[1].ascenderOffset == 32.0f, "%d: unexpected ascenderOffset %.2f\n", i, offsets[1].ascenderOffset); - ok(offsets[2].ascenderOffset == 31.0f, "%d: unexpected ascenderOffset %.2f\n", i, offsets[2].ascenderOffset); + ok(offsets[0].ascenderOffset == 23.0f, "Unexpected ascenderOffset %.2f.\n", offsets[0].ascenderOffset); + ok(offsets[1].ascenderOffset == 32.0f, "Unexpected ascenderOffset %.2f.\n", offsets[1].ascenderOffset); + ok(offsets[2].ascenderOffset == 31.0f, "Unexpected ascenderOffset %.2f.\n", offsets[2].ascenderOffset); } - else { + else + { /* with aliased advances original values are retained */ - ok(ptr->advances[0] == advances[0], "%d: got advance[0] %.2f, expected %.2f\n", i, advances[0], ptr->advances[0]); - ok(ptr->advances[1] == advances[1], "%d: got advance[1] %.2f, expected %.2f\n", i, advances[1], ptr->advances[1]); - ok(ptr->offsets[0] == offsets[0].advanceOffset, "%d: got offset[0] %.2f, expected %.2f\n", i, + ok(ptr->advances[0] == advances[0], "Got advance[0] %.2f, expected %.2f.\n", advances[0], ptr->advances[0]); + ok(ptr->advances[1] == advances[1], "Got advance[1] %.2f, expected %.2f.\n", advances[1], ptr->advances[1]); + ok(ptr->offsets[0] == offsets[0].advanceOffset, "Got offset[0] %.2f, expected %.2f.\n", offsets[0].advanceOffset, ptr->modified_offsets[0]); - ok(ptr->offsets[1] == offsets[1].advanceOffset, "%d: got offset[1] %.2f, expected %.2f\n", i, + ok(ptr->offsets[1] == offsets[1].advanceOffset, "Got offset[1] %.2f, expected %.2f.\n", offsets[1].advanceOffset, ptr->modified_offsets[1]); - ok(offsets[0].ascenderOffset == 23.0f, "%d: unexpected ascenderOffset %.2f\n", i, offsets[0].ascenderOffset); - ok(offsets[1].ascenderOffset == 32.0f, "%d: unexpected ascenderOffset %.2f\n", i, offsets[1].ascenderOffset); + ok(offsets[0].ascenderOffset == 23.0f, "Unexpected ascenderOffset %.2f.\n", offsets[0].ascenderOffset); + ok(offsets[1].ascenderOffset == 32.0f, "Unexpected ascenderOffset %.2f.\n", offsets[1].ascenderOffset); } + + winetest_pop_context(); } IDWriteTextAnalyzer1_Release(analyzer1); diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index be367463414..ba4a2793372 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -2133,56 +2133,61 @@ static void check_font_metrics(const WCHAR *nameW, IDWriteFontFace *fontface, co else IDWriteFontFace_GetMetrics(fontface, (DWRITE_FONT_METRICS *)&metrics); - ok(metrics.designUnitsPerEm == expected->designUnitsPerEm, "font %s: designUnitsPerEm %u, expected %u\n", - wine_dbgstr_w(nameW), metrics.designUnitsPerEm, expected->designUnitsPerEm); - ok(metrics.ascent == expected->ascent, "font %s: ascent %u, expected %u\n", wine_dbgstr_w(nameW), metrics.ascent, - expected->ascent); - ok(metrics.descent == expected->descent, "font %s: descent %u, expected %u\n", wine_dbgstr_w(nameW), - metrics.descent, expected->descent); - ok(metrics.lineGap == expected->lineGap, "font %s: lineGap %d, expected %d\n", wine_dbgstr_w(nameW), - metrics.lineGap, expected->lineGap); - ok(metrics.underlinePosition == expected->underlinePosition, "font %s: underlinePosition %d, expected %d\n", - wine_dbgstr_w(nameW), metrics.underlinePosition, expected->underlinePosition); - ok(metrics.underlineThickness == expected->underlineThickness, "font %s: underlineThickness %u, " - "expected %u\n", wine_dbgstr_w(nameW), metrics.underlineThickness, expected->underlineThickness); - ok(metrics.strikethroughPosition == expected->strikethroughPosition, "font %s: strikethroughPosition %d, expected %d\n", - wine_dbgstr_w(nameW), metrics.strikethroughPosition, expected->strikethroughPosition); - ok(metrics.strikethroughThickness == expected->strikethroughThickness, "font %s: strikethroughThickness %u, " - "expected %u\n", wine_dbgstr_w(nameW), metrics.strikethroughThickness, expected->strikethroughThickness); - - if (has_metrics1) { + winetest_push_context("Font %s", wine_dbgstr_w(nameW)); + + ok(metrics.designUnitsPerEm == expected->designUnitsPerEm, "designUnitsPerEm %u, expected %u.\n", + metrics.designUnitsPerEm, expected->designUnitsPerEm); + ok(metrics.ascent == expected->ascent, "ascent %u, expected %u.\n", metrics.ascent, expected->ascent); + ok(metrics.descent == expected->descent, "descent %u, expected %u.\n", metrics.descent, expected->descent); + ok(metrics.lineGap == expected->lineGap, "lineGap %d, expected %d.\n", metrics.lineGap, expected->lineGap); + ok(metrics.underlinePosition == expected->underlinePosition, "underlinePosition %d, expected %d.\n", + metrics.underlinePosition, expected->underlinePosition); + ok(metrics.underlineThickness == expected->underlineThickness, "underlineThickness %u, expected %u.\n", + metrics.underlineThickness, expected->underlineThickness); + ok(metrics.strikethroughPosition == expected->strikethroughPosition, "strikethroughPosition %d, expected %d.\n", + metrics.strikethroughPosition, expected->strikethroughPosition); + ok(metrics.strikethroughThickness == expected->strikethroughThickness, "strikethroughThickness %u, " + "expected %u.\n", metrics.strikethroughThickness, expected->strikethroughThickness); + + if (has_metrics1) + { /* For simulated faces metrics are adjusted. Enable tests when exact pattern is understood. */ if (simulations & DWRITE_FONT_SIMULATIONS_OBLIQUE) + { + winetest_pop_context(); return; + } - ok(metrics.hasTypographicMetrics == expected->hasTypographicMetrics, "font %s: hasTypographicMetrics %d, " - "expected %d\n", wine_dbgstr_w(nameW), metrics.hasTypographicMetrics, expected->hasTypographicMetrics); - ok(metrics.glyphBoxLeft == expected->glyphBoxLeft, "font %s: glyphBoxLeft %d, expected %d\n", - wine_dbgstr_w(nameW), metrics.glyphBoxLeft, expected->glyphBoxLeft); - ok(metrics.glyphBoxTop == expected->glyphBoxTop, "font %s: glyphBoxTop %d, expected %d\n", - wine_dbgstr_w(nameW), metrics.glyphBoxTop, expected->glyphBoxTop); - ok(metrics.glyphBoxRight == expected->glyphBoxRight, "font %s: glyphBoxRight %d, expected %d\n", - wine_dbgstr_w(nameW), metrics.glyphBoxRight, expected->glyphBoxRight); - ok(metrics.glyphBoxBottom == expected->glyphBoxBottom, "font %s: glyphBoxBottom %d, expected %d\n", - wine_dbgstr_w(nameW), metrics.glyphBoxBottom, expected->glyphBoxBottom); - - ok(metrics.subscriptPositionX == expected->subscriptPositionX, "font %s: subscriptPositionX %d, expected %d\n", - wine_dbgstr_w(nameW), metrics.subscriptPositionX, expected->subscriptPositionX); - ok(metrics.subscriptPositionY == expected->subscriptPositionY, "font %s: subscriptPositionY %d, expected %d\n", - wine_dbgstr_w(nameW), metrics.subscriptPositionY, expected->subscriptPositionY); - ok(metrics.subscriptSizeX == expected->subscriptSizeX, "font %s: subscriptSizeX %d, expected %d\n", - wine_dbgstr_w(nameW), metrics.subscriptSizeX, expected->subscriptSizeX); - ok(metrics.subscriptSizeY == expected->subscriptSizeY, "font %s: subscriptSizeY %d, expected %d\n", - wine_dbgstr_w(nameW), metrics.subscriptSizeY, expected->subscriptSizeY); - ok(metrics.superscriptPositionX == expected->superscriptPositionX, "font %s: superscriptPositionX %d, expected %d\n", - wine_dbgstr_w(nameW), metrics.superscriptPositionX, expected->superscriptPositionX); - ok(metrics.superscriptPositionY == expected->superscriptPositionY, "font %s: superscriptPositionY %d, expected %d\n", - wine_dbgstr_w(nameW), metrics.superscriptPositionY, expected->superscriptPositionY); - ok(metrics.superscriptSizeX == expected->superscriptSizeX, "font %s: superscriptSizeX %d, expected %d\n", - wine_dbgstr_w(nameW), metrics.superscriptSizeX, expected->superscriptSizeX); - ok(metrics.superscriptSizeY == expected->superscriptSizeY, "font %s: superscriptSizeY %d, expected %d\n", - wine_dbgstr_w(nameW), metrics.superscriptSizeY, expected->superscriptSizeY); - } + ok(metrics.hasTypographicMetrics == expected->hasTypographicMetrics, "hasTypographicMetrics %d, " + "expected %d.\n", metrics.hasTypographicMetrics, expected->hasTypographicMetrics); + ok(metrics.glyphBoxLeft == expected->glyphBoxLeft, "glyphBoxLeft %d, expected %d.\n", + metrics.glyphBoxLeft, expected->glyphBoxLeft); + ok(metrics.glyphBoxTop == expected->glyphBoxTop, "glyphBoxTop %d, expected %d.\n", + metrics.glyphBoxTop, expected->glyphBoxTop); + ok(metrics.glyphBoxRight == expected->glyphBoxRight, "glyphBoxRight %d, expected %d.\n", + metrics.glyphBoxRight, expected->glyphBoxRight); + ok(metrics.glyphBoxBottom == expected->glyphBoxBottom, "glyphBoxBottom %d, expected %d.\n", + metrics.glyphBoxBottom, expected->glyphBoxBottom); + + ok(metrics.subscriptPositionX == expected->subscriptPositionX, "subscriptPositionX %d, expected %d.\n", + metrics.subscriptPositionX, expected->subscriptPositionX); + ok(metrics.subscriptPositionY == expected->subscriptPositionY, "subscriptPositionY %d, expected %d.\n", + metrics.subscriptPositionY, expected->subscriptPositionY); + ok(metrics.subscriptSizeX == expected->subscriptSizeX, "subscriptSizeX %d, expected %d.\n", + metrics.subscriptSizeX, expected->subscriptSizeX); + ok(metrics.subscriptSizeY == expected->subscriptSizeY, "subscriptSizeY %d, expected %d.\n", + metrics.subscriptSizeY, expected->subscriptSizeY); + ok(metrics.superscriptPositionX == expected->superscriptPositionX, "superscriptPositionX %d, expected %d.\n", + metrics.superscriptPositionX, expected->superscriptPositionX); + ok(metrics.superscriptPositionY == expected->superscriptPositionY, "superscriptPositionY %d, expected %d.\n", + metrics.superscriptPositionY, expected->superscriptPositionY); + ok(metrics.superscriptSizeX == expected->superscriptSizeX, "superscriptSizeX %d, expected %d.\n", + metrics.superscriptSizeX, expected->superscriptSizeX); + ok(metrics.superscriptSizeY == expected->superscriptSizeY, "superscriptSizeY %d, expected %d.\n", + metrics.superscriptSizeY, expected->superscriptSizeY); + } + + winetest_pop_context(); } static void get_enus_string(IDWriteLocalizedStrings *strings, WCHAR *buff, UINT32 size) @@ -2873,21 +2878,22 @@ if (0) /* crashes on native */ sim = IDWriteFontFace_GetSimulations(fontface); get_logfont_from_font(font, &lf); - ok(logfont.lfWeight == lf.lfWeight, "%s: unexpected lfWeight %d, expected lfWeight %d, font weight %d, " - "bold simulation %s\n", wine_dbgstr_w(nameW), logfont.lfWeight, lf.lfWeight, IDWriteFont_GetWeight(font), - sim & DWRITE_FONT_SIMULATIONS_BOLD ? "yes" : "no"); - ok(logfont.lfItalic == lf.lfItalic, "%s: unexpected italic flag %d, oblique simulation %s\n", - wine_dbgstr_w(nameW), logfont.lfItalic, sim & DWRITE_FONT_SIMULATIONS_OBLIQUE ? "yes" : "no"); - ok(!lstrcmpW(logfont.lfFaceName, lf.lfFaceName), "%s: unexpected facename %s, expected %s\n", - wine_dbgstr_w(nameW), wine_dbgstr_w(logfont.lfFaceName), wine_dbgstr_w(lf.lfFaceName)); - - ok(logfont.lfOutPrecision == OUT_OUTLINE_PRECIS, "%s: unexpected output precision %d\n", wine_dbgstr_w(nameW), - logfont.lfOutPrecision); - ok(logfont.lfClipPrecision == CLIP_DEFAULT_PRECIS, "%s: unexpected clipping precision %d\n", wine_dbgstr_w(nameW), - logfont.lfClipPrecision); - ok(logfont.lfQuality == DEFAULT_QUALITY, "%s: unexpected quality %d\n", wine_dbgstr_w(nameW), logfont.lfQuality); - ok(logfont.lfPitchAndFamily == DEFAULT_PITCH, "%s: unexpected pitch %d\n", wine_dbgstr_w(nameW), - logfont.lfPitchAndFamily); + winetest_push_context("Font %s", wine_dbgstr_w(nameW)); + + ok(logfont.lfWeight == lf.lfWeight, "Unexpected lfWeight %d, expected lfWeight %d, font weight %d, " + "bold simulation %s.\n", logfont.lfWeight, lf.lfWeight, IDWriteFont_GetWeight(font), + sim & DWRITE_FONT_SIMULATIONS_BOLD ? "yes" : "no"); + ok(logfont.lfItalic == lf.lfItalic, "Unexpected italic flag %d, oblique simulation %s.\n", + logfont.lfItalic, sim & DWRITE_FONT_SIMULATIONS_OBLIQUE ? "yes" : "no"); + ok(!lstrcmpW(logfont.lfFaceName, lf.lfFaceName), "Unexpected facename %s, expected %s\n", + wine_dbgstr_w(logfont.lfFaceName), wine_dbgstr_w(lf.lfFaceName)); + + ok(logfont.lfOutPrecision == OUT_OUTLINE_PRECIS, "Unexpected output precision %d.\n", logfont.lfOutPrecision); + ok(logfont.lfClipPrecision == CLIP_DEFAULT_PRECIS, "Unexpected clipping precision %d.\n", logfont.lfClipPrecision); + ok(logfont.lfQuality == DEFAULT_QUALITY, "Unexpected quality %d.\n", logfont.lfQuality); + ok(logfont.lfPitchAndFamily == DEFAULT_PITCH, "Unexpected pitch %d.\n", logfont.lfPitchAndFamily); + + winetest_pop_context(); IDWriteFontFace_Release(fontface); IDWriteFont_Release(font); @@ -4840,22 +4846,23 @@ if (0) { /* crashes on native */ sim = IDWriteFont_GetSimulations(font); + winetest_push_context("Font %s", wine_dbgstr_w(nameW)); + get_logfont_from_font(font, &lf); - ok(logfont.lfWeight == lf.lfWeight, "%s: unexpected lfWeight %d, expected lfWeight %d, font weight %d, " - "bold simulation %s\n", wine_dbgstr_w(nameW), logfont.lfWeight, lf.lfWeight, IDWriteFont_GetWeight(font), - sim & DWRITE_FONT_SIMULATIONS_BOLD ? "yes" : "no"); - ok(logfont.lfItalic == lf.lfItalic, "%s: unexpected italic flag %d, oblique simulation %s\n", - wine_dbgstr_w(nameW), logfont.lfItalic, sim & DWRITE_FONT_SIMULATIONS_OBLIQUE ? "yes" : "no"); - ok(!lstrcmpW(logfont.lfFaceName, lf.lfFaceName), "%s: unexpected facename %s, expected %s\n", - wine_dbgstr_w(nameW), wine_dbgstr_w(logfont.lfFaceName), wine_dbgstr_w(lf.lfFaceName)); - - ok(logfont.lfOutPrecision == OUT_OUTLINE_PRECIS, "%s: unexpected output precision %d\n", wine_dbgstr_w(nameW), - logfont.lfOutPrecision); - ok(logfont.lfClipPrecision == CLIP_DEFAULT_PRECIS, "%s: unexpected clipping precision %d\n", wine_dbgstr_w(nameW), - logfont.lfClipPrecision); - ok(logfont.lfQuality == DEFAULT_QUALITY, "%s: unexpected quality %d\n", wine_dbgstr_w(nameW), logfont.lfQuality); - ok(logfont.lfPitchAndFamily == DEFAULT_PITCH, "%s: unexpected pitch %d\n", wine_dbgstr_w(nameW), - logfont.lfPitchAndFamily); + ok(logfont.lfWeight == lf.lfWeight, "Unexpected lfWeight %d, expected lfWeight %d, font weight %d, " + "bold simulation %s.\n", logfont.lfWeight, lf.lfWeight, IDWriteFont_GetWeight(font), + sim & DWRITE_FONT_SIMULATIONS_BOLD ? "yes" : "no"); + ok(logfont.lfItalic == lf.lfItalic, "Unexpected italic flag %d, oblique simulation %s.\n", + logfont.lfItalic, sim & DWRITE_FONT_SIMULATIONS_OBLIQUE ? "yes" : "no"); + ok(!lstrcmpW(logfont.lfFaceName, lf.lfFaceName), "Unexpected facename %s, expected %s.\n", + wine_dbgstr_w(logfont.lfFaceName), wine_dbgstr_w(lf.lfFaceName)); + + ok(logfont.lfOutPrecision == OUT_OUTLINE_PRECIS, "Unexpected output precision %d.\n", logfont.lfOutPrecision); + ok(logfont.lfClipPrecision == CLIP_DEFAULT_PRECIS, "Unexpected clipping precision %d.\n", logfont.lfClipPrecision); + ok(logfont.lfQuality == DEFAULT_QUALITY, "Unexpected quality %d.\n", logfont.lfQuality); + ok(logfont.lfPitchAndFamily == DEFAULT_PITCH, "Unexpected pitch %d.\n", logfont.lfPitchAndFamily); + + winetest_pop_context(); IDWriteFont_Release(font); } @@ -6206,79 +6213,77 @@ static BOOL get_vdmx_size(const struct VDMX_group *group, int emsize, int *a, in static void test_metrics_cmp(FLOAT emsize, const DWRITE_FONT_METRICS *metrics, const DWRITE_FONT_METRICS1 *expected) { - ok(metrics->designUnitsPerEm == expected->designUnitsPerEm, "%.2f: emsize: got %u expect %u\n", - emsize, metrics->designUnitsPerEm, expected->designUnitsPerEm); - ok(metrics->ascent == expected->ascent, "%.2f a: got %u expect %u\n", - emsize, metrics->ascent, expected->ascent); - ok(metrics->descent == expected->descent, "%.2f d: got %u expect %u\n", - emsize, metrics->descent, expected->descent); - ok(metrics->lineGap == expected->lineGap, "%.2f lg: got %d expect %d\n", - emsize, metrics->lineGap, expected->lineGap); - ok(metrics->capHeight == expected->capHeight, "%.2f capH: got %u expect %u\n", - emsize, metrics->capHeight, expected->capHeight); - ok(metrics->xHeight == expected->xHeight, "%.2f xH: got %u expect %u\n", - emsize, metrics->xHeight, expected->xHeight); - ok(metrics->underlinePosition == expected->underlinePosition, "%.2f ulP: got %d expect %d\n", - emsize, metrics->underlinePosition, expected->underlinePosition); - ok(metrics->underlineThickness == expected->underlineThickness, "%.2f ulTh: got %u expect %u\n", - emsize, metrics->underlineThickness, expected->underlineThickness); - ok(metrics->strikethroughPosition == expected->strikethroughPosition, "%.2f stP: got %d expect %d\n", - emsize, metrics->strikethroughPosition, expected->strikethroughPosition); - ok(metrics->strikethroughThickness == expected->strikethroughThickness, "%.2f stTh: got %u expect %u\n", - emsize, metrics->strikethroughThickness, expected->strikethroughThickness); + winetest_push_context("Size %.2f", emsize); + + ok(metrics->designUnitsPerEm == expected->designUnitsPerEm, "got %u expect %u.\n", + metrics->designUnitsPerEm, expected->designUnitsPerEm); + ok(metrics->ascent == expected->ascent, "a: got %u expect %u.\n", metrics->ascent, expected->ascent); + ok(metrics->descent == expected->descent, "d: got %u expect %u.\n", metrics->descent, expected->descent); + ok(metrics->lineGap == expected->lineGap, "lg: got %d expect %d.\n", metrics->lineGap, expected->lineGap); + ok(metrics->capHeight == expected->capHeight, "capH: got %u expect %u.\n", metrics->capHeight, expected->capHeight); + ok(metrics->xHeight == expected->xHeight, "xH: got %u expect %u.\n", metrics->xHeight, expected->xHeight); + ok(metrics->underlinePosition == expected->underlinePosition, "ulP: got %d expect %d.\n", + metrics->underlinePosition, expected->underlinePosition); + ok(metrics->underlineThickness == expected->underlineThickness, "ulTh: got %u expect %u.\n", + metrics->underlineThickness, expected->underlineThickness); + ok(metrics->strikethroughPosition == expected->strikethroughPosition, "stP: got %d expect %d.\n", + metrics->strikethroughPosition, expected->strikethroughPosition); + ok(metrics->strikethroughThickness == expected->strikethroughThickness, "stTh: got %u expect %u.\n", + metrics->strikethroughThickness, expected->strikethroughThickness); + + winetest_pop_context(); } static void test_metrics1_cmp(FLOAT emsize, const DWRITE_FONT_METRICS1 *metrics, const DWRITE_FONT_METRICS1 *expected) { - ok(metrics->designUnitsPerEm == expected->designUnitsPerEm, "%.2f: emsize: got %u expect %u\n", - emsize, metrics->designUnitsPerEm, expected->designUnitsPerEm); - ok(metrics->ascent == expected->ascent, "%.2f a: got %u expect %u\n", - emsize, metrics->ascent, expected->ascent); - ok(metrics->descent == expected->descent, "%.2f d: got %u expect %u\n", - emsize, metrics->descent, expected->descent); - ok(metrics->lineGap == expected->lineGap, "%.2f lg: got %d expect %d\n", - emsize, metrics->lineGap, expected->lineGap); - ok(metrics->capHeight == expected->capHeight, "%.2f capH: got %u expect %u\n", - emsize, metrics->capHeight, expected->capHeight); - ok(metrics->xHeight == expected->xHeight, "%.2f xH: got %u expect %u\n", - emsize, metrics->xHeight, expected->xHeight); - ok(metrics->underlinePosition == expected->underlinePosition, "%.2f ulP: got %d expect %d\n", - emsize, metrics->underlinePosition, expected->underlinePosition); - ok(metrics->underlineThickness == expected->underlineThickness, "%.2f ulTh: got %u expect %u\n", - emsize, metrics->underlineThickness, expected->underlineThickness); - ok(metrics->strikethroughPosition == expected->strikethroughPosition, "%.2f stP: got %d expect %d\n", - emsize, metrics->strikethroughPosition, expected->strikethroughPosition); - ok(metrics->strikethroughThickness == expected->strikethroughThickness, "%.2f stTh: got %u expect %u\n", - emsize, metrics->strikethroughThickness, expected->strikethroughThickness); - ok(metrics->glyphBoxLeft == expected->glyphBoxLeft, "%.2f box left: got %d expect %d\n", - emsize, metrics->glyphBoxLeft, expected->glyphBoxLeft); + winetest_push_context("Size %.2f", emsize); + + ok(metrics->designUnitsPerEm == expected->designUnitsPerEm, "got %u expect %u.\n", + metrics->designUnitsPerEm, expected->designUnitsPerEm); + ok(metrics->ascent == expected->ascent, "a: got %u expect %u.\n", metrics->ascent, expected->ascent); + ok(metrics->descent == expected->descent, "d: got %u expect %u.\n", metrics->descent, expected->descent); + ok(metrics->lineGap == expected->lineGap, "lg: got %d expect %d.\n", metrics->lineGap, expected->lineGap); + ok(metrics->capHeight == expected->capHeight, "capH: got %u expect %u.\n", metrics->capHeight, expected->capHeight); + ok(metrics->xHeight == expected->xHeight, "xH: got %u expect %u.\n", metrics->xHeight, expected->xHeight); + ok(metrics->underlinePosition == expected->underlinePosition, "ulP: got %d expect %d.\n", + metrics->underlinePosition, expected->underlinePosition); + ok(metrics->underlineThickness == expected->underlineThickness, "ulTh: got %u expect %u.\n", + metrics->underlineThickness, expected->underlineThickness); + ok(metrics->strikethroughPosition == expected->strikethroughPosition, "stP: got %d expect %d.\n", + metrics->strikethroughPosition, expected->strikethroughPosition); + ok(metrics->strikethroughThickness == expected->strikethroughThickness, "stTh: got %u expect %u.\n", + metrics->strikethroughThickness, expected->strikethroughThickness); + ok(metrics->glyphBoxLeft == expected->glyphBoxLeft, "box left: got %d expect %d.\n", + metrics->glyphBoxLeft, expected->glyphBoxLeft); if (0) { /* this is not consistent */ - ok(metrics->glyphBoxTop == expected->glyphBoxTop, "%.2f box top: got %d expect %d\n", - emsize, metrics->glyphBoxTop, expected->glyphBoxTop); - ok(metrics->glyphBoxRight == expected->glyphBoxRight, "%.2f box right: got %d expect %d\n", - emsize, metrics->glyphBoxRight, expected->glyphBoxRight); -} - ok(metrics->glyphBoxBottom == expected->glyphBoxBottom, "%.2f box bottom: got %d expect %d\n", - emsize, metrics->glyphBoxBottom, expected->glyphBoxBottom); - ok(metrics->subscriptPositionX == expected->subscriptPositionX, "%.2f subX: got %d expect %d\n", - emsize, metrics->subscriptPositionX, expected->subscriptPositionX); - ok(metrics->subscriptPositionY == expected->subscriptPositionY, "%.2f subY: got %d expect %d\n", - emsize, metrics->subscriptPositionY, expected->subscriptPositionY); - ok(metrics->subscriptSizeX == expected->subscriptSizeX, "%.2f subsizeX: got %d expect %d\n", - emsize, metrics->subscriptSizeX, expected->subscriptSizeX); - ok(metrics->subscriptPositionY == expected->subscriptPositionY, "%.2f subsizeY: got %d expect %d\n", - emsize, metrics->subscriptSizeY, expected->subscriptSizeY); - ok(metrics->superscriptPositionX == expected->superscriptPositionX, "%.2f supX: got %d expect %d\n", - emsize, metrics->superscriptPositionX, expected->superscriptPositionX); + ok(metrics->glyphBoxTop == expected->glyphBoxTop, "box top: got %d expect %d.\n", + metrics->glyphBoxTop, expected->glyphBoxTop); + ok(metrics->glyphBoxRight == expected->glyphBoxRight, "box right: got %d expect %d.\n", + metrics->glyphBoxRight, expected->glyphBoxRight); +} + ok(metrics->glyphBoxBottom == expected->glyphBoxBottom, "box bottom: got %d expect %d.\n", + metrics->glyphBoxBottom, expected->glyphBoxBottom); + ok(metrics->subscriptPositionX == expected->subscriptPositionX, "subX: got %d expect %d.\n", + metrics->subscriptPositionX, expected->subscriptPositionX); + ok(metrics->subscriptPositionY == expected->subscriptPositionY, "subY: got %d expect %d.\n", + metrics->subscriptPositionY, expected->subscriptPositionY); + ok(metrics->subscriptSizeX == expected->subscriptSizeX, "subsizeX: got %d expect %d.\n", + metrics->subscriptSizeX, expected->subscriptSizeX); + ok(metrics->subscriptPositionY == expected->subscriptPositionY, "subsizeY: got %d expect %d.\n", + metrics->subscriptSizeY, expected->subscriptSizeY); + ok(metrics->superscriptPositionX == expected->superscriptPositionX, "supX: got %d expect %d.\n", + metrics->superscriptPositionX, expected->superscriptPositionX); if (0) - ok(metrics->superscriptPositionY == expected->superscriptPositionY, "%.2f supY: got %d expect %d\n", - emsize, metrics->superscriptPositionY, expected->superscriptPositionY); - ok(metrics->superscriptSizeX == expected->superscriptSizeX, "%.2f supsizeX: got %d expect %d\n", - emsize, metrics->superscriptSizeX, expected->superscriptSizeX); - ok(metrics->superscriptSizeY == expected->superscriptSizeY, "%.2f supsizeY: got %d expect %d\n", - emsize, metrics->superscriptSizeY, expected->superscriptSizeY); - ok(metrics->hasTypographicMetrics == expected->hasTypographicMetrics, "%.2f hastypo: got %d expect %d\n", - emsize, metrics->hasTypographicMetrics, expected->hasTypographicMetrics); + ok(metrics->superscriptPositionY == expected->superscriptPositionY, "supY: got %d expect %d.\n", + metrics->superscriptPositionY, expected->superscriptPositionY); + ok(metrics->superscriptSizeX == expected->superscriptSizeX, "supsizeX: got %d expect %d.\n", + metrics->superscriptSizeX, expected->superscriptSizeX); + ok(metrics->superscriptSizeY == expected->superscriptSizeY, "supsizeY: got %d expect %d.\n", + metrics->superscriptSizeY, expected->superscriptSizeY); + ok(metrics->hasTypographicMetrics == expected->hasTypographicMetrics, "hastypo: got %d expect %d.\n", + metrics->hasTypographicMetrics, expected->hasTypographicMetrics); + + winetest_pop_context(); } struct compatmetrics_test { @@ -6557,27 +6562,31 @@ static void test_GetPanose(void) IDWriteFont1_GetPanose(font1, &panose); get_expected_panose(font1, &expected_panose); - ok(panose.values[0] == expected_panose.values[0], "%s: values[0] %#x, expected %#x.\n", wine_dbgstr_w(nameW), + winetest_push_context("Font %s", wine_dbgstr_w(nameW)); + + ok(panose.values[0] == expected_panose.values[0], "values[0] %#x, expected %#x.\n", panose.values[0], expected_panose.values[0]); - ok(panose.values[1] == expected_panose.values[1], "%s: values[1] %#x, expected %#x.\n", wine_dbgstr_w(nameW), + ok(panose.values[1] == expected_panose.values[1], "values[1] %#x, expected %#x.\n", panose.values[1], expected_panose.values[1]); - ok(panose.values[2] == expected_panose.values[2], "%s: values[2] %#x, expected %#x.\n", wine_dbgstr_w(nameW), + ok(panose.values[2] == expected_panose.values[2], "values[2] %#x, expected %#x.\n", panose.values[2], expected_panose.values[2]); - ok(panose.values[3] == expected_panose.values[3], "%s: values[3] %#x, expected %#x.\n", wine_dbgstr_w(nameW), + ok(panose.values[3] == expected_panose.values[3], "values[3] %#x, expected %#x.\n", panose.values[3], expected_panose.values[3]); - ok(panose.values[4] == expected_panose.values[4], "%s: values[4] %#x, expected %#x.\n", wine_dbgstr_w(nameW), + ok(panose.values[4] == expected_panose.values[4], "values[4] %#x, expected %#x.\n", panose.values[4], expected_panose.values[4]); - ok(panose.values[5] == expected_panose.values[5], "%s: values[5] %#x, expected %#x.\n", wine_dbgstr_w(nameW), + ok(panose.values[5] == expected_panose.values[5], "values[5] %#x, expected %#x.\n", panose.values[5], expected_panose.values[5]); - ok(panose.values[6] == expected_panose.values[6], "%s: values[6] %#x, expected %#x.\n", wine_dbgstr_w(nameW), + ok(panose.values[6] == expected_panose.values[6], "values[6] %#x, expected %#x.\n", panose.values[6], expected_panose.values[6]); - ok(panose.values[7] == expected_panose.values[7], "%s: values[7] %#x, expected %#x.\n", wine_dbgstr_w(nameW), + ok(panose.values[7] == expected_panose.values[7], "values[7] %#x, expected %#x.\n", panose.values[7], expected_panose.values[7]); - ok(panose.values[8] == expected_panose.values[8], "%s: values[8] %#x, expected %#x.\n", wine_dbgstr_w(nameW), + ok(panose.values[8] == expected_panose.values[8], "values[8] %#x, expected %#x.\n", panose.values[8], expected_panose.values[8]); - ok(panose.values[9] == expected_panose.values[9], "%s: values[9] %#x, expected %#x.\n", wine_dbgstr_w(nameW), + ok(panose.values[9] == expected_panose.values[9], "values[9] %#x, expected %#x.\n", panose.values[9], expected_panose.values[9]); + winetest_pop_context(); + hr = IDWriteFont1_CreateFontFace(font1, &fontface); ok(hr == S_OK, "Failed to create a font face, %#x.\n", hr); if (IDWriteFontFace_QueryInterface(fontface, &IID_IDWriteFontFace3, (void **)&fontface3) == S_OK) { @@ -6876,20 +6885,26 @@ static void test_GetRecommendedRenderingMode(void) /* detect old dwrite version, that is using higher threshold value */ g_is_vista = fontface1 == NULL; - for (emsize = 1.0; emsize < 500.0; emsize += 1.0) { + for (emsize = 1.0; emsize < 500.0; emsize += 1.0) + { DWRITE_RENDERING_MODE expected; + unsigned int i; FLOAT ppdip; WORD gasp; - int i; - for (i = 0; i < ARRAY_SIZE(recmode_tests); i++) { + winetest_push_context("Size %.2f", emsize); + + for (i = 0; i < ARRAY_SIZE(recmode_tests); ++i) + { + winetest_push_context("%u", i); + ppdip = 1.0f; mode = 10; gasp = get_gasp_flags(fontface, emsize, ppdip); expected = get_expected_rendering_mode(emsize * ppdip, gasp, recmode_tests[i].measuring, recmode_tests[i].threshold); hr = IDWriteFontFace_GetRecommendedRenderingMode(fontface, emsize, ppdip, recmode_tests[i].measuring, params, &mode); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(mode == expected, "%.2f/%d: got %d, ppdip %f, flags 0x%04x, expected %d\n", emsize, i, mode, ppdip, gasp, expected); + ok(mode == expected, "got %d, ppdip %f, flags 0x%04x, expected %d.\n", mode, ppdip, gasp, expected); /* some ppdip variants */ ppdip = 0.5f; @@ -6898,18 +6913,19 @@ static void test_GetRecommendedRenderingMode(void) expected = get_expected_rendering_mode(emsize * ppdip, gasp, recmode_tests[i].measuring, recmode_tests[i].threshold); hr = IDWriteFontFace_GetRecommendedRenderingMode(fontface, emsize, ppdip, recmode_tests[i].measuring, params, &mode); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(mode == expected, "%.2f/%d: got %d, ppdip %f, flags 0x%04x, expected %d\n", emsize, i, mode, ppdip, gasp, expected); + ok(mode == expected, "got %d, ppdip %f, flags 0x%04x, expected %d.\n", mode, ppdip, gasp, expected); /* Only test larger sizes to workaround Win7 differences, where unscaled natural emsize threshold is used; Win8 and Win10 handle this as expected. */ - if (emsize > 20.0f) { + if (emsize > 20.0f) + { ppdip = 1.5f; mode = 10; gasp = get_gasp_flags(fontface, emsize, ppdip); expected = get_expected_rendering_mode(emsize * ppdip, gasp, recmode_tests[i].measuring, recmode_tests[i].threshold); hr = IDWriteFontFace_GetRecommendedRenderingMode(fontface, emsize, ppdip, recmode_tests[i].measuring, params, &mode); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(mode == expected, "%.2f/%d: got %d, ppdip %f, flags 0x%04x, expected %d\n", emsize, i, mode, ppdip, gasp, expected); + ok(mode == expected, "got %d, ppdip %f, flags 0x%04x, expected %d.\n", mode, ppdip, gasp, expected); ppdip = 2.0f; mode = 10; @@ -6917,15 +6933,21 @@ static void test_GetRecommendedRenderingMode(void) expected = get_expected_rendering_mode(emsize * ppdip, gasp, recmode_tests[i].measuring, recmode_tests[i].threshold); hr = IDWriteFontFace_GetRecommendedRenderingMode(fontface, emsize, ppdip, recmode_tests[i].measuring, params, &mode); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(mode == expected, "%.2f/%d: got %d, ppdip %f, flags 0x%04x, expected %d\n", emsize, i, mode, ppdip, gasp, expected); + ok(mode == expected, "got %d, ppdip %f, flags 0x%04x, expected %d.\n", mode, ppdip, gasp, expected); } + + winetest_pop_context(); } /* IDWriteFontFace1 offers another variant of this method */ - if (fontface1) { - for (i = 0; i < ARRAY_SIZE(recmode_tests1); i++) { + if (fontface1) + { + for (i = 0; i < ARRAY_SIZE(recmode_tests1); ++i) + { FLOAT dpi; + winetest_push_context("%u", i); + ppdip = 1.0f; dpi = 96.0f * ppdip; mode = 10; @@ -6934,11 +6956,12 @@ static void test_GetRecommendedRenderingMode(void) hr = IDWriteFontFace1_GetRecommendedRenderingMode(fontface1, emsize, dpi, dpi, NULL, FALSE, recmode_tests1[i].threshold, recmode_tests1[i].measuring, &mode); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(mode == expected, "%.2f/%d: got %d, dpi %f, flags 0x%04x, expected %d\n", emsize, i, mode, dpi, gasp, expected); + ok(mode == expected, "got %d, dpi %f, flags 0x%04x, expected %d.\n", mode, dpi, gasp, expected); /* Only test larger sizes to workaround Win7 differences, where unscaled natural emsize threshold is used; Win8 and Win10 handle this as expected. */ - if (emsize > 20.0f) { + if (emsize > 20.0f) + { ppdip = 2.0f; dpi = 96.0f * ppdip; mode = 10; @@ -6947,7 +6970,7 @@ static void test_GetRecommendedRenderingMode(void) hr = IDWriteFontFace1_GetRecommendedRenderingMode(fontface1, emsize, dpi, dpi, NULL, FALSE, recmode_tests1[i].threshold, recmode_tests1[i].measuring, &mode); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(mode == expected, "%.2f/%d: got %d, dpi %f, flags 0x%04x, expected %d\n", emsize, i, mode, dpi, gasp, expected); + ok(mode == expected, "got %d, dpi %f, flags 0x%04x, expected %d.\n", mode, dpi, gasp, expected); ppdip = 0.5f; dpi = 96.0f * ppdip; @@ -6957,7 +6980,7 @@ static void test_GetRecommendedRenderingMode(void) hr = IDWriteFontFace1_GetRecommendedRenderingMode(fontface1, emsize, dpi, dpi, NULL, FALSE, recmode_tests1[i].threshold, recmode_tests1[i].measuring, &mode); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(mode == expected, "%.2f/%d: got %d, dpi %f, flags 0x%04x, expected %d\n", emsize, i, mode, dpi, gasp, expected); + ok(mode == expected, "got %d, dpi %f, flags 0x%04x, expected %d.\n", mode, dpi, gasp, expected); /* try different dpis for X and Y direction */ ppdip = 1.0f; @@ -6968,7 +6991,7 @@ static void test_GetRecommendedRenderingMode(void) hr = IDWriteFontFace1_GetRecommendedRenderingMode(fontface1, emsize, dpi * 0.5f, dpi, NULL, FALSE, recmode_tests1[i].threshold, recmode_tests1[i].measuring, &mode); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(mode == expected, "%.2f/%d: got %d, dpi %f, flags 0x%04x, expected %d\n", emsize, i, mode, dpi, gasp, expected); + ok(mode == expected, "got %d, dpi %f, flags 0x%04x, expected %d.\n", mode, dpi, gasp, expected); ppdip = 1.0f; dpi = 96.0f * ppdip; @@ -6978,7 +7001,7 @@ static void test_GetRecommendedRenderingMode(void) hr = IDWriteFontFace1_GetRecommendedRenderingMode(fontface1, emsize, dpi, dpi * 0.5f, NULL, FALSE, recmode_tests1[i].threshold, recmode_tests1[i].measuring, &mode); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(mode == expected, "%.2f/%d: got %d, dpi %f, flags 0x%04x, expected %d\n", emsize, i, mode, dpi, gasp, expected); + ok(mode == expected, "got %d, dpi %f, flags 0x%04x, expected %d.\n", mode, dpi, gasp, expected); ppdip = 2.0f; dpi = 96.0f * ppdip; @@ -6988,7 +7011,7 @@ static void test_GetRecommendedRenderingMode(void) hr = IDWriteFontFace1_GetRecommendedRenderingMode(fontface1, emsize, dpi * 0.5f, dpi, NULL, FALSE, recmode_tests1[i].threshold, recmode_tests1[i].measuring, &mode); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(mode == expected, "%.2f/%d: got %d, dpi %f, flags 0x%04x, expected %d\n", emsize, i, mode, dpi, gasp, expected); + ok(mode == expected, "got %d, dpi %f, flags 0x%04x, expected %d.\n", mode, dpi, gasp, expected); ppdip = 2.0f; dpi = 96.0f * ppdip; @@ -6998,8 +7021,10 @@ static void test_GetRecommendedRenderingMode(void) hr = IDWriteFontFace1_GetRecommendedRenderingMode(fontface1, emsize, dpi, dpi * 0.5f, NULL, FALSE, recmode_tests1[i].threshold, recmode_tests1[i].measuring, &mode); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(mode == expected, "%.2f/%d: got %d, dpi %f, flags 0x%04x, expected %d\n", emsize, i, mode, dpi, gasp, expected); + ok(mode == expected, "got %d, dpi %f, flags 0x%04x, expected %d.\n", mode, dpi, gasp, expected); } + + winetest_pop_context(); } } @@ -7008,16 +7033,20 @@ static void test_GetRecommendedRenderingMode(void) DWRITE_GRID_FIT_MODE gridfit, expected_gridfit; gasp = get_gasp_flags(fontface, emsize, 1.0f); - for (i = 0; i < ARRAY_SIZE(recmode_tests1); i++) { + for (i = 0; i < ARRAY_SIZE(recmode_tests1); ++i) + { + winetest_push_context("%u", i); + mode = 10; expected = get_expected_rendering_mode(emsize, gasp, recmode_tests1[i].measuring, recmode_tests1[i].threshold); expected_gridfit = get_expected_gridfit_mode(emsize, gasp, recmode_tests1[i].measuring, recmode_tests1[i].threshold); hr = IDWriteFontFace2_GetRecommendedRenderingMode(fontface2, emsize, 96.0f, 96.0f, NULL, FALSE, recmode_tests1[i].threshold, recmode_tests1[i].measuring, params, &mode, &gridfit); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(mode == expected, "%.2f: got %d, flags 0x%04x, expected %d\n", emsize, mode, gasp, expected); - ok(gridfit == expected_gridfit, "%.2f/%d: gridfit: got %d, flags 0x%04x, expected %d\n", emsize, i, gridfit, - gasp, expected_gridfit); + ok(mode == expected, "got %d, flags 0x%04x, expected %d.\n", mode, gasp, expected); + ok(gridfit == expected_gridfit, "gridfit: got %d, flags 0x%04x, expected %d.\n", gridfit, gasp, expected_gridfit); + + winetest_pop_context(); } } @@ -7027,18 +7056,24 @@ static void test_GetRecommendedRenderingMode(void) DWRITE_RENDERING_MODE1 mode1, expected1; gasp = get_gasp_flags(fontface, emsize, 1.0f); - for (i = 0; i < ARRAY_SIZE(recmode_tests1); i++) { + for (i = 0; i < ARRAY_SIZE(recmode_tests1); ++i) + { + winetest_push_context("%u", i); + mode1 = 10; expected1 = get_expected_rendering_mode(emsize, gasp, recmode_tests1[i].measuring, recmode_tests1[i].threshold); expected_gridfit = get_expected_gridfit_mode(emsize, gasp, recmode_tests1[i].measuring, recmode_tests1[i].threshold); hr = IDWriteFontFace3_GetRecommendedRenderingMode(fontface3, emsize, 96.0f, 96.0f, NULL, FALSE, recmode_tests1[i].threshold, recmode_tests1[i].measuring, params, &mode1, &gridfit); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(mode1 == expected1, "%.2f: got %d, flags 0x%04x, expected %d\n", emsize, mode1, gasp, expected1); - ok(gridfit == expected_gridfit, "%.2f/%d: gridfit: got %d, flags 0x%04x, expected %d\n", emsize, i, gridfit, - gasp, expected_gridfit); + ok(mode1 == expected1, "got %d, flags 0x%04x, expected %d.\n", mode1, gasp, expected1); + ok(gridfit == expected_gridfit, "gridfit: got %d, flags 0x%04x, expected %d.\n", gridfit, gasp, expected_gridfit); + + winetest_pop_context(); } } + + winetest_pop_context(); } IDWriteRenderingParams_Release(params); @@ -8161,19 +8196,23 @@ static void test_GetFontSignature(void) get_expected_fontsig(font, &expected_signature); - ok(fontsig.fsUsb[0] == expected_signature.fsUsb[0], "%s: fsUsb[0] %#x, expected %#x\n", wine_dbgstr_w(nameW), - fontsig.fsUsb[0], expected_signature.fsUsb[0]); - ok(fontsig.fsUsb[1] == expected_signature.fsUsb[1], "%s: fsUsb[1] %#x, expected %#x\n", wine_dbgstr_w(nameW), - fontsig.fsUsb[1], expected_signature.fsUsb[1]); - ok(fontsig.fsUsb[2] == expected_signature.fsUsb[2], "%s: fsUsb[2] %#x, expected %#x\n", wine_dbgstr_w(nameW), - fontsig.fsUsb[2], expected_signature.fsUsb[2]); - ok(fontsig.fsUsb[3] == expected_signature.fsUsb[3], "%s: fsUsb[3] %#x, expected %#x\n", wine_dbgstr_w(nameW), - fontsig.fsUsb[3], expected_signature.fsUsb[3]); + winetest_push_context("Font %s\n", wine_dbgstr_w(nameW)); - ok(fontsig.fsCsb[0] == expected_signature.fsCsb[0], "%s: fsCsb[0] %#x, expected %#x\n", wine_dbgstr_w(nameW), - fontsig.fsCsb[0], expected_signature.fsCsb[0]); - ok(fontsig.fsCsb[1] == expected_signature.fsCsb[1], "%s: fsCsb[1] %#x, expected %#x\n", wine_dbgstr_w(nameW), - fontsig.fsCsb[1], expected_signature.fsCsb[1]); + ok(fontsig.fsUsb[0] == expected_signature.fsUsb[0], "fsUsb[0] %#x, expected %#x.\n", + fontsig.fsUsb[0], expected_signature.fsUsb[0]); + ok(fontsig.fsUsb[1] == expected_signature.fsUsb[1], "fsUsb[1] %#x, expected %#x.\n", + fontsig.fsUsb[1], expected_signature.fsUsb[1]); + ok(fontsig.fsUsb[2] == expected_signature.fsUsb[2], "fsUsb[2] %#x, expected %#x.\n", + fontsig.fsUsb[2], expected_signature.fsUsb[2]); + ok(fontsig.fsUsb[3] == expected_signature.fsUsb[3], "fsUsb[3] %#x, expected %#x.\n", + fontsig.fsUsb[3], expected_signature.fsUsb[3]); + + ok(fontsig.fsCsb[0] == expected_signature.fsCsb[0], "fsCsb[0] %#x, expected %#x.\n", + fontsig.fsCsb[0], expected_signature.fsCsb[0]); + ok(fontsig.fsCsb[1] == expected_signature.fsCsb[1], "fsCsb[1] %#x, expected %#x.\n", + fontsig.fsCsb[1], expected_signature.fsCsb[1]); + + winetest_pop_context(); IDWriteFont_Release(font); IDWriteFontFamily_Release(family); @@ -9340,30 +9379,34 @@ static void test_CreateCustomRenderingParams(void) for (i = 0; i < ARRAY_SIZE(params_tests); i++) { IDWriteRenderingParams *params; + winetest_push_context("%u", i); + params = (void *)0xdeadbeef; hr = IDWriteFactory_CreateCustomRenderingParams(factory, params_tests[i].gamma, params_tests[i].contrast, params_tests[i].cleartype_level, params_tests[i].geometry, params_tests[i].rendering_mode, &params); - ok(hr == params_tests[i].hr, "%u: unexpected hr %#x, expected %#x.\n", i, hr, params_tests[i].hr); + ok(hr == params_tests[i].hr, "unexpected hr %#x, expected %#x.\n", hr, params_tests[i].hr); if (hr == S_OK) { - ok(params_tests[i].gamma == IDWriteRenderingParams_GetGamma(params), "%u: unexpected gamma %f, expected %f.\n", - i, IDWriteRenderingParams_GetGamma(params), params_tests[i].gamma); + ok(params_tests[i].gamma == IDWriteRenderingParams_GetGamma(params), "unexpected gamma %f, expected %f.\n", + IDWriteRenderingParams_GetGamma(params), params_tests[i].gamma); ok(params_tests[i].contrast == IDWriteRenderingParams_GetEnhancedContrast(params), - "%u: unexpected contrast %f, expected %f.\n", - i, IDWriteRenderingParams_GetEnhancedContrast(params), params_tests[i].contrast); + "unexpected contrast %f, expected %f.\n", + IDWriteRenderingParams_GetEnhancedContrast(params), params_tests[i].contrast); ok(params_tests[i].cleartype_level == IDWriteRenderingParams_GetClearTypeLevel(params), - "%u: unexpected ClearType level %f, expected %f.\n", - i, IDWriteRenderingParams_GetClearTypeLevel(params), params_tests[i].cleartype_level); + "unexpected ClearType level %f, expected %f.\n", + IDWriteRenderingParams_GetClearTypeLevel(params), params_tests[i].cleartype_level); ok(params_tests[i].geometry == IDWriteRenderingParams_GetPixelGeometry(params), - "%u: unexpected pixel geometry %u, expected %u.\n", i, IDWriteRenderingParams_GetPixelGeometry(params), + "unexpected pixel geometry %u, expected %u.\n", IDWriteRenderingParams_GetPixelGeometry(params), params_tests[i].geometry); ok(params_tests[i].rendering_mode == IDWriteRenderingParams_GetRenderingMode(params), - "%u: unexpected rendering mode %u, expected %u.\n", i, IDWriteRenderingParams_GetRenderingMode(params), + "unexpected rendering mode %u, expected %u.\n", IDWriteRenderingParams_GetRenderingMode(params), params_tests[i].rendering_mode); IDWriteRenderingParams_Release(params); } else ok(params == NULL, "%u: expected NULL interface pointer on failure.\n", i); + + winetest_pop_context(); } ref = IDWriteFactory_Release(factory); -- 2.32.0

1 0

[PATCH v6] msvcrt/tests: Add test for fopen/_open access hints
by Piotr Caban 18 Aug '21

18 Aug '21

From: Luke Deller <luke(a)deller.id.au> Signed-off-by: Luke Deller <luke(a)deller.id.au> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- v6: - move test file to temp directory - remove tests that doesn't test anything - reorganize the code dlls/msvcrt/tests/file.c | 78 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 78 insertions(+)

1 0

[PATCH 1/2] dsound: Commit next audio chunk between play cursor and write cursor to playing.
by Eduard Permyakov 18 Aug '21

18 Aug '21

This region of the audio buffer is forbidden to be written to by the DirectSound specification. The documentation states: "The write cursor is the point after which it is safe to write data into the buffer. The block between the play cursor and the write cursor is already committed to be played, and cannot be changed safely." However, some applications still do this, which has lead to audio glitches only when using the Wine DirectSound implementation. Experiments showed that the native DirctSound implementation will still play the old audio the first time around when the buffer region gets overwritten. Use an approach of copying the next forbidden region into a "committed buffer" to add the same behavior to the Wine implementation. Signed-off-by: Eduard Permyakov <epermyakov(a)codeweavers.com> --- dlls/dsound/buffer.c | 8 ++++++++ dlls/dsound/dsound_convert.c | 30 ++++++++++++++++++++---------- dlls/dsound/dsound_private.h | 5 ++++- dlls/dsound/mixer.c | 19 +++++++++++++++++++ 4 files changed, 51 insertions(+), 11 deletions(-) diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c index dc3b54906ce..df8962f1c0f 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -1081,6 +1081,13 @@ HRESULT secondarybuffer_create(DirectSoundDevice *device, const DSBUFFERDESC *ds /* calculate fragment size and write lead */ DSOUND_RecalcFormat(dsb); + dsb->committedbuff = HeapAlloc(GetProcessHeap(), 0, dsb->writelead); + if(!dsb->committedbuff) { + IDirectSoundBuffer8_Release(&dsb->IDirectSoundBuffer8_iface); + return DSERR_OUTOFMEMORY; + } + FillMemory(dsb->committedbuff, dsb->writelead, dsbd->lpwfxFormat->wBitsPerSample == 8 ? 128 : 0); + if (dsb->dsbd.dwFlags & DSBCAPS_CTRL3D) { dsb->ds3db_ds3db.dwSize = sizeof(DS3DBUFFER); dsb->ds3db_ds3db.vPosition.x = 0.0; @@ -1135,6 +1142,7 @@ void secondarybuffer_destroy(IDirectSoundBufferImpl *This) HeapFree(GetProcessHeap(), 0, This->notifies); HeapFree(GetProcessHeap(), 0, This->pwfx); + HeapFree(GetProcessHeap(), 0, This->committedbuff); if (This->filters) { int i; diff --git a/dlls/dsound/dsound_convert.c b/dlls/dsound/dsound_convert.c index 4735178a9a8..fc2b0cd0797 100644 --- a/dlls/dsound/dsound_convert.c +++ b/dlls/dsound/dsound_convert.c @@ -55,17 +55,27 @@ WINE_DEFAULT_DEBUG_CHANNEL(dsound); #define le32(x) (x) #endif +static BYTE *buff_byte(const IDirectSoundBufferImpl *dsb, DWORD offset) +{ + if(offset >= dsb->sec_mixpos && offset < dsb->sec_mixpos + dsb->writelead) { + return (BYTE*)dsb->committedbuff + (offset - dsb->sec_mixpos); + }else if(offset < (dsb->sec_mixpos + dsb->writelead) % dsb->buflen) { + return (BYTE*)dsb->committedbuff + (dsb->buflen - dsb->sec_mixpos + offset); + }else{ + return dsb->buffer->memory + offset; + } +} + static float get8(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel) { - const BYTE* buf = dsb->buffer->memory; - buf += pos + channel; + const BYTE *buf = buff_byte(dsb, pos + channel); return (buf[0] - 0x80) / (float)0x80; } static float get16(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel) { - const BYTE* buf = dsb->buffer->memory; - const SHORT *sbuf = (const SHORT*)(buf + pos + 2 * channel); + const BYTE *buf = buff_byte(dsb, pos + 2 * channel); + const SHORT *sbuf = (const SHORT*)(buf); SHORT sample = (SHORT)le16(*sbuf); return sample / (float)0x8000; } @@ -73,8 +83,8 @@ static float get16(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel) static float get24(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel) { LONG sample; - const BYTE* buf = dsb->buffer->memory; - buf += pos + 3 * channel; + const BYTE *buf = buff_byte(dsb, pos + 3 * channel); + /* The next expression deliberately has an overflow for buf[2] >= 0x80, this is how negative values are made. */ @@ -84,16 +94,16 @@ static float get24(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel) static float get32(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel) { - const BYTE* buf = dsb->buffer->memory; - const LONG *sbuf = (const LONG*)(buf + pos + 4 * channel); + const BYTE *buf = buff_byte(dsb, pos + 4 * channel); + const LONG *sbuf = (const LONG*)(buf); LONG sample = le32(*sbuf); return sample / (float)0x80000000U; } static float getieee32(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel) { - const BYTE* buf = dsb->buffer->memory; - const float *sbuf = (const float*)(buf + pos + 4 * channel); + const BYTE *buf = buff_byte(dsb, pos + 4 * channel); + const float *sbuf = (const float*)(buf); /* The value will be clipped later, when put into some non-float buffer */ return *sbuf; } diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index bdb9ebee544..a79d62c54da 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -153,7 +153,10 @@ struct IDirectSoundBufferImpl LONG64 freqAccNum; /* used for mixing */ DWORD sec_mixpos; - + /* Holds a copy of the next 'writelead' bytes, to be used for mixing. This makes it + * so that these bytes get played once even if this region of the buffer gets overwritten, + * which is more in-line with native DirectSound behavior. */ + LPVOID committedbuff; /* IDirectSoundNotify fields */ LPDSBPOSITIONNOTIFY notifies; int nrofnotifies; diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c index 124d1e4fba1..32656fbd618 100644 --- a/dlls/dsound/mixer.c +++ b/dlls/dsound/mixer.c @@ -391,6 +391,18 @@ static void cp_fields(IDirectSoundBufferImpl *dsb, UINT count, LONG64 *freqAccNu dsb->sec_mixpos = ipos; } +static void copy_circular(VOID *dstbuff, VOID *srcbuff, DWORD srcoff, DWORD srcsize, DWORD cpysize) +{ + DWORD overflow; + if(cpysize > srcsize - srcoff) { + overflow = cpysize - (srcsize - srcoff); + memcpy(dstbuff, (BYTE*)srcbuff + srcoff, srcsize - srcoff); + memcpy((BYTE*)dstbuff + (srcsize - srcoff), srcbuff, overflow); + }else{ + memcpy(dstbuff, (BYTE*)srcbuff + srcoff, cpysize); + } +} + /** * Calculate the distance between two buffer offsets, taking wraparound * into account. @@ -518,6 +530,8 @@ static DWORD DSOUND_MixInBuffer(IDirectSoundBufferImpl *dsb, float *mix_buffer, INT ilen = DSOUND_BufPtrDiff(dsb->buflen, dsb->sec_mixpos, oldpos); DSOUND_CheckEvent(dsb, oldpos, ilen); } + TRACE("committing %u bytes from offset %u\n", dsb->writelead, dsb->sec_mixpos); + copy_circular(dsb->committedbuff, dsb->buffer->memory, dsb->sec_mixpos, dsb->buflen, dsb->writelead); return frames; } @@ -551,6 +565,11 @@ static DWORD DSOUND_MixOne(IDirectSoundBufferImpl *dsb, float *mix_buffer, DWORD } } + if(dsb->leadin) { + TRACE("committing %u bytes from offset %u\n", dsb->writelead, dsb->sec_mixpos); + copy_circular(dsb->committedbuff, dsb->buffer->memory, dsb->sec_mixpos, dsb->buflen, dsb->writelead); + } + dsb->leadin = FALSE; TRACE("frames (primary) = %i\n", frames); -- 2.17.1

2 3

[PATCH v2] programs/winecfg: Disable virtual desktop when using macdrv.
by Gijs Vermeulen 18 Aug '21

18 Aug '21

Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- programs/winecfg/x11drvdlg.c | 33 ++++++++++++++++++++++++++++++--- 1 file changed, 30 insertions(+), 3 deletions(-) diff --git a/programs/winecfg/x11drvdlg.c b/programs/winecfg/x11drvdlg.c index fbc6716e94e..34b194d04a6 100644 --- a/programs/winecfg/x11drvdlg.c +++ b/programs/winecfg/x11drvdlg.c @@ -111,17 +111,44 @@ static void update_gui_for_desktop_mode(HWND dialog) updating_ui = FALSE; } +static BOOL can_enable_desktop(void) +{ + char *value; + UINT guid_atom; + BOOL ret = FALSE; + char key[sizeof("System\\CurrentControlSet\\Control\\Video\\{}\\0000") + 40]; + + guid_atom = HandleToULong(GetPropA(GetDesktopWindow(), "__wine_display_device_guid")); + strcpy( key, "System\\CurrentControlSet\\Control\\Video\\{" ); + if (!GlobalGetAtomNameA(guid_atom, key + strlen(key), 40)) return ret; + strcat( key, "}\\0000" ); + if ((value = get_reg_key(HKEY_LOCAL_MACHINE, key, "GraphicsDriver", NULL))) + { + if(strcmp(value, "winemac.drv")) + ret = TRUE; + HeapFree(GetProcessHeap(), 0, value); + } + return ret; +} + static void init_dialog(HWND dialog) { char* buf; + BOOL enable_desktop; convert_x11_desktop_key(); - update_gui_for_desktop_mode(dialog); + if ((enable_desktop = can_enable_desktop())) + update_gui_for_desktop_mode(dialog); + else + disable(IDC_ENABLE_DESKTOP); updating_ui = TRUE; - SendDlgItemMessageW(dialog, IDC_DESKTOP_WIDTH, EM_LIMITTEXT, RES_MAXLEN, 0); - SendDlgItemMessageW(dialog, IDC_DESKTOP_HEIGHT, EM_LIMITTEXT, RES_MAXLEN, 0); + if (enable_desktop) + { + SendDlgItemMessageW(dialog, IDC_DESKTOP_WIDTH, EM_LIMITTEXT, RES_MAXLEN, 0); + SendDlgItemMessageW(dialog, IDC_DESKTOP_HEIGHT, EM_LIMITTEXT, RES_MAXLEN, 0); + } buf = get_reg_key(config_key, keypath("X11 Driver"), "GrabFullscreen", "N"); if (IS_OPTION_TRUE(*buf)) -- 2.33.0

1 0

[PATCH v4] conhost: Use font face length as number of characters, not size
by Hugh McMaster 18 Aug '21

18 Aug '21

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- Changes in v4: * Don't recalculate length of face_name in get_first_font_sub_enum() when face_name is not null-terminated (bug in original code). programs/conhost/conhost.c | 10 +++++++--- programs/conhost/window.c | 28 +++++++++++----------------- 2 files changed, 18 insertions(+), 20 deletions(-) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index 9bfc5f84242..dcb847421f7 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -97,9 +97,13 @@ static struct screen_buffer *create_screen_buffer( struct console *console, int screen_buffer->popup_attr = console->active->attr; screen_buffer->font = console->active->font; - if (!(screen_buffer->font.face_name = malloc( screen_buffer->font.face_len ))) return NULL; - memcpy( screen_buffer->font.face_name, console->active->font.face_name, - screen_buffer->font.face_len ); + if (screen_buffer->font.face_len) + { + size_t size = screen_buffer->font.face_len * sizeof(WCHAR); + + if (!(screen_buffer->font.face_name = malloc(size))) return NULL; + memcpy(screen_buffer->font.face_name, console->active->font.face_name, size); + } } else { diff --git a/programs/conhost/window.c b/programs/conhost/window.c index 3ce36fe2c3d..8e57c7ed2b8 100644 --- a/programs/conhost/window.c +++ b/programs/conhost/window.c @@ -242,7 +242,6 @@ static void load_config( const WCHAR *key_name, struct console_config *config ) TRACE("loading %s registry settings.\n", wine_dbgstr_w( key_name )); memcpy( config->color_map, color_map, sizeof(color_map) ); - memset( config->face_name, 0, sizeof(config->face_name) ); config->cursor_size = 25; config->cursor_visible = 1; config->font_pitch_family = FIXED_PITCH | FF_DONTCARE; @@ -675,6 +674,7 @@ static BOOL set_console_font( struct console *console, const LOGFONTW *logfont ) struct font_info *font_info = &console->active->font; HFONT font, old_font; TEXTMETRICW tm; + size_t face_name_size; CPINFO cpinfo; HDC dc; @@ -683,9 +683,7 @@ static BOOL set_console_font( struct console *console, const LOGFONTW *logfont ) if (console->window->font && logfont->lfHeight == console->active->font.height && logfont->lfWeight == console->active->font.weight && !logfont->lfItalic && !logfont->lfUnderline && !logfont->lfStrikeOut && - console->active->font.face_len == wcslen( logfont->lfFaceName ) * sizeof(WCHAR) && - !memcmp( logfont->lfFaceName, console->active->font.face_name, - console->active->font.face_len )) + !wcsncmp(logfont->lfFaceName, console->active->font.face_name, console->active->font.face_len)) { TRACE( "equal to current\n" ); return TRUE; @@ -708,9 +706,10 @@ static BOOL set_console_font( struct console *console, const LOGFONTW *logfont ) font_info->weight = tm.tmWeight; free( font_info->face_name ); - font_info->face_len = wcslen( logfont->lfFaceName ) * sizeof(WCHAR); - font_info->face_name = malloc( font_info->face_len ); - memcpy( font_info->face_name, logfont->lfFaceName, font_info->face_len ); + font_info->face_len = wcslen(logfont->lfFaceName); + face_name_size = font_info->face_len * sizeof(WCHAR); + font_info->face_name = malloc(face_name_size); + memcpy(font_info->face_name, logfont->lfFaceName, face_name_size); /* FIXME: use maximum width for DBCS codepages since some chars take two cells */ if (GetCPInfo( console->output_cp, &cpinfo ) && cpinfo.MaxCharSize > 1) @@ -819,9 +818,9 @@ static int WINAPI get_first_font_sub_enum( const LOGFONTW *lf, const TEXTMETRICW load_config( fc->console->window->config_key, &config ); config.cell_width = fc->console->active->font.width; config.cell_height = fc->console->active->font.height; - fc->console->active->font.face_len = wcslen( config.face_name ) * sizeof(WCHAR); - memcpy( fc->console->active->font.face_name, config.face_name, - fc->console->active->font.face_len ); + lstrcpynW(config.face_name, fc->console->active->font.face_name, + fc->console->active->font.face_len +1); + /* Force also its writing back to the registry so that we can get it * the next time. */ @@ -1895,8 +1894,7 @@ static void apply_config( struct console *console, const struct console_config * console->active->font.height != config->cell_height || console->active->font.weight != config->font_weight || console->active->font.pitch_family != config->font_pitch_family || - console->active->font.face_len != wcslen( config->face_name ) * sizeof(WCHAR) || - memcmp( console->active->font.face_name, config->face_name, console->active->font.face_len )) + wcsncmp(console->active->font.face_name, config->face_name, console->active->font.face_len)) { update_console_font( console, config->face_name, config->cell_height, config->font_weight ); } @@ -1908,8 +1906,6 @@ static void apply_config( struct console *console, const struct console_config * static void current_config( struct console *console, struct console_config *config ) { - size_t len; - config->menu_mask = console->window->menu_mask; config->quick_edit = console->window->quick_edit; @@ -1930,9 +1926,7 @@ static void current_config( struct console *console, struct console_config *conf config->cell_height = console->active->font.height; config->font_weight = console->active->font.weight; config->font_pitch_family = console->active->font.pitch_family; - len = min( ARRAY_SIZE(config->face_name) - 1, console->active->font.face_len / sizeof(WCHAR) ); - if (len) memcpy( config->face_name, console->active->font.face_name, len * sizeof(WCHAR) ); - config->face_name[len] = 0; + lstrcpynW(config->face_name, console->active->font.face_name, console->active->font.face_len + 1); config->sb_width = console->active->width; config->sb_height = console->active->height; -- 2.32.0

1 0

[PATCH] programs/winecfg: Disable virtual desktop when using macdrv.
by Gijs Vermeulen 18 Aug '21

18 Aug '21

Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- programs/winecfg/x11drvdlg.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/programs/winecfg/x11drvdlg.c b/programs/winecfg/x11drvdlg.c index fbc6716e94e..74ccfb77bf5 100644 --- a/programs/winecfg/x11drvdlg.c +++ b/programs/winecfg/x11drvdlg.c @@ -77,6 +77,21 @@ static void update_gui_for_desktop_mode(HWND dialog) WINE_TRACE("\n"); updating_ui = TRUE; +#ifdef __APPLE__ + { + char *tmp; + + tmp = get_reg_key(HKEY_CURRENT_USER, "Software\\Wine\\Drivers", "Graphics", NULL); + if (!tmp || (tmp && !strncmp(tmp, "mac", 3))) + { + disable(IDC_ENABLE_DESKTOP); + if (tmp) HeapFree(GetProcessHeap(), 0, tmp); + updating_ui = FALSE; + return; + } + } +#endif + buf = get_reg_keyW(config_key, explorer_desktopsW, desktop_name, NULL); if (buf && (bufindex = strchrW(buf, 'x'))) { -- 2.33.0

1 0

[PATCH 10/10] gdi32: Remove no longer used driver entry points.
by Jacek Caban 18 Aug '21

18 Aug '21

2 1

[PATCH 09/10] gdi32: Use NtGdiFlattenPath for FlattenPath.
by Jacek Caban 18 Aug '21

18 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/enhmfdrv/dc.c | 5 ++--- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 1 - dlls/gdi32/enhmfdrv/init.c | 2 +- dlls/gdi32/gdi_private.h | 1 + dlls/gdi32/gdidc.c | 12 ++++++++++ dlls/gdi32/path.c | 33 +++++++++++----------------- 6 files changed, 29 insertions(+), 25 deletions(-)

2 1

[PATCH 08/10] gdi32: Use NtGdiSelectClipPath for SelectClipPath.
by Jacek Caban 18 Aug '21

18 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/enhmfdrv/dc.c | 16 +++------------- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 1 - dlls/gdi32/enhmfdrv/init.c | 2 +- dlls/gdi32/gdi_private.h | 1 + dlls/gdi32/gdidc.c | 12 ++++++++++++ dlls/gdi32/path.c | 23 +++++++---------------- 6 files changed, 24 insertions(+), 31 deletions(-)

2 1

[PATCH 07/10] gdi32: Use NtGdiFillPath for FillPath.
by Jacek Caban 18 Aug '21

18 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/enhmfdrv/graphics.c | 11 ++++++++++- dlls/gdi32/gdi_private.h | 1 + dlls/gdi32/gdidc.c | 12 ++++++++++++ dlls/gdi32/path.c | 7 ++----- 4 files changed, 25 insertions(+), 6 deletions(-)

2 1

[PATCH 06/10] gdi32: Merge mfdrv/text.c into metadc.c.
by Jacek Caban 18 Aug '21

18 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/Makefile.in | 1 - dlls/gdi32/metadc.c | 159 +++++++++++++++++++++++++++++---- dlls/gdi32/mfdrv/metafiledrv.h | 65 -------------- dlls/gdi32/mfdrv/text.c | 153 ------------------------------- 4 files changed, 143 insertions(+), 235 deletions(-) delete mode 100644 dlls/gdi32/mfdrv/metafiledrv.h delete mode 100644 dlls/gdi32/mfdrv/text.c

2 1

[PATCH 05/10] gdi32: Merge mfdrv/bitblt.c into metadc.c.
by Jacek Caban 18 Aug '21

18 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/Makefile.in | 1 - dlls/gdi32/metadc.c | 138 +++++++++++++++++++++++++++++ dlls/gdi32/mfdrv/bitblt.c | 177 -------------------------------------- 3 files changed, 138 insertions(+), 178 deletions(-) delete mode 100644 dlls/gdi32/mfdrv/bitblt.c

2 1

[PATCH 04/10] gdi32: Merge mfdrv/objects.c into metadc.c.
by Jacek Caban 18 Aug '21

18 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/Makefile.in | 1 - dlls/gdi32/metadc.c | 379 ++++++++++++++++++++++++++ dlls/gdi32/mfdrv/metafiledrv.h | 4 - dlls/gdi32/mfdrv/objects.c | 467 --------------------------------- 4 files changed, 379 insertions(+), 472 deletions(-) delete mode 100644 dlls/gdi32/mfdrv/objects.c

2 1

[PATCH 03/10] gdi32: Merge mfdrv/graphics.c into metadc.c.
by Jacek Caban 18 Aug '21

18 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/Makefile.in | 1 - dlls/gdi32/metadc.c | 322 +++++++++++++++++++++++++++ dlls/gdi32/mfdrv/graphics.c | 430 ------------------------------------ 3 files changed, 322 insertions(+), 431 deletions(-) delete mode 100644 dlls/gdi32/mfdrv/graphics.c

2 1

[PATCH 02/10] gdi32: Merge mfdrv/dc.c into metadc.c.
by Jacek Caban 18 Aug '21

18 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/Makefile.in | 1 - dlls/gdi32/metadc.c | 130 +++++++++++++++++++++++++++++++++++ dlls/gdi32/mfdrv/dc.c | 151 ----------------------------------------- 3 files changed, 130 insertions(+), 152 deletions(-) delete mode 100644 dlls/gdi32/mfdrv/dc.c

2 1

[PATCH 01/10] gdi32: Move mfdrv/init.c to new metadc.c file.
by Jacek Caban 18 Aug '21

18 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/Makefile.in | 2 +- dlls/gdi32/{mfdrv/init.c => metadc.c} | 344 ++++++++++++-------------- 2 files changed, 158 insertions(+), 188 deletions(-) rename dlls/gdi32/{mfdrv/init.c => metadc.c} (87%)

2 1

[PATCH v2 2/2] user32: Check control type in the STM_SETIMAGE/STM_SETICON handlers before calling the helpers.
by Dmitry Timoshkov 18 Aug '21

18 Aug '21

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/user32/static.c | 7 ++- dlls/user32/tests/static.c | 121 ++++++++++++++++++++++++++++++++++++- 2 files changed, 122 insertions(+), 6 deletions(-) diff --git a/dlls/user32/static.c b/dlls/user32/static.c index 72e49e15e8f..35bdc2490c0 100644 --- a/dlls/user32/static.c +++ b/dlls/user32/static.c @@ -103,7 +103,6 @@ static HICON STATIC_SetIcon( HWND hwnd, HICON hicon, DWORD style ) HICON prevIcon; SIZE size; - if ((style & SS_TYPEMASK) != SS_ICON) return 0; if (hicon && !get_icon_size( hicon, &size )) { WARN("hicon != 0, but invalid\n"); @@ -138,7 +137,6 @@ static HBITMAP STATIC_SetBitmap( HWND hwnd, HBITMAP hBitmap, DWORD style ) { HBITMAP hOldBitmap; - if ((style & SS_TYPEMASK) != SS_BITMAP) return 0; if (hBitmap && GetObjectType(hBitmap) != OBJ_BITMAP) { WARN("hBitmap != 0, but it's not a bitmap\n"); return 0; @@ -174,7 +172,6 @@ static HBITMAP STATIC_SetBitmap( HWND hwnd, HBITMAP hBitmap, DWORD style ) */ static HENHMETAFILE STATIC_SetEnhMetaFile( HWND hwnd, HENHMETAFILE hEnhMetaFile, DWORD style ) { - if ((style & SS_TYPEMASK) != SS_ENHMETAFILE) return 0; if (hEnhMetaFile && GetObjectType(hEnhMetaFile) != OBJ_ENHMETAFILE) { WARN("hEnhMetaFile != 0, but it's not an enhanced metafile\n"); return 0; @@ -501,13 +498,16 @@ LRESULT StaticWndProc_common( HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam case STM_SETIMAGE: switch(wParam) { case IMAGE_BITMAP: + if (style != SS_BITMAP) return 0; lResult = (LRESULT)STATIC_SetBitmap( hwnd, (HBITMAP)lParam, full_style ); break; case IMAGE_ENHMETAFILE: + if (style != SS_ENHMETAFILE) return 0; lResult = (LRESULT)STATIC_SetEnhMetaFile( hwnd, (HENHMETAFILE)lParam, full_style ); break; case IMAGE_ICON: case IMAGE_CURSOR: + if (style != SS_ICON) return 0; lResult = (LRESULT)STATIC_SetIcon( hwnd, (HICON)lParam, full_style ); break; default: @@ -518,6 +518,7 @@ LRESULT StaticWndProc_common( HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam break; case STM_SETICON: + if (style != SS_ICON) return 0; lResult = (LRESULT)STATIC_SetIcon( hwnd, (HICON)wParam, full_style ); STATIC_TryPaintFcn( hwnd, full_style ); break; diff --git a/dlls/user32/tests/static.c b/dlls/user32/tests/static.c index 0c453d08a67..731e0f5df72 100644 --- a/dlls/user32/tests/static.c +++ b/dlls/user32/tests/static.c @@ -20,9 +20,11 @@ #include <stdarg.h> #include <stdio.h> -#define STRICT -#define WIN32_LEAN_AND_MEAN -#include <windows.h> +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#define OEMRESOURCE +#include "winuser.h" #include "wine/test.h" @@ -189,6 +191,118 @@ static void test_set_image(void) DeleteObject(image); } +static void test_STM_SETIMAGE(void) +{ + DWORD type; + HWND hwnd; + HICON icon, old_image; + HBITMAP bmp; + HENHMETAFILE emf; + HDC dc; + + icon = LoadIconW(0, (LPCWSTR)IDI_APPLICATION); + bmp = LoadBitmapW(0, (LPCWSTR)OBM_CLOSE); + dc = CreateEnhMetaFileW(0, NULL, NULL, NULL); + LineTo(dc, 1, 1); + emf = CloseEnhMetaFile(dc); + DeleteDC(dc); + + for (type = SS_LEFT; type < SS_ETCHEDFRAME; type++) + { + winetest_push_context("%u", type); + + hwnd = build_static(type); + ok(hwnd != 0, "failed to create static type %#x\n", type); + + /* set icon */ + g_nReceivedColorStatic = 0; + old_image = (HICON)SendMessageW(hwnd, STM_SETIMAGE, IMAGE_ICON, (LPARAM)icon); + ok(!old_image, "got %p\n", old_image); + if (type == SS_ICON) + ok(g_nReceivedColorStatic, "Unexpected WM_CTLCOLORSTATIC value %d\n", g_nReceivedColorStatic); + else + ok(!g_nReceivedColorStatic, "Unexpected WM_CTLCOLORSTATIC value %d\n", g_nReceivedColorStatic); + + g_nReceivedColorStatic = 0; + old_image = (HICON)SendMessageW(hwnd, STM_SETIMAGE, IMAGE_ICON, (LPARAM)icon); + if (type == SS_ICON) + { + ok(old_image != 0, "got %p\n", old_image); + ok(g_nReceivedColorStatic, "Unexpected WM_CTLCOLORSTATIC value %d\n", g_nReceivedColorStatic); + } + else + { + ok(!old_image, "got %p\n", old_image); + ok(!g_nReceivedColorStatic, "Unexpected WM_CTLCOLORSTATIC value %d\n", g_nReceivedColorStatic); + } + + g_nReceivedColorStatic = 0; + old_image = (HICON)SendMessageW(hwnd, STM_SETICON, (WPARAM)icon, 0); + if (type == SS_ICON) + { + ok(old_image != 0, "got %p\n", old_image); + ok(g_nReceivedColorStatic, "Unexpected WM_CTLCOLORSTATIC value %d\n", g_nReceivedColorStatic); + } + else + { + ok(!old_image, "got %p\n", old_image); + ok(!g_nReceivedColorStatic, "Unexpected WM_CTLCOLORSTATIC value %d\n", g_nReceivedColorStatic); + } + + /* set bitmap */ + g_nReceivedColorStatic = 0; + old_image = (HICON)SendMessageW(hwnd, STM_SETIMAGE, IMAGE_BITMAP, (LPARAM)bmp); + ok(!old_image, "got %p\n", old_image); + if (type == SS_BITMAP) + ok(g_nReceivedColorStatic, "Unexpected WM_CTLCOLORSTATIC value %d\n", g_nReceivedColorStatic); + else + ok(!g_nReceivedColorStatic, "Unexpected WM_CTLCOLORSTATIC value %d\n", g_nReceivedColorStatic); + + g_nReceivedColorStatic = 0; + old_image = (HICON)SendMessageW(hwnd, STM_SETIMAGE, IMAGE_BITMAP, (LPARAM)bmp); + if (type == SS_BITMAP) + { + ok(old_image != 0, "got %p\n", old_image); + ok(g_nReceivedColorStatic, "Unexpected WM_CTLCOLORSTATIC value %d\n", g_nReceivedColorStatic); + } + else + { + ok(!old_image, "got %p\n", old_image); + ok(!g_nReceivedColorStatic, "Unexpected WM_CTLCOLORSTATIC value %d\n", g_nReceivedColorStatic); + } + + /* set EMF */ + g_nReceivedColorStatic = 0; + old_image = (HICON)SendMessageW(hwnd, STM_SETIMAGE, IMAGE_ENHMETAFILE, (LPARAM)emf); + ok(!old_image, "got %p\n", old_image); + if (type == SS_ENHMETAFILE) + ok(g_nReceivedColorStatic, "Unexpected WM_CTLCOLORSTATIC value %d\n", g_nReceivedColorStatic); + else + ok(!g_nReceivedColorStatic, "Unexpected WM_CTLCOLORSTATIC value %d\n", g_nReceivedColorStatic); + + g_nReceivedColorStatic = 0; + old_image = (HICON)SendMessageW(hwnd, STM_SETIMAGE, IMAGE_ENHMETAFILE, (LPARAM)emf); + if (type == SS_ENHMETAFILE) + { + ok(old_image != 0, "got %p\n", old_image); + ok(g_nReceivedColorStatic, "Unexpected WM_CTLCOLORSTATIC value %d\n", g_nReceivedColorStatic); + } + else + { + ok(!old_image, "got %p\n", old_image); + ok(!g_nReceivedColorStatic, "Unexpected WM_CTLCOLORSTATIC value %d\n", g_nReceivedColorStatic); + } + + DestroyWindow(hwnd); + + winetest_pop_context(); + } + + DestroyIcon(icon); + DeleteObject(bmp); + DeleteEnhMetaFile(emf); +} + START_TEST(static) { static const char szClassName[] = "testclass"; @@ -222,6 +336,7 @@ START_TEST(static) test_updates(SS_ETCHEDVERT, TODO_COUNT); test_set_text(); test_set_image(); + test_STM_SETIMAGE(); DestroyWindow(hMainWnd); } -- 2.31.1

1 0

[PATCH v2 1/2] comctl32: Check control type in the STM_SETIMAGE/STM_SETICON handlers before calling the helpers.
by Dmitry Timoshkov 18 Aug '21

18 Aug '21

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/comctl32/static.c | 7 +- dlls/comctl32/tests/static.c | 121 ++++++++++++++++++++++++++++++++++- 2 files changed, 122 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/static.c b/dlls/comctl32/static.c index 2bd2b22bc20..60af6696425 100644 --- a/dlls/comctl32/static.c +++ b/dlls/comctl32/static.c @@ -133,7 +133,6 @@ static HICON STATIC_SetIcon( HWND hwnd, HICON hicon, DWORD style ) SIZE size; struct static_extra_info *extra; - if ((style & SS_TYPEMASK) != SS_ICON) return 0; if (hicon && !get_icon_size( hicon, &size )) { WARN("hicon != 0, but invalid\n"); @@ -220,7 +219,6 @@ static HBITMAP STATIC_SetBitmap( HWND hwnd, HBITMAP hBitmap, DWORD style ) HBITMAP hOldBitmap, alpha; struct static_extra_info *extra; - if ((style & SS_TYPEMASK) != SS_BITMAP) return 0; if (hBitmap && GetObjectType(hBitmap) != OBJ_BITMAP) { WARN("hBitmap != 0, but it's not a bitmap\n"); @@ -277,7 +275,6 @@ static HENHMETAFILE STATIC_SetEnhMetaFile( HWND hwnd, HENHMETAFILE hEnhMetaFile, HENHMETAFILE old_hemf; struct static_extra_info *extra; - if ((style & SS_TYPEMASK) != SS_ENHMETAFILE) return 0; if (hEnhMetaFile && GetObjectType(hEnhMetaFile) != OBJ_ENHMETAFILE) { WARN("hEnhMetaFile != 0, but it's not an enhanced metafile\n"); @@ -594,13 +591,16 @@ static LRESULT CALLBACK STATIC_WindowProc( HWND hwnd, UINT uMsg, WPARAM wParam, switch (wParam) { case IMAGE_BITMAP: + if (style != SS_BITMAP) return 0; lResult = (LRESULT)STATIC_SetBitmap( hwnd, (HBITMAP)lParam, full_style ); break; case IMAGE_ENHMETAFILE: + if (style != SS_ENHMETAFILE) return 0; lResult = (LRESULT)STATIC_SetEnhMetaFile( hwnd, (HENHMETAFILE)lParam, full_style ); break; case IMAGE_ICON: case IMAGE_CURSOR: + if (style != SS_ICON) return 0; lResult = (LRESULT)STATIC_SetIcon( hwnd, (HICON)lParam, full_style ); break; default: @@ -611,6 +611,7 @@ static LRESULT CALLBACK STATIC_WindowProc( HWND hwnd, UINT uMsg, WPARAM wParam, break; case STM_SETICON: + if (style != SS_ICON) return 0; lResult = (LRESULT)STATIC_SetIcon( hwnd, (HICON)wParam, full_style ); STATIC_TryPaintFcn( hwnd, full_style ); break; diff --git a/dlls/comctl32/tests/static.c b/dlls/comctl32/tests/static.c index 4efb7685790..40a337b97b0 100644 --- a/dlls/comctl32/tests/static.c +++ b/dlls/comctl32/tests/static.c @@ -20,9 +20,11 @@ #include <stdarg.h> #include <stdio.h> -#define STRICT -#define WIN32_LEAN_AND_MEAN -#include <windows.h> +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#define OEMRESOURCE +#include "winuser.h" #include "commctrl.h" #include "resources.h" @@ -263,6 +265,118 @@ static void test_set_image(void) DeleteObject(image); } +static void test_STM_SETIMAGE(void) +{ + DWORD type; + HWND hwnd; + HICON icon, old_image; + HBITMAP bmp; + HENHMETAFILE emf; + HDC dc; + + icon = LoadIconW(0, (LPCWSTR)IDI_APPLICATION); + bmp = LoadBitmapW(0, (LPCWSTR)OBM_CLOSE); + dc = CreateEnhMetaFileW(0, NULL, NULL, NULL); + LineTo(dc, 1, 1); + emf = CloseEnhMetaFile(dc); + DeleteDC(dc); + + for (type = SS_LEFT; type < SS_ETCHEDFRAME; type++) + { + winetest_push_context("%u", type); + + hwnd = create_static(type); + ok(hwnd != 0, "failed to create static type %#x\n", type); + + /* set icon */ + g_nReceivedColorStatic = 0; + old_image = (HICON)SendMessageW(hwnd, STM_SETIMAGE, IMAGE_ICON, (LPARAM)icon); + ok(!old_image, "got %p\n", old_image); + if (type == SS_ICON) + ok(g_nReceivedColorStatic, "Unexpected WM_CTLCOLORSTATIC value %d\n", g_nReceivedColorStatic); + else + ok(!g_nReceivedColorStatic, "Unexpected WM_CTLCOLORSTATIC value %d\n", g_nReceivedColorStatic); + + g_nReceivedColorStatic = 0; + old_image = (HICON)SendMessageW(hwnd, STM_SETIMAGE, IMAGE_ICON, (LPARAM)icon); + if (type == SS_ICON) + { + ok(old_image != 0, "got %p\n", old_image); + ok(g_nReceivedColorStatic, "Unexpected WM_CTLCOLORSTATIC value %d\n", g_nReceivedColorStatic); + } + else + { + ok(!old_image, "got %p\n", old_image); + ok(!g_nReceivedColorStatic, "Unexpected WM_CTLCOLORSTATIC value %d\n", g_nReceivedColorStatic); + } + + g_nReceivedColorStatic = 0; + old_image = (HICON)SendMessageW(hwnd, STM_SETICON, (WPARAM)icon, 0); + if (type == SS_ICON) + { + ok(old_image != 0, "got %p\n", old_image); + ok(g_nReceivedColorStatic, "Unexpected WM_CTLCOLORSTATIC value %d\n", g_nReceivedColorStatic); + } + else + { + ok(!old_image, "got %p\n", old_image); + ok(!g_nReceivedColorStatic, "Unexpected WM_CTLCOLORSTATIC value %d\n", g_nReceivedColorStatic); + } + + /* set bitmap */ + g_nReceivedColorStatic = 0; + old_image = (HICON)SendMessageW(hwnd, STM_SETIMAGE, IMAGE_BITMAP, (LPARAM)bmp); + ok(!old_image, "got %p\n", old_image); + if (type == SS_BITMAP) + ok(g_nReceivedColorStatic, "Unexpected WM_CTLCOLORSTATIC value %d\n", g_nReceivedColorStatic); + else + ok(!g_nReceivedColorStatic, "Unexpected WM_CTLCOLORSTATIC value %d\n", g_nReceivedColorStatic); + + g_nReceivedColorStatic = 0; + old_image = (HICON)SendMessageW(hwnd, STM_SETIMAGE, IMAGE_BITMAP, (LPARAM)bmp); + if (type == SS_BITMAP) + { + ok(old_image != 0, "got %p\n", old_image); + ok(g_nReceivedColorStatic, "Unexpected WM_CTLCOLORSTATIC value %d\n", g_nReceivedColorStatic); + } + else + { + ok(!old_image, "got %p\n", old_image); + ok(!g_nReceivedColorStatic, "Unexpected WM_CTLCOLORSTATIC value %d\n", g_nReceivedColorStatic); + } + + /* set EMF */ + g_nReceivedColorStatic = 0; + old_image = (HICON)SendMessageW(hwnd, STM_SETIMAGE, IMAGE_ENHMETAFILE, (LPARAM)emf); + ok(!old_image, "got %p\n", old_image); + if (type == SS_ENHMETAFILE) + ok(g_nReceivedColorStatic, "Unexpected WM_CTLCOLORSTATIC value %d\n", g_nReceivedColorStatic); + else + ok(!g_nReceivedColorStatic, "Unexpected WM_CTLCOLORSTATIC value %d\n", g_nReceivedColorStatic); + + g_nReceivedColorStatic = 0; + old_image = (HICON)SendMessageW(hwnd, STM_SETIMAGE, IMAGE_ENHMETAFILE, (LPARAM)emf); + if (type == SS_ENHMETAFILE) + { + ok(old_image != 0, "got %p\n", old_image); + ok(g_nReceivedColorStatic, "Unexpected WM_CTLCOLORSTATIC value %d\n", g_nReceivedColorStatic); + } + else + { + ok(!old_image, "got %p\n", old_image); + ok(!g_nReceivedColorStatic, "Unexpected WM_CTLCOLORSTATIC value %d\n", g_nReceivedColorStatic); + } + + DestroyWindow(hwnd); + + winetest_pop_context(); + } + + DestroyIcon(icon); + DeleteObject(bmp); + DeleteEnhMetaFile(emf); +} + START_TEST(static) { static const char classname[] = "testclass"; @@ -302,6 +416,7 @@ START_TEST(static) test_updates(SS_ETCHEDVERT, TODO_COUNT); test_set_text(); test_set_image(); + test_STM_SETIMAGE(); DestroyWindow(hMainWnd); -- 2.31.1

1 0

[PATCH] [DbgHelp]: fix copy_line_W64_from_64 when A and W buffers are identical
by Eric Pouech 18 Aug '21

18 Aug '21

As reported by Alistair, when doing Unicode conversion for FileName field from IMAGEHLP_LINE64 into IMAGEHLP_LINE64W, both structures would refer to the same buffer allocated by fetch_buffer. So properly detect and handle this situation. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/symbol.c | 35 +++++++++++++++++++++++++++-------- 1 file changed, 27 insertions(+), 8 deletions(-) diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index b2b4d578910..3b264eb9a52 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -1588,19 +1588,39 @@ static void copy_line_64_from_32(IMAGEHLP_LINE64* l64, const IMAGEHLP_LINE* l32) } /****************************************************************** - * copy_line_W64_from_32 (internal) + * copy_line_W64_from_64 (internal) * + * Note: upon return, l64w->FileName is always allocated by fetch_buffer(). + * So, if input l64->FileName has *also* been allocated by fetch_buffer() + * before calling this function, l64->FileName will be overwritten + * (as it's the same buffer returned in l64w). + * In consequence, don't use the l64 structure *after* calling this function. */ -static void copy_line_W64_from_64(struct process* pcs, IMAGEHLP_LINEW64* l64w, const IMAGEHLP_LINE64* l64) +static BOOL copy_line_W64_from_64(struct process* pcs, IMAGEHLP_LINEW64* l64w, const IMAGEHLP_LINE64* l64) { - unsigned len; + char* incoming = l64->FileName; + unsigned len = MultiByteToWideChar(CP_ACP, 0, l64->FileName, -1, NULL, 0); + + /* detect when l64->FileName has been allocated by fetch_buffer() + * and make a copy before calling fetch_buffer() again + */ + if (incoming >= (char*)pcs->buffer && incoming < (char*)pcs->buffer + pcs->buffer_size) + { + DWORD sz = strlen(incoming) + 1; + char* new = HeapAlloc(GetProcessHeap(), 0, sz); + if (!new) + return FALSE; + incoming = memcpy(new, incoming, sz); + } l64w->Key = l64->Key; l64w->LineNumber = l64->LineNumber; - len = MultiByteToWideChar(CP_ACP, 0, l64->FileName, -1, NULL, 0); - if ((l64w->FileName = fetch_buffer(pcs, len * sizeof(WCHAR)))) - MultiByteToWideChar(CP_ACP, 0, l64->FileName, -1, l64w->FileName, len); l64w->Address = l64->Address; + if (!(l64w->FileName = fetch_buffer(pcs, len * sizeof(WCHAR)))) + return FALSE; + MultiByteToWideChar(CP_ACP, 0, incoming, -1, l64w->FileName, len); + if (incoming != l64->FileName) HeapFree(GetProcessHeap(), 0, incoming); + return TRUE; } /****************************************************************** @@ -1671,8 +1691,7 @@ BOOL WINAPI SymGetLineFromAddrW64(HANDLE hProcess, DWORD64 dwAddr, il64.SizeOfStruct = sizeof(il64); if (!SymGetLineFromAddr64(hProcess, dwAddr, pdwDisplacement, &il64)) return FALSE; - copy_line_W64_from_64(process_find_by_handle(hProcess), Line, &il64); - return TRUE; + return copy_line_W64_from_64(process_find_by_handle(hProcess), Line, &il64); } /******************************************************************

1 0

[PATCH 5/5] iphlpapi: Implement GetUdpStatisticsEx() on top of nsi.
by Huw Davies 18 Aug '21

18 Aug '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/iphlpapi/Makefile.in | 4 +- dlls/iphlpapi/ifenum.c | 395 ---------------------------------- dlls/iphlpapi/ifenum.h | 66 ------ dlls/iphlpapi/iphlpapi_main.c | 48 ++++- dlls/iphlpapi/ipstats.c | 370 ------------------------------- dlls/nsi/tests/nsi.c | 1 - 6 files changed, 48 insertions(+), 836 deletions(-) delete mode 100644 dlls/iphlpapi/ifenum.c delete mode 100644 dlls/iphlpapi/ifenum.h delete mode 100644 dlls/iphlpapi/ipstats.c diff --git a/dlls/iphlpapi/Makefile.in b/dlls/iphlpapi/Makefile.in index 3797ac793e6..326cf8bf75e 100644 --- a/dlls/iphlpapi/Makefile.in +++ b/dlls/iphlpapi/Makefile.in @@ -5,8 +5,6 @@ EXTRALIBS = $(KSTAT_LIBS) $(PROCSTAT_LIBS) C_SRCS = \ icmp.c \ - ifenum.c \ - iphlpapi_main.c \ - ipstats.c + iphlpapi_main.c RC_SRCS = version.rc diff --git a/dlls/iphlpapi/ifenum.c b/dlls/iphlpapi/ifenum.c deleted file mode 100644 index 0264f621b1f..00000000000 --- a/dlls/iphlpapi/ifenum.c +++ /dev/null @@ -1,395 +0,0 @@ -/* Copyright (C) 2003,2006,2011 Juan Lang - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include "config.h" - -#include <stdarg.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> - -#ifdef HAVE_UNISTD_H -#include <unistd.h> -#endif - -#include <sys/types.h> -#ifdef HAVE_SYS_PARAM_H -#include <sys/param.h> -#endif - -#ifdef HAVE_SYS_SOCKET_H -#include <sys/socket.h> -#endif - -#ifdef HAVE_NET_IF_H -#include <net/if.h> -#endif - -#ifdef HAVE_NET_IF_ARP_H -#include <net/if_arp.h> -#endif - -#ifdef HAVE_NET_ROUTE_H -#include <net/route.h> -#endif - -#ifdef HAVE_SYS_IOCTL_H -#include <sys/ioctl.h> -#endif - -#ifdef HAVE_SYS_SYSCTL_H -#include <sys/sysctl.h> -#endif - -#ifdef HAVE_SYS_SOCKIO_H -#include <sys/sockio.h> -#endif - -#ifdef HAVE_NET_IF_DL_H -#include <net/if_dl.h> -#endif - -#ifdef HAVE_NET_IF_TYPES_H -#include <net/if_types.h> -#endif - -#ifdef HAVE_NETINET_IN_H -#include <netinet/in.h> -#endif - -#ifdef HAVE_IFADDRS_H -#include <ifaddrs.h> -#endif - -#ifdef HAVE_LINUX_RTNETLINK_H -#include <linux/rtnetlink.h> -#endif - -#include "ifenum.h" -#include "ws2ipdef.h" - -#ifdef HAVE_STRUCT_SOCKADDR_SA_LEN -#define ifreq_len(ifr) \ - max(sizeof(struct ifreq), sizeof((ifr)->ifr_name)+(ifr)->ifr_addr.sa_len) -#else -#define ifreq_len(ifr) sizeof(struct ifreq) -#endif - -#ifndef ETH_ALEN -#define ETH_ALEN 6 -#endif - -#ifndef IF_NAMESIZE -#define IF_NAMESIZE 16 -#endif - -#ifndef INADDR_NONE -#define INADDR_NONE (~0U) -#endif - -#define INITIAL_INTERFACES_ASSUMED 4 - -/* Functions */ - -static BOOL isLoopbackInterface(int fd, const char *name) -{ - BOOL ret = FALSE; - - if (name) { - struct ifreq ifr; - - lstrcpynA(ifr.ifr_name, name, IFNAMSIZ); - if (ioctl(fd, SIOCGIFFLAGS, &ifr) == 0) - ret = ifr.ifr_flags & IFF_LOOPBACK; - } - return !!ret; -} - -/* The comments say MAX_ADAPTER_NAME is required, but really only IF_NAMESIZE - * bytes are necessary. - */ -static char *getInterfaceNameByIndex(IF_INDEX index, char *name) -{ - return if_indextoname(index, name); -} - -DWORD getInterfaceIndexByName(const char *name, IF_INDEX *index) -{ - DWORD ret; - unsigned int idx; - - if (!name) - return ERROR_INVALID_PARAMETER; - if (!index) - return ERROR_INVALID_PARAMETER; - idx = if_nametoindex(name); - if (idx) { - *index = idx; - ret = NO_ERROR; - } - else - ret = ERROR_INVALID_DATA; - return ret; -} - -static BOOL isIfIndexLoopback(ULONG idx) -{ - BOOL ret = FALSE; - char name[IFNAMSIZ]; - int fd; - - getInterfaceNameByIndex(idx, name); - fd = socket(PF_INET, SOCK_DGRAM, 0); - if (fd != -1) { - ret = isLoopbackInterface(fd, name); - close(fd); - } - return ret; -} - -#ifdef HAVE_IF_NAMEINDEX -DWORD get_interface_indices( BOOL skip_loopback, InterfaceIndexTable **table ) -{ - DWORD count = 0, i; - struct if_nameindex *p, *indices = if_nameindex(); - InterfaceIndexTable *ret; - - if (table) *table = NULL; - if (!indices) return 0; - - for (p = indices; p->if_name; p++) - { - if (skip_loopback && isIfIndexLoopback( p->if_index )) continue; - count++; - } - - if (table) - { - ret = HeapAlloc( GetProcessHeap(), 0, FIELD_OFFSET(InterfaceIndexTable, indexes[count]) ); - if (!ret) - { - count = 0; - goto end; - } - for (p = indices, i = 0; p->if_name && i < count; p++) - { - if (skip_loopback && isIfIndexLoopback( p->if_index )) continue; - ret->indexes[i++] = p->if_index; - } - ret->numIndexes = count = i; - *table = ret; - } - -end: - if_freenameindex( indices ); - return count; -} - -#elif defined(HAVE_LINUX_RTNETLINK_H) -static int open_netlink( int *pid ) -{ - int fd = socket( AF_NETLINK, SOCK_RAW, NETLINK_ROUTE ); - struct sockaddr_nl addr; - socklen_t len; - - if (fd < 0) return fd; - - memset( &addr, 0, sizeof(addr) ); - addr.nl_family = AF_NETLINK; - - if (bind( fd, (struct sockaddr *)&addr, sizeof(addr) ) < 0) - goto fail; - - len = sizeof(addr); - if (getsockname( fd, (struct sockaddr *)&addr, &len ) < 0) - goto fail; - - *pid = addr.nl_pid; - return fd; -fail: - close( fd ); - return -1; -} - -static int send_netlink_req( int fd, int pid, int type, int *seq_no ) -{ - static LONG seq; - struct request - { - struct nlmsghdr hdr; - struct rtgenmsg gen; - } req; - struct sockaddr_nl addr; - - req.hdr.nlmsg_len = sizeof(req); - req.hdr.nlmsg_type = type; - req.hdr.nlmsg_flags = NLM_F_ROOT | NLM_F_MATCH | NLM_F_REQUEST; - req.hdr.nlmsg_pid = pid; - req.hdr.nlmsg_seq = InterlockedIncrement( &seq ); - req.gen.rtgen_family = AF_UNSPEC; - - memset( &addr, 0, sizeof(addr) ); - addr.nl_family = AF_NETLINK; - if (sendto( fd, &req, sizeof(req), 0, (struct sockaddr *)&addr, sizeof(addr) ) != sizeof(req)) - return -1; - *seq_no = req.hdr.nlmsg_seq; - return 0; -} - -struct netlink_reply -{ - struct netlink_reply *next; - int size; - struct nlmsghdr *hdr; -}; - -static void free_netlink_reply( struct netlink_reply *data ) -{ - struct netlink_reply *ptr; - while( data ) - { - ptr = data->next; - HeapFree( GetProcessHeap(), 0, data ); - data = ptr; - } -} - -static int recv_netlink_reply( int fd, int pid, int seq, struct netlink_reply **data ) -{ - int bufsize = getpagesize(); - int left, read; - BOOL done = FALSE; - socklen_t sa_len; - struct sockaddr_nl addr; - struct netlink_reply *cur, *last = NULL; - struct nlmsghdr *hdr; - char *buf; - - *data = NULL; - buf = HeapAlloc( GetProcessHeap(), 0, bufsize ); - if (!buf) return -1; - - do - { - left = read = recvfrom( fd, buf, bufsize, 0, (struct sockaddr *)&addr, &sa_len ); - if (read < 0) goto fail; - if (addr.nl_pid != 0) continue; /* not from kernel */ - - for (hdr = (struct nlmsghdr *)buf; NLMSG_OK(hdr, left); hdr = NLMSG_NEXT(hdr, left)) - { - if (hdr->nlmsg_pid != pid || hdr->nlmsg_seq != seq) continue; - if (hdr->nlmsg_type == NLMSG_DONE) - { - done = TRUE; - break; - } - } - - cur = HeapAlloc( GetProcessHeap(), 0, sizeof(*cur) + read ); - if (!cur) goto fail; - cur->next = NULL; - cur->size = read; - cur->hdr = (struct nlmsghdr *)(cur + 1); - memcpy( cur->hdr, buf, read ); - if (last) last->next = cur; - else *data = cur; - last = cur; - } while (!done); - - HeapFree( GetProcessHeap(), 0, buf ); - return 0; - -fail: - free_netlink_reply( *data ); - HeapFree( GetProcessHeap(), 0, buf ); - return -1; -} - - -static DWORD get_indices_from_reply( struct netlink_reply *reply, int pid, int seq, - BOOL skip_loopback, InterfaceIndexTable *table ) -{ - struct nlmsghdr *hdr; - struct netlink_reply *r; - int count = 0; - - for (r = reply; r; r = r->next) - { - int size = r->size; - for (hdr = r->hdr; NLMSG_OK(hdr, size); hdr = NLMSG_NEXT(hdr, size)) - { - if (hdr->nlmsg_pid != pid || hdr->nlmsg_seq != seq) continue; - if (hdr->nlmsg_type == NLMSG_DONE) break; - - if (hdr->nlmsg_type == RTM_NEWLINK) - { - struct ifinfomsg *info = NLMSG_DATA(hdr); - - if (skip_loopback && (info->ifi_flags & IFF_LOOPBACK)) continue; - if (table) table->indexes[count] = info->ifi_index; - count++; - } - } - } - return count; -} - -DWORD get_interface_indices( BOOL skip_loopback, InterfaceIndexTable **table ) -{ - int fd, pid, seq; - struct netlink_reply *reply = NULL; - DWORD count = 0; - - if (table) *table = NULL; - fd = open_netlink( &pid ); - if (fd < 0) return 0; - - if (send_netlink_req( fd, pid, RTM_GETLINK, &seq ) < 0) - goto end; - - if (recv_netlink_reply( fd, pid, seq, &reply ) < 0) - goto end; - - count = get_indices_from_reply( reply, pid, seq, skip_loopback, NULL ); - - if (table) - { - InterfaceIndexTable *ret = HeapAlloc( GetProcessHeap(), 0, FIELD_OFFSET(InterfaceIndexTable, indexes[count]) ); - if (!ret) - { - count = 0; - goto end; - } - - ret->numIndexes = count; - get_indices_from_reply( reply, pid, seq, skip_loopback, ret ); - *table = ret; - } - -end: - free_netlink_reply( reply ); - close( fd ); - return count; -} - -#else -DWORD get_interface_indices( BOOL skip_loopback, InterfaceIndexTable **table ) -{ - if (table) *table = NULL; - return 0; -} -#endif diff --git a/dlls/iphlpapi/ifenum.h b/dlls/iphlpapi/ifenum.h deleted file mode 100644 index 710b493ad36..00000000000 --- a/dlls/iphlpapi/ifenum.h +++ /dev/null @@ -1,66 +0,0 @@ -/* ifenum.h - * Copyright (C) 2003,2006 Juan Lang - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - * - * This module implements network interface and address enumeration. It's - * meant to hide some problematic defines like socket(), and make iphlpapi - * more portable. - * - * Like Windows, it uses a numeric index to identify an interface uniquely. - * As implemented, an interface represents a UNIX network interface, virtual - * or real, and thus can have 0 or 1 IP addresses associated with it. (This - * only supports IPv4.) - * The indexes returned are not guaranteed to be contiguous, so don't call - * getNumInterfaces() and assume the values [0,getNumInterfaces() - 1] will be - * valid indexes; use getInterfaceIndexTable() instead. - * - * See also the companion file, ipstats.h, for functions related to getting - * statistics. - */ -#ifndef WINE_IFENUM_H_ -#define WINE_IFENUM_H_ - -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#define USE_WS_PREFIX -#include "iprtrmib.h" -#include "winsock2.h" - -#define MAX_INTERFACE_PHYSADDR 8 -#define MAX_INTERFACE_DESCRIPTION 256 - -/* A table of interface indexes, see get_interface_indices(). */ -typedef struct _InterfaceIndexTable { - DWORD numIndexes; - IF_INDEX indexes[1]; -} InterfaceIndexTable; - -/* Returns the count of all interface indexes and optionally a ptr to an interface table. - * HeapFree() the returned table. Will optionally ignore loopback devices. - */ -DWORD get_interface_indices( BOOL skip_loopback, InterfaceIndexTable **table ) DECLSPEC_HIDDEN; - -/* ByName/ByIndex versions of various getter functions. */ - -/* Fills index with the index of name, if found. Returns - * ERROR_INVALID_PARAMETER if name or index is NULL, ERROR_INVALID_DATA if name - * is not found, and NO_ERROR on success. - */ -DWORD getInterfaceIndexByName(const char *name, IF_INDEX *index) DECLSPEC_HIDDEN; - -#endif /* ndef WINE_IFENUM_H_ */ diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 82c63b0dfce..8a8b6b3e7cf 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -42,7 +42,6 @@ #include "ws2ipdef.h" #include "windns.h" #include "iphlpapi.h" -#include "ifenum.h" #include "ipifcons.h" #include "fltdefs.h" #include "ifdef.h" @@ -3282,6 +3281,53 @@ DWORD WINAPI AllocateAndGetTcpExTableFromStack( void **table, BOOL sort, HANDLE return allocate_tcp_table( table, sort, heap, flags, family, TCP_TABLE_OWNER_PID_ALL ); } +/****************************************************************** + * GetUdpStatistics (IPHLPAPI.@) + * + * Get the UDP statistics for the local computer. + * + * PARAMS + * stats [Out] buffer for UDP statistics + */ +DWORD WINAPI GetUdpStatistics( MIB_UDPSTATS *stats ) +{ + return GetUdpStatisticsEx( stats, WS_AF_INET ); +} + +/****************************************************************** + * GetUdpStatisticsEx (IPHLPAPI.@) + * + * Get the IPv4 and IPv6 UDP statistics for the local computer. + * + * PARAMS + * stats [Out] buffer for UDP statistics + * family [In] specifies whether IPv4 or IPv6 statistics are returned + * + * RETURNS + * Success: NO_ERROR + * Failure: error code from winerror.h + */ +DWORD WINAPI GetUdpStatisticsEx( MIB_UDPSTATS *stats, DWORD family ) +{ + struct nsi_udp_stats_dynamic dyn; + USHORT key = (USHORT)family; + DWORD err; + + if (!stats || !ip_module_id( family )) return ERROR_INVALID_PARAMETER; + memset( stats, 0, sizeof(*stats) ); + + err = NsiGetAllParameters( 1, &NPI_MS_UDP_MODULEID, NSI_UDP_STATS_TABLE, &key, sizeof(key), NULL, 0, + &dyn, sizeof(dyn), NULL, 0 ); + if (err) return err; + + stats->dwInDatagrams = dyn.in_dgrams; + stats->dwNoPorts = dyn.no_ports; + stats->dwInErrors = dyn.in_errs; + stats->dwOutDatagrams = dyn.out_dgrams; + stats->dwNumAddrs = dyn.num_addrs; + return err; +} + /****************************************************************** * GetUdpTable (IPHLPAPI.@) * diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c deleted file mode 100644 index 1a71396e388..00000000000 --- a/dlls/iphlpapi/ipstats.c +++ /dev/null @@ -1,370 +0,0 @@ -/* - * Copyright (C) 2003,2006 Juan Lang - * Copyright (C) 2007 TransGaming Technologies Inc. - * Copyright (C) 2009 Alexandre Julliard - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include "config.h" -#include "wine/port.h" - -#include <stdarg.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <errno.h> -#include <sys/types.h> -#ifdef HAVE_DIRENT_H -#include <dirent.h> -#endif -#ifdef HAVE_ALIAS_H -#include <alias.h> -#endif -#ifdef HAVE_SYS_SOCKET_H -#include <sys/socket.h> -#endif -#ifdef HAVE_SYS_SOCKETVAR_H -#include <sys/socketvar.h> -#endif -#ifdef HAVE_SYS_TIMEOUT_H -#include <sys/timeout.h> -#endif -#ifdef HAVE_NETINET_IN_H -#include <netinet/in.h> -#endif -#ifdef HAVE_NETINET_IN_SYSTM_H -#include <netinet/in_systm.h> -#endif -#ifdef HAVE_ARPA_INET_H -#include <arpa/inet.h> -#endif -#ifdef HAVE_NET_IF_H -#include <net/if.h> -#endif -#ifdef HAVE_NET_IF_DL_H -#include <net/if_dl.h> -#endif -#ifdef HAVE_NET_IF_TYPES_H -#include <net/if_types.h> -#endif -#ifdef HAVE_NET_ROUTE_H -#include <net/route.h> -#endif -#ifdef HAVE_NET_IF_ARP_H -#include <net/if_arp.h> -#endif -#ifdef HAVE_NETINET_IF_ETHER_H -#include <netinet/if_ether.h> -#endif -#ifdef HAVE_NETINET_IF_INARP_H -#include <netinet/if_inarp.h> -#endif -#ifdef HAVE_NETINET_IP_H -#include <netinet/ip.h> -#endif -#ifdef HAVE_NETINET_TCP_H -#include <netinet/tcp.h> -#endif -#ifdef HAVE_NETINET_IP_VAR_H -#include <netinet/ip_var.h> -#endif -#ifdef HAVE_NETINET_TCP_FSM_H -#include <netinet/tcp_fsm.h> -#endif -#ifdef HAVE_NETINET_IN_PCB_H -#include <netinet/in_pcb.h> -#endif -#ifdef HAVE_NETINET_TCP_TIMER_H -#include <netinet/tcp_timer.h> -#endif -#ifdef HAVE_NETINET_TCP_VAR_H -#include <netinet/tcp_var.h> -#endif -#ifdef HAVE_NETINET_IP_ICMP_H -#include <netinet/ip_icmp.h> -#endif -#ifdef HAVE_NETINET_ICMP_VAR_H -#include <netinet/icmp_var.h> -#endif -#ifdef HAVE_NETINET_UDP_H -#include <netinet/udp.h> -#endif -#ifdef HAVE_NETINET_UDP_VAR_H -#include <netinet/udp_var.h> -#endif -#ifdef HAVE_SYS_PROTOSW_H -#include <sys/protosw.h> -#endif -#ifdef HAVE_SYS_SYSCTL_H -#include <sys/sysctl.h> -#endif -#ifdef HAVE_KSTAT_H -#include <kstat.h> -#endif -#ifdef HAVE_INET_MIB2_H -#include <inet/mib2.h> -#endif -#ifdef HAVE_STROPTS_H -#include <stropts.h> -#endif -#ifdef HAVE_SYS_TIHDR_H -#include <sys/tihdr.h> -#endif -#ifdef HAVE_SYS_PARAM_H -#include <sys/param.h> -#endif -#ifdef HAVE_SYS_QUEUE_H -#include <sys/queue.h> -#endif -#ifdef HAVE_SYS_USER_H -/* Make sure the definitions of struct kinfo_proc are the same. */ -#include <sys/user.h> -#endif -#ifdef HAVE_LIBPROCSTAT_H -#include <libprocstat.h> -#endif -#ifdef HAVE_LIBPROC_H -#include <libproc.h> -#endif -#ifdef HAVE_IFADDRS_H -#include <ifaddrs.h> -#endif - -#ifndef ROUNDUP -#define ROUNDUP(a) \ - ((a) > 0 ? (1 + (((a) - 1) | (sizeof(int) - 1))) : sizeof(int)) -#endif -#ifndef ADVANCE -#define ADVANCE(x, n) (x += ROUNDUP(((struct sockaddr *)n)->sa_len)) -#endif - -#include "ntstatus.h" -#define WIN32_NO_STATUS -#define NONAMELESSUNION -#define USE_WS_PREFIX -#include "winsock2.h" -#include "ws2ipdef.h" -#include "ifenum.h" -#include "iphlpapi.h" - -#include "wine/debug.h" -#include "wine/server.h" -#include "wine/unicode.h" - -#ifndef HAVE_NETINET_TCP_FSM_H -#define TCPS_ESTABLISHED 1 -#define TCPS_SYN_SENT 2 -#define TCPS_SYN_RECEIVED 3 -#define TCPS_FIN_WAIT_1 4 -#define TCPS_FIN_WAIT_2 5 -#define TCPS_TIME_WAIT 6 -#define TCPS_CLOSED 7 -#define TCPS_CLOSE_WAIT 8 -#define TCPS_LAST_ACK 9 -#define TCPS_LISTEN 10 -#define TCPS_CLOSING 11 -#endif - -#ifndef RTF_MULTICAST -#define RTF_MULTICAST 0 /* Not available on NetBSD/OpenBSD */ -#endif - -#ifndef RTF_LLINFO -#define RTF_LLINFO 0 /* Not available on FreeBSD 8 and above */ -#endif - -WINE_DEFAULT_DEBUG_CHANNEL(iphlpapi); - -#ifdef HAVE_LIBKSTAT -static DWORD kstat_get_ui32( kstat_t *ksp, const char *name ) -{ - unsigned int i; - kstat_named_t *data = ksp->ks_data; - - for (i = 0; i < ksp->ks_ndata; i++) - if (!strcmp( data[i].name, name )) return data[i].value.ui32; - return 0; -} -#endif - -/****************************************************************** - * GetUdpStatistics (IPHLPAPI.@) - * - * Get the IPv4 and IPv6 UDP statistics for the local computer. - * - * PARAMS - * stats [Out] buffer for UDP statistics - * family [In] specifies whether IPv4 or IPv6 statistics are returned - * - * RETURNS - * Success: NO_ERROR - * Failure: error code from winerror.h - */ -DWORD WINAPI GetUdpStatisticsEx(PMIB_UDPSTATS stats, DWORD family) -{ - DWORD ret = ERROR_NOT_SUPPORTED; - - if (!stats) return ERROR_INVALID_PARAMETER; - if (family != WS_AF_INET && family != WS_AF_INET6) return ERROR_INVALID_PARAMETER; - memset( stats, 0, sizeof(*stats) ); - - stats->dwNumAddrs = get_interface_indices( FALSE, NULL ); - - if (family == WS_AF_INET6) - { -#ifdef __linux__ - { - FILE *fp; - - if ((fp = fopen("/proc/net/snmp6", "r"))) - { - struct { - const char *name; - DWORD *elem; - } udpstatlist[] = { - { "Udp6InDatagrams", &stats->dwInDatagrams }, - { "Udp6NoPorts", &stats->dwNoPorts }, - { "Udp6InErrors", &stats->dwInErrors }, - { "Udp6OutDatagrams", &stats->dwOutDatagrams }, - }; - char buf[512], *ptr, *value; - DWORD res, i; - - 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'; - - for (i = 0; i < ARRAY_SIZE(udpstatlist); i++) - if (!_strnicmp(buf, udpstatlist[i].name, -1) && sscanf(value, "%d", &res)) - *udpstatlist[i].elem = res; - } - fclose(fp); - ret = NO_ERROR; - } - } -#else - FIXME( "unimplemented for IPv6\n" ); -#endif - return ret; - } - -#ifdef __linux__ - { - FILE *fp; - - if ((fp = fopen("/proc/net/snmp", "r"))) - { - static const char hdr[] = "Udp:"; - char buf[512], *ptr; - - while ((ptr = fgets(buf, sizeof(buf), fp))) - { - if (_strnicmp(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)) - { - ptr += sizeof(hdr); - sscanf( ptr, "%u %u %u %u %u", - &stats->dwInDatagrams, &stats->dwNoPorts, - &stats->dwInErrors, &stats->dwOutDatagrams, &stats->dwNumAddrs ); - break; - } - } - fclose(fp); - ret = NO_ERROR; - } - } -#elif defined(HAVE_LIBKSTAT) - { - static char udp[] = "udp"; - kstat_ctl_t *kc; - kstat_t *ksp; - MIB_UDPTABLE *udp_table; - - if ((kc = kstat_open()) && - (ksp = kstat_lookup( kc, udp, 0, udp )) && - kstat_read( kc, ksp, NULL ) != -1 && - ksp->ks_type == KSTAT_TYPE_NAMED) - { - stats->dwInDatagrams = kstat_get_ui32( ksp, "inDatagrams" ); - stats->dwNoPorts = 0; /* FIXME */ - stats->dwInErrors = kstat_get_ui32( ksp, "inErrors" ); - stats->dwOutDatagrams = kstat_get_ui32( ksp, "outDatagrams" ); - if (!AllocateAndGetUdpTableFromStack( &udp_table, FALSE, GetProcessHeap(), 0 )) - { - stats->dwNumAddrs = udp_table->dwNumEntries; - HeapFree( GetProcessHeap(), 0, udp_table ); - } - ret = NO_ERROR; - } - if (kc) kstat_close( kc ); - } -#elif defined(HAVE_SYS_SYSCTL_H) && defined(UDPCTL_STATS) && defined(HAVE_STRUCT_UDPSTAT_UDPS_IPACKETS) - { - int mib[] = {CTL_NET, PF_INET, IPPROTO_UDP, UDPCTL_STATS}; - struct udpstat udp_stat; - MIB_UDPTABLE *udp_table; - size_t needed = sizeof(udp_stat); - - if(sysctl(mib, ARRAY_SIZE(mib), &udp_stat, &needed, NULL, 0) != -1) - { - stats->dwInDatagrams = udp_stat.udps_ipackets; - stats->dwOutDatagrams = udp_stat.udps_opackets; - stats->dwNoPorts = udp_stat.udps_noport; - stats->dwInErrors = udp_stat.udps_hdrops + udp_stat.udps_badsum + udp_stat.udps_fullsock + udp_stat.udps_badlen; - if (!AllocateAndGetUdpTableFromStack( &udp_table, FALSE, GetProcessHeap(), 0 )) - { - stats->dwNumAddrs = udp_table->dwNumEntries; - HeapFree( GetProcessHeap(), 0, udp_table ); - } - ret = NO_ERROR; - } - else ERR ("failed to get udpstat\n"); - } -#else - FIXME( "unimplemented for IPv4\n" ); -#endif - return ret; -} - -/****************************************************************** - * GetUdpStatistics (IPHLPAPI.@) - * - * Get the UDP statistics for the local computer. - * - * PARAMS - * stats [Out] buffer for UDP statistics - * - * RETURNS - * Success: NO_ERROR - * Failure: error code from winerror.h - */ -DWORD WINAPI GetUdpStatistics(PMIB_UDPSTATS stats) -{ - return GetUdpStatisticsEx(stats, WS_AF_INET); -} diff --git a/dlls/nsi/tests/nsi.c b/dlls/nsi/tests/nsi.c index bd7992f6916..f1f3c4f387f 100644 --- a/dlls/nsi/tests/nsi.c +++ b/dlls/nsi/tests/nsi.c @@ -966,7 +966,6 @@ static void test_udp_stats( int family ) table.dwInErrors, dyn.in_errs, dyn2.in_errs ); ok( bounded( table.dwOutDatagrams, dyn.out_dgrams, dyn2.out_dgrams ), "%d vs [%I64d %I64d]\n", table.dwOutDatagrams, dyn.out_dgrams, dyn2.out_dgrams ); -todo_wine_if(!unstable(0) && table.dwNumAddrs != dyn.num_addrs) ok( unstable( table.dwNumAddrs == dyn.num_addrs ), "%d %d\n", table.dwNumAddrs, dyn.num_addrs ); winetest_pop_context(); -- 2.23.0

1 0

[PATCH 4/5] nsiproxy: Implement UDP stats get_all_parameters.
by Huw Davies 18 Aug '21

18 Aug '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/nsi/tests/nsi.c | 36 +++++++++++ dlls/nsiproxy.sys/udp.c | 128 ++++++++++++++++++++++++++++++++++++++++ include/wine/nsi.h | 11 ++++ 3 files changed, 175 insertions(+) diff --git a/dlls/nsi/tests/nsi.c b/dlls/nsi/tests/nsi.c index ce09bbf8a22..bd7992f6916 100644 --- a/dlls/nsi/tests/nsi.c +++ b/dlls/nsi/tests/nsi.c @@ -938,6 +938,40 @@ static void test_tcp_tables( int family, int table_type ) winetest_pop_context(); } +static void test_udp_stats( int family ) +{ + DWORD err; + USHORT key = family; + struct nsi_udp_stats_dynamic dyn, dyn2; + MIB_UDPSTATS table; + + winetest_push_context( family == AF_INET ? "AF_INET" : "AF_INET6" ); + + err = NsiGetAllParameters( 1, &NPI_MS_UDP_MODULEID, NSI_UDP_STATS_TABLE, &key, sizeof(key), NULL, 0, + &dyn, sizeof(dyn), NULL, 0 ); + ok( !err, "got %x\n", err ); + + err = GetUdpStatisticsEx( &table, family ); + ok( !err, "got %d\n", err ); + + err = NsiGetAllParameters( 1, &NPI_MS_UDP_MODULEID, NSI_UDP_STATS_TABLE, &key, sizeof(key), NULL, 0, + &dyn2, sizeof(dyn2), NULL, 0 ); + ok( !err, "got %x\n", err ); + + ok( bounded( table.dwInDatagrams, dyn.in_dgrams, dyn2.in_dgrams ), "%d vs [%I64d %I64d]\n", + table.dwInDatagrams, dyn.in_dgrams, dyn2.in_dgrams ); + ok( bounded( table.dwNoPorts, dyn.no_ports, dyn2.no_ports ), "%d vs [%d %d]\n", + table.dwNoPorts, dyn.no_ports, dyn2.no_ports); + ok( bounded( table.dwInErrors, dyn.in_errs, dyn2.in_errs ), "%d vs [%d %d]\n", + table.dwInErrors, dyn.in_errs, dyn2.in_errs ); + ok( bounded( table.dwOutDatagrams, dyn.out_dgrams, dyn2.out_dgrams ), "%d vs [%I64d %I64d]\n", + table.dwOutDatagrams, dyn.out_dgrams, dyn2.out_dgrams ); +todo_wine_if(!unstable(0) && table.dwNumAddrs != dyn.num_addrs) + ok( unstable( table.dwNumAddrs == dyn.num_addrs ), "%d %d\n", table.dwNumAddrs, dyn.num_addrs ); + + winetest_pop_context(); +} + static void test_udp_tables( int family ) { DWORD i, err, count, size; @@ -1030,6 +1064,8 @@ START_TEST( nsi ) test_tcp_tables( AF_INET6, TCP_TABLE_OWNER_MODULE_CONNECTIONS ); test_tcp_tables( AF_INET6, TCP_TABLE_OWNER_MODULE_LISTENER ); + test_udp_stats( AF_INET ); + test_udp_stats( AF_INET6 ); test_udp_tables( AF_INET ); test_udp_tables( AF_INET6 ); } diff --git a/dlls/nsiproxy.sys/udp.c b/dlls/nsiproxy.sys/udp.c index 454aefe95aa..49acedcf214 100644 --- a/dlls/nsiproxy.sys/udp.c +++ b/dlls/nsiproxy.sys/udp.c @@ -73,6 +73,125 @@ WINE_DEFAULT_DEBUG_CHANNEL(nsi); +static DWORD udp_num_addrs( USHORT family ) +{ + DWORD endpoint_count = 0; + + nsi_enumerate_all( 1, 0, &NPI_MS_UDP_MODULEID, NSI_UDP_ENDPOINT_TABLE, + NULL, 0, NULL, 0, NULL, 0, NULL, 0, &endpoint_count ); + /* FIXME: actually retrieve the keys and only count endpoints which match family */ + return endpoint_count; +} + +static NTSTATUS udp_stats_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_udp_stats_dynamic dyn; + const USHORT *family = key; + + 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 ); + + if (*family != WS_AF_INET && *family != WS_AF_INET6) return STATUS_NOT_SUPPORTED; + + memset( &dyn, 0, sizeof(dyn) ); + + dyn.num_addrs = udp_num_addrs( *family ); + +#ifdef __linux__ + if (*family == WS_AF_INET) + { + NTSTATUS status = STATUS_NOT_SUPPORTED; + static const char hdr[] = "Udp:"; + char buf[512], *ptr; + FILE *fp; + + if (!(fp = fopen( "/proc/net/snmp", "r" ))) return STATUS_NOT_SUPPORTED; + + while ((ptr = fgets( buf, sizeof(buf), fp ))) + { + if (_strnicmp( 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)) + { + unsigned int in_dgrams, out_dgrams; + ptr += sizeof(hdr); + sscanf( ptr, "%u %u %u %u %u", + &in_dgrams, &dyn.no_ports, &dyn.in_errs, &out_dgrams, &dyn.num_addrs ); + dyn.in_dgrams = in_dgrams; + dyn.out_dgrams = out_dgrams; + if (dynamic_data) *(struct nsi_udp_stats_dynamic *)dynamic_data = dyn; + status = STATUS_SUCCESS; + break; + } + } + fclose( fp ); + return status; + } + else + { + unsigned int in_dgrams = 0, out_dgrams = 0; + struct + { + const char *name; + DWORD *elem; + } udp_stat_list[] = + { + { "Udp6InDatagrams", &in_dgrams }, + { "Udp6NoPorts", &dyn.no_ports }, + { "Udp6InErrors", &dyn.in_errs }, + { "Udp6OutDatagrams", &out_dgrams }, + }; + 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'; + + for (i = 0; i < ARRAY_SIZE(udp_stat_list); i++) + if (!_strnicmp( buf, udp_stat_list[i].name, -1 ) && sscanf( value, "%d", &res )) + *udp_stat_list[i].elem = res; + } + dyn.in_dgrams = in_dgrams; + dyn.out_dgrams = out_dgrams; + if (dynamic_data) *(struct nsi_udp_stats_dynamic *)dynamic_data = dyn; + fclose( fp ); + return STATUS_SUCCESS; + } +#elif defined(HAVE_SYS_SYSCTL_H) && defined(UDPCTL_STATS) && defined(HAVE_STRUCT_UDPSTAT_UDPS_IPACKETS) + { + int mib[] = { CTL_NET, PF_INET, IPPROTO_UDP, UDPCTL_STATS }; + struct udpstat udp_stat; + size_t needed = sizeof(udp_stat); + + if (sysctl( mib, ARRAY_SIZE(mib), &udp_stat, &needed, NULL, 0 ) == -1) return STATUS_NOT_SUPPORTED; + + dyn.in_dgrams = udp_stat.udps_ipackets; + dyn.out_dgrams = udp_stat.udps_opackets; + dyn.no_ports = udp_stat.udps_noport; + dyn.in_errs = udp_stat.udps_hdrops + udp_stat.udps_badsum + udp_stat.udps_fullsock + udp_stat.udps_badlen; + if (dynamic_data) *(struct nsi_udp_stats_dynamic *)dynamic_data = dyn; + return STATUS_SUCCESS; + } +#endif + FIXME( "Not implemented\n" ); + return STATUS_NOT_SUPPORTED; +} + static NTSTATUS udp_endpoint_enumerate_all( void *key_data, DWORD key_size, void *rw_data, DWORD rw_size, void *dynamic_data, DWORD dynamic_size, void *static_data, DWORD static_size, DWORD_PTR *count ) @@ -271,6 +390,15 @@ static NTSTATUS udp_endpoint_enumerate_all( void *key_data, DWORD key_size, void static struct module_table udp_tables[] = { + { + NSI_UDP_STATS_TABLE, + { + sizeof(USHORT), 0, + sizeof(struct nsi_udp_stats_dynamic), 0 + }, + NULL, + udp_stats_get_all_parameters, + }, { NSI_UDP_ENDPOINT_TABLE, { diff --git a/include/wine/nsi.h b/include/wine/nsi.h index 8bf3bc1d5d0..7b8cb29e9d5 100644 --- a/include/wine/nsi.h +++ b/include/wine/nsi.h @@ -347,8 +347,19 @@ struct nsi_tcp_conn_static }; /* Undocumented NSI UDP tables */ +#define NSI_UDP_STATS_TABLE 0 #define NSI_UDP_ENDPOINT_TABLE 1 +struct nsi_udp_stats_dynamic +{ + ULONGLONG in_dgrams; + DWORD no_ports; + DWORD in_errs; + ULONGLONG out_dgrams; + DWORD num_addrs; + DWORD unk[5]; +}; + struct nsi_udp_endpoint_key { SOCKADDR_INET local; -- 2.23.0

1 0

[PATCH 3/5] iphlpapi: Implement AllocateAndGetUdpTableFromStack() on top of nsi.
by Huw Davies 18 Aug '21

18 Aug '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/iphlpapi/iphlpapi_main.c | 21 ++ dlls/iphlpapi/ipstats.c | 524 ---------------------------------- 2 files changed, 21 insertions(+), 524 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index bcda2b81b6e..82c63b0dfce 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -3491,6 +3491,27 @@ DWORD WINAPI GetExtendedUdpTable( void *table, DWORD *size, BOOL sort, ULONG fam return err; } +DWORD WINAPI AllocateAndGetUdpTableFromStack( MIB_UDPTABLE **table, BOOL sort, HANDLE heap, DWORD flags ) +{ + DWORD err, size = 0x100, attempt; + + TRACE("table %p, sort %d, heap %p, flags 0x%08x\n", table, sort, heap, flags ); + + if (!table) return ERROR_INVALID_PARAMETER; + + for (attempt = 0; attempt < 5; attempt++) + { + *table = HeapAlloc( heap, flags, size ); + if (!*table) return ERROR_NOT_ENOUGH_MEMORY; + err = GetExtendedUdpTable( *table, &size, sort, WS_AF_INET, UDP_TABLE_BASIC, 0 ); + if (!err) break; + HeapFree( heap, flags, *table ); + *table = NULL; + if (err != ERROR_INSUFFICIENT_BUFFER) break; + } + return err; +} + static void unicast_row_fill( MIB_UNICASTIPADDRESS_ROW *row, USHORT fam, void *key, struct nsi_ip_unicast_rw *rw, struct nsi_ip_unicast_dynamic *dyn, struct nsi_ip_unicast_static *stat ) { diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index 65bf65fec7b..1a71396e388 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -200,81 +200,6 @@ static DWORD kstat_get_ui32( kstat_t *ksp, const char *name ) } #endif -#if defined(HAVE_SYS_TIHDR_H) && defined(T_OPTMGMT_ACK) -static int open_streams_mib( const char *proto ) -{ - int fd; - struct strbuf buf; - struct request - { - struct T_optmgmt_req req_header; - struct opthdr opt_header; - } request; - - if ((fd = open( "/dev/arp", O_RDWR )) == -1) - { - WARN( "could not open /dev/arp: %s\n", strerror(errno) ); - return -1; - } - if (proto) ioctl( fd, I_PUSH, proto ); - - request.req_header.PRIM_type = T_SVR4_OPTMGMT_REQ; - request.req_header.OPT_length = sizeof(request.opt_header); - request.req_header.OPT_offset = FIELD_OFFSET( struct request, opt_header ); - request.req_header.MGMT_flags = T_CURRENT; - request.opt_header.level = MIB2_IP; - request.opt_header.name = 0; - request.opt_header.len = 0; - - buf.len = sizeof(request); - buf.buf = (caddr_t)&request; - if (putmsg( fd, &buf, NULL, 0 ) == -1) - { - WARN( "putmsg: %s\n", strerror(errno) ); - close( fd ); - fd = -1; - } - return fd; -} - -static void *read_mib_entry( int fd, int level, int name, int *len ) -{ - struct strbuf buf; - void *data; - int ret, flags = 0; - - struct reply - { - struct T_optmgmt_ack ack_header; - struct opthdr opt_header; - } reply; - - for (;;) - { - buf.maxlen = sizeof(reply); - buf.buf = (caddr_t)&reply; - if ((ret = getmsg( fd, &buf, NULL, &flags )) < 0) return NULL; - if (!(ret & MOREDATA)) return NULL; - if (reply.ack_header.PRIM_type != T_OPTMGMT_ACK) return NULL; - if (buf.len < sizeof(reply.ack_header)) return NULL; - if (reply.ack_header.OPT_length < sizeof(reply.opt_header)) return NULL; - - if (!(data = HeapAlloc( GetProcessHeap(), 0, reply.opt_header.len ))) return NULL; - buf.maxlen = reply.opt_header.len; - buf.buf = (caddr_t)data; - flags = 0; - if (getmsg( fd, NULL, &buf, &flags ) >= 0 && - reply.opt_header.level == level && - reply.opt_header.name == name) - { - *len = buf.len; - return data; - } - HeapFree( GetProcessHeap(), 0, data ); - } -} -#endif /* HAVE_SYS_TIHDR_H && T_OPTMGMT_ACK */ - /****************************************************************** * GetUdpStatistics (IPHLPAPI.@) * @@ -443,452 +368,3 @@ DWORD WINAPI GetUdpStatistics(PMIB_UDPSTATS stats) { return GetUdpStatisticsEx(stats, WS_AF_INET); } - -static void *append_table_row( HANDLE heap, DWORD flags, void *table, DWORD *table_size, DWORD *table_capacity, - const void *row, DWORD row_size ) -{ - DWORD *num_entries = table; /* this must be the first field */ - if (*num_entries == *table_capacity) - { - void *new_table; - *table_size += *table_capacity * row_size; - if (!(new_table = HeapReAlloc( heap, flags, table, *table_size ))) - { - HeapFree( heap, 0, table ); - return NULL; - } - num_entries = table = new_table; - *table_capacity *= 2; - } - memcpy( (char *)table + *table_size - (*table_capacity - *num_entries) * row_size, row, row_size ); - (*num_entries)++; - return table; -} - -struct pid_map -{ - unsigned int pid; - unsigned int unix_pid; -}; - -static struct pid_map *get_pid_map( unsigned int *num_entries ) -{ - struct pid_map *map; - unsigned int i = 0, buffer_len = 4096, process_count, pos = 0; - NTSTATUS ret; - char *buffer = NULL, *new_buffer; - - if (!(buffer = HeapAlloc( GetProcessHeap(), 0, buffer_len ))) return NULL; - - for (;;) - { - SERVER_START_REQ( list_processes ) - { - wine_server_set_reply( req, buffer, buffer_len ); - ret = wine_server_call( req ); - buffer_len = reply->info_size; - process_count = reply->process_count; - } - SERVER_END_REQ; - - if (ret != STATUS_INFO_LENGTH_MISMATCH) break; - - if (!(new_buffer = HeapReAlloc( GetProcessHeap(), 0, buffer, buffer_len ))) - { - HeapFree( GetProcessHeap(), 0, buffer ); - return NULL; - } - buffer = new_buffer; - } - - if (!(map = HeapAlloc( GetProcessHeap(), 0, process_count * sizeof(*map) ))) - { - HeapFree( GetProcessHeap(), 0, buffer ); - return NULL; - } - - for (i = 0; i < process_count; ++i) - { - const struct process_info *process; - - pos = (pos + 7) & ~7; - process = (const struct process_info *)(buffer + pos); - - map[i].pid = process->pid; - map[i].unix_pid = process->unix_pid; - - pos += sizeof(struct process_info) + process->name_len; - pos = (pos + 7) & ~7; - pos += process->thread_count * sizeof(struct thread_info); - } - - HeapFree( GetProcessHeap(), 0, buffer ); - *num_entries = process_count; - return map; -} - -static unsigned int find_owning_pid( struct pid_map *map, unsigned int num_entries, UINT_PTR inode ) -{ -#ifdef __linux__ - unsigned int i, len_socket; - char socket[32]; - - sprintf( socket, "socket:[%lu]", inode ); - len_socket = strlen( socket ); - for (i = 0; i < num_entries; i++) - { - char dir[32]; - struct dirent *dirent; - DIR *dirfd; - - sprintf( dir, "/proc/%u/fd", map[i].unix_pid ); - if ((dirfd = opendir( dir ))) - { - while ((dirent = readdir( dirfd ))) - { - char link[sizeof(dirent->d_name) + 32], name[32]; - int len; - - sprintf( link, "/proc/%u/fd/%s", map[i].unix_pid, dirent->d_name ); - if ((len = readlink( link, name, sizeof(name) - 1 )) > 0) name[len] = 0; - if (len == len_socket && !strcmp( socket, name )) - { - closedir( dirfd ); - return map[i].pid; - } - } - closedir( dirfd ); - } - } - return 0; -#elif defined(HAVE_LIBPROCSTAT) - struct procstat *pstat; - struct kinfo_proc *proc; - struct filestat_list *fds; - struct filestat *fd; - struct sockstat sock; - unsigned int i, proc_count; - - pstat = procstat_open_sysctl(); - if (!pstat) return 0; - - for (i = 0; i < num_entries; i++) - { - proc = procstat_getprocs( pstat, KERN_PROC_PID, map[i].unix_pid, &proc_count ); - if (!proc || proc_count < 1) continue; - - fds = procstat_getfiles( pstat, proc, 0 ); - if (!fds) - { - procstat_freeprocs( pstat, proc ); - continue; - } - - STAILQ_FOREACH( fd, fds, next ) - { - char errbuf[_POSIX2_LINE_MAX]; - - if (fd->fs_type != PS_FST_TYPE_SOCKET) continue; - - procstat_get_socket_info( pstat, fd, &sock, errbuf ); - - if (sock.so_pcb == inode) - { - procstat_freefiles( pstat, fds ); - procstat_freeprocs( pstat, proc ); - procstat_close( pstat ); - return map[i].pid; - } - } - - procstat_freefiles( pstat, fds ); - procstat_freeprocs( pstat, proc ); - } - - procstat_close( pstat ); - return 0; -#elif defined(HAVE_PROC_PIDINFO) - struct proc_fdinfo *fds; - struct socket_fdinfo sock; - unsigned int i, j, n; - - for (i = 0; i < num_entries; i++) - { - int fd_len = proc_pidinfo( map[i].unix_pid, PROC_PIDLISTFDS, 0, NULL, 0 ); - if (fd_len <= 0) continue; - - fds = HeapAlloc( GetProcessHeap(), 0, fd_len ); - if (!fds) continue; - - proc_pidinfo( map[i].unix_pid, PROC_PIDLISTFDS, 0, fds, fd_len ); - n = fd_len / sizeof(struct proc_fdinfo); - for (j = 0; j < n; j++) - { - if (fds[j].proc_fdtype != PROX_FDTYPE_SOCKET) continue; - - proc_pidfdinfo( map[i].unix_pid, fds[j].proc_fd, PROC_PIDFDSOCKETINFO, &sock, sizeof(sock) ); - if (sock.psi.soi_pcb == inode) - { - HeapFree( GetProcessHeap(), 0, fds ); - return map[i].pid; - } - } - - HeapFree( GetProcessHeap(), 0, fds ); - } - return 0; -#else - FIXME( "not implemented\n" ); - return 0; -#endif -} - -static DWORD get_udp_table_sizes( UDP_TABLE_CLASS class, DWORD row_count, DWORD *row_size ) -{ - DWORD table_size; - - switch (class) - { - case UDP_TABLE_BASIC: - { - table_size = FIELD_OFFSET(MIB_UDPTABLE, table[row_count]); - if (row_size) *row_size = sizeof(MIB_UDPROW); - break; - } - case UDP_TABLE_OWNER_PID: - { - table_size = FIELD_OFFSET(MIB_UDPTABLE_OWNER_PID, table[row_count]); - if (row_size) *row_size = sizeof(MIB_UDPROW_OWNER_PID); - break; - } - case UDP_TABLE_OWNER_MODULE: - { - table_size = FIELD_OFFSET(MIB_UDPTABLE_OWNER_MODULE, table[row_count]); - if (row_size) *row_size = sizeof(MIB_UDPROW_OWNER_MODULE); - break; - } - default: - ERR("unhandled class %u\n", class); - return 0; - } - return table_size; -} - -static int compare_udp_rows(const void *a, const void *b) -{ - const MIB_UDPROW *rowA = a; - const MIB_UDPROW *rowB = b; - int ret; - - if ((ret = rowA->dwLocalAddr - rowB->dwLocalAddr) != 0) return ret; - return rowA->dwLocalPort - rowB->dwLocalPort; -} - -DWORD build_udp_table( UDP_TABLE_CLASS class, void **tablep, BOOL order, HANDLE heap, DWORD flags, - DWORD *size ) -{ - MIB_UDPTABLE *table; - MIB_UDPROW_OWNER_MODULE row; - DWORD ret = NO_ERROR, count = 16, table_size, row_size; - - if (!(table_size = get_udp_table_sizes( class, count, &row_size ))) - return ERROR_INVALID_PARAMETER; - - if (!(table = HeapAlloc( heap, flags, table_size ))) - return ERROR_OUTOFMEMORY; - - table->dwNumEntries = 0; - memset( &row, 0, sizeof(row) ); - -#ifdef __linux__ - { - FILE *fp; - - if ((fp = fopen( "/proc/net/udp", "r" ))) - { - char buf[512], *ptr; - struct pid_map *map = NULL; - unsigned int num_entries = 0; - int inode; - - if (class >= UDP_TABLE_OWNER_PID) map = get_pid_map( &num_entries ); - - /* skip header line */ - ptr = fgets( buf, sizeof(buf), fp ); - while ((ptr = fgets( buf, sizeof(buf), fp ))) - { - if (sscanf( ptr, "%*u: %x:%x %*s %*s %*s %*s %*s %*s %*s %d", - &row.dwLocalAddr, &row.dwLocalPort, &inode ) != 3) - continue; - row.dwLocalPort = htons( row.dwLocalPort ); - - if (class >= UDP_TABLE_OWNER_PID) - row.dwOwningPid = find_owning_pid( map, num_entries, inode ); - if (class >= UDP_TABLE_OWNER_MODULE) - { - row.liCreateTimestamp.QuadPart = 0; /* FIXME */ - row.dwFlags = 0; - memset( &row.OwningModuleInfo, 0, sizeof(row.OwningModuleInfo) ); - } - if (!(table = append_table_row( heap, flags, table, &table_size, &count, &row, row_size ))) - break; - } - HeapFree( GetProcessHeap(), 0, map ); - fclose( fp ); - } - else ret = ERROR_NOT_SUPPORTED; - } -#elif defined(HAVE_SYS_TIHDR_H) && defined(T_OPTMGMT_ACK) - { - void *data; - int fd, len; - mib2_udpEntry_t *entry; - - if ((fd = open_streams_mib( "udp" )) != -1) - { - if ((data = read_mib_entry( fd, MIB2_UDP, MIB2_UDP_ENTRY, &len ))) - { - for (entry = data; (char *)(entry + 1) <= (char *)data + len; entry++) - { - row.dwLocalAddr = entry->udpLocalAddress; - row.dwLocalPort = htons( entry->udpLocalPort ); - if (!(table = append_table_row( heap, flags, table, &table_size, &count, &row, row_size ))) - break; - } - HeapFree( GetProcessHeap(), 0, data ); - } - close( fd ); - } - else ret = ERROR_NOT_SUPPORTED; - } -#elif defined(HAVE_SYS_SYSCTL_H) && defined(HAVE_STRUCT_XINPGEN) - { - size_t Len = 0; - char *Buf = NULL; - struct xinpgen *pXIG, *pOrigXIG; - struct pid_map *pMap = NULL; - unsigned NumEntries; - - if (sysctlbyname ("net.inet.udp.pcblist", NULL, &Len, NULL, 0) < 0) - { - ERR ("Failure to read net.inet.udp.pcblist via sysctlbyname!\n"); - ret = ERROR_NOT_SUPPORTED; - goto done; - } - - Buf = HeapAlloc (GetProcessHeap (), 0, Len); - if (!Buf) - { - ret = ERROR_OUTOFMEMORY; - goto done; - } - - if (sysctlbyname ("net.inet.udp.pcblist", Buf, &Len, NULL, 0) < 0) - { - ERR ("Failure to read net.inet.udp.pcblist via sysctlbyname!\n"); - ret = ERROR_NOT_SUPPORTED; - goto done; - } - - if (class >= UDP_TABLE_OWNER_PID) - pMap = get_pid_map( &NumEntries ); - - /* Might be nothing here; first entry is just a header it seems */ - if (Len <= sizeof (struct xinpgen)) goto done; - - pOrigXIG = (struct xinpgen *)Buf; - pXIG = pOrigXIG; - - for (pXIG = (struct xinpgen *)((char *)pXIG + pXIG->xig_len); - pXIG->xig_len > sizeof (struct xinpgen); - pXIG = (struct xinpgen *)((char *)pXIG + pXIG->xig_len)) - { -#if __FreeBSD_version >= 1200026 - struct xinpcb *pINData = (struct xinpcb *)pXIG; - struct xsocket *pSockData = &pINData->xi_socket; -#else - struct inpcb *pINData = &((struct xinpcb *)pXIG)->xi_inp; - struct xsocket *pSockData = &((struct xinpcb *)pXIG)->xi_socket; -#endif - - /* Ignore sockets for other protocols */ - if (pSockData->xso_protocol != IPPROTO_UDP) - continue; - - /* Ignore PCBs that were freed while generating the data */ - if (pINData->inp_gencnt > pOrigXIG->xig_gen) - continue; - - /* we're only interested in IPv4 addresses */ - if (!(pINData->inp_vflag & INP_IPV4) || - (pINData->inp_vflag & INP_IPV6)) - continue; - - /* If all 0's, skip it */ - if (!pINData->inp_laddr.s_addr && - !pINData->inp_lport) - continue; - - /* Fill in structure details */ - row.dwLocalAddr = pINData->inp_laddr.s_addr; - row.dwLocalPort = pINData->inp_lport; - if (class >= UDP_TABLE_OWNER_PID) - row.dwOwningPid = find_owning_pid( pMap, NumEntries, (UINT_PTR)pSockData->so_pcb ); - if (class >= UDP_TABLE_OWNER_MODULE) - { - row.liCreateTimestamp.QuadPart = 0; /* FIXME */ - row.dwFlags = 0; - row.SpecificPortBind = !(pINData->inp_flags & INP_ANONPORT); - memset( &row.OwningModuleInfo, 0, sizeof(row.OwningModuleInfo) ); - } - if (!(table = append_table_row( heap, flags, table, &table_size, &count, &row, row_size ))) - break; - } - - done: - HeapFree( GetProcessHeap(), 0, pMap ); - HeapFree (GetProcessHeap (), 0, Buf); - } -#else - FIXME( "not implemented\n" ); - ret = ERROR_NOT_SUPPORTED; -#endif - - if (!table) return ERROR_OUTOFMEMORY; - if (!ret) - { - if (order && table->dwNumEntries) - qsort( table->table, table->dwNumEntries, row_size, compare_udp_rows ); - *tablep = table; - } - else HeapFree( heap, flags, table ); - if (size) *size = get_udp_table_sizes( class, count, NULL ); - TRACE( "returning ret %u table %p\n", ret, table ); - return ret; -} - -/****************************************************************** - * AllocateAndGetUdpTableFromStack (IPHLPAPI.@) - * - * Get the UDP listener table. - * Like GetUdpTable(), but allocate the returned table from heap. - * - * PARAMS - * ppUdpTable [Out] pointer into which the MIB_UDPTABLE is - * allocated and returned. - * bOrder [In] whether to sort the table - * heap [In] heap from which the table is allocated - * flags [In] flags to HeapAlloc - * - * RETURNS - * ERROR_INVALID_PARAMETER if ppUdpTable is NULL, whatever GetUdpTable() - * returns otherwise. - */ -DWORD WINAPI AllocateAndGetUdpTableFromStack(PMIB_UDPTABLE *ppUdpTable, BOOL bOrder, - HANDLE heap, DWORD flags) -{ - TRACE("table %p, bOrder %d, heap %p, flags 0x%08x\n", ppUdpTable, bOrder, heap, flags); - - if (!ppUdpTable) return ERROR_INVALID_PARAMETER; - return build_udp_table( UDP_TABLE_BASIC, (void **)ppUdpTable, bOrder, heap, flags, NULL ); -} -- 2.23.0

1 0

[PATCH 2/5] iphlpapi: Implement GetExtendedUdpTable() on top of nsi.
by Huw Davies 18 Aug '21

18 Aug '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/iphlpapi/iphlpapi_main.c | 225 +++++++++++++++++----- dlls/iphlpapi/ipstats.c | 350 ---------------------------------- dlls/iphlpapi/ipstats.h | 33 ---- 3 files changed, 175 insertions(+), 433 deletions(-) delete mode 100644 dlls/iphlpapi/ipstats.h diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index e78689d8f11..bcda2b81b6e 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -43,7 +43,6 @@ #include "windns.h" #include "iphlpapi.h" #include "ifenum.h" -#include "ipstats.h" #include "ipifcons.h" #include "fltdefs.h" #include "ifdef.h" @@ -3289,81 +3288,207 @@ DWORD WINAPI AllocateAndGetTcpExTableFromStack( void **table, BOOL sort, HANDLE * Get a table of active UDP connections. * * PARAMS - * pUdpTable [Out] buffer for UDP connections table - * pdwSize [In/Out] length of output buffer - * bOrder [In] whether to order the table - * - * RETURNS - * Success: NO_ERROR - * Failure: error code from winerror.h + * table [Out] buffer for UDP connections table + * size [In/Out] length of output buffer + * sort [In] whether to order the table * - * NOTES - * If pdwSize is less than required, the function will return - * ERROR_INSUFFICIENT_BUFFER, and *pdwSize will be set to the - * required byte size. - * If bOrder is true, the returned table will be sorted, first by - * local address, then by local port number. */ -DWORD WINAPI GetUdpTable(PMIB_UDPTABLE pUdpTable, PDWORD pdwSize, BOOL bOrder) +DWORD WINAPI GetUdpTable( MIB_UDPTABLE *table, DWORD *size, BOOL sort ) { - return GetExtendedUdpTable(pUdpTable, pdwSize, bOrder, WS_AF_INET, UDP_TABLE_BASIC, 0); + return GetExtendedUdpTable( table, size, sort, WS_AF_INET, UDP_TABLE_BASIC, 0 ); } /****************************************************************** * GetUdp6Table (IPHLPAPI.@) */ -DWORD WINAPI GetUdp6Table(PMIB_UDP6TABLE pUdpTable, PDWORD pdwSize, BOOL bOrder) +DWORD WINAPI GetUdp6Table( MIB_UDP6TABLE *table, DWORD *size, BOOL sort ) { - return GetExtendedUdpTable(pUdpTable, pdwSize, bOrder, WS_AF_INET6, UDP_TABLE_BASIC, 0); + return GetExtendedUdpTable( table, size, sort, WS_AF_INET6, UDP_TABLE_BASIC, 0 ); } -/****************************************************************** - * GetExtendedUdpTable (IPHLPAPI.@) - */ -DWORD WINAPI GetExtendedUdpTable(PVOID pUdpTable, PDWORD pdwSize, BOOL bOrder, - ULONG ulAf, UDP_TABLE_CLASS TableClass, ULONG Reserved) +static DWORD udp_table_size( ULONG family, ULONG table_class, DWORD row_count, DWORD *row_size ) { - DWORD ret, size; - void *table; + switch (table_class) + { + case UDP_TABLE_BASIC: + *row_size = (family == WS_AF_INET) ? sizeof(MIB_UDPROW) : sizeof(MIB_UDP6ROW); + return (family == WS_AF_INET) ? FIELD_OFFSET(MIB_UDPTABLE, table[row_count]) : + FIELD_OFFSET(MIB_UDP6TABLE, table[row_count]); - TRACE("pUdpTable %p, pdwSize %p, bOrder %d, ulAf %u, TableClass %u, Reserved %u\n", - pUdpTable, pdwSize, bOrder, ulAf, TableClass, Reserved); + case UDP_TABLE_OWNER_PID: + *row_size = (family == WS_AF_INET) ? sizeof(MIB_UDPROW_OWNER_PID) : sizeof(MIB_UDP6ROW_OWNER_PID); + return (family == WS_AF_INET) ? FIELD_OFFSET(MIB_UDPTABLE_OWNER_PID, table[row_count]) : + FIELD_OFFSET(MIB_UDP6TABLE_OWNER_PID, table[row_count]); - if (!pdwSize) return ERROR_INVALID_PARAMETER; + case UDP_TABLE_OWNER_MODULE: + *row_size = (family == WS_AF_INET) ? sizeof(MIB_UDPROW_OWNER_MODULE) : sizeof(MIB_UDP6ROW_OWNER_MODULE); + return (family == WS_AF_INET) ? FIELD_OFFSET(MIB_UDPTABLE_OWNER_MODULE, table[row_count]) : + FIELD_OFFSET(MIB_UDP6TABLE_OWNER_MODULE, table[row_count]); - if (TableClass == UDP_TABLE_OWNER_MODULE) - FIXME("UDP_TABLE_OWNER_MODULE not fully supported\n"); + default: + ERR( "unhandled class %u\n", table_class ); + return 0; + } +} - switch (ulAf) +static void udp_row_fill( void *table, DWORD num, ULONG family, ULONG table_class, + struct nsi_udp_endpoint_key *key, + struct nsi_udp_endpoint_static *stat ) +{ + if (family == WS_AF_INET) { - case WS_AF_INET: - ret = build_udp_table(TableClass, &table, bOrder, GetProcessHeap(), 0, &size); - break; - - case WS_AF_INET6: - ret = build_udp6_table(TableClass, &table, bOrder, GetProcessHeap(), 0, &size); - break; - + switch (table_class) + { + case UDP_TABLE_BASIC: + { + MIB_UDPROW *row = ((MIB_UDPTABLE *)table)->table + num; + row->dwLocalAddr = key->local.Ipv4.sin_addr.WS_s_addr; + row->dwLocalPort = key->local.Ipv4.sin_port; + return; + } + case UDP_TABLE_OWNER_PID: + { + MIB_UDPROW_OWNER_PID *row = ((MIB_UDPTABLE_OWNER_PID *)table)->table + num; + row->dwLocalAddr = key->local.Ipv4.sin_addr.WS_s_addr; + row->dwLocalPort = key->local.Ipv4.sin_port; + row->dwOwningPid = stat->pid; + return; + } + case UDP_TABLE_OWNER_MODULE: + { + MIB_UDPROW_OWNER_MODULE *row = ((MIB_UDPTABLE_OWNER_MODULE *)table)->table + num; + row->dwLocalAddr = key->local.Ipv4.sin_addr.WS_s_addr; + row->dwLocalPort = key->local.Ipv4.sin_port; + row->dwOwningPid = stat->pid; + row->liCreateTimestamp.QuadPart = stat->create_time; + row->dwFlags = stat->flags; + row->OwningModuleInfo[0] = stat->mod_info; + memset( row->OwningModuleInfo + 1, 0, sizeof(row->OwningModuleInfo) - sizeof(row->OwningModuleInfo[0]) ); + return; + } default: - FIXME("ulAf = %u not supported\n", ulAf); - ret = ERROR_NOT_SUPPORTED; + ERR( "Unknown class %d\n", table_class ); + return; + } } + else + { + switch (table_class) + { + case UDP_TABLE_BASIC: + { + MIB_UDP6ROW *row = ((MIB_UDP6TABLE *)table)->table + num; + memcpy( &row->dwLocalAddr, &key->local.Ipv6.sin6_addr, sizeof(row->dwLocalAddr) ); + row->dwLocalScopeId = key->local.Ipv6.sin6_scope_id; + row->dwLocalPort = key->local.Ipv6.sin6_port; + return; + } + case UDP_TABLE_OWNER_PID: + { + MIB_UDP6ROW_OWNER_PID *row = ((MIB_UDP6TABLE_OWNER_PID *)table)->table + num; + memcpy( &row->ucLocalAddr, &key->local.Ipv6.sin6_addr, sizeof(row->ucLocalAddr) ); + row->dwLocalScopeId = key->local.Ipv6.sin6_scope_id; + row->dwLocalPort = key->local.Ipv6.sin6_port; + row->dwOwningPid = stat->pid; + return; + } + case UDP_TABLE_OWNER_MODULE: + { + MIB_UDP6ROW_OWNER_MODULE *row = ((MIB_UDP6TABLE_OWNER_MODULE *)table)->table + num; + memcpy( &row->ucLocalAddr, &key->local.Ipv6.sin6_addr, sizeof(row->ucLocalAddr) ); + row->dwLocalScopeId = key->local.Ipv6.sin6_scope_id; + row->dwLocalPort = key->local.Ipv6.sin6_port; + row->dwOwningPid = stat->pid; + row->liCreateTimestamp.QuadPart = stat->create_time; + row->dwFlags = stat->flags; + row->OwningModuleInfo[0] = stat->mod_info; + memset( row->OwningModuleInfo + 1, 0, sizeof(row->OwningModuleInfo) - sizeof(row->OwningModuleInfo[0]) ); + return; + } + default: + ERR( "Unknown class %d\n", table_class ); + return; + } + } + ERR( "Unknown family %d\n", family ); + return; +} - if (ret) - return ret; +static int udp_row_cmp( const void *a, const void *b ) +{ + const MIB_UDPROW *rowA = a; + const MIB_UDPROW *rowB = b; + int ret; + + if ((ret = RtlUlongByteSwap( rowA->dwLocalAddr ) - RtlUlongByteSwap( rowB->dwLocalAddr )) != 0) return ret; + return RtlUshortByteSwap( rowA->dwLocalPort ) - RtlUshortByteSwap( rowB->dwLocalPort ); +} + +static int udp6_row_cmp( const void *a, const void *b ) +{ + const MIB_UDP6ROW *rowA = a; + const MIB_UDP6ROW *rowB = b; + int ret; + + if ((ret = memcmp( &rowA->dwLocalAddr, &rowB->dwLocalAddr, sizeof(rowA->dwLocalAddr) )) != 0) return ret; + if ((ret = rowA->dwLocalScopeId - rowB->dwLocalScopeId) != 0) return ret; + return RtlUshortByteSwap( rowA->dwLocalPort ) - RtlUshortByteSwap( rowB->dwLocalPort ); +} + +/****************************************************************** + * GetExtendedUdpTable (IPHLPAPI.@) + */ +DWORD WINAPI GetExtendedUdpTable( void *table, DWORD *size, BOOL sort, ULONG family, + UDP_TABLE_CLASS table_class, ULONG reserved ) +{ + DWORD err, count, needed, i, num = 0, row_size = 0; + struct nsi_udp_endpoint_key *key; + struct nsi_udp_endpoint_static *stat; + + TRACE( "table %p, size %p, sort %d, family %u, table_class %u, reserved %u\n", + table, size, sort, family, table_class, reserved ); + + if (!size || !ip_module_id( family )) return ERROR_INVALID_PARAMETER; + + err = NsiAllocateAndGetTable( 1, &NPI_MS_UDP_MODULEID, NSI_UDP_ENDPOINT_TABLE, (void **)&key, sizeof(*key), + NULL, 0, NULL, 0, (void **)&stat, sizeof(*stat), &count, 0 ); + if (err) return err; + + for (i = 0; i < count; i++) + if (key[i].local.si_family == family) + num++; - if (!pUdpTable || *pdwSize < size) + needed = udp_table_size( family, table_class, num, &row_size ); + if (!table || *size < needed) { - *pdwSize = size; - ret = ERROR_INSUFFICIENT_BUFFER; + *size = needed; + err = ERROR_INSUFFICIENT_BUFFER; } else { - *pdwSize = size; - memcpy(pUdpTable, table, size); + *size = needed; + *(DWORD *)table = num; + num = 0; + for (i = 0; i < count; i++) + { + if (key[i].local.si_family != family) continue; + udp_row_fill( table, num++, family, table_class, key + i, stat + i ); + } + } + + if (!err && sort) + { + int (*fn)(const void *, const void *); + DWORD offset = udp_table_size( family, table_class, 0, &row_size ); + + if (family == WS_AF_INET) fn = udp_row_cmp; + else fn = udp6_row_cmp; + + qsort( (BYTE *)table + offset, num, row_size, fn ); } - HeapFree(GetProcessHeap(), 0, table); - return ret; + + NsiFreeTable( key, NULL, NULL, stat ); + return err; } static void unicast_row_fill( MIB_UNICASTIPADDRESS_ROW *row, USHORT fam, void *key, struct nsi_ip_unicast_rw *rw, diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index 326db56f5bc..65bf65fec7b 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -158,7 +158,6 @@ #include "winsock2.h" #include "ws2ipdef.h" #include "ifenum.h" -#include "ipstats.h" #include "iphlpapi.h" #include "wine/debug.h" @@ -868,355 +867,6 @@ DWORD build_udp_table( UDP_TABLE_CLASS class, void **tablep, BOOL order, HANDLE return ret; } -static DWORD get_udp6_table_sizes( UDP_TABLE_CLASS class, DWORD row_count, DWORD *row_size ) -{ - DWORD table_size; - - switch (class) - { - case UDP_TABLE_BASIC: - { - table_size = FIELD_OFFSET(MIB_UDP6TABLE, table[row_count]); - if (row_size) *row_size = sizeof(MIB_UDP6ROW); - break; - } - case UDP_TABLE_OWNER_PID: - { - table_size = FIELD_OFFSET(MIB_UDP6TABLE_OWNER_PID, table[row_count]); - if (row_size) *row_size = sizeof(MIB_UDP6ROW_OWNER_PID); - break; - } - case UDP_TABLE_OWNER_MODULE: - { - table_size = FIELD_OFFSET(MIB_UDP6TABLE_OWNER_MODULE, table[row_count]); - if (row_size) *row_size = sizeof(MIB_UDP6ROW_OWNER_MODULE); - break; - } - default: - ERR("unhandled class %u\n", class); - return 0; - } - return table_size; -} - -static int compare_udp6_rows(const void *a, const void *b) -{ - const MIB_UDP6ROW *rowA = a; - const MIB_UDP6ROW *rowB = b; - int ret; - - if ((ret = memcmp(&rowA->dwLocalAddr, &rowB->dwLocalAddr, sizeof(rowA->dwLocalAddr))) != 0) return ret; - if ((ret = rowA->dwLocalScopeId - rowB->dwLocalScopeId) != 0) return ret; - return rowA->dwLocalPort - rowB->dwLocalPort; -} - -#if defined(__linux__) || (defined(HAVE_SYS_SYSCTL_H) && defined(HAVE_STRUCT_XINPGEN)) -struct ipv6_addr_scope -{ - IN6_ADDR addr; - DWORD scope; -}; - -static struct ipv6_addr_scope *get_ipv6_addr_scope_table(unsigned int *size) -{ - struct ipv6_addr_scope *table = NULL; - unsigned int table_size = 0; -#ifdef __linux__ - char buf[512], *ptr; - FILE *fp; -#elif defined(HAVE_GETIFADDRS) - struct ifaddrs *addrs, *cur; -#endif - - if (!(table = HeapAlloc( GetProcessHeap(), 0, sizeof(table[0]) ))) - return NULL; - -#ifdef __linux__ - if (!(fp = fopen( "/proc/net/if_inet6", "r" ))) - goto failed; - - while ((ptr = fgets( buf, sizeof(buf), fp ))) - { - WORD a[8]; - DWORD scope; - struct ipv6_addr_scope *new_table; - struct ipv6_addr_scope *entry; - unsigned int i; - - if (sscanf( ptr, "%4hx%4hx%4hx%4hx%4hx%4hx%4hx%4hx %*s %*s %x", - &a[0], &a[1], &a[2], &a[3], &a[4], &a[5], &a[6], &a[7], &scope ) != 9) - continue; - - table_size++; - if (!(new_table = HeapReAlloc( GetProcessHeap(), 0, table, table_size * sizeof(table[0]) ))) - { - fclose(fp); - goto failed; - } - - table = new_table; - entry = &table[table_size - 1]; - - i = 0; - while (i < 8) - { - entry->addr.u.Word[i] = htons(a[i]); - i++; - } - - entry->scope = htons(scope); - } - - fclose(fp); -#elif defined(HAVE_GETIFADDRS) - if (getifaddrs(&addrs) == -1) - goto failed; - - for (cur = addrs; cur; cur = cur->ifa_next) - { - struct sockaddr_in6 *sin6; - struct ipv6_addr_scope *new_table; - struct ipv6_addr_scope *entry; - - if (cur->ifa_addr->sa_family != AF_INET6) - continue; - - sin6 = (struct sockaddr_in6 *)cur->ifa_addr; - - table_size++; - if (!(new_table = HeapReAlloc( GetProcessHeap(), 0, table, table_size * sizeof(table[0]) ))) - { - freeifaddrs(addrs); - goto failed; - } - - table = new_table; - entry = &table[table_size - 1]; - - memcpy(&entry->addr, &sin6->sin6_addr, sizeof(entry->addr)); - entry->scope = sin6->sin6_scope_id; - } - - freeifaddrs(addrs); -#else - FIXME( "not implemented\n" ); - goto failed; -#endif - - *size = table_size; - return table; - -failed: - HeapFree( GetProcessHeap(), 0, table ); - return NULL; -} - -static DWORD find_ipv6_addr_scope(const IN6_ADDR *addr, const struct ipv6_addr_scope *table, unsigned int size) -{ - const BYTE multicast_scope_mask = 0x0F; - const BYTE multicast_scope_shift = 0; - unsigned int i = 0; - - if (WS_IN6_IS_ADDR_UNSPECIFIED(addr)) - return 0; - - if (WS_IN6_IS_ADDR_MULTICAST(addr)) - return htons((addr->u.Byte[1] & multicast_scope_mask) >> multicast_scope_shift); - - if (!table) - return -1; - - while (i < size) - { - if (memcmp(&table[i].addr, addr, sizeof(table[i].addr)) == 0) - return table[i].scope; - i++; - } - - return -1; -} -#endif - -DWORD build_udp6_table( UDP_TABLE_CLASS class, void **tablep, BOOL order, HANDLE heap, DWORD flags, - DWORD *size ) -{ - MIB_UDP6TABLE *table; - MIB_UDP6ROW_OWNER_MODULE row; - DWORD ret = NO_ERROR, count = 16, table_size, row_size; - - if (!(table_size = get_udp6_table_sizes( class, count, &row_size ))) - return ERROR_INVALID_PARAMETER; - - if (!(table = HeapAlloc( heap, flags, table_size ))) - return ERROR_OUTOFMEMORY; - - table->dwNumEntries = 0; - memset( &row, 0, sizeof(row) ); - -#ifdef __linux__ - { - FILE *fp; - - if ((fp = fopen( "/proc/net/udp6", "r" ))) - { - char buf[512], *ptr; - struct pid_map *map = NULL; - unsigned int num_entries = 0; - struct ipv6_addr_scope *addr_scopes; - unsigned int addr_scopes_size = 0; - int inode; - - addr_scopes = get_ipv6_addr_scope_table(&addr_scopes_size); - - if (class >= UDP_TABLE_OWNER_PID) map = get_pid_map( &num_entries ); - - /* skip header line */ - ptr = fgets( buf, sizeof(buf), fp ); - while ((ptr = fgets( buf, sizeof(buf), fp ))) - { - DWORD *local_addr = (DWORD *)&row.ucLocalAddr; - - if (sscanf( ptr, "%*u: %8x%8x%8x%8x:%x %*s %*s %*s %*s %*s %*s %*s %d", - &local_addr[0], &local_addr[1], &local_addr[2], &local_addr[3], - &row.dwLocalPort, &inode ) != 6) - continue; - row.dwLocalScopeId = find_ipv6_addr_scope((const IN6_ADDR *)&row.ucLocalAddr, addr_scopes, addr_scopes_size); - row.dwLocalPort = htons( row.dwLocalPort ); - - if (class >= UDP_TABLE_OWNER_PID) - row.dwOwningPid = find_owning_pid( map, num_entries, inode ); - if (class >= UDP_TABLE_OWNER_MODULE) - { - row.liCreateTimestamp.QuadPart = 0; /* FIXME */ - row.dwFlags = 0; - memset( &row.OwningModuleInfo, 0, sizeof(row.OwningModuleInfo) ); - } - if (!(table = append_table_row( heap, flags, table, &table_size, &count, &row, row_size ))) - break; - } - HeapFree( GetProcessHeap(), 0, map ); - HeapFree( GetProcessHeap(), 0, addr_scopes ); - fclose( fp ); - } - else ret = ERROR_NOT_SUPPORTED; - } -#elif defined(HAVE_SYS_SYSCTL_H) && defined(HAVE_STRUCT_XINPGEN) - { - static const char zero[sizeof(IN6_ADDR)] = {0}; - - size_t len = 0; - char *buf = NULL; - struct xinpgen *xig, *orig_xig; - struct pid_map *map = NULL; - unsigned num_entries; - struct ipv6_addr_scope *addr_scopes = NULL; - unsigned int addr_scopes_size = 0; - - if (sysctlbyname( "net.inet.udp.pcblist", NULL, &len, NULL, 0 ) < 0) - { - ERR( "Failure to read net.inet.udp.pcblist via sysctlbyname!\n" ); - ret = ERROR_NOT_SUPPORTED; - goto done; - } - - buf = HeapAlloc( GetProcessHeap(), 0, len ); - if (!buf) - { - ret = ERROR_OUTOFMEMORY; - goto done; - } - - if (sysctlbyname( "net.inet.udp.pcblist", buf, &len, NULL, 0 ) < 0) - { - ERR ("Failure to read net.inet.udp.pcblist via sysctlbyname!\n"); - ret = ERROR_NOT_SUPPORTED; - goto done; - } - - addr_scopes = get_ipv6_addr_scope_table( &addr_scopes_size ); - if (!addr_scopes) - { - ret = ERROR_OUTOFMEMORY; - goto done; - } - - if (class >= UDP_TABLE_OWNER_PID) map = get_pid_map( &num_entries ); - - /* Might be nothing here; first entry is just a header it seems */ - if (len <= sizeof (struct xinpgen)) goto done; - - orig_xig = (struct xinpgen *)buf; - xig = orig_xig; - - for (xig = (struct xinpgen *)((char *)xig + xig->xig_len); - xig->xig_len > sizeof (struct xinpgen); - xig = (struct xinpgen *)((char *)xig + xig->xig_len)) - { -#if __FreeBSD_version >= 1200026 - struct xinpcb *in = (struct xinpcb *)xig; - struct xsocket *sock = &in->xi_socket; -#else - struct inpcb *in = &((struct xinpcb *)xig)->xi_inp; - struct xsocket *sock = &((struct xinpcb *)xig)->xi_socket; -#endif - - /* Ignore sockets for other protocols */ - if (sock->xso_protocol != IPPROTO_UDP) - continue; - - /* Ignore PCBs that were freed while generating the data */ - if (in->inp_gencnt > orig_xig->xig_gen) - continue; - - /* we're only interested in IPv6 addresses */ - if (!(in->inp_vflag & INP_IPV6) || - (in->inp_vflag & INP_IPV4)) - continue; - - /* If all 0's, skip it */ - if (!memcmp( &in->in6p_laddr.s6_addr, zero, sizeof(zero) ) && !in->inp_lport) - continue; - - /* Fill in structure details */ - memcpy(row.ucLocalAddr, &in->in6p_laddr.s6_addr, sizeof(row.ucLocalAddr)); - row.dwLocalPort = in->inp_lport; - row.dwLocalScopeId = find_ipv6_addr_scope((const IN6_ADDR *)&row.ucLocalAddr, addr_scopes, addr_scopes_size); - if (class >= UDP_TABLE_OWNER_PID) - row.dwOwningPid = find_owning_pid( map, num_entries, (UINT_PTR)sock->so_pcb ); - if (class >= UDP_TABLE_OWNER_MODULE) - { - row.liCreateTimestamp.QuadPart = 0; /* FIXME */ - row.dwFlags = 0; - row.SpecificPortBind = !(in->inp_flags & INP_ANONPORT); - memset( &row.OwningModuleInfo, 0, sizeof(row.OwningModuleInfo) ); - } - if (!(table = append_table_row( heap, flags, table, &table_size, &count, &row, row_size ))) - break; - } - - done: - HeapFree( GetProcessHeap(), 0, map ); - HeapFree( GetProcessHeap(), 0, buf ); - HeapFree( GetProcessHeap(), 0, addr_scopes ); - } -#else - FIXME( "not implemented\n" ); - ret = ERROR_NOT_SUPPORTED; -#endif - - if (!table) return ERROR_OUTOFMEMORY; - if (!ret) - { - if (order && table->dwNumEntries) - qsort( table->table, table->dwNumEntries, row_size, compare_udp6_rows ); - *tablep = table; - } - else HeapFree( heap, flags, table ); - if (size) *size = get_udp6_table_sizes( class, count, NULL ); - TRACE( "returning ret %u table %p\n", ret, table ); - return ret; -} - /****************************************************************** * AllocateAndGetUdpTableFromStack (IPHLPAPI.@) * diff --git a/dlls/iphlpapi/ipstats.h b/dlls/iphlpapi/ipstats.h deleted file mode 100644 index 60398609207..00000000000 --- a/dlls/iphlpapi/ipstats.h +++ /dev/null @@ -1,33 +0,0 @@ -/* ipstats.h - * Copyright (C) 2003,2006 Juan Lang - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - * - * This module implements functions that get network-related statistics. - * It's meant to hide some platform-specificisms. - */ -#ifndef WINE_IPSTATS_H_ -#define WINE_IPSTATS_H_ - -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "iprtrmib.h" - -DWORD build_udp_table(UDP_TABLE_CLASS, void **, BOOL, HANDLE, DWORD, DWORD *) DECLSPEC_HIDDEN; -DWORD build_udp6_table(UDP_TABLE_CLASS, void **, BOOL, HANDLE, DWORD, DWORD *) DECLSPEC_HIDDEN; - -#endif /* ndef WINE_IPSTATS_H_ */ -- 2.23.0

1 0

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