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

Huw Davies : ntdll: Return STATUS_NOT_SUPPORTED if dlinfo() is not present.
by Alexandre Julliard 04 Aug '21

04 Aug '21

Module: wine Branch: master Commit: 41e84b3f07a7b284a52cc5d80de0b2d920fae1e4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=41e84b3f07a7b284a52cc5d8… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Aug 4 12:23:10 2021 +0100 ntdll: Return STATUS_NOT_SUPPORTED if dlinfo() is not present. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/loader.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index f1dbe9f345e..8888376f2f0 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1745,6 +1745,8 @@ NTSTATUS get_builtin_init_funcs( void *handle, void **funcs, SIZE_T len, SIZE_T if (init_func) *funcs++ = init_func; for (i = 0; i < init_arraysz / sizeof(*init_array); i++) funcs[i] = init_array[i]; return STATUS_SUCCESS; +#else + return STATUS_NOT_SUPPORTED; #endif }

1 0

Nikolay Sivov : d3d10core/tests: Test 2D texture creation with mutually exclusive sharing modes.
by Alexandre Julliard 04 Aug '21

04 Aug '21

Module: wine Branch: master Commit: b1b49b586328a2df09e3983da661e6784f9c4342 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b1b49b586328a2df09e3983d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Aug 4 10:04:10 2021 +0300 d3d10core/tests: Test 2D texture creation with mutually exclusive sharing modes. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/d3d10core.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index 2014e8edc94..58b5f90fadb 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -1976,6 +1976,8 @@ static void test_create_texture2d(void) {DXGI_FORMAT_R8G8B8A8_UINT, 1, D3D10_BIND_RENDER_TARGET, 0, TRUE, FALSE}, {DXGI_FORMAT_R8G8B8A8_SNORM, 1, D3D10_BIND_RENDER_TARGET, 0, TRUE, FALSE}, {DXGI_FORMAT_R8G8B8A8_SINT, 1, D3D10_BIND_RENDER_TARGET, 0, TRUE, FALSE}, + {DXGI_FORMAT_R8G8B8A8_UNORM, 1, D3D10_BIND_RENDER_TARGET, D3D10_RESOURCE_MISC_SHARED | D3D10_RESOURCE_MISC_SHARED_KEYEDMUTEX, + FALSE, TRUE}, {DXGI_FORMAT_D24_UNORM_S8_UINT, 1, D3D10_BIND_SHADER_RESOURCE, 0, FALSE, TRUE}, {DXGI_FORMAT_D24_UNORM_S8_UINT, 1, D3D10_BIND_RENDER_TARGET, 0, FALSE, FALSE}, {DXGI_FORMAT_D32_FLOAT, 1, D3D10_BIND_SHADER_RESOURCE, 0, FALSE, TRUE},

1 0

Jacek Caban : gdi32: Use NtGdiIntersectClipRect for IntersectClipRect implementation.
by Alexandre Julliard 04 Aug '21

04 Aug '21

Module: wine Branch: master Commit: 496eaa0bc6c1cfcb0fb0323c365ee4f3d6d56aec URL: https://source.winehq.org/git/wine.git/?a=commit;h=496eaa0bc6c1cfcb0fb0323c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 4 11:20:21 2021 +0200 gdi32: Use NtGdiIntersectClipRect for IntersectClipRect implementation. 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/clipping.c | 49 ++++++++++++++++-------------------- dlls/gdi32/enhmfdrv/dc.c | 6 ++--- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 1 - dlls/gdi32/enhmfdrv/init.c | 2 +- dlls/gdi32/gdi_private.h | 4 +++ dlls/gdi32/gdidc.c | 16 ++++++++++++ dlls/gdi32/mfdrv/dc.c | 4 +-- dlls/gdi32/mfdrv/init.c | 2 +- dlls/gdi32/mfdrv/metafiledrv.h | 1 - 9 files changed, 47 insertions(+), 38 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=496eaa0bc6c1cfcb0fb0…

1 0

Jacek Caban : gdi32: Use NtGdiOffsetClipRgn for OffsetClipRgn implementation.
by Alexandre Julliard 04 Aug '21

04 Aug '21

Module: wine Branch: master Commit: 112fe018bf84769f089f459dd7cf5c23c931177c URL: https://source.winehq.org/git/wine.git/?a=commit;h=112fe018bf84769f089f459d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 4 11:20:53 2021 +0200 gdi32: Use NtGdiOffsetClipRgn for OffsetClipRgn implementation. 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/clipping.c | 33 +++++++++++++-------------------- dlls/gdi32/enhmfdrv/dc.c | 6 ++---- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 1 - dlls/gdi32/enhmfdrv/init.c | 2 +- dlls/gdi32/gdi_private.h | 2 ++ dlls/gdi32/gdidc.c | 13 +++++++++++++ dlls/gdi32/mfdrv/dc.c | 4 ++-- dlls/gdi32/mfdrv/init.c | 2 +- dlls/gdi32/mfdrv/metafiledrv.h | 1 - 9 files changed, 34 insertions(+), 30 deletions(-) diff --git a/dlls/gdi32/clipping.c b/dlls/gdi32/clipping.c index 30ce88fe41c..9e03635a103 100644 --- a/dlls/gdi32/clipping.c +++ b/dlls/gdi32/clipping.c @@ -211,18 +211,7 @@ INT CDECL nulldrv_IntersectClipRect( PHYSDEV dev, INT left, INT top, INT right, INT CDECL nulldrv_OffsetClipRgn( PHYSDEV dev, INT x, INT y ) { - DC *dc = get_nulldrv_dc( dev ); - INT ret = NULLREGION; - - if (dc->hClipRgn) - { - x = MulDiv( x, dc->attr->vport_ext.cx, dc->attr->wnd_ext.cx ); - y = MulDiv( y, dc->attr->vport_ext.cy, dc->attr->wnd_ext.cy ); - if (dc->attr->layout & LAYOUT_RTL) x = -x; - ret = NtGdiOffsetRgn( dc->hClipRgn, x, y ); - update_dc_clipping( dc ); - } - return ret; + return ERROR; } @@ -283,20 +272,24 @@ void CDECL __wine_set_visible_region( HDC hdc, HRGN hrgn, const RECT *vis_rect, /*********************************************************************** - * OffsetClipRgn (GDI32.@) + * NtGdiOffsetClipRgn (win32u.@) */ -INT WINAPI OffsetClipRgn( HDC hdc, INT x, INT y ) +INT WINAPI NtGdiOffsetClipRgn( HDC hdc, INT x, INT y ) { - PHYSDEV physdev; - INT ret; + INT ret = NULLREGION; DC *dc = get_dc_ptr( hdc ); - TRACE("%p %d,%d\n", hdc, x, y ); - if (!dc) return ERROR; update_dc( dc ); - physdev = GET_DC_PHYSDEV( dc, pOffsetClipRgn ); - ret = physdev->funcs->pOffsetClipRgn( physdev, x, y ); + + if (dc->hClipRgn) + { + x = MulDiv( x, dc->attr->vport_ext.cx, dc->attr->wnd_ext.cx ); + y = MulDiv( y, dc->attr->vport_ext.cy, dc->attr->wnd_ext.cy ); + if (dc->attr->layout & LAYOUT_RTL) x = -x; + ret = NtGdiOffsetRgn( dc->hClipRgn, x, y ); + update_dc_clipping( dc ); + } release_dc_ptr( dc ); return ret; } diff --git a/dlls/gdi32/enhmfdrv/dc.c b/dlls/gdi32/enhmfdrv/dc.c index 68f8e1445cb..4b51a140c27 100644 --- a/dlls/gdi32/enhmfdrv/dc.c +++ b/dlls/gdi32/enhmfdrv/dc.c @@ -174,17 +174,15 @@ BOOL EMFDC_IntersectClipRect( DC_ATTR *dc_attr, INT left, INT top, INT right, IN return EMFDRV_WriteRecord( dc_attr->emf, &emr.emr ); } -INT CDECL EMFDRV_OffsetClipRgn( PHYSDEV dev, INT x, INT y ) +BOOL EMFDC_OffsetClipRgn( DC_ATTR *dc_attr, INT x, INT y ) { - PHYSDEV next = GET_NEXT_PHYSDEV( dev, pOffsetClipRgn ); EMROFFSETCLIPRGN emr; emr.emr.iType = EMR_OFFSETCLIPRGN; emr.emr.nSize = sizeof(emr); emr.ptlOffset.x = x; emr.ptlOffset.y = y; - if (!EMFDRV_WriteRecord( dev, &emr.emr )) return ERROR; - return next->funcs->pOffsetClipRgn( next, x, y ); + return EMFDRV_WriteRecord( dc_attr->emf, &emr.emr ); } INT CDECL EMFDRV_ExtSelectClipRgn( PHYSDEV dev, HRGN hrgn, INT mode ) diff --git a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h index 9986d44dd85..d0d7ad14878 100644 --- a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h +++ b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h @@ -85,7 +85,6 @@ extern BOOL CDECL EMFDRV_GradientFill( PHYSDEV dev, TRIVERTEX *vert_array, U extern BOOL CDECL EMFDRV_InvertRgn( PHYSDEV dev, HRGN hrgn ) DECLSPEC_HIDDEN; extern BOOL CDECL EMFDRV_LineTo( PHYSDEV dev, INT x, INT y ) DECLSPEC_HIDDEN; extern BOOL CDECL EMFDRV_ModifyWorldTransform( PHYSDEV dev, const XFORM *xform, DWORD mode ) DECLSPEC_HIDDEN; -extern INT CDECL EMFDRV_OffsetClipRgn( PHYSDEV dev, INT x, INT y ) DECLSPEC_HIDDEN; extern BOOL CDECL EMFDRV_OffsetViewportOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) DECLSPEC_HIDDEN; extern BOOL CDECL EMFDRV_OffsetWindowOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) DECLSPEC_HIDDEN; extern BOOL CDECL EMFDRV_PatBlt( PHYSDEV dev, struct bitblt_coords *dst, DWORD rop ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c index 79a505c7701..80326fe0d04 100644 --- a/dlls/gdi32/enhmfdrv/init.c +++ b/dlls/gdi32/enhmfdrv/init.c @@ -99,7 +99,7 @@ static const struct gdi_dc_funcs emfdrv_driver = EMFDRV_LineTo, /* pLineTo */ EMFDRV_ModifyWorldTransform, /* pModifyWorldTransform */ NULL, /* pMoveTo */ - EMFDRV_OffsetClipRgn, /* pOffsetClipRgn */ + NULL, /* pOffsetClipRgn */ EMFDRV_OffsetViewportOrgEx, /* pOffsetViewportOrgEx */ EMFDRV_OffsetWindowOrgEx, /* pOffsetWindowOrgEx */ NULL, /* pPaintRgn */ diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index cc7dbec910f..58ea438a582 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -59,6 +59,7 @@ extern BOOL METADC_IntersectClipRect( HDC hdc, INT left, INT top, INT right, extern BOOL METADC_InvertRgn( HDC hdc, HRGN hrgn ) DECLSPEC_HIDDEN; extern BOOL METADC_LineTo( HDC hdc, INT x, INT y ) DECLSPEC_HIDDEN; extern BOOL METADC_MoveTo( HDC hdc, INT x, INT y ) DECLSPEC_HIDDEN; +extern BOOL METADC_OffsetClipRgn( HDC hdc, INT x, INT y ) DECLSPEC_HIDDEN; extern BOOL METADC_PaintRgn( HDC hdc, HRGN hrgn ) DECLSPEC_HIDDEN; extern BOOL METADC_PatBlt( HDC hdc, INT left, INT top, INT width, INT height, DWORD rop ); extern BOOL METADC_Pie( HDC hdc, INT left, INT top, INT right, INT bottom, @@ -105,6 +106,7 @@ extern BOOL EMFDC_IntersectClipRect( DC_ATTR *dc_attr, INT left, INT top, INT ri extern BOOL EMFDC_InvertRgn( DC_ATTR *dc_attr, HRGN hrgn ) DECLSPEC_HIDDEN; extern BOOL EMFDC_LineTo( DC_ATTR *dc_attr, INT x, INT y ) DECLSPEC_HIDDEN; extern BOOL EMFDC_MoveTo( DC_ATTR *dc_attr, INT x, INT y ) DECLSPEC_HIDDEN; +extern BOOL EMFDC_OffsetClipRgn( DC_ATTR *dc_attr, INT x, INT y ) DECLSPEC_HIDDEN; extern BOOL EMFDC_PaintRgn( DC_ATTR *dc_attr, HRGN hrgn ) DECLSPEC_HIDDEN; extern BOOL EMFDC_PatBlt( DC_ATTR *dc_attr, INT left, INT top, INT width, INT height, DWORD rop ); extern BOOL EMFDC_PolyBezier( DC_ATTR *dc_attr, const POINT *points, DWORD count ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index 72990ef18e3..c1743498934 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -1062,6 +1062,19 @@ INT WINAPI IntersectClipRect( HDC hdc, INT left, INT top, INT right, INT bottom return NtGdiIntersectClipRect( hdc, left, top, right, bottom ); } +/*********************************************************************** + * OffsetClipRgn (GDI32.@) + */ +INT WINAPI OffsetClipRgn( HDC hdc, INT x, INT y ) +{ + DC_ATTR *dc_attr; + + if (is_meta_dc( hdc )) return METADC_OffsetClipRgn( hdc, x, y ); + if (!(dc_attr = get_dc_attr( hdc ))) return FALSE; + if (dc_attr->emf && !EMFDC_OffsetClipRgn( dc_attr, x, y )) return FALSE; + return NtGdiOffsetClipRgn( hdc, x, y ); +} + /*********************************************************************** * GdiSetPixelFormat (GDI32.@) */ diff --git a/dlls/gdi32/mfdrv/dc.c b/dlls/gdi32/mfdrv/dc.c index 93924c98216..fde7bacfd11 100644 --- a/dlls/gdi32/mfdrv/dc.c +++ b/dlls/gdi32/mfdrv/dc.c @@ -80,9 +80,9 @@ INT CDECL MFDRV_ExcludeClipRect( PHYSDEV dev, INT left, INT top, INT right, INT return MFDRV_MetaParam4( dev, META_EXCLUDECLIPRECT, left, top, right, bottom ); } -INT CDECL MFDRV_OffsetClipRgn( PHYSDEV dev, INT x, INT y ) +BOOL METADC_OffsetClipRgn( HDC hdc, INT x, INT y ) { - return MFDRV_MetaParam2( dev, META_OFFSETCLIPRGN, x, y ); + return metadc_param2( hdc, META_OFFSETCLIPRGN, x, y ); } DWORD CDECL MFDRV_SetLayout( PHYSDEV dev, DWORD layout ) diff --git a/dlls/gdi32/mfdrv/init.c b/dlls/gdi32/mfdrv/init.c index 4c225c68e53..01e1ee92c98 100644 --- a/dlls/gdi32/mfdrv/init.c +++ b/dlls/gdi32/mfdrv/init.c @@ -164,7 +164,7 @@ static const struct gdi_dc_funcs MFDRV_Funcs = NULL, /* pLineTo */ NULL, /* pModifyWorldTransform */ NULL, /* pMoveTo */ - MFDRV_OffsetClipRgn, /* pOffsetClipRgn */ + NULL, /* pOffsetClipRgn */ MFDRV_OffsetViewportOrgEx, /* pOffsetViewportOrgEx */ MFDRV_OffsetWindowOrgEx, /* pOffsetWindowOrgEx */ NULL, /* pPaintRgn */ diff --git a/dlls/gdi32/mfdrv/metafiledrv.h b/dlls/gdi32/mfdrv/metafiledrv.h index ec3a0ab7b6d..5b5d17859fa 100644 --- a/dlls/gdi32/mfdrv/metafiledrv.h +++ b/dlls/gdi32/mfdrv/metafiledrv.h @@ -88,7 +88,6 @@ extern INT CDECL MFDRV_ExtSelectClipRgn( PHYSDEV dev, HRGN hrgn, INT mode ) DEC extern BOOL CDECL MFDRV_FillPath( PHYSDEV dev ) DECLSPEC_HIDDEN; extern BOOL CDECL MFDRV_FillRgn( PHYSDEV dev, HRGN hrgn, HBRUSH hbrush ) DECLSPEC_HIDDEN; extern BOOL CDECL MFDRV_FlattenPath( PHYSDEV dev ) DECLSPEC_HIDDEN; -extern INT CDECL MFDRV_OffsetClipRgn( PHYSDEV dev, INT x, INT y ) DECLSPEC_HIDDEN; extern BOOL CDECL MFDRV_OffsetViewportOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) DECLSPEC_HIDDEN; extern BOOL CDECL MFDRV_OffsetWindowOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) DECLSPEC_HIDDEN; extern BOOL CDECL MFDRV_PolyBezier( PHYSDEV dev, const POINT* pt, DWORD count ) DECLSPEC_HIDDEN;

1 0

Jacek Caban : gdi32: Use NtGdiExcludeClipRect for ExcludeClipRect implementation.
by Alexandre Julliard 04 Aug '21

04 Aug '21

Module: wine Branch: master Commit: 92e7cc1e03b1caf967ab011ed3791add670fbbbc URL: https://source.winehq.org/git/wine.git/?a=commit;h=92e7cc1e03b1caf967ab011e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 4 11:21:13 2021 +0200 gdi32: Use NtGdiExcludeClipRect for ExcludeClipRect implementation. 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/clipping.c | 34 ++++++++++++++++------------------ dlls/gdi32/enhmfdrv/dc.c | 6 ++---- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 1 - dlls/gdi32/enhmfdrv/init.c | 2 +- dlls/gdi32/gdi_private.h | 4 ++++ dlls/gdi32/gdidc.c | 14 ++++++++++++++ dlls/gdi32/mfdrv/dc.c | 4 ++-- dlls/gdi32/mfdrv/init.c | 2 +- dlls/gdi32/mfdrv/metafiledrv.h | 1 - 9 files changed, 40 insertions(+), 28 deletions(-) diff --git a/dlls/gdi32/clipping.c b/dlls/gdi32/clipping.c index 9e03635a103..bea2c7f8cfc 100644 --- a/dlls/gdi32/clipping.c +++ b/dlls/gdi32/clipping.c @@ -191,17 +191,7 @@ INT CDECL nulldrv_ExtSelectClipRgn( PHYSDEV dev, HRGN rgn, INT mode ) INT CDECL nulldrv_ExcludeClipRect( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) { - DC *dc = get_nulldrv_dc( dev ); - RECT rect = get_clip_rect( dc, left, top, right, bottom ); - INT ret; - HRGN rgn; - - if (!(rgn = CreateRectRgnIndirect( &rect ))) return ERROR; - if (!dc->hClipRgn) create_default_clip_region( dc ); - ret = NtGdiCombineRgn( dc->hClipRgn, dc->hClipRgn, rgn, RGN_DIFF ); - DeleteObject( rgn ); - if (ret != ERROR) update_dc_clipping( dc ); - return ret; + return ERROR; } INT CDECL nulldrv_IntersectClipRect( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) @@ -296,21 +286,29 @@ INT WINAPI NtGdiOffsetClipRgn( HDC hdc, INT x, INT y ) /*********************************************************************** - * ExcludeClipRect (GDI32.@) + * NtGdiExcludeClipRect (win32u.@) */ -INT WINAPI ExcludeClipRect( HDC hdc, INT left, INT top, - INT right, INT bottom ) +INT WINAPI NtGdiExcludeClipRect( HDC hdc, INT left, INT top, INT right, INT bottom ) { - PHYSDEV physdev; - INT ret; + INT ret = ERROR; + RECT rect; + HRGN rgn; DC *dc = get_dc_ptr( hdc ); TRACE("%p %d,%d-%d,%d\n", hdc, left, top, right, bottom ); if (!dc) return ERROR; update_dc( dc ); - physdev = GET_DC_PHYSDEV( dc, pExcludeClipRect ); - ret = physdev->funcs->pExcludeClipRect( physdev, left, top, right, bottom ); + + rect = get_clip_rect( dc, left, top, right, bottom ); + + if ((rgn = CreateRectRgnIndirect( &rect ))) + { + if (!dc->hClipRgn) create_default_clip_region( dc ); + ret = NtGdiCombineRgn( dc->hClipRgn, dc->hClipRgn, rgn, RGN_DIFF ); + DeleteObject( rgn ); + if (ret != ERROR) update_dc_clipping( dc ); + } release_dc_ptr( dc ); return ret; } diff --git a/dlls/gdi32/enhmfdrv/dc.c b/dlls/gdi32/enhmfdrv/dc.c index 4b51a140c27..8508f6296be 100644 --- a/dlls/gdi32/enhmfdrv/dc.c +++ b/dlls/gdi32/enhmfdrv/dc.c @@ -146,9 +146,8 @@ BOOL EMFDC_SetArcDirection( DC_ATTR *dc_attr, INT dir ) return EMFDRV_WriteRecord( dc_attr->emf, &emr.emr ); } -INT CDECL EMFDRV_ExcludeClipRect( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) +INT EMFDC_ExcludeClipRect( DC_ATTR *dc_attr, INT left, INT top, INT right, INT bottom ) { - PHYSDEV next = GET_NEXT_PHYSDEV( dev, pExcludeClipRect ); EMREXCLUDECLIPRECT emr; emr.emr.iType = EMR_EXCLUDECLIPRECT; @@ -157,8 +156,7 @@ INT CDECL EMFDRV_ExcludeClipRect( PHYSDEV dev, INT left, INT top, INT right, INT emr.rclClip.top = top; emr.rclClip.right = right; emr.rclClip.bottom = bottom; - if (!EMFDRV_WriteRecord( dev, &emr.emr )) return ERROR; - return next->funcs->pExcludeClipRect( next, left, top, right, bottom ); + return EMFDRV_WriteRecord( dc_attr->emf, &emr.emr ); } BOOL EMFDC_IntersectClipRect( DC_ATTR *dc_attr, INT left, INT top, INT right, INT bottom) diff --git a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h index d0d7ad14878..08936a73f8f 100644 --- a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h +++ b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h @@ -70,7 +70,6 @@ extern BOOL CDECL EMFDRV_Chord( PHYSDEV dev, INT left, INT top, INT right, I INT xstart, INT ystart, INT xend, INT yend ) DECLSPEC_HIDDEN; extern BOOL CDECL EMFDRV_DeleteObject( PHYSDEV dev, HGDIOBJ obj ) DECLSPEC_HIDDEN; extern BOOL CDECL EMFDRV_Ellipse( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) DECLSPEC_HIDDEN; -extern INT CDECL EMFDRV_ExcludeClipRect( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) DECLSPEC_HIDDEN; extern INT CDECL EMFDRV_ExtSelectClipRgn( PHYSDEV dev, HRGN hrgn, INT mode ) DECLSPEC_HIDDEN; extern BOOL CDECL EMFDRV_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, const RECT *lprect, LPCWSTR str, UINT count, const INT *lpDx ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c index 80326fe0d04..17179dd37ba 100644 --- a/dlls/gdi32/enhmfdrv/init.c +++ b/dlls/gdi32/enhmfdrv/init.c @@ -57,7 +57,7 @@ static const struct gdi_dc_funcs emfdrv_driver = NULL, /* pEndPath */ NULL, /* pEnumFonts */ NULL, /* pEnumICMProfiles */ - EMFDRV_ExcludeClipRect, /* pExcludeClipRect */ + NULL, /* pExcludeClipRect */ NULL, /* pExtDeviceMode */ NULL, /* pExtEscape */ NULL, /* pExtFloodFill */ diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 58ea438a582..b0136e9c898 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -47,6 +47,8 @@ extern BOOL METADC_Arc( HDC hdc, INT left, INT top, INT right, INT bottom, extern BOOL METADC_Chord( HDC hdc, INT left, INT top, INT right, INT bottom, INT xstart, INT ystart, INT xend, INT yend ) DECLSPEC_HIDDEN; extern BOOL METADC_Ellipse( HDC hdc, INT left, INT top, INT right, INT bottom ) DECLSPEC_HIDDEN; +extern BOOL METADC_ExcludeClipRect( HDC hdc, INT left, INT top, INT right, + INT bottom ) DECLSPEC_HIDDEN; extern BOOL METADC_ExtFloodFill( HDC hdc, INT x, INT y, COLORREF color, UINT fill_type ) DECLSPEC_HIDDEN; extern BOOL METADC_ExtTextOut( HDC hdc, INT x, INT y, UINT flags, const RECT *rect, @@ -92,6 +94,8 @@ extern BOOL EMFDC_CloseFigure( DC_ATTR *dc_attr ) DECLSPEC_HIDDEN; extern BOOL EMFDC_Ellipse( DC_ATTR *dc_attr, INT left, INT top, INT right, INT bottom ) DECLSPEC_HIDDEN; extern BOOL EMFDC_EndPath( DC_ATTR *dc_attr ) DECLSPEC_HIDDEN; +extern BOOL EMFDC_ExcludeClipRect( DC_ATTR *dc_attr, INT left, INT top, INT right, + INT bottom ) DECLSPEC_HIDDEN; extern BOOL EMFDC_ExtFloodFill( DC_ATTR *dc_attr, INT x, INT y, COLORREF color, UINT fill_type ) DECLSPEC_HIDDEN; extern BOOL EMFDC_ExtTextOut( DC_ATTR *dc_attr, INT x, INT y, UINT flags, const RECT *rect, diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index c1743498934..716b5ee28a5 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -1075,6 +1075,20 @@ INT WINAPI OffsetClipRgn( HDC hdc, INT x, INT y ) return NtGdiOffsetClipRgn( hdc, x, y ); } +/*********************************************************************** + * ExcludeClipRect (GDI32.@) + */ +INT WINAPI ExcludeClipRect( HDC hdc, INT left, INT top, INT right, INT bottom ) +{ + DC_ATTR *dc_attr; + + if (is_meta_dc( hdc )) return METADC_ExcludeClipRect( hdc, left, top, right, bottom ); + if (!(dc_attr = get_dc_attr( hdc ))) return FALSE; + if (dc_attr->emf && !EMFDC_ExcludeClipRect( dc_attr, left, top, right, bottom )) + return FALSE; + return NtGdiExcludeClipRect( hdc, left, top, right, bottom ); +} + /*********************************************************************** * GdiSetPixelFormat (GDI32.@) */ diff --git a/dlls/gdi32/mfdrv/dc.c b/dlls/gdi32/mfdrv/dc.c index fde7bacfd11..363274a40b0 100644 --- a/dlls/gdi32/mfdrv/dc.c +++ b/dlls/gdi32/mfdrv/dc.c @@ -75,9 +75,9 @@ BOOL METADC_IntersectClipRect( HDC hdc, INT left, INT top, INT right, INT bottom return metadc_param4( hdc, META_INTERSECTCLIPRECT, left, top, right, bottom ); } -INT CDECL MFDRV_ExcludeClipRect( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) +BOOL METADC_ExcludeClipRect( HDC hdc, INT left, INT top, INT right, INT bottom ) { - return MFDRV_MetaParam4( dev, META_EXCLUDECLIPRECT, left, top, right, bottom ); + return metadc_param4( hdc, META_EXCLUDECLIPRECT, left, top, right, bottom ); } BOOL METADC_OffsetClipRgn( HDC hdc, INT x, INT y ) diff --git a/dlls/gdi32/mfdrv/init.c b/dlls/gdi32/mfdrv/init.c index 01e1ee92c98..db508ea3dbd 100644 --- a/dlls/gdi32/mfdrv/init.c +++ b/dlls/gdi32/mfdrv/init.c @@ -122,7 +122,7 @@ static const struct gdi_dc_funcs MFDRV_Funcs = MFDRV_EndPath, /* pEndPath */ NULL, /* pEnumFonts */ NULL, /* pEnumICMProfiles */ - MFDRV_ExcludeClipRect, /* pExcludeClipRect */ + NULL, /* pExcludeClipRect */ NULL, /* pExtDeviceMode */ MFDRV_ExtEscape, /* pExtEscape */ NULL, /* pExtFloodFill */ diff --git a/dlls/gdi32/mfdrv/metafiledrv.h b/dlls/gdi32/mfdrv/metafiledrv.h index 5b5d17859fa..17fd626c5ec 100644 --- a/dlls/gdi32/mfdrv/metafiledrv.h +++ b/dlls/gdi32/mfdrv/metafiledrv.h @@ -83,7 +83,6 @@ extern BOOL CDECL MFDRV_BeginPath( PHYSDEV dev ) DECLSPEC_HIDDEN; extern BOOL CDECL MFDRV_CloseFigure( PHYSDEV dev ) DECLSPEC_HIDDEN; extern BOOL CDECL MFDRV_DeleteObject( PHYSDEV dev, HGDIOBJ obj ) DECLSPEC_HIDDEN; extern BOOL CDECL MFDRV_EndPath( PHYSDEV dev ) DECLSPEC_HIDDEN; -extern INT CDECL MFDRV_ExcludeClipRect( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) DECLSPEC_HIDDEN; extern INT CDECL MFDRV_ExtSelectClipRgn( PHYSDEV dev, HRGN hrgn, INT mode ) DECLSPEC_HIDDEN; extern BOOL CDECL MFDRV_FillPath( PHYSDEV dev ) DECLSPEC_HIDDEN; extern BOOL CDECL MFDRV_FillRgn( PHYSDEV dev, HRGN hrgn, HBRUSH hbrush ) DECLSPEC_HIDDEN;

1 0

Jacek Caban : gdi32: Use ntgdi names for PtVisible and RectVisible.
by Alexandre Julliard 04 Aug '21

04 Aug '21

Module: wine Branch: master Commit: 18a0b5828dba2c8071398057ad89ca06ef6372d3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=18a0b5828dba2c8071398057… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 4 11:21:26 2021 +0200 gdi32: Use ntgdi names for PtVisible and RectVisible. 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/clipping.c | 8 ++++---- dlls/gdi32/gdi32.spec | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/gdi32/clipping.c b/dlls/gdi32/clipping.c index bea2c7f8cfc..1fc16149366 100644 --- a/dlls/gdi32/clipping.c +++ b/dlls/gdi32/clipping.c @@ -345,9 +345,9 @@ INT WINAPI NtGdiIntersectClipRect( HDC hdc, INT left, INT top, INT right, INT bo /*********************************************************************** - * PtVisible (GDI32.@) + * NtGdiPtVisible (win32u.@) */ -BOOL WINAPI PtVisible( HDC hdc, INT x, INT y ) +BOOL WINAPI NtGdiPtVisible( HDC hdc, INT x, INT y ) { POINT pt; RECT visrect; @@ -371,9 +371,9 @@ BOOL WINAPI PtVisible( HDC hdc, INT x, INT y ) /*********************************************************************** - * RectVisible (GDI32.@) + * NtGdiRectVisible (win32u.@) */ -BOOL WINAPI RectVisible( HDC hdc, const RECT* rect ) +BOOL WINAPI NtGdiRectVisible( HDC hdc, const RECT *rect ) { RECT tmpRect, visrect; BOOL ret; diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index 626463fe2f7..41f27fe7f57 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -407,11 +407,11 @@ @ stdcall Polyline(long ptr long) @ stdcall PolylineTo(long ptr long) @ stdcall PtInRegion(long long long) NtGdiPtInRegion -@ stdcall PtVisible(long long long) +@ stdcall PtVisible(long long long) NtGdiPtVisible # @ stub QueryFontAssocStatus @ stdcall RealizePalette(long) @ stdcall RectInRegion(long ptr) NtGdiRectInRegion -@ stdcall RectVisible(long ptr) +@ stdcall RectVisible(long ptr) NtGdiRectVisible @ stdcall Rectangle(long long long long long) @ stdcall RemoveFontMemResourceEx(ptr) @ stdcall RemoveFontResourceA(str)

1 0

Jacek Caban : gdi32: Use NtGdiExtSelectClipRgn for ExtSelectClipRgn implementation.
by Alexandre Julliard 04 Aug '21

04 Aug '21

Module: wine Branch: master Commit: 24a22a51ff704d620f7326f72f84bfb33dcf8eee URL: https://source.winehq.org/git/wine.git/?a=commit;h=24a22a51ff704d620f7326f7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 4 11:22:02 2021 +0200 gdi32: Use NtGdiExtSelectClipRgn for ExtSelectClipRgn implementation. 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/clipping.c | 57 ++++++++++++++---------------------- dlls/gdi32/enhmfdrv/dc.c | 10 +++---- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 1 - dlls/gdi32/enhmfdrv/init.c | 2 +- dlls/gdi32/gdi_private.h | 2 ++ dlls/gdi32/gdidc.c | 24 +++++++++++++++ dlls/gdi32/mfdrv/graphics.c | 14 +++++---- dlls/gdi32/mfdrv/init.c | 2 +- dlls/gdi32/mfdrv/metafiledrv.h | 1 - 9 files changed, 62 insertions(+), 51 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=24a22a51ff704d620f73…

1 0

Jacek Caban : gdi32: Use NtGdiSetMetaRgn for SetMetaRgn.
by Alexandre Julliard 04 Aug '21

04 Aug '21

Module: wine Branch: master Commit: 1d9f57bb298cf8366948a29fbd9ba4fd748de5e0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1d9f57bb298cf8366948a29f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 4 11:22:19 2021 +0200 gdi32: Use NtGdiSetMetaRgn for SetMetaRgn. 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/clipping.c | 4 ++-- dlls/gdi32/gdidc.c | 12 ++++++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/clipping.c b/dlls/gdi32/clipping.c index 6ef49c674f2..92efa6a8926 100644 --- a/dlls/gdi32/clipping.c +++ b/dlls/gdi32/clipping.c @@ -526,9 +526,9 @@ INT WINAPI GetRandomRgn(HDC hDC, HRGN hRgn, INT iCode) /*********************************************************************** - * SetMetaRgn (GDI32.@) + * NtGdiSetMetaRgn (win32u.@) */ -INT WINAPI SetMetaRgn( HDC hdc ) +INT WINAPI NtGdiSetMetaRgn( HDC hdc ) { INT ret; RECT dummy; diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index a9eb7000b48..1b9057b33e0 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -1113,6 +1113,18 @@ INT WINAPI SelectClipRgn( HDC hdc, HRGN hrgn ) return ExtSelectClipRgn( hdc, hrgn, RGN_COPY ); } +/*********************************************************************** + * SetMetaRgn (GDI32.@) + */ +INT WINAPI SetMetaRgn( HDC hdc ) +{ + DC_ATTR *dc_attr; + + if (!(dc_attr = get_dc_attr( hdc ))) return FALSE; + if (dc_attr->emf) FIXME( "EMFs are not yet supported\n" ); + return NtGdiSetMetaRgn( hdc ); +} + /*********************************************************************** * GdiSetPixelFormat (GDI32.@) */

1 0

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

04 Aug '21

Module: wine Branch: master Commit: 48cd631413bb9a647f5237590653ba81fe4daf27 URL: https://source.winehq.org/git/wine.git/?a=commit;h=48cd631413bb9a647f523759… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 4 11:22:53 2021 +0200 gdi32: Remove no longer used clipping 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/clipping.c | 24 ------------------------ dlls/gdi32/dibdrv/dc.c | 8 -------- dlls/gdi32/driver.c | 4 ---- dlls/gdi32/enhmfdrv/init.c | 4 ---- dlls/gdi32/font.c | 4 ---- dlls/gdi32/mfdrv/init.c | 4 ---- dlls/gdi32/ntgdi_private.h | 4 ---- dlls/gdi32/path.c | 4 ---- dlls/wineandroid.drv/init.c | 4 ---- dlls/winemac.drv/gdi.c | 4 ---- dlls/wineps.drv/init.c | 4 ---- dlls/winex11.drv/init.c | 4 ---- dlls/winex11.drv/xrender.c | 4 ---- include/wine/gdi_driver.h | 6 +----- 14 files changed, 1 insertion(+), 81 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=48cd631413bb9a647f52…

1 0

Jacek Caban : gdi32: Use ntgdi interface for GetTransform and GetWorldTransform.
by Alexandre Julliard 04 Aug '21

04 Aug '21

Module: wine Branch: master Commit: b5780cbc5b0dd557b35cbdc982cdda91e0b13ba3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b5780cbc5b0dd557b35cbdc9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 4 11:23:17 2021 +0200 gdi32: Use ntgdi interface for GetTransform and GetWorldTransform. 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 | 18 ++---------------- dlls/gdi32/enhmfdrv/bitblt.c | 2 +- dlls/gdi32/gdi32.spec | 2 +- dlls/gdi32/gdidc.c | 8 ++++++++ 4 files changed, 12 insertions(+), 18 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 8c03392c513..70dbade998a 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -881,21 +881,7 @@ INT WINAPI SetGraphicsMode( HDC hdc, INT mode ) /*********************************************************************** - * GetWorldTransform (GDI32.@) - */ -BOOL WINAPI GetWorldTransform( HDC hdc, LPXFORM xform ) -{ - DC * dc; - if (!xform) return FALSE; - if (!(dc = get_dc_ptr( hdc ))) return FALSE; - *xform = dc->xformWorld2Wnd; - release_dc_ptr( dc ); - return TRUE; -} - - -/*********************************************************************** - * GetTransform (GDI32.@) + * NtGdiGetTransform (win32u.@) * * Undocumented * @@ -911,7 +897,7 @@ BOOL WINAPI GetWorldTransform( HDC hdc, LPXFORM xform ) * xform [O] The xform. * */ -BOOL WINAPI GetTransform( HDC hdc, DWORD which, XFORM *xform ) +BOOL WINAPI NtGdiGetTransform( HDC hdc, DWORD which, XFORM *xform ) { BOOL ret = TRUE; DC *dc = get_dc_ptr( hdc ); diff --git a/dlls/gdi32/enhmfdrv/bitblt.c b/dlls/gdi32/enhmfdrv/bitblt.c index 2ef2081be71..ca3455459e5 100644 --- a/dlls/gdi32/enhmfdrv/bitblt.c +++ b/dlls/gdi32/enhmfdrv/bitblt.c @@ -85,7 +85,7 @@ static BOOL emfdrv_stretchblt( PHYSDEV dev_dst, struct bitblt_coords *dst, PHYSD emr_stretchblt->cySrc = src->log_height; } emr->dwRop = rop; - GetTransform(dev_src->hdc, 0x204, &emr->xformSrc); + NtGdiGetTransform( dev_src->hdc, 0x204, &emr->xformSrc ); emr->crBkColorSrc = GetBkColor(dev_src->hdc); emr->iUsageSrc = DIB_RGB_COLORS; emr->offBmiSrc = emr_size; diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index 41f27fe7f57..049a61d4ab2 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -361,7 +361,7 @@ @ stdcall GetTextFaceW(long long ptr) @ stdcall GetTextMetricsA(long ptr) @ stdcall GetTextMetricsW(long ptr) -@ stdcall GetTransform(long long ptr) +@ stdcall GetTransform(long long ptr) NtGdiGetTransform @ stdcall GetViewportExtEx(long ptr) @ stdcall GetViewportOrgEx(long ptr) @ stdcall GetWinMetaFileBits(long long ptr long long) diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index 1b9057b33e0..baa6c199b87 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -418,6 +418,14 @@ BOOL WINAPI GetViewportOrgEx( HDC hdc, POINT *point ) return TRUE; } +/*********************************************************************** + * GetWorldTransform (GDI32.@) + */ +BOOL WINAPI GetWorldTransform( HDC hdc, XFORM *xform ) +{ + return NtGdiGetTransform( hdc, 0x203, xform ); +} + /*********************************************************************** * SetStretchBltMode (GDI32.@) */

1 0