August 2021 - Wine-Commits - list.winehq.org

Jacek Caban : gdi32: Use NtGdiGetAndSetDCDword for SetDCPenColor.
by Alexandre Julliard Aug. 19, 2021

Aug. 19, 2021

Module: wine Branch: master Commit: b223f82603e30c0cf74d9450aa010ec1b0845e23 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b223f82603e30c0cf74d9450… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 19 10:24:55 2021 +0200 gdi32: Use NtGdiGetAndSetDCDword for SetDCPenColor. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)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

1 0

Jacek Caban : gdi32: Use NtGdiGetAndSetDCDword for SetDCBrushColor.
by Alexandre Julliard Aug. 19, 2021

Aug. 19, 2021

Module: wine Branch: master Commit: 02ee9bf24641441b3accf7725f0f1e098788eeb6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=02ee9bf24641441b3accf772… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 19 10:24:44 2021 +0200 gdi32: Use NtGdiGetAndSetDCDword for SetDCBrushColor. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dc.c | 34 ++++++++-------------------------- 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, 33 insertions(+), 38 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 4fc1204d70c..f1648575ecb 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -821,6 +821,7 @@ INT WINAPI NtGdiGetDeviceCaps( HDC hdc, INT cap ) */ BOOL WINAPI NtGdiGetAndSetDCDword( HDC hdc, UINT method, DWORD value, DWORD *prev_value ) { + PHYSDEV physdev; BOOL ret = TRUE; DC *dc; @@ -843,6 +844,13 @@ BOOL WINAPI NtGdiGetAndSetDCDword( HDC hdc, UINT method, DWORD value, DWORD *pre set_text_color( dc, value ); break; + case NtGdiSetDCBrushColor: + physdev = GET_DC_PHYSDEV( dc, pSetDCBrushColor ); + *prev_value = dc->attr->brush_color; + value = physdev->funcs->pSetDCBrushColor( physdev, value ); + if (value != CLR_INVALID) dc->attr->brush_color = value; + break; + default: WARN( "unknown method %u\n", method ); ret = FALSE; @@ -1287,32 +1295,6 @@ DWORD WINAPI NtGdiSetLayout( HDC hdc, LONG wox, DWORD layout ) return old_layout; } -/*********************************************************************** - * SetDCBrushColor (GDI32.@) - */ -COLORREF WINAPI SetDCBrushColor(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, pSetDCBrushColor ); - crColor = physdev->funcs->pSetDCBrushColor( physdev, crColor ); - if (crColor != CLR_INVALID) - { - oldClr = dc->attr->brush_color; - dc->attr->brush_color = crColor; - } - release_dc_ptr( dc ); - } - - return oldClr; -} - /*********************************************************************** * SetDCPenColor (GDI32.@) */ diff --git a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h index e96093b825b..82b450a3e03 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_SetDCBrushColor( PHYSDEV dev, COLORREF color ) 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, diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c index 0088ee29609..d1e19993e8e 100644 --- a/dlls/gdi32/enhmfdrv/init.c +++ b/dlls/gdi32/enhmfdrv/init.c @@ -114,7 +114,7 @@ static const struct gdi_dc_funcs emfdrv_driver = NULL, /* pSelectPen */ NULL, /* pSetBkColor */ NULL, /* pSetBoundsRect */ - EMFDRV_SetDCBrushColor, /* pSetDCBrushColor*/ + NULL, /* pSetDCBrushColor*/ EMFDRV_SetDCPenColor, /* pSetDCPenColor*/ EMFDRV_SetDIBitsToDevice, /* pSetDIBitsToDevice */ NULL, /* pSetDeviceClipping */ diff --git a/dlls/gdi32/enhmfdrv/objects.c b/dlls/gdi32/enhmfdrv/objects.c index 1e2cb52dc6a..76f67594770 100644 --- a/dlls/gdi32/enhmfdrv/objects.c +++ b/dlls/gdi32/enhmfdrv/objects.c @@ -466,25 +466,24 @@ BOOL EMFDC_SelectObject( DC_ATTR *dc_attr, HGDIOBJ obj ) } /****************************************************************** - * EMFDRV_SetDCBrushColor + * EMFDC_SetDCBrushColor */ -COLORREF CDECL EMFDRV_SetDCBrushColor( PHYSDEV dev, COLORREF color ) +BOOL EMFDC_SetDCBrushColor( 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; - if (dc->hBrush != GetStockObject( DC_BRUSH )) return color; + if (GetCurrentObject( dc_attr->hdc, OBJ_BRUSH ) != GetStockObject( DC_BRUSH )) return TRUE; - if (physDev->dc_brush) DeleteObject( physDev->dc_brush ); - if (!(physDev->dc_brush = CreateSolidBrush( color ))) return CLR_INVALID; - if (!(index = EMFDRV_CreateBrushIndirect(dev, physDev->dc_brush ))) return CLR_INVALID; - GDI_hdc_using_object( physDev->dc_brush, dev->hdc, EMFDC_DeleteObject ); + if (emf->dc_brush) DeleteObject( emf->dc_brush ); + if (!(emf->dc_brush = CreateSolidBrush( color ))) return FALSE; + if (!(index = EMFDRV_CreateBrushIndirect( &emf->dev, emf->dc_brush ))) return FALSE; + GDI_hdc_using_object( emf->dc_brush, 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 969cd324f98..3b2e787005d 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -191,6 +191,7 @@ extern BOOL EMFDC_SelectPalette( DC_ATTR *dc_attr, HPALETTE palette ) DECLSPEC_H 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 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 e5d0e711eab..98cb01476d2 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -315,6 +315,19 @@ COLORREF WINAPI GetDCBrushColor( HDC hdc ) return dc_attr ? dc_attr->brush_color : CLR_INVALID; } +/*********************************************************************** + * SetDCBrushColor (GDI32.@) + */ +COLORREF WINAPI SetDCBrushColor( 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_SetDCBrushColor( dc_attr, color )) return CLR_INVALID; + return NtGdiGetAndSetDCDword( hdc, NtGdiSetDCBrushColor, color, &ret ) ? ret : CLR_INVALID; +} + /*********************************************************************** * GetDCPenColor (GDI32.@) */ diff --git a/include/ntgdi.h b/include/ntgdi.h index 5fb3ac76c04..e6447dd836f 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -106,6 +106,7 @@ enum /* not compatible with Windows */ NtGdiSetBkColor = 100, NtGdiSetTextColor, + NtGdiSetDCBrushColor, }; enum

1 0

Jacek Caban : gdi32: Use ntgdi names for GetPath and PathToRegion.
by Alexandre Julliard Aug. 19, 2021

Aug. 19, 2021

Module: wine Branch: master Commit: 59b2aabd6162e4903cf71afcf85f5ce02e535849 URL: https://source.winehq.org/git/wine.git/?a=commit;h=59b2aabd6162e4903cf71afc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 19 10:24:34 2021 +0200 gdi32: Use ntgdi names for GetPath and PathToRegion. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/gdi32.spec | 4 +-- dlls/gdi32/path.c | 75 +++++++++++++++++++++++++-------------------------- 2 files changed, 38 insertions(+), 41 deletions(-) diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index b0b649ffe3b..6aef8c2dbf6 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -326,7 +326,7 @@ @ stdcall GetOutlineTextMetricsA(long long ptr) @ stdcall GetOutlineTextMetricsW(long long ptr) @ stdcall GetPaletteEntries(long long long ptr) -@ stdcall GetPath(long ptr ptr long) +@ stdcall GetPath(long ptr ptr long) NtGdiGetPath @ stdcall GetPixel(long long long) NtGdiGetPixel @ stdcall GetPixelFormat(long) @ stdcall GetPolyFillMode(long) @@ -388,7 +388,7 @@ @ stdcall OffsetWindowOrgEx(long long long ptr) @ stdcall PaintRgn(long long) @ stdcall PatBlt(long long long long long long) -@ stdcall PathToRegion(long) +@ stdcall PathToRegion(long) NtGdiPathToRegion @ stdcall Pie(long long long long long long long long long) @ stdcall PlayEnhMetaFile(long long ptr) @ stdcall PlayEnhMetaFileRecord(long ptr ptr long) diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c index 3eed8f78c28..b3735f60b0b 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -624,52 +624,49 @@ BOOL WINAPI NtGdiCloseFigure( HDC hdc ) /*********************************************************************** - * GetPath (GDI32.@) + * NtGdiGetPath (win32u.@) */ -INT WINAPI GetPath(HDC hdc, LPPOINT pPoints, LPBYTE pTypes, INT nSize) +INT WINAPI NtGdiGetPath( HDC hdc, POINT *points, BYTE *types, INT size ) { - INT ret = -1; - DC *dc = get_dc_ptr( hdc ); + INT ret = -1; + DC *dc = get_dc_ptr( hdc ); - if(!dc) return -1; + if (!dc) return -1; - if (!dc->path) - { - SetLastError(ERROR_CAN_NOT_COMPLETE); - goto done; - } + if (!dc->path) + { + SetLastError( ERROR_CAN_NOT_COMPLETE ); + } + else if (size == 0) + { + ret = dc->path->count; + } + else if (size < dc->path->count) + { + SetLastError( ERROR_INVALID_PARAMETER ); + } + else + { + memcpy( points, dc->path->points, sizeof(POINT) * dc->path->count ); + memcpy( types, dc->path->flags, sizeof(BYTE) * dc->path->count ); - if(nSize==0) - ret = dc->path->count; - else if(nSize<dc->path->count) - { - SetLastError(ERROR_INVALID_PARAMETER); - goto done; - } - else - { - memcpy(pPoints, dc->path->points, sizeof(POINT)*dc->path->count); - memcpy(pTypes, dc->path->flags, sizeof(BYTE)*dc->path->count); + /* Convert the points to logical coordinates */ + if (dp_to_lp( dc, points, dc->path->count )) + ret = dc->path->count; + else + /* FIXME: Is this the correct value? */ + SetLastError( ERROR_CAN_NOT_COMPLETE ); + } - /* Convert the points to logical coordinates */ - if(!dp_to_lp(dc, pPoints, dc->path->count)) - { - /* FIXME: Is this the correct value? */ - SetLastError(ERROR_CAN_NOT_COMPLETE); - goto done; - } - else ret = dc->path->count; - } - done: - release_dc_ptr( dc ); - return ret; + release_dc_ptr( dc ); + return ret; } /*********************************************************************** - * PathToRegion (GDI32.@) + * NtGdiPathToRegion (win32u.@) */ -HRGN WINAPI PathToRegion(HDC hdc) +HRGN WINAPI NtGdiPathToRegion( HDC hdc ) { HRGN ret = 0; DC *dc = get_dc_ptr( hdc ); @@ -721,7 +718,7 @@ BOOL WINAPI NtGdiSelectClipPath( HDC hdc, INT mode ) BOOL ret = FALSE; HRGN rgn; - if ((rgn = PathToRegion( hdc ))) + if ((rgn = NtGdiPathToRegion( hdc ))) { ret = NtGdiExtSelectClipRgn( hdc, rgn, mode ) != ERROR; DeleteObject( rgn ); @@ -2008,21 +2005,21 @@ BOOL CDECL nulldrv_CloseFigure( PHYSDEV dev ) BOOL CDECL nulldrv_FillPath( PHYSDEV dev ) { - if (GetPath( dev->hdc, NULL, NULL, 0 ) == -1) return FALSE; + if (NtGdiGetPath( dev->hdc, NULL, NULL, 0 ) == -1) return FALSE; NtGdiAbortPath( dev->hdc ); return TRUE; } BOOL CDECL nulldrv_StrokeAndFillPath( PHYSDEV dev ) { - if (GetPath( dev->hdc, NULL, NULL, 0 ) == -1) return FALSE; + if (NtGdiGetPath( dev->hdc, NULL, NULL, 0 ) == -1) return FALSE; NtGdiAbortPath( dev->hdc ); return TRUE; } BOOL CDECL nulldrv_StrokePath( PHYSDEV dev ) { - if (GetPath( dev->hdc, NULL, NULL, 0 ) == -1) return FALSE; + if (NtGdiGetPath( dev->hdc, NULL, NULL, 0 ) == -1) return FALSE; NtGdiAbortPath( dev->hdc ); return TRUE; }

1 0

Jacek Caban : gdi32: Use NtGdiWidenPath for WidenPath.
by Alexandre Julliard Aug. 19, 2021

Aug. 19, 2021

Module: wine Branch: master Commit: 37a5c8b9f3e99c362a5a28c5bd7fb6d0831687ac URL: https://source.winehq.org/git/wine.git/?a=commit;h=37a5c8b9f3e99c362a5a28c5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 19 10:24:21 2021 +0200 gdi32: Use NtGdiWidenPath for WidenPath. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dibdrv/dc.c | 2 -- dlls/gdi32/driver.c | 1 - dlls/gdi32/enhmfdrv/dc.c | 5 ++--- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 1 - dlls/gdi32/enhmfdrv/init.c | 1 - dlls/gdi32/font.c | 1 - dlls/gdi32/gdi_private.h | 1 + dlls/gdi32/gdidc.c | 12 +++++++++++ dlls/gdi32/ntgdi_private.h | 1 - dlls/gdi32/path.c | 39 ++++++++++++------------------------ dlls/wineandroid.drv/init.c | 1 - dlls/winemac.drv/gdi.c | 1 - dlls/wineps.drv/init.c | 1 - dlls/winex11.drv/init.c | 1 - dlls/winex11.drv/xrender.c | 1 - include/wine/gdi_driver.h | 3 +-- 16 files changed, 29 insertions(+), 43 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=37a5c8b9f3e99c362a5a…

1 0

Alexandre Julliard : ntdll/tests: Don't mark Wow64 floating point behavior as broken.
by Alexandre Julliard Aug. 19, 2021

Aug. 19, 2021

Module: wine Branch: master Commit: b7323b4b3edb49e74bc64a55112fad293415a139 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b7323b4b3edb49e74bc64a55… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 19 15:07:25 2021 +0200 ntdll/tests: Don't mark Wow64 floating point behavior as broken. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/exception.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 2a56641ca3c..8140a3aefb6 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -1476,8 +1476,7 @@ static void test_fpu_exceptions(void) run_exception_test(fpu_exception_handler, &info, fpu_exception_test_ie, sizeof(fpu_exception_test_ie), 0); ok(info.exception_code == EXCEPTION_FLT_STACK_CHECK, "Got exception code %#x, expected EXCEPTION_FLT_STACK_CHECK\n", info.exception_code); - ok(info.exception_offset == 0x19 || - broken( info.exception_offset == info.eip_offset ), + ok(info.exception_offset == 0x19 || info.exception_offset == info.eip_offset, "Got exception offset %#x, expected 0x19\n", info.exception_offset); ok(info.eip_offset == 0x1b, "Got EIP offset %#x, expected 0x1b\n", info.eip_offset); @@ -1485,8 +1484,7 @@ static void test_fpu_exceptions(void) run_exception_test(fpu_exception_handler, &info, fpu_exception_test_de, sizeof(fpu_exception_test_de), 0); ok(info.exception_code == EXCEPTION_FLT_DIVIDE_BY_ZERO, "Got exception code %#x, expected EXCEPTION_FLT_DIVIDE_BY_ZERO\n", info.exception_code); - ok(info.exception_offset == 0x17 || - broken( info.exception_offset == info.eip_offset ), + ok(info.exception_offset == 0x17 || info.exception_offset == info.eip_offset, "Got exception offset %#x, expected 0x17\n", info.exception_offset); ok(info.eip_offset == 0x19, "Got EIP offset %#x, expected 0x19\n", info.eip_offset); } @@ -3379,7 +3377,7 @@ static void test_exceptions(void) __asm__ volatile( "movw %%ss,%0" : "=g" (ss) ); res = pNtGetContextThread( GetCurrentThread(), &ctx ); ok( res == STATUS_SUCCESS, "NtGetContextThread failed with %x\n", res ); - ok( ctx.SegDs == ds, "wrong ds %08x / %08x\n", ctx.SegDs, ds ); + ok( ctx.SegDs == ds, "wrong ds %04x / %04x\n", ctx.SegDs, ds ); ok( ctx.SegEs == es, "wrong es %04x / %04x\n", ctx.SegEs, es ); ok( ctx.SegFs == fs, "wrong fs %04x / %04x\n", ctx.SegFs, fs ); ok( ctx.SegGs == gs, "wrong gs %04x / %04x\n", ctx.SegGs, gs );

1 0

Alexandre Julliard : server: Also set extended registers from the native context even in Wow64 mode.
by Alexandre Julliard Aug. 19, 2021

Aug. 19, 2021

Module: wine Branch: master Commit: d9ca9d455eed8b242106d0eeb1cf8481b2f62168 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d9ca9d455eed8b242106d0ee… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 19 15:20:19 2021 +0200 server: Also set extended registers from the native context even in Wow64 mode. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/thread.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/thread.c b/server/thread.c index c1fa80f1ad8..9d412106809 100644 --- a/server/thread.c +++ b/server/thread.c @@ -129,7 +129,7 @@ struct context /* flags for registers that always need to be set from the server side */ static const unsigned int system_flags = SERVER_CTX_DEBUG_REGISTERS; /* flags for registers that are set from the native context even in WoW mode */ -static const unsigned int always_native_flags = SERVER_CTX_DEBUG_REGISTERS | SERVER_CTX_YMM_REGISTERS; +static const unsigned int always_native_flags = SERVER_CTX_DEBUG_REGISTERS | SERVER_CTX_FLOATING_POINT | SERVER_CTX_YMM_REGISTERS; static void dump_context( struct object *obj, int verbose ); static int context_signaled( struct object *obj, struct wait_queue_entry *entry );

1 0

Zebediah Figura : ws2_32: Use malloc() instead of HeapAlloc().
by Alexandre Julliard Aug. 19, 2021

Aug. 19, 2021

Module: wine Branch: master Commit: 357fb2be9b8a786081269cafce9cc384bf74632d URL: https://source.winehq.org/git/wine.git/?a=commit;h=357fb2be9b8a786081269caf… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Aug 18 23:25:48 2021 -0500 ws2_32: Use malloc() instead of HeapAlloc(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/async.c | 26 +++----- dlls/ws2_32/protocol.c | 141 +++++++++++++++++++++---------------------- dlls/ws2_32/socket.c | 72 +++++++++++----------- dlls/ws2_32/ws2_32_private.h | 2 +- 4 files changed, 116 insertions(+), 125 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=357fb2be9b8a78608126…

1 0

Gerald Pfeifer : nsiproxy: Include netinet/in_pcb.h.
by Alexandre Julliard Aug. 19, 2021

Aug. 19, 2021

Module: wine Branch: master Commit: 823532bd3ae36c99c0c5befdd6ef3341ba26914a URL: https://source.winehq.org/git/wine.git/?a=commit;h=823532bd3ae36c99c0c5befd… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Thu Aug 19 01:18:01 2021 +0200 nsiproxy: Include netinet/in_pcb.h. Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/nsiproxy.sys/tcp.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/nsiproxy.sys/tcp.c b/dlls/nsiproxy.sys/tcp.c index eda438318f0..8567330be99 100644 --- a/dlls/nsiproxy.sys/tcp.c +++ b/dlls/nsiproxy.sys/tcp.c @@ -50,6 +50,10 @@ #include <netinet/in.h> #endif +#ifdef HAVE_NETINET_IN_PCB_H +#include <netinet/in_pcb.h> +#endif + #ifdef HAVE_NETINET_IP_VAR_H #include <netinet/ip_var.h> #endif

1 0

Gerald Pfeifer : nsiproxy: Include sys/param.h.
by Alexandre Julliard Aug. 19, 2021

Aug. 19, 2021

Module: wine Branch: master Commit: 20c4149e7241d413d16b70b6cf058d52145c15cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=20c4149e7241d413d16b70b6… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Wed Aug 18 23:13:33 2021 +0200 nsiproxy: Include sys/param.h. This fixes In file included from dlls/nsiproxy.sys/tcp.c:70: /usr/include/libprocstat.h:130:36: error: 'SPECNAMELEN' undeclared here 130 | char vn_devname[SPECNAMELEN + 1]; on FreeBSD 11 and presumably other targets. Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/nsiproxy.sys/tcp.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/nsiproxy.sys/tcp.c b/dlls/nsiproxy.sys/tcp.c index 3d0f3a67dd7..eda438318f0 100644 --- a/dlls/nsiproxy.sys/tcp.c +++ b/dlls/nsiproxy.sys/tcp.c @@ -22,6 +22,10 @@ #include "config.h" #include <stdarg.h> +#ifdef HAVE_SYS_PARAM_H +#include <sys/param.h> +#endif + #ifdef HAVE_SYS_TYPES_H #include <sys/types.h> #endif

1 0

Gerald Pfeifer : ntdll: Always return a value in get_builtin_init_funcs.
by Alexandre Julliard Aug. 19, 2021

Aug. 19, 2021

Module: wine Branch: master Commit: 6468e445bd29b4c2eb006cd64623e21127ed0151 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6468e445bd29b4c2eb006cd6… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Thu Aug 19 01:36:39 2021 +0200 ntdll: Always return a value in get_builtin_init_funcs. This only showed up in the #ifdef __FreeBSD__ case, so did not appear on other platforms during testing. Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/loader.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index a8e145de16e..2dde2332a6a 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1729,7 +1729,8 @@ NTSTATUS get_builtin_init_funcs( void *handle, void **funcs, SIZE_T len, SIZE_T #ifdef __FreeBSD__ /* On older FreeBSD versions, l_addr was the absolute load address, now it's the relocation offset. */ if (offsetof(struct link_map, l_addr) == 0) - if (!get_relocbase(map->l_addr, &relocbase)) return; + if (!get_relocbase(map->l_addr, &relocbase)) + return STATUS_NOT_SUPPORTED; #endif switch (dyn->d_tag) {

1 0