5 files changed, 11 insertions, 8 deletions
diff --git a/src/plugins/windowsaudio/qwindowsaudiodeviceinfo.cpp b/src/plugins/windowsaudio/qwindowsaudiodeviceinfo.cpp
index c054c0f76..70e7fbce5 100644
--- a/src/plugins/windowsaudio/qwindowsaudiodeviceinfo.cpp
+++ b/src/plugins/windowsaudio/qwindowsaudiodeviceinfo.cpp
@@ -396,7 +396,7 @@ QList<QByteArray> QWindowsAudioDeviceInfo::availableDevices(QAudio::Mode mode)
 
     QList<QByteArray> devices;
     //enumerate device fullnames through directshow api
-    CoInitialize(NULL);
+    auto hrCoInit = CoInitialize(nullptr);
     ICreateDevEnum *pDevEnum = NULL;
     IEnumMoniker *pEnum = NULL;
     // Create the System device enumerator
@@ -447,7 +447,8 @@ QList<QByteArray> QWindowsAudioDeviceInfo::availableDevices(QAudio::Mode mode)
         }
         pDevEnum->Release();
     }
-    CoUninitialize();
+    if (SUCCEEDED(hrCoInit))
+        CoUninitialize();
 
     return devices;
 }
diff --git a/src/plugins/windowsaudio/qwindowsaudioinput.cpp b/src/plugins/windowsaudio/qwindowsaudioinput.cpp
index 717baaff0..3332e3067 100644
--- a/src/plugins/windowsaudio/qwindowsaudioinput.cpp
+++ b/src/plugins/windowsaudio/qwindowsaudioinput.cpp
@@ -52,6 +52,7 @@
 #include "qwindowsaudioinput.h"
 
 #include <QtCore/QDataStream>
+#include <QtCore/qtimer.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/windowsaudio/qwindowsaudioinput.h b/src/plugins/windowsaudio/qwindowsaudioinput.h
index a0feae257..817176731 100644
--- a/src/plugins/windowsaudio/qwindowsaudioinput.h
+++ b/src/plugins/windowsaudio/qwindowsaudioinput.h
@@ -55,7 +55,7 @@
 
 #include <QtCore/qfile.h>
 #include <QtCore/qdebug.h>
-#include <QtCore/qtimer.h>
+#include <QtCore/qelapsedtimer.h>
 #include <QtCore/qstring.h>
 #include <QtCore/qstringlist.h>
 #include <QtCore/qdatetime.h>
@@ -120,9 +120,9 @@ private:
     QByteArray m_device;
     int bytesAvailable;
     int intervalTime;
-    QTime timeStamp;
+    QElapsedTimer timeStamp;
     qint64 elapsedTimeOffset;
-    QTime timeStampOpened;
+    QElapsedTimer timeStampOpened;
     qint64 totalTimeValue;
     bool pullMode;
     bool resuming;
diff --git a/src/plugins/windowsaudio/qwindowsaudiooutput.cpp b/src/plugins/windowsaudio/qwindowsaudiooutput.cpp
index f39e1694b..1182647fc 100644
--- a/src/plugins/windowsaudio/qwindowsaudiooutput.cpp
+++ b/src/plugins/windowsaudio/qwindowsaudiooutput.cpp
@@ -53,6 +53,7 @@
 #include "qwindowsaudioutils.h"
 #include <QtEndian>
 #include <QtCore/QDataStream>
+#include <QtCore/qtimer.h>
 #include <private/qaudiohelpers_p.h>
 
 //#define DEBUG_AUDIO 1
diff --git a/src/plugins/windowsaudio/qwindowsaudiooutput.h b/src/plugins/windowsaudio/qwindowsaudiooutput.h
index 30ee1defe..d6e6998ec 100644
--- a/src/plugins/windowsaudio/qwindowsaudiooutput.h
+++ b/src/plugins/windowsaudio/qwindowsaudiooutput.h
@@ -54,7 +54,7 @@
 #include "qwindowsaudioutils.h"
 
 #include <QtCore/qdebug.h>
-#include <QtCore/qtimer.h>
+#include <QtCore/qelapsedtimer.h>
 #include <QtCore/qstring.h>
 #include <QtCore/qstringlist.h>
 #include <QtCore/qdatetime.h>
@@ -118,9 +118,9 @@ private:
     void pauseAndSleep();
     QByteArray m_device;
     int bytesAvailable;
-    QTime timeStamp;
+    QElapsedTimer timeStamp;
     qint64 elapsedTimeOffset;
-    QTime timeStampOpened;
+    QElapsedTimer timeStampOpened;
     qint32 buffer_size;
     qint32 period_size;
     qint32 blocks_count;