From 6b9a9a01e289381ea915ac43595c6c5da0db73b4 Mon Sep 17 00:00:00 2001
From: Maurice Kalinowski <maurice.kalinowski@digia.com>
Date: Fri, 23 May 2014 17:16:54 +0200
Subject: remove HSTRING instances

HSTRING needs to be released or handles will be leaked.
Instead use HString which takes care of resource management
on its own.

Task-Number: QTBUG-38115
Change-Id: I2c767776c1f22f45acd8dd77b693f30d63d894b9
Reviewed-by: Andrew Knight <andrew.knight@digia.com>
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
---
 src/network/kernel/qdnslookup_winrt.cpp        | 12 ++++++------
 src/network/kernel/qhostinfo_winrt.cpp         | 24 ++++++++++++------------
 src/network/kernel/qnetworkinterface_winrt.cpp |  6 +++---
 3 files changed, 21 insertions(+), 21 deletions(-)

(limited to 'src/network/kernel')

diff --git a/src/network/kernel/qdnslookup_winrt.cpp b/src/network/kernel/qdnslookup_winrt.cpp
index 6ac944934a..08f3167a29 100644
--- a/src/network/kernel/qdnslookup_winrt.cpp
+++ b/src/network/kernel/qdnslookup_winrt.cpp
@@ -98,9 +98,9 @@ void QDnsLookupRunnable::query(const int requestType, const QByteArray &requestN
     GetActivationFactory(HString::MakeReference(RuntimeClass_Windows_Networking_Sockets_DatagramSocket).Get(), &datagramSocketStatics);
 
     IAsyncOperation<IVectorView<EndpointPair*> *> *op;
-    HSTRING proto;
-    WindowsCreateString(L"0", 1, &proto);
-    datagramSocketStatics->GetEndpointPairsAsync(host, proto, &op);
+    datagramSocketStatics->GetEndpointPairsAsync(host,
+                                                 HString::MakeReference(L"0").Get(),
+                                                 &op);
     datagramSocketStatics->Release();
     host->Release();
 
@@ -134,11 +134,11 @@ void QDnsLookupRunnable::query(const int requestType, const QByteArray &requestN
                 || (type == HostNameType_Ipv6 && requestType == QDnsLookup::A))))
             continue;
 
-        HSTRING name;
-        remoteHost->get_CanonicalName(&name);
+        HString name;
+        remoteHost->get_CanonicalName(name.GetAddressOf());
         remoteHost->Release();
         UINT32 length;
-        PCWSTR rawString = WindowsGetStringRawBuffer(name, &length);
+        PCWSTR rawString = name.GetRawBuffer(&length);
         QDnsHostAddressRecord record;
         record.d->name = aceHostname;
         record.d->value = QHostAddress(QString::fromWCharArray(rawString, length));
diff --git a/src/network/kernel/qhostinfo_winrt.cpp b/src/network/kernel/qhostinfo_winrt.cpp
index 92897f563d..e02cd98e08 100644
--- a/src/network/kernel/qhostinfo_winrt.cpp
+++ b/src/network/kernel/qhostinfo_winrt.cpp
@@ -95,9 +95,9 @@ QHostInfo QHostInfoAgent::fromName(const QString &hostName)
     GetActivationFactory(HString::MakeReference(RuntimeClass_Windows_Networking_Sockets_DatagramSocket).Get(), &datagramSocketStatics);
 
     IAsyncOperation<IVectorView<EndpointPair*> *> *op;
-    HSTRING proto;
-    WindowsCreateString(L"0", 1, &proto);
-    datagramSocketStatics->GetEndpointPairsAsync(host, proto, &op);
+    datagramSocketStatics->GetEndpointPairsAsync(host,
+                                                 HString::MakeReference(L"0").Get(),
+                                                 &op);
     datagramSocketStatics->Release();
     host->Release();
 
@@ -131,11 +131,11 @@ QHostInfo QHostInfoAgent::fromName(const QString &hostName)
         if (type == HostNameType_DomainName)
             continue;
 
-        HSTRING name;
-        remoteHost->get_CanonicalName(&name);
+        HString name;
+        remoteHost->get_CanonicalName(name.GetAddressOf());
         remoteHost->Release();
         UINT32 length;
-        PCWSTR rawString = WindowsGetStringRawBuffer(name, &length);
+        PCWSTR rawString = name.GetRawBuffer(&length);
         QHostAddress addr;
         addr.setAddress(QString::fromWCharArray(rawString, length));
         if (!addresses.contains(addr))
@@ -170,22 +170,22 @@ QString QHostInfo::localHostName()
         if (type != HostNameType_DomainName)
             continue;
 
-        HSTRING name;
-        hostName->get_CanonicalName(&name);
+        HString name;
+        hostName->get_CanonicalName(name.GetAddressOf());
         hostName->Release();
         UINT32 length;
-        PCWSTR rawString = WindowsGetStringRawBuffer(name, &length);
+        PCWSTR rawString = name.GetRawBuffer(&length);
         return QString::fromWCharArray(rawString, length);
     }
     IHostName *firstHost;
     hostNames->GetAt(0, &firstHost);
     hostNames->Release();
 
-    HSTRING name;
-    firstHost->get_CanonicalName(&name);
+    HString name;
+    firstHost->get_CanonicalName(name.GetAddressOf());
     firstHost->Release();
     UINT32 length;
-    PCWSTR rawString = WindowsGetStringRawBuffer(name, &length);
+    PCWSTR rawString = name.GetRawBuffer(&length);
     return QString::fromWCharArray(rawString, length);
 }
 
diff --git a/src/network/kernel/qnetworkinterface_winrt.cpp b/src/network/kernel/qnetworkinterface_winrt.cpp
index 6a814c85d4..48a96928a8 100644
--- a/src/network/kernel/qnetworkinterface_winrt.cpp
+++ b/src/network/kernel/qnetworkinterface_winrt.cpp
@@ -114,11 +114,11 @@ static QList<QNetworkInterfacePrivate *> interfaceListing()
                 || (type == HostNameType_Ipv6 && hostInfo.prefixLength > 128))
             continue;
 
-        HSTRING name;
-        hostName->get_CanonicalName(&name);
+        HString name;
+        hostName->get_CanonicalName(name.GetAddressOf());
         hostName->Release();
         UINT32 length;
-        PCWSTR rawString = WindowsGetStringRawBuffer(name, &length);
+        PCWSTR rawString = name.GetRawBuffer(&length);
         hostInfo.address = QString::fromWCharArray(rawString, length);
 
         hostList << hostInfo;
-- 
cgit v1.2.3