Henri Verbeet : gdi32: Call AbortProc from StartDoc instead of EndPage.
Alexandre Julliard
julliard at winehq.org
Wed Oct 8 08:32:31 CDT 2008
Module: wine
Branch: master
Commit: 4f2a3c2c28a4c7815c0a277ed6ecbf471122ddf4
URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f2a3c2c28a4c7815c0a277ed6ecbf471122ddf4
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Tue Oct 7 16:01:01 2008 +0200
gdi32: Call AbortProc from StartDoc instead of EndPage.
---
dlls/gdi32/printdrv.c | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/dlls/gdi32/printdrv.c b/dlls/gdi32/printdrv.c
index b224896..7d2cb42 100644
--- a/dlls/gdi32/printdrv.c
+++ b/dlls/gdi32/printdrv.c
@@ -77,6 +77,12 @@ INT WINAPI StartDocW(HDC hdc, const DOCINFOW* doc)
if(!dc) return SP_ERROR;
+ if (dc->pAbortProc && !dc->pAbortProc( hdc, 0 ))
+ {
+ release_dc_ptr( dc );
+ return ret;
+ }
+
if (dc->funcs->pStartDoc) ret = dc->funcs->pStartDoc( dc->physDev, doc );
release_dc_ptr( dc );
return ret;
@@ -173,11 +179,6 @@ INT WINAPI EndPage(HDC hdc)
if(!dc) return SP_ERROR;
if (dc->funcs->pEndPage) ret = dc->funcs->pEndPage( dc->physDev );
- if (dc->pAbortProc && !dc->pAbortProc( hdc, 0 ))
- {
- EndDoc( hdc );
- ret = 0;
- }
release_dc_ptr( dc );
return ret;
}
More information about the wine-cvs
mailing list