ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

iphlpapi: Implement GetInterfaceInfo() on top of GetIfTable(). 

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@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Huw Davies 2021-07-09 09:09:23 +01:00 committed by Alexandre Julliard
parent ecce6909d6
commit 9f16ac9ae1
2 changed files with 32 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
dlls/iphlpapi/iphlpapi_main.c
View File

@ -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;
err = AllocateAndGetIfTableFromStack( &if_table, 0, GetProcessHeap(), 0 );
if (err) return err;
needed = FIELD_OFFSET(IP_INTERFACE_INFO, Adapter[if_table->dwNumEntries]);
if (!table || *size < needed)
{
*size = needed;
heap_free( if_table );
return ERROR_INSUFFICIENT_BUFFER;
}
else {
InterfaceIndexTable *table;
get_interface_indices( FALSE, &table );
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];
*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;
}

12
dlls/iphlpapi/tests/iphlpapi.c
View File

@ -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);
}
}