1 files changed, 94 insertions, 1 deletions
diff --git a/src/corelib/kernel/qfunctions_winrt.h b/src/corelib/kernel/qfunctions_winrt.h
index fa2b2e12ff..5f051c3ea6 100644
--- a/src/corelib/kernel/qfunctions_winrt.h
+++ b/src/corelib/kernel/qfunctions_winrt.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the QtCore module of the Qt Toolkit.
@@ -46,6 +46,10 @@
 
 #ifdef Q_OS_WINRT
 
+#include <QtCore/QThread>
+#include <QtCore/QAbstractEventDispatcher>
+#include <QtCore/qt_windows.h>
+
 QT_BEGIN_NAMESPACE
 
 #ifdef QT_BUILD_CORE_LIB
@@ -118,5 +122,94 @@ generate_inline_return_func2(_putenv_s, errno_t, const char *, const char *)
 generate_inline_return_func0(tzset, void)
 generate_inline_return_func0(_tzset, void)
 
+// Convenience macros for handling HRESULT values
+#define RETURN_IF_FAILED(msg, ret) \
+    if (FAILED(hr)) { \
+        qErrnoWarning(hr, msg); \
+        ret; \
+    }
+
+#define RETURN_HR_IF_FAILED(msg) RETURN_IF_FAILED(msg, return hr)
+#define RETURN_OK_IF_FAILED(msg) RETURN_IF_FAILED(msg, return S_OK)
+#define RETURN_FALSE_IF_FAILED(msg) RETURN_IF_FAILED(msg, return false)
+#define RETURN_VOID_IF_FAILED(msg) RETURN_IF_FAILED(msg, return)
+
+#define Q_ASSERT_SUCCEEDED(hr) \
+    Q_ASSERT_X(SUCCEEDED(hr), Q_FUNC_INFO, qPrintable(qt_error_string(hr)));
+
+
+namespace Microsoft { namespace WRL { template <typename T> class ComPtr; } }
+
+namespace QWinRTFunctions {
+
+// Synchronization methods
+enum AwaitStyle
+{
+    YieldThread = 0,
+    ProcessThreadEvents = 1,
+    ProcessMainThreadEvents = 2
+};
+
+template <typename T>
+static inline HRESULT _await_impl(const Microsoft::WRL::ComPtr<T> &asyncOp, AwaitStyle awaitStyle)
+{
+    Microsoft::WRL::ComPtr<IAsyncInfo> asyncInfo;
+    HRESULT hr = asyncOp.As(&asyncInfo);
+    if (FAILED(hr))
+        return hr;
+
+    AsyncStatus status;
+    switch (awaitStyle) {
+    case ProcessMainThreadEvents:
+        while (SUCCEEDED(hr = asyncInfo->get_Status(&status)) && status == Started)
+            QCoreApplication::processEvents();
+        break;
+    case ProcessThreadEvents:
+        if (QAbstractEventDispatcher *dispatcher = QThread::currentThread()->eventDispatcher()) {
+            while (SUCCEEDED(hr = asyncInfo->get_Status(&status)) && status == Started)
+                dispatcher->processEvents(QEventLoop::AllEvents);
+            break;
+        }
+        // fall through
+    default:
+    case YieldThread:
+        while (SUCCEEDED(hr = asyncInfo->get_Status(&status)) && status == Started)
+            QThread::yieldCurrentThread();
+        break;
+    }
+
+    if (FAILED(hr) || status != Completed) {
+        HRESULT ec;
+        hr = asyncInfo->get_ErrorCode(&ec);
+        if (FAILED(hr))
+            return hr;
+        return ec;
+    }
+
+    return hr;
+}
+
+template <typename T>
+static inline HRESULT await(const Microsoft::WRL::ComPtr<T> &asyncOp, AwaitStyle awaitStyle = YieldThread)
+{
+    HRESULT hr = _await_impl(asyncOp, awaitStyle);
+    if (FAILED(hr))
+        return hr;
+
+    return asyncOp->GetResults();
+}
+
+template <typename T, typename U>
+static inline HRESULT await(const Microsoft::WRL::ComPtr<T> &asyncOp, U *results, AwaitStyle awaitStyle = YieldThread)
+{
+    HRESULT hr = _await_impl(asyncOp, awaitStyle);
+    if (FAILED(hr))
+        return hr;
+
+    return asyncOp->GetResults(results);
+}
+
+} // QWinRTFunctions
+
 #endif // Q_OS_WINRT
 #endif // QFUNCTIONS_WINRT_H