Module: wine Branch: master Commit: a6400cfbcb6cba86978d610ec9fdcc602eb61b07 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6400cfbcb6cba86978d610ec...
Author: Jacek Caban jacek@codeweavers.com Date: Fri Jul 30 13:01:11 2021 +0200
gdi32: Use get_dc_attr in SetMiterLimit.
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/dc.c | 24 ------------------------ dlls/gdi32/gdidc.c | 13 +++++++++++++ 2 files changed, 13 insertions(+), 24 deletions(-)
diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 4a8326c647e..a0bc86d6337 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -1538,30 +1538,6 @@ BOOL WINAPI CancelDC(HDC hdc) return TRUE; }
-/******************************************************************* - * SetMiterLimit [GDI32.@] - * - * - */ -BOOL WINAPI SetMiterLimit(HDC hdc, FLOAT eNewLimit, PFLOAT peOldLimit) -{ - BOOL bRet = FALSE; - DC *dc; - - TRACE("(%p,%f,%p)\n", hdc, eNewLimit, peOldLimit); - - dc = get_dc_ptr( hdc ); - if (dc) - { - if (peOldLimit) - *peOldLimit = dc->attr->miter_limit; - dc->attr->miter_limit = eNewLimit; - release_dc_ptr( dc ); - bRet = TRUE; - } - return bRet; -} - /******************************************************************* * GdiIsMetaPrintDC [GDI32.@] */ diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index 8d55d50f9a3..aec9ad48610 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -339,6 +339,19 @@ BOOL WINAPI GetMiterLimit( HDC hdc, FLOAT *limit ) return TRUE; }
+/******************************************************************* + * SetMiterLimit (GDI32.@) + */ +BOOL WINAPI SetMiterLimit( HDC hdc, FLOAT limit, FLOAT *old_limit ) +{ + DC_ATTR *dc_attr; + if (!(dc_attr = get_dc_attr( hdc ))) return FALSE; + /* FIXME: record EMFs */ + if (old_limit) *old_limit = dc_attr->miter_limit; + dc_attr->miter_limit = limit; + return TRUE; +} + /*********************************************************************** * SetPixel (GDI32.@) */