1 files changed, 79 insertions, 39 deletions

diff --git a/src/plugins/networkinformation/networklistmanager/qnetworklistmanagerevents.cpp b/src/plugins/networkinformation/networklistmanager/qnetworklistmanagerevents.cpp
index 72023c6628..caa5046751 100644
--- a/src/plugins/networkinformation/networklistmanager/qnetworklistmanagerevents.cpp
+++ b/src/plugins/networkinformation/networklistmanager/qnetworklistmanagerevents.cpp
@@ -2,19 +2,17 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
 #include "qnetworklistmanagerevents.h"
+#include <QtCore/private/qsystemerror_p.h>
 
-#ifdef SUPPORTS_WINRT
-#include <winrt/base.h>
-// Workaround for Windows SDK bug.
-// See https://github.com/microsoft/Windows.UI.Composition-Win32-Samples/issues/47
-namespace winrt::impl
-{
-    template <typename Async>
-    auto wait_for(Async const& async, Windows::Foundation::TimeSpan const& timeout);
-}
+#include <QtCore/qpointer.h>
+
+#include <mutex>
+
+#if QT_CONFIG(cpp_winrt)
+#include <QtCore/private/qt_winrtbase_p.h>
 
 #include <winrt/Windows.Networking.Connectivity.h>
-#endif
+#endif // QT_CONFIG(cpp_winrt)
 
 QT_BEGIN_NAMESPACE
 
@@ -37,7 +35,7 @@ QNetworkListManagerEvents::QNetworkListManagerEvents() : QObject(nullptr)
                                IID_INetworkListManager, &networkListManager);
     if (FAILED(hr)) {
         qCWarning(lcNetInfoNLM) << "Could not get a NetworkListManager instance:"
-                                << errorStringFromHResult(hr);
+                                << QSystemError::windowsComString(hr);
         return;
     }
 
@@ -49,7 +47,7 @@ QNetworkListManagerEvents::QNetworkListManagerEvents() : QObject(nullptr)
     }
     if (FAILED(hr)) {
         qCWarning(lcNetInfoNLM) << "Failed to get connection point for network list manager events:"
-                                << errorStringFromHResult(hr);
+                                << QSystemError::windowsComString(hr);
     }
 }
 
@@ -87,26 +85,39 @@ bool QNetworkListManagerEvents::start()
     auto hr = connectionPoint->Advise(this, &cookie);
     if (FAILED(hr)) {
         qCWarning(lcNetInfoNLM) << "Failed to subscribe to network connectivity events:"
-                                << errorStringFromHResult(hr);
+                                << QSystemError::windowsComString(hr);
         return false;
     }
 
     // Update connectivity since it might have changed since this class was constructed
     NLM_CONNECTIVITY connectivity;
     hr = networkListManager->GetConnectivity(&connectivity);
-    if (FAILED(hr))
-        qCWarning(lcNetInfoNLM) << "Could not get connectivity:" << errorStringFromHResult(hr);
-    else
+    if (FAILED(hr)) {
+        qCWarning(lcNetInfoNLM) << "Could not get connectivity:"
+                                << QSystemError::windowsComString(hr);
+    } else {
         emit connectivityChanged(connectivity);
+    }
 
-#ifdef SUPPORTS_WINRT
+#if QT_CONFIG(cpp_winrt)
     using namespace winrt::Windows::Networking::Connectivity;
-    // Register for changes in the network and store a token to unregister later:
-    token = NetworkInformation::NetworkStatusChanged(
-            [this](const winrt::Windows::Foundation::IInspectable sender) {
-                Q_UNUSED(sender);
-                emitWinRTUpdates();
-            });
+    using winrt::Windows::Foundation::IInspectable;
+    try {
+        // Register for changes in the network and store a token to unregister later:
+        token = NetworkInformation::NetworkStatusChanged(
+                [owner = QPointer(this)](const IInspectable sender) {
+                    Q_UNUSED(sender);
+                    if (owner) {
+                        std::scoped_lock locker(owner->winrtLock);
+                        if (owner->token)
+                            owner->emitWinRTUpdates();
+                    }
+                });
+    } catch (const winrt::hresult_error &ex) {
+        qCWarning(lcNetInfoNLM) << "Failed to register network status changed callback:"
+                                << QSystemError::windowsComString(ex.code());
+    }
+
     // Emit initial state
     emitWinRTUpdates();
 #endif
@@ -114,24 +125,28 @@ bool QNetworkListManagerEvents::start()
     return true;
 }
 
-bool QNetworkListManagerEvents::stop()
+void QNetworkListManagerEvents::stop()
 {
     Q_ASSERT(connectionPoint);
     auto hr = connectionPoint->Unadvise(cookie);
     if (FAILED(hr)) {
         qCWarning(lcNetInfoNLM) << "Failed to unsubscribe from network connectivity events:"
-                                << errorStringFromHResult(hr);
-        return false;
+                                << QSystemError::windowsComString(hr);
+    } else {
+        cookie = 0;
     }
-    cookie = 0;
+    // Even if we fail we should still try to unregister from winrt events:
 
-#ifdef SUPPORTS_WINRT
-    using namespace winrt::Windows::Networking::Connectivity;
-    // Pass the token we stored earlier to unregister:
-    NetworkInformation::NetworkStatusChanged(token);
-    token = {};
+#if QT_CONFIG(cpp_winrt)
+    // Try to synchronize unregistering with potentially in-progress callbacks
+    std::scoped_lock locker(winrtLock);
+    if (token) {
+        using namespace winrt::Windows::Networking::Connectivity;
+        // Pass the token we stored earlier to unregister:
+        NetworkInformation::NetworkStatusChanged(token);
+        token = {};
+    }
 #endif
-    return true;
 }
 
 bool QNetworkListManagerEvents::checkBehindCaptivePortal()
@@ -155,7 +170,7 @@ bool QNetworkListManagerEvents::checkBehindCaptivePortal()
             VariantInit(&variant);
             const auto scopedVariantClear = qScopeGuard([&variant]() { VariantClear(&variant); });
 
-            const wchar_t *versions[] = { NA_InternetConnectivityV6, NA_InternetConnectivityV4 };
+            const wchar_t *versions[] = { L"NA_InternetConnectivityV6", L"NA_InternetConnectivityV4" };
             for (const auto version : versions) {
                 hr = propertyBag->Read(version, &variant, nullptr);
                 if (SUCCEEDED(hr)
@@ -172,7 +187,7 @@ bool QNetworkListManagerEvents::checkBehindCaptivePortal()
     return false;
 }
 
-#ifdef SUPPORTS_WINRT
+#if QT_CONFIG(cpp_winrt)
 namespace {
 using namespace winrt::Windows::Networking::Connectivity;
 // NB: this isn't part of "network list manager", but sadly NLM doesn't have an
@@ -185,7 +200,14 @@ QNetworkInformation::TransportMedium getTransportMedium(const ConnectionProfile
     if (profile.IsWlanConnectionProfile())
         return QNetworkInformation::TransportMedium::WiFi;
 
-    NetworkAdapter adapter = profile.NetworkAdapter();
+    NetworkAdapter adapter(nullptr);
+    try {
+        adapter = profile.NetworkAdapter();
+    } catch (const winrt::hresult_error &ex) {
+        qCWarning(lcNetInfoNLM) << "Failed to obtain network adapter:"
+                                << QSystemError::windowsComString(ex.code());
+        // pass, we will return Unknown anyway
+    }
     if (adapter == nullptr)
         return QNetworkInformation::TransportMedium::Unknown;
 
@@ -208,7 +230,16 @@ QNetworkInformation::TransportMedium getTransportMedium(const ConnectionProfile
 
 [[nodiscard]] bool getMetered(const ConnectionProfile &profile)
 {
-    ConnectionCost cost = profile.GetConnectionCost();
+    ConnectionCost cost(nullptr);
+    try {
+        cost = profile.GetConnectionCost();
+    } catch (const winrt::hresult_error &ex) {
+        qCWarning(lcNetInfoNLM) << "Failed to obtain connection cost:"
+                                << QSystemError::windowsComString(ex.code());
+        // pass, we return false if we get an empty object back anyway
+    }
+    if (cost == nullptr)
+        return false;
     NetworkCostType type = cost.NetworkCostType();
     return type == NetworkCostType::Fixed || type == NetworkCostType::Variable;
 }
@@ -217,12 +248,21 @@ QNetworkInformation::TransportMedium getTransportMedium(const ConnectionProfile
 void QNetworkListManagerEvents::emitWinRTUpdates()
 {
     using namespace winrt::Windows::Networking::Connectivity;
-    ConnectionProfile profile = NetworkInformation::GetInternetConnectionProfile();
+    ConnectionProfile profile = nullptr;
+    try {
+        profile = NetworkInformation::GetInternetConnectionProfile();
+    } catch (const winrt::hresult_error &ex) {
+        qCWarning(lcNetInfoNLM) << "Failed to obtain connection profile:"
+                                << QSystemError::windowsComString(ex.code());
+        // pass, we would just return early if we get an empty object back anyway
+    }
     if (profile == nullptr)
         return;
     emit transportMediumChanged(getTransportMedium(profile));
     emit isMeteredChanged(getMetered(profile));
 }
-#endif
+#endif // QT_CONFIG(cpp_winrt)
 
 QT_END_NAMESPACE
+
+#include "moc_qnetworklistmanagerevents.cpp"