From: thi garlet <garlet at gmail dot com> --- dlls/iphlpapi/iphlpapi_main.c | 12 ++++++------ dlls/iphlpapi/tests/iphlpapi.c | 1 - 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 7ca577f6742..7a4fd9e955e 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -4066,7 +4066,7 @@ DWORD WINAPI SendARP(IPAddr DestIP, IPAddr SrcIP, PULONG pMacAddr, PULONG PhyAdd /* first, check if DestIP is a local adapter */ do { - pInterfaces = (IP_ADAPTER_ADDRESSES *) heap_alloc_zero(size); + pInterfaces = (IP_ADAPTER_ADDRESSES *) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); if (pInterfaces == NULL) { ERR("Memory allocation failed for IP_ADAPTER_ADDRESSES struct"); @@ -4089,7 +4089,7 @@ DWORD WINAPI SendARP(IPAddr DestIP, IPAddr SrcIP, PULONG pMacAddr, PULONG PhyAdd pUnicast->Address.lpSockaddr)->sin_addr.s_addr ) { memcpy(pMacAddr, pCurrInterface->PhysicalAddress, 6); - heap_free(pInterfaces); + HeapFree(GetProcessHeap(), 0, pInterfaces); return NO_ERROR; } pUnicast = pUnicast->Next; @@ -4097,7 +4097,7 @@ DWORD WINAPI SendARP(IPAddr DestIP, IPAddr SrcIP, PULONG pMacAddr, PULONG PhyAdd pCurrInterface = pCurrInterface->Next; } } - heap_free(pInterfaces); + HeapFree(GetProcessHeap(), 0, pInterfaces); } while ( i == ERROR_BUFFER_OVERFLOW && i-- > 0 ); @@ -4126,7 +4126,7 @@ DWORD WINAPI SendARP(IPAddr DestIP, IPAddr SrcIP, PULONG pMacAddr, PULONG PhyAdd size = 16000; while( time_out-- > 0 ) { - table = heap_alloc_zero(size); + table = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); if( table == NULL ) { ERR("Memory allocation failed for IpNetTable struct"); @@ -4140,13 +4140,13 @@ DWORD WINAPI SendARP(IPAddr DestIP, IPAddr SrcIP, PULONG pMacAddr, PULONG PhyAdd if( table->table[i].dwAddr == DestIP ) { memcpy(pMacAddr, table->table[i].bPhysAddr, 6); - heap_free(table); + HeapFree(GetProcessHeap(), 0, table); return NO_ERROR; } } } Sleep(1); - heap_free(table); + HeapFree(GetProcessHeap(), 0, table); } return ERROR_NOT_FOUND; diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 151f05de664..a1a74a633bb 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -3600,7 +3600,6 @@ static void test_compartments(void) ok(id == NET_IF_COMPARTMENT_ID_PRIMARY, "got %u\n", id); } -<<<<<<< HEAD static void test_GetIpInterface(void) { MIB_IPINTERFACE_ROW entry_row; -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/6884