whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Check if Start/EndPage returns non-positive value when error checking 

StartPage and EndPage are documented to return a non-positive value (0 or
less) when they fail, therefore it is not enough to check if !StartPage.
Checking if is 0 or less is more accurate.

Change-Id: Ia0ff43da4e4309ba0a5983e91a0ad583aad0a955
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
bb10
Andy Shaw 2014-07-22 15:59:45 +02:00
parent 8306dee38f
commit 51ff044934
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -203,7 +203,7 @@ bool QWin32PrintEngine::newPage()
bool transparent = GetBkMode(d->hdc) == TRANSPARENT;
if (!EndPage(d->hdc)) {
if (EndPage(d->hdc) <= 0) {
qErrnoWarning("QWin32PrintEngine::newPage: EndPage failed");
return false;
}
@ -216,7 +216,7 @@ bool QWin32PrintEngine::newPage()
d->reinit = false;
}
if (!StartPage(d->hdc)) {
if (StartPage(d->hdc) <= 0) {
qErrnoWarning("Win32PrintEngine::newPage: StartPage failed");
return false;
}
@ -235,7 +235,7 @@ bool QWin32PrintEngine::newPage()
bool success = false;
if (d->hdc && d->state == QPrinter::Active) {
if (EndPage(d->hdc) != SP_ERROR) {
if (EndPage(d->hdc) > 0) {
// reinitialize the DC before StartPage if needed,
// because resetdc is disabled between calls to the StartPage and EndPage functions
// (see StartPage documentation in the Platform SDK:Windows GDI)
@ -248,7 +248,7 @@ bool QWin32PrintEngine::newPage()
qErrnoWarning("QWin32PrintEngine::newPage(), ResetDC failed (2)");
d->reinit = false;
}
success = (StartPage(d->hdc) != SP_ERROR);
success = (StartPage(d->hdc) > 0);
}
if (!success) {
d->state = QPrinter::Aborted;