Module: wine Branch: master Commit: b223f82603e30c0cf74d9450aa010ec1b0845e23 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b223f82603e30c0cf74d9450a...
Author: Jacek Caban jacek@codeweavers.com Date: Thu Aug 19 10:24:55 2021 +0200
gdi32: Use NtGdiGetAndSetDCDword for SetDCPenColor.
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 | 33 +++++++-------------------------- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 1 - dlls/gdi32/enhmfdrv/init.c | 2 +- dlls/gdi32/enhmfdrv/objects.c | 19 +++++++++---------- dlls/gdi32/gdi_private.h | 1 + dlls/gdi32/gdidc.c | 13 +++++++++++++ include/ntgdi.h | 1 + 7 files changed, 32 insertions(+), 38 deletions(-)
diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index f1648575ecb..51b754d1ccd 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -851,6 +851,13 @@ BOOL WINAPI NtGdiGetAndSetDCDword( HDC hdc, UINT method, DWORD value, DWORD *pre if (value != CLR_INVALID) dc->attr->brush_color = value; break;
+ case NtGdiSetDCPenColor: + physdev = GET_DC_PHYSDEV( dc, pSetDCPenColor ); + *prev_value = dc->attr->pen_color; + value = physdev->funcs->pSetDCPenColor( physdev, value ); + if (value != CLR_INVALID) dc->attr->pen_color = value; + break; + default: WARN( "unknown method %u\n", method ); ret = FALSE; @@ -1294,29 +1301,3 @@ DWORD WINAPI NtGdiSetLayout( HDC hdc, LONG wox, DWORD layout )
return old_layout; } - -/*********************************************************************** - * SetDCPenColor (GDI32.@) - */ -COLORREF WINAPI SetDCPenColor(HDC hdc, COLORREF crColor) -{ - DC *dc; - COLORREF oldClr = CLR_INVALID; - - TRACE("hdc(%p) crColor(%08x)\n", hdc, crColor); - - dc = get_dc_ptr( hdc ); - if (dc) - { - PHYSDEV physdev = GET_DC_PHYSDEV( dc, pSetDCPenColor ); - crColor = physdev->funcs->pSetDCPenColor( physdev, crColor ); - if (crColor != CLR_INVALID) - { - oldClr = dc->attr->pen_color; - dc->attr->pen_color = crColor; - } - release_dc_ptr( dc ); - } - - return oldClr; -} diff --git a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h index 82b450a3e03..6613d0b5489 100644 --- a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h +++ b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h @@ -93,7 +93,6 @@ extern BOOL CDECL EMFDRV_ScaleWindowExtEx( PHYSDEV dev, INT xNum, INT xDenom INT yNum, INT yDenom, SIZE *size ) DECLSPEC_HIDDEN; extern HBITMAP CDECL EMFDRV_SelectBitmap( PHYSDEV dev, HBITMAP handle ) DECLSPEC_HIDDEN; extern HFONT CDECL EMFDRV_SelectFont( PHYSDEV dev, HFONT handle, UINT *aa_flags ) DECLSPEC_HIDDEN; -extern COLORREF CDECL EMFDRV_SetDCPenColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; extern INT CDECL EMFDRV_SetDIBitsToDevice( PHYSDEV dev, INT xDest, INT yDest, DWORD cx, DWORD cy, INT xSrc, INT ySrc, UINT startscan, UINT lines, LPCVOID bits, BITMAPINFO *info, UINT coloruse ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c index d1e19993e8e..09a9a901086 100644 --- a/dlls/gdi32/enhmfdrv/init.c +++ b/dlls/gdi32/enhmfdrv/init.c @@ -115,7 +115,7 @@ static const struct gdi_dc_funcs emfdrv_driver = NULL, /* pSetBkColor */ NULL, /* pSetBoundsRect */ NULL, /* pSetDCBrushColor*/ - EMFDRV_SetDCPenColor, /* pSetDCPenColor*/ + NULL, /* pSetDCPenColor*/ EMFDRV_SetDIBitsToDevice, /* pSetDIBitsToDevice */ NULL, /* pSetDeviceClipping */ NULL, /* pSetDeviceGammaRamp */ diff --git a/dlls/gdi32/enhmfdrv/objects.c b/dlls/gdi32/enhmfdrv/objects.c index 76f67594770..2243f42a3fc 100644 --- a/dlls/gdi32/enhmfdrv/objects.c +++ b/dlls/gdi32/enhmfdrv/objects.c @@ -487,26 +487,25 @@ BOOL EMFDC_SetDCBrushColor( DC_ATTR *dc_attr, COLORREF color ) }
/****************************************************************** - * EMFDRV_SetDCPenColor + * EMFDC_SetDCPenColor */ -COLORREF CDECL EMFDRV_SetDCPenColor( PHYSDEV dev, COLORREF color ) +BOOL EMFDC_SetDCPenColor( DC_ATTR *dc_attr, COLORREF color ) { - EMFDRV_PDEVICE *physDev = get_emf_physdev( dev ); - DC *dc = get_physdev_dc( dev ); + EMFDRV_PDEVICE *emf = dc_attr->emf; EMRSELECTOBJECT emr; DWORD index; LOGPEN logpen = { PS_SOLID, { 0, 0 }, color };
- if (dc->hPen != GetStockObject( DC_PEN )) return color; + if (GetCurrentObject( dc_attr->hdc, OBJ_PEN ) != GetStockObject( DC_PEN )) return TRUE;
- if (physDev->dc_pen) DeleteObject( physDev->dc_pen ); - if (!(physDev->dc_pen = CreatePenIndirect( &logpen ))) return CLR_INVALID; - if (!(index = EMFDRV_CreatePenIndirect(dev, physDev->dc_pen))) return CLR_INVALID; - GDI_hdc_using_object( physDev->dc_pen, dev->hdc, EMFDC_DeleteObject ); + if (emf->dc_pen) DeleteObject( emf->dc_pen ); + if (!(emf->dc_pen = CreatePenIndirect( &logpen ))) return FALSE; + if (!(index = EMFDRV_CreatePenIndirect( &emf->dev, emf->dc_pen ))) return FALSE; + GDI_hdc_using_object( emf->dc_pen, dc_attr->hdc, EMFDC_DeleteObject ); emr.emr.iType = EMR_SELECTOBJECT; emr.emr.nSize = sizeof(emr); emr.ihObject = index; - return EMFDRV_WriteRecord( dev, &emr.emr ) ? color : CLR_INVALID; + return EMFDRV_WriteRecord( &emf->dev, &emr.emr ); }
/******************************************************************* diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 3b2e787005d..bf7684b53a7 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -192,6 +192,7 @@ extern BOOL EMFDC_SetArcDirection( DC_ATTR *dc_attr, INT dir ) DECLSPEC_HIDDEN; extern BOOL EMFDC_SetBkColor( DC_ATTR *dc_attr, COLORREF color ) DECLSPEC_HIDDEN; extern BOOL EMFDC_SetBkMode( DC_ATTR *dc_attr, INT mode ) DECLSPEC_HIDDEN; extern BOOL EMFDC_SetDCBrushColor( DC_ATTR *dc_attr, COLORREF color ) DECLSPEC_HIDDEN; +extern BOOL EMFDC_SetDCPenColor( DC_ATTR *dc_attr, COLORREF color ) DECLSPEC_HIDDEN; extern INT EMFDC_SetDIBitsToDevice( DC_ATTR *dc_attr, INT x_dest, INT y_dest, DWORD width, DWORD height, INT x_src, INT y_src, UINT startscan, UINT lines, const void *bits, const BITMAPINFO *info, diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index 98cb01476d2..87cfe7d99f4 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -337,6 +337,19 @@ COLORREF WINAPI GetDCPenColor(HDC hdc) return dc_attr ? dc_attr->pen_color : CLR_INVALID; }
+/*********************************************************************** + * SetDCPenColor (GDI32.@) + */ +COLORREF WINAPI SetDCPenColor( HDC hdc, COLORREF color ) +{ + DC_ATTR *dc_attr; + COLORREF ret; + + if (!(dc_attr = get_dc_attr( hdc ))) return CLR_INVALID; + if (dc_attr->emf && !EMFDC_SetDCPenColor( dc_attr, color )) return CLR_INVALID; + return NtGdiGetAndSetDCDword( hdc, NtGdiSetDCPenColor, color, &ret ) ? ret : CLR_INVALID; +} + /*********************************************************************** * GetTextColor (GDI32.@) */ diff --git a/include/ntgdi.h b/include/ntgdi.h index e6447dd836f..cfcbce43fed 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -107,6 +107,7 @@ enum NtGdiSetBkColor = 100, NtGdiSetTextColor, NtGdiSetDCBrushColor, + NtGdiSetDCPenColor, };
enum