From 6dd9146938bbf619af711d13a56100dbd7990390 Mon Sep 17 00:00:00 2001
From: Andrew Knight <andrew.knight@digia.com>
Date: Fri, 6 Jun 2014 14:20:41 +0300
Subject: winrt: use ComPtr in network classes

This removes extra code and potential memory leaks by using smart
pointers instead of calling Release() directly.

Task-number: QTBUG-38115
Change-Id: If799d6948af8c3df3d0c1617742653b104087e3b
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@digia.com>
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
---
 src/network/socket/qnativesocketengine_winrt.cpp | 20 +++++++++-----------
 src/network/socket/qnativesocketengine_winrt_p.h |  6 ++----
 2 files changed, 11 insertions(+), 15 deletions(-)

(limited to 'src/network/socket')

diff --git a/src/network/socket/qnativesocketengine_winrt.cpp b/src/network/socket/qnativesocketengine_winrt.cpp
index 8eb632ff63..852a0cd066 100644
--- a/src/network/socket/qnativesocketengine_winrt.cpp
+++ b/src/network/socket/qnativesocketengine_winrt.cpp
@@ -474,16 +474,15 @@ void QNativeSocketEngine::close()
 {
     Q_D(QNativeSocketEngine);
     if (d->socketDescriptor != -1) {
-        IClosable *socket = 0;
+        ComPtr<IClosable> socket;
         if (d->socketType == QAbstractSocket::TcpSocket)
-            d->tcp->QueryInterface(IID_PPV_ARGS(&socket));
+            d->tcp.As(&socket);
         else if (d->socketType == QAbstractSocket::UdpSocket)
-            d->udp->QueryInterface(IID_PPV_ARGS(&socket));
+            d->udp.As(&socket);
 
         if (socket) {
             d->closingDown = true;
             socket->Close();
-            socket->Release();
             d->socketDescriptor = -1;
         }
         d->socketDescriptor = -1;
@@ -621,11 +620,10 @@ qint64 QNativeSocketEngine::readDatagram(char *data, qint64 maxlen, QHostAddress
         *addr = returnAddress;
         *port = returnPort;
         arg = d->pendingDatagrams.takeFirst();
+        arg->Release();
 
         // TODO: fill data
         Q_UNUSED(data);
-        arg->Release();
-        delete arg;
         --i;
         return maxlen;
     }
@@ -830,8 +828,8 @@ bool QNativeSocketEnginePrivate::createNewSocket(QAbstractSocket::SocketType soc
     SocketHandler *handler = gSocketHandler();
     switch (socketType) {
     case QAbstractSocket::TcpSocket: {
-        if (FAILED(RoActivateInstance(HString::MakeReference(RuntimeClass_Windows_Networking_Sockets_StreamSocket).Get(),
-                                      reinterpret_cast<IInspectable **>(&tcp)))) {
+        HRESULT hr = RoActivateInstance(HString::MakeReference(RuntimeClass_Windows_Networking_Sockets_StreamSocket).Get(), &tcp);
+        if (FAILED(hr)) {
             qWarning("Failed to create StreamSocket instance");
             return false;
         }
@@ -839,8 +837,8 @@ bool QNativeSocketEnginePrivate::createNewSocket(QAbstractSocket::SocketType soc
         return true;
     }
     case QAbstractSocket::UdpSocket: {
-        if (FAILED(RoActivateInstance(HString::MakeReference(RuntimeClass_Windows_Networking_Sockets_DatagramSocket).Get(),
-                                      reinterpret_cast<IInspectable **>(&udp)))) {
+        HRESULT hr = RoActivateInstance(HString::MakeReference(RuntimeClass_Windows_Networking_Sockets_DatagramSocket).Get(), &udp);
+        if (FAILED(hr)) {
             qWarning("Failed to create stream socket");
             return false;
         }
@@ -1253,7 +1251,7 @@ HRESULT QNativeSocketEnginePrivate::handleWriteCompleted(IAsyncOperationWithProg
 HRESULT QNativeSocketEnginePrivate::handleNewDatagram(IDatagramSocket *socket, IDatagramSocketMessageReceivedEventArgs *args)
 {
     Q_Q(QNativeSocketEngine);
-    Q_UNUSED(socket)
+    Q_UNUSED(socket);
     pendingDatagrams.append(args);
     emit q->readReady();
 
diff --git a/src/network/socket/qnativesocketengine_winrt_p.h b/src/network/socket/qnativesocketengine_winrt_p.h
index ec2e1b3ad4..bf23faeb45 100644
--- a/src/network/socket/qnativesocketengine_winrt_p.h
+++ b/src/network/socket/qnativesocketengine_winrt_p.h
@@ -193,10 +193,8 @@ public:
     bool checkProxy(const QHostAddress &address);
     bool fetchConnectionParameters();
 private:
-    union {
-        ABI::Windows::Networking::Sockets::IStreamSocket *tcp;
-        ABI::Windows::Networking::Sockets::IDatagramSocket *udp;
-    };
+    Microsoft::WRL::ComPtr<ABI::Windows::Networking::Sockets::IStreamSocket> tcp;
+    Microsoft::WRL::ComPtr<ABI::Windows::Networking::Sockets::IDatagramSocket> udp;
     Microsoft::WRL::ComPtr<ABI::Windows::Networking::Sockets::IStreamSocketListener> tcpListener;
     Microsoft::WRL::ComPtr<ABI::Windows::Storage::Streams::IBuffer> readBuffer;
     QBuffer readBytes;
-- 
cgit v1.2.3