diff options
| author | Oliver Wolff <oliver.wolff@theqtcompany.com> | 2015-06-23 12:59:34 +0200 |
|---|---|---|
| committer | Oliver Wolff <oliver.wolff@theqtcompany.com> | 2015-09-03 12:13:41 +0000 |
| commit | 055cbaafd6c48ddfd00f918006c0a2ffe3a72f81 (patch) | |
| tree | bb0e592cce2c0d17ddd905bc7162028bae86a470 /src/network/socket/qnativesocketengine_winrt_p.h | |
| parent | 111ee58c065602bfcde520b54f44809d854e73f0 (diff) | |
Fixed connectToHost
connectToHost is not meant to be synchronous, but waitForWrite
is used internally to wait for the connection to be established.
Thus the same logic that is used in the callback has to be applied
in there.
Task-number: QTBUG-46339
Change-Id: Ia1fb5c1ae609a9942ff4d8fe2f5fab2ef572da0c
Reviewed-by: Andrew Knight <andrew.knight@intopalo.com>
Diffstat (limited to 'src/network/socket/qnativesocketengine_winrt_p.h')
| -rw-r--r-- | src/network/socket/qnativesocketengine_winrt_p.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/network/socket/qnativesocketengine_winrt_p.h b/src/network/socket/qnativesocketengine_winrt_p.h index eb032bc977..8e8448e6a8 100644 --- a/src/network/socket/qnativesocketengine_winrt_p.h +++ b/src/network/socket/qnativesocketengine_winrt_p.h @@ -216,7 +216,8 @@ private: ABI::Windows::Networking::Sockets::IDatagramSocketMessageReceivedEventArgs *args); HRESULT handleClientConnection(ABI::Windows::Networking::Sockets::IStreamSocketListener *tcpListener, ABI::Windows::Networking::Sockets::IStreamSocketListenerConnectionReceivedEventArgs *args); - void handleConnectionErrors(ABI::Windows::Foundation::IAsyncAction *connectAction, bool *errorsOccured); + HRESULT handleConnectToHost(ABI::Windows::Foundation::IAsyncAction *, ABI::Windows::Foundation::AsyncStatus); + void handleConnectionEstablished(ABI::Windows::Foundation::IAsyncAction *action); HRESULT handleReadyRead(ABI::Windows::Foundation::IAsyncOperationWithProgress<ABI::Windows::Storage::Streams::IBuffer *, UINT32> *asyncInfo, ABI::Windows::Foundation::AsyncStatus); }; |