- Wine-Devel - list.winehq.org

[PATCH 4/6] iphlpapi: Implement GetIfEntry() on top of nsi.
by Huw Davies July 9, 2021

July 9, 2021

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/iphlpapi/ifenum.c | 41 ----------------------------------- dlls/iphlpapi/ifenum.h | 7 ------ dlls/iphlpapi/iphlpapi_main.c | 33 ++++++++++++++-------------- 3 files changed, 16 insertions(+), 65 deletions(-) diff --git a/dlls/iphlpapi/ifenum.c b/dlls/iphlpapi/ifenum.c index 3b4ac775db7..8108c7ff8c2 100644 --- a/dlls/iphlpapi/ifenum.c +++ b/dlls/iphlpapi/ifenum.c @@ -745,47 +745,6 @@ DWORD getInterfaceStatusByName(const char *name, INTERNAL_IF_OPER_STATUS *status return ret; } -DWORD getInterfaceEntryByName(const char *name, PMIB_IFROW entry) -{ - BYTE addr[MAX_INTERFACE_PHYSADDR]; - DWORD ret, len = sizeof(addr), type; - - if (!name) - return ERROR_INVALID_PARAMETER; - if (!entry) - return ERROR_INVALID_PARAMETER; - - if (getInterfacePhysicalByName(name, &len, addr, &type) == NO_ERROR) { - WCHAR *assigner; - const char *walker; - - memset(entry, 0, sizeof(MIB_IFROW)); - for (assigner = entry->wszName, walker = name; *walker; - walker++, assigner++) - *assigner = *walker; - *assigner = 0; - getInterfaceIndexByName(name, &entry->dwIndex); - entry->dwPhysAddrLen = len; - memcpy(entry->bPhysAddr, addr, len); - memset(entry->bPhysAddr + len, 0, sizeof(entry->bPhysAddr) - len); - entry->dwType = type; - /* FIXME: how to calculate real speed? */ - getInterfaceMtuByName(name, &entry->dwMtu); - /* lie, there's no "administratively down" here */ - entry->dwAdminStatus = MIB_IF_ADMIN_STATUS_UP; - getInterfaceStatusByName(name, &entry->dwOperStatus); - /* punt on dwLastChange? */ - entry->dwDescrLen = min(strlen(name), MAX_INTERFACE_DESCRIPTION - 1); - memcpy(entry->bDescr, name, entry->dwDescrLen); - entry->bDescr[entry->dwDescrLen] = '\0'; - entry->dwDescrLen++; - ret = NO_ERROR; - } - else - ret = ERROR_INVALID_DATA; - return ret; -} - static DWORD getIPAddrRowByName(PMIB_IPADDRROW ipAddrRow, const char *ifName, const struct sockaddr *sa) { diff --git a/dlls/iphlpapi/ifenum.h b/dlls/iphlpapi/ifenum.h index 558dff64cb6..d0143eaaf69 100644 --- a/dlls/iphlpapi/ifenum.h +++ b/dlls/iphlpapi/ifenum.h @@ -87,13 +87,6 @@ DWORD getInterfaceIndexByName(const char *name, IF_INDEX *index) DECLSPEC_HIDDEN DWORD getInterfacePhysicalByIndex(IF_INDEX index, PDWORD len, PBYTE addr, PDWORD type) DECLSPEC_HIDDEN; -/* Fills in the MIB_IFROW by name. Doesn't fill in interface statistics, - * see ipstats.h for that. - * Returns ERROR_INVALID_PARAMETER if name is NULL, ERROR_INVALID_DATA - * if name isn't valid, and NO_ERROR otherwise. - */ -DWORD getInterfaceEntryByName(const char *name, PMIB_IFROW entry) DECLSPEC_HIDDEN; - DWORD getNumIPAddresses(void) DECLSPEC_HIDDEN; /* Gets the configured IP addresses for the system, and sets *ppIpAddrTable to diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index e5b6e72bde1..375766f1e9c 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -1821,26 +1821,25 @@ static void if_row_fill( MIB_IFROW *row, struct nsi_ndis_ifinfo_rw *rw, struct n * Success: NO_ERROR * Failure: error code from winerror.h */ -DWORD WINAPI GetIfEntry(PMIB_IFROW pIfRow) +DWORD WINAPI GetIfEntry( MIB_IFROW *row ) { - DWORD ret; - char nameBuf[MAX_ADAPTER_NAME]; - char *name; + struct nsi_ndis_ifinfo_rw rw; + struct nsi_ndis_ifinfo_dynamic dyn; + struct nsi_ndis_ifinfo_static stat; + NET_LUID luid; + DWORD err; - TRACE("pIfRow %p\n", pIfRow); - if (!pIfRow) - return ERROR_INVALID_PARAMETER; + TRACE( "row %p\n", row ); + if (!row) return ERROR_INVALID_PARAMETER; - name = getInterfaceNameByIndex(pIfRow->dwIndex, nameBuf); - if (name) { - ret = getInterfaceEntryByName(name, pIfRow); - if (ret == NO_ERROR) - ret = getInterfaceStatsByName(name, pIfRow); - } - else - ret = ERROR_INVALID_DATA; - TRACE("returning %d\n", ret); - return ret; + err = ConvertInterfaceIndexToLuid( row->dwIndex, &luid ); + if (err) return err; + + err = NsiGetAllParameters( 1, &NPI_MS_NDIS_MODULEID, NSI_NDIS_IFINFO_TABLE, + &luid, sizeof(luid), &rw, sizeof(rw), + &dyn, sizeof(dyn), &stat, sizeof(stat) ); + if (!err) if_row_fill( row, &rw, &dyn, &stat ); + return err; } static int ifrow_cmp( const void *a, const void *b ) -- 2.23.0

1 0

[PATCH 3/6] iphlpapi: Implement GetIfTable() on top of nsi.
by Huw Davies July 9, 2021

July 9, 2021

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/iphlpapi/iphlpapi_main.c | 131 ++++++++++++++++++--------------- dlls/iphlpapi/tests/iphlpapi.c | 16 ++++ 2 files changed, 87 insertions(+), 60 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index ff534afa0f9..e5b6e72bde1 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -1775,6 +1775,38 @@ DWORD WINAPI GetFriendlyIfIndex(DWORD IfIndex) return IfIndex; } +static void if_counted_string_copy( WCHAR *dst, unsigned int len, IF_COUNTED_STRING *src ); + +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 ) +{ + if_counted_string_copy( row->wszName, ARRAY_SIZE(row->wszName), &rw->alias ); + row->dwIndex = stat->if_index; + row->dwType = stat->type; + row->dwMtu = dyn->mtu; + row->dwSpeed = dyn->rcv_speed; + row->dwPhysAddrLen = rw->phys_addr.Length; + if (row->dwPhysAddrLen > sizeof(row->bPhysAddr)) row->dwPhysAddrLen = 0; + memcpy( row->bPhysAddr, rw->phys_addr.Address, row->dwPhysAddrLen ); + row->dwAdminStatus = rw->admin_status; + row->dwOperStatus = (dyn->oper_status == IfOperStatusUp) ? MIB_IF_OPER_STATUS_OPERATIONAL : MIB_IF_OPER_STATUS_NON_OPERATIONAL; + row->dwLastChange = 0; + row->dwInOctets = dyn->in_octets; + row->dwInUcastPkts = dyn->in_ucast_pkts; + row->dwInNUcastPkts = dyn->in_bcast_pkts + dyn->in_mcast_pkts; + row->dwInDiscards = dyn->in_discards; + row->dwInErrors = dyn->in_errors; + row->dwInUnknownProtos = 0; + row->dwOutOctets = dyn->out_octets; + row->dwOutUcastPkts = dyn->out_ucast_pkts; + row->dwOutNUcastPkts = dyn->out_bcast_pkts + dyn->out_mcast_pkts; + row->dwOutDiscards = dyn->out_discards; + row->dwOutErrors = dyn->out_errors; + row->dwOutQLen = 0; + row->dwDescrLen = WideCharToMultiByte( CP_ACP, 0, stat->descr.String, stat->descr.Length / sizeof(WCHAR), + (char *)row->bDescr, sizeof(row->bDescr) - 1, NULL, NULL ); + row->bDescr[row->dwDescrLen] = '\0'; +} /****************************************************************** * GetIfEntry (IPHLPAPI.@) @@ -1811,91 +1843,70 @@ DWORD WINAPI GetIfEntry(PMIB_IFROW pIfRow) return ret; } -static int IfTableSorter(const void *a, const void *b) +static int ifrow_cmp( const void *a, const void *b ) { - int ret; - - if (a && b) - ret = ((const MIB_IFROW*)a)->dwIndex - ((const MIB_IFROW*)b)->dwIndex; - else - ret = 0; - return ret; + return ((const MIB_IFROW*)a)->dwIndex - ((const MIB_IFROW*)b)->dwIndex; } - /****************************************************************** * GetIfTable (IPHLPAPI.@) * * Get a table of local interfaces. * * PARAMS - * pIfTable [Out] buffer for local interfaces table - * pdwSize [In/Out] length of output buffer - * bOrder [In] whether to sort the table + * table [Out] buffer for local interfaces table + * size [In/Out] length of output buffer + * sort [In] whether to sort the table * * RETURNS * Success: NO_ERROR * Failure: error code from winerror.h * * NOTES - * If pdwSize is less than required, the function will return + * If size 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 by interface index. + * If sort is true, the returned table will be sorted by interface index. */ -DWORD WINAPI GetIfTable(PMIB_IFTABLE pIfTable, PULONG pdwSize, BOOL bOrder) +DWORD WINAPI GetIfTable( MIB_IFTABLE *table, ULONG *size, BOOL sort ) { - DWORD ret; + DWORD i, count, needed, err; + NET_LUID *keys; + struct nsi_ndis_ifinfo_rw *rw; + struct nsi_ndis_ifinfo_dynamic *dyn; + struct nsi_ndis_ifinfo_static *stat; - TRACE("pIfTable %p, pdwSize %p, bOrder %d\n", pIfTable, pdwSize, bOrder); + if (!size) return ERROR_INVALID_PARAMETER; - if (!pdwSize) - ret = ERROR_INVALID_PARAMETER; - else { - DWORD numInterfaces = get_interface_indices( FALSE, NULL ); - ULONG size = sizeof(MIB_IFTABLE); + /* While this could be implemented on top of GetIfTable2(), it would require + an additional copy of the data */ + err = NsiAllocateAndGetTable( 1, &NPI_MS_NDIS_MODULEID, NSI_NDIS_IFINFO_TABLE, (void **)&keys, sizeof(*keys), + (void **)&rw, sizeof(*rw), (void **)&dyn, sizeof(*dyn), + (void **)&stat, sizeof(*stat), &count, 0 ); + if (err) return err; + + needed = FIELD_OFFSET( MIB_IFTABLE, table[count] ); - if (numInterfaces > 1) - size += (numInterfaces - 1) * sizeof(MIB_IFROW); - if (!pIfTable || *pdwSize < size) { - *pdwSize = size; - ret = ERROR_INSUFFICIENT_BUFFER; + if (!table || *size < needed) + { + *size = needed; + err = ERROR_INSUFFICIENT_BUFFER; + goto err; } - else { - InterfaceIndexTable *table; - get_interface_indices( FALSE, &table ); - - if (table) { - size = sizeof(MIB_IFTABLE); - if (table->numIndexes > 1) - size += (table->numIndexes - 1) * sizeof(MIB_IFROW); - if (*pdwSize < size) { - *pdwSize = size; - ret = ERROR_INSUFFICIENT_BUFFER; - } - else { - DWORD ndx; - *pdwSize = size; - pIfTable->dwNumEntries = 0; - for (ndx = 0; ndx < table->numIndexes; ndx++) { - pIfTable->table[ndx].dwIndex = table->indexes[ndx]; - GetIfEntry(&pIfTable->table[ndx]); - pIfTable->dwNumEntries++; - } - if (bOrder) - qsort(pIfTable->table, pIfTable->dwNumEntries, sizeof(MIB_IFROW), - IfTableSorter); - ret = NO_ERROR; - } - HeapFree(GetProcessHeap(), 0, table); - } - else - ret = ERROR_OUTOFMEMORY; + table->dwNumEntries = count; + for (i = 0; i < count; i++) + { + MIB_IFROW *row = table->table + i; + + if_row_fill( row, rw + i, dyn + i, stat + i ); } - } - TRACE("returning %d\n", ret); - return ret; + + if (sort) qsort( table->table, count, sizeof(MIB_IFROW), ifrow_cmp ); + +err: + NsiFreeTable( keys, rw, dyn, stat ); + return err; } static void if_counted_string_copy( WCHAR *dst, unsigned int len, IF_COUNTED_STRING *src ) diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 784eafbd1ef..1e8950f3482 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -238,12 +238,16 @@ static void testGetIfTable(void) if (apiReturn == NO_ERROR) { + char descr[MAX_INTERFACE_NAME_LEN]; + WCHAR name[MAX_INTERFACE_NAME_LEN]; DWORD i, index; if (winetest_debug > 1) trace( "interface table: %u entries\n", buf->dwNumEntries ); for (i = 0; i < buf->dwNumEntries; i++) { MIB_IFROW *row = &buf->table[i]; + MIB_IF_ROW2 row2; + GUID *guid; if (winetest_debug > 1) { @@ -261,6 +265,18 @@ static void testGetIfTable(void) ok( index == row->dwIndex || broken( index != row->dwIndex && index ), /* Win8 can have identical guids for two different ifaces */ "got %d vs %d\n", index, row->dwIndex ); + memset( &row2, 0, sizeof(row2) ); + row2.InterfaceIndex = row->dwIndex; + GetIfEntry2( &row2 ); + WideCharToMultiByte( CP_ACP, 0, row2.Description, -1, descr, sizeof(descr), NULL, NULL ); + ok( !strcmp( (char *)row->bDescr, descr ), "got %s vs %s\n", row->bDescr, descr ); + guid = &row2.InterfaceGuid; + swprintf( name, ARRAY_SIZE(name), L"\\DEVICE\\TCPIP_{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}", + guid->Data1, guid->Data2, guid->Data3, guid->Data4[0], guid->Data4[1], + guid->Data4[2], guid->Data4[3], guid->Data4[4], guid->Data4[5], + guid->Data4[6], guid->Data4[7]); +todo_wine + ok( !wcscmp( row->wszName, name ), "got %s vs %s\n", debugstr_w( row->wszName ), debugstr_w( name ) ); } } HeapFree(GetProcessHeap(), 0, buf); -- 2.23.0

1 0

[PATCH 2/6] iphlpapi: Implement GetAdapterIndex() on top of GetIfTable().
by Huw Davies July 9, 2021

July 9, 2021

Eventually this should just parse the Guid in the name. This is an intermediate step to keep the interface names in sync. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/iphlpapi/iphlpapi_main.c | 37 ++++++++++++++++++++-------------- dlls/iphlpapi/tests/iphlpapi.c | 36 ++++++++++++++++++--------------- 2 files changed, 42 insertions(+), 31 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 7c537dc3f27..ff534afa0f9 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -628,28 +628,35 @@ void WINAPI FreeMibTable(void *ptr) * Get interface index from its name. * * PARAMS - * AdapterName [In] unicode string with the adapter name - * IfIndex [Out] returns found interface index + * 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(LPWSTR AdapterName, PULONG IfIndex) +DWORD WINAPI GetAdapterIndex( WCHAR *adapter_name, ULONG *index ) { - char adapterName[MAX_ADAPTER_NAME]; - unsigned int i; - DWORD ret; + MIB_IFTABLE *if_table; + DWORD err, i; - TRACE("(AdapterName %p, IfIndex %p)\n", AdapterName, IfIndex); - /* The adapter name is guaranteed not to have any unicode characters, so - * this translation is never lossy */ - for (i = 0; i < sizeof(adapterName) - 1 && AdapterName[i]; i++) - adapterName[i] = (char)AdapterName[i]; - adapterName[i] = '\0'; - ret = getInterfaceIndexByName(adapterName, IfIndex); - TRACE("returning %d\n", ret); - return ret; + TRACE( "name %s, index %p\n", debugstr_w( adapter_name ), index ); + + err = AllocateAndGetIfTableFromStack( &if_table, 0, GetProcessHeap(), 0 ); + 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; } diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 61406090839..784eafbd1ef 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -236,27 +236,31 @@ static void testGetIfTable(void) "GetIfTable(buf, &dwSize, FALSE) returned %d, expected NO_ERROR\n\n", apiReturn); - if (apiReturn == NO_ERROR && winetest_debug > 1) + if (apiReturn == NO_ERROR) { - DWORD i, j; - char name[MAX_INTERFACE_NAME_LEN]; + DWORD i, index; - trace( "interface table: %u entries\n", buf->dwNumEntries ); + if (winetest_debug > 1) trace( "interface table: %u entries\n", buf->dwNumEntries ); for (i = 0; i < buf->dwNumEntries; i++) { MIB_IFROW *row = &buf->table[i]; - WideCharToMultiByte( CP_ACP, 0, row->wszName, -1, name, MAX_INTERFACE_NAME_LEN, NULL, NULL ); - trace( "%u: '%s' type %u mtu %u speed %u phys", - row->dwIndex, name, row->dwType, row->dwMtu, row->dwSpeed ); - for (j = 0; j < row->dwPhysAddrLen; j++) - printf( " %02x", row->bPhysAddr[j] ); - printf( "\n" ); - trace( " in: bytes %u upkts %u nupkts %u disc %u err %u unk %u\n", - row->dwInOctets, row->dwInUcastPkts, row->dwInNUcastPkts, - row->dwInDiscards, row->dwInErrors, row->dwInUnknownProtos ); - trace( " out: bytes %u upkts %u nupkts %u disc %u err %u\n", - row->dwOutOctets, row->dwOutUcastPkts, row->dwOutNUcastPkts, - row->dwOutDiscards, row->dwOutErrors ); + + if (winetest_debug > 1) + { + trace( "%u: '%s' type %u mtu %u speed %u\n", + row->dwIndex, debugstr_w(row->wszName), row->dwType, row->dwMtu, row->dwSpeed ); + trace( " in: bytes %u upkts %u nupkts %u disc %u err %u unk %u\n", + row->dwInOctets, row->dwInUcastPkts, row->dwInNUcastPkts, + row->dwInDiscards, row->dwInErrors, row->dwInUnknownProtos ); + trace( " out: bytes %u upkts %u nupkts %u disc %u err %u\n", + row->dwOutOctets, row->dwOutUcastPkts, row->dwOutNUcastPkts, + row->dwOutDiscards, row->dwOutErrors ); + } + apiReturn = GetAdapterIndex( row->wszName, &index ); + ok( !apiReturn, "got %d\n", apiReturn ); + ok( index == row->dwIndex || + broken( index != row->dwIndex && index ), /* Win8 can have identical guids for two different ifaces */ + "got %d vs %d\n", index, row->dwIndex ); } } HeapFree(GetProcessHeap(), 0, buf); -- 2.23.0

1 0

[PATCH 1/6] iphlpapi: Implement GetInterfaceInfo() on top of GetIfTable().
by Huw Davies July 9, 2021

July 9, 2021

Eventually this should be implemented using NSI. This is an intermediate step to keep the interface names in sync. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/iphlpapi/iphlpapi_main.c | 74 ++++++++++------------------------ dlls/iphlpapi/tests/iphlpapi.c | 12 +++++- 2 files changed, 32 insertions(+), 54 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 5621a4485c4..7c537dc3f27 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -2060,65 +2060,33 @@ DWORD WINAPI GetIfTable2( MIB_IF_TABLE2 **table ) * BUGS * MSDN states this should return non-loopback interfaces only. */ -DWORD WINAPI GetInterfaceInfo(PIP_INTERFACE_INFO pIfTable, PULONG dwOutBufLen) +DWORD WINAPI GetInterfaceInfo( IP_INTERFACE_INFO *table, ULONG *size ) { - DWORD ret; + MIB_IFTABLE *if_table; + DWORD err, needed, i; - TRACE("pIfTable %p, dwOutBufLen %p\n", pIfTable, dwOutBufLen); - if (!dwOutBufLen) - ret = ERROR_INVALID_PARAMETER; - else { - DWORD numInterfaces = get_interface_indices( FALSE, NULL ); - ULONG size = sizeof(IP_INTERFACE_INFO); + TRACE("table %p, size %p\n", table, size ); + if (!size) return ERROR_INVALID_PARAMETER; - if (numInterfaces > 1) - size += (numInterfaces - 1) * sizeof(IP_ADAPTER_INDEX_MAP); - if (!pIfTable || *dwOutBufLen < size) { - *dwOutBufLen = size; - ret = ERROR_INSUFFICIENT_BUFFER; - } - else { - InterfaceIndexTable *table; - get_interface_indices( FALSE, &table ); + err = AllocateAndGetIfTableFromStack( &if_table, 0, GetProcessHeap(), 0 ); + if (err) return err; - if (table) { - size = sizeof(IP_INTERFACE_INFO); - if (table->numIndexes > 1) - size += (table->numIndexes - 1) * sizeof(IP_ADAPTER_INDEX_MAP); - if (*dwOutBufLen < size) { - *dwOutBufLen = size; - ret = ERROR_INSUFFICIENT_BUFFER; - } - else { - DWORD ndx; - char nameBuf[MAX_ADAPTER_NAME]; + needed = FIELD_OFFSET(IP_INTERFACE_INFO, Adapter[if_table->dwNumEntries]); + if (!table || *size < needed) + { + *size = needed; + heap_free( if_table ); + return ERROR_INSUFFICIENT_BUFFER; + } - *dwOutBufLen = size; - pIfTable->NumAdapters = 0; - for (ndx = 0; ndx < table->numIndexes; ndx++) { - const char *walker, *name; - WCHAR *assigner; - - pIfTable->Adapter[ndx].Index = table->indexes[ndx]; - name = getInterfaceNameByIndex(table->indexes[ndx], nameBuf); - for (walker = name, assigner = pIfTable->Adapter[ndx].Name; - walker && *walker && - assigner - pIfTable->Adapter[ndx].Name < MAX_ADAPTER_NAME - 1; - walker++, assigner++) - *assigner = *walker; - *assigner = 0; - pIfTable->NumAdapters++; - } - ret = NO_ERROR; - } - HeapFree(GetProcessHeap(), 0, table); - } - else - ret = ERROR_OUTOFMEMORY; + table->NumAdapters = if_table->dwNumEntries; + for (i = 0; i < if_table->dwNumEntries; i++) + { + table->Adapter[i].Index = if_table->table[i].dwIndex; + strcpyW( table->Adapter[i].Name, if_table->table[i].wszName ); } - } - TRACE("returning %d\n", ret); - return ret; + heap_free( if_table ); + return ERROR_SUCCESS; } diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 39aa7123668..61406090839 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -1040,7 +1040,7 @@ static void testWinNT4Functions(void) static void testGetInterfaceInfo(void) { DWORD apiReturn; - ULONG len = 0; + ULONG len = 0, i; apiReturn = GetInterfaceInfo(NULL, NULL); if (apiReturn == ERROR_NOT_SUPPORTED) { @@ -1061,6 +1061,16 @@ static void testGetInterfaceInfo(void) ok(apiReturn == NO_ERROR, "GetInterfaceInfo(buf, &dwSize) returned %d, expected NO_ERROR\n", apiReturn); + + for (i = 0; i < buf->NumAdapters; i++) + { + MIB_IFROW row = { .dwIndex = buf->Adapter[i].Index }; + 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/5] ws2_32: Move the setsockopt(IP_MULTICAST_LOOP) implementation to ntdll.
by Zebediah Figura July 9, 2021

July 9, 2021

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/ntdll/unix/socket.c | 3 +++ dlls/ws2_32/socket.c | 4 +++- include/wine/afd.h | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index 34796dbfd3d..f37a8178552 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -1755,6 +1755,9 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc case IOCTL_AFD_WINE_GET_IP_MULTICAST_LOOP: return do_getsockopt( handle, io, IPPROTO_IP, IP_MULTICAST_LOOP, out_buffer, out_size ); + case IOCTL_AFD_WINE_SET_IP_MULTICAST_LOOP: + return do_setsockopt( handle, io, IPPROTO_IP, IP_MULTICAST_LOOP, in_buffer, in_size ); + default: { if ((code >> 16) == FILE_DEVICE_NETWORK) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index cb49fa4107a..b8b8ea3480b 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3653,6 +3653,9 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, case WS_IP_MULTICAST_IF: return server_setsockopt( s, IOCTL_AFD_WINE_SET_IP_MULTICAST_IF, optval, optlen ); + case WS_IP_MULTICAST_LOOP: + return server_setsockopt( s, IOCTL_AFD_WINE_SET_IP_MULTICAST_LOOP, optval, optlen ); + case WS_IP_UNBLOCK_SOURCE: { WS_IP_MREQ_SOURCE* val = (void*)optval; @@ -3666,7 +3669,6 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, convert_sockopt(&level, &optname); break; } - case WS_IP_MULTICAST_LOOP: case WS_IP_MULTICAST_TTL: case WS_IP_OPTIONS: #if defined(IP_PKTINFO) || defined(IP_RECVDSTADDR) diff --git a/include/wine/afd.h b/include/wine/afd.h index 218b65986bb..a0e8b0f5fef 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -193,6 +193,7 @@ struct afd_get_events_params #define IOCTL_AFD_WINE_GET_IP_MULTICAST_IF WINE_AFD_IOC(248) #define IOCTL_AFD_WINE_SET_IP_MULTICAST_IF WINE_AFD_IOC(249) #define IOCTL_AFD_WINE_GET_IP_MULTICAST_LOOP WINE_AFD_IOC(250) +#define IOCTL_AFD_WINE_SET_IP_MULTICAST_LOOP WINE_AFD_IOC(251) struct afd_create_params { -- 2.30.2

1 4

[PATCH v3] comctl32: Handle NULL text in COMBOEX_NotifyEndEdit().
by Haoyang Chen July 9, 2021

July 9, 2021

Signed-off-by: Haoyang Chen <chenhaoyang(a)uniontech.com> --- dlls/comctl32/comboex.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/comboex.c b/dlls/comctl32/comboex.c index 0f7e46949e4..cc3b03030bd 100644 --- a/dlls/comctl32/comboex.c +++ b/dlls/comctl32/comboex.c @@ -223,7 +223,10 @@ static INT COMBOEX_NotifyEndEdit (const COMBOEX_INFO *infoPtr, NMCBEENDEDITW *ne { /* Change the Text item from Unicode to ANSI if necessary for NOTIFY */ if (infoPtr->NtfUnicode) { - lstrcpynW(neew->szText, wstr, CBEMAXSTRLEN); + if (!wstr) + neew->szText[0] = 0; + else + lstrcpynW(neew->szText, wstr, CBEMAXSTRLEN); return COMBOEX_Notify (infoPtr, CBEN_ENDEDITW, &neew->hdr); } else { NMCBEENDEDITA neea; -- 2.20.1

1 0

[PATCH vkd3d v3 1/5] vkd3d-shader: Allocate the $Params buffer in hlsl_ctx_init().
by Zebediah Figura July 9, 2021

July 9, 2021

For clarity. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- v3: don't allocate the buffer twice... libs/vkd3d-shader/hlsl.c | 3 +++ libs/vkd3d-shader/hlsl.h | 2 +- libs/vkd3d-shader/hlsl_codegen.c | 15 ++------------- 3 files changed, 6 insertions(+), 14 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 0b8c660c..bc593f82 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -1664,6 +1664,9 @@ static bool hlsl_ctx_init(struct hlsl_ctx *ctx, const struct hlsl_profile_info * if (!(ctx->globals_buffer = hlsl_new_buffer(ctx, HLSL_BUFFER_CONSTANT, hlsl_strdup(ctx, "$Globals"), NULL, ctx->location))) return false; + if (!(ctx->params_buffer = hlsl_new_buffer(ctx, HLSL_BUFFER_CONSTANT, + hlsl_strdup(ctx, "$Params"), NULL, ctx->location))) + return false; ctx->cur_buffer = ctx->globals_buffer; return true; diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index b62e7818..e0045acf 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -456,7 +456,7 @@ struct hlsl_ctx struct list extern_vars; struct list buffers; - struct hlsl_buffer *cur_buffer, *globals_buffer; + struct hlsl_buffer *cur_buffer, *globals_buffer, *params_buffer; struct list types; struct rb_tree functions; const struct hlsl_ir_function_decl *cur_function; diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 6336ddfc..778d9dff 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -1142,27 +1142,16 @@ static void calculate_buffer_offset(struct hlsl_ir_var *var) static void allocate_buffers(struct hlsl_ctx *ctx) { - struct hlsl_buffer *buffer, *params_buffer; + struct hlsl_buffer *buffer; struct hlsl_ir_var *var; uint32_t index = 0; - if (!(params_buffer = hlsl_new_buffer(ctx, HLSL_BUFFER_CONSTANT, - hlsl_strdup(ctx, "$Params"), NULL, ctx->location))) - return; - - /* The $Globals and $Params buffers should be allocated first, before all - * explicit buffers. */ - list_remove(&params_buffer->entry); - list_add_head(&ctx->buffers, &params_buffer->entry); - list_remove(&ctx->globals_buffer->entry); - list_add_head(&ctx->buffers, &ctx->globals_buffer->entry); - LIST_FOR_EACH_ENTRY(var, &ctx->extern_vars, struct hlsl_ir_var, extern_entry) { if (var->is_uniform) { if (var->is_param) - var->buffer = params_buffer; + var->buffer = ctx->params_buffer; calculate_buffer_offset(var); } -- 2.32.0

5 12

[PATCH v12 1/4] winevulkan: Support use of extensions which mustn't be exposed.
by Derek Lesho July 8, 2021

July 8, 2021

Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> --- dlls/winevulkan/make_vulkan | 35 ++++++++++++++++++++++++----------- 1 file changed, 24 insertions(+), 11 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index e8534cbd5f5..c46ef02dcb9 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -124,6 +124,11 @@ UNSUPPORTED_EXTENSIONS = [ "VK_NV_external_memory_win32", ] +# Either internal extensions which aren't present on the win32 platform which +# winevulkan may nonetheless use, or extensions we want to generate headers for +# but not expose to applications (useful for test commits) +UNEXPOSED_EXTENSIONS = {} + # The Vulkan loader provides entry-points for core functionality and important # extensions. Based on vulkan-1.def this amounts to WSI extensions on 1.0.51. CORE_EXTENSIONS = [ @@ -513,8 +518,8 @@ class VkEnumValue(object): class VkFunction(object): - def __init__(self, _type=None, name=None, params=[], extensions=[], alias=None): - self.extensions = [] + def __init__(self, _type=None, name=None, params=[], alias=None): + self.extensions = set() self.name = name self.type = _type self.params = params @@ -657,6 +662,10 @@ class VkFunction(object): def needs_private_thunk(self): return self.thunk_type == ThunkType.PRIVATE + def needs_exposing(self): + # The function needs exposed if at-least one extension isn't both UNSUPPORTED and UNEXPOSED + return self.is_required() and (not self.extensions or not self.extensions.issubset(UNEXPOSED_EXTENSIONS)) + def pfn(self, prefix="p", call_conv=None, conv=False): """ Create function pointer. """ @@ -2682,7 +2691,7 @@ class VkGenerator(object): # Create thunks for instance and device functions. # Global functions don't go through the thunks. for vk_func in self.registry.funcs.values(): - if not vk_func.is_required(): + if not vk_func.needs_exposing(): continue if vk_func.is_global_func(): @@ -2702,6 +2711,8 @@ class VkGenerator(object): for ext in self.registry.extensions: if ext["type"] != "device": continue + if ext["name"] in UNEXPOSED_EXTENSIONS: + continue f.write(" \"{0}\",\n".format(ext["name"])) f.write("};\n\n") @@ -2711,6 +2722,8 @@ class VkGenerator(object): for ext in self.registry.extensions: if ext["type"] != "instance": continue + if ext["name"] in UNEXPOSED_EXTENSIONS: + continue f.write(" \"{0}\",\n".format(ext["name"])) f.write("};\n\n") @@ -2770,7 +2783,7 @@ class VkGenerator(object): f.write("const struct unix_funcs loader_funcs =\n") f.write("{\n") for vk_func in self.registry.funcs.values(): - if not vk_func.is_required(): + if not vk_func.needs_exposing(): continue if vk_func.loader_thunk_type == ThunkType.NONE: continue @@ -2789,7 +2802,7 @@ class VkGenerator(object): # Generate prototypes for device and instance functions requiring a custom implementation. f.write("/* Functions for which we have custom implementations outside of the thunks. */\n") for vk_func in self.registry.funcs.values(): - if not vk_func.is_required(): + if not vk_func.needs_exposing(): continue if vk_func.needs_thunk() and not vk_func.needs_private_thunk(): continue @@ -2888,7 +2901,7 @@ class VkGenerator(object): f.write("WINE_DEFAULT_DEBUG_CHANNEL(vulkan);\n\n") for vk_func in self.registry.funcs.values(): - if not vk_func.is_required(): + if not vk_func.needs_exposing(): continue if vk_func.loader_thunk_type != ThunkType.PUBLIC: continue @@ -2897,7 +2910,7 @@ class VkGenerator(object): f.write("static const struct vulkan_func vk_device_dispatch_table[] =\n{\n") for vk_func in self.registry.device_funcs: - if not vk_func.is_required(): + if not vk_func.needs_exposing(): continue f.write(" {{\"{0}\", &{0}}},\n".format(vk_func.name)) @@ -2905,7 +2918,7 @@ class VkGenerator(object): f.write("static const struct vulkan_func vk_phys_dev_dispatch_table[] =\n{\n") for vk_func in self.registry.phys_dev_funcs: - if not vk_func.is_required(): + if not vk_func.needs_exposing(): continue f.write(" {{\"{0}\", &{0}}},\n".format(vk_func.name)) @@ -2913,7 +2926,7 @@ class VkGenerator(object): f.write("static const struct vulkan_func vk_instance_dispatch_table[] =\n{\n") for vk_func in self.registry.instance_funcs: - if not vk_func.is_required(): + if not vk_func.needs_exposing(): continue f.write(" {{\"{0}\", &{0}}},\n".format(vk_func.name)) @@ -2970,7 +2983,7 @@ class VkGenerator(object): f.write("struct unix_funcs\n") f.write("{\n") for vk_func in self.registry.funcs.values(): - if not vk_func.is_required(): + if not vk_func.needs_exposing(): continue if vk_func.loader_thunk_type == ThunkType.NONE: continue @@ -3464,7 +3477,7 @@ class VkRegistry(object): # the XML file to handle this, but because of the manner in which we parse the XML # file we pre-populate from <commands> before we check if a command is enabled. if cmd_name in self.funcs: - self.funcs[cmd_name].extensions.append(ext_name) + self.funcs[cmd_name].extensions.add(ext_name) # Some extensions are not ready or have numbers reserved as a place holder. if ext.attrib["supported"] == "disabled": -- 2.32.0

1 3

[PATCH 1/2] tests: Return the condition value from ok() & co.
by Francois Gouget July 8, 2021

July 8, 2021

This allows writing things like: ret = GetComplexStructure(&out); if (ok(ret, "GetComplexStructure failed le=%u\n", GetLastError())) { /* We know out was successfully filled so its content can be tested */ ok(strcmp(out.field1, val1) == 0, "bad field1\n"); ... } Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This should avoid duplication between the ok() call and the following if () condition. --- include/wine/test.h | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/include/wine/test.h b/include/wine/test.h index 8073071d262..6d90c13fe7a 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -91,7 +91,7 @@ extern int broken( int condition ); extern int winetest_vok( int condition, const char *msg, __winetest_va_list ap ); extern void winetest_vskip( const char *msg, __winetest_va_list ap ); -extern void __winetest_cdecl winetest_ok( int condition, const char *msg, ... ) __WINE_PRINTF_ATTR(2,3); +extern int __winetest_cdecl winetest_ok( int condition, const char *msg, ... ) __WINE_PRINTF_ATTR(2,3); extern void __winetest_cdecl winetest_skip( const char *msg, ... ) __WINE_PRINTF_ATTR(1,2); extern void __winetest_cdecl winetest_win_skip( const char *msg, ... ) __WINE_PRINTF_ATTR(1,2); extern void __winetest_cdecl winetest_trace( const char *msg, ... ) __WINE_PRINTF_ATTR(1,2); @@ -102,7 +102,7 @@ extern void winetest_pop_context(void); #ifdef WINETEST_NO_LINE_NUMBERS # define subtest_(file, line) (winetest_set_location(file, 0), 0) ? (void)0 : winetest_subtest # define ignore_exceptions_(file, line) (winetest_set_location(file, 0), 0) ? (void)0 : winetest_ignore_exceptions -# define ok_(file, line) (winetest_set_location(file, 0), 0) ? (void)0 : winetest_ok +# define ok_(file, line) (winetest_set_location(file, 0), 0) ? 0 : winetest_ok # define skip_(file, line) (winetest_set_location(file, 0), 0) ? (void)0 : winetest_skip # define win_skip_(file, line) (winetest_set_location(file, 0), 0) ? (void)0 : winetest_win_skip # define trace_(file, line) (winetest_set_location(file, 0), 0) ? (void)0 : winetest_trace @@ -110,7 +110,7 @@ extern void winetest_pop_context(void); #else # define subtest_(file, line) (winetest_set_location(file, line), 0) ? (void)0 : winetest_subtest # define ignore_exceptions_(file, line) (winetest_set_location(file, line), 0) ? (void)0 : winetest_ignore_exceptions -# define ok_(file, line) (winetest_set_location(file, line), 0) ? (void)0 : winetest_ok +# define ok_(file, line) (winetest_set_location(file, line), 0) ? 0 : winetest_ok # define skip_(file, line) (winetest_set_location(file, line), 0) ? (void)0 : winetest_skip # define win_skip_(file, line) (winetest_set_location(file, line), 0) ? (void)0 : winetest_win_skip # define trace_(file, line) (winetest_set_location(file, line), 0) ? (void)0 : winetest_trace @@ -361,7 +361,7 @@ static LONG winetest_add_line( void ) * - file - test application source code file name of the check * - line - test application source code file line number of the check * Return: - * 0 if condition does not have the expected value, 1 otherwise + * The condition value */ int winetest_vok( int condition, const char *msg, __winetest_va_list args ) { @@ -374,7 +374,6 @@ int winetest_vok( int condition, const char *msg, __winetest_va_list args ) winetest_print_context( "Test succeeded inside todo block: " ); vprintf(msg, args); InterlockedIncrement(&todo_failures); - return 0; } else { @@ -390,7 +389,6 @@ int winetest_vok( int condition, const char *msg, __winetest_va_list args ) } else InterlockedIncrement(&muted_todo_successes); - return 1; } } else @@ -400,7 +398,6 @@ int winetest_vok( int condition, const char *msg, __winetest_va_list args ) winetest_print_context( "Test failed: " ); vprintf(msg, args); InterlockedIncrement(&failures); - return 0; } else { @@ -410,18 +407,19 @@ int winetest_vok( int condition, const char *msg, __winetest_va_list args ) winetest_printf("Test succeeded\n"); } InterlockedIncrement(&successes); - return 1; } } + return condition; } -void __winetest_cdecl winetest_ok( int condition, const char *msg, ... ) +int __winetest_cdecl winetest_ok( int condition, const char *msg, ... ) { __winetest_va_list valist; __winetest_va_start(valist, msg); winetest_vok(condition, msg, valist); __winetest_va_end(valist); + return condition; } void __winetest_cdecl winetest_trace( const char *msg, ... ) -- 2.20.1

2 2

[PATCH 3/3] gdi32: Store ntgdi object types in handle table.
by Jacek Caban July 8, 2021

July 8, 2021

2 1