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

[PATCH 1/5] iphlpapi: Remove unused function getInterfaceStatsByName().
by Huw Davies 20 Jul '21

20 Jul '21

This should have been part of commit 0b5a6c704c06. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/iphlpapi/ipstats.c | 130 ---------------------------------------- dlls/iphlpapi/ipstats.h | 5 -- 2 files changed, 135 deletions(-) diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index 3cf0e811437..43c481c749f 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -199,16 +199,6 @@ static DWORD kstat_get_ui32( kstat_t *ksp, const char *name ) if (!strcmp( data[i].name, name )) return data[i].value.ui32; return 0; } - -static ULONGLONG kstat_get_ui64( 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.ui64; - return 0; -} #endif #if defined(HAVE_SYS_TIHDR_H) && defined(T_OPTMGMT_ACK) @@ -286,126 +276,6 @@ static void *read_mib_entry( int fd, int level, int name, int *len ) } #endif /* HAVE_SYS_TIHDR_H && T_OPTMGMT_ACK */ -DWORD getInterfaceStatsByName(const char *name, PMIB_IFROW entry) -{ - DWORD ret = ERROR_NOT_SUPPORTED; - - if (!name || !entry) return ERROR_INVALID_PARAMETER; - -#ifdef __linux__ - { - FILE *fp; - - if ((fp = fopen("/proc/net/dev", "r"))) - { - DWORD skip; - char buf[512], *ptr; - int nameLen = strlen(name); - - while ((ptr = fgets(buf, sizeof(buf), fp))) - { - while (*ptr && isspace(*ptr)) ptr++; - if (_strnicmp(ptr, name, nameLen) == 0 && *(ptr + nameLen) == ':') - { - ptr += nameLen + 1; - sscanf( ptr, "%u %u %u %u %u %u %u %u %u %u %u %u", - &entry->dwInOctets, &entry->dwInUcastPkts, - &entry->dwInErrors, &entry->dwInDiscards, - &skip, &skip, &skip, - &entry->dwInNUcastPkts, &entry->dwOutOctets, - &entry->dwOutUcastPkts, &entry->dwOutErrors, - &entry->dwOutDiscards ); - break; - } - } - fclose(fp); - ret = NO_ERROR; - } - } -#elif defined(HAVE_LIBKSTAT) - { - kstat_ctl_t *kc; - kstat_t *ksp; - - if ((kc = kstat_open()) && - (ksp = kstat_lookup( kc, NULL, -1, (char *)name )) && - kstat_read( kc, ksp, NULL ) != -1 && - ksp->ks_type == KSTAT_TYPE_NAMED) - { - entry->dwMtu = 1500; /* FIXME */ - entry->dwSpeed = min( kstat_get_ui64( ksp, "ifspeed" ), ~0u ); - entry->dwInOctets = kstat_get_ui32( ksp, "rbytes" ); - entry->dwInNUcastPkts = kstat_get_ui32( ksp, "multircv" ); - entry->dwInNUcastPkts += kstat_get_ui32( ksp, "brdcstrcv" ); - entry->dwInUcastPkts = kstat_get_ui32( ksp, "ipackets" ) - entry->dwInNUcastPkts; - entry->dwInDiscards = kstat_get_ui32( ksp, "norcvbuf" ); - entry->dwInErrors = kstat_get_ui32( ksp, "ierrors" ); - entry->dwInUnknownProtos = kstat_get_ui32( ksp, "unknowns" ); - entry->dwOutOctets = kstat_get_ui32( ksp, "obytes" ); - entry->dwOutNUcastPkts = kstat_get_ui32( ksp, "multixmt" ); - entry->dwOutNUcastPkts += kstat_get_ui32( ksp, "brdcstxmt" ); - entry->dwOutUcastPkts = kstat_get_ui32( ksp, "opackets" ) - entry->dwOutNUcastPkts; - entry->dwOutDiscards = 0; /* FIXME */ - entry->dwOutErrors = kstat_get_ui32( ksp, "oerrors" ); - entry->dwOutQLen = kstat_get_ui32( ksp, "noxmtbuf" ); - ret = NO_ERROR; - } - if (kc) kstat_close( kc ); - } -#elif defined(HAVE_SYS_SYSCTL_H) && defined(NET_RT_IFLIST) - { - int mib[] = {CTL_NET, PF_ROUTE, 0, AF_INET, NET_RT_IFLIST, if_nametoindex(name)}; - size_t needed; - char *buf = NULL, *end; - struct if_msghdr *ifm; - struct if_data ifdata; - - if(sysctl(mib, ARRAY_SIZE(mib), NULL, &needed, NULL, 0) == -1) - { - ERR ("failed to get size of iflist\n"); - goto done; - } - buf = HeapAlloc (GetProcessHeap (), 0, needed); - if (!buf) - { - ret = ERROR_OUTOFMEMORY; - goto done; - } - if(sysctl(mib, ARRAY_SIZE(mib), buf, &needed, NULL, 0) == -1) - { - ERR ("failed to get iflist\n"); - goto done; - } - for ( end = buf + needed; buf < end; buf += ifm->ifm_msglen) - { - ifm = (struct if_msghdr *) buf; - if(ifm->ifm_type == RTM_IFINFO) - { - ifdata = ifm->ifm_data; - entry->dwMtu = ifdata.ifi_mtu; - entry->dwSpeed = ifdata.ifi_baudrate; - entry->dwInOctets = ifdata.ifi_ibytes; - entry->dwInErrors = ifdata.ifi_ierrors; - entry->dwInDiscards = ifdata.ifi_iqdrops; - entry->dwInUcastPkts = ifdata.ifi_ipackets; - entry->dwInNUcastPkts = ifdata.ifi_imcasts; - entry->dwOutOctets = ifdata.ifi_obytes; - entry->dwOutUcastPkts = ifdata.ifi_opackets; - entry->dwOutErrors = ifdata.ifi_oerrors; - ret = NO_ERROR; - break; - } - } - done: - HeapFree (GetProcessHeap (), 0, buf); - } -#else - FIXME( "unimplemented\n" ); -#endif - return ret; -} - - /****************************************************************** * GetIcmpStatistics (IPHLPAPI.@) * diff --git a/dlls/iphlpapi/ipstats.h b/dlls/iphlpapi/ipstats.h index 68bcb9c9ad8..bb0c77758f7 100644 --- a/dlls/iphlpapi/ipstats.h +++ b/dlls/iphlpapi/ipstats.h @@ -27,11 +27,6 @@ #include "winbase.h" #include "iprtrmib.h" -/* Fills in entry's interface stats, using name to find them. - * Returns ERROR_INVALID_PARAMETER if name or entry is NULL, NO_ERROR otherwise. - */ -DWORD getInterfaceStatsByName(const char *name, PMIB_IFROW entry) DECLSPEC_HIDDEN; - DWORD build_tcp_table(TCP_TABLE_CLASS, void **, BOOL, HANDLE, DWORD, DWORD *) DECLSPEC_HIDDEN; DWORD build_tcp6_table(TCP_TABLE_CLASS, void **, BOOL, HANDLE, DWORD, DWORD *) DECLSPEC_HIDDEN; DWORD build_udp_table(UDP_TABLE_CLASS, void **, BOOL, HANDLE, DWORD, DWORD *) DECLSPEC_HIDDEN; -- 2.23.0

1 0

[PATCH 02/10] gdi32: Use DC_ATTR for GetCurrentPositionEx implementation.
by Jacek Caban 20 Jul '21

20 Jul '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/dc.c | 13 ------------- dlls/gdi32/gdidc.c | 11 +++++++++++ dlls/gdi32/tests/metafile.c | 3 +++ 3 files changed, 14 insertions(+), 13 deletions(-)

3 3

[PATCH v2 1/2] ndis.sys: Add network adapter information to the registry.
by Haoyang Chen 20 Jul '21

20 Jul '21

Signed-off-by: Haoyang Chen <chenhaoyang(a)uniontech.com> --- dlls/ndis.sys/main.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/dlls/ndis.sys/main.c b/dlls/ndis.sys/main.c index 94c19ffca53..25faf9f7dad 100644 --- a/dlls/ndis.sys/main.c +++ b/dlls/ndis.sys/main.c @@ -123,6 +123,7 @@ static void add_key(const WCHAR *guidstrW, const MIB_IF_ROW2 *netdev) { HKEY card_key; WCHAR keynameW[100]; + HKEY sub_key; swprintf( keynameW, ARRAY_SIZE(keynameW), L"Software\\Microsoft\\Windows NT\\CurrentVersion\\NetworkCards\\%d", netdev->InterfaceIndex ); if (RegCreateKeyExW( HKEY_LOCAL_MACHINE, keynameW, 0, NULL, @@ -132,6 +133,22 @@ static void add_key(const WCHAR *guidstrW, const MIB_IF_ROW2 *netdev) RegSetValueExW( card_key, L"ServiceName", 0, REG_SZ, (BYTE *)guidstrW, (lstrlenW(guidstrW) + 1) * sizeof(WCHAR) ); RegCloseKey( card_key ); } + + swprintf( keynameW, ARRAY_SIZE(keynameW), L"System\\CurrentControlSet\\Control\\Network\\{4D36E972-E325-11CE-BFC1-08002BE10318}"); + if (RegCreateKeyExW( HKEY_LOCAL_MACHINE, keynameW, 0, NULL, + REG_OPTION_VOLATILE, KEY_ALL_ACCESS, NULL, &card_key, NULL ) == ERROR_SUCCESS) + { + swprintf( keynameW, ARRAY_SIZE(keynameW), L"%s\\Connection", guidstrW); + if (RegCreateKeyExW( card_key, keynameW, 0, NULL, + REG_OPTION_VOLATILE, KEY_ALL_ACCESS, NULL, &sub_key, NULL ) == ERROR_SUCCESS) + { + RegSetValueExW( sub_key, L"Name", 0, REG_SZ, (BYTE *)netdev->Description, (lstrlenW(netdev->Description) + 1) * sizeof(WCHAR) ); + RegSetValueExW( sub_key, L"PnpInstanceID", 0, REG_SZ, (BYTE *)L"PCI\\VEN_8086&DEV_100E&SUBSYS_001E8086&REV_02\\3&267A616A&0&18", + (lstrlenW(L"PCI\\VEN_8086&DEV_100E&SUBSYS_001E8086&REV_02\\3&267A616A&0&18") + 1) * sizeof(WCHAR) ); + RegCloseKey( sub_key ); + } + RegCloseKey( card_key ); + } } static int add_device(DRIVER_OBJECT *driver, const WCHAR *guidstrW, MIB_IF_ROW2 *netdev) -- 2.20.1

1 1

[PATCH 10/10] gdi32: Use NtGdiAngleArc for AngleArc implementation.
by Jacek Caban 19 Jul '21

19 Jul '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/enhmfdrv/dc.c | 14 +------------- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 1 - dlls/gdi32/enhmfdrv/graphics.c | 6 +++--- dlls/gdi32/enhmfdrv/init.c | 2 +- dlls/gdi32/gdi_private.h | 2 ++ dlls/gdi32/gdidc.c | 15 +++++++++++++++ dlls/gdi32/painting.c | 6 ++---- 7 files changed, 24 insertions(+), 22 deletions(-)

2 1

[PATCH 09/10] gdi32: Use NtGdiRectangle for Rectangle implementation.
by Jacek Caban 19 Jul '21

19 Jul '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/enhmfdrv/dc.c | 14 +------- dlls/gdi32/enhmfdrv/graphics.c | 59 +++++++++++++++++++++------------- dlls/gdi32/gdi_private.h | 3 ++ dlls/gdi32/gdidc.c | 15 +++++++++ dlls/gdi32/mfdrv/graphics.c | 6 ++-- dlls/gdi32/mfdrv/init.c | 2 +- dlls/gdi32/mfdrv/metafiledrv.h | 1 - dlls/gdi32/painting.c | 7 ++-- 8 files changed, 62 insertions(+), 45 deletions(-)

2 1

[PATCH 08/10] gdi32: Use NtGdiRoundRect for RoundRect implementation.
by Jacek Caban 19 Jul '21

19 Jul '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/enhmfdrv/dc.c | 15 +------- dlls/gdi32/enhmfdrv/graphics.c | 62 ++++++++++++++++++++++------------ dlls/gdi32/gdi_private.h | 4 +++ dlls/gdi32/gdidc.c | 22 ++++++++++++ dlls/gdi32/mfdrv/graphics.c | 10 +++--- dlls/gdi32/mfdrv/init.c | 13 ++++++- dlls/gdi32/mfdrv/metafiledrv.h | 4 +-- dlls/gdi32/painting.c | 8 ++--- 8 files changed, 89 insertions(+), 49 deletions(-)

2 1

[PATCH 07/10] gdi32: Use NtGdiEllipse for Ellipse implementation.
by Jacek Caban 19 Jul '21

19 Jul '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/enhmfdrv/dc.c | 14 +------- dlls/gdi32/enhmfdrv/graphics.c | 59 +++++++++++++++++++++------------- dlls/gdi32/gdi_private.h | 3 ++ dlls/gdi32/gdidc.c | 15 +++++++++ dlls/gdi32/mfdrv/graphics.c | 6 ++-- dlls/gdi32/mfdrv/init.c | 11 ++++++- dlls/gdi32/mfdrv/metafiledrv.h | 3 +- dlls/gdi32/painting.c | 7 ++-- 8 files changed, 73 insertions(+), 45 deletions(-)

2 1

[PATCH 06/10] gdi32: Handle EMFs directly in arc functions.
by Jacek Caban 19 Jul '21

19 Jul '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/enhmfdrv/dc.c | 60 +++---------------------------- dlls/gdi32/enhmfdrv/graphics.c | 66 ++++++++++++++++++++++++---------- dlls/gdi32/gdi_private.h | 3 ++ dlls/gdi32/gdidc.c | 28 +++++++++++++++ 4 files changed, 83 insertions(+), 74 deletions(-)

2 1

[PATCH 05/10] gdi32: Store graphics mode in DC_ATTR.
by Jacek Caban 19 Jul '21

19 Jul '21

2 1

[PATCH 04/10] gdi32: Handle EMFs directly in MoveToEx.
by Jacek Caban 19 Jul '21

19 Jul '21

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

2 1