3 files changed, 103 insertions, 138 deletions

diff --git a/src/network/kernel/qhostinfo.cpp b/src/network/kernel/qhostinfo.cpp
index 487cac6d90..9ce2d72bd3 100644
--- a/src/network/kernel/qhostinfo.cpp
+++ b/src/network/kernel/qhostinfo.cpp
@@ -102,16 +102,6 @@ std::pair<OutputIt1, OutputIt2> separate_if(InputIt first, InputIt last, OutputI
     return std::make_pair(dest1, dest2);
 }
 
-int get_signal_index()
-{
-    static auto senderMetaObject = &QHostInfoResult::staticMetaObject;
-    static auto signal = &QHostInfoResult::resultsReady;
-    int signal_index = -1;
-    void *args[] = { &signal_index, &signal };
-    senderMetaObject->static_metacall(QMetaObject::IndexOfMethod, 0, args);
-    return signal_index + QMetaObjectPrivate::signalOffset(senderMetaObject);
-}
-
 }
 
 /*
@@ -129,38 +119,59 @@ void QHostInfoResult::postResultsReady(const QHostInfo &info)
 {
     // queued connection will take care of dispatching to right thread
     if (!slotObj) {
-        emitResultsReady(info);
+        emit resultsReady(info);
         return;
     }
-    static const int signal_index = get_signal_index();
-
     // we used to have a context object, but it's already destroyed
     if (withContextObject && !receiver)
         return;
 
-    /* QHostInfoResult c'tor moves the result object to the thread of receiver.
-       If we don't have a receiver, then the result object will not live in a
-       thread that runs an event loop - so move it to this' thread, which is the thread
-       that initiated the lookup, and required to have a running event loop. */
-    auto result = new QHostInfoResult(receiver, slotObj);
-    if (!receiver)
-        result->moveToThread(thread());
+    static const int signal_index = []() -> int {
+        auto senderMetaObject = &QHostInfoResult::staticMetaObject;
+        auto signal = &QHostInfoResult::resultsReady;
+        int signal_index = -1;
+        void *args[] = { &signal_index, &signal };
+        senderMetaObject->static_metacall(QMetaObject::IndexOfMethod, 0, args);
+        return signal_index + QMetaObjectPrivate::signalOffset(senderMetaObject);
+    }();
+
+    // a long-living version of this
+    auto result = new QHostInfoResult(this);
     Q_CHECK_PTR(result);
+
     const int nargs = 2;
-    auto types = reinterpret_cast<int *>(malloc(nargs * sizeof(int)));
-    Q_CHECK_PTR(types);
+    auto metaCallEvent = new QMetaCallEvent(slotObj, nullptr, signal_index, nargs);
+    Q_CHECK_PTR(metaCallEvent);
+    void **args = metaCallEvent->args();
+    int *types = metaCallEvent->types();
     types[0] = QMetaType::type("void");
     types[1] = QMetaType::type("QHostInfo");
-    auto args = reinterpret_cast<void **>(malloc(nargs * sizeof(void *)));
-    Q_CHECK_PTR(args);
-    args[0] = 0;
+    args[0] = nullptr;
     args[1] = QMetaType::create(types[1], &info);
     Q_CHECK_PTR(args[1]);
-    auto metaCallEvent = new QMetaCallEvent(slotObj, nullptr, signal_index, nargs, types, args);
-    Q_CHECK_PTR(metaCallEvent);
     qApp->postEvent(result, metaCallEvent);
 }
 
+/*
+    Receives the event posted by postResultsReady, and calls the functor.
+*/
+bool QHostInfoResult::event(QEvent *event)
+{
+    if (event->type() == QEvent::MetaCall) {
+        Q_ASSERT(slotObj);
+        auto metaCallEvent = static_cast<QMetaCallEvent *>(event);
+        auto args = metaCallEvent->args();
+        // we didn't have a context object, or it's still alive
+        if (!withContextObject || receiver)
+            slotObj->call(const_cast<QObject*>(receiver.data()), args);
+        slotObj->destroyIfLastRef();
+
+        deleteLater();
+        return true;
+    }
+    return QObject::event(event);
+}
+
 /*!
     \class QHostInfo
     \brief The QHostInfo class provides static functions for host name lookups.
@@ -255,64 +266,9 @@ static int nextId()
 
     \sa abortHostLookup(), addresses(), error(), fromName()
 */
-int QHostInfo::lookupHost(const QString &name, QObject *receiver,
-                          const char *member)
+int QHostInfo::lookupHost(const QString &name, QObject *receiver, const char *member)
 {
-#if defined QHOSTINFO_DEBUG
-    qDebug("QHostInfo::lookupHost(\"%s\", %p, %s)",
-           name.toLatin1().constData(), receiver, member ? member + 1 : 0);
-#endif
-
-    if (!QAbstractEventDispatcher::instance(QThread::currentThread())) {
-        qWarning("QHostInfo::lookupHost() called with no event dispatcher");
-        return -1;
-    }
-
-    qRegisterMetaType<QHostInfo>();
-
-    int id = nextId(); // generate unique ID
-
-    if (name.isEmpty()) {
-        if (!receiver)
-            return -1;
-
-        QHostInfo hostInfo(id);
-        hostInfo.setError(QHostInfo::HostNotFound);
-        hostInfo.setErrorString(QCoreApplication::translate("QHostInfo", "No host name given"));
-        QScopedPointer<QHostInfoResult> result(new QHostInfoResult);
-        QObject::connect(result.data(), SIGNAL(resultsReady(QHostInfo)),
-                         receiver, member, Qt::QueuedConnection);
-        result.data()->emitResultsReady(hostInfo);
-        return id;
-    }
-
-    QHostInfoLookupManager *manager = theHostInfoLookupManager();
-
-    if (manager) {
-        // the application is still alive
-        if (manager->cache.isEnabled()) {
-            // check cache first
-            bool valid = false;
-            QHostInfo info = manager->cache.get(name, &valid);
-            if (valid) {
-                if (!receiver)
-                    return -1;
-
-                info.setLookupId(id);
-                QHostInfoResult result;
-                QObject::connect(&result, SIGNAL(resultsReady(QHostInfo)), receiver, member, Qt::QueuedConnection);
-                result.emitResultsReady(info);
-                return id;
-            }
-        }
-
-        // cache is not enabled or it was not in the cache, do normal lookup
-        QHostInfoRunnable* runnable = new QHostInfoRunnable(name, id);
-        if (receiver)
-            QObject::connect(&runnable->resultEmitter, SIGNAL(resultsReady(QHostInfo)), receiver, member, Qt::QueuedConnection);
-        manager->scheduleLookup(runnable);
-    }
-    return id;
+    return QHostInfoPrivate::lookupHostImpl(name, receiver, nullptr, member);
 }
 
 /*!
@@ -818,14 +774,32 @@ QString QHostInfo::localHostName()
     \sa hostName()
 */
 
+// ### Qt 6 merge with function below
 int QHostInfo::lookupHostImpl(const QString &name,
                               const QObject *receiver,
                               QtPrivate::QSlotObjectBase *slotObj)
 {
+    return QHostInfoPrivate::lookupHostImpl(name, receiver, slotObj, nullptr);
+}
+/*
+    Called by the various lookupHost overloads to perform the lookup.
+
+    Signals either the functor encapuslated in the \a slotObj in the context
+    of \a receiver, or the \a member slot of the \a receiver.
+
+    \a receiver might be the nullptr, but only if a \a slotObj is provided.
+*/
+int QHostInfoPrivate::lookupHostImpl(const QString &name,
+                                     const QObject *receiver,
+                                     QtPrivate::QSlotObjectBase *slotObj,
+                                     const char *member)
+{
 #if defined QHOSTINFO_DEBUG
-    qDebug("QHostInfo::lookupHost(\"%s\", %p, %p)",
-           name.toLatin1().constData(), receiver, slotObj);
+    qDebug("QHostInfoPrivate::lookupHostImpl(\"%s\", %p, %p, %s)",
+           name.toLatin1().constData(), receiver, slotObj, member ? member + 1 : 0);
 #endif
+    Q_ASSERT(!member != !slotObj); // one of these must be set, but not both
+    Q_ASSERT(receiver || slotObj);
 
     if (!QAbstractEventDispatcher::instance(QThread::currentThread())) {
         qWarning("QHostInfo::lookupHost() called with no event dispatcher");
@@ -840,8 +814,13 @@ int QHostInfo::lookupHostImpl(const QString &name,
         QHostInfo hostInfo(id);
         hostInfo.setError(QHostInfo::HostNotFound);
         hostInfo.setErrorString(QCoreApplication::translate("QHostInfo", "No host name given"));
+
         QHostInfoResult result(receiver, slotObj);
+        if (receiver && member)
+            QObject::connect(&result, SIGNAL(resultsReady(QHostInfo)),
+                            receiver, member, Qt::QueuedConnection);
         result.postResultsReady(hostInfo);
+
         return id;
     }
 
@@ -856,23 +835,24 @@ int QHostInfo::lookupHostImpl(const QString &name,
             if (valid) {
                 info.setLookupId(id);
                 QHostInfoResult result(receiver, slotObj);
+                if (receiver && member)
+                    QObject::connect(&result, SIGNAL(resultsReady(QHostInfo)),
+                                    receiver, member, Qt::QueuedConnection);
                 result.postResultsReady(info);
                 return id;
             }
         }
 
         // cache is not enabled or it was not in the cache, do normal lookup
-        QHostInfoRunnable* runnable = new QHostInfoRunnable(name, id, receiver, slotObj);
+        QHostInfoRunnable *runnable = new QHostInfoRunnable(name, id, receiver, slotObj);
+        if (receiver && member)
+            QObject::connect(&runnable->resultEmitter, SIGNAL(resultsReady(QHostInfo)),
+                                receiver, member, Qt::QueuedConnection);
         manager->scheduleLookup(runnable);
     }
     return id;
 }
 
-QHostInfoRunnable::QHostInfoRunnable(const QString &hn, int i) : toBeLookedUp(hn), id(i)
-{
-    setAutoDelete(true);
-}
-
 QHostInfoRunnable::QHostInfoRunnable(const QString &hn, int i, const QObject *receiver,
                                      QtPrivate::QSlotObjectBase *slotObj) :
     toBeLookedUp(hn), id(i), resultEmitter(receiver, slotObj)
@@ -1119,7 +1099,7 @@ QHostInfo qt_qhostinfo_lookup(const QString &name, QObject *receiver, const char
     }
 
     // was not in cache, trigger lookup
-    *id = QHostInfo::lookupHost(name, receiver, member);
+    *id = QHostInfoPrivate::lookupHostImpl(name, receiver, nullptr, member);
 
     // return empty response, valid==false
     return QHostInfo();
diff --git a/src/network/kernel/qhostinfo_p.h b/src/network/kernel/qhostinfo_p.h
index 9a4657234e..1798ceab0a 100644
--- a/src/network/kernel/qhostinfo_p.h
+++ b/src/network/kernel/qhostinfo_p.h
@@ -81,58 +81,38 @@ QT_BEGIN_NAMESPACE
 class QHostInfoResult : public QObject
 {
     Q_OBJECT
-
-    QPointer<const QObject> receiver = nullptr;
-    QtPrivate::QSlotObjectBase *slotObj = nullptr;
-    const bool withContextObject = false;
-
 public:
-    QHostInfoResult() = default;
-    QHostInfoResult(const QObject *receiver, QtPrivate::QSlotObjectBase *slotObj) :
-        receiver(receiver),
-        slotObj(slotObj),
-        withContextObject(slotObj && receiver)
+    QHostInfoResult(const QObject *receiver, QtPrivate::QSlotObjectBase *slotObj)
+        : receiver(receiver), slotObj(slotObj),
+          withContextObject(slotObj && receiver)
     {
-        connect(QCoreApplication::instance(), &QCoreApplication::aboutToQuit, this,
-                &QObject::deleteLater);
-        if (slotObj && receiver)
+        if (receiver)
             moveToThread(receiver->thread());
     }
 
     void postResultsReady(const QHostInfo &info);
 
-public Q_SLOTS:
-    inline void emitResultsReady(const QHostInfo &info)
-    {
-        if (slotObj) {
-            // we used to have a context object, but it's already destroyed
-            if (withContextObject && !receiver)
-                return;
-            QHostInfo copy = info;
-            void *args[2] = { nullptr, reinterpret_cast<void *>(&copy) };
-            slotObj->call(const_cast<QObject*>(receiver.data()), args);
-            slotObj->destroyIfLastRef();
-        } else {
-            emit resultsReady(info);
-        }
-    }
+Q_SIGNALS:
+    void resultsReady(const QHostInfo &info);
 
 protected:
-    bool event(QEvent *event) override
+    bool event(QEvent *event) override;
+
+private:
+    QHostInfoResult(const QHostInfoResult *other)
+        : receiver(other->receiver), slotObj(other->slotObj),
+          withContextObject(other->withContextObject)
     {
-        if (event->type() == QEvent::MetaCall) {
-            auto metaCallEvent = static_cast<QMetaCallEvent *>(event);
-            auto args = metaCallEvent->args();
-            auto hostInfo = reinterpret_cast<QHostInfo *>(args[1]);
-            emitResultsReady(*hostInfo);
-            deleteLater();
-            return true;
-        }
-        return QObject::event(event);
+        // cleanup if the application terminates before results are delivered
+        connect(QCoreApplication::instance(), &QCoreApplication::aboutToQuit,
+                this, &QObject::deleteLater);
+        // maintain thread affinity
+        moveToThread(other->thread());
     }
 
-Q_SIGNALS:
-    void resultsReady(const QHostInfo &info);
+    QPointer<const QObject> receiver = nullptr;
+    QtPrivate::QSlotObjectBase *slotObj = nullptr;
+    const bool withContextObject = false;
 };
 
 class QHostInfoAgent
@@ -160,6 +140,10 @@ public:
     //not a public API yet
     static QHostInfo fromName(const QString &hostName, QSharedPointer<QNetworkSession> networkSession);
 #endif
+    static int lookupHostImpl(const QString &name,
+                              const QObject *receiver,
+                              QtPrivate::QSlotObjectBase *slotObj,
+                              const char *member);
 
     QHostInfo::HostInfoError err;
     QString errorStr;
@@ -204,7 +188,6 @@ private:
 class QHostInfoRunnable : public QRunnable
 {
 public:
-    QHostInfoRunnable(const QString &hn, int i);
     QHostInfoRunnable(const QString &hn, int i, const QObject *receiver,
                       QtPrivate::QSlotObjectBase *slotObj);
     void run() override;
diff --git a/src/network/kernel/qnetconmonitor_win.cpp b/src/network/kernel/qnetconmonitor_win.cpp
index b543508169..a010df8e3a 100644
--- a/src/network/kernel/qnetconmonitor_win.cpp
+++ b/src/network/kernel/qnetconmonitor_win.cpp
@@ -99,7 +99,7 @@ QNetworkInterface getInterfaceFromHostAddress(const QHostAddress &local)
 }
 } // anonymous namespace
 
-class QNetworkConnectionEvents final : public INetworkConnectionEvents
+class QNetworkConnectionEvents : public INetworkConnectionEvents
 {
 public:
     QNetworkConnectionEvents(QNetworkConnectionMonitorPrivate *monitor);
@@ -139,7 +139,7 @@ private:
 
     QNetworkConnectionMonitorPrivate *monitor = nullptr;
 
-    QAtomicInteger<ULONG> ref = 1; // start at 1 for our own initial reference
+    QAtomicInteger<ULONG> ref = 0;
     DWORD cookie = 0;
 };
 
@@ -346,6 +346,8 @@ QNetworkConnectionMonitorPrivate::~QNetworkConnectionMonitorPrivate()
 {
     if (comInitFailed)
         return;
+    if (monitoring)
+        stopMonitoring();
     connectionEvents.Reset();
     CoUninitialize();
 }
@@ -465,7 +467,7 @@ bool QNetworkConnectionMonitor::isReachable()
     return d_func()->connectivity & required;
 }
 
-class QNetworkListManagerEvents final : public INetworkListManagerEvents
+class QNetworkListManagerEvents : public INetworkListManagerEvents
 {
 public:
     QNetworkListManagerEvents(QNetworkStatusMonitorPrivate *monitor);
@@ -496,7 +498,7 @@ private:
 
     QNetworkStatusMonitorPrivate *monitor = nullptr;
 
-    QAtomicInteger<ULONG> ref = 1; // start at 1 for our own initial reference
+    QAtomicInteger<ULONG> ref = 0;
     DWORD cookie = 0;
 };