Direct2D QPA: Fix g++ warnings

Fix warnings like:
qwindowsdirect2dpaintengine.cpp:722:107: error: format '%x' expects argument of type 'unsigned int', but argument 4 has type 'HRESULT {aka long int}' [-Werror=format=]
                     qWarning("%s: Could not convert Direct2D linear gradient brush: %#x", __FUNCTION__, hr);

qwindowsdirect2dintegration.cpp:112:88: error: passing NULL to non-pointer argument 2 of 'WINBOOL GetFileVersionInfoW(LPCWSTR, DWORD, DWORD, LPVOID)' [-Werror=conversion-null]
                     if (GetFileVersionInfo(filename, NULL, versionInfoSize, info.data())) {
                                                                                        ^

Change-Id: Ie03abdb5f4ba47b4803c283b9a4ec10181aae76e
Reviewed-by: Louai Al-Khanji <louai.al-khanji@qt.io>

6 files changed, 41 insertions, 41 deletions

diff --git a/src/plugins/platforms/direct2d/qwindowsdirect2dbitmap.cpp b/src/plugins/platforms/direct2d/qwindowsdirect2dbitmap.cpp
index 57491cb5b0..38425f8fa1 100644
--- a/src/plugins/platforms/direct2d/qwindowsdirect2dbitmap.cpp
+++ b/src/plugins/platforms/direct2d/qwindowsdirect2dbitmap.cpp
@@ -90,7 +90,7 @@ public:
         if (SUCCEEDED(hr))
             deviceContext->get()->SetTarget(bitmap.Get());
         else
-            qWarning("%s: Could not create bitmap: %#x", __FUNCTION__, hr);
+            qWarning("%s: Could not create bitmap: %#lx", __FUNCTION__, hr);
 
         return SUCCEEDED(hr);
     }
@@ -108,23 +108,23 @@ public:
         D2D1_BITMAP_PROPERTIES1 properties = bitmapProperties();
         properties.bitmapOptions = D2D1_BITMAP_OPTIONS_CANNOT_DRAW | D2D1_BITMAP_OPTIONS_CPU_READ;
 
-        hr = deviceContext->get()->CreateBitmap(size, NULL, NULL,
+        hr = deviceContext->get()->CreateBitmap(size, NULL, 0,
                                                 properties, &mappingCopy);
         if (FAILED(hr)) {
-            qWarning("%s: Could not create bitmap: %#x", __FUNCTION__, hr);
+            qWarning("%s: Could not create bitmap: %#lx", __FUNCTION__, hr);
             return QImage();
         }
 
         hr = mappingCopy->CopyFromBitmap(NULL, bitmap.Get(), NULL);
         if (FAILED(hr)) {
-            qWarning("%s: Could not copy from bitmap: %#x", __FUNCTION__, hr);
+            qWarning("%s: Could not copy from bitmap: %#lx", __FUNCTION__, hr);
             return QImage();
         }
 
         D2D1_MAPPED_RECT mappedRect;
         hr = mappingCopy->Map(D2D1_MAP_OPTIONS_READ, &mappedRect);
         if (FAILED(hr)) {
-            qWarning("%s: Could not map: %#x", __FUNCTION__, hr);
+            qWarning("%s: Could not map: %#lx", __FUNCTION__, hr);
             return QImage();
         }
 
diff --git a/src/plugins/platforms/direct2d/qwindowsdirect2dcontext.cpp b/src/plugins/platforms/direct2d/qwindowsdirect2dcontext.cpp
index 5af0fcabe9..a5817016e6 100644
--- a/src/plugins/platforms/direct2d/qwindowsdirect2dcontext.cpp
+++ b/src/plugins/platforms/direct2d/qwindowsdirect2dcontext.cpp
@@ -84,7 +84,7 @@ public:
         }
 
         if (FAILED(hr)) {
-            qWarning("%s: Could not create Direct3D Device: %#x", __FUNCTION__, hr);
+            qWarning("%s: Could not create Direct3D Device: %#lx", __FUNCTION__, hr);
             return false;
         }
 
@@ -93,7 +93,7 @@ public:
 
         hr = d3dDevice.As(&dxgiDevice);
         if (FAILED(hr)) {
-            qWarning("%s: DXGI Device interface query failed on D3D Device: %#x", __FUNCTION__, hr);
+            qWarning("%s: DXGI Device interface query failed on D3D Device: %#lx", __FUNCTION__, hr);
             return false;
         }
 
@@ -102,13 +102,13 @@ public:
 
         hr = dxgiDevice->GetAdapter(&dxgiAdapter);
         if (FAILED(hr)) {
-            qWarning("%s: Failed to probe DXGI Device for parent DXGI Adapter: %#x", __FUNCTION__, hr);
+            qWarning("%s: Failed to probe DXGI Device for parent DXGI Adapter: %#lx", __FUNCTION__, hr);
             return false;
         }
 
         hr = dxgiAdapter->GetParent(IID_PPV_ARGS(&dxgiFactory));
         if (FAILED(hr)) {
-            qWarning("%s: Failed to probe DXGI Adapter for parent DXGI Factory: %#x", __FUNCTION__, hr);
+            qWarning("%s: Failed to probe DXGI Adapter for parent DXGI Factory: %#lx", __FUNCTION__, hr);
             return false;
         }
 
@@ -121,26 +121,26 @@ public:
 
         hr = D2D1CreateFactory(D2D1_FACTORY_TYPE_SINGLE_THREADED, options, d2dFactory.GetAddressOf());
         if (FAILED(hr)) {
-            qWarning("%s: Could not create Direct2D Factory: %#x", __FUNCTION__, hr);
+            qWarning("%s: Could not create Direct2D Factory: %#lx", __FUNCTION__, hr);
             return false;
         }
 
         hr = d2dFactory->CreateDevice(dxgiDevice.Get(), &d2dDevice);
         if (FAILED(hr)) {
-            qWarning("%s: Could not create D2D Device: %#x", __FUNCTION__, hr);
+            qWarning("%s: Could not create D2D Device: %#lx", __FUNCTION__, hr);
             return false;
         }
 
         hr = DWriteCreateFactory(DWRITE_FACTORY_TYPE_SHARED, __uuidof(IDWriteFactory),
                                  static_cast<IUnknown **>(&directWriteFactory));
         if (FAILED(hr)) {
-            qWarning("%s: Could not create DirectWrite factory: %#x", __FUNCTION__, hr);
+            qWarning("%s: Could not create DirectWrite factory: %#lx", __FUNCTION__, hr);
             return false;
         }
 
         hr = directWriteFactory->GetGdiInterop(&directWriteGdiInterop);
         if (FAILED(hr)) {
-            qWarning("%s: Could not create DirectWrite GDI Interop: %#x", __FUNCTION__, hr);
+            qWarning("%s: Could not create DirectWrite GDI Interop: %#lx", __FUNCTION__, hr);
             return false;
         }
 
diff --git a/src/plugins/platforms/direct2d/qwindowsdirect2ddevicecontext.cpp b/src/plugins/platforms/direct2d/qwindowsdirect2ddevicecontext.cpp
index be6a50a139..8a34f6974f 100644
--- a/src/plugins/platforms/direct2d/qwindowsdirect2ddevicecontext.cpp
+++ b/src/plugins/platforms/direct2d/qwindowsdirect2ddevicecontext.cpp
@@ -57,7 +57,7 @@ public:
                         D2D1_DEVICE_CONTEXT_OPTIONS_NONE,
                         &deviceContext);
             if (Q_UNLIKELY(FAILED(hr)))
-                qFatal("%s: Couldn't create Direct2D Device Context: %#x", __FUNCTION__, hr);
+                qFatal("%s: Couldn't create Direct2D Device Context: %#lx", __FUNCTION__, hr);
         }
 
         Q_ASSERT(deviceContext);
diff --git a/src/plugins/platforms/direct2d/qwindowsdirect2dintegration.cpp b/src/plugins/platforms/direct2d/qwindowsdirect2dintegration.cpp
index 478995ad1c..ea51135583 100644
--- a/src/plugins/platforms/direct2d/qwindowsdirect2dintegration.cpp
+++ b/src/plugins/platforms/direct2d/qwindowsdirect2dintegration.cpp
@@ -104,7 +104,7 @@ public:
                 DWORD versionInfoSize = GetFileVersionInfoSize(filename, NULL);
                 if (versionInfoSize) {
                     QVarLengthArray<BYTE> info(static_cast<int>(versionInfoSize));
-                    if (GetFileVersionInfo(filename, NULL, versionInfoSize, info.data())) {
+                    if (GetFileVersionInfo(filename, 0, versionInfoSize, info.data())) {
                         UINT size;
                         DWORD *fi;
 
diff --git a/src/plugins/platforms/direct2d/qwindowsdirect2dpaintengine.cpp b/src/plugins/platforms/direct2d/qwindowsdirect2dpaintengine.cpp
index a9e66d2586..85f333ac78 100644
--- a/src/plugins/platforms/direct2d/qwindowsdirect2dpaintengine.cpp
+++ b/src/plugins/platforms/direct2d/qwindowsdirect2dpaintengine.cpp
@@ -142,13 +142,13 @@ public:
     {
         HRESULT hr = factory()->CreatePathGeometry(&m_geometry);
         if (FAILED(hr)) {
-            qWarning("%s: Could not create path geometry: %#x", __FUNCTION__, hr);
+            qWarning("%s: Could not create path geometry: %#lx", __FUNCTION__, hr);
             return false;
         }
 
         hr = m_geometry->Open(&m_sink);
         if (FAILED(hr)) {
-            qWarning("%s: Could not create geometry sink: %#x", __FUNCTION__, hr);
+            qWarning("%s: Could not create geometry sink: %#lx", __FUNCTION__, hr);
             return false;
         }
 
@@ -606,7 +606,7 @@ public:
         }
 
         if (FAILED(hr))
-            qWarning("%s: Could not create stroke style: %#x", __FUNCTION__, hr);
+            qWarning("%s: Could not create stroke style: %#lx", __FUNCTION__, hr);
     }
 
     ComPtr<ID2D1Brush> to_d2d_brush(const QBrush &newBrush, bool *needsEmulation)
@@ -628,13 +628,13 @@ public:
 
             hr = dc()->CreateSolidColorBrush(to_d2d_color_f(newBrush.color()), &solid);
             if (FAILED(hr)) {
-                qWarning("%s: Could not create solid color brush: %#x", __FUNCTION__, hr);
+                qWarning("%s: Could not create solid color brush: %#lx", __FUNCTION__, hr);
                 break;
             }
 
             hr = solid.As(&result);
             if (FAILED(hr))
-                qWarning("%s: Could not convert solid color brush: %#x", __FUNCTION__, hr);
+                qWarning("%s: Could not convert solid color brush: %#lx", __FUNCTION__, hr);
         }
             break;
 
@@ -674,13 +674,13 @@ public:
                                          bitmapBrushProperties,
                                          &bitmapBrush);
             if (FAILED(hr)) {
-                qWarning("%s: Could not create Direct2D bitmap brush for Qt pattern brush: %#x", __FUNCTION__, hr);
+                qWarning("%s: Could not create Direct2D bitmap brush for Qt pattern brush: %#lx", __FUNCTION__, hr);
                 break;
             }
 
             hr = bitmapBrush.As(&result);
             if (FAILED(hr))
-                qWarning("%s: Could not convert Direct2D bitmap brush for Qt pattern brush: %#x", __FUNCTION__, hr);
+                qWarning("%s: Could not convert Direct2D bitmap brush for Qt pattern brush: %#lx", __FUNCTION__, hr);
         }
             break;
 
@@ -703,20 +703,20 @@ public:
                                                         UINT32(stops.size()),
                                                         &gradientStopCollection);
                 if (FAILED(hr)) {
-                    qWarning("%s: Could not create gradient stop collection for linear gradient: %#x", __FUNCTION__, hr);
+                    qWarning("%s: Could not create gradient stop collection for linear gradient: %#lx", __FUNCTION__, hr);
                     break;
                 }
 
                 hr = dc()->CreateLinearGradientBrush(linearGradientBrushProperties, gradientStopCollection.Get(),
                                                      &linear);
                 if (FAILED(hr)) {
-                    qWarning("%s: Could not create Direct2D linear gradient brush: %#x", __FUNCTION__, hr);
+                    qWarning("%s: Could not create Direct2D linear gradient brush: %#lx", __FUNCTION__, hr);
                     break;
                 }
 
                 hr = linear.As(&result);
                 if (FAILED(hr)) {
-                    qWarning("%s: Could not convert Direct2D linear gradient brush: %#x", __FUNCTION__, hr);
+                    qWarning("%s: Could not convert Direct2D linear gradient brush: %#lx", __FUNCTION__, hr);
                     break;
                 }
             }
@@ -741,20 +741,20 @@ public:
 
                 hr = dc()->CreateGradientStopCollection(stops.constData(), stops.size(), &gradientStopCollection);
                 if (FAILED(hr)) {
-                    qWarning("%s: Could not create gradient stop collection for radial gradient: %#x", __FUNCTION__, hr);
+                    qWarning("%s: Could not create gradient stop collection for radial gradient: %#lx", __FUNCTION__, hr);
                     break;
                 }
 
                 hr = dc()->CreateRadialGradientBrush(radialGradientBrushProperties, gradientStopCollection.Get(),
                                                      &radial);
                 if (FAILED(hr)) {
-                    qWarning("%s: Could not create Direct2D radial gradient brush: %#x", __FUNCTION__, hr);
+                    qWarning("%s: Could not create Direct2D radial gradient brush: %#lx", __FUNCTION__, hr);
                     break;
                 }
 
                 radial.As(&result);
                 if (FAILED(hr)) {
-                    qWarning("%s: Could not convert Direct2D radial gradient brush: %#x", __FUNCTION__, hr);
+                    qWarning("%s: Could not convert Direct2D radial gradient brush: %#lx", __FUNCTION__, hr);
                     break;
                 }
             }
@@ -780,13 +780,13 @@ public:
                                          &bitmapBrush);
 
             if (FAILED(hr)) {
-                qWarning("%s: Could not create texture brush: %#x", __FUNCTION__, hr);
+                qWarning("%s: Could not create texture brush: %#lx", __FUNCTION__, hr);
                 break;
             }
 
             hr = bitmapBrush.As(&result);
             if (FAILED(hr))
-                qWarning("%s: Could not convert texture brush: %#x", __FUNCTION__, hr);
+                qWarning("%s: Could not convert texture brush: %#lx", __FUNCTION__, hr);
         }
             break;
         }
@@ -1046,13 +1046,13 @@ public:
         ComPtr<IDWriteFont> dwriteFont;
         HRESULT hr = QWindowsDirect2DContext::instance()->dwriteGdiInterop()->CreateFontFromLOGFONT(&lf, &dwriteFont);
         if (FAILED(hr)) {
-            qDebug("%s: CreateFontFromLOGFONT failed: %#x", __FUNCTION__, hr);
+            qDebug("%s: CreateFontFromLOGFONT failed: %#lx", __FUNCTION__, hr);
             return fontFace;
         }
 
         hr = dwriteFont->CreateFontFace(&fontFace);
         if (FAILED(hr)) {
-            qDebug("%s: CreateFontFace failed: %#x", __FUNCTION__, hr);
+            qDebug("%s: CreateFontFace failed: %#lx", __FUNCTION__, hr);
             return fontFace;
         }
 
@@ -1515,7 +1515,7 @@ void QWindowsDirect2DPaintEngine::drawPixmap(const QRectF &r,
                                                                bitmap->bitmap(),
                                                                &d2d_sr);
             if (FAILED(hr)) {
-                qWarning("%s: Could not copy source rect area from source bitmap to intermediate bitmap: %#x", __FUNCTION__, hr);
+                qWarning("%s: Could not copy source rect area from source bitmap to intermediate bitmap: %#lx", __FUNCTION__, hr);
                 return;
             }
         } else {
@@ -1530,7 +1530,7 @@ void QWindowsDirect2DPaintEngine::drawPixmap(const QRectF &r,
                                                                bitmap->bitmap(),
                                                                NULL);
             if (FAILED(hr)) {
-                qWarning("%s: Could not copy source bitmap to intermediate bitmap: %#x", __FUNCTION__, hr);
+                qWarning("%s: Could not copy source bitmap to intermediate bitmap: %#lx", __FUNCTION__, hr);
                 return;
             }
         }
diff --git a/src/plugins/platforms/direct2d/qwindowsdirect2dwindow.cpp b/src/plugins/platforms/direct2d/qwindowsdirect2dwindow.cpp
index b5543b7c37..21294cfb15 100644
--- a/src/plugins/platforms/direct2d/qwindowsdirect2dwindow.cpp
+++ b/src/plugins/platforms/direct2d/qwindowsdirect2dwindow.cpp
@@ -66,7 +66,7 @@ QWindowsDirect2DWindow::QWindowsDirect2DWindow(QWindow *window, const QWindowsWi
                 D2D1_DEVICE_CONTEXT_OPTIONS_NONE,
                 m_deviceContext.GetAddressOf());
     if (FAILED(hr))
-        qWarning("%s: Couldn't create Direct2D Device context: %#x", __FUNCTION__, hr);
+        qWarning("%s: Couldn't create Direct2D Device context: %#lx", __FUNCTION__, hr);
 }
 
 QWindowsDirect2DWindow::~QWindowsDirect2DWindow()
@@ -200,7 +200,7 @@ void QWindowsDirect2DWindow::setupSwapChain()
                 m_swapChain.ReleaseAndGetAddressOf());            // [out]  IDXGISwapChain1 **ppSwapChain
 
     if (FAILED(hr))
-        qWarning("%s: Could not create swap chain: %#x", __FUNCTION__, hr);
+        qWarning("%s: Could not create swap chain: %#lx", __FUNCTION__, hr);
 
     m_needsFullFlush = true;
 }
@@ -220,7 +220,7 @@ void QWindowsDirect2DWindow::resizeSwapChain(const QSize &size)
                                             DXGI_FORMAT_UNKNOWN,
                                             0);
     if (FAILED(hr))
-        qWarning("%s: Could not resize swap chain: %#x", __FUNCTION__, hr);
+        qWarning("%s: Could not resize swap chain: %#lx", __FUNCTION__, hr);
 }
 
 QSharedPointer<QWindowsDirect2DBitmap> QWindowsDirect2DWindow::copyBackBuffer() const
@@ -247,13 +247,13 @@ QSharedPointer<QWindowsDirect2DBitmap> QWindowsDirect2DWindow::copyBackBuffer()
     HRESULT hr = m_deviceContext.Get()->CreateBitmap(size, NULL, 0, properties, &copy);
 
     if (FAILED(hr)) {
-        qWarning("%s: Could not create staging bitmap: %#x", __FUNCTION__, hr);
+        qWarning("%s: Could not create staging bitmap: %#lx", __FUNCTION__, hr);
         return null_result;
     }
 
     hr = copy.Get()->CopyFromBitmap(NULL, m_bitmap->bitmap(), NULL);
     if (FAILED(hr)) {
-        qWarning("%s: Could not copy from bitmap! %#x", __FUNCTION__, hr);
+        qWarning("%s: Could not copy from bitmap! %#lx", __FUNCTION__, hr);
         return null_result;
     }
 
@@ -276,7 +276,7 @@ void QWindowsDirect2DWindow::setupBitmap()
     if (m_directRendering) {
         hr = m_swapChain->GetBuffer(0, IID_PPV_ARGS(&backBufferSurface));
         if (FAILED(hr)) {
-            qWarning("%s: Could not query backbuffer for DXGI Surface: %#x", __FUNCTION__, hr);
+            qWarning("%s: Could not query backbuffer for DXGI Surface: %#lx", __FUNCTION__, hr);
             return;
         }
     } else {
@@ -301,7 +301,7 @@ void QWindowsDirect2DWindow::setupBitmap()
     ComPtr<ID2D1Bitmap1> backBufferBitmap;
     hr = m_deviceContext->CreateBitmapFromDxgiSurface(backBufferSurface.Get(), NULL, backBufferBitmap.GetAddressOf());
     if (FAILED(hr)) {
-        qWarning("%s: Could not create Direct2D Bitmap from DXGI Surface: %#x", __FUNCTION__, hr);
+        qWarning("%s: Could not create Direct2D Bitmap from DXGI Surface: %#lx", __FUNCTION__, hr);
         return;
     }