Commit 268b5555 authored by Marcus Meissner's avatar Marcus Meissner Committed by Alexandre Julliard

Don't call QueryAbort16() in WriteSpool16(), since it might be called

with locks held (and we do not need to call it here).
parent 85ba8798
......@@ -193,6 +193,11 @@ INT WINAPI EndPage(HDC hdc)
else
ret = Escape(hdc, NEWFRAME, 0, 0, 0);
GDI_ReleaseObj( hdc );
if (!QueryAbort16( hdc, 0 ))
{
EndDoc( hdc );
ret = 0;
}
return ret;
}
......@@ -604,6 +609,10 @@ INT16 WINAPI WriteSpool16(HPJOB16 hJob, LPSTR lpData, INT16 cch)
nRet = SP_OUTOFDISK;
else
nRet = cch;
#if 0
/* FIXME: We just cannot call 16 bit functions from here, since we
* have acquired several locks (DC). And we do not really need to.
*/
if (pPrintJob->hDC == 0) {
TRACE("hDC == 0 so no QueryAbort\n");
}
......@@ -612,6 +621,7 @@ INT16 WINAPI WriteSpool16(HPJOB16 hJob, LPSTR lpData, INT16 cch)
CloseJob16(hJob); /* printing aborted */
nRet = SP_APPABORT;
}
#endif
}
return nRet;
}
......
......@@ -483,6 +483,7 @@ BOOL16 WINAPI Polygon16(HDC16,const POINT16*,INT16);
BOOL16 WINAPI Polyline16(HDC16,const POINT16*,INT16);
BOOL16 WINAPI PtInRegion16(HRGN16,INT16,INT16);
BOOL16 WINAPI PtVisible16(HDC16,INT16,INT16);
BOOL16 WINAPI QueryAbort16(HDC16,INT16);
UINT16 WINAPI RealizeDefaultPalette16(HDC16);
BOOL16 WINAPI Rectangle16(HDC16,INT16,INT16,INT16,INT16);
BOOL16 WINAPI RectInRegion16(HRGN16,const RECT16 *);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment