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

Jacek Caban : gdi32: Merge mfdrv/bitblt.c into metadc.c.
by Alexandre Julliard 18 Aug '21

18 Aug '21

Module: wine Branch: master Commit: 61084e0bdc9fdf8326338eb1c00669ba69db8be7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=61084e0bdc9fdf8326338eb1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 18 11:57:52 2021 +0200 gdi32: Merge mfdrv/bitblt.c into metadc.c. 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/Makefile.in | 1 - dlls/gdi32/metadc.c | 138 ++++++++++++++++++++++++++++++++++++ dlls/gdi32/mfdrv/bitblt.c | 177 ---------------------------------------------- 3 files changed, 138 insertions(+), 178 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=61084e0bdc9fdf832633…

1 0

Jacek Caban : gdi32: Merge mfdrv/text.c into metadc.c.
by Alexandre Julliard 18 Aug '21

18 Aug '21

Module: wine Branch: master Commit: b47fb9081d4cf2802d64b29b06ed1a377191dbf9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b47fb9081d4cf2802d64b29b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 18 11:58:05 2021 +0200 gdi32: Merge mfdrv/text.c into metadc.c. 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/Makefile.in | 1 - dlls/gdi32/metadc.c | 159 ++++++++++++++++++++++++++++++++++++----- dlls/gdi32/mfdrv/metafiledrv.h | 65 ----------------- dlls/gdi32/mfdrv/text.c | 153 --------------------------------------- 4 files changed, 143 insertions(+), 235 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b47fb9081d4cf2802d64…

1 0

Jacek Caban : gdi32: Use NtGdiFillPath for FillPath.
by Alexandre Julliard 18 Aug '21

18 Aug '21

Module: wine Branch: master Commit: 6ce4ad23eb46e0492a28a85fdfc2f8ca8b925ecc URL: https://source.winehq.org/git/wine.git/?a=commit;h=6ce4ad23eb46e0492a28a85f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 18 11:58:26 2021 +0200 gdi32: Use NtGdiFillPath for FillPath. 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/enhmfdrv/graphics.c | 11 ++++++++++- dlls/gdi32/gdi_private.h | 1 + dlls/gdi32/gdidc.c | 12 ++++++++++++ dlls/gdi32/path.c | 7 ++----- 4 files changed, 25 insertions(+), 6 deletions(-) diff --git a/dlls/gdi32/enhmfdrv/graphics.c b/dlls/gdi32/enhmfdrv/graphics.c index eacf596c92b..0f48d6876dd 100644 --- a/dlls/gdi32/enhmfdrv/graphics.c +++ b/dlls/gdi32/enhmfdrv/graphics.c @@ -1180,7 +1180,16 @@ BOOL EMFDC_GradientFill( DC_ATTR *dc_attr, TRIVERTEX *vert_array, ULONG nvert, */ BOOL CDECL EMFDRV_FillPath( PHYSDEV dev ) { - return emfdrv_stroke_and_fill_path( dev, EMR_FILLPATH ); + /* FIXME: update bound rect */ + return TRUE; +} + +/********************************************************************** + * EMFDC_FillPath + */ +BOOL EMFDC_FillPath( DC_ATTR *dc_attr ) +{ + return emfdrv_stroke_and_fill_path( dc_attr->emf, EMR_FILLPATH ); } /********************************************************************** diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index b32bae5449d..0a894e9ec3d 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -147,6 +147,7 @@ extern BOOL EMFDC_ExtFloodFill( DC_ATTR *dc_attr, INT x, INT y, COLORREF color, extern BOOL EMFDC_ExtSelectClipRgn( DC_ATTR *dc_attr, HRGN hrgn, INT mode ) DECLSPEC_HIDDEN; extern BOOL EMFDC_ExtTextOut( DC_ATTR *dc_attr, INT x, INT y, UINT flags, const RECT *rect, const WCHAR *str, UINT count, const INT *dx ) DECLSPEC_HIDDEN; +extern BOOL EMFDC_FillPath( DC_ATTR *dc_attr ) DECLSPEC_HIDDEN; extern BOOL EMFDC_FillRgn( DC_ATTR *dc_attr, HRGN hrgn, HBRUSH hbrush ) DECLSPEC_HIDDEN; extern BOOL EMFDC_FrameRgn( DC_ATTR *dc_attr, HRGN hrgn, HBRUSH hbrush, INT width, INT height ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index 041cba83581..85744cc5c11 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -1519,6 +1519,18 @@ BOOL WINAPI CloseFigure( HDC hdc ) return NtGdiCloseFigure( hdc ); } +/*********************************************************************** + * FillPath (GDI32.@) + */ +BOOL WINAPI FillPath( HDC hdc ) +{ + DC_ATTR *dc_attr; + + if (!(dc_attr = get_dc_attr( hdc ))) return FALSE; + if (dc_attr->emf && !EMFDC_FillPath( dc_attr )) return FALSE; + return NtGdiFillPath( hdc ); +} + /*********************************************************************** * IntersectClipRect (GDI32.@) */ diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c index fd8970f2929..54e93ca74db 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -696,12 +696,9 @@ HRGN WINAPI PathToRegion(HDC hdc) /*********************************************************************** - * FillPath (GDI32.@) - * - * FIXME - * Check that SetLastError is being called correctly + * NtGdiFillPath (win32u.@) */ -BOOL WINAPI FillPath(HDC hdc) +BOOL WINAPI NtGdiFillPath( HDC hdc ) { BOOL ret = FALSE; DC *dc = get_dc_ptr( hdc );

1 0

Jacek Caban : gdi32: Use NtGdiSelectClipPath for SelectClipPath.
by Alexandre Julliard 18 Aug '21

18 Aug '21

Module: wine Branch: master Commit: 617cab35686c3254ce02821e3be54f9df6275fbd URL: https://source.winehq.org/git/wine.git/?a=commit;h=617cab35686c3254ce02821e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 18 11:58:54 2021 +0200 gdi32: Use NtGdiSelectClipPath for SelectClipPath. 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/enhmfdrv/dc.c | 16 +++------------- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 1 - dlls/gdi32/enhmfdrv/init.c | 2 +- dlls/gdi32/gdi_private.h | 1 + dlls/gdi32/gdidc.c | 12 ++++++++++++ dlls/gdi32/path.c | 23 +++++++---------------- 6 files changed, 24 insertions(+), 31 deletions(-) diff --git a/dlls/gdi32/enhmfdrv/dc.c b/dlls/gdi32/enhmfdrv/dc.c index f424b459fb3..bf8f1a85ad9 100644 --- a/dlls/gdi32/enhmfdrv/dc.c +++ b/dlls/gdi32/enhmfdrv/dc.c @@ -386,24 +386,14 @@ BOOL CDECL EMFDRV_FlattenPath( PHYSDEV dev ) return EMFDRV_WriteRecord( dev, &emr.emr ); } -BOOL CDECL EMFDRV_SelectClipPath( PHYSDEV dev, INT iMode ) +BOOL EMFDC_SelectClipPath( DC_ATTR *dc_attr, INT mode ) { EMRSELECTCLIPPATH emr; - BOOL ret = FALSE; - HRGN hrgn; emr.emr.iType = EMR_SELECTCLIPPATH; emr.emr.nSize = sizeof(emr); - emr.iMode = iMode; - - if (!EMFDRV_WriteRecord( dev, &emr.emr )) return FALSE; - hrgn = PathToRegion( dev->hdc ); - if (hrgn) - { - ret = NtGdiExtSelectClipRgn( dev->hdc, hrgn, iMode ); - DeleteObject( hrgn ); - } - return ret; + emr.iMode = mode; + return EMFDRV_WriteRecord( dc_attr->emf, &emr.emr ); } BOOL CDECL EMFDRV_WidenPath( PHYSDEV dev ) diff --git a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h index fb108c15be5..ea60aa6cf29 100644 --- a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h +++ b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h @@ -93,7 +93,6 @@ extern BOOL CDECL EMFDRV_RoundRect( PHYSDEV dev, INT left, INT top, INT righ 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 BOOL CDECL EMFDRV_SelectClipPath( PHYSDEV dev, INT iMode ) 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; diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c index 5421f6009ce..57d538f3597 100644 --- a/dlls/gdi32/enhmfdrv/init.c +++ b/dlls/gdi32/enhmfdrv/init.c @@ -111,7 +111,7 @@ static const struct gdi_dc_funcs emfdrv_driver = EMFDRV_RoundRect, /* pRoundRect */ EMFDRV_SelectBitmap, /* pSelectBitmap */ NULL, /* pSelectBrush */ - EMFDRV_SelectClipPath, /* pSelectClipPath */ + NULL, /* pSelectClipPath */ EMFDRV_SelectFont, /* pSelectFont */ NULL, /* pSelectPen */ NULL, /* pSetBkColor */ diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 0a894e9ec3d..1e0e4d2dd0a 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -184,6 +184,7 @@ extern BOOL EMFDC_ScaleViewportExtEx( DC_ATTR *dc_attr, INT x_num, INT x_denom, INT y_denom ) DECLSPEC_HIDDEN; extern BOOL EMFDC_ScaleWindowExtEx( DC_ATTR *dc_attr, INT x_num, INT x_denom, INT y_num, INT y_denom ) DECLSPEC_HIDDEN; +extern BOOL EMFDC_SelectClipPath( DC_ATTR *dc_attr, INT mode ) DECLSPEC_HIDDEN; extern BOOL EMFDC_SelectObject( DC_ATTR *dc_attr, HGDIOBJ obj ) DECLSPEC_HIDDEN; extern BOOL EMFDC_SelectPalette( DC_ATTR *dc_attr, HPALETTE palette ) DECLSPEC_HIDDEN; extern BOOL EMFDC_SetArcDirection( DC_ATTR *dc_attr, INT dir ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index 85744cc5c11..067a7e7f588 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -1531,6 +1531,18 @@ BOOL WINAPI FillPath( HDC hdc ) return NtGdiFillPath( hdc ); } +/*********************************************************************** + * SelectClipPath (GDI32.@) + */ +BOOL WINAPI SelectClipPath( HDC hdc, INT mode ) +{ + DC_ATTR *dc_attr; + + if (!(dc_attr = get_dc_attr( hdc ))) return FALSE; + if (dc_attr->emf && !EMFDC_SelectClipPath( dc_attr, mode )) return FALSE; + return NtGdiSelectClipPath( hdc, mode ); +} + /*********************************************************************** * IntersectClipRect (GDI32.@) */ diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c index 54e93ca74db..2badf2874f2 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -714,18 +714,17 @@ BOOL WINAPI NtGdiFillPath( HDC hdc ) /*********************************************************************** - * SelectClipPath (GDI32.@) + * NtGdiSelectClipPath (win32u.@) */ -BOOL WINAPI SelectClipPath(HDC hdc, INT iMode) +BOOL WINAPI NtGdiSelectClipPath( HDC hdc, INT mode ) { BOOL ret = FALSE; - DC *dc = get_dc_ptr( hdc ); + HRGN rgn; - if (dc) + if ((rgn = PathToRegion( hdc ))) { - PHYSDEV physdev = GET_DC_PHYSDEV( dc, pSelectClipPath ); - ret = physdev->funcs->pSelectClipPath( physdev, iMode ); - release_dc_ptr( dc ); + ret = NtGdiExtSelectClipRgn( hdc, rgn, mode ) != ERROR; + DeleteObject( rgn ); } return ret; } @@ -2005,15 +2004,7 @@ BOOL CDECL nulldrv_CloseFigure( PHYSDEV dev ) BOOL CDECL nulldrv_SelectClipPath( PHYSDEV dev, INT mode ) { - BOOL ret = FALSE; - HRGN hrgn = PathToRegion( dev->hdc ); - - if (hrgn) - { - ret = ExtSelectClipRgn( dev->hdc, hrgn, mode ) != ERROR; - DeleteObject( hrgn ); - } - return ret; + return TRUE; } BOOL CDECL nulldrv_FillPath( PHYSDEV dev )

1 0

Jacek Caban : gdi32: Use NtGdiFlattenPath for FlattenPath.
by Alexandre Julliard 18 Aug '21

18 Aug '21

Module: wine Branch: master Commit: b39d4cbe36708d791a4c45f7a27cfa75e93db56c URL: https://source.winehq.org/git/wine.git/?a=commit;h=b39d4cbe36708d791a4c45f7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 18 11:59:15 2021 +0200 gdi32: Use NtGdiFlattenPath for FlattenPath. 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/enhmfdrv/dc.c | 5 ++--- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 1 - dlls/gdi32/enhmfdrv/init.c | 2 +- dlls/gdi32/gdi_private.h | 1 + dlls/gdi32/gdidc.c | 12 ++++++++++++ dlls/gdi32/path.c | 33 +++++++++++++-------------------- 6 files changed, 29 insertions(+), 25 deletions(-) diff --git a/dlls/gdi32/enhmfdrv/dc.c b/dlls/gdi32/enhmfdrv/dc.c index bf8f1a85ad9..5b88e6e9c13 100644 --- a/dlls/gdi32/enhmfdrv/dc.c +++ b/dlls/gdi32/enhmfdrv/dc.c @@ -376,14 +376,13 @@ BOOL EMFDC_EndPath( DC_ATTR *dc_attr ) return EMFDRV_WriteRecord( &emf->dev, &emr.emr ); } -BOOL CDECL EMFDRV_FlattenPath( PHYSDEV dev ) +BOOL EMFDC_FlattenPath( DC_ATTR *dc_attr ) { EMRFLATTENPATH emr; emr.emr.iType = EMR_FLATTENPATH; emr.emr.nSize = sizeof(emr); - - return EMFDRV_WriteRecord( dev, &emr.emr ); + return EMFDRV_WriteRecord( dc_attr->emf, &emr.emr ); } BOOL EMFDC_SelectClipPath( DC_ATTR *dc_attr, INT mode ) diff --git a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h index ea60aa6cf29..6e0a89495e6 100644 --- a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h +++ b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h @@ -71,7 +71,6 @@ extern BOOL CDECL EMFDRV_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, UINT count, const INT *lpDx ) DECLSPEC_HIDDEN; extern BOOL CDECL EMFDRV_FillPath( PHYSDEV dev ) DECLSPEC_HIDDEN; extern BOOL CDECL EMFDRV_FillRgn( PHYSDEV dev, HRGN hrgn, HBRUSH hbrush ) DECLSPEC_HIDDEN; -extern BOOL CDECL EMFDRV_FlattenPath( PHYSDEV dev ) DECLSPEC_HIDDEN; extern BOOL CDECL EMFDRV_FrameRgn( PHYSDEV dev, HRGN hrgn, HBRUSH hbrush, INT width, INT height ) DECLSPEC_HIDDEN; extern INT CDECL EMFDRV_GetDeviceCaps( PHYSDEV dev, INT cap ) DECLSPEC_HIDDEN; extern BOOL CDECL EMFDRV_GradientFill( PHYSDEV dev, TRIVERTEX *vert_array, ULONG nvert, diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c index 57d538f3597..7cbe6efb96d 100644 --- a/dlls/gdi32/enhmfdrv/init.c +++ b/dlls/gdi32/enhmfdrv/init.c @@ -63,7 +63,7 @@ static const struct gdi_dc_funcs emfdrv_driver = EMFDRV_ExtTextOut, /* pExtTextOut */ EMFDRV_FillPath, /* pFillPath */ EMFDRV_FillRgn, /* pFillRgn */ - EMFDRV_FlattenPath, /* pFlattenPath */ + NULL, /* pFlattenPath */ NULL, /* pFontIsLinked */ EMFDRV_FrameRgn, /* pFrameRgn */ NULL, /* pGetBoundsRect */ diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 1e0e4d2dd0a..bb90ee471f1 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -149,6 +149,7 @@ extern BOOL EMFDC_ExtTextOut( DC_ATTR *dc_attr, INT x, INT y, UINT flags, const const WCHAR *str, UINT count, const INT *dx ) DECLSPEC_HIDDEN; extern BOOL EMFDC_FillPath( DC_ATTR *dc_attr ) DECLSPEC_HIDDEN; extern BOOL EMFDC_FillRgn( DC_ATTR *dc_attr, HRGN hrgn, HBRUSH hbrush ) DECLSPEC_HIDDEN; +extern BOOL EMFDC_FlattenPath( DC_ATTR *dc_attr ) DECLSPEC_HIDDEN; extern BOOL EMFDC_FrameRgn( DC_ATTR *dc_attr, HRGN hrgn, HBRUSH hbrush, INT width, INT height ) DECLSPEC_HIDDEN; extern BOOL EMFDC_GradientFill( DC_ATTR *dc_attr, TRIVERTEX *vert_array, ULONG nvert, diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index 067a7e7f588..c5e8d29837a 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -1531,6 +1531,18 @@ BOOL WINAPI FillPath( HDC hdc ) return NtGdiFillPath( hdc ); } +/*********************************************************************** + * FlattenPath (GDI32.@) + */ +BOOL WINAPI FlattenPath( HDC hdc ) +{ + DC_ATTR *dc_attr; + + if (!(dc_attr = get_dc_attr( hdc ))) return FALSE; + if (dc_attr->emf && !EMFDC_FlattenPath( dc_attr )) return FALSE; + return NtGdiFlattenPath( hdc ); +} + /*********************************************************************** * SelectClipPath (GDI32.@) */ diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c index 2badf2874f2..a47682a6eda 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -1588,21 +1588,25 @@ static BOOL CDECL pathdrv_CloseFigure( PHYSDEV dev ) /******************************************************************* - * FlattenPath [GDI32.@] - * - * + * NtGdiFlattenPath (win32u.@) */ -BOOL WINAPI FlattenPath(HDC hdc) +BOOL WINAPI NtGdiFlattenPath( HDC hdc ) { + struct gdi_path *path; BOOL ret = FALSE; - DC *dc = get_dc_ptr( hdc ); + DC *dc; - if (dc) + if (!(dc = get_dc_ptr( hdc ))) return FALSE; + + if (!dc->path) SetLastError( ERROR_CAN_NOT_COMPLETE ); + else if ((path = PATH_FlattenPath( dc->path ))) { - PHYSDEV physdev = GET_DC_PHYSDEV( dc, pFlattenPath ); - ret = physdev->funcs->pFlattenPath( physdev ); - release_dc_ptr( dc ); + free_gdi_path( dc->path ); + dc->path = path; + ret = TRUE; } + + release_dc_ptr( dc ); return ret; } @@ -2030,17 +2034,6 @@ BOOL CDECL nulldrv_StrokePath( PHYSDEV dev ) BOOL CDECL nulldrv_FlattenPath( PHYSDEV dev ) { - DC *dc = get_nulldrv_dc( dev ); - struct gdi_path *path; - - if (!dc->path) - { - SetLastError( ERROR_CAN_NOT_COMPLETE ); - return FALSE; - } - if (!(path = PATH_FlattenPath( dc->path ))) return FALSE; - free_gdi_path( dc->path ); - dc->path = path; return TRUE; }

1 0

Jacek Caban : gdi32: Remove no longer used driver entry points.
by Alexandre Julliard 18 Aug '21

18 Aug '21

Module: wine Branch: master Commit: 817f116e9522d5f0cb333010cfe9fd783aca025e URL: https://source.winehq.org/git/wine.git/?a=commit;h=817f116e9522d5f0cb333010… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 18 11:59:24 2021 +0200 gdi32: Remove no longer used driver entry points. 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 | 4 ---- dlls/gdi32/driver.c | 2 -- dlls/gdi32/enhmfdrv/init.c | 2 -- dlls/gdi32/font.c | 2 -- dlls/gdi32/ntgdi_private.h | 2 -- dlls/gdi32/path.c | 12 ------------ dlls/wineandroid.drv/init.c | 2 -- dlls/winemac.drv/gdi.c | 2 -- dlls/wineps.drv/init.c | 2 -- dlls/winex11.drv/init.c | 2 -- dlls/winex11.drv/xrender.c | 2 -- include/wine/gdi_driver.h | 4 +--- 12 files changed, 1 insertion(+), 37 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=817f116e9522d5f0cb33…

1 0

Atharva Nimbalkar : vkd3d-shader: Implement VKD3D_SHADER_TARGET_GLSL.
by Alexandre Julliard 18 Aug '21

18 Aug '21

Module: vkd3d Branch: master Commit: 0376a8b4ee8fccf4f053de8f6bbd0d9db95d6ef0 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=0376a8b4ee8fccf4f053de8… Author: Atharva Nimbalkar <atharvakn(a)gmail.com> Date: Wed Aug 18 10:07:14 2021 +0530 vkd3d-shader: Implement VKD3D_SHADER_TARGET_GLSL. Signed-off-by: Atharva Nimbalkar <atharvakn(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_shader.h | 4 ++++ libs/vkd3d-shader/vkd3d_shader_main.c | 10 ++++++++++ libs/vkd3d-shader/vkd3d_shader_private.h | 2 ++ programs/vkd3d-compiler/main.c | 3 +++ 4 files changed, 19 insertions(+) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 5092fac..58e507b 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -491,6 +491,10 @@ enum vkd3d_shader_target_type * the format used for Direct3D shader model 4 and 5 shaders. */ VKD3D_SHADER_TARGET_DXBC_TPF, + /** + * An 'OpenGL Shading Language' shader. + */ + VKD3D_SHADER_TARGET_GLSL, VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_TARGET_TYPE), }; diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 78312a1..a9b5d0a 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -1032,6 +1032,15 @@ static int compile_dxbc_tpf(const struct vkd3d_shader_compile_info *compile_info return ret; } + if (compile_info->target_type == VKD3D_SHADER_TARGET_GLSL) + { + vkd3d_shader_error(message_context, NULL, VKD3D_SHADER_ERROR_GLSL_INTERNAL, + "Internal compiler error: Unhandled instruction."); + vkd3d_shader_parser_destroy(&parser); + vkd3d_shader_free_scan_descriptor_info(&scan_descriptor_info); + return VKD3D_ERROR; + } + if (!(spirv_compiler = vkd3d_dxbc_compiler_create(&parser.shader_version, &parser.shader_desc, compile_info, &scan_descriptor_info, message_context))) { @@ -1280,6 +1289,7 @@ const enum vkd3d_shader_target_type *vkd3d_shader_get_supported_target_types( VKD3D_SHADER_TARGET_SPIRV_TEXT, #endif VKD3D_SHADER_TARGET_D3D_ASM, + VKD3D_SHADER_TARGET_GLSL, }; static const enum vkd3d_shader_target_type hlsl_types[] = diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 8550380..b490b9c 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -115,6 +115,8 @@ enum vkd3d_shader_error VKD3D_SHADER_ERROR_HLSL_NOT_IMPLEMENTED = 5017, VKD3D_SHADER_WARNING_HLSL_IMPLICIT_TRUNCATION = 5300, + + VKD3D_SHADER_ERROR_GLSL_INTERNAL = 6000, }; enum vkd3d_shader_opcode diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index fb19a70..71f90f8 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -90,6 +90,9 @@ target_type_info[] = "dxbc-tpf", "A 'Tokenized Program Format' shader embedded in a DXBC container.\n" " This is the format used for Direct3D shader model 4 and 5 shaders.\n", true}, + {VKD3D_SHADER_TARGET_GLSL, + "glsl", "An 'OpenGL Shading Language' shader.\n", + false} }; static bool read_shader(struct vkd3d_shader_code *shader, FILE *f)

1 0

Hugh McMaster : kernel32/tests: Add tests for SetCurrentConsoleFontEx.
by Alexandre Julliard 17 Aug '21

17 Aug '21

Module: wine Branch: master Commit: ec25eeab4c18d9697bbd6ad1822368aa6330cc2f URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec25eeab4c18d9697bbd6ad1… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Aug 17 22:11:11 2021 +1000 kernel32/tests: Add tests for SetCurrentConsoleFontEx. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/console.c | 117 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 117 insertions(+) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 759a0572b13..3003ff63f5a 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -3536,6 +3536,122 @@ static void test_GetCurrentConsoleFontEx(HANDLE std_output) ok(cfix.dwFontSize.Y == cfi.dwFontSize.Y, "expected values to match\n"); } +static void test_SetCurrentConsoleFontEx(HANDLE std_output) +{ + CONSOLE_FONT_INFOEX orig_cfix, cfix; + BOOL ret; + HANDLE pipe1, pipe2; + HANDLE std_input = GetStdHandle(STD_INPUT_HANDLE); + + orig_cfix.cbSize = sizeof(CONSOLE_FONT_INFOEX); + + ret = GetCurrentConsoleFontEx(std_output, FALSE, &orig_cfix); + ok(ret, "got %d, expected non-zero\n", ret); + + cfix = orig_cfix; + cfix.cbSize = 0; + + SetLastError(0xdeadbeef); + ret = SetCurrentConsoleFontEx(NULL, FALSE, &cfix); + ok(!ret, "got %d, expected 0\n", ret); + todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u, expected 87\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = SetCurrentConsoleFontEx(NULL, TRUE, &cfix); + ok(!ret, "got %d, expected 0\n", ret); + todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u, expected 87\n", GetLastError()); + + CreatePipe(&pipe1, &pipe2, NULL, 0); + SetLastError(0xdeadbeef); + ret = SetCurrentConsoleFontEx(pipe1, FALSE, &cfix); + ok(!ret, "got %d, expected 0\n", ret); + todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u, expected 87\n", GetLastError()); + CloseHandle(pipe1); + CloseHandle(pipe2); + + CreatePipe(&pipe1, &pipe2, NULL, 0); + SetLastError(0xdeadbeef); + ret = SetCurrentConsoleFontEx(pipe1, TRUE, &cfix); + ok(!ret, "got %d, expected 0\n", ret); + todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u, expected 87\n", GetLastError()); + CloseHandle(pipe1); + CloseHandle(pipe2); + + SetLastError(0xdeadbeef); + ret = SetCurrentConsoleFontEx(std_input, FALSE, &cfix); + ok(!ret, "got %d, expected 0\n", ret); + todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u, expected 87\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = SetCurrentConsoleFontEx(std_input, TRUE, &cfix); + ok(!ret, "got %d, expected 0\n", ret); + todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u, expected 87\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = SetCurrentConsoleFontEx(std_output, FALSE, &cfix); + ok(!ret, "got %d, expected 0\n", ret); + todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u, expected 87\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = SetCurrentConsoleFontEx(std_output, TRUE, &cfix); + ok(!ret, "got %d, expected 0\n", ret); + todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u, expected 87\n", GetLastError()); + + cfix = orig_cfix; + + SetLastError(0xdeadbeef); + ret = SetCurrentConsoleFontEx(NULL, FALSE, &cfix); + ok(!ret, "got %d, expected 0\n", ret); + todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = SetCurrentConsoleFontEx(NULL, TRUE, &cfix); + ok(!ret, "got %d, expected 0\n", ret); + todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); + + CreatePipe(&pipe1, &pipe2, NULL, 0); + SetLastError(0xdeadbeef); + ret = SetCurrentConsoleFontEx(pipe1, FALSE, &cfix); + ok(!ret, "got %d, expected 0\n", ret); + todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); + CloseHandle(pipe1); + CloseHandle(pipe2); + + CreatePipe(&pipe1, &pipe2, NULL, 0); + SetLastError(0xdeadbeef); + ret = SetCurrentConsoleFontEx(pipe1, TRUE, &cfix); + ok(!ret, "got %d, expected 0\n", ret); + todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); + CloseHandle(pipe1); + CloseHandle(pipe2); + + SetLastError(0xdeadbeef); + ret = SetCurrentConsoleFontEx(std_input, FALSE, &cfix); + ok(!ret, "got %d, expected 0\n", ret); + todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = SetCurrentConsoleFontEx(std_input, TRUE, &cfix); + ok(!ret, "got %d, expected 0\n", ret); + todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = SetCurrentConsoleFontEx(std_output, FALSE, &cfix); + todo_wine ok(ret, "got %d, expected non-zero\n", ret); + todo_wine ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = SetCurrentConsoleFontEx(std_output, TRUE, &cfix); + todo_wine ok(ret, "got %d, expected non-zero\n", ret); + todo_wine ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); + + /* Restore original console font parameters */ + SetLastError(0xdeadbeef); + ret = SetCurrentConsoleFontEx(std_output, FALSE, &orig_cfix); + todo_wine ok(ret, "got %d, expected non-zero\n", ret); + todo_wine ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); +} + static void test_GetConsoleFontSize(HANDLE std_output) { COORD c; @@ -4692,6 +4808,7 @@ START_TEST(console) { test_GetCurrentConsoleFont(hConOut); test_GetCurrentConsoleFontEx(hConOut); + test_SetCurrentConsoleFontEx(hConOut); test_GetConsoleFontSize(hConOut); test_GetLargestConsoleWindowSize(hConOut); test_GetConsoleFontInfo(hConOut);

1 0

Nikolay Sivov : d3dx11_42/tests: Enable tests.
by Alexandre Julliard 17 Aug '21

17 Aug '21

Module: wine Branch: master Commit: b6d1a984ed959f7157b73facd82d1cd027be6aed URL: https://source.winehq.org/git/wine.git/?a=commit;h=b6d1a984ed959f7157b73fac… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 16 13:06:08 2021 +0300 d3dx11_42/tests: Enable tests. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/d3dx11_42/Makefile.in | 3 ++- dlls/d3dx11_42/tests/Makefile.in | 6 ++++++ 4 files changed, 10 insertions(+), 1 deletion(-) diff --git a/configure b/configure index 46eadaa4c5a..dbbe3a5395d 100755 --- a/configure +++ b/configure @@ -20439,6 +20439,7 @@ wine_fn_config_makefile dlls/d3dx10_42 enable_d3dx10_42 wine_fn_config_makefile dlls/d3dx10_43 enable_d3dx10_43 wine_fn_config_makefile dlls/d3dx10_43/tests enable_tests wine_fn_config_makefile dlls/d3dx11_42 enable_d3dx11_42 +wine_fn_config_makefile dlls/d3dx11_42/tests enable_tests wine_fn_config_makefile dlls/d3dx11_43 enable_d3dx11_43 wine_fn_config_makefile dlls/d3dx11_43/tests enable_tests wine_fn_config_makefile dlls/d3dx9_24 enable_d3dx9_24 diff --git a/configure.ac b/configure.ac index 7237289a2ad..a143f6d3d2a 100644 --- a/configure.ac +++ b/configure.ac @@ -3098,6 +3098,7 @@ WINE_CONFIG_MAKEFILE(dlls/d3dx10_42) WINE_CONFIG_MAKEFILE(dlls/d3dx10_43) WINE_CONFIG_MAKEFILE(dlls/d3dx10_43/tests) WINE_CONFIG_MAKEFILE(dlls/d3dx11_42) +WINE_CONFIG_MAKEFILE(dlls/d3dx11_42/tests) WINE_CONFIG_MAKEFILE(dlls/d3dx11_43) WINE_CONFIG_MAKEFILE(dlls/d3dx11_43/tests) WINE_CONFIG_MAKEFILE(dlls/d3dx9_24) diff --git a/dlls/d3dx11_42/Makefile.in b/dlls/d3dx11_42/Makefile.in index dbc31e2407d..c34f53a930c 100644 --- a/dlls/d3dx11_42/Makefile.in +++ b/dlls/d3dx11_42/Makefile.in @@ -1,5 +1,6 @@ EXTRADEFS = -DD3DX11_SDK_VERSION=42 -MODULE = d3dx11_42.dll +MODULE = d3dx11_42.dll +IMPORTLIB = d3dx11_42 IMPORTS = d3dcompiler PARENTSRC = ../d3dx11_43 diff --git a/dlls/d3dx11_42/tests/Makefile.in b/dlls/d3dx11_42/tests/Makefile.in new file mode 100644 index 00000000000..660f6d947cc --- /dev/null +++ b/dlls/d3dx11_42/tests/Makefile.in @@ -0,0 +1,6 @@ +TESTDLL = d3dx11_42.dll +IMPORTS = d3dx11_42 +PARENTSRC = ../../d3dx11_43/tests + +C_SRCS = \ + d3dx11.c

1 0

Nikolay Sivov : d3d10/effect: Get rid of unnecessary cast in ID3D10EffectPass::GetDesc().
by Alexandre Julliard 17 Aug '21

17 Aug '21

Module: wine Branch: master Commit: 85ebf567aca542497dce96fa487c30301e7911ea URL: https://source.winehq.org/git/wine.git/?a=commit;h=85ebf567aca542497dce96fa… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 12 10:33:53 2021 +0300 d3d10/effect: Get rid of unnecessary cast in ID3D10EffectPass::GetDesc(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/effect.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 15b71aab1b7..64dd9ac9312 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -3559,33 +3559,33 @@ static BOOL STDMETHODCALLTYPE d3d10_effect_pass_IsValid(ID3D10EffectPass *iface) static HRESULT STDMETHODCALLTYPE d3d10_effect_pass_GetDesc(ID3D10EffectPass *iface, D3D10_PASS_DESC *desc) { - struct d3d10_effect_pass *This = impl_from_ID3D10EffectPass(iface); + struct d3d10_effect_pass *pass = impl_from_ID3D10EffectPass(iface); struct d3d10_effect_shader_variable *s; FIXME("iface %p, desc %p partial stub!\n", iface, desc); - if(This == &null_pass) + if (pass == &null_pass) { WARN("Null pass specified\n"); return E_FAIL; } - if(!desc) + if (!desc) { WARN("Invalid argument specified\n"); return E_INVALIDARG; } + s = &impl_from_ID3D10EffectShaderVariable(pass->vs.pShaderVariable)->u.shader; + memset(desc, 0, sizeof(*desc)); - desc->Name = This->name; - s = &impl_from_ID3D10EffectVariable((ID3D10EffectVariable *)This->vs.pShaderVariable)->u.shader; + desc->Name = pass->name; desc->pIAInputSignature = (BYTE *)s->input_signature.signature; desc->IAInputSignatureSize = s->input_signature.signature_size; - - desc->StencilRef = This->stencil_ref; - desc->SampleMask = This->sample_mask; - memcpy(desc->BlendFactor, This->blend_factor, 4 * sizeof(float)); + desc->StencilRef = pass->stencil_ref; + desc->SampleMask = pass->sample_mask; + memcpy(desc->BlendFactor, pass->blend_factor, 4 * sizeof(float)); return S_OK; }

1 0