1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QNetworkInterface: Remove dynamic finding of Windows Vista functions

Browse Source 
We no longer support Windows XP (or Vista, for that matter). We can
directly link to those functions.

Change-Id: Ie9104b1dca6fc2a626399778e68b04e9f8a9d5af
Reviewed-by: Jesus Fernandez <Jesus.Fernandez@qt.io>
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
This commit is contained in:
Thiago Macieira 2017-07-11 13:32:50 -07:00
parent 64bce9bbff
commit 2589111dc0
1 changed files with 10 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
src/network/kernel/qnetworkinterface_win.cpp
View File

@ -63,33 +63,6 @@
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
typedef NETIO_STATUS (WINAPI *PtrConvertInterfaceIndexToLuid)(NET_IFINDEX, PNET_LUID);
typedef NETIO_STATUS (WINAPI *PtrConvertInterfaceLuidToName)(const NET_LUID *, PWSTR, SIZE_T);
typedef NETIO_STATUS (WINAPI *PtrConvertInterfaceLuidToIndex)(const NET_LUID *, PNET_IFINDEX);
typedef NETIO_STATUS (WINAPI *PtrConvertInterfaceNameToLuid)(const WCHAR *, PNET_LUID);
static PtrConvertInterfaceIndexToLuid ptrConvertInterfaceIndexToLuid = 0;
static PtrConvertInterfaceLuidToName ptrConvertInterfaceLuidToName = 0;
static PtrConvertInterfaceLuidToIndex ptrConvertInterfaceLuidToIndex = 0;
static PtrConvertInterfaceNameToLuid ptrConvertInterfaceNameToLuid = 0;
static void resolveLibs()
{
// try to find the functions we need from Iphlpapi.dll
static bool done = false;
if (!done) {
HINSTANCE iphlpapiHnd = GetModuleHandle(L"iphlpapi");
Q_ASSERT(iphlpapiHnd);
// since Windows Vista
ptrConvertInterfaceIndexToLuid = (PtrConvertInterfaceIndexToLuid)GetProcAddress(iphlpapiHnd, "ConvertInterfaceIndexToLuid");
ptrConvertInterfaceLuidToName = (PtrConvertInterfaceLuidToName)GetProcAddress(iphlpapiHnd, "ConvertInterfaceLuidToNameW");
ptrConvertInterfaceLuidToIndex = (PtrConvertInterfaceLuidToIndex)GetProcAddress(iphlpapiHnd, "ConvertInterfaceLuidToIndex");
ptrConvertInterfaceNameToLuid = (PtrConvertInterfaceNameToLuid)GetProcAddress(iphlpapiHnd, "ConvertInterfaceNameToLuidW");
done = true;
}
}
static QHostAddress addressFromSockaddr(sockaddr *sa) static QHostAddress addressFromSockaddr(sockaddr *sa)
{ {
QHostAddress address; QHostAddress address;
@ -111,30 +84,22 @@ static QHostAddress addressFromSockaddr(sockaddr *sa)
uint QNetworkInterfaceManager::interfaceIndexFromName(const QString &name) uint QNetworkInterfaceManager::interfaceIndexFromName(const QString &name)
{ {
resolveLibs();
if (!ptrConvertInterfaceNameToLuid || !ptrConvertInterfaceLuidToIndex)
return 0;
NET_IFINDEX id; NET_IFINDEX id;
NET_LUID luid; NET_LUID luid;
if (ptrConvertInterfaceNameToLuid(reinterpret_cast<const wchar_t *>(name.constData()), &luid) == NO_ERROR if (ConvertInterfaceNameToLuidW(reinterpret_cast<const wchar_t *>(name.constData()), &luid) == NO_ERROR
&& ptrConvertInterfaceLuidToIndex(&luid, &id) == NO_ERROR) && ConvertInterfaceLuidToIndex(&luid, &id) == NO_ERROR)
return uint(id); return uint(id);
return 0; return 0;
} }
QString QNetworkInterfaceManager::interfaceNameFromIndex(uint index) QString QNetworkInterfaceManager::interfaceNameFromIndex(uint index)
{ {
resolveLibs(); NET_LUID luid;
if (ptrConvertInterfaceIndexToLuid && ptrConvertInterfaceLuidToName) { if (ConvertInterfaceIndexToLuid(index, &luid) == NO_ERROR) {
NET_LUID luid; WCHAR buf[IF_MAX_STRING_SIZE + 1];
if (ptrConvertInterfaceIndexToLuid(index, &luid) == NO_ERROR) { if (ConvertInterfaceLuidToNameW(&luid, buf, sizeof(buf)/sizeof(buf[0])) == NO_ERROR)
WCHAR buf[IF_MAX_STRING_SIZE + 1]; return QString::fromWCharArray(buf);
if (ptrConvertInterfaceLuidToName(&luid, buf, sizeof(buf)/sizeof(buf[0])) == NO_ERROR)
return QString::fromWCharArray(buf);
}
} }
return QString::number(index); return QString::number(index);
} }
@ -223,11 +188,11 @@ static QList<QNetworkInterfacePrivate *> interfaceListingWinXP()
if (ptr->IfType == IF_TYPE_PPP) if (ptr->IfType == IF_TYPE_PPP)
iface->flags |= QNetworkInterface::IsPointToPoint; iface->flags |= QNetworkInterface::IsPointToPoint;
if (ptrConvertInterfaceLuidToName && ptr->Length >= offsetof(IP_ADAPTER_ADDRESSES, Luid)) { if (ptr->Length >= offsetof(IP_ADAPTER_ADDRESSES, Luid)) {
// use ConvertInterfaceLuidToName because that returns a friendlier name, though not // use ConvertInterfaceLuidToNameW because that returns a friendlier name, though not
// as friendly as FriendlyName below // as friendly as FriendlyName below
WCHAR buf[IF_MAX_STRING_SIZE + 1]; WCHAR buf[IF_MAX_STRING_SIZE + 1];
if (ptrConvertInterfaceLuidToName(&ptr->Luid, buf, sizeof(buf)/sizeof(buf[0])) == NO_ERROR) if (ConvertInterfaceLuidToNameW(&ptr->Luid, buf, sizeof(buf)/sizeof(buf[0])) == NO_ERROR)
iface->name = QString::fromWCharArray(buf); iface->name = QString::fromWCharArray(buf);
} }
if (iface->name.isEmpty()) if (iface->name.isEmpty())
@ -275,14 +240,11 @@ static QList<QNetworkInterfacePrivate *> interfaceListingWinXP()
QList<QNetworkInterfacePrivate *> QNetworkInterfaceManager::scan() QList<QNetworkInterfacePrivate *> QNetworkInterfaceManager::scan()
{ {
resolveLibs();
return interfaceListingWinXP(); return interfaceListingWinXP();
} }
QString QHostInfo::localDomainName() QString QHostInfo::localDomainName()
{ {
resolveLibs();
FIXED_INFO info, *pinfo; FIXED_INFO info, *pinfo;
ULONG bufSize = sizeof info; ULONG bufSize = sizeof info;
pinfo = &info; pinfo = &info;