winrt: Fix clang warnings

Fixed warning:
  - 0 as nullptr constant
  - missing override
  - change of signedness
  - non portable path to header file

Change-Id: I75a7d8de45099e39eb46feed2350117b2e1995c3
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>

20 files changed, 90 insertions, 92 deletions

diff --git a/src/plugins/winrt/qwinrtabstractvideorenderercontrol.cpp b/src/plugins/winrt/qwinrtabstractvideorenderercontrol.cpp
index 3544031a7..654d0e605 100644
--- a/src/plugins/winrt/qwinrtabstractvideorenderercontrol.cpp
+++ b/src/plugins/winrt/qwinrtabstractvideorenderercontrol.cpp
@@ -91,7 +91,7 @@ struct QWinRTVideoRendererControlGlobal
 #ifdef _DEBUG
         flags |= D3D11_CREATE_DEVICE_DEBUG;
 #endif
-        hr = D3D11CreateDevice(NULL, D3D_DRIVER_TYPE_HARDWARE, NULL, flags,
+        hr = D3D11CreateDevice(nullptr, D3D_DRIVER_TYPE_HARDWARE, nullptr, flags,
                                featureLevels, ARRAYSIZE(featureLevels), D3D11_SDK_VERSION,
                                &device, &featureLevel, &context);
 #ifdef _DEBUG
@@ -106,7 +106,7 @@ struct QWinRTVideoRendererControlGlobal
             qErrnoWarning(hr, "Failed to create D3D device");
 
         if (!device || FAILED(hr)) {
-            hr = D3D11CreateDevice(NULL, D3D_DRIVER_TYPE_WARP, NULL, flags,
+            hr = D3D11CreateDevice(nullptr, D3D_DRIVER_TYPE_WARP, nullptr, flags,
                                    featureLevels, ARRAYSIZE(featureLevels), D3D11_SDK_VERSION,
                                    &device, &featureLevel, &context);
             if (FAILED(hr)) {
@@ -160,7 +160,7 @@ public:
         Q_UNUSED(mode);
         Q_UNUSED(numBytes);
         Q_UNUSED(bytesPerLine);
-        return 0;
+        return nullptr;
     }
 
     void unmap() override
@@ -227,9 +227,9 @@ QWinRTAbstractVideoRendererControl::QWinRTAbstractVideoRendererControl(const QSi
     d->format = QVideoSurfaceFormat(size, QVideoFrame::Format_BGRA32,
                                     QAbstractVideoBuffer::GLTextureHandle);
     d->dirtyState = TextureDirty;
-    d->shareHandle = 0;
+    d->shareHandle = nullptr;
     d->eglDisplay = EGL_NO_DISPLAY;
-    d->eglConfig = 0;
+    d->eglConfig = nullptr;
     d->eglSurface = EGL_NO_SURFACE;
     d->active = false;
     d->blitMode = DirectVideo;
@@ -278,7 +278,7 @@ void QWinRTAbstractVideoRendererControl::syncAndRender()
                 CD3D11_TEXTURE2D_DESC desc(DXGI_FORMAT_B8G8R8A8_UNORM, d->format.frameWidth(), d->format.frameHeight(), 1, 1);
                 desc.BindFlags |= D3D11_BIND_RENDER_TARGET;
                 desc.MiscFlags = D3D11_RESOURCE_MISC_SHARED;
-                hr = g->device->CreateTexture2D(&desc, NULL, d->texture.ReleaseAndGetAddressOf());
+                hr = g->device->CreateTexture2D(&desc, nullptr, d->texture.ReleaseAndGetAddressOf());
                 BREAK_IF_FAILED("Failed to get create video texture");
                 ComPtr<IDXGIResource> resource;
                 hr = d->texture.As(&resource);
@@ -398,7 +398,7 @@ void QWinRTAbstractVideoRendererControl::setBlitMode(QWinRTAbstractVideoRenderer
 
     if (d->texture) {
         d->texture.Reset();
-        d->shareHandle = 0;
+        d->shareHandle = nullptr;
     }
 
     if (d->eglSurface) {
diff --git a/src/plugins/winrt/qwinrtabstractvideorenderercontrol.h b/src/plugins/winrt/qwinrtabstractvideorenderercontrol.h
index e190c8c4a..819dd9c3a 100644
--- a/src/plugins/winrt/qwinrtabstractvideorenderercontrol.h
+++ b/src/plugins/winrt/qwinrtabstractvideorenderercontrol.h
@@ -55,8 +55,8 @@ class QWinRTAbstractVideoRendererControl : public QVideoRendererControl
 {
     Q_OBJECT
 public:
-    explicit QWinRTAbstractVideoRendererControl(const QSize &size, QObject *parent = 0);
-    ~QWinRTAbstractVideoRendererControl();
+    explicit QWinRTAbstractVideoRendererControl(const QSize &size, QObject *parent = nullptr);
+    ~QWinRTAbstractVideoRendererControl() override;
 
     enum BlitMode {
         DirectVideo,
diff --git a/src/plugins/winrt/qwinrtcameracontrol.cpp b/src/plugins/winrt/qwinrtcameracontrol.cpp
index 164a958ff..c00f65624 100644
--- a/src/plugins/winrt/qwinrtcameracontrol.cpp
+++ b/src/plugins/winrt/qwinrtcameracontrol.cpp
@@ -54,7 +54,7 @@
 
 #include <functional>
 #include <mfapi.h>
-#include <mferror.h>
+#include <Mferror.h>
 #include <mfidl.h>
 #include <wrl.h>
 #include <windows.devices.enumeration.h>
@@ -103,7 +103,7 @@ HRESULT getMediaStreamResolutions(IMediaDeviceController *device,
     quint32 listSize;
     hr = (*propertiesList)->get_Size(&listSize);
     Q_ASSERT_SUCCEEDED(hr);
-    resolutions->reserve(listSize);
+    resolutions->reserve(int(listSize));
     for (quint32 index = 0; index < listSize; ++index) {
         ComPtr<IMediaEncodingProperties> properties;
         hr = (*propertiesList)->GetAt(index, &properties);
@@ -123,7 +123,7 @@ HRESULT getMediaStreamResolutions(IMediaDeviceController *device,
             Q_ASSERT_SUCCEEDED(hr);
             hr = videoProperties->get_Height(&height);
             Q_ASSERT_SUCCEEDED(hr);
-            resolutions->append(QSize(width, height));
+            resolutions->append(QSize(int(width), int(height)));
         } else if (propertyType == imageRef) {
             ComPtr<IImageEncodingProperties> imageProperties;
             hr = properties.As(&imageProperties);
@@ -133,7 +133,7 @@ HRESULT getMediaStreamResolutions(IMediaDeviceController *device,
             Q_ASSERT_SUCCEEDED(hr);
             hr = imageProperties->get_Height(&height);
             Q_ASSERT_SUCCEEDED(hr);
-            resolutions->append(QSize(width, height));
+            resolutions->append(QSize(int(width), int(height)));
         }
     }
     return resolutions->isEmpty() ? MF_E_INVALID_FORMAT : hr;
@@ -237,7 +237,7 @@ public:
         Q_ASSERT_SUCCEEDED(hr);
     }
 
-    ~MediaStream()
+    ~MediaStream() override
     {
         QMutexLocker locker(&m_mutex);
         m_eventQueue->Shutdown();
@@ -399,9 +399,7 @@ public:
         m_stream = Make<MediaStream>(videoType.Get(), this, videoRenderer);
     }
 
-    ~MediaSink()
-    {
-    }
+    ~MediaSink() override = default;
 
     HRESULT RequestSample()
     {
@@ -591,7 +589,7 @@ QWinRTCameraControl::QWinRTCameraControl(QObject *parent)
     d->cameraFocusControl = new QWinRTCameraFocusControl(this);
     d->cameraLocksControl = new QWinRTCameraLocksControl(this);
 
-    d->initializationCompleteEvent = CreateEvent(NULL, false, false, NULL);
+    d->initializationCompleteEvent = CreateEvent(nullptr, false, false, nullptr);
 
     if (qGuiApp) {
         connect(qGuiApp, &QGuiApplication::applicationStateChanged,
@@ -954,13 +952,12 @@ HRESULT QWinRTCameraControl::initialize()
             return E_FAIL;
         }
 
-        const QCamera::Position position = d->videoDeviceSelector->cameraPosition(deviceName);
         d->videoRenderer->setScanLineDirection(QVideoSurfaceFormat::TopToBottom);
         ComPtr<IMediaCaptureInitializationSettings> settings;
         hr = RoActivateInstance(HString::MakeReference(RuntimeClass_Windows_Media_Capture_MediaCaptureInitializationSettings).Get(),
                                 &settings);
         Q_ASSERT_SUCCEEDED(hr);
-        HStringReference deviceId(reinterpret_cast<LPCWSTR>(deviceName.utf16()), deviceName.length());
+        HStringReference deviceId(reinterpret_cast<LPCWSTR>(deviceName.utf16()), uint(deviceName.length()));
         hr = settings->put_VideoDeviceId(deviceId.Get());
         Q_ASSERT_SUCCEEDED(hr);
 
@@ -992,7 +989,7 @@ HRESULT QWinRTCameraControl::initializeFocus()
     ComPtr<IVectorView<enum FocusMode>> focusModes;
     hr = focusControl2->get_SupportedFocusModes(&focusModes);
     if (FAILED(hr)) {
-        d->cameraFocusControl->setSupportedFocusMode(0);
+        d->cameraFocusControl->setSupportedFocusMode(nullptr);
         d->cameraFocusControl->setSupportedFocusPointMode(QSet<QCameraFocus::FocusPointMode>());
         qErrnoWarning(hr, "Failed to get camera supported focus mode list");
         return hr;
@@ -1000,7 +997,7 @@ HRESULT QWinRTCameraControl::initializeFocus()
     quint32 size;
     hr = focusModes->get_Size(&size);
     Q_ASSERT_SUCCEEDED(hr);
-    QCameraFocus::FocusModes supportedModeFlag = 0;
+    QCameraFocus::FocusModes supportedModeFlag = nullptr;
     for (quint32 i = 0; i < size; ++i) {
         FocusMode mode;
         hr = focusModes->GetAt(i, &mode);
@@ -1122,19 +1119,21 @@ bool QWinRTCameraControl::setFocus(QCameraFocus::FocusModes modes)
 bool QWinRTCameraControl::setFocusPoint(const QPointF &focusPoint)
 {
     Q_D(QWinRTCameraControl);
-    if (focusPoint.x() < FOCUS_RECT_POSITION_MIN || focusPoint.x() > FOCUS_RECT_BOUNDARY) {
+    if (focusPoint.x() < double(FOCUS_RECT_POSITION_MIN)
+            || focusPoint.x() > double(FOCUS_RECT_BOUNDARY)) {
         emit error(QCamera::CameraError, QStringLiteral("Focus horizontal location should be between 0.0 and 1.0."));
         return false;
     }
 
-    if (focusPoint.y() < FOCUS_RECT_POSITION_MIN || focusPoint.y() > FOCUS_RECT_BOUNDARY) {
+    if (focusPoint.y() < double(FOCUS_RECT_POSITION_MIN)
+            || focusPoint.y() > double(FOCUS_RECT_BOUNDARY)) {
         emit error(QCamera::CameraError, QStringLiteral("Focus vertical location should be between 0.0 and 1.0."));
         return false;
     }
 
     ABI::Windows::Foundation::Rect rect;
-    rect.X = qBound<float>(FOCUS_RECT_POSITION_MIN, focusPoint.x() - FOCUS_RECT_HALF_SIZE, FOCUS_RECT_POSITION_MAX);
-    rect.Y = qBound<float>(FOCUS_RECT_POSITION_MIN, focusPoint.y() - FOCUS_RECT_HALF_SIZE, FOCUS_RECT_POSITION_MAX);
+    rect.X = qBound<float>(FOCUS_RECT_POSITION_MIN, float(focusPoint.x() - double(FOCUS_RECT_HALF_SIZE)), FOCUS_RECT_POSITION_MAX);
+    rect.Y = qBound<float>(FOCUS_RECT_POSITION_MIN, float(focusPoint.y() - double(FOCUS_RECT_HALF_SIZE)), FOCUS_RECT_POSITION_MAX);
     rect.Width  = (rect.X + FOCUS_RECT_SIZE) < FOCUS_RECT_BOUNDARY ? FOCUS_RECT_SIZE : FOCUS_RECT_BOUNDARY - rect.X;
     rect.Height = (rect.Y + FOCUS_RECT_SIZE) < FOCUS_RECT_BOUNDARY ? FOCUS_RECT_SIZE : FOCUS_RECT_BOUNDARY - rect.Y;
 
@@ -1328,7 +1327,7 @@ HRESULT QWinRTCameraControl::onCaptureFailed(IMediaCapture *, IMediaCaptureFaile
     RETURN_HR_IF_FAILED("Failed to get error message");
     quint32 messageLength;
     const wchar_t *messageBuffer = message.GetRawBuffer(&messageLength);
-    emit error(QCamera::CameraError, QString::fromWCharArray(messageBuffer, messageLength));
+    emit error(QCamera::CameraError, QString::fromWCharArray(messageBuffer, int(messageLength)));
     setState(QCamera::LoadedState);
     return S_OK;
 }
@@ -1402,7 +1401,7 @@ HRESULT QWinRTCameraControl::onInitializationCompleted(IAsyncAction *, AsyncStat
     // Set capture resolutions.
     d->imageEncoderControl->setSupportedResolutionsList(captureResolutions.toList());
     const QSize captureResolution = d->imageEncoderControl->imageSettings().resolution();
-    const quint32 captureResolutionIndex = captureResolutions.indexOf(captureResolution);
+    const quint32 captureResolutionIndex = quint32(captureResolutions.indexOf(captureResolution));
     ComPtr<IMediaEncodingProperties> captureProperties;
     hr = capturePropertiesList->GetAt(captureResolutionIndex, &captureProperties);
     Q_ASSERT_SUCCEEDED(hr);
@@ -1424,7 +1423,7 @@ HRESULT QWinRTCameraControl::onInitializationCompleted(IAsyncAction *, AsyncStat
               [](QSize size1, QSize size2) { return size1.width() * size1.height() < size2.width() * size2.height(); });
 
     const QSize &viewfinderResolution = filtered.first();
-    const quint32 viewfinderResolutionIndex = previewResolutions.indexOf(viewfinderResolution);
+    const quint32 viewfinderResolutionIndex = quint32(previewResolutions.indexOf(viewfinderResolution));
     hr = RoActivateInstance(HString::MakeReference(RuntimeClass_Windows_Media_MediaProperties_MediaEncodingProfile).Get(),
                             &d->encodingProfile);
     Q_ASSERT_SUCCEEDED(hr);
diff --git a/src/plugins/winrt/qwinrtcameracontrol.h b/src/plugins/winrt/qwinrtcameracontrol.h
index c46921a9c..3a2125f5b 100644
--- a/src/plugins/winrt/qwinrtcameracontrol.h
+++ b/src/plugins/winrt/qwinrtcameracontrol.h
@@ -78,8 +78,8 @@ class QWinRTCameraControl : public QCameraControl
 {
     Q_OBJECT
 public:
-    explicit QWinRTCameraControl(QObject *parent = 0);
-    ~QWinRTCameraControl();
+    explicit QWinRTCameraControl(QObject *parent = nullptr);
+    ~QWinRTCameraControl() override;
 
     QCamera::State state() const override;
     void setState(QCamera::State state) override;
diff --git a/src/plugins/winrt/qwinrtcamerafocuscontrol.cpp b/src/plugins/winrt/qwinrtcamerafocuscontrol.cpp
index aeefc9241..afe7017d7 100644
--- a/src/plugins/winrt/qwinrtcamerafocuscontrol.cpp
+++ b/src/plugins/winrt/qwinrtcamerafocuscontrol.cpp
@@ -200,7 +200,7 @@ void QWinRTCameraFocusControl::setSupportedFocusMode(QCameraFocus::FocusModes mo
     d->focusModeInitialized = true;
     if (isFocusModeSupported(d->focusModes))
         return;
-    d->focusModes = 0;
+    d->focusModes = nullptr;
     if (!modes) {
         emit focusModeChanged(d->focusModes);
         return;
diff --git a/src/plugins/winrt/qwinrtcameraimagecapturecontrol.cpp b/src/plugins/winrt/qwinrtcameraimagecapturecontrol.cpp
index f4903c5a1..4ed208feb 100644
--- a/src/plugins/winrt/qwinrtcameraimagecapturecontrol.cpp
+++ b/src/plugins/winrt/qwinrtcameraimagecapturecontrol.cpp
@@ -170,7 +170,8 @@ int QWinRTCameraImageCaptureControl::capture(const QString &fileName)
     CaptureRequest request = {
         d->currentCaptureId,
         d->location.generateFileName(fileName, QMediaStorageLocation::Pictures, QStringLiteral("IMG_"),
-                                     fileName.isEmpty() ? QStringLiteral("jpg") : QFileInfo(fileName).suffix())
+                                     fileName.isEmpty() ? QStringLiteral("jpg") : QFileInfo(fileName).suffix()),
+        nullptr, nullptr, nullptr
     };
 
     HRESULT hr = QEventDispatcherWinRT::runOnXamlThread([this, d, capture, &request]() {
@@ -183,9 +184,9 @@ int QWinRTCameraImageCaptureControl::capture(const QString &fileName)
         Q_ASSERT_SUCCEEDED(hr);
 
         const QSize imageSize = static_cast<QWinRTImageEncoderControl*>(d->cameraControl->imageEncoderControl())->imageSettings().resolution();
-        hr = request.imageFormat->put_Width(imageSize.width());
+        hr = request.imageFormat->put_Width(UINT32(imageSize.width()));
         Q_ASSERT_SUCCEEDED(hr);
-        hr = request.imageFormat->put_Height(imageSize.height());
+        hr = request.imageFormat->put_Height(UINT32(imageSize.height()));
         Q_ASSERT_SUCCEEDED(hr);
 
         hr = capture->CapturePhotoToStreamAsync(request.imageFormat.Get(), request.stream.Get(), &request.op);
@@ -301,7 +302,8 @@ HRESULT QWinRTCameraImageCaptureControl::onCaptureCompleted(IAsyncAction *asyncI
     UINT32 pixelWidth;
     hr = frame->get_PixelWidth(&pixelWidth);
     Q_ASSERT_SUCCEEDED(hr);
-    const QImage image(pixelData, pixelWidth, pixelHeight, QImage::Format_RGBA8888,
+    const QImage image(pixelData, int(pixelWidth), int(pixelHeight),
+                       QImage::Format_RGBA8888,
                        reinterpret_cast<QImageCleanupFunction>(&freeImageData), pixelData);
     emit imageCaptured(request.id, image);
 
diff --git a/src/plugins/winrt/qwinrtcamerainfocontrol.h b/src/plugins/winrt/qwinrtcamerainfocontrol.h
index 031ed2720..0f49ba244 100644
--- a/src/plugins/winrt/qwinrtcamerainfocontrol.h
+++ b/src/plugins/winrt/qwinrtcamerainfocontrol.h
@@ -48,7 +48,7 @@ class QWinRTCameraInfoControl : public QCameraInfoControl
 {
     Q_OBJECT
 public:
-    explicit QWinRTCameraInfoControl(QObject *parent = 0);
+    explicit QWinRTCameraInfoControl(QObject *parent = nullptr);
 
     QCamera::Position cameraPosition(const QString &deviceName) const override;
     int cameraOrientation(const QString &deviceName) const override;
diff --git a/src/plugins/winrt/qwinrtcameraservice.h b/src/plugins/winrt/qwinrtcameraservice.h
index 6fa4d5fce..b2d213b87 100644
--- a/src/plugins/winrt/qwinrtcameraservice.h
+++ b/src/plugins/winrt/qwinrtcameraservice.h
@@ -49,7 +49,7 @@ class QWinRTCameraService : public QMediaService
 {
     Q_OBJECT
 public:
-    explicit QWinRTCameraService(QObject *parent = 0);
+    explicit QWinRTCameraService(QObject *parent = nullptr);
 
     QMediaControl *requestControl(const char *name) override;
     void releaseControl(QMediaControl *control) override;
diff --git a/src/plugins/winrt/qwinrtcameravideorenderercontrol.cpp b/src/plugins/winrt/qwinrtcameravideorenderercontrol.cpp
index 6c5e3dbf9..8b757b467 100644
--- a/src/plugins/winrt/qwinrtcameravideorenderercontrol.cpp
+++ b/src/plugins/winrt/qwinrtcameravideorenderercontrol.cpp
@@ -46,14 +46,14 @@
 #include <QVideoFrame>
 
 #include <d3d11.h>
-#include <D3D11_1.h>
+#include <d3d11_1.h>
 #include <mfapi.h>
 #include <wrl.h>
 
 #include "qwinrtcameracontrol.h"
 
 #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_PHONE_APP)
-#include <Windows.Security.ExchangeActiveSyncProvisioning.h>
+#include <windows.security.exchangeactivesyncprovisioning.h>
 using namespace ABI::Windows::Security::ExchangeActiveSyncProvisioning;
 #endif
 
@@ -77,15 +77,15 @@ class QWinRTCameraVideoBuffer : public QAbstractVideoBuffer
 public:
     QWinRTCameraVideoBuffer(IMF2DBuffer *buffer, int size, QWinRTCameraControl *control)
         : QAbstractVideoBuffer(NoHandle)
-        , currentMode(NotMapped)
         , buffer(buffer)
+        , currentMode(NotMapped)
         , size(size)
         , control(control)
     {
         Q_ASSERT(control);
     }
 
-    ~QWinRTCameraVideoBuffer()
+    ~QWinRTCameraVideoBuffer() override
     {
         unmap();
     }
@@ -97,13 +97,13 @@ public:
 
     uchar *map(MapMode mode, int *numBytes, int *bytesPerLine) override
     {
-        if (currentMode != NotMapped || mode == NotMapped || control && control->state() != QCamera::ActiveState)
+        if (currentMode != NotMapped || mode == NotMapped || (control && control->state() != QCamera::ActiveState))
             return nullptr;
 
         BYTE *bytes;
         LONG stride;
         HRESULT hr = buffer->Lock2D(&bytes, &stride);
-        RETURN_IF_FAILED("Failed to lock camera frame buffer", nullptr);
+        RETURN_IF_FAILED("Failed to lock camera frame buffer", return nullptr);
         control->frameMapped();
 
         if (bytesPerLine)
@@ -164,8 +164,8 @@ public:
         if (!m_videoEnumerator) {
             D3D11_VIDEO_PROCESSOR_CONTENT_DESC videoProcessorDesc = {
                 D3D11_VIDEO_FRAME_FORMAT_PROGRESSIVE,
-                { 0 }, desc.Width, desc.Height,
-                { 0 }, desc.Width, desc.Height,
+                { 0, 0}, desc.Width, desc.Height,
+                { 0, 0}, desc.Width, desc.Height,
                 D3D11_VIDEO_USAGE_OPTIMAL_SPEED
             };
             hr = m_videoDevice->CreateVideoProcessorEnumerator(&videoProcessorDesc, &m_videoEnumerator);
@@ -178,7 +178,7 @@ public:
         }
 
         if (!m_outputView) {
-            D3D11_VIDEO_PROCESSOR_OUTPUT_VIEW_DESC outputDesc = { D3D11_VPOV_DIMENSION_TEXTURE2D };
+            D3D11_VIDEO_PROCESSOR_OUTPUT_VIEW_DESC outputDesc = { D3D11_VPOV_DIMENSION_TEXTURE2D, {{ 0 }} };
             hr = m_videoDevice->CreateVideoProcessorOutputView(
                         m_target, m_videoEnumerator.Get(), &outputDesc, &m_outputView);
             RETURN_VOID_IF_FAILED("Failed to create video output view");
@@ -187,8 +187,8 @@ public:
         ComPtr<IDXGIResource1> sourceResource;
         hr = texture->QueryInterface(IID_PPV_ARGS(&sourceResource));
         RETURN_VOID_IF_FAILED("Failed to query interface IDXGIResource1");
-        HANDLE sharedHandle = NULL;
-        hr = sourceResource->CreateSharedHandle(NULL, DXGI_SHARED_RESOURCE_READ, NULL, &sharedHandle);
+        HANDLE sharedHandle = nullptr;
+        hr = sourceResource->CreateSharedHandle(nullptr, DXGI_SHARED_RESOURCE_READ, nullptr, &sharedHandle);
         RETURN_VOID_IF_FAILED("Failed to create shared handle");
         ComPtr<ID3D11Device1> dev;
         hr = m_d3dDevice.As(&dev);
@@ -212,7 +212,9 @@ public:
         hr = context.As(&videoContext);
         RETURN_VOID_IF_FAILED("Failed to get video context");
 
-        D3D11_VIDEO_PROCESSOR_STREAM stream = { TRUE };
+        D3D11_VIDEO_PROCESSOR_STREAM stream = { TRUE, 0, 0, 0, 0, nullptr,
+                                                nullptr, nullptr, nullptr,
+                                                nullptr, nullptr};
         stream.pInputSurface = inputView.Get();
         hr = videoContext->VideoProcessorBlt(
                     m_videoProcessor.Get(), m_outputView.Get(), 0, 1, &stream);
@@ -282,7 +284,7 @@ bool QWinRTCameraVideoRendererControlPrivate::getCameraSampleInfo(const ComPtr<I
     DWORD pcbLength;
     hr = buffer->GetContiguousLength(&pcbLength);
     Q_ASSERT_SUCCEEDED(hr);
-    cameraSampleSize = pcbLength;
+    cameraSampleSize = int(pcbLength);
     return true;
 }
 
diff --git a/src/plugins/winrt/qwinrtcameravideorenderercontrol.h b/src/plugins/winrt/qwinrtcameravideorenderercontrol.h
index 2f98e70f4..e50bcd2e6 100644
--- a/src/plugins/winrt/qwinrtcameravideorenderercontrol.h
+++ b/src/plugins/winrt/qwinrtcameravideorenderercontrol.h
@@ -56,7 +56,7 @@ class QWinRTCameraVideoRendererControl : public QWinRTAbstractVideoRendererContr
     Q_OBJECT
 public:
     explicit QWinRTCameraVideoRendererControl(const QSize &size, QObject *parent);
-    ~QWinRTCameraVideoRendererControl();
+    ~QWinRTCameraVideoRendererControl() override;
 
     bool render(ID3D11Texture2D *texture) override;
     bool dequeueFrame(QVideoFrame *frame) override;
diff --git a/src/plugins/winrt/qwinrtimageencodercontrol.h b/src/plugins/winrt/qwinrtimageencodercontrol.h
index dbeac2384..711e550c7 100644
--- a/src/plugins/winrt/qwinrtimageencodercontrol.h
+++ b/src/plugins/winrt/qwinrtimageencodercontrol.h
@@ -49,11 +49,11 @@ class QWinRTImageEncoderControl : public QImageEncoderControl
 {
     Q_OBJECT
 public:
-    explicit QWinRTImageEncoderControl(QObject *parent = 0);
+    explicit QWinRTImageEncoderControl(QObject *parent = nullptr);
 
     QStringList supportedImageCodecs() const override;
     QString imageCodecDescription(const QString &codecName) const override;
-    QList<QSize> supportedResolutions(const QImageEncoderSettings &settings, bool *continuous = 0) const override;
+    QList<QSize> supportedResolutions(const QImageEncoderSettings &settings, bool *continuous = nullptr) const override;
     QImageEncoderSettings imageSettings() const override;
     void setImageSettings(const QImageEncoderSettings &settings) override;
 
diff --git a/src/plugins/winrt/qwinrtmediaplayercontrol.cpp b/src/plugins/winrt/qwinrtmediaplayercontrol.cpp
index fae8e6bf0..7991f435b 100644
--- a/src/plugins/winrt/qwinrtmediaplayercontrol.cpp
+++ b/src/plugins/winrt/qwinrtmediaplayercontrol.cpp
@@ -50,7 +50,7 @@
 #include <QtConcurrent/QtConcurrentRun>
 
 #include <dxgi.h>
-#include <oleauto.h>
+#include <OleAuto.h>
 #include <mfapi.h>
 #include <mfmediaengine.h>
 
@@ -138,7 +138,7 @@ public:
                 hr = d->engine->GetNativeVideoSize(&width, &height);
                 if (FAILED(hr))
                     break;
-                d->videoRenderer->setSize(QSize(width, height));
+                d->videoRenderer->setSize(QSize(int(width), int(height)));
             }
 
             newStatus = QMediaPlayer::LoadedMedia;
@@ -177,7 +177,7 @@ public:
             // If the media is already loaded, the playing event may not occur after stop
             if (d->mediaStatus != QMediaPlayer::LoadedMedia)
                 break;
-            // fall through
+            Q_FALLTHROUGH();
         }
         case MF_MEDIA_ENGINE_EVENT_PLAYING: {
             newState = QMediaPlayer::PlayingState;
@@ -206,7 +206,7 @@ public:
         case MF_MEDIA_ENGINE_EVENT_DURATIONCHANGE: {
             double duration = d->engine->GetDuration() * 1000;
             if (!qFuzzyCompare(d->duration, duration)) {
-                d->duration = duration;
+                d->duration = qint64(duration);
                 emit q->durationChanged(d->duration);
             }
             break;
@@ -214,7 +214,7 @@ public:
         case MF_MEDIA_ENGINE_EVENT_TIMEUPDATE: {
             double position = d->engine->GetCurrentTime() * 1000;
             if (!qFuzzyCompare(d->position, position)) {
-                d->position = position;
+                d->position = qint64(position);
                 emit q->positionChanged(d->position);
             }
             // Stopped state: paused at beginning
@@ -238,7 +238,7 @@ public:
             default:
             case MF_MEDIA_ENGINE_ERR_NOERROR:
                 newStatus = QMediaPlayer::UnknownMediaStatus;
-                emit q->error(QMediaPlayer::ResourceError, qt_error_string(param2));
+                emit q->error(QMediaPlayer::ResourceError, qt_error_string(int(param2)));
                 break;
             case MF_MEDIA_ENGINE_ERR_ABORTED:
                 if (d->mediaStatus == QMediaPlayer::StalledMedia || d->mediaStatus == QMediaPlayer::BufferingMedia)
@@ -299,19 +299,19 @@ public:
 
     DWORD __stdcall GetLength()
     {
-        return d->media.resources().length();
+        return DWORD(d->media.resources().length());
     }
 
     HRESULT __stdcall GetURL(DWORD index, BSTR *url)
     {
-        const QString resourceUrl = d->media.resources().value(index).url().toString();
+        const QString resourceUrl = d->media.resources().value(int(index)).url().toString();
         *url = SysAllocString((const OLECHAR *)resourceUrl.utf16());
         return S_OK;
     }
 
     HRESULT __stdcall GetType(DWORD index, BSTR *type)
     {
-        const QString resourceType = d->media.resources().value(index).mimeType();
+        const QString resourceType = d->media.resources().value(int(index)).mimeType();
         *type = SysAllocString((const OLECHAR *)resourceType.utf16());
         return S_OK;
     }
@@ -319,7 +319,7 @@ public:
     HRESULT __stdcall GetMedia(DWORD index, BSTR *media)
     {
         Q_UNUSED(index);
-        *media = NULL;
+        *media = nullptr;
         return S_OK;
     }
 
@@ -348,7 +348,7 @@ public:
 
     void read(QIODevice *device)
     {
-        bytesRead = device->read(reinterpret_cast<char *>(bytes), maxLength);
+        bytesRead = ULONG(device->read(reinterpret_cast<char *>(bytes), maxLength));
     }
 
     BYTE *bytes;
@@ -359,8 +359,8 @@ public:
 class MediaEngineByteStream : public RuntimeClass<RuntimeClassFlags<ClassicCom>, IMFByteStream>
 {
 public:
-    MediaEngineByteStream(QWinRTMediaPlayerControl *q_ptr, QWinRTMediaPlayerControlPrivate *d_ptr)
-        : q(q_ptr), d(d_ptr)
+    MediaEngineByteStream(QWinRTMediaPlayerControlPrivate *d_ptr)
+        : d(d_ptr)
     {
     }
 
@@ -392,7 +392,7 @@ public:
 
     HRESULT __stdcall SetCurrentPosition(QWORD position)
     {
-        qint64 pos(position);
+        const qint64 pos = qint64(position);
         if (pos >= d->stream->size()) {
             // MSDN states we should return E_INVALIDARG, but that immediately
             // stops playback and does not play remaining buffers in the queue.
@@ -413,7 +413,7 @@ public:
 
     HRESULT __stdcall Read(BYTE *bytes, ULONG maxlen, ULONG *bytesRead)
     {
-        *bytesRead = d->stream->read(reinterpret_cast<char *>(bytes), maxlen);
+        *bytesRead = ULONG(d->stream->read(reinterpret_cast<char *>(bytes), maxlen));
         return S_OK;
     }
 
@@ -508,7 +508,6 @@ public:
     }
 
 private:
-    QWinRTMediaPlayerControl *q;
     QWinRTMediaPlayerControlPrivate *d;
 
     ComPtr<IMFAsyncResult> asyncResult;
@@ -570,11 +569,7 @@ QWinRTMediaPlayerControl::QWinRTMediaPlayerControl(IMFMediaEngineClassFactory *f
     hr = d->engine->SetSourceElements(d->sources.Get());
     Q_ASSERT_SUCCEEDED(hr);
 
-    d->streamProvider = Make<MediaEngineByteStream>(this, d);
-}
-
-QWinRTMediaPlayerControl::~QWinRTMediaPlayerControl()
-{
+    d->streamProvider = Make<MediaEngineByteStream>(d);
 }
 
 QMediaPlayer::State QWinRTMediaPlayerControl::state() const
diff --git a/src/plugins/winrt/qwinrtmediaplayercontrol.h b/src/plugins/winrt/qwinrtmediaplayercontrol.h
index 174ba664b..0075cc954 100644
--- a/src/plugins/winrt/qwinrtmediaplayercontrol.h
+++ b/src/plugins/winrt/qwinrtmediaplayercontrol.h
@@ -53,8 +53,8 @@ class QWinRTMediaPlayerControl : public QMediaPlayerControl
 {
     Q_OBJECT
 public:
-    QWinRTMediaPlayerControl(IMFMediaEngineClassFactory *factory, QObject *parent = 0);
-    ~QWinRTMediaPlayerControl();
+    QWinRTMediaPlayerControl(IMFMediaEngineClassFactory *factory, QObject *parent = nullptr);
+    ~QWinRTMediaPlayerControl() override = default;
 
     QMediaPlayer::State state() const override;
     QMediaPlayer::MediaStatus mediaStatus() const override;
diff --git a/src/plugins/winrt/qwinrtmediaplayerservice.cpp b/src/plugins/winrt/qwinrtmediaplayerservice.cpp
index 3253ed188..208e7625b 100644
--- a/src/plugins/winrt/qwinrtmediaplayerservice.cpp
+++ b/src/plugins/winrt/qwinrtmediaplayerservice.cpp
@@ -70,9 +70,9 @@ QWinRTMediaPlayerService::QWinRTMediaPlayerService(QObject *parent)
     HRESULT hr = MFStartup(MF_VERSION);
     Q_ASSERT(SUCCEEDED(hr));
 
-    MULTI_QI results = { &IID_IUnknown, NULL, 0 };
-    hr = CoCreateInstanceFromApp(CLSID_MFMediaEngineClassFactory, NULL,
-                                 CLSCTX_INPROC_SERVER, NULL, 1, &results);
+    MULTI_QI results = { &IID_IUnknown, nullptr, 0 };
+    hr = CoCreateInstanceFromApp(CLSID_MFMediaEngineClassFactory, nullptr,
+                                 CLSCTX_INPROC_SERVER, nullptr, 1, &results);
     Q_ASSERT(SUCCEEDED(hr));
 
     hr = results.pItf->QueryInterface(d->factory.GetAddressOf());
diff --git a/src/plugins/winrt/qwinrtplayerrenderercontrol.cpp b/src/plugins/winrt/qwinrtplayerrenderercontrol.cpp
index ef8c4f21e..5952aa638 100644
--- a/src/plugins/winrt/qwinrtplayerrenderercontrol.cpp
+++ b/src/plugins/winrt/qwinrtplayerrenderercontrol.cpp
@@ -100,7 +100,7 @@ QWinRTPlayerRendererControl::QWinRTPlayerRendererControl(IMFMediaEngineEx *engin
     d->engine = engine;
     d->manager = manager;
     d->resetToken = resetToken;
-    d->deviceHandle = 0;
+    d->deviceHandle = nullptr;
 }
 
 QWinRTPlayerRendererControl::~QWinRTPlayerRendererControl()
diff --git a/src/plugins/winrt/qwinrtplayerrenderercontrol.h b/src/plugins/winrt/qwinrtplayerrenderercontrol.h
index 70f3c4af2..7653db46f 100644
--- a/src/plugins/winrt/qwinrtplayerrenderercontrol.h
+++ b/src/plugins/winrt/qwinrtplayerrenderercontrol.h
@@ -54,7 +54,7 @@ class QWinRTPlayerRendererControl : public QWinRTAbstractVideoRendererControl
     Q_OBJECT
 public:
     explicit QWinRTPlayerRendererControl(IMFMediaEngineEx *engine, IMFDXGIDeviceManager *manager, quint32 resetToken, QObject *parent);
-    ~QWinRTPlayerRendererControl();
+    ~QWinRTPlayerRendererControl() override;
 
     bool ensureReady();
 
diff --git a/src/plugins/winrt/qwinrtserviceplugin.h b/src/plugins/winrt/qwinrtserviceplugin.h
index 30a76022d..b0a4e5973 100644
--- a/src/plugins/winrt/qwinrtserviceplugin.h
+++ b/src/plugins/winrt/qwinrtserviceplugin.h
@@ -57,10 +57,10 @@ class QWinRTServicePlugin : public QMediaServiceProviderPlugin
     Q_INTERFACES(QMediaServiceDefaultDeviceInterface)
     Q_PLUGIN_METADATA(IID "org.qt-project.qt.mediaserviceproviderfactory/5.0" FILE "winrt.json")
 public:
-    QMediaService *create(QString const &key);
-    void release(QMediaService *service);
+    QMediaService *create(QString const &key) override;
+    void release(QMediaService *service) override;
 
-    QMediaServiceProviderHint::Features supportedFeatures(const QByteArray &service) const;
+    QMediaServiceProviderHint::Features supportedFeatures(const QByteArray &service) const override;
 
     QCamera::Position cameraPosition(const QByteArray &device) const override;
     int cameraOrientation(const QByteArray &device) const override;
diff --git a/src/plugins/winrt/qwinrtvideodeviceselectorcontrol.cpp b/src/plugins/winrt/qwinrtvideodeviceselectorcontrol.cpp
index 1095cd92f..59aa91b03 100644
--- a/src/plugins/winrt/qwinrtvideodeviceselectorcontrol.cpp
+++ b/src/plugins/winrt/qwinrtvideodeviceselectorcontrol.cpp
@@ -68,7 +68,7 @@ static QString deviceName(IDeviceInformation *device)
     Q_ASSERT_SUCCEEDED(hr);
     quint32 length;
     const wchar_t *buffer = id.GetRawBuffer(&length);
-    return QString::fromWCharArray(buffer, length);
+    return QString::fromWCharArray(buffer, int(length));
 }
 
 static QString deviceDescription(IDeviceInformation *device)
@@ -79,7 +79,7 @@ static QString deviceDescription(IDeviceInformation *device)
     Q_ASSERT_SUCCEEDED(hr);
     quint32 length;
     const wchar_t *buffer = name.GetRawBuffer(&length);
-    return QString::fromWCharArray(buffer, length);
+    return QString::fromWCharArray(buffer, int(length));
 }
 
 struct QWinRTVideoDeviceSelectorControlGlobal
@@ -179,7 +179,7 @@ private:
         Q_ASSERT_SUCCEEDED(hr);
         quint32 nameLength;
         const wchar_t *nameString = name.GetRawBuffer(&nameLength);
-        const int index = deviceIndex.take(QString::fromWCharArray(nameString, nameLength));
+        const int index = deviceIndex.take(QString::fromWCharArray(nameString, int(nameLength)));
         if (index >= 0)
             devices.remove(index);
 
@@ -356,7 +356,7 @@ int QWinRTVideoDeviceSelectorControl::cameraOrientation(const QString &deviceNam
     quint32 rotation;
     hr = enclosure2->get_RotationAngleInDegreesClockwise(&rotation);
     RETURN_IF_FAILED("Failed to get camera rotation angle", return 0);
-    return rotation;
+    return int(rotation);
 }
 
 QList<QByteArray> QWinRTVideoDeviceSelectorControl::deviceNames()
diff --git a/src/plugins/winrt/qwinrtvideodeviceselectorcontrol.h b/src/plugins/winrt/qwinrtvideodeviceselectorcontrol.h
index 3beb9782a..a9ddaf9fd 100644
--- a/src/plugins/winrt/qwinrtvideodeviceselectorcontrol.h
+++ b/src/plugins/winrt/qwinrtvideodeviceselectorcontrol.h
@@ -62,8 +62,8 @@ class QWinRTVideoDeviceSelectorControl : public QVideoDeviceSelectorControl
 {
     Q_OBJECT
 public:
-    explicit QWinRTVideoDeviceSelectorControl(QObject *parent = 0);
-    ~QWinRTVideoDeviceSelectorControl();
+    explicit QWinRTVideoDeviceSelectorControl(QObject *parent = nullptr);
+    ~QWinRTVideoDeviceSelectorControl() override;
 
     int deviceCount() const override;
 
diff --git a/src/plugins/winrt/qwinrtvideoprobecontrol.h b/src/plugins/winrt/qwinrtvideoprobecontrol.h
index 972720c96..2a79cb91d 100644
--- a/src/plugins/winrt/qwinrtvideoprobecontrol.h
+++ b/src/plugins/winrt/qwinrtvideoprobecontrol.h
@@ -49,7 +49,7 @@ class QWinRTVideoProbeControl : public QMediaVideoProbeControl
     Q_OBJECT
 public:
     explicit QWinRTVideoProbeControl(QWinRTCameraVideoRendererControl *parent);
-    ~QWinRTVideoProbeControl();
+    ~QWinRTVideoProbeControl() override;
 };
 
 QT_END_NAMESPACE