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

with locks held (and we do not need to call it here).
This commit is contained in:
Marcus Meissner 2001-01-06 00:35:37 +00:00 committed by Alexandre Julliard
parent 85ba8798b5
commit 268b5555ac
2 changed files with 11 additions and 0 deletions

View File

@ -193,6 +193,11 @@ INT WINAPI EndPage(HDC hdc)
else else
ret = Escape(hdc, NEWFRAME, 0, 0, 0); ret = Escape(hdc, NEWFRAME, 0, 0, 0);
GDI_ReleaseObj( hdc ); GDI_ReleaseObj( hdc );
if (!QueryAbort16( hdc, 0 ))
{
EndDoc( hdc );
ret = 0;
}
return ret; return ret;
} }
@ -604,6 +609,10 @@ INT16 WINAPI WriteSpool16(HPJOB16 hJob, LPSTR lpData, INT16 cch)
nRet = SP_OUTOFDISK; nRet = SP_OUTOFDISK;
else else
nRet = cch; 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) { if (pPrintJob->hDC == 0) {
TRACE("hDC == 0 so no QueryAbort\n"); TRACE("hDC == 0 so no QueryAbort\n");
} }
@ -612,6 +621,7 @@ INT16 WINAPI WriteSpool16(HPJOB16 hJob, LPSTR lpData, INT16 cch)
CloseJob16(hJob); /* printing aborted */ CloseJob16(hJob); /* printing aborted */
nRet = SP_APPABORT; nRet = SP_APPABORT;
} }
#endif
} }
return nRet; return nRet;
} }

View File

@ -483,6 +483,7 @@ BOOL16 WINAPI Polygon16(HDC16,const POINT16*,INT16);
BOOL16 WINAPI Polyline16(HDC16,const POINT16*,INT16); BOOL16 WINAPI Polyline16(HDC16,const POINT16*,INT16);
BOOL16 WINAPI PtInRegion16(HRGN16,INT16,INT16); BOOL16 WINAPI PtInRegion16(HRGN16,INT16,INT16);
BOOL16 WINAPI PtVisible16(HDC16,INT16,INT16); BOOL16 WINAPI PtVisible16(HDC16,INT16,INT16);
BOOL16 WINAPI QueryAbort16(HDC16,INT16);
UINT16 WINAPI RealizeDefaultPalette16(HDC16); UINT16 WINAPI RealizeDefaultPalette16(HDC16);
BOOL16 WINAPI Rectangle16(HDC16,INT16,INT16,INT16,INT16); BOOL16 WINAPI Rectangle16(HDC16,INT16,INT16,INT16,INT16);
BOOL16 WINAPI RectInRegion16(HRGN16,const RECT16 *); BOOL16 WINAPI RectInRegion16(HRGN16,const RECT16 *);