1 files changed, 27 insertions, 77 deletions

diff --git a/src/printsupport/platform/windows/qprintengine_win_p.h b/src/printsupport/platform/windows/qprintengine_win_p.h
index eb8609e511..995c31ff1e 100644
--- a/src/printsupport/platform/windows/qprintengine_win_p.h
+++ b/src/printsupport/platform/windows/qprintengine_win_p.h
@@ -1,41 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2020 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtPrintSupport module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2020 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
 #ifndef QPRINTENGINE_WIN_P_H
 #define QPRINTENGINE_WIN_P_H
@@ -119,25 +83,9 @@ class QWin32PrintEnginePrivate : public QAlphaPaintEnginePrivate
     Q_DECLARE_PUBLIC(QWin32PrintEngine)
 public:
     QWin32PrintEnginePrivate() :
-        hPrinter(0),
-        globalDevMode(0),
-        devMode(0),
-        pInfo(0),
-        hMem(0),
-        hdc(0),
-        ownsDevMode(false),
-        mode(QPrinter::ScreenResolution),
-        state(QPrinter::Idle),
-        resolution(0),
-        m_pageLayout(QPageLayout(QPageSize(QPageSize::A4), QPageLayout::Portrait, QMarginsF(0, 0, 0, 0))),
-        stretch_x(1), stretch_y(1), origin_x(0), origin_y(0),
-        dpi_x(96), dpi_y(96), dpi_display(96),
-        num_copies(1),
-        printToFile(false),
-        reinit(false),
+        printToFile(false), reinit(false),
         complex_xform(false), has_pen(false), has_brush(false), has_custom_paper_size(false),
-        embed_fonts(true),
-        txop(0 /* QTransform::TxNone */)
+        embed_fonts(true)
     {
     }
 
@@ -163,6 +111,8 @@ public:
        is handled in the next begin or newpage. */
     void doReinit();
 
+    static void initializeDevMode(DEVMODE *);
+
     bool resetDC();
 
     void strokePath(const QPainterPath &path, const QColor &color);
@@ -178,19 +128,19 @@ public:
     void debugMetrics() const;
 
     // Windows GDI printer references.
-    HANDLE hPrinter;
+    HANDLE hPrinter = nullptr;
 
-    HGLOBAL globalDevMode;
-    DEVMODE *devMode;
-    PRINTER_INFO_2 *pInfo;
-    HGLOBAL hMem;
+    HGLOBAL globalDevMode = nullptr;
+    DEVMODE *devMode = nullptr;
+    PRINTER_INFO_2 *pInfo = nullptr;
+    HGLOBAL hMem = nullptr;
 
-    HDC hdc;
+    HDC hdc = nullptr;
 
     // True if devMode was allocated separately from pInfo.
-    bool ownsDevMode;
+    bool ownsDevMode = false;
 
-    QPrinter::PrinterMode mode;
+    QPrinter::PrinterMode mode = QPrinter::ScreenResolution;
 
     // Print Device
     QPrintDevice m_printDevice;
@@ -200,26 +150,26 @@ public:
     QString m_creator;
     QString fileName;
 
-    QPrinter::PrinterState state;
-    int resolution;
+    QPrinter::PrinterState state = QPrinter::Idle;
+    int resolution = 0;
 
     // Page Layout
-    QPageLayout m_pageLayout;
-
+    QPageLayout m_pageLayout{QPageSize(QPageSize::A4),
+                             QPageLayout::Portrait, QMarginsF{0, 0, 0, 0}};
     // Page metrics cache
     QRect m_paintRectPixels;
     QSize m_paintSizeMM;
 
     // Windows painting
-    qreal stretch_x;
-    qreal stretch_y;
-    int origin_x;
-    int origin_y;
+    qreal stretch_x = 1;
+    qreal stretch_y = 1;
+    int origin_x = 0;
+    int origin_y = 0;
 
-    int dpi_x;
-    int dpi_y;
-    int dpi_display;
-    int num_copies;
+    int dpi_x = 96;
+    int dpi_y = 96;
+    int dpi_display = 96;
+    int num_copies = 1;
 
     uint printToFile : 1;
     uint reinit : 1;
@@ -230,7 +180,7 @@ public:
     uint has_custom_paper_size : 1;
     uint embed_fonts : 1;
 
-    uint txop;
+    uint txop = 0; // QTransform::TxNone
 
     QColor brush_color;
     QPen pen;