Jacek Caban : gdi32: Use get_dc_attr in SetArcDirection.
Alexandre Julliard
julliard at winehq.org
Thu Jul 29 16:37:52 CDT 2021
Module: wine
Branch: master
Commit: 18ce9d5efc1488216709912ecb255650f265a3a6
URL: https://source.winehq.org/git/wine.git/?a=commit;h=18ce9d5efc1488216709912ecb255650f265a3a6
Author: Jacek Caban <jacek at codeweavers.com>
Date: Thu Jul 29 13:21:56 2021 +0100
gdi32: Use get_dc_attr in SetArcDirection.
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/dc.c | 29 -----------------------------
dlls/gdi32/enhmfdrv/dc.c | 6 +++---
dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 1 -
dlls/gdi32/enhmfdrv/init.c | 2 +-
dlls/gdi32/gdi_private.h | 1 +
dlls/gdi32/gdidc.c | 22 ++++++++++++++++++++++
6 files changed, 27 insertions(+), 34 deletions(-)
diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c
index 55b48b2be5f..a76c7b79a0b 100644
--- a/dlls/gdi32/dc.c
+++ b/dlls/gdi32/dc.c
@@ -990,35 +990,6 @@ INT WINAPI SetGraphicsMode( HDC hdc, INT mode )
}
-/***********************************************************************
- * SetArcDirection (GDI32.@)
- */
-INT WINAPI SetArcDirection( HDC hdc, INT dir )
-{
- DC * dc;
- INT ret = 0;
-
- if (dir != AD_COUNTERCLOCKWISE && dir != AD_CLOCKWISE)
- {
- SetLastError(ERROR_INVALID_PARAMETER);
- return 0;
- }
-
- if ((dc = get_dc_ptr( hdc )))
- {
- PHYSDEV physdev = GET_DC_PHYSDEV( dc, pSetArcDirection );
- dir = physdev->funcs->pSetArcDirection( physdev, dir );
- if (dir)
- {
- ret = dc->attr->arc_direction;
- dc->attr->arc_direction = dir;
- }
- release_dc_ptr( dc );
- }
- return ret;
-}
-
-
/***********************************************************************
* GetWorldTransform (GDI32.@)
*/
diff --git a/dlls/gdi32/enhmfdrv/dc.c b/dlls/gdi32/enhmfdrv/dc.c
index ff78ab4c774..69e4a89af97 100644
--- a/dlls/gdi32/enhmfdrv/dc.c
+++ b/dlls/gdi32/enhmfdrv/dc.c
@@ -143,14 +143,14 @@ INT CDECL EMFDRV_SetStretchBltMode( PHYSDEV dev, INT mode )
return EMFDRV_WriteRecord( dev, &emr.emr ) ? mode : 0;
}
-INT CDECL EMFDRV_SetArcDirection(PHYSDEV dev, INT arcDirection)
+BOOL EMFDC_SetArcDirection( DC_ATTR *dc_attr, INT dir )
{
EMRSETARCDIRECTION emr;
emr.emr.iType = EMR_SETARCDIRECTION;
emr.emr.nSize = sizeof(emr);
- emr.iArcDirection = arcDirection;
- return EMFDRV_WriteRecord(dev, &emr.emr) ? arcDirection : 0;
+ emr.iArcDirection = dir;
+ return EMFDRV_WriteRecord( dc_attr->emf, &emr.emr );
}
INT CDECL EMFDRV_ExcludeClipRect( PHYSDEV dev, INT left, INT top, INT right, INT bottom )
diff --git a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h
index a5d4a623b95..def005cefbd 100644
--- a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h
+++ b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h
@@ -113,7 +113,6 @@ extern BOOL CDECL EMFDRV_SelectClipPath( PHYSDEV dev, INT iMode ) DECLSPEC_H
extern HFONT CDECL EMFDRV_SelectFont( PHYSDEV dev, HFONT handle, UINT *aa_flags ) DECLSPEC_HIDDEN;
extern HPEN CDECL EMFDRV_SelectPen( PHYSDEV dev, HPEN handle, const struct brush_pattern *pattern ) DECLSPEC_HIDDEN;
extern HPALETTE CDECL EMFDRV_SelectPalette( PHYSDEV dev, HPALETTE hPal, BOOL force ) DECLSPEC_HIDDEN;
-extern INT CDECL EMFDRV_SetArcDirection( PHYSDEV dev, INT arcDirection ) DECLSPEC_HIDDEN;
extern COLORREF CDECL EMFDRV_SetBkColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN;
extern COLORREF CDECL EMFDRV_SetDCBrushColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN;
extern COLORREF CDECL EMFDRV_SetDCPenColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN;
diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c
index 33f075673cf..929d7a2dd51 100644
--- a/dlls/gdi32/enhmfdrv/init.c
+++ b/dlls/gdi32/enhmfdrv/init.c
@@ -127,7 +127,7 @@ static const struct gdi_dc_funcs emfdrv_driver =
EMFDRV_SelectFont, /* pSelectFont */
EMFDRV_SelectPalette, /* pSelectPalette */
EMFDRV_SelectPen, /* pSelectPen */
- EMFDRV_SetArcDirection, /* pSetArcDirection */
+ NULL, /* pSetArcDirection */
EMFDRV_SetBkColor, /* pSetBkColor */
NULL, /* pSetBoundsRect */
EMFDRV_SetDCBrushColor, /* pSetDCBrushColor*/
diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h
index 7ffb92d83d1..01a451576c1 100644
--- a/dlls/gdi32/gdi_private.h
+++ b/dlls/gdi32/gdi_private.h
@@ -111,6 +111,7 @@ extern BOOL EMFDC_Rectangle( DC_ATTR *dc_attr, INT left, INT top, INT right,
INT bottom) DECLSPEC_HIDDEN;
extern BOOL EMFDC_RoundRect( DC_ATTR *dc_attr, INT left, INT top, INT right, INT bottom,
INT ell_width, INT ell_height ) DECLSPEC_HIDDEN;
+extern BOOL EMFDC_SetArcDirection( DC_ATTR *dc_attr, INT dir ) DECLSPEC_HIDDEN;
extern BOOL EMFDC_SetBkMode( DC_ATTR *dc_attr, INT mode ) DECLSPEC_HIDDEN;
extern BOOL EMFDC_SetPixel( DC_ATTR *dc_attr, INT x, INT y, COLORREF color ) DECLSPEC_HIDDEN;
extern BOOL EMFDC_SetROP2( DC_ATTR *dc_attr, INT rop ) DECLSPEC_HIDDEN;
diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c
index 7f8af0552bf..f8ec6083ccf 100644
--- a/dlls/gdi32/gdidc.c
+++ b/dlls/gdi32/gdidc.c
@@ -133,6 +133,28 @@ INT WINAPI GetArcDirection( HDC hdc )
return dc_attr ? dc_attr->arc_direction : 0;
}
+/***********************************************************************
+ * SetArcDirection (GDI32.@)
+ */
+INT WINAPI SetArcDirection( HDC hdc, INT dir )
+{
+ DC_ATTR *dc_attr;
+ INT ret;
+
+ if (dir != AD_COUNTERCLOCKWISE && dir != AD_CLOCKWISE)
+ {
+ SetLastError(ERROR_INVALID_PARAMETER);
+ return 0;
+ }
+
+ if (!(dc_attr = get_dc_attr( hdc ))) return 0;
+ if (dc_attr->emf && !EMFDC_SetArcDirection( dc_attr, dir )) return 0;
+
+ ret = dc_attr->arc_direction;
+ dc_attr->arc_direction = dir;
+ return ret;
+}
+
/***********************************************************************
* GetLayout (GDI32.@)
*/
More information about the wine-cvs
mailing list