Module: wine Branch: master Commit: 1bf34b763ebfdbda73f9de042d40da798450ddc5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1bf34b763ebfdbda73f9de042...
Author: Jacek Caban jacek@codeweavers.com Date: Sat Jul 17 16:57:16 2021 +0200
gdi32: Use NtGdiArcInternal for Chord implementation.
Signed-off-by: Jacek Caban jacek@codeweavers.com Signed-off-by: Huw Davies huw@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/gdi32/gdidc.c | 13 +++++++++++++ dlls/gdi32/painting.c | 28 ++++++---------------------- 2 files changed, 19 insertions(+), 22 deletions(-)
diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index 98269cb7582..0123ed8f525 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -67,3 +67,16 @@ BOOL WINAPI ArcTo( HDC hdc, INT left, INT top, INT right, INT bottom, return NtGdiArcInternal( NtGdiArcTo, hdc, left, top, right, bottom, xstart, ystart, xend, yend ); } + +/*********************************************************************** + * Chord (GDI32.@) + */ +BOOL WINAPI Chord( HDC hdc, INT left, INT top, INT right, INT bottom, + INT xstart, INT ystart, INT xend, INT yend ) +{ + TRACE( "%p, (%d, %d)-(%d, %d), (%d, %d), (%d, %d)\n", hdc, left, top, + right, bottom, xstart, ystart, xend, yend ); + + return NtGdiArcInternal( NtGdiChord, hdc, left, top, right, bottom, + xstart, ystart, xend, yend ); +} diff --git a/dlls/gdi32/painting.c b/dlls/gdi32/painting.c index 4fc7f98d9b8..f34570cf1ff 100644 --- a/dlls/gdi32/painting.c +++ b/dlls/gdi32/painting.c @@ -316,6 +316,12 @@ BOOL WINAPI NtGdiArcInternal( UINT type, HDC hdc, INT left, INT top, INT right, break; }
+ case NtGdiChord: + physdev = GET_DC_PHYSDEV( dc, pChord ); + ret = physdev->funcs->pChord( physdev, left, top, right, bottom, + xstart, ystart, xend, yend ); + break; + default: WARN( "invalid arc type %u\n", type ); ret = FALSE; @@ -348,28 +354,6 @@ BOOL WINAPI Pie( HDC hdc, INT left, INT top, }
-/*********************************************************************** - * Chord (GDI32.@) - */ -BOOL WINAPI Chord( HDC hdc, INT left, INT top, - INT right, INT bottom, INT xstart, INT ystart, - INT xend, INT yend ) -{ - BOOL ret; - PHYSDEV physdev; - DC * dc = get_dc_ptr( hdc ); - - TRACE( "%p, (%d, %d)-(%d, %d), (%d, %d), (%d, %d)\n", hdc, left, top, right, bottom, xstart, ystart, xend, yend ); - - if (!dc) return FALSE; - update_dc( dc ); - physdev = GET_DC_PHYSDEV( dc, pChord ); - ret = physdev->funcs->pChord( physdev, left, top, right, bottom, xstart, ystart, xend, yend ); - release_dc_ptr( dc ); - return ret; -} - - /*********************************************************************** * Ellipse (GDI32.@) */