Merge remote-tracking branch 'origin/5.11' into dev

Change-Id: I7f644741677dbd848d480dde7c76cdf7ad81e4b9

3 files changed, 9 insertions, 11 deletions

diff --git a/src/plugins/directshow/common/directshowutils.cpp b/src/plugins/directshow/common/directshowutils.cpp
index 96fabd6da..8f3f321e7 100644
--- a/src/plugins/directshow/common/directshowutils.cpp
+++ b/src/plugins/directshow/common/directshowutils.cpp
@@ -150,7 +150,7 @@ bool DirectShowUtils::matchPin(IPin *pin, PIN_DIRECTION pinDirection, BOOL shoul
     if (isConnected == shouldBeConnected)
         return hasPinDirection(pin, pinDirection, hrOut);
 
-    return SUCCEEDED(*hrOut);
+    return false;
 }
 
 /**
@@ -183,9 +183,6 @@ bool DirectShowUtils::findUnconnectedPin(IBaseFilter *filter, PIN_DIRECTION pinD
             (*pin)->AddRef();
             return true;
         }
-
-        if (FAILED(*hrOut))
-            return false;
     }
 
     qCDebug(qtDirectShowPlugin, "No unconnected pins found");
@@ -285,7 +282,7 @@ bool DirectShowUtils::connectFilters(IGraphBuilder *graph,
 
     // Try to connect to the upstream filter first.
     if (findAndConnect(upstreamFilter))
-        return S_OK;
+        return false;
 
     const auto getFilters = [graph, hrOut]() -> IEnumFilters * {
         IEnumFilters *f = nullptr;
@@ -304,10 +301,10 @@ bool DirectShowUtils::connectFilters(IGraphBuilder *graph,
     while (S_OK == filters->Next(1, &nextFilter, 0)) {
         const ScopedSafeRelease<IBaseFilter> releaseNextFilter { &nextFilter };
         if (nextFilter && findAndConnect(nextFilter))
-            break;
+            return true;
     }
 
-    return SUCCEEDED(*hrOut);
+    return false;
 }
 
 QT_END_NAMESPACE
diff --git a/src/plugins/directshow/player/directshowplayerservice.cpp b/src/plugins/directshow/player/directshowplayerservice.cpp
index 63f738bbe..d7d190c6a 100644
--- a/src/plugins/directshow/player/directshowplayerservice.cpp
+++ b/src/plugins/directshow/player/directshowplayerservice.cpp
@@ -723,7 +723,7 @@ void DirectShowPlayerService::doSetVideoProbe(QMutexLocker *locker)
     for (int i = 0; i != items; ++i) {
         mediaType->subtype = subtypes[i];
         m_videoSampleGrabber->setMediaType(&mediaType);
-        if (SUCCEEDED(DirectShowUtils::connectFilters(m_graph, m_source, m_videoSampleGrabber->filter(), true))) {
+        if (DirectShowUtils::connectFilters(m_graph, m_source, m_videoSampleGrabber->filter(), true)) {
             connected = true;
             break;
         }
@@ -760,7 +760,7 @@ void DirectShowPlayerService::doSetAudioProbe(QMutexLocker *locker)
         return;
     }
 
-    if (FAILED(DirectShowUtils::connectFilters(m_graph, m_source, m_audioSampleGrabber->filter(), true))) {
+    if (!DirectShowUtils::connectFilters(m_graph, m_source, m_audioSampleGrabber->filter(), true)) {
         qCWarning(qtDirectShowPlugin, "Failed to connect the audio sample grabber");
         return;
     }
diff --git a/src/plugins/windowsaudio/qwindowsaudioinput.cpp b/src/plugins/windowsaudio/qwindowsaudioinput.cpp
index 8d0fc8c24..4771fe1cc 100644
--- a/src/plugins/windowsaudio/qwindowsaudioinput.cpp
+++ b/src/plugins/windowsaudio/qwindowsaudioinput.cpp
@@ -415,9 +415,10 @@ void QWindowsAudioInput::initMixer()
 
     // Get the Mixer ID from the Sound Device ID
     UINT mixerIntID = 0;
-    if (mixerGetID((HMIXEROBJ)(quintptr(inputDevice)), &mixerIntID, MIXER_OBJECTF_WAVEIN) != MMSYSERR_NOERROR)
+    if (mixerGetID(reinterpret_cast<HMIXEROBJ>(quintptr(inputDevice)),
+        &mixerIntID, MIXER_OBJECTF_WAVEIN) != MMSYSERR_NOERROR)
         return;
-    mixerID = (HMIXEROBJ)mixerIntID;
+    mixerID = reinterpret_cast<HMIXEROBJ>(quintptr(mixerIntID));
 
     // Get the Destination (Recording) Line Information
     MIXERLINE mixerLine;