Changeset 561 for trunk/src/gui/painting/qprintengine_win.cpp

Timestamp:

Feb 11, 2010, 11:19:06 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.1 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/gui/painting/qprintengine_win.cpp (modified) (43 diffs)

trunk/src/gui/painting/qprintengine_win.cpp

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
@@ -21 +22 @@
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
@@ -34 +34 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
@@ -200 +200 @@
         d->fileName = d->port;
 
-    QT_WA({
-    d->devModeW()->dmCopies = d->num_copies;
-        DOCINFO di;
-        memset(&di, 0, sizeof(DOCINFO));
-        di.cbSize = sizeof(DOCINFO);
-        di.lpszDocName = reinterpret_cast<const wchar_t *>(d->docName.utf16());
-        if (d->printToFile && !d->fileName.isEmpty())
-            di.lpszOutput = reinterpret_cast<const wchar_t *>(d->fileName.utf16());
-        if (ok && StartDoc(d->hdc, &di) == SP_ERROR) {
-            qErrnoWarning("QWin32PrintEngine::begin: StartDoc failed");
-            ok = false;
-        }
-    } , {
-    d->devModeA()->dmCopies = d->num_copies;
-        DOCINFOA di;
-        memset(&di, 0, sizeof(DOCINFOA));
-        di.cbSize = sizeof(DOCINFOA);
-        QByteArray docNameA = d->docName.toLocal8Bit();
-        di.lpszDocName = docNameA.data();
-        QByteArray outfileA = d->fileName.toLocal8Bit();
-        if (d->printToFile && !d->fileName.isEmpty())
-            di.lpszOutput = outfileA;
-        if (ok && StartDocA(d->hdc, &di) == SP_ERROR) {
-            qErrnoWarning("QWin32PrintEngine::begin: StartDoc failed");
-            ok = false;
-        }
-    });
+    d->devMode->dmCopies = d->num_copies;
+
+    DOCINFO di;
+    memset(&di, 0, sizeof(DOCINFO));
+    di.cbSize = sizeof(DOCINFO);
+    di.lpszDocName = reinterpret_cast<const wchar_t *>(d->docName.utf16());
+    if (d->printToFile && !d->fileName.isEmpty())
+        di.lpszOutput = reinterpret_cast<const wchar_t *>(d->fileName.utf16());
+    if (ok && StartDoc(d->hdc, &di) == SP_ERROR) {
+        qErrnoWarning("QWin32PrintEngine::begin: StartDoc failed");
+        ok = false;
+    }
 
     if (StartPage(d->hdc) <= 0) {
@@ -318 +303 @@
     bool success = false;
     if (d->hdc && d->state == QPrinter::Active) {
-//         bool restorePainter = false;
-//         if ((qWinVersion()& Qt::WV_DOS_based) && painter && painter->isActive()) {
-//             painter->save();               // EndPage/StartPage ruins the DC
-//             restorePainter = true;
-//         }
         if (EndPage(d->hdc) != SP_ERROR) {
             // reinitialize the DC before StartPage if needed,
@@ -338 +318 @@
             success = (StartPage(d->hdc) != SP_ERROR);
         }
-        if (!success)
+        if (!success) {
             d->state = QPrinter::Aborted;
-
-//         if (qWinVersion() & Qt::WV_DOS_based)
-//         if (restorePainter) {
-//             painter->restore();
-//      }
-
-        if (!success)
             return false;
+        }
     }
     return true;
@@ -370 +344 @@
     bool fallBack = state->pen().brush().style() != Qt::SolidPattern
                     || qAlpha(brushColor) != 0xff
-                    || QT_WA_INLINE(d->txop >= QTransform::TxProject, d->txop >= QTransform::TxScale)
+                    || d->txop >= QTransform::TxProject
                     || ti.fontEngine->type() != QFontEngine::Win;
 
@@ -381 +355 @@
 
         if (GetDeviceCaps(d->hdc, TECHNOLOGY) != DT_CHARSTREAM) {
-            QT_WA({
-                TCHAR n[64];
-                GetTextFaceW(d->hdc, 64, n);
-                fallBack = QString::fromUtf16((ushort *)n)
-                        != QString::fromUtf16((ushort *)fe->logfont.lfFaceName);
-            } , {
-                char an[64];
-                GetTextFaceA(d->hdc, 64, an);
-                fallBack = QString::fromLocal8Bit(an)
-                        != QString::fromLocal8Bit(((LOGFONTA*)(&fe->logfont))->lfFaceName);
-            });
+            wchar_t n[64];
+            GetTextFace(d->hdc, 64, n);
+            fallBack = QString::fromWCharArray(n)
+                    != QString::fromWCharArray(fe->logfont.lfFaceName);
         }
     }
@@ -401 +368 @@
     }
 
-    // We only want to convert the glyphs to text if the entire string is latin1
-    bool latin1String = true;
+    // We only want to convert the glyphs to text if the entire string is compatible with ASCII
+    bool convertToText = true;
     for (int i=0;  i < ti.num_chars; ++i) {
-        if (ti.chars[i].unicode() >= 0x100) {
-            latin1String = false;
+        if (ti.chars[i].unicode() >= 0x80) {
+            convertToText = false;
+            break;
+        }
+
+        if (ti.logClusters[i] != i) {
+            convertToText = false;
             break;
         }
@@ -415 +387 @@
     SetTextColor(d->hdc, cf);
 
-    draw_text_item_win(p, ti, d->hdc, latin1String, d->matrix, d->devPaperRect.topLeft());
+    draw_text_item_win(p, ti, d->hdc, convertToText, d->matrix, d->devPaperRect.topLeft());
     DeleteObject(SelectObject(d->hdc,GetStockObject(HOLLOW_BRUSH)));
     DeleteObject(SelectObject(d->hdc,GetStockObject(BLACK_PEN)));
@@ -664 +636 @@
     qreal scaleY = 1.0f;
 
-    QTransform scaleMatrix;
-    scaleMatrix.scale(r.width() / pixmap.width(), r.height() / pixmap.height());
+    QTransform scaleMatrix = QTransform::fromScale(r.width() / pixmap.width(), r.height() / pixmap.height());
     QTransform adapted = QPixmap::trueMatrix(d->painterMatrix * scaleMatrix,
                                              pixmap.width(), pixmap.height());
@@ -863 +834 @@
 {
     composeGdiPath(path);
-    HPEN pen = CreatePen(PS_SOLID, qRound(penWidth), RGB(color.red(), color.green(), color.blue()));
+    LOGBRUSH brush;
+    brush.lbStyle = BS_SOLID;
+    brush.lbColor = RGB(color.red(), color.green(), color.blue());
+    DWORD capStyle = PS_ENDCAP_SQUARE;
+    DWORD joinStyle = PS_JOIN_BEVEL;
+    if (pen.capStyle() == Qt::FlatCap)
+        capStyle = PS_ENDCAP_FLAT;
+    else if (pen.capStyle() == Qt::RoundCap)
+        capStyle = PS_ENDCAP_ROUND;
+
+    if (pen.joinStyle() == Qt::MiterJoin)
+        joinStyle = PS_JOIN_MITER;
+    else if (pen.joinStyle() == Qt::RoundJoin)
+        joinStyle = PS_JOIN_ROUND;
+
+    HPEN pen = ExtCreatePen(((penWidth == 0) ? PS_COSMETIC : PS_GEOMETRIC)
+                            | PS_SOLID | capStyle | joinStyle,
+                            penWidth, &brush, 0, 0);
+
     HGDIOBJ old_pen = SelectObject(hdc, pen);
     StrokePath(hdc);
@@ -967 +956 @@
      */
     QString noPrinters(QLatin1String("qt_no_printers"));
-    QString output;
-    QT_WA({
-        ushort buffer[256];
-        GetProfileStringW(L"windows", L"device",
-                          reinterpret_cast<const wchar_t *>(noPrinters.utf16()),
-                          reinterpret_cast<wchar_t *>(buffer), 256);
-        output = QString::fromUtf16(buffer);
-        if (output.isEmpty() || output == noPrinters) // no printers
-            return;
-    }, {
-        char buffer[256];
-        GetProfileStringA("windows", "device", noPrinters.toLatin1(), buffer, 256);
-        output = QString::fromLocal8Bit(buffer);
-        if (output.isEmpty() || output == noPrinters) // no printers
-            return;
-    });
+    wchar_t buffer[256];
+    GetProfileString(L"windows", L"device",
+                     reinterpret_cast<const wchar_t *>(noPrinters.utf16()),
+                     buffer, 256);
+    QString output = QString::fromWCharArray(buffer);
+    if (output.isEmpty() || output == noPrinters) // no printers
+        return;
+
     QStringList info = output.split(QLatin1Char(','));
     if (info.size() > 0) {
@@ -1014 +995 @@
     txop = QTransform::TxNone;
 
-    bool ok;
-    QT_WA( {
-        ok = OpenPrinterW((LPWSTR)name.utf16(), (LPHANDLE)&hPrinter, 0);
-    }, {
-        ok = OpenPrinterA((LPSTR)name.toLatin1().data(), (LPHANDLE)&hPrinter, 0);
-    } );
-
+    bool ok = OpenPrinter((LPWSTR)name.utf16(), (LPHANDLE)&hPrinter, 0);
     if (!ok) {
         qErrnoWarning("QWin32PrintEngine::initialize: OpenPrinter failed");
@@ -1029 +1004 @@
     // printer settings.
     DWORD infoSize, numBytes;
-    ok = true;
-    QT_WA( {
-        GetPrinterW(hPrinter, 2, NULL, 0, &infoSize);
-        hMem = GlobalAlloc(GHND, infoSize);
-        pInfo = GlobalLock(hMem);
-        if (!GetPrinterW(hPrinter, 2, (LPBYTE)pInfo, infoSize, &numBytes)) {
-            ok = false;
-        }
-    }, {
-        GetPrinterA(hPrinter, 2, NULL, 0, &infoSize);
-        hMem = GlobalAlloc(GHND, infoSize);
-        pInfo = GlobalLock(hMem);
-        if (!GetPrinterA(hPrinter, 2, (LPBYTE)pInfo, infoSize, &numBytes)) {
-            ok = false;
-        }
-    });
+    GetPrinter(hPrinter, 2, NULL, 0, &infoSize);
+    hMem = GlobalAlloc(GHND, infoSize);
+    pInfo = (PRINTER_INFO_2*) GlobalLock(hMem);
+    ok = GetPrinter(hPrinter, 2, (LPBYTE)pInfo, infoSize, &numBytes);
 
     if (!ok) {
@@ -1057 +1020 @@
     }
 
-    QT_WA( {
-        devMode = pInfoW()->pDevMode;
-    }, {
-        devMode = pInfoA()->pDevMode;
-    } );
-
-    QT_WA( {
-        hdc = CreateDC(reinterpret_cast<const wchar_t *>(program.utf16()),
-                       reinterpret_cast<const wchar_t *>(name.utf16()), 0, devModeW());
-    }, {
-        hdc = CreateDCA(program.toLatin1(), name.toLatin1(), 0, devModeA());
-    } );
+    devMode = pInfo->pDevMode;
+    hdc = CreateDC(reinterpret_cast<const wchar_t *>(program.utf16()),
+                   reinterpret_cast<const wchar_t *>(name.utf16()), 0, devMode);
 
     Q_ASSERT(hPrinter);
@@ -1074 +1028 @@
 
     if (devMode) {
-        QT_WA( {
-            num_copies = devModeW()->dmCopies;
-        }, {
-            num_copies = devModeA()->dmCopies;
-        } );
+        num_copies = devMode->dmCopies;
     }
 
@@ -1196 +1146 @@
 {
     // Read the supported resolutions of the printer.
-    DWORD numRes;
-    LONG *enumRes;
-    DWORD errRes;
     QList<QVariant> list;
 
-    QT_WA({
-        numRes = DeviceCapabilities(reinterpret_cast<const wchar_t *>(name.utf16()),
-                                    reinterpret_cast<const wchar_t *>(port.utf16()),
-                                    DC_ENUMRESOLUTIONS, 0, 0);
-        if (numRes == (DWORD)-1)
-            return list;
-        enumRes = (LONG*)malloc(numRes * 2 * sizeof(LONG));
-        errRes = DeviceCapabilities(reinterpret_cast<const wchar_t *>(name.utf16()),
-                                    reinterpret_cast<const wchar_t *>(port.utf16()),
-                                    DC_ENUMRESOLUTIONS, (LPWSTR)enumRes, 0);
-    }, {
-        numRes = DeviceCapabilitiesA(name.toLocal8Bit(), port.toLocal8Bit(), DC_ENUMRESOLUTIONS, 0, 0);
-        if (numRes == (DWORD)-1)
-            return list;
-        enumRes = (LONG*)malloc(numRes * 2 * sizeof(LONG));
-        errRes = DeviceCapabilitiesA(name.toLocal8Bit(), port.toLocal8Bit(), DC_ENUMRESOLUTIONS, (LPSTR)enumRes, 0);
-    });
+    DWORD numRes = DeviceCapabilities(reinterpret_cast<const wchar_t *>(name.utf16()),
+                                      reinterpret_cast<const wchar_t *>(port.utf16()),
+                                      DC_ENUMRESOLUTIONS, 0, 0);
+    if (numRes == (DWORD)-1)
+        return list;
+
+    LONG *enumRes = (LONG*)malloc(numRes * 2 * sizeof(LONG));
+    DWORD errRes = DeviceCapabilities(reinterpret_cast<const wchar_t *>(name.utf16()),
+                                      reinterpret_cast<const wchar_t *>(port.utf16()),
+                                      DC_ENUMRESOLUTIONS, (LPWSTR)enumRes, 0);
 
     if (errRes == (DWORD)-1) {
@@ -1225 +1165 @@
 
     for (uint i=0; i<numRes; ++i)
-        list.append(int(enumRes[i*2]));
+        list.append(int(enumRes[i * 2]));
+
     return list;
 }
@@ -1269 +1210 @@
             if (!d->devMode)
                 break;
-            short collate = value.toBool() ? DMCOLLATE_TRUE : DMCOLLATE_FALSE;
-            QT_WA( { d->devModeW()->dmCollate = collate; },
-                   { d->devModeA()->dmCollate = collate; } );
+            d->devMode->dmCollate = value.toBool() ? DMCOLLATE_TRUE : DMCOLLATE_FALSE;
             d->doReinit();
         }
@@ -1280 +1219 @@
             if (!d->devMode)
                 break;
-            int cm = value.toInt() == QPrinter::Color ? DMCOLOR_COLOR : DMCOLOR_MONOCHROME;
-            QT_WA( { d->devModeW()->dmColor = cm; }, { d->devModeA()->dmColor = cm; } );
+            d->devMode->dmColor = (value.toInt() == QPrinter::Color) ? DMCOLOR_COLOR : DMCOLOR_MONOCHROME;
             d->doReinit();
         }
@@ -1307 +1245 @@
             break;
         d->num_copies = value.toInt();
-        QT_WA( { d->devModeW()->dmCopies = d->num_copies; },
-               { d->devModeA()->dmCopies = d->num_copies; });
+        d->devMode->dmCopies = d->num_copies;
         d->doReinit();
         break;
@@ -1317 +1254 @@
                 break;
             int orientation = value.toInt() == QPrinter::Landscape ? DMORIENT_LANDSCAPE : DMORIENT_PORTRAIT;
-            int old_orientation;
-            QT_WA( {
-                old_orientation = d->devModeW()->dmOrientation;
-                d->devModeW()->dmOrientation = orientation;
-            }, {
-                old_orientation = d->devModeA()->dmOrientation;
-                d->devModeA()->dmOrientation = orientation;
-            } );
+            int old_orientation = d->devMode->dmOrientation;
+            d->devMode->dmOrientation = orientation;
             if (d->has_custom_paper_size && old_orientation != orientation)
                 d->paper_size = QSizeF(d->paper_size.height(), d->paper_size.width());
@@ -1343 +1274 @@
         if (!d->devMode)
             break;
-        QT_WA( {
-            d->devModeW()->dmPaperSize = mapPaperSizeDevmode(QPrinter::PaperSize(value.toInt()));
-        }, {
-            d->devModeA()->dmPaperSize = mapPaperSizeDevmode(QPrinter::PaperSize(value.toInt()));
-        } );
+        d->devMode->dmPaperSize = mapPaperSizeDevmode(QPrinter::PaperSize(value.toInt()));
         d->has_custom_paper_size = (QPrinter::PaperSize(value.toInt()) == QPrinter::Custom);
         d->doReinit();
@@ -1362 +1289 @@
                 dmMapped = mapPaperSourceDevmode(QPrinter::PaperSource(value.toInt()));
 
-            QT_WA( {
-                d->devModeW()->dmDefaultSource = dmMapped;
-            }, {
-                d->devModeA()->dmDefaultSource = dmMapped;
-            } );
+            d->devMode->dmDefaultSource = dmMapped;
             d->doReinit();
         }
@@ -1400 +1323 @@
             break;
         d->has_custom_paper_size = false;
-        QT_WA( {
-            d->devModeW()->dmPaperSize = value.toInt();
-        }, {
-            d->devModeA()->dmPaperSize = value.toInt();
-        } );
+        d->devMode->dmPaperSize = value.toInt();
         d->doReinit();
         break;
@@ -1414 +1333 @@
         if (!d->devMode)
             break;
-        int orientation;
-        QT_WA( {
-            orientation = d->devModeW()->dmOrientation;
-            DWORD needed = 0;
-            DWORD returned = 0;
-            if (!EnumForms(d->hPrinter, 1, 0, 0, &needed, &returned)) {
-                BYTE *forms = (BYTE *) malloc(needed);
-                if (EnumForms(d->hPrinter, 1, forms, needed, &needed, &returned)) {
-                    for (DWORD i=0; i< returned; ++i) {
-                        FORM_INFO_1 *formArray = reinterpret_cast<FORM_INFO_1 *>(forms);
-                        // the form sizes are specified in 1000th of a mm,
-                        // convert the size to Points
-                        QSizeF size((formArray[i].Size.cx * 72/25.4)/1000.0,
-                                    (formArray[i].Size.cy * 72/25.4)/1000.0);
-                        if (qAbs(d->paper_size.width() - size.width()) <= 2
-                            && qAbs(d->paper_size.height() - size.height()) <= 2)
-                        {
-                            d->devModeW()->dmPaperSize = i+1;
-                            break;
-                        }
+        int orientation = d->devMode->dmOrientation;
+        DWORD needed = 0;
+        DWORD returned = 0;
+        if (!EnumForms(d->hPrinter, 1, 0, 0, &needed, &returned)) {
+            BYTE *forms = (BYTE *) malloc(needed);
+            if (EnumForms(d->hPrinter, 1, forms, needed, &needed, &returned)) {
+                for (DWORD i=0; i< returned; ++i) {
+                    FORM_INFO_1 *formArray = reinterpret_cast<FORM_INFO_1 *>(forms);
+                    // the form sizes are specified in 1000th of a mm,
+                    // convert the size to Points
+                    QSizeF size((formArray[i].Size.cx * 72/25.4)/1000.0,
+                                (formArray[i].Size.cy * 72/25.4)/1000.0);
+                    if (qAbs(d->paper_size.width() - size.width()) <= 2
+                        && qAbs(d->paper_size.height() - size.height()) <= 2)
+                    {
+                        d->devMode->dmPaperSize = i + 1;
+                        break;
                     }
                 }
-                free(forms);
             }
-        }, {
-            orientation = d->devModeA()->dmOrientation;
-        } );
+            free(forms);
+        }
         if (orientation != DMORIENT_PORTRAIT)
             d->paper_size = QSizeF(d->paper_size.height(), d->paper_size.width());
@@ -1452 +1366 @@
         int left, top, right, bottom;
         // specified in 1/100 mm
-        left = (margins.at(0).toDouble()*25.4/72.0) * 100;
-        top = (margins.at(1).toDouble()*25.4/72.0) * 100;
-        right = (margins.at(2).toDouble()*25.4/72.0) * 100;
-        bottom = (margins.at(3).toDouble()*25.4/72.0) * 100;
+        left = (margins.at(0).toReal()*25.4/72.0) * 100;
+        top = (margins.at(1).toReal()*25.4/72.0) * 100;
+        right = (margins.at(2).toReal()*25.4/72.0) * 100;
+        bottom = (margins.at(3).toReal()*25.4/72.0) * 100;
         d->setPageMargins(left, top, right, bottom);
         break;
@@ -1480 +1394 @@
                 value = QPrinter::Color;
             } else {
-                int mode;
-                QT_WA( {
-                    mode = d->devModeW()->dmColor;
-                }, {
-                    mode = d->devModeA()->dmColor;
-                } );
-                value = mode == DMCOLOR_COLOR ? QPrinter::Color : QPrinter::GrayScale;
+                value = (d->devMode->dmColor == DMCOLOR_COLOR) ? QPrinter::Color : QPrinter::GrayScale;
             }
         }
@@ -1508 +1416 @@
                 value = QPrinter::Portrait;
             } else {
-                int o;
-                QT_WA( { o = d->devModeW()->dmOrientation; }, { o = d->devModeA()->dmOrientation; } );
-                value = o == DMORIENT_LANDSCAPE ? QPrinter::Landscape : QPrinter::Portrait;
+                value = (d->devMode->dmOrientation == DMORIENT_LANDSCAPE) ? QPrinter::Landscape : QPrinter::Portrait;
             }
         }
@@ -1533 +1439 @@
         } else {
             value = QTransform(1/d->stretch_x, 0, 0, 1/d->stretch_y, 0, 0)
-                    .mapRect(d->fullPage ? d->devPaperRect : d->devPageRect);
+                    .mapRect(d->fullPage ? d->devPhysicalPageRect : d->devPageRect);
         }
         break;
@@ -1544 +1450 @@
                 value = QPrinter::A4;
             } else {
-                QT_WA( {
-                        value = mapDevmodePaperSize(d->devModeW()->dmPaperSize);
-                    }, {
-                        value = mapDevmodePaperSize(d->devModeA()->dmPaperSize);
-                    } );
+                value = mapDevmodePaperSize(d->devMode->dmPaperSize);
             }
         }
@@ -1567 +1469 @@
             value = QPrinter::Auto;
         } else {
-            QT_WA( {
-                value = mapDevmodePaperSource(d->devModeW()->dmDefaultSource);
-            }, {
-                value = mapDevmodePaperSource(d->devModeA()->dmDefaultSource);
-            } );
+            value = mapDevmodePaperSource(d->devMode->dmDefaultSource);
         }
         break;
@@ -1592 +1490 @@
             value = -1;
         } else {
-            QT_WA( {
-                value = d->devModeW()->dmPaperSize;
-            }, {
-                value = d->devModeA()->dmPaperSize;
-            } );
+            value = d->devMode->dmPaperSize;
         }
         break;
@@ -1602 +1496 @@
     case PPK_PaperSources:
         {
-            int available, count;
-            WORD *data;
-
-            QT_WA({
-                available = DeviceCapabilitiesW((const WCHAR *)d->name.utf16(), (const WCHAR *)d->port.utf16(), DC_BINS, 0,
-                                                d->devModeW());
-            }, {
-                available = DeviceCapabilitiesA(d->name.toLatin1(), d->port.toLatin1(), DC_BINS, 0,
-                                                d->devModeA());
-            });
+            int available = DeviceCapabilities((const wchar_t *)d->name.utf16(),
+                                               (const wchar_t *)d->port.utf16(), DC_BINS, 0, d->devMode);
 
             if (available <= 0)
                 break;
-            data = (WORD *) malloc(available * sizeof(WORD));
-
-            QT_WA({
-                count = DeviceCapabilitiesW((const WCHAR *)d->name.utf16(), (const WCHAR *)d->port.utf16(), DC_BINS, (WCHAR *)data,
-                                            d->devModeW());
-            }, {
-                count = DeviceCapabilitiesA(d->name.toLatin1(), d->port.toLatin1(), DC_BINS,
-                                            (char *) data, d->devModeA());
-            });
+
+            wchar_t *data = new wchar_t[available];
+            int count = DeviceCapabilities((const wchar_t *)d->name.utf16(),
+                                           (const wchar_t *)d->port.utf16(), DC_BINS, data, d->devMode);
 
             QList<QVariant> out;
@@ -1632 +1513 @@
             }
             value = out;
-            free(data);
+
+            delete [] data;
         }
         break;
@@ -1677 +1559 @@
 HGLOBAL *QWin32PrintEnginePrivate::createDevNames()
 {
-    QT_WA( {
-        int size = sizeof(DEVNAMES)
-                   + program.length() * 2 + 2
-                   + name.length() * 2 + 2
-                   + port.length() * 2 + 2;
-        HGLOBAL *hGlobal = (HGLOBAL *) GlobalAlloc(GMEM_MOVEABLE, size);
-        DEVNAMES *dn = (DEVNAMES*) GlobalLock(hGlobal);
-
-        dn->wDriverOffset = sizeof(DEVNAMES) / sizeof(TCHAR);
-        dn->wDeviceOffset = dn->wDriverOffset + program.length() + 1;
-        dn->wOutputOffset = dn->wDeviceOffset + name.length() + 1;
-
-        memcpy((ushort*)dn + dn->wDriverOffset, program.utf16(), program.length() * 2 + 2);
-        memcpy((ushort*)dn + dn->wDeviceOffset, name.utf16(), name.length() * 2 + 2);
-        memcpy((ushort*)dn + dn->wOutputOffset, port.utf16(), port.length() * 2 + 2);
-        dn->wDefault = 0;
-
-        GlobalUnlock(hGlobal);
+    int size = sizeof(DEVNAMES)
+               + program.length() * 2 + 2
+               + name.length() * 2 + 2
+               + port.length() * 2 + 2;
+    HGLOBAL *hGlobal = (HGLOBAL *) GlobalAlloc(GMEM_MOVEABLE, size);
+    DEVNAMES *dn = (DEVNAMES*) GlobalLock(hGlobal);
+
+    dn->wDriverOffset = sizeof(DEVNAMES) / sizeof(wchar_t);
+    dn->wDeviceOffset = dn->wDriverOffset + program.length() + 1;
+    dn->wOutputOffset = dn->wDeviceOffset + name.length() + 1;
+
+    memcpy((ushort*)dn + dn->wDriverOffset, program.utf16(), program.length() * 2 + 2);
+    memcpy((ushort*)dn + dn->wDeviceOffset, name.utf16(), name.length() * 2 + 2);
+    memcpy((ushort*)dn + dn->wOutputOffset, port.utf16(), port.length() * 2 + 2);
+    dn->wDefault = 0;
+
+    GlobalUnlock(hGlobal);
 
 //         printf("QPrintDialogWinPrivate::createDevNames()\n"
@@ -1705 +1586 @@
 
 //         printf("QPrintDialogWinPrivate::createDevNames(): %s, %s, %s\n",
-//                QString::fromUtf16((ushort*)(dn) + dn->wDriverOffset).latin1(),
-//                QString::fromUtf16((ushort*)(dn) + dn->wDeviceOffset).latin1(),
-//                QString::fromUtf16((ushort*)(dn) + dn->wOutputOffset).latin1());
-
-        return hGlobal;
-    }, {
-        int size = sizeof(DEVNAMES)
-                   + program.length() + 2
-                   + name.length() + 2
-                   + port.length() + 2;
-        HGLOBAL *hGlobal = (HGLOBAL *) GlobalAlloc(GMEM_MOVEABLE, size);
-        DEVNAMES *dn = (DEVNAMES*) GlobalLock(hGlobal);
-
-        dn->wDriverOffset = sizeof(DEVNAMES);
-        dn->wDeviceOffset = dn->wDriverOffset + program.length() + 1;
-        dn->wOutputOffset = dn->wDeviceOffset + name.length() + 1;
-
-        memcpy((char*)dn + dn->wDriverOffset, program.toLatin1(), program.length() + 2);
-        memcpy((char*)dn + dn->wDeviceOffset, name.toLatin1(), name.length() + 2);
-        memcpy((char*)dn + dn->wOutputOffset, port.toLatin1(), port.length() + 2);
-        dn->wDefault = 0;
-
-        GlobalUnlock(hGlobal);
-        return hGlobal;
-    } );
+//                QString::fromWCharArray((wchar_t*)(dn) + dn->wDriverOffset).latin1(),
+//                QString::fromWCharArray((wchar_t*)(dn) + dn->wDeviceOffset).latin1(),
+//                QString::fromWCharArray((wchar_t*)(dn) + dn->wOutputOffset).latin1());
+
+    return hGlobal;
 }
 
@@ -1735 +1596 @@
 {
     if (globalDevnames) {
-        QT_WA( {
-            DEVNAMES *dn = (DEVNAMES*) GlobalLock(globalDevnames);
-            name = QString::fromUtf16((ushort*)(dn) + dn->wDeviceOffset);
-            port = QString::fromUtf16((ushort*)(dn) + dn->wOutputOffset);
-            program = QString::fromUtf16((ushort*)(dn) + dn->wDriverOffset);
-            GlobalUnlock(globalDevnames);
-        }, {
-            DEVNAMES *dn = (DEVNAMES*) GlobalLock(globalDevnames);
-            name = QString::fromLatin1((char*)(dn) + dn->wDeviceOffset);
-            port = QString::fromLatin1((char*)(dn) + dn->wOutputOffset);
-            program = QString::fromLatin1((char*)(dn) + dn->wDriverOffset);
-            GlobalUnlock(globalDevnames);
-        } );
+        DEVNAMES *dn = (DEVNAMES*) GlobalLock(globalDevnames);
+        name = QString::fromWCharArray((wchar_t*)(dn) + dn->wDeviceOffset);
+        port = QString::fromWCharArray((wchar_t*)(dn) + dn->wOutputOffset);
+        program = QString::fromWCharArray((wchar_t*)(dn) + dn->wDriverOffset);
+        GlobalUnlock(globalDevnames);
     }
 }
@@ -1754 +1607 @@
 {
     if (globalDevmode) {
-        QT_WA( {
-            DEVMODE *dm = (DEVMODE*) GlobalLock(globalDevmode);
-            release();
-            globalDevMode = globalDevmode;
-            devMode = dm;
-            hdc = CreateDC(reinterpret_cast<const wchar_t *>(program.utf16()),
-                           reinterpret_cast<const wchar_t *>(name.utf16()), 0, dm);
-
-            num_copies = devModeW()->dmCopies;
-            if (!OpenPrinterW((LPWSTR)name.utf16(), (LPHANDLE)&hPrinter, 0))
-                qWarning("QPrinter: OpenPrinter() failed after reading DEVMODE.");
-        }, {
-            DEVMODEA *dm = (DEVMODEA*) GlobalLock(globalDevmode);
-            release();
-            globalDevMode = globalDevmode;
-            devMode = dm;
-            hdc = CreateDCA(program.toLatin1(), name.toLatin1(), 0, dm);
-
-            num_copies = devModeA()->dmCopies;
-            if (!OpenPrinterA((LPSTR)name.toLatin1().data(), (LPHANDLE)&hPrinter, 0))
-                qWarning("QPrinter: OpenPrinter() failed after reading DEVMODE.");
-        } );
+        DEVMODE *dm = (DEVMODE*) GlobalLock(globalDevmode);
+        release();
+        globalDevMode = globalDevmode;
+        devMode = dm;
+        hdc = CreateDC(reinterpret_cast<const wchar_t *>(program.utf16()),
+                       reinterpret_cast<const wchar_t *>(name.utf16()), 0, dm);
+
+        num_copies = devMode->dmCopies;
+        if (!OpenPrinter((wchar_t*)name.utf16(), &hPrinter, 0))
+            qWarning("QPrinter: OpenPrinter() failed after reading DEVMODE.");
     }
 
@@ -1782 +1623 @@
 }
 
-static void draw_text_item_win(const QPointF &_pos, const QTextItemInt &ti, HDC hdc,
+static void draw_text_item_win(const QPointF &pos, const QTextItemInt &ti, HDC hdc,
                                bool convertToText, const QTransform &xform, const QPointF &topLeft)
 {
-
-    // Make sure we translate for systems that can't handle world transforms
-    QPointF pos(QT_WA_INLINE(_pos, _pos + QPointF(xform.dx(), xform.dy())));
     QFontEngine *fe = ti.fontEngine;
     QPointF baseline_pos = xform.inverted().map(xform.map(pos) - topLeft);
@@ -1799 +1637 @@
     HFONT hfont;
     bool ttf = false;
-    bool useTextOutA = false;
 
     if (winfe) {
         hfont = winfe->hfont;
         ttf = winfe->ttf;
-        useTextOutA = winfe->useTextOutA;
     } else {
         hfont = (HFONT)GetStockObject(ANSI_VAR_FONT);
@@ -1814 +1650 @@
     QGlyphLayout glyphs = ti.glyphs;
 
-    if (!(ti.flags & QTextItem::RightToLeft) && useTextOutA) {
-        qreal x = pos.x();
-        qreal y = pos.y();
-
-        // hack to get symbol fonts working on Win95. See also QFontEngine constructor
-        // can only happen if !ttf
-        for(int i = 0; i < glyphs.numGlyphs; i++) {
-            QString str(QChar(glyphs.glyphs[i]));
-            QT_WA({
-                TextOutW(hdc, qRound(x + glyphs.offsets[i].x.toReal()),
-                        qRound(y + glyphs.offsets[i].y.toReal()),
-                        (LPWSTR)str.utf16(), str.length());
-            } , {
-                QByteArray cstr = str.toLocal8Bit();
-                TextOutA(hdc, qRound(x + glyphs.offsets[i].x.toReal()),
-                        qRound(y + glyphs.offsets[i].y.toReal()),
-                        cstr.data(), cstr.length());
-            });
-            x += glyphs.effectiveAdvance(i).toReal();
-        }
+    bool fast = !has_kerning && !(ti.flags & QTextItem::RightToLeft);
+    for (int i = 0; fast && i < glyphs.numGlyphs; i++) {
+        if (glyphs.offsets[i].x != 0 || glyphs.offsets[i].y != 0 || glyphs.justifications[i].space_18d6 != 0
+            || glyphs.attributes[i].dontPrint) {
+            fast = false;
+            break;
+        }
+    }
+
+#if !defined(Q_OS_WINCE)
+    // Scale, rotate and translate here.
+    XFORM win_xform;
+    win_xform.eM11 = xform.m11();
+    win_xform.eM12 = xform.m12();
+    win_xform.eM21 = xform.m21();
+    win_xform.eM22 = xform.m22();
+    win_xform.eDx = xform.dx();
+    win_xform.eDy = xform.dy();
+
+    SetGraphicsMode(hdc, GM_ADVANCED);
+    SetWorldTransform(hdc, &win_xform);
+#endif
+
+    if (fast) {
+        // fast path
+        QVarLengthArray<wchar_t> g(glyphs.numGlyphs);
+        for (int i = 0; i < glyphs.numGlyphs; ++i)
+            g[i] = glyphs.glyphs[i];
+        ExtTextOut(hdc,
+                   qRound(baseline_pos.x() + glyphs.offsets[0].x.toReal()),
+                   qRound(baseline_pos.y() + glyphs.offsets[0].y.toReal()),
+                   options, 0, convertToText ? convertedGlyphs : g.data(), glyphs.numGlyphs, 0);
     } else {
-        bool fast = !has_kerning && !(ti.flags & QTextItem::RightToLeft);
-        for(int i = 0; fast && i < glyphs.numGlyphs; i++) {
-            if (glyphs.offsets[i].x != 0 || glyphs.offsets[i].y != 0 || glyphs.justifications[i].space_18d6 != 0
-                || glyphs.attributes[i].dontPrint) {
-                fast = false;
-                break;
+        QVarLengthArray<QFixedPoint> positions;
+        QVarLengthArray<glyph_t> _glyphs;
+
+        QTransform matrix = QTransform::fromTranslate(baseline_pos.x(), baseline_pos.y());
+        ti.fontEngine->getGlyphPositions(ti.glyphs, matrix, ti.flags,
+            _glyphs, positions);
+        if (_glyphs.size() == 0) {
+            SelectObject(hdc, old_font);
+            return;
+        }
+
+        convertToText = convertToText && glyphs.numGlyphs == _glyphs.size();
+        bool outputEntireItem = _glyphs.size() > 0;
+
+        if (outputEntireItem) {
+            options |= ETO_PDY;
+            QVarLengthArray<INT> glyphDistances(_glyphs.size() * 2);
+            QVarLengthArray<wchar_t> g(_glyphs.size());
+            for (int i=0; i<_glyphs.size() - 1; ++i) {
+                glyphDistances[i * 2] = qRound(positions[i + 1].x) - qRound(positions[i].x);
+                glyphDistances[i * 2 + 1] = qRound(positions[i + 1].y) - qRound(positions[i].y);
+                g[i] = _glyphs[i];
             }
-        }
+            glyphDistances[(_glyphs.size() - 1) * 2] = 0;
+            glyphDistances[(_glyphs.size() - 1) * 2 + 1] = 0;
+            g[_glyphs.size() - 1] = _glyphs[_glyphs.size() - 1];
+            ExtTextOut(hdc, qRound(positions[0].x), qRound(positions[0].y), options, 0,
+                       convertToText ? convertedGlyphs : g.data(), _glyphs.size(),
+                       glyphDistances.data());
+        } else {
+            int i = 0;
+            while(i < _glyphs.size()) {
+                wchar_t g = _glyphs[i];
+
+                ExtTextOut(hdc, qRound(positions[i].x),
+                           qRound(positions[i].y), options, 0,
+                           convertToText ? convertedGlyphs + i : &g, 1, 0);
+                ++i;
+            }
+        }
+    }
 
 #if !defined(Q_OS_WINCE)
-        // Scale, rotate and translate here. This is only valid for systems > Windows Me.
-        // We should never get here on Windows Me or lower if the transformation specifies
-        // scaling or rotation.
-        QT_WA({
-            XFORM win_xform;
-            win_xform.eM11 = xform.m11();
-            win_xform.eM12 = xform.m12();
-            win_xform.eM21 = xform.m21();
-            win_xform.eM22 = xform.m22();
-            win_xform.eDx = xform.dx();
-            win_xform.eDy = xform.dy();
-            SetGraphicsMode(hdc, GM_ADVANCED);
-            SetWorldTransform(hdc, &win_xform);
-        }, {
-            // nothing
-        });
+        win_xform.eM11 = win_xform.eM22 = 1.0;
+        win_xform.eM12 = win_xform.eM21 = win_xform.eDx = win_xform.eDy = 0.0;
+        SetWorldTransform(hdc, &win_xform);
 #endif
 
-        if (fast) {
-            // fast path
-            QVarLengthArray<wchar_t> g(glyphs.numGlyphs);
-            for (int i = 0; i < glyphs.numGlyphs; ++i)
-                g[i] = glyphs.glyphs[i];
-            ExtTextOutW(hdc,
-                        qRound(baseline_pos.x() + glyphs.offsets[0].x.toReal()),
-                        qRound(baseline_pos.y() + glyphs.offsets[0].y.toReal()),
-                        options, 0, convertToText ? convertedGlyphs : g.data(), glyphs.numGlyphs, 0);
-        } else {
-            QVarLengthArray<QFixedPoint> positions;
-            QVarLengthArray<glyph_t> _glyphs;
-
-            QTransform matrix;
-            matrix.translate(baseline_pos.x(), baseline_pos.y());
-            ti.fontEngine->getGlyphPositions(ti.glyphs, matrix, ti.flags,
-                _glyphs, positions);
-            if (_glyphs.size() == 0) {
-                SelectObject(hdc, old_font);
-                return;
-            }
-
-            convertToText = convertToText && glyphs.numGlyphs == _glyphs.size();
-
-            bool outputEntireItem = (QSysInfo::WindowsVersion & QSysInfo::WV_NT_based)
-                && QSysInfo::WindowsVersion != QSysInfo::WV_NT
-                && _glyphs.size() > 0;
-
-            if (outputEntireItem) {
-                options |= ETO_PDY;
-                QVarLengthArray<INT> glyphDistances(_glyphs.size() * 2);
-                QVarLengthArray<wchar_t> g(_glyphs.size());
-                for (int i=0; i<_glyphs.size() - 1; ++i) {
-                    glyphDistances[i * 2] = qRound(positions[i + 1].x) - qRound(positions[i].x);
-                    glyphDistances[i * 2 + 1] = qRound(positions[i + 1].y) - qRound(positions[i].y);
-                    g[i] = _glyphs[i];
-                }
-                glyphDistances[(_glyphs.size() - 1) * 2] = 0;
-                glyphDistances[(_glyphs.size() - 1) * 2 + 1] = 0;
-                g[_glyphs.size() - 1] = _glyphs[_glyphs.size() - 1];
-                ExtTextOutW(hdc, qRound(positions[0].x), qRound(positions[0].y), options, 0,
-                            convertToText ? convertedGlyphs : g.data(), _glyphs.size(),
-                            glyphDistances.data());
-            } else {
-                int i = 0;
-                while(i < _glyphs.size()) {
-                    wchar_t g = _glyphs[i];
-
-                    ExtTextOutW(hdc, qRound(positions[i].x),
-                        qRound(positions[i].y), options, 0,
-                                convertToText ? convertedGlyphs + i : &g, 1, 0);
-                    ++i;
+    SelectObject(hdc, old_font);
+}
+
+
+void QWin32PrintEnginePrivate::updateCustomPaperSize()
+{
+    uint paperSize = devMode->dmPaperSize;
+    if (paperSize > 0 && mapDevmodePaperSize(paperSize) == QPrinter::Custom) {
+        has_custom_paper_size = true;
+        DWORD needed = 0;
+        DWORD returned = 0;
+        if (!EnumForms(hPrinter, 1, 0, 0, &needed, &returned)) {
+            BYTE *forms = (BYTE *) malloc(needed);
+            if (EnumForms(hPrinter, 1, forms, needed, &needed, &returned)) {
+                if (paperSize <= returned) {
+                    FORM_INFO_1 *formArray = (FORM_INFO_1 *) forms;
+                    int width = formArray[paperSize - 1].Size.cx; // 1/1000 of a mm
+                    int height = formArray[paperSize - 1].Size.cy; // 1/1000 of a mm
+                    paper_size = QSizeF((width * 72 /25.4) / 1000.0, (height * 72 / 25.4) / 1000.0);
+                } else {
+                    has_custom_paper_size = false;
                 }
             }
-        }
-
-#if !defined(Q_OS_WINCE)
-        QT_WA({
-            XFORM win_xform;
-            win_xform.eM11 = win_xform.eM22 = 1.0;
-            win_xform.eM12 = win_xform.eM21 = win_xform.eDx = win_xform.eDy = 0.0;
-            SetWorldTransform(hdc, &win_xform);
-        }, {
-            // nothing
-        });
-#endif
-    }
-    SelectObject(hdc, old_font);
-}
-
-
-void QWin32PrintEnginePrivate::updateCustomPaperSize()
-{
-    QT_WA( {
-        uint paperSize = devModeW()->dmPaperSize;
-        if (paperSize > 0 && mapDevmodePaperSize(paperSize) == QPrinter::Custom) {
-            has_custom_paper_size = true;
-            DWORD needed = 0;
-            DWORD returned = 0;
-            if (!EnumForms(hPrinter, 1, 0, 0, &needed, &returned)) {
-                BYTE *forms = (BYTE *) malloc(needed);
-                if (EnumForms(hPrinter, 1, forms, needed, &needed, &returned)) {
-                    if (paperSize <= returned) {
-                        FORM_INFO_1 *formArray = (FORM_INFO_1 *) forms;
-                        int width = formArray[paperSize-1].Size.cx; // 1/1000 of a mm
-                        int height = formArray[paperSize-1].Size.cy; // 1/1000 of a mm
-                        paper_size = QSizeF((width*72/25.4)/1000.0, (height*72/25.4)/1000.0);
-                    } else {
-                        has_custom_paper_size = false;
-                    }
-                }
-                free(forms);
-            }
-        } else {
-            has_custom_paper_size = false;
-        }
-    }, {
-        // Not supported under Win98
-    } );
+            free(forms);
+        }
+    } else {
+        has_custom_paper_size = false;
+    }
 }