AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QWin32PrintEngine: Fix build on MinGW + avoid dummy allocations

Browse Source 
Don't use wcscpy_s() which is not available on MinGW but determine the utf-16
string length and pass that value to QString::fromWCharArray() instead.

Change-Id: I45d1b1969fe03255fdb6353fa9f52417af530e40
Reviewed-by: Laszlo Papp <lpapp@kde.org>
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
This commit is contained in:
Konstantin Ritt 2013-02-26 12:51:34 +02:00 committed by The Qt Project
parent 1b76cf0174
commit 7729d89e15
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/printsupport/kernel/qprintengine_win.cpp
View File

@ -1596,6 +1596,16 @@ QList<QPrinter::PaperSize> QWin32PrintEngine::supportedPaperSizes(const QPrinter
return returnList;
}
static inline uint qwcsnlen(const wchar_t *str, uint maxlen)
{
uint length = 0;
if (str) {
while (length < maxlen && *str++)
length++;
}
return length;
}
QList<QPair<QString, QSizeF> > QWin32PrintEngine::supportedSizesWithNames(const QPrinterInfo &printerInfo)
{
QList<QPair<QString, QSizeF> > paperSizes;
@ -1603,22 +1613,20 @@ QList<QPair<QString, QSizeF> > QWin32PrintEngine::supportedSizesWithNames(const
return paperSizes;
DWORD size = DeviceCapabilities(reinterpret_cast<const wchar_t*>(printerInfo.printerName().utf16()),
NULL, DC_PAPERNAMES, NULL, NULL);
if ((int)size != -1) {
if ((int)size > 0) {
wchar_t *papers = new wchar_t[size*64];
size = DeviceCapabilities(reinterpret_cast<const wchar_t*>(printerInfo.printerName().utf16()),
NULL, DC_PAPERNAMES, papers, NULL);
DWORD size2 = DeviceCapabilities(reinterpret_cast<const wchar_t*>(printerInfo.printerName().utf16()),
NULL, DC_PAPERSIZE, NULL, NULL);
if ((int)size2 != -1) {
if ((int)size2 > 0) {
POINT *points = new POINT[size2*sizeof(POINT)];
size2 = DeviceCapabilities(reinterpret_cast<const wchar_t*>(printerInfo.printerName().utf16()),
NULL, DC_PAPERSIZE, (wchar_t *)points, NULL);
wchar_t copyOfPaper[65];
for (int i=0;i<(int)size;i++) {
wcscpy_s(copyOfPaper, 64, papers + (i * 64));
copyOfPaper[64] = '\0';
QString str = QString::fromWCharArray(copyOfPaper);
wchar_t *paper = papers + (i * 64);
QString str = QString::fromWCharArray(paper, qwcsnlen(paper, 64));
paperSizes << qMakePair(str, QSizeF(points[i].x / 10, points[i].y / 10));
}
delete [] points;