diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2015-03-31 10:03:31 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-03-31 10:03:31 +0200 |
commit | ce9519593a0b3deb99d1dd2529770f7e9fffef92 (patch) | |
tree | c9bca05230dd68f49494240ae930bad1fe0c5956 /src/printsupport | |
parent | 509f77cca28aa3edea5523c5869bae4412ed2ccc (diff) | |
parent | 7baaec17edb06634f1d6235a55c7adbd112cba3e (diff) |
Merge remote-tracking branch 'origin/5.4' into 5.5
Conflicts:
mkspecs/android-g++/qmake.conf
qmake/generators/unix/unixmake2.cpp
src/gui/image/qimage_conversions.cpp
Change-Id: Ib76264b8c2d29a0228438ec02bd97d4b97545be0
Diffstat (limited to 'src/printsupport')
-rw-r--r-- | src/printsupport/dialogs/qpagesetupdialog_win.cpp | 7 | ||||
-rw-r--r-- | src/printsupport/kernel/qprintengine_win.cpp | 53 | ||||
-rw-r--r-- | src/printsupport/kernel/qprintengine_win_p.h | 4 |
3 files changed, 59 insertions, 5 deletions
diff --git a/src/printsupport/dialogs/qpagesetupdialog_win.cpp b/src/printsupport/dialogs/qpagesetupdialog_win.cpp index 04698901f7..afe0268e55 100644 --- a/src/printsupport/dialogs/qpagesetupdialog_win.cpp +++ b/src/printsupport/dialogs/qpagesetupdialog_win.cpp @@ -134,6 +134,13 @@ int QPageSetupDialog::exec() // copy from our temp DEVMODE struct if (!engine->globalDevMode() && hDevMode) { + // Make sure memory is allocated + if (ep->ownsDevMode && ep->devMode) + free(ep->devMode); + ep->devMode = (DEVMODE *) malloc(devModeSize); + ep->ownsDevMode = true; + + // Copy void *src = GlobalLock(hDevMode); memcpy(ep->devMode, src, devModeSize); GlobalUnlock(hDevMode); diff --git a/src/printsupport/kernel/qprintengine_win.cpp b/src/printsupport/kernel/qprintengine_win.cpp index 5b3184a20d..910c6c1514 100644 --- a/src/printsupport/kernel/qprintengine_win.cpp +++ b/src/printsupport/kernel/qprintengine_win.cpp @@ -868,7 +868,8 @@ void QWin32PrintEnginePrivate::initialize() txop = QTransform::TxNone; - bool ok = OpenPrinter((LPWSTR)m_printDevice.id().utf16(), (LPHANDLE)&hPrinter, 0); + QString printerName = m_printDevice.id(); + bool ok = OpenPrinter((LPWSTR)printerName.utf16(), (LPHANDLE)&hPrinter, 0); if (!ok) { qErrnoWarning("QWin32PrintEngine::initialize: OpenPrinter failed"); return; @@ -889,7 +890,32 @@ void QWin32PrintEnginePrivate::initialize() } devMode = pInfo->pDevMode; - hdc = CreateDC(NULL, reinterpret_cast<const wchar_t *>(m_printDevice.id().utf16()), 0, devMode); + + if (!devMode) { + // pInfo->pDevMode == NULL for some printers and passing NULL + // into CreateDC leads to the printer doing nothing. In addition, + // the framework assumes that devMode isn't NULL, such as in + // QWin32PrintEngine::begin() and QPageSetupDialog::exec() + // Attempt to get the DEVMODE a different way. + + // Allocate the required buffer + LONG result = DocumentProperties(NULL, hPrinter, (LPWSTR)printerName.utf16(), + NULL, NULL, 0); + devMode = (DEVMODE *) malloc(result); + ownsDevMode = true; + + // Get the default DevMode + result = DocumentProperties(NULL, hPrinter, (LPWSTR)printerName.utf16(), + devMode, NULL, DM_OUT_BUFFER); + if (result != IDOK) { + qErrnoWarning("QWin32PrintEngine::initialize: Failed to obtain devMode"); + free(devMode); + devMode = NULL; + ownsDevMode = false; + } + } + + hdc = CreateDC(NULL, (LPCWSTR)printerName.utf16(), 0, devMode); if (!hdc) { qErrnoWarning("QWin32PrintEngine::initialize: CreateDC failed"); @@ -952,8 +978,7 @@ void QWin32PrintEnginePrivate::release() { if (globalDevMode) { // Devmode comes from print dialog GlobalUnlock(globalDevMode); - } else if (hMem) { // Devmode comes from initialize... - // devMode is a part of the same memory block as pInfo so one free is enough... + } else if (hMem) { GlobalUnlock(hMem); GlobalFree(hMem); } @@ -962,11 +987,16 @@ void QWin32PrintEnginePrivate::release() if (hdc) DeleteDC(hdc); + // Check if devMode was allocated separately from pInfo / hMem. + if (ownsDevMode) + free(devMode); + hdc = 0; hPrinter = 0; pInfo = 0; hMem = 0; devMode = 0; + ownsDevMode = false; } void QWin32PrintEnginePrivate::doReinit() @@ -1261,6 +1291,8 @@ void QWin32PrintEngine::setProperty(PrintEnginePropertyKey key, const QVariant & } case PPK_QPageSize: { + if (!d->devMode) + break; // Get the page size from the printer if supported const QPageSize pageSize = value.value<QPageSize>(); if (pageSize.isValid()) { @@ -1331,7 +1363,10 @@ QVariant QWin32PrintEngine::property(PrintEnginePropertyKey key) const break; case PPK_CollateCopies: - value = d->devMode->dmCollate == DMCOLLATE_TRUE; + if (!d->devMode) + value = false; + else + value = d->devMode->dmCollate == DMCOLLATE_TRUE; break; case PPK_ColorMode: @@ -1541,6 +1576,10 @@ void QWin32PrintEngine::setGlobalDevMode(HGLOBAL globalDevNames, HGLOBAL globalD DEVMODE *dm = (DEVMODE*) GlobalLock(globalDevMode); d->release(); d->globalDevMode = globalDevMode; + if (d->ownsDevMode) { + free(d->devMode); + d->ownsDevMode = false; + } d->devMode = dm; d->hdc = CreateDC(NULL, reinterpret_cast<const wchar_t *>(d->m_printDevice.id().utf16()), 0, dm); @@ -1571,6 +1610,8 @@ void QWin32PrintEnginePrivate::setPageSize(const QPageSize &pageSize) if (!pageSize.isValid()) return; + Q_ASSERT(devMode); + // Use the printer page size if supported const QPageSize printerPageSize = m_printDevice.supportedPageSize(pageSize); const QPageSize usePageSize = printerPageSize.isValid() ? printerPageSize : pageSize; @@ -1599,6 +1640,8 @@ void QWin32PrintEnginePrivate::setPageSize(const QPageSize &pageSize) // Update the page layout after any changes made to devMode void QWin32PrintEnginePrivate::updatePageLayout() { + Q_ASSERT(devMode); + // Update orientation first as is needed to obtain printable margins when changing page size m_pageLayout.setOrientation(devMode->dmOrientation == DMORIENT_LANDSCAPE ? QPageLayout::Landscape : QPageLayout::Portrait); if (devMode->dmPaperSize >= DMPAPER_USER) { diff --git a/src/printsupport/kernel/qprintengine_win_p.h b/src/printsupport/kernel/qprintengine_win_p.h index 98a4cff1a8..c1d7b452f9 100644 --- a/src/printsupport/kernel/qprintengine_win_p.h +++ b/src/printsupport/kernel/qprintengine_win_p.h @@ -119,6 +119,7 @@ public: pInfo(0), hMem(0), hdc(0), + ownsDevMode(false), mode(QPrinter::ScreenResolution), state(QPrinter::Idle), resolution(0), @@ -176,6 +177,9 @@ public: HDC hdc; + // True if devMode was allocated separately from pInfo. + bool ownsDevMode; + QPrinter::PrinterMode mode; // Print Device |