[PATCH 7/9] gdi32: Handle metafiles directly in OffsetWindowOrgEx.

[Jacek Caban]

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com>
---
  dlls/gdi32/enhmfdrv/dc.c             | 22 ----------------------
  dlls/gdi32/enhmfdrv/enhmetafiledrv.h |  1 -
  dlls/gdi32/enhmfdrv/init.c           |  2 +-
  dlls/gdi32/gdi_private.h             |  1 +
  dlls/gdi32/gdidc.c                   | 17 +++++++++++++++++
  dlls/gdi32/mapping.c                 | 26 --------------------------
  dlls/gdi32/mfdrv/dc.c                |  4 ++--
  dlls/gdi32/mfdrv/init.c              |  2 +-
  dlls/gdi32/mfdrv/metafiledrv.h       |  1 -
  9 files changed, 22 insertions(+), 54 deletions(-)

[Huw Davies]

On Tue, Aug 10, 2021 at 12:57:55AM +0200, Jacek Caban wrote:
> +/***********************************************************************
> + *           OffsetWindowOrgEx    (GDI32.@)
> + */
> +BOOL WINAPI OffsetWindowOrgEx( HDC hdc, INT x, INT y, POINT *point )
> +{
> +    DC_ATTR *dc_attr;
> +
> +    if (is_meta_dc( hdc )) return METADC_OffsetWindowOrgEx( hdc, x, y );
> +    if (!(dc_attr = get_dc_attr( hdc ))) return FALSE;
> +    if (point) *point = dc_attr->vport_org;
> +    dc_attr->vport_org.x += x;
> +    dc_attr->vport_org.y += y;
> +    if (dc_attr->emf && !EMFDC_SetViewportOrgEx( dc_attr, dc_attr->vport_org.x,
> +                                                 dc_attr->vport_org.y )) return FALSE;
> +    return NtGdiComputeXformCoefficients( hdc );
> +}

vport_org -> wnd_org.  I've fixed it up and sent in v2.

Thanks,
Huw.