From 99c6eb0dd02e7612ecc7cac502a449aa6dac0cb0 Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Wed, 25 Apr 2012 17:16:24 +0200 Subject: [PATCH] iphlpapi/tests: Get rid of function typedefs and use more standard names for function pointers. --- dlls/iphlpapi/tests/iphlpapi.c | 312 +++++++++++++-------------------- 1 file changed, 123 insertions(+), 189 deletions(-) diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index e9e4021205c..7ab5cff5e9d 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -46,127 +46,61 @@ static HMODULE hLibrary = NULL; -typedef DWORD (WINAPI *GetNumberOfInterfacesFunc)(PDWORD); -typedef DWORD (WINAPI *GetIpAddrTableFunc)(PMIB_IPADDRTABLE,PULONG,BOOL); -typedef DWORD (WINAPI *GetIfEntryFunc)(PMIB_IFROW); -typedef DWORD (WINAPI *GetFriendlyIfIndexFunc)(DWORD); -typedef DWORD (WINAPI *GetIfTableFunc)(PMIB_IFTABLE,PULONG,BOOL); -typedef DWORD (WINAPI *GetIpForwardTableFunc)(PMIB_IPFORWARDTABLE,PULONG,BOOL); -typedef DWORD (WINAPI *GetIpNetTableFunc)(PMIB_IPNETTABLE,PULONG,BOOL); -typedef DWORD (WINAPI *GetInterfaceInfoFunc)(PIP_INTERFACE_INFO,PULONG); -typedef DWORD (WINAPI *GetAdaptersInfoFunc)(PIP_ADAPTER_INFO,PULONG); -typedef DWORD (WINAPI *GetNetworkParamsFunc)(PFIXED_INFO,PULONG); -typedef DWORD (WINAPI *GetIcmpStatisticsFunc)(PMIB_ICMP); -typedef DWORD (WINAPI *GetIpStatisticsFunc)(PMIB_IPSTATS); -typedef DWORD (WINAPI *GetTcpStatisticsFunc)(PMIB_TCPSTATS); -typedef DWORD (WINAPI *GetUdpStatisticsFunc)(PMIB_UDPSTATS); -typedef DWORD (WINAPI *GetTcpTableFunc)(PMIB_TCPTABLE,PDWORD,BOOL); -typedef DWORD (WINAPI *GetUdpTableFunc)(PMIB_UDPTABLE,PDWORD,BOOL); -typedef DWORD (WINAPI *GetPerAdapterInfoFunc)(ULONG,PIP_PER_ADAPTER_INFO,PULONG); -typedef DWORD (WINAPI *GetAdaptersAddressesFunc)(ULONG,ULONG,PVOID,PIP_ADAPTER_ADDRESSES,PULONG); -typedef DWORD (WINAPI *NotifyAddrChangeFunc)(PHANDLE,LPOVERLAPPED); -typedef BOOL (WINAPI *CancelIPChangeNotifyFunc)(LPOVERLAPPED); -typedef DWORD (WINAPI *GetExtendedTcpTableFunc)(PVOID,PDWORD,BOOL,ULONG,TCP_TABLE_CLASS,ULONG); -typedef DWORD (WINAPI *SetTcpEntryFunc)(PMIB_TCPROW); - -static GetNumberOfInterfacesFunc gGetNumberOfInterfaces = NULL; -static GetIpAddrTableFunc gGetIpAddrTable = NULL; -static GetIfEntryFunc gGetIfEntry = NULL; -static GetFriendlyIfIndexFunc gGetFriendlyIfIndex = NULL; -static GetIfTableFunc gGetIfTable = NULL; -static GetIpForwardTableFunc gGetIpForwardTable = NULL; -static GetIpNetTableFunc gGetIpNetTable = NULL; -static GetInterfaceInfoFunc gGetInterfaceInfo = NULL; -static GetAdaptersInfoFunc gGetAdaptersInfo = NULL; -static GetNetworkParamsFunc gGetNetworkParams = NULL; -static GetIcmpStatisticsFunc gGetIcmpStatistics = NULL; -static GetIpStatisticsFunc gGetIpStatistics = NULL; -static GetTcpStatisticsFunc gGetTcpStatistics = NULL; -static GetUdpStatisticsFunc gGetUdpStatistics = NULL; -static GetTcpTableFunc gGetTcpTable = NULL; -static GetUdpTableFunc gGetUdpTable = NULL; -static GetPerAdapterInfoFunc gGetPerAdapterInfo = NULL; -static GetAdaptersAddressesFunc gGetAdaptersAddresses = NULL; -static NotifyAddrChangeFunc gNotifyAddrChange = NULL; -static CancelIPChangeNotifyFunc gCancelIPChangeNotify = NULL; -static GetExtendedTcpTableFunc gGetExtendedTcpTable = NULL; -static SetTcpEntryFunc gSetTcpEntry = NULL; +static DWORD (WINAPI *pGetNumberOfInterfaces)(PDWORD); +static DWORD (WINAPI *pGetIpAddrTable)(PMIB_IPADDRTABLE,PULONG,BOOL); +static DWORD (WINAPI *pGetIfEntry)(PMIB_IFROW); +static DWORD (WINAPI *pGetFriendlyIfIndex)(DWORD); +static DWORD (WINAPI *pGetIfTable)(PMIB_IFTABLE,PULONG,BOOL); +static DWORD (WINAPI *pGetIpForwardTable)(PMIB_IPFORWARDTABLE,PULONG,BOOL); +static DWORD (WINAPI *pGetIpNetTable)(PMIB_IPNETTABLE,PULONG,BOOL); +static DWORD (WINAPI *pGetInterfaceInfo)(PIP_INTERFACE_INFO,PULONG); +static DWORD (WINAPI *pGetAdaptersInfo)(PIP_ADAPTER_INFO,PULONG); +static DWORD (WINAPI *pGetNetworkParams)(PFIXED_INFO,PULONG); +static DWORD (WINAPI *pGetIcmpStatistics)(PMIB_ICMP); +static DWORD (WINAPI *pGetIpStatistics)(PMIB_IPSTATS); +static DWORD (WINAPI *pGetTcpStatistics)(PMIB_TCPSTATS); +static DWORD (WINAPI *pGetUdpStatistics)(PMIB_UDPSTATS); +static DWORD (WINAPI *pGetTcpTable)(PMIB_TCPTABLE,PDWORD,BOOL); +static DWORD (WINAPI *pGetUdpTable)(PMIB_UDPTABLE,PDWORD,BOOL); +static DWORD (WINAPI *pGetPerAdapterInfo)(ULONG,PIP_PER_ADAPTER_INFO,PULONG); +static DWORD (WINAPI *pGetAdaptersAddresses)(ULONG,ULONG,PVOID,PIP_ADAPTER_ADDRESSES,PULONG); +static DWORD (WINAPI *pNotifyAddrChange)(PHANDLE,LPOVERLAPPED); +static BOOL (WINAPI *pCancelIPChangeNotify)(LPOVERLAPPED); +static DWORD (WINAPI *pGetExtendedTcpTable)(PVOID,PDWORD,BOOL,ULONG,TCP_TABLE_CLASS,ULONG); +static DWORD (WINAPI *pSetTcpEntry)(PMIB_TCPROW); static void loadIPHlpApi(void) { hLibrary = LoadLibraryA("iphlpapi.dll"); if (hLibrary) { - gGetNumberOfInterfaces = (GetNumberOfInterfacesFunc)GetProcAddress( - hLibrary, "GetNumberOfInterfaces"); - gGetIpAddrTable = (GetIpAddrTableFunc)GetProcAddress( - hLibrary, "GetIpAddrTable"); - gGetIfEntry = (GetIfEntryFunc)GetProcAddress( - hLibrary, "GetIfEntry"); - gGetFriendlyIfIndex = (GetFriendlyIfIndexFunc)GetProcAddress( - hLibrary, "GetFriendlyIfIndex"); - gGetIfTable = (GetIfTableFunc)GetProcAddress( - hLibrary, "GetIfTable"); - gGetIpForwardTable = (GetIpForwardTableFunc)GetProcAddress( - hLibrary, "GetIpForwardTable"); - gGetIpNetTable = (GetIpNetTableFunc)GetProcAddress( - hLibrary, "GetIpNetTable"); - gGetInterfaceInfo = (GetInterfaceInfoFunc)GetProcAddress( - hLibrary, "GetInterfaceInfo"); - gGetAdaptersInfo = (GetAdaptersInfoFunc)GetProcAddress( - hLibrary, "GetAdaptersInfo"); - gGetNetworkParams = (GetNetworkParamsFunc)GetProcAddress( - hLibrary, "GetNetworkParams"); - gGetIcmpStatistics = (GetIcmpStatisticsFunc)GetProcAddress( - hLibrary, "GetIcmpStatistics"); - gGetIpStatistics = (GetIpStatisticsFunc)GetProcAddress( - hLibrary, "GetIpStatistics"); - gGetTcpStatistics = (GetTcpStatisticsFunc)GetProcAddress( - hLibrary, "GetTcpStatistics"); - gGetUdpStatistics = (GetUdpStatisticsFunc)GetProcAddress( - hLibrary, "GetUdpStatistics"); - gGetTcpTable = (GetTcpTableFunc)GetProcAddress( - hLibrary, "GetTcpTable"); - gGetUdpTable = (GetUdpTableFunc)GetProcAddress( - hLibrary, "GetUdpTable"); - gGetPerAdapterInfo = (GetPerAdapterInfoFunc)GetProcAddress(hLibrary, "GetPerAdapterInfo"); - gGetAdaptersAddresses = (GetAdaptersAddressesFunc)GetProcAddress(hLibrary, "GetAdaptersAddresses"); - gNotifyAddrChange = (NotifyAddrChangeFunc)GetProcAddress( - hLibrary, "NotifyAddrChange"); - gCancelIPChangeNotify = (CancelIPChangeNotifyFunc)GetProcAddress( - hLibrary, "CancelIPChangeNotify"); - gGetExtendedTcpTable = (GetExtendedTcpTableFunc)GetProcAddress( - hLibrary, "GetExtendedTcpTable"); - gSetTcpEntry = (SetTcpEntryFunc)GetProcAddress( - hLibrary, "SetTcpEntry"); + pGetNumberOfInterfaces = (void *)GetProcAddress(hLibrary, "GetNumberOfInterfaces"); + pGetIpAddrTable = (void *)GetProcAddress(hLibrary, "GetIpAddrTable"); + pGetIfEntry = (void *)GetProcAddress(hLibrary, "GetIfEntry"); + pGetFriendlyIfIndex = (void *)GetProcAddress(hLibrary, "GetFriendlyIfIndex"); + pGetIfTable = (void *)GetProcAddress(hLibrary, "GetIfTable"); + pGetIpForwardTable = (void *)GetProcAddress(hLibrary, "GetIpForwardTable"); + pGetIpNetTable = (void *)GetProcAddress(hLibrary, "GetIpNetTable"); + pGetInterfaceInfo = (void *)GetProcAddress(hLibrary, "GetInterfaceInfo"); + pGetAdaptersInfo = (void *)GetProcAddress(hLibrary, "GetAdaptersInfo"); + pGetNetworkParams = (void *)GetProcAddress(hLibrary, "GetNetworkParams"); + pGetIcmpStatistics = (void *)GetProcAddress(hLibrary, "GetIcmpStatistics"); + pGetIpStatistics = (void *)GetProcAddress(hLibrary, "GetIpStatistics"); + pGetTcpStatistics = (void *)GetProcAddress(hLibrary, "GetTcpStatistics"); + pGetUdpStatistics = (void *)GetProcAddress(hLibrary, "GetUdpStatistics"); + pGetTcpTable = (void *)GetProcAddress(hLibrary, "GetTcpTable"); + pGetUdpTable = (void *)GetProcAddress(hLibrary, "GetUdpTable"); + pGetPerAdapterInfo = (void *)GetProcAddress(hLibrary, "GetPerAdapterInfo"); + pGetAdaptersAddresses = (void *)GetProcAddress(hLibrary, "GetAdaptersAddresses"); + pNotifyAddrChange = (void *)GetProcAddress(hLibrary, "NotifyAddrChange"); + pCancelIPChangeNotify = (void *)GetProcAddress(hLibrary, "CancelIPChangeNotify"); + pGetExtendedTcpTable = (void *)GetProcAddress(hLibrary, "GetExtendedTcpTable"); + pSetTcpEntry = (void *)GetProcAddress(hLibrary, "SetTcpEntry"); } } static void freeIPHlpApi(void) { - if (hLibrary) { - gGetNumberOfInterfaces = NULL; - gGetIpAddrTable = NULL; - gGetIfEntry = NULL; - gGetFriendlyIfIndex = NULL; - gGetIfTable = NULL; - gGetIpForwardTable = NULL; - gGetIpNetTable = NULL; - gGetInterfaceInfo = NULL; - gGetAdaptersInfo = NULL; - gGetNetworkParams = NULL; - gGetIcmpStatistics = NULL; - gGetIpStatistics = NULL; - gGetTcpStatistics = NULL; - gGetUdpStatistics = NULL; - gGetTcpTable = NULL; - gGetUdpTable = NULL; - gNotifyAddrChange = NULL; - gCancelIPChangeNotify = NULL; - gGetExtendedTcpTable = NULL; - gSetTcpEntry = NULL; FreeLibrary(hLibrary); - hLibrary = NULL; - } } /* replacement for inet_ntoa */ @@ -189,12 +123,12 @@ static void testWin98OnlyFunctions(void) static void testGetNumberOfInterfaces(void) { - if (gGetNumberOfInterfaces) { + if (pGetNumberOfInterfaces) { DWORD apiReturn, numInterfaces; /* Crashes on Vista */ if (0) { - apiReturn = gGetNumberOfInterfaces(NULL); + apiReturn = pGetNumberOfInterfaces(NULL); if (apiReturn == ERROR_NOT_SUPPORTED) return; ok(apiReturn == ERROR_INVALID_PARAMETER, @@ -202,7 +136,7 @@ static void testGetNumberOfInterfaces(void) apiReturn); } - apiReturn = gGetNumberOfInterfaces(&numInterfaces); + apiReturn = pGetNumberOfInterfaces(&numInterfaces); if (apiReturn == ERROR_NOT_SUPPORTED) { skip("GetNumberOfInterfaces is not supported\n"); return; @@ -214,12 +148,12 @@ static void testGetNumberOfInterfaces(void) static void testGetIfEntry(DWORD index) { - if (gGetIfEntry) { + if (pGetIfEntry) { DWORD apiReturn; MIB_IFROW row; memset(&row, 0, sizeof(row)); - apiReturn = gGetIfEntry(NULL); + apiReturn = pGetIfEntry(NULL); if (apiReturn == ERROR_NOT_SUPPORTED) { skip("GetIfEntry is not supported\n"); return; @@ -228,13 +162,13 @@ static void testGetIfEntry(DWORD index) "GetIfEntry(NULL) returned %d, expected ERROR_INVALID_PARAMETER\n", apiReturn); row.dwIndex = -1; /* hope that's always bogus! */ - apiReturn = gGetIfEntry(&row); + apiReturn = pGetIfEntry(&row); ok(apiReturn == ERROR_INVALID_DATA || apiReturn == ERROR_FILE_NOT_FOUND /* Vista */, "GetIfEntry(bogus row) returned %d, expected ERROR_INVALID_DATA or ERROR_FILE_NOT_FOUND\n", apiReturn); row.dwIndex = index; - apiReturn = gGetIfEntry(&row); + apiReturn = pGetIfEntry(&row); ok(apiReturn == NO_ERROR, "GetIfEntry returned %d, expected NO_ERROR\n", apiReturn); } @@ -242,11 +176,11 @@ static void testGetIfEntry(DWORD index) static void testGetIpAddrTable(void) { - if (gGetIpAddrTable) { + if (pGetIpAddrTable) { DWORD apiReturn; ULONG dwSize = 0; - apiReturn = gGetIpAddrTable(NULL, NULL, FALSE); + apiReturn = pGetIpAddrTable(NULL, NULL, FALSE); if (apiReturn == ERROR_NOT_SUPPORTED) { skip("GetIpAddrTable is not supported\n"); return; @@ -254,14 +188,14 @@ static void testGetIpAddrTable(void) ok(apiReturn == ERROR_INVALID_PARAMETER, "GetIpAddrTable(NULL, NULL, FALSE) returned %d, expected ERROR_INVALID_PARAMETER\n", apiReturn); - apiReturn = gGetIpAddrTable(NULL, &dwSize, FALSE); + apiReturn = pGetIpAddrTable(NULL, &dwSize, FALSE); ok(apiReturn == ERROR_INSUFFICIENT_BUFFER, "GetIpAddrTable(NULL, &dwSize, FALSE) returned %d, expected ERROR_INSUFFICIENT_BUFFER\n", apiReturn); if (apiReturn == ERROR_INSUFFICIENT_BUFFER) { PMIB_IPADDRTABLE buf = HeapAlloc(GetProcessHeap(), 0, dwSize); - apiReturn = gGetIpAddrTable(buf, &dwSize, FALSE); + apiReturn = pGetIpAddrTable(buf, &dwSize, FALSE); ok(apiReturn == NO_ERROR, "GetIpAddrTable(buf, &dwSize, FALSE) returned %d, expected NO_ERROR\n", apiReturn); @@ -274,11 +208,11 @@ static void testGetIpAddrTable(void) static void testGetIfTable(void) { - if (gGetIfTable) { + if (pGetIfTable) { DWORD apiReturn; ULONG dwSize = 0; - apiReturn = gGetIfTable(NULL, NULL, FALSE); + apiReturn = pGetIfTable(NULL, NULL, FALSE); if (apiReturn == ERROR_NOT_SUPPORTED) { skip("GetIfTable is not supported\n"); return; @@ -286,14 +220,14 @@ static void testGetIfTable(void) ok(apiReturn == ERROR_INVALID_PARAMETER, "GetIfTable(NULL, NULL, FALSE) returned %d, expected ERROR_INVALID_PARAMETER\n", apiReturn); - apiReturn = gGetIfTable(NULL, &dwSize, FALSE); + apiReturn = pGetIfTable(NULL, &dwSize, FALSE); ok(apiReturn == ERROR_INSUFFICIENT_BUFFER, "GetIfTable(NULL, &dwSize, FALSE) returned %d, expected ERROR_INSUFFICIENT_BUFFER\n", apiReturn); if (apiReturn == ERROR_INSUFFICIENT_BUFFER) { PMIB_IFTABLE buf = HeapAlloc(GetProcessHeap(), 0, dwSize); - apiReturn = gGetIfTable(buf, &dwSize, FALSE); + apiReturn = pGetIfTable(buf, &dwSize, FALSE); ok(apiReturn == NO_ERROR, "GetIfTable(buf, &dwSize, FALSE) returned %d, expected NO_ERROR\n\n", apiReturn); @@ -328,11 +262,11 @@ static void testGetIfTable(void) static void testGetIpForwardTable(void) { - if (gGetIpForwardTable) { + if (pGetIpForwardTable) { DWORD apiReturn; ULONG dwSize = 0; - apiReturn = gGetIpForwardTable(NULL, NULL, FALSE); + apiReturn = pGetIpForwardTable(NULL, NULL, FALSE); if (apiReturn == ERROR_NOT_SUPPORTED) { skip("GetIpForwardTable is not supported\n"); return; @@ -340,14 +274,14 @@ static void testGetIpForwardTable(void) ok(apiReturn == ERROR_INVALID_PARAMETER, "GetIpForwardTable(NULL, NULL, FALSE) returned %d, expected ERROR_INVALID_PARAMETER\n", apiReturn); - apiReturn = gGetIpForwardTable(NULL, &dwSize, FALSE); + apiReturn = pGetIpForwardTable(NULL, &dwSize, FALSE); ok(apiReturn == ERROR_INSUFFICIENT_BUFFER, "GetIpForwardTable(NULL, &dwSize, FALSE) returned %d, expected ERROR_INSUFFICIENT_BUFFER\n", apiReturn); if (apiReturn == ERROR_INSUFFICIENT_BUFFER) { PMIB_IPFORWARDTABLE buf = HeapAlloc(GetProcessHeap(), 0, dwSize); - apiReturn = gGetIpForwardTable(buf, &dwSize, FALSE); + apiReturn = pGetIpForwardTable(buf, &dwSize, FALSE); ok(apiReturn == NO_ERROR, "GetIpForwardTable(buf, &dwSize, FALSE) returned %d, expected NO_ERROR\n", apiReturn); @@ -374,11 +308,11 @@ static void testGetIpForwardTable(void) static void testGetIpNetTable(void) { - if (gGetIpNetTable) { + if (pGetIpNetTable) { DWORD apiReturn; ULONG dwSize = 0; - apiReturn = gGetIpNetTable(NULL, NULL, FALSE); + apiReturn = pGetIpNetTable(NULL, NULL, FALSE); if (apiReturn == ERROR_NOT_SUPPORTED) { skip("GetIpNetTable is not supported\n"); return; @@ -386,7 +320,7 @@ static void testGetIpNetTable(void) ok(apiReturn == ERROR_INVALID_PARAMETER, "GetIpNetTable(NULL, NULL, FALSE) returned %d, expected ERROR_INVALID_PARAMETER\n", apiReturn); - apiReturn = gGetIpNetTable(NULL, &dwSize, FALSE); + apiReturn = pGetIpNetTable(NULL, &dwSize, FALSE); ok(apiReturn == ERROR_NO_DATA || apiReturn == ERROR_INSUFFICIENT_BUFFER, "GetIpNetTable(NULL, &dwSize, FALSE) returned %d, expected ERROR_NO_DATA or ERROR_INSUFFICIENT_BUFFER\n", apiReturn); @@ -395,7 +329,7 @@ static void testGetIpNetTable(void) else if (apiReturn == ERROR_INSUFFICIENT_BUFFER) { PMIB_IPNETTABLE buf = HeapAlloc(GetProcessHeap(), 0, dwSize); - apiReturn = gGetIpNetTable(buf, &dwSize, FALSE); + apiReturn = pGetIpNetTable(buf, &dwSize, FALSE); ok(apiReturn == NO_ERROR || apiReturn == ERROR_NO_DATA, /* empty ARP table's okay */ "GetIpNetTable(buf, &dwSize, FALSE) returned %d, expected NO_ERROR\n", @@ -422,13 +356,13 @@ static void testGetIpNetTable(void) static void testGetIcmpStatistics(void) { - if (gGetIcmpStatistics) { + if (pGetIcmpStatistics) { DWORD apiReturn; MIB_ICMP stats; /* Crashes on Vista */ if (0) { - apiReturn = gGetIcmpStatistics(NULL); + apiReturn = pGetIcmpStatistics(NULL); if (apiReturn == ERROR_NOT_SUPPORTED) return; ok(apiReturn == ERROR_INVALID_PARAMETER, @@ -436,7 +370,7 @@ static void testGetIcmpStatistics(void) apiReturn); } - apiReturn = gGetIcmpStatistics(&stats); + apiReturn = pGetIcmpStatistics(&stats); if (apiReturn == ERROR_NOT_SUPPORTED) { skip("GetIcmpStatistics is not supported\n"); @@ -466,11 +400,11 @@ static void testGetIcmpStatistics(void) static void testGetIpStatistics(void) { - if (gGetIpStatistics) { + if (pGetIpStatistics) { DWORD apiReturn; MIB_IPSTATS stats; - apiReturn = gGetIpStatistics(NULL); + apiReturn = pGetIpStatistics(NULL); if (apiReturn == ERROR_NOT_SUPPORTED) { skip("GetIpStatistics is not supported\n"); return; @@ -478,7 +412,7 @@ static void testGetIpStatistics(void) ok(apiReturn == ERROR_INVALID_PARAMETER, "GetIpStatistics(NULL) returned %d, expected ERROR_INVALID_PARAMETER\n", apiReturn); - apiReturn = gGetIpStatistics(&stats); + apiReturn = pGetIpStatistics(&stats); ok(apiReturn == NO_ERROR, "GetIpStatistics returned %d, expected NO_ERROR\n", apiReturn); if (apiReturn == NO_ERROR && winetest_debug > 1) @@ -513,11 +447,11 @@ static void testGetIpStatistics(void) static void testGetTcpStatistics(void) { - if (gGetTcpStatistics) { + if (pGetTcpStatistics) { DWORD apiReturn; MIB_TCPSTATS stats; - apiReturn = gGetTcpStatistics(NULL); + apiReturn = pGetTcpStatistics(NULL); if (apiReturn == ERROR_NOT_SUPPORTED) { skip("GetTcpStatistics is not supported\n"); return; @@ -525,7 +459,7 @@ static void testGetTcpStatistics(void) ok(apiReturn == ERROR_INVALID_PARAMETER, "GetTcpStatistics(NULL) returned %d, expected ERROR_INVALID_PARAMETER\n", apiReturn); - apiReturn = gGetTcpStatistics(&stats); + apiReturn = pGetTcpStatistics(&stats); ok(apiReturn == NO_ERROR, "GetTcpStatistics returned %d, expected NO_ERROR\n", apiReturn); if (apiReturn == NO_ERROR && winetest_debug > 1) @@ -552,11 +486,11 @@ static void testGetTcpStatistics(void) static void testGetUdpStatistics(void) { - if (gGetUdpStatistics) { + if (pGetUdpStatistics) { DWORD apiReturn; MIB_UDPSTATS stats; - apiReturn = gGetUdpStatistics(NULL); + apiReturn = pGetUdpStatistics(NULL); if (apiReturn == ERROR_NOT_SUPPORTED) { skip("GetUdpStatistics is not supported\n"); return; @@ -564,7 +498,7 @@ static void testGetUdpStatistics(void) ok(apiReturn == ERROR_INVALID_PARAMETER, "GetUdpStatistics(NULL) returned %d, expected ERROR_INVALID_PARAMETER\n", apiReturn); - apiReturn = gGetUdpStatistics(&stats); + apiReturn = pGetUdpStatistics(&stats); ok(apiReturn == NO_ERROR, "GetUdpStatistics returned %d, expected NO_ERROR\n", apiReturn); if (apiReturn == NO_ERROR && winetest_debug > 1) @@ -581,11 +515,11 @@ static void testGetUdpStatistics(void) static void testGetTcpTable(void) { - if (gGetTcpTable) { + if (pGetTcpTable) { DWORD apiReturn; ULONG dwSize = 0; - apiReturn = gGetTcpTable(NULL, &dwSize, FALSE); + apiReturn = pGetTcpTable(NULL, &dwSize, FALSE); if (apiReturn == ERROR_NOT_SUPPORTED) { skip("GetTcpTable is not supported\n"); return; @@ -597,7 +531,7 @@ static void testGetTcpTable(void) if (apiReturn == ERROR_INSUFFICIENT_BUFFER) { PMIB_TCPTABLE buf = HeapAlloc(GetProcessHeap(), 0, dwSize); - apiReturn = gGetTcpTable(buf, &dwSize, FALSE); + apiReturn = pGetTcpTable(buf, &dwSize, FALSE); ok(apiReturn == NO_ERROR, "GetTcpTable(buf, &dwSize, FALSE) returned %d, expected NO_ERROR\n", apiReturn); @@ -623,11 +557,11 @@ static void testGetTcpTable(void) static void testGetUdpTable(void) { - if (gGetUdpTable) { + if (pGetUdpTable) { DWORD apiReturn; ULONG dwSize = 0; - apiReturn = gGetUdpTable(NULL, &dwSize, FALSE); + apiReturn = pGetUdpTable(NULL, &dwSize, FALSE); if (apiReturn == ERROR_NOT_SUPPORTED) { skip("GetUdpTable is not supported\n"); return; @@ -638,7 +572,7 @@ static void testGetUdpTable(void) if (apiReturn == ERROR_INSUFFICIENT_BUFFER) { PMIB_UDPTABLE buf = HeapAlloc(GetProcessHeap(), 0, dwSize); - apiReturn = gGetUdpTable(buf, &dwSize, FALSE); + apiReturn = pGetUdpTable(buf, &dwSize, FALSE); ok(apiReturn == NO_ERROR, "GetUdpTable(buf, &dwSize, FALSE) returned %d, expected NO_ERROR\n", apiReturn); @@ -664,15 +598,15 @@ static void testSetTcpEntry(void) memset(&row, 0, sizeof(row)); if(0) /* This test crashes in OS >= VISTA */ { - ret = gSetTcpEntry(NULL); + ret = pSetTcpEntry(NULL); ok( ret == ERROR_INVALID_PARAMETER, "got %u, expected %u\n", ret, ERROR_INVALID_PARAMETER); } - ret = gSetTcpEntry(&row); + ret = pSetTcpEntry(&row); todo_wine ok( ret == ERROR_INVALID_PARAMETER, "got %u, expected %u\n", ret, ERROR_INVALID_PARAMETER); row.dwState = MIB_TCP_STATE_DELETE_TCB; - ret = gSetTcpEntry(&row); + ret = pSetTcpEntry(&row); todo_wine ok( ret == ERROR_MR_MID_NOT_FOUND || broken(ret == ERROR_INVALID_PARAMETER), "got %u, expected %u\n", ret, ERROR_MR_MID_NOT_FOUND); } @@ -709,11 +643,11 @@ static void testWinNT4Functions(void) static void testGetInterfaceInfo(void) { - if (gGetInterfaceInfo) { + if (pGetInterfaceInfo) { DWORD apiReturn; ULONG len = 0; - apiReturn = gGetInterfaceInfo(NULL, NULL); + apiReturn = pGetInterfaceInfo(NULL, NULL); if (apiReturn == ERROR_NOT_SUPPORTED) { skip("GetInterfaceInfo is not supported\n"); return; @@ -721,14 +655,14 @@ static void testGetInterfaceInfo(void) ok(apiReturn == ERROR_INVALID_PARAMETER, "GetInterfaceInfo returned %d, expected ERROR_INVALID_PARAMETER\n", apiReturn); - apiReturn = gGetInterfaceInfo(NULL, &len); + apiReturn = pGetInterfaceInfo(NULL, &len); ok(apiReturn == ERROR_INSUFFICIENT_BUFFER, "GetInterfaceInfo returned %d, expected ERROR_INSUFFICIENT_BUFFER\n", apiReturn); if (apiReturn == ERROR_INSUFFICIENT_BUFFER) { PIP_INTERFACE_INFO buf = HeapAlloc(GetProcessHeap(), 0, len); - apiReturn = gGetInterfaceInfo(buf, &len); + apiReturn = pGetInterfaceInfo(buf, &len); ok(apiReturn == NO_ERROR, "GetInterfaceInfo(buf, &dwSize) returned %d, expected NO_ERROR\n", apiReturn); @@ -739,11 +673,11 @@ static void testGetInterfaceInfo(void) static void testGetAdaptersInfo(void) { - if (gGetAdaptersInfo) { + if (pGetAdaptersInfo) { DWORD apiReturn; ULONG len = 0; - apiReturn = gGetAdaptersInfo(NULL, NULL); + apiReturn = pGetAdaptersInfo(NULL, NULL); if (apiReturn == ERROR_NOT_SUPPORTED) { skip("GetAdaptersInfo is not supported\n"); return; @@ -751,7 +685,7 @@ static void testGetAdaptersInfo(void) ok(apiReturn == ERROR_INVALID_PARAMETER, "GetAdaptersInfo returned %d, expected ERROR_INVALID_PARAMETER\n", apiReturn); - apiReturn = gGetAdaptersInfo(NULL, &len); + apiReturn = pGetAdaptersInfo(NULL, &len); ok(apiReturn == ERROR_NO_DATA || apiReturn == ERROR_BUFFER_OVERFLOW, "GetAdaptersInfo returned %d, expected ERROR_NO_DATA or ERROR_BUFFER_OVERFLOW\n", apiReturn); @@ -760,7 +694,7 @@ static void testGetAdaptersInfo(void) else if (apiReturn == ERROR_BUFFER_OVERFLOW) { PIP_ADAPTER_INFO buf = HeapAlloc(GetProcessHeap(), 0, len); - apiReturn = gGetAdaptersInfo(buf, &len); + apiReturn = pGetAdaptersInfo(buf, &len); ok(apiReturn == NO_ERROR, "GetAdaptersInfo(buf, &dwSize) returned %d, expected NO_ERROR\n", apiReturn); @@ -771,11 +705,11 @@ static void testGetAdaptersInfo(void) static void testGetNetworkParams(void) { - if (gGetNetworkParams) { + if (pGetNetworkParams) { DWORD apiReturn; ULONG len = 0; - apiReturn = gGetNetworkParams(NULL, NULL); + apiReturn = pGetNetworkParams(NULL, NULL); if (apiReturn == ERROR_NOT_SUPPORTED) { skip("GetNetworkParams is not supported\n"); return; @@ -783,14 +717,14 @@ static void testGetNetworkParams(void) ok(apiReturn == ERROR_INVALID_PARAMETER, "GetNetworkParams returned %d, expected ERROR_INVALID_PARAMETER\n", apiReturn); - apiReturn = gGetNetworkParams(NULL, &len); + apiReturn = pGetNetworkParams(NULL, &len); ok(apiReturn == ERROR_BUFFER_OVERFLOW, "GetNetworkParams returned %d, expected ERROR_BUFFER_OVERFLOW\n", apiReturn); if (apiReturn == ERROR_BUFFER_OVERFLOW) { PFIXED_INFO buf = HeapAlloc(GetProcessHeap(), 0, len); - apiReturn = gGetNetworkParams(buf, &len); + apiReturn = pGetNetworkParams(buf, &len); ok(apiReturn == NO_ERROR, "GetNetworkParams(buf, &dwSize) returned %d, expected NO_ERROR\n", apiReturn); @@ -819,20 +753,20 @@ static void testGetPerAdapterInfo(void) DWORD ret, needed; void *buffer; - if (!gGetPerAdapterInfo) return; - ret = gGetPerAdapterInfo(1, NULL, NULL); + if (!pGetPerAdapterInfo) return; + ret = pGetPerAdapterInfo(1, NULL, NULL); if (ret == ERROR_NOT_SUPPORTED) { skip("GetPerAdapterInfo is not supported\n"); return; } ok( ret == ERROR_INVALID_PARAMETER, "got %u instead of ERROR_INVALID_PARAMETER\n", ret ); needed = 0xdeadbeef; - ret = gGetPerAdapterInfo(1, NULL, &needed); + ret = pGetPerAdapterInfo(1, NULL, &needed); if (ret == ERROR_NO_DATA) return; /* no such adapter */ ok( ret == ERROR_BUFFER_OVERFLOW, "got %u instead of ERROR_BUFFER_OVERFLOW\n", ret ); ok( needed != 0xdeadbeef, "needed not set\n" ); buffer = HeapAlloc( GetProcessHeap(), 0, needed ); - ret = gGetPerAdapterInfo(1, buffer, &needed); + ret = pGetPerAdapterInfo(1, buffer, &needed); ok( ret == NO_ERROR, "got %u instead of NO_ERROR\n", ret ); HeapFree( GetProcessHeap(), 0, buffer ); } @@ -844,12 +778,12 @@ static void testNotifyAddrChange(void) HANDLE handle; BOOL success; - if (!gNotifyAddrChange) + if (!pNotifyAddrChange) { win_skip("NotifyAddrChange not present\n"); return; } - if (!gCancelIPChangeNotify) + if (!pCancelIPChangeNotify) { win_skip("CancelIPChangeNotify not present\n"); return; @@ -857,7 +791,7 @@ static void testNotifyAddrChange(void) handle = NULL; ZeroMemory(&overlapped, sizeof(overlapped)); - ret = gNotifyAddrChange(&handle, &overlapped); + ret = pNotifyAddrChange(&handle, &overlapped); if (ret == ERROR_NOT_SUPPORTED) { win_skip("NotifyAddrChange is not supported\n"); @@ -866,24 +800,24 @@ static void testNotifyAddrChange(void) ok(ret == ERROR_IO_PENDING, "NotifyAddrChange returned %d, expected ERROR_IO_PENDING\n", ret); ret = GetLastError(); todo_wine ok(ret == ERROR_IO_PENDING, "GetLastError returned %d, expected ERROR_IO_PENDING\n", ret); - success = gCancelIPChangeNotify(&overlapped); + success = pCancelIPChangeNotify(&overlapped); todo_wine ok(success == TRUE, "CancelIPChangeNotify returned FALSE, expected TRUE\n"); ZeroMemory(&overlapped, sizeof(overlapped)); - success = gCancelIPChangeNotify(&overlapped); + success = pCancelIPChangeNotify(&overlapped); ok(success == FALSE, "CancelIPChangeNotify returned TRUE, expected FALSE\n"); handle = NULL; ZeroMemory(&overlapped, sizeof(overlapped)); overlapped.hEvent = CreateEvent(NULL, FALSE, FALSE, NULL); - ret = gNotifyAddrChange(&handle, &overlapped); + ret = pNotifyAddrChange(&handle, &overlapped); ok(ret == ERROR_IO_PENDING, "NotifyAddrChange returned %d, expected ERROR_IO_PENDING\n", ret); todo_wine ok(handle != INVALID_HANDLE_VALUE, "NotifyAddrChange returned invalid file handle\n"); success = GetOverlappedResult(handle, &overlapped, &bytes, FALSE); ok(success == FALSE, "GetOverlappedResult returned TRUE, expected FALSE\n"); ret = GetLastError(); ok(ret == ERROR_IO_INCOMPLETE, "GetLastError returned %d, expected ERROR_IO_INCOMPLETE\n", ret); - success = gCancelIPChangeNotify(&overlapped); + success = pCancelIPChangeNotify(&overlapped); todo_wine ok(success == TRUE, "CancelIPChangeNotify returned FALSE, expected TRUE\n"); if (winetest_interactive) @@ -893,7 +827,7 @@ static void testNotifyAddrChange(void) overlapped.hEvent = CreateEvent(NULL, FALSE, FALSE, NULL); trace("Testing asynchronous ipv4 address change notification. Please " "change the ipv4 address of one of your network interfaces\n"); - ret = gNotifyAddrChange(&handle, &overlapped); + ret = pNotifyAddrChange(&handle, &overlapped); ok(ret == ERROR_IO_PENDING, "NotifyAddrChange returned %d, expected NO_ERROR\n", ret); success = GetOverlappedResult(handle, &overlapped, &bytes, TRUE); ok(success == TRUE, "GetOverlappedResult returned FALSE, expected TRUE\n"); @@ -904,7 +838,7 @@ static void testNotifyAddrChange(void) { trace("Testing synchronous ipv4 address change notification. Please " "change the ipv4 address of one of your network interfaces\n"); - ret = gNotifyAddrChange(NULL, NULL); + ret = pNotifyAddrChange(NULL, NULL); todo_wine ok(ret == NO_ERROR, "NotifyAddrChange returned %d, expected NO_ERROR\n", ret); } } @@ -934,23 +868,23 @@ static void test_GetAdaptersAddresses(void) IP_ADAPTER_ADDRESSES *aa, *ptr; IP_ADAPTER_UNICAST_ADDRESS *ua; - if (!gGetAdaptersAddresses) + if (!pGetAdaptersAddresses) { win_skip("GetAdaptersAddresses not present\n"); return; } - ret = gGetAdaptersAddresses(AF_UNSPEC, 0, NULL, NULL, NULL); + ret = pGetAdaptersAddresses(AF_UNSPEC, 0, NULL, NULL, NULL); ok(ret == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER got %u\n", ret); /* size should be ignored and overwritten if buffer is NULL */ size = 0x7fffffff; - ret = gGetAdaptersAddresses(AF_UNSPEC, 0, NULL, NULL, &size); + ret = pGetAdaptersAddresses(AF_UNSPEC, 0, NULL, NULL, &size); ok(ret == ERROR_BUFFER_OVERFLOW, "expected ERROR_BUFFER_OVERFLOW, got %u\n", ret); if (ret != ERROR_BUFFER_OVERFLOW) return; ptr = HeapAlloc(GetProcessHeap(), 0, size); - ret = gGetAdaptersAddresses(AF_UNSPEC, 0, NULL, ptr, &size); + ret = pGetAdaptersAddresses(AF_UNSPEC, 0, NULL, ptr, &size); ok(!ret, "expected ERROR_SUCCESS got %u\n", ret); for (aa = ptr; !ret && aa; aa = aa->Next) @@ -1007,29 +941,29 @@ static void test_GetExtendedTcpTable(void) MIB_TCPTABLE *table; MIB_TCPTABLE_OWNER_PID *table_pid; - if (!gGetExtendedTcpTable) + if (!pGetExtendedTcpTable) { win_skip("GetExtendedTcpTable not available\n"); return; } - ret = gGetExtendedTcpTable( NULL, NULL, TRUE, AF_INET, TCP_TABLE_BASIC_ALL, 0 ); + ret = pGetExtendedTcpTable( NULL, NULL, TRUE, AF_INET, TCP_TABLE_BASIC_ALL, 0 ); ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); size = 0; - ret = gGetExtendedTcpTable( NULL, &size, TRUE, AF_INET, TCP_TABLE_BASIC_ALL, 0 ); + ret = pGetExtendedTcpTable( NULL, &size, TRUE, AF_INET, TCP_TABLE_BASIC_ALL, 0 ); ok( ret == ERROR_INSUFFICIENT_BUFFER, "got %u\n", ret ); table = HeapAlloc( GetProcessHeap(), 0, size ); - ret = gGetExtendedTcpTable( table, &size, TRUE, AF_INET, TCP_TABLE_BASIC_ALL, 0 ); + ret = pGetExtendedTcpTable( table, &size, TRUE, AF_INET, TCP_TABLE_BASIC_ALL, 0 ); ok( ret == ERROR_SUCCESS, "got %u\n", ret ); HeapFree( GetProcessHeap(), 0, table ); size = 0; - ret = gGetExtendedTcpTable( NULL, &size, TRUE, AF_INET, TCP_TABLE_OWNER_PID_ALL, 0 ); + ret = pGetExtendedTcpTable( NULL, &size, TRUE, AF_INET, TCP_TABLE_OWNER_PID_ALL, 0 ); ok( ret == ERROR_INSUFFICIENT_BUFFER, "got %u\n", ret ); table_pid = HeapAlloc( GetProcessHeap(), 0, size ); - ret = gGetExtendedTcpTable( table_pid, &size, TRUE, AF_INET, TCP_TABLE_OWNER_PID_ALL, 0 ); + ret = pGetExtendedTcpTable( table_pid, &size, TRUE, AF_INET, TCP_TABLE_OWNER_PID_ALL, 0 ); ok( ret == ERROR_SUCCESS, "got %u\n", ret ); HeapFree( GetProcessHeap(), 0, table_pid ); }