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

iphlpapi: Fix the field 'AdapterName' of IP_ADAPTER_INFO returned by GetAdaptersInfo.

Browse Source 
Signed-off-by: Yeshun Ye <yeyeshun@uniontech.com>
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Yeshun Ye 2021-06-17 08:56:30 +08:00 committed by Alexandre Julliard
parent afd5550b07
commit fb648144e3
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dlls/iphlpapi/iphlpapi_main.c
View File

@ -706,9 +706,16 @@ DWORD WINAPI GetAdaptersInfo(PIP_ADAPTER_INFO pAdapterInfo, PULONG pOutBufLen)
DWORD i;
PIP_ADDR_STRING currentIPAddr = &ptr->IpAddressList;
BOOL firstIPAddr = TRUE;
NET_LUID luid;
GUID guid;
/* on Win98 this is left empty, but whatever */
getInterfaceNameByIndex(table->indexes[ndx], ptr->AdapterName);
ConvertInterfaceIndexToLuid(table->indexes[ndx], &luid);
ConvertInterfaceLuidToGuid(&luid, &guid);
sprintf(ptr->AdapterName, "{%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]);
getInterfaceNameByIndex(table->indexes[ndx], ptr->Description);
ptr->AddressLength = sizeof(ptr->Address);
getInterfacePhysicalByIndex(table->indexes[ndx],

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

@ -1115,6 +1115,9 @@ static void testGetAdaptersInfo(void)
; /* no adapter's, that's okay */
else if (apiReturn == ERROR_BUFFER_OVERFLOW) {
PIP_ADAPTER_INFO ptr, buf = HeapAlloc(GetProcessHeap(), 0, len);
NET_LUID luid;
GUID guid;
char AdapterName[ARRAY_SIZE(ptr->AdapterName)];
apiReturn = GetAdaptersInfo(buf, &len);
ok(apiReturn == NO_ERROR,
@ -1122,6 +1125,13 @@ static void testGetAdaptersInfo(void)
apiReturn);
ptr = buf;
while (ptr) {
ConvertInterfaceIndexToLuid(ptr->Index, &luid);
ConvertInterfaceLuidToGuid(&luid, &guid);
sprintf(AdapterName, "{%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]);
ok(!strcmp(ptr->AdapterName, AdapterName), "expected '%s' got '%s'\n", ptr->AdapterName, AdapterName);
ok(ptr->IpAddressList.IpAddress.String[0], "A valid IP address must be present\n");
ok(ptr->IpAddressList.IpMask.String[0], "A valid mask must be present\n");
ok(ptr->GatewayList.IpAddress.String[0], "A valid IP address must be present\n");