Merge remote-tracking branch 'origin/5.6' into 5.7

Change-Id: I51bb4162845894f4757a0d0dc40e2c04af546f06

10 files changed, 153 insertions, 136 deletions

diff --git a/src/activeqt/container/qaxwidget.cpp b/src/activeqt/container/qaxwidget.cpp
index 22febc9..2dd4c31 100644
--- a/src/activeqt/container/qaxwidget.cpp
+++ b/src/activeqt/container/qaxwidget.cpp
@@ -1779,6 +1779,8 @@ void QAxHostWidget::focusOutEvent(QFocusEvent *e)
     axhost->m_spInPlaceObject->UIDeactivate();
 }
 
+Q_GUI_EXPORT HBITMAP qt_pixmapToWinHBITMAP(const QPixmap &p, int hbitmapFormat = 0);
+Q_GUI_EXPORT QPixmap qt_pixmapFromWinHBITMAP(HBITMAP bitmap, int hbitmapFormat = 0);
 
 void QAxHostWidget::paintEvent(QPaintEvent*)
 {
@@ -1797,7 +1799,7 @@ void QAxHostWidget::paintEvent(QPaintEvent*)
     QPixmap pm(qaxNativeWidgetSize(this));
     pm.fill();
 
-    HBITMAP hBmp = qaxPixmapToWinHBITMAP(pm);
+    HBITMAP hBmp = qt_pixmapToWinHBITMAP(pm);
     HDC hBmp_hdc = CreateCompatibleDC(qt_win_display_dc());
     HGDIOBJ old_hBmp = SelectObject(hBmp_hdc, hBmp);
 
@@ -1811,7 +1813,7 @@ void QAxHostWidget::paintEvent(QPaintEvent*)
     view->Release();
 
     QPainter painter(this);
-    QPixmap pixmap = qaxPixmapFromWinHBITMAP(hBmp);
+    QPixmap pixmap = qt_pixmapFromWinHBITMAP(hBmp);
     pixmap.setDevicePixelRatio(devicePixelRatioF());
     painter.drawPixmap(0, 0, pixmap);
 
diff --git a/src/activeqt/control/qaxserverbase.cpp b/src/activeqt/control/qaxserverbase.cpp
index d6af214..b131e76 100644
--- a/src/activeqt/control/qaxserverbase.cpp
+++ b/src/activeqt/control/qaxserverbase.cpp
@@ -3097,6 +3097,8 @@ HRESULT WINAPI QAxServerBase::Save(LPCOLESTR fileName, BOOL fRemember)
     return E_FAIL;
 }
 
+Q_GUI_EXPORT HBITMAP qt_pixmapToWinHBITMAP(const QPixmap &p, int hbitmapFormat = 0);
+
 //**** IViewObject
 /*
     Draws the widget into the provided device context.
@@ -3135,7 +3137,7 @@ HRESULT WINAPI QAxServerBase::Draw(DWORD dwAspect, LONG /* lindex */, void * /*
         ::LPtoDP(hicTargetDev, (LPPOINT)&rc, 2);
 
     const QPixmap pm = qt.widget->grab();
-    HBITMAP hbm = qaxPixmapToWinHBITMAP(pm);
+    HBITMAP hbm = qt_pixmapToWinHBITMAP(pm);
     HDC hdc = CreateCompatibleDC(0);
     SelectObject(hdc, hbm);
     ::StretchBlt(hdcDraw, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, hdc, 0, 0,pm.width(), pm.height(), SRCCOPY);
diff --git a/src/activeqt/shared/qaxtypes.cpp b/src/activeqt/shared/qaxtypes.cpp
index ba11ac2..df3b655 100644
--- a/src/activeqt/shared/qaxtypes.cpp
+++ b/src/activeqt/shared/qaxtypes.cpp
@@ -128,6 +128,9 @@ static QFont IFontToQFont(IFont *f)
     return font;
 }
 
+Q_GUI_EXPORT HBITMAP qt_pixmapToWinHBITMAP(const QPixmap &p, int hbitmapFormat = 0);
+Q_GUI_EXPORT QPixmap qt_pixmapFromWinHBITMAP(HBITMAP bitmap, int hbitmapFormat = 0);
+
 static IPictureDisp *QPixmapToIPicture(const QPixmap &pixmap)
 {
     IPictureDisp *pic = 0;
@@ -140,7 +143,7 @@ static IPictureDisp *QPixmapToIPicture(const QPixmap &pixmap)
     desc.bmp.hpal = 0;
 
     if (!pixmap.isNull()) {
-        desc.bmp.hbitmap = qaxPixmapToWinHBITMAP(pixmap);
+        desc.bmp.hbitmap = qt_pixmapToWinHBITMAP(pixmap);
         Q_ASSERT(desc.bmp.hbitmap);
     }
 
@@ -167,7 +170,7 @@ static QPixmap IPictureToQPixmap(IPicture *ipic)
     if (!hbm)
         return QPixmap();
 
-    return qaxPixmapFromWinHBITMAP(hbm);
+    return qt_pixmapFromWinHBITMAP(hbm);
 }
 
 static QDateTime DATEToQDateTime(DATE ole)
diff --git a/src/activeqt/shared/qaxutils.cpp b/src/activeqt/shared/qaxutils.cpp
index 7c7e967..51c0a1b 100644
--- a/src/activeqt/shared/qaxutils.cpp
+++ b/src/activeqt/shared/qaxutils.cpp
@@ -72,128 +72,6 @@ HWND hwndForWidget(QWidget *widget)
     return 0;
 }
 
-// Code courtesy of the Windows platform plugin (see pixmaputils.cpp/h).
-HBITMAP qaxPixmapToWinHBITMAP(const QPixmap &p, HBitmapFormat format)
-{
-    if (p.isNull())
-        return 0;
-
-    HBITMAP bitmap = 0;
-    if (p.handle()->classId() != QPlatformPixmap::RasterClass) {
-        QRasterPlatformPixmap *data = new QRasterPlatformPixmap(p.depth() == 1 ?
-            QRasterPlatformPixmap::BitmapType : QRasterPlatformPixmap::PixmapType);
-        data->fromImage(p.toImage(), Qt::AutoColor);
-        return qaxPixmapToWinHBITMAP(QPixmap(data), format);
-    }
-
-    QRasterPlatformPixmap *d = static_cast<QRasterPlatformPixmap*>(p.handle());
-    const QImage *rasterImage = d->buffer();
-    const int w = rasterImage->width();
-    const int h = rasterImage->height();
-
-    HDC display_dc = GetDC(0);
-
-    // Define the header
-    BITMAPINFO bmi;
-    memset(&bmi, 0, sizeof(bmi));
-    bmi.bmiHeader.biSize        = sizeof(BITMAPINFOHEADER);
-    bmi.bmiHeader.biWidth       = w;
-    bmi.bmiHeader.biHeight      = -h;
-    bmi.bmiHeader.biPlanes      = 1;
-    bmi.bmiHeader.biBitCount    = 32;
-    bmi.bmiHeader.biCompression = BI_RGB;
-    bmi.bmiHeader.biSizeImage   = w * h * 4;
-
-    // Create the pixmap
-    uchar *pixels = 0;
-    bitmap = CreateDIBSection(display_dc, &bmi, DIB_RGB_COLORS, (void **) &pixels, 0, 0);
-    ReleaseDC(0, display_dc);
-    if (!bitmap) {
-        qErrnoWarning("%s, failed to create dibsection", __FUNCTION__);
-        return 0;
-    }
-    if (!pixels) {
-        qErrnoWarning("%s, did not allocate pixel data", __FUNCTION__);
-        return 0;
-    }
-
-    // Copy over the data
-    QImage::Format imageFormat = QImage::Format_ARGB32;
-    if (format == HBitmapAlpha)
-        imageFormat = QImage::Format_RGB32;
-    else if (format == HBitmapPremultipliedAlpha)
-        imageFormat = QImage::Format_ARGB32_Premultiplied;
-    const QImage image = rasterImage->convertToFormat(imageFormat);
-    const int bytes_per_line = w * 4;
-    for (int y=0; y < h; ++y)
-        memcpy(pixels + y * bytes_per_line, image.scanLine(y), bytes_per_line);
-
-    return bitmap;
-}
-
-QPixmap qaxPixmapFromWinHBITMAP(HBITMAP bitmap, HBitmapFormat format)
-{
-    // Verify size
-    BITMAP bitmap_info;
-    memset(&bitmap_info, 0, sizeof(BITMAP));
-
-    const int res = GetObject(bitmap, sizeof(BITMAP), &bitmap_info);
-    if (!res) {
-        qErrnoWarning("QPixmap::fromWinHBITMAP(), failed to get bitmap info");
-        return QPixmap();
-    }
-    const int w = bitmap_info.bmWidth;
-    const int h = bitmap_info.bmHeight;
-
-    BITMAPINFO bmi;
-    memset(&bmi, 0, sizeof(bmi));
-    bmi.bmiHeader.biSize        = sizeof(BITMAPINFOHEADER);
-    bmi.bmiHeader.biWidth       = w;
-    bmi.bmiHeader.biHeight      = -h;
-    bmi.bmiHeader.biPlanes      = 1;
-    bmi.bmiHeader.biBitCount    = 32;
-    bmi.bmiHeader.biCompression = BI_RGB;
-    bmi.bmiHeader.biSizeImage   = w * h * 4;
-
-    // Get bitmap bits
-    QScopedArrayPointer<uchar> data(new uchar[bmi.bmiHeader.biSizeImage]);
-    HDC display_dc = GetDC(0);
-    if (!GetDIBits(display_dc, bitmap, 0, h, data.data(), &bmi, DIB_RGB_COLORS)) {
-        ReleaseDC(0, display_dc);
-        qWarning("%s, failed to get bitmap bits", __FUNCTION__);
-        return QPixmap();
-    }
-
-    QImage::Format imageFormat = QImage::Format_ARGB32_Premultiplied;
-    uint mask = 0;
-    if (format == HBitmapNoAlpha) {
-        imageFormat = QImage::Format_RGB32;
-        mask = 0xff000000;
-    }
-
-    // Create image and copy data into image.
-    QImage image(w, h, imageFormat);
-    if (image.isNull()) { // failed to alloc?
-        ReleaseDC(0, display_dc);
-        qWarning("%s, failed create image of %dx%d", __FUNCTION__, w, h);
-        return QPixmap();
-    }
-    const int bytes_per_line = w * sizeof(QRgb);
-    for (int y = 0; y < h; ++y) {
-        QRgb *dest = (QRgb *) image.scanLine(y);
-        const QRgb *src = (const QRgb *) (data.data() + y * bytes_per_line);
-        for (int x = 0; x < w; ++x) {
-            const uint pixel = src[x];
-            if ((pixel & 0xff000000) == 0 && (pixel & 0x00ffffff) != 0)
-                dest[x] = pixel | 0xff000000;
-            else
-                dest[x] = pixel | mask;
-        }
-    }
-    ReleaseDC(0, display_dc);
-    return QPixmap::fromImage(image);
-}
-
 // Code courtesy of QWindowsXPStyle
 static void addRectToHrgn(HRGN &winRegion, const QRect &r)
 {
diff --git a/src/activeqt/shared/qaxutils_p.h b/src/activeqt/shared/qaxutils_p.h
index f2576c1..bb73c16 100644
--- a/src/activeqt/shared/qaxutils_p.h
+++ b/src/activeqt/shared/qaxutils_p.h
@@ -65,16 +65,7 @@ class QRect;
 class QRegion;
 class QWindow;
 
-enum HBitmapFormat
-{
-    HBitmapNoAlpha,
-    HBitmapPremultipliedAlpha,
-    HBitmapAlpha
-};
-
 HWND hwndForWidget(QWidget *widget);
-HBITMAP qaxPixmapToWinHBITMAP(const QPixmap &p, HBitmapFormat format = HBitmapNoAlpha);
-QPixmap qaxPixmapFromWinHBITMAP(HBITMAP bitmap, HBitmapFormat format = HBitmapNoAlpha);
 HRGN qaxHrgnFromQRegion(QRegion region, const QWindow *window);
 
 typedef QPair<qreal, qreal> QDpi;
diff --git a/tests/manual/testcontrol/main.cpp b/tests/manual/testcontrol/main.cpp
new file mode 100644
index 0000000..7baa8f6
--- /dev/null
+++ b/tests/manual/testcontrol/main.cpp
@@ -0,0 +1,124 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL21$
+** 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 http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://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 2.1 or version 3 as published by the Free
+** Software Foundation and appearing in the file LICENSE.LGPLv21 and
+** LICENSE.LGPLv3 included in the packaging of this file. Please review the
+** following information to ensure the GNU Lesser General Public License
+** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** As a special exception, The Qt Company gives you certain additional
+** rights. These rights are described in The Qt Company LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <ActiveQt/QAxFactory>
+#include <QtWidgets/QAction>
+#include <QtWidgets/QApplication>
+#include <QtWidgets/QMainWindow>
+#include <QtWidgets/QMenu>
+#include <QtWidgets/QMenuBar>
+#include <QtWidgets/QPlainTextEdit>
+#include <QtWidgets/QToolBar>
+
+#include <QtGui/QClipboard>
+#include <QtGui/QWindow>
+
+#include <QtCore/QDebug>
+#include <QtCore/QLibraryInfo>
+
+/* A sample control for testing embedding Active X controls with
+ * functionality to dump window parameters. See testcontrol.html
+ * on how to use it with Internet Explorer. */
+
+QT_USE_NAMESPACE
+
+class QTestControl : public QMainWindow
+{
+    Q_OBJECT
+    Q_CLASSINFO("ClassID", "{DF16845C-92CD-4AAB-A982-EB9840E7466A}")
+    Q_CLASSINFO("InterfaceID", "{616F620B-91C5-4410-A74E-6B81C76FFFE1}")
+    Q_CLASSINFO("EventsID", "{E1816BBA-BF5D-4A31-9855-D6BA43205510}")
+
+public:
+    explicit QTestControl(QWidget *parent = Q_NULLPTR);
+
+public slots:
+    void appendText(const QString &t) { m_logWindow->appendPlainText(t); }
+    void testMapToGlobal();
+    void dumpWindowInfo();
+    void copyAll();
+
+private:
+    QPlainTextEdit *m_logWindow;
+};
+
+QTestControl::QTestControl(QWidget *parent)
+    : QMainWindow(parent)
+    , m_logWindow(new QPlainTextEdit)
+{
+    QMenuBar *menubar = menuBar();
+    QToolBar *toolbar = new QToolBar;
+    addToolBar(Qt::TopToolBarArea, toolbar);
+    QMenu *testMenu = menubar->addMenu(QLatin1String("&Test"));
+    QAction *a = testMenu->addAction(QLatin1String("&Dump Window"), this, &QTestControl::dumpWindowInfo);
+    toolbar->addAction(a);
+    a = testMenu->addAction(QLatin1String("&Map to Global"), this, &QTestControl::testMapToGlobal);
+    toolbar->addAction(a);
+
+    QMenu *editMenu = menubar->addMenu(QLatin1String("&Edit"));
+    a = editMenu->addAction(QLatin1String("Copy"), this, &QTestControl::dumpWindowInfo);
+    a->setShortcut(QKeySequence::Copy);
+    toolbar->addAction(a);
+
+    m_logWindow->setReadOnly(true);
+    setCentralWidget(m_logWindow);
+    appendText(QLatin1String(QLibraryInfo::build()));
+}
+
+void QTestControl::testMapToGlobal()
+{
+    QString text;
+    QPoint global = mapToGlobal(QPoint(0, 0));
+    QDebug(&text) << "\nmapToGlobal:" << global << ", back:" << mapFromGlobal(global) << '\n';
+    appendText(text);
+}
+
+void QTestControl::dumpWindowInfo()
+{
+    QString text;
+    QDebug debug(&text);
+    debug.setVerbosity(3);
+    debug << "\nQWidget: " << this <<"\n\nQWindow: " << windowHandle() << '\n';
+    appendText(text);
+}
+
+void QTestControl::copyAll()
+{
+    QGuiApplication::clipboard()->setText(m_logWindow->toPlainText());
+}
+
+#include "main.moc"
+
+QAXFACTORY_BEGIN("{EC08F8FC-2754-47AB-8EFE-56A54057F34F}", "{A095BA0C-224F-4933-A458-2DD7F6B85D90}")
+    QAXCLASS(QTestControl)
+QAXFACTORY_END()
diff --git a/tests/manual/testcontrol/testcontrol.html b/tests/manual/testcontrol/testcontrol.html
new file mode 100644
index 0000000..f809f68
--- /dev/null
+++ b/tests/manual/testcontrol/testcontrol.html
@@ -0,0 +1,9 @@
+<!--
+Example HTML file to embed QTestControl in Internet Explorer
+(requires 32bit builds).
+"c:\Program Files\Internet Explorer\iexplore.exe" file:///C:..testcontrol.html
+-->
+<object ID="Hierarchy" CLASSID="CLSID:DF16845C-92CD-4AAB-A982-EB9840E7466A"
+CODEBASE="http://www.qt-project.org/demos/menusax.cab">
+[Object not available! Did you forget to build and register the server?]
+</object>
diff --git a/tests/manual/testcontrol/testcontrol.ico b/tests/manual/testcontrol/testcontrol.ico
new file mode 100644
index 0000000..c80d36a
--- /dev/null
+++ b/tests/manual/testcontrol/testcontrol.ico
diff --git a/tests/manual/testcontrol/testcontrol.pro b/tests/manual/testcontrol/testcontrol.pro
new file mode 100644
index 0000000..30a0b48
--- /dev/null
+++ b/tests/manual/testcontrol/testcontrol.pro
@@ -0,0 +1,6 @@
+QT += widgets axserver
+TARGET = testcontrol
+TEMPLATE = app
+SOURCES += main.cpp
+CONFIG += warn_off
+RC_FILE = testcontrol.rc
diff --git a/tests/manual/testcontrol/testcontrol.rc b/tests/manual/testcontrol/testcontrol.rc
new file mode 100644
index 0000000..7fa8736
--- /dev/null
+++ b/tests/manual/testcontrol/testcontrol.rc
@@ -0,0 +1,2 @@
+1 TYPELIB "testcontrol.rc"
+1 ICON DISCARDABLE "testcontrol.ico"