Jacek Caban : gdi32: Use ntgdi interface for printer driver functions.
Alexandre Julliard
julliard at winehq.org
Thu Sep 2 15:45:31 CDT 2021
Module: wine
Branch: master
Commit: ef7b2a1b8bf3cfdd29051da248fa3c2060800271
URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef7b2a1b8bf3cfdd29051da248fa3c2060800271
Author: Jacek Caban <jacek at codeweavers.com>
Date: Thu Sep 2 14:15:53 2021 +0200
gdi32: Use ntgdi interface for printer driver functions.
Signed-off-by: Jacek Caban <jacek at codeweavers.com>
Signed-off-by: Huw Davies <huw at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/gdi32/gdidc.c | 32 ++++++++++++++++++++++++++++++++
dlls/gdi32/printdrv.c | 21 +++++++++------------
2 files changed, 41 insertions(+), 12 deletions(-)
diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c
index f50b10dd3c7..4dc0db42571 100644
--- a/dlls/gdi32/gdidc.c
+++ b/dlls/gdi32/gdidc.c
@@ -1888,6 +1888,38 @@ INT WINAPI StartDocA( HDC hdc, const DOCINFOA *doc )
return ret;
}
+/***********************************************************************
+ * StartPage (GDI32.@)
+ */
+INT WINAPI StartPage( HDC hdc )
+{
+ return NtGdiStartPage( hdc );
+}
+
+/***********************************************************************
+ * EndPage (GDI32.@)
+ */
+INT WINAPI EndPage( HDC hdc )
+{
+ return NtGdiEndPage( hdc );
+}
+
+/***********************************************************************
+ * EndDoc (GDI32.@)
+ */
+INT WINAPI EndDoc( HDC hdc )
+{
+ return NtGdiEndDoc( hdc );
+}
+
+/***********************************************************************
+ * AbortDoc (GDI32.@)
+ */
+INT WINAPI AbortDoc( HDC hdc )
+{
+ return NtGdiAbortDoc( hdc );
+}
+
/**********************************************************************
* SetAbortProc (GDI32.@)
*/
diff --git a/dlls/gdi32/printdrv.c b/dlls/gdi32/printdrv.c
index 19f23ccbc12..9a4ad3b5c23 100644
--- a/dlls/gdi32/printdrv.c
+++ b/dlls/gdi32/printdrv.c
@@ -81,10 +81,9 @@ INT WINAPI NtGdiStartDoc( HDC hdc, const DOCINFOW *doc, BOOL *banding, INT job )
/******************************************************************
- * EndDoc [GDI32.@]
- *
+ * NtGdiEndDoc (win32u.@)
*/
-INT WINAPI EndDoc(HDC hdc)
+INT WINAPI NtGdiEndDoc( HDC hdc )
{
INT ret = SP_ERROR;
DC *dc = get_dc_ptr( hdc );
@@ -100,10 +99,9 @@ INT WINAPI EndDoc(HDC hdc)
/******************************************************************
- * StartPage [GDI32.@]
- *
+ * NtGdiStartPage (win32u.@)
*/
-INT WINAPI StartPage(HDC hdc)
+INT WINAPI NtGdiStartPage( HDC hdc )
{
INT ret = SP_ERROR;
DC *dc = get_dc_ptr( hdc );
@@ -119,10 +117,9 @@ INT WINAPI StartPage(HDC hdc)
/******************************************************************
- * EndPage [GDI32.@]
- *
+ * NtGdiEndPage (win32u.@)
*/
-INT WINAPI EndPage(HDC hdc)
+INT WINAPI NtGdiEndPage( HDC hdc )
{
INT ret = SP_ERROR;
DC *dc = get_dc_ptr( hdc );
@@ -137,10 +134,10 @@ INT WINAPI EndPage(HDC hdc)
}
-/******************************************************************************
- * AbortDoc [GDI32.@]
+/***********************************************************************
+ * NtGdiAbortDoc (win32u.@)
*/
-INT WINAPI AbortDoc(HDC hdc)
+INT WINAPI NtGdiAbortDoc( HDC hdc )
{
INT ret = SP_ERROR;
DC *dc = get_dc_ptr( hdc );
More information about the wine-cvs
mailing list