Jacek Caban : gdi32: Use get_dc_attr in SetROP2.
Alexandre Julliard
julliard at winehq.org
Wed Jul 28 15:37:41 CDT 2021
Module: wine
Branch: master
Commit: c00b231826d7d244f59a50610677960280823b9b
URL: https://source.winehq.org/git/wine.git/?a=commit;h=c00b231826d7d244f59a50610677960280823b9b
Author: Jacek Caban <jacek at codeweavers.com>
Date: Wed Jul 28 11:39:15 2021 +0200
gdi32: Use get_dc_attr in SetROP2.
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 | 28 ----------------------------
dlls/gdi32/enhmfdrv/dc.c | 4 ++--
dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 1 -
dlls/gdi32/enhmfdrv/init.c | 2 +-
dlls/gdi32/gdi_private.h | 2 ++
dlls/gdi32/gdidc.c | 23 +++++++++++++++++++++++
dlls/gdi32/mfdrv/dc.c | 4 ++--
dlls/gdi32/mfdrv/init.c | 2 +-
dlls/gdi32/mfdrv/metafiledrv.h | 1 -
9 files changed, 31 insertions(+), 36 deletions(-)
diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c
index 0f793dd76cc..dc7d0b2655d 100644
--- a/dlls/gdi32/dc.c
+++ b/dlls/gdi32/dc.c
@@ -1554,34 +1554,6 @@ INT WINAPI GetRelAbs( HDC hdc, DWORD dwIgnore )
}
-/***********************************************************************
- * SetROP2 (GDI32.@)
- */
-INT WINAPI SetROP2( HDC hdc, INT mode )
-{
- INT ret = 0;
- DC *dc;
-
- if ((mode < R2_BLACK) || (mode > R2_WHITE))
- {
- SetLastError(ERROR_INVALID_PARAMETER);
- return 0;
- }
- if ((dc = get_dc_ptr( hdc )))
- {
- PHYSDEV physdev = GET_DC_PHYSDEV( dc, pSetROP2 );
- mode = physdev->funcs->pSetROP2( physdev, mode );
- if (mode)
- {
- ret = dc->attr->rop_mode;
- dc->attr->rop_mode = mode;
- }
- release_dc_ptr( dc );
- }
- return ret;
-}
-
-
/***********************************************************************
* SetRelAbs (GDI32.@)
*/
diff --git a/dlls/gdi32/enhmfdrv/dc.c b/dlls/gdi32/enhmfdrv/dc.c
index c0a53045099..ff78ab4c774 100644
--- a/dlls/gdi32/enhmfdrv/dc.c
+++ b/dlls/gdi32/enhmfdrv/dc.c
@@ -116,13 +116,13 @@ COLORREF CDECL EMFDRV_SetTextColor( PHYSDEV dev, COLORREF color )
return EMFDRV_WriteRecord( dev, &emr.emr ) ? color : CLR_INVALID;
}
-INT CDECL EMFDRV_SetROP2( PHYSDEV dev, INT rop )
+BOOL EMFDC_SetROP2( DC_ATTR *dc_attr, INT rop )
{
EMRSETROP2 emr;
emr.emr.iType = EMR_SETROP2;
emr.emr.nSize = sizeof(emr);
emr.iMode = rop;
- return EMFDRV_WriteRecord( dev, &emr.emr ) ? rop : 0;
+ return EMFDRV_WriteRecord( dc_attr->emf, &emr.emr );
}
INT CDECL EMFDRV_SetPolyFillMode( PHYSDEV dev, INT mode )
diff --git a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h
index b80e0ffafd2..a5d4a623b95 100644
--- a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h
+++ b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h
@@ -125,7 +125,6 @@ extern INT CDECL EMFDRV_SetMapMode( PHYSDEV dev, INT mode ) DECLSPEC_HIDDEN
extern DWORD CDECL EMFDRV_SetMapperFlags( PHYSDEV dev, DWORD flags ) DECLSPEC_HIDDEN;
extern COLORREF CDECL EMFDRV_SetPixel( PHYSDEV dev, INT x, INT y, COLORREF color ) DECLSPEC_HIDDEN;
extern INT CDECL EMFDRV_SetPolyFillMode( PHYSDEV dev, INT mode ) DECLSPEC_HIDDEN;
-extern INT CDECL EMFDRV_SetROP2( PHYSDEV dev, INT rop ) DECLSPEC_HIDDEN;
extern INT CDECL EMFDRV_SetStretchBltMode( PHYSDEV dev, INT mode ) DECLSPEC_HIDDEN;
extern COLORREF CDECL EMFDRV_SetTextColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN;
extern BOOL CDECL EMFDRV_SetTextJustification( PHYSDEV dev, INT nBreakExtra, INT nBreakCount ) DECLSPEC_HIDDEN;
diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c
index 27856434d50..e9e8ae6eec0 100644
--- a/dlls/gdi32/enhmfdrv/init.c
+++ b/dlls/gdi32/enhmfdrv/init.c
@@ -141,7 +141,7 @@ static const struct gdi_dc_funcs emfdrv_driver =
EMFDRV_SetMapperFlags, /* pSetMapperFlags */
EMFDRV_SetPixel, /* pSetPixel */
EMFDRV_SetPolyFillMode, /* pSetPolyFillMode */
- EMFDRV_SetROP2, /* pSetROP2 */
+ NULL, /* pSetROP2 */
NULL, /* pSetRelAbs */
EMFDRV_SetStretchBltMode, /* pSetStretchBltMode */
NULL, /* pSetTextAlign */
diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h
index 37cec4bfe78..7ffb92d83d1 100644
--- a/dlls/gdi32/gdi_private.h
+++ b/dlls/gdi32/gdi_private.h
@@ -68,6 +68,7 @@ extern BOOL METADC_RoundRect( HDC hdc, INT left, INT top, INT right, INT bottom,
INT ell_width, INT ell_height ) DECLSPEC_HIDDEN;
extern BOOL METADC_SetBkMode( HDC hdc, INT mode ) DECLSPEC_HIDDEN;
extern BOOL METADC_SetPixel( HDC hdc, INT x, INT y, COLORREF color ) DECLSPEC_HIDDEN;
+extern BOOL METADC_SetROP2( HDC hdc, INT rop ) DECLSPEC_HIDDEN;
extern BOOL METADC_SetTextAlign( HDC hdc, UINT align ) DECLSPEC_HIDDEN;
/* enhanced metafiles */
@@ -112,6 +113,7 @@ extern BOOL EMFDC_RoundRect( DC_ATTR *dc_attr, INT left, INT top, INT right, INT
INT ell_width, INT ell_height ) 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;
extern BOOL EMFDC_SetTextAlign( DC_ATTR *dc_attr, UINT align ) DECLSPEC_HIDDEN;
#endif /* __WINE_GDI_PRIVATE_H */
diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c
index df6bc75c32d..d3221610ed6 100644
--- a/dlls/gdi32/gdidc.c
+++ b/dlls/gdi32/gdidc.c
@@ -117,6 +117,29 @@ INT WINAPI GetROP2( HDC hdc )
return dc_attr ? dc_attr->rop_mode : 0;
}
+/***********************************************************************
+ * SetROP2 (GDI32.@)
+ */
+INT WINAPI SetROP2( HDC hdc, INT mode )
+{
+ DC_ATTR *dc_attr;
+ INT ret;
+
+ if ((mode < R2_BLACK) || (mode > R2_WHITE))
+ {
+ SetLastError(ERROR_INVALID_PARAMETER);
+ return 0;
+ }
+
+ if (is_meta_dc( hdc )) return METADC_SetROP2( hdc, mode );
+ if (!(dc_attr = get_dc_attr( hdc ))) return 0;
+ if (dc_attr->emf && !EMFDC_SetROP2( dc_attr, mode )) return 0;
+
+ ret = dc_attr->rop_mode;
+ dc_attr->rop_mode = mode;
+ return ret;
+}
+
/***********************************************************************
* SetPixel (GDI32.@)
*/
diff --git a/dlls/gdi32/mfdrv/dc.c b/dlls/gdi32/mfdrv/dc.c
index 0ebb9b660e7..e20dc5666c9 100644
--- a/dlls/gdi32/mfdrv/dc.c
+++ b/dlls/gdi32/mfdrv/dc.c
@@ -50,9 +50,9 @@ COLORREF CDECL MFDRV_SetTextColor( PHYSDEV dev, COLORREF color )
return MFDRV_MetaParam2(dev, META_SETTEXTCOLOR, HIWORD(color), LOWORD(color)) ? color : CLR_INVALID;
}
-INT CDECL MFDRV_SetROP2( PHYSDEV dev, INT rop )
+BOOL METADC_SetROP2( HDC hdc, INT rop )
{
- return MFDRV_MetaParam1( dev, META_SETROP2, (WORD)rop) ? rop : 0;
+ return metadc_param1( hdc, META_SETROP2, (WORD)rop );
}
INT CDECL MFDRV_SetRelAbs( PHYSDEV dev, INT mode )
diff --git a/dlls/gdi32/mfdrv/init.c b/dlls/gdi32/mfdrv/init.c
index 3733d93e554..14c9abac379 100644
--- a/dlls/gdi32/mfdrv/init.c
+++ b/dlls/gdi32/mfdrv/init.c
@@ -204,7 +204,7 @@ static const struct gdi_dc_funcs MFDRV_Funcs =
MFDRV_SetMapperFlags, /* pSetMapperFlags */
NULL, /* pSetPixel */
MFDRV_SetPolyFillMode, /* pSetPolyFillMode */
- MFDRV_SetROP2, /* pSetROP2 */
+ NULL, /* pSetROP2 */
MFDRV_SetRelAbs, /* pSetRelAbs */
MFDRV_SetStretchBltMode, /* pSetStretchBltMode */
NULL, /* pSetTextAlign */
diff --git a/dlls/gdi32/mfdrv/metafiledrv.h b/dlls/gdi32/mfdrv/metafiledrv.h
index 5a9997209e7..70802a673d7 100644
--- a/dlls/gdi32/mfdrv/metafiledrv.h
+++ b/dlls/gdi32/mfdrv/metafiledrv.h
@@ -112,7 +112,6 @@ extern DWORD CDECL MFDRV_SetLayout( PHYSDEV dev, DWORD layout ) DECLSPEC_HIDD
extern INT CDECL MFDRV_SetMapMode( PHYSDEV dev, INT mode ) DECLSPEC_HIDDEN;
extern DWORD CDECL MFDRV_SetMapperFlags( PHYSDEV dev, DWORD flags ) DECLSPEC_HIDDEN;
extern INT CDECL MFDRV_SetPolyFillMode( PHYSDEV dev, INT mode ) DECLSPEC_HIDDEN;
-extern INT CDECL MFDRV_SetROP2( PHYSDEV dev, INT rop ) DECLSPEC_HIDDEN;
extern INT CDECL MFDRV_SetRelAbs( PHYSDEV dev, INT mode ) DECLSPEC_HIDDEN;
extern INT CDECL MFDRV_SetStretchBltMode( PHYSDEV dev, INT mode ) DECLSPEC_HIDDEN;
extern INT CDECL MFDRV_SetTextCharacterExtra( PHYSDEV dev, INT extra ) DECLSPEC_HIDDEN;
More information about the wine-cvs
mailing list