Commit 4f2a3c2c authored by Henri Verbeet's avatar Henri Verbeet Committed by Alexandre Julliard

gdi32: Call AbortProc from StartDoc instead of EndPage.

parent e20ef501
...@@ -77,6 +77,12 @@ INT WINAPI StartDocW(HDC hdc, const DOCINFOW* doc) ...@@ -77,6 +77,12 @@ INT WINAPI StartDocW(HDC hdc, const DOCINFOW* doc)
if(!dc) return SP_ERROR; 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 ); if (dc->funcs->pStartDoc) ret = dc->funcs->pStartDoc( dc->physDev, doc );
release_dc_ptr( dc ); release_dc_ptr( dc );
return ret; return ret;
...@@ -173,11 +179,6 @@ INT WINAPI EndPage(HDC hdc) ...@@ -173,11 +179,6 @@ INT WINAPI EndPage(HDC hdc)
if(!dc) return SP_ERROR; if(!dc) return SP_ERROR;
if (dc->funcs->pEndPage) ret = dc->funcs->pEndPage( dc->physDev ); 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 ); release_dc_ptr( dc );
return ret; return ret;
} }
......
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