From 56efbd0212e84ceb18bd5c499e1d39eeb76fa203 Mon Sep 17 00:00:00 2001 From: Jacek Caban Date: Mon, 23 Aug 2021 13:51:50 +0200 Subject: [PATCH] gdi32: Move EMF driver to separated file. Signed-off-by: Jacek Caban Signed-off-by: Huw Davies Signed-off-by: Alexandre Julliard --- dlls/gdi32/Makefile.in | 1 + dlls/gdi32/emfdrv.c | 595 +++++++++++++++++++++++++++ dlls/gdi32/enhmfdrv/bitblt.c | 29 -- dlls/gdi32/enhmfdrv/dc.c | 9 - dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 48 --- dlls/gdi32/enhmfdrv/graphics.c | 388 ----------------- dlls/gdi32/enhmfdrv/init.c | 172 -------- dlls/gdi32/enhmfdrv/objects.c | 19 - include/ntgdi.h | 1 + 9 files changed, 597 insertions(+), 665 deletions(-) create mode 100644 dlls/gdi32/emfdrv.c diff --git a/dlls/gdi32/Makefile.in b/dlls/gdi32/Makefile.in index e4eb248a888..36748bf1a35 100644 --- a/dlls/gdi32/Makefile.in +++ b/dlls/gdi32/Makefile.in @@ -22,6 +22,7 @@ C_SRCS = \ dibdrv/opengl.c \ dibdrv/primitives.c \ driver.c \ + emfdrv.c \ enhmetafile.c \ enhmfdrv/bitblt.c \ enhmfdrv/dc.c \ diff --git a/dlls/gdi32/emfdrv.c b/dlls/gdi32/emfdrv.c new file mode 100644 index 00000000000..b1e6c18ccce --- /dev/null +++ b/dlls/gdi32/emfdrv.c @@ -0,0 +1,595 @@ +/* + * Enhanced MetaFile driver + * + * Copyright 1999 Huw D M Davies + * Copyright 2021 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "enhmfdrv/enhmetafiledrv.h" + + +static void emfdrv_update_bounds( DC *dc, RECTL *rect ) +{ + RECTL *bounds = &dc->attr->emf_bounds; + RECTL vport_rect = *rect; + + lp_to_dp( dc, (POINT *)&vport_rect, 2 ); + + /* The coordinate systems may be mirrored + (LPtoDP handles points, not rectangles) */ + if (vport_rect.left > vport_rect.right) + { + LONG temp = vport_rect.right; + vport_rect.right = vport_rect.left; + vport_rect.left = temp; + } + if (vport_rect.top > vport_rect.bottom) + { + LONG temp = vport_rect.bottom; + vport_rect.bottom = vport_rect.top; + vport_rect.top = temp; + } + + if (bounds->left > bounds->right) + { + /* first bounding rectangle */ + *bounds = vport_rect; + } + else + { + bounds->left = min( bounds->left, vport_rect.left ); + bounds->top = min( bounds->top, vport_rect.top ); + bounds->right = max( bounds->right, vport_rect.right ); + bounds->bottom = max( bounds->bottom, vport_rect.bottom ); + } +} + +static BOOL CDECL EMFDRV_LineTo( PHYSDEV dev, INT x, INT y ) +{ + DC *dc = get_physdev_dc( dev ); + RECTL bounds; + POINT pt; + + pt = dc->attr->cur_pos; + + bounds.left = min( x, pt.x ); + bounds.top = min( y, pt.y ); + bounds.right = max( x, pt.x ); + bounds.bottom = max( y, pt.y ); + emfdrv_update_bounds( dc, &bounds ); + return TRUE; +} + +static BOOL CDECL EMFDRV_RoundRect( PHYSDEV dev, INT left, INT top, INT right, + INT bottom, INT ell_width, INT ell_height ) +{ + DC *dc = get_physdev_dc( dev ); + RECTL bounds; + + if (left == right || top == bottom) return FALSE; + + bounds.left = min( left, right ); + bounds.top = min( top, bottom ); + bounds.right = max( left, right ); + bounds.bottom = max( top, bottom ); + if (dc->attr->graphics_mode == GM_COMPATIBLE) + { + bounds.right--; + bounds.bottom--; + } + + emfdrv_update_bounds( dc, &bounds ); + return TRUE; +} + +static BOOL EMFDRV_ArcChordPie( PHYSDEV dev, INT left, INT top, INT right, INT bottom, + INT xstart, INT ystart, INT xend, INT yend, DWORD type ) +{ + DC *dc = get_physdev_dc( dev ); + INT temp, x_centre, y_centre, i; + double angle_start, angle_end; + double xinter_start, yinter_start, xinter_end, yinter_end; + EMRARC emr; + RECTL bounds; + + if (left == right || top == bottom) return FALSE; + + if (left > right) { temp = left; left = right; right = temp; } + if (top > bottom) { temp = top; top = bottom; bottom = temp; } + + if (dc->attr->graphics_mode == GM_COMPATIBLE) + { + right--; + bottom--; + } + + emr.emr.iType = type; + emr.emr.nSize = sizeof(emr); + emr.rclBox.left = left; + emr.rclBox.top = top; + emr.rclBox.right = right; + emr.rclBox.bottom = bottom; + emr.ptlStart.x = xstart; + emr.ptlStart.y = ystart; + emr.ptlEnd.x = xend; + emr.ptlEnd.y = yend; + + /* Now calculate the BBox */ + x_centre = (left + right + 1) / 2; + y_centre = (top + bottom + 1) / 2; + + xstart -= x_centre; + ystart -= y_centre; + xend -= x_centre; + yend -= y_centre; + + /* invert y co-ords to get angle anti-clockwise from x-axis */ + angle_start = atan2( -(double)ystart, (double)xstart ); + angle_end = atan2( -(double)yend, (double)xend ); + + /* These are the intercepts of the start/end lines with the arc */ + xinter_start = (right - left + 1)/2 * cos(angle_start) + x_centre; + yinter_start = -(bottom - top + 1)/2 * sin(angle_start) + y_centre; + xinter_end = (right - left + 1)/2 * cos(angle_end) + x_centre; + yinter_end = -(bottom - top + 1)/2 * sin(angle_end) + y_centre; + + if (angle_start < 0) angle_start += 2 * M_PI; + if (angle_end < 0) angle_end += 2 * M_PI; + if (angle_end < angle_start) angle_end += 2 * M_PI; + + bounds.left = min( xinter_start, xinter_end ); + bounds.top = min( yinter_start, yinter_end ); + bounds.right = max( xinter_start, xinter_end ); + bounds.bottom = max( yinter_start, yinter_end ); + + for (i = 0; i <= 8; i++) + { + if(i * M_PI / 2 < angle_start) /* loop until we're past start */ + continue; + if(i * M_PI / 2 > angle_end) /* if we're past end we're finished */ + break; + + /* the arc touches the rectangle at the start of quadrant i, so adjust + BBox to reflect this. */ + + switch(i % 4) { + case 0: + bounds.right = right; + break; + case 1: + bounds.top = top; + break; + case 2: + bounds.left = left; + break; + case 3: + bounds.bottom = bottom; + break; + } + } + + /* If we're drawing a pie then make sure we include the centre */ + if (type == EMR_PIE) + { + if (bounds.left > x_centre) bounds.left = x_centre; + else if (bounds.right < x_centre) bounds.right = x_centre; + if (bounds.top > y_centre) bounds.top = y_centre; + else if (bounds.bottom < y_centre) bounds.bottom = y_centre; + } + else if (type == EMR_ARCTO) + { + POINT pt; + pt = dc->attr->cur_pos; + bounds.left = min( bounds.left, pt.x ); + bounds.top = min( bounds.top, pt.y ); + bounds.right = max( bounds.right, pt.x ); + bounds.bottom = max( bounds.bottom, pt.y ); + } + emfdrv_update_bounds( dc, &bounds ); + return TRUE; +} + +static BOOL CDECL EMFDRV_Arc( PHYSDEV dev, INT left, INT top, INT right, INT bottom, + INT xstart, INT ystart, INT xend, INT yend ) +{ + return EMFDRV_ArcChordPie( dev, left, top, right, bottom, xstart, ystart, + xend, yend, EMR_ARC ); +} + +static BOOL CDECL EMFDRV_ArcTo( PHYSDEV dev, INT left, INT top, INT right, INT bottom, + INT xstart, INT ystart, INT xend, INT yend ) +{ + return EMFDRV_ArcChordPie( dev, left, top, right, bottom, xstart, ystart, + xend, yend, EMR_ARCTO ); +} + +static BOOL CDECL EMFDRV_Pie( PHYSDEV dev, INT left, INT top, INT right, INT bottom, + INT xstart, INT ystart, INT xend, INT yend ) +{ + return EMFDRV_ArcChordPie( dev, left, top, right, bottom, xstart, ystart, + xend, yend, EMR_PIE ); +} + +static BOOL CDECL EMFDRV_Chord( PHYSDEV dev, INT left, INT top, INT right, INT bottom, + INT xstart, INT ystart, INT xend, INT yend ) +{ + return EMFDRV_ArcChordPie( dev, left, top, right, bottom, xstart, ystart, + xend, yend, EMR_CHORD ); +} + +static BOOL CDECL EMFDRV_Ellipse( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) +{ + DC *dc = get_physdev_dc( dev ); + RECTL bounds; + + if (left == right || top == bottom) return FALSE; + + bounds.left = min( left, right ); + bounds.top = min( top, bottom ); + bounds.right = max( left, right ); + bounds.bottom = max( top, bottom ); + if (dc->attr->graphics_mode == GM_COMPATIBLE) + { + bounds.right--; + bounds.bottom--; + } + + emfdrv_update_bounds( dc, &bounds ); + return TRUE; +} + +static BOOL EMFDRV_Rectangle( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) +{ + DC *dc = get_physdev_dc( dev ); + RECTL bounds; + + if (left == right || top == bottom) return FALSE; + + bounds.left = min( left, right ); + bounds.top = min( top, bottom ); + bounds.right = max( left, right ); + bounds.bottom = max( top, bottom ); + if (dc->attr->graphics_mode == GM_COMPATIBLE) + { + bounds.right--; + bounds.bottom--; + } + + emfdrv_update_bounds( dc, &bounds ); + return TRUE; +} + +static COLORREF CDECL EMFDRV_SetPixel( PHYSDEV dev, INT x, INT y, COLORREF color ) +{ + DC *dc = get_physdev_dc( dev ); + RECTL bounds; + + bounds.left = bounds.right = x; + bounds.top = bounds.bottom = y; + emfdrv_update_bounds( dc, &bounds ); + return CLR_INVALID; +} + +static BOOL CDECL EMFDRV_PolylineTo( PHYSDEV dev, const POINT *pt, INT count ) +{ + /* FIXME: update bounding rect */ + return TRUE; +} + +static BOOL CDECL EMFDRV_PolyBezier( PHYSDEV dev, const POINT *pts, DWORD count ) +{ + /* FIXME: update bounding rect */ + return TRUE; +} + +static BOOL CDECL EMFDRV_PolyBezierTo( PHYSDEV dev, const POINT *pts, DWORD count ) +{ + /* FIXME: update bounding rect */ + return TRUE; +} + +static BOOL CDECL EMFDRV_PolyPolyline( PHYSDEV dev, const POINT *pt, + const DWORD *counts, UINT polys ) +{ + /* FIXME: update bounding rect */ + return TRUE; +} + +static BOOL CDECL EMFDRV_PolyPolygon( PHYSDEV dev, const POINT *pt, + const INT *counts, UINT polys ) +{ + /* FIXME: update bounding rect */ + return TRUE; +} + +static BOOL CDECL EMFDRV_PolyDraw( PHYSDEV dev, const POINT *pts, + const BYTE *types, DWORD count ) +{ + /* FIXME: update bounding rect */ + return TRUE; +} + +static BOOL CDECL EMFDRV_FillRgn( PHYSDEV dev, HRGN hrgn, HBRUSH hbrush ) +{ + /* FIXME: update bounding rect */ + return TRUE; +} + +static BOOL CDECL EMFDRV_FrameRgn( PHYSDEV dev, HRGN hrgn, HBRUSH hbrush, INT width, INT height ) +{ + /* FIXME: update bounding rect */ + return TRUE; +} + +static BOOL CDECL EMFDRV_InvertRgn( PHYSDEV dev, HRGN hrgn ) +{ + /* FIXME: update bounding rect */ + return TRUE; +} + +static BOOL CDECL EMFDRV_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, const RECT *lprect, + LPCWSTR str, UINT count, const INT *lpDx ) +{ + /* FIXME: update bounding rect */ + return TRUE; +} + +static BOOL CDECL EMFDRV_GradientFill( PHYSDEV dev, TRIVERTEX *vert_array, ULONG nvert, + void *grad_array, ULONG ngrad, ULONG mode ) +{ + /* FIXME: update bounding rect */ + return TRUE; +} + +static BOOL CDECL EMFDRV_FillPath( PHYSDEV dev ) +{ + /* FIXME: update bound rect */ + return TRUE; +} + +static BOOL CDECL EMFDRV_StrokeAndFillPath( PHYSDEV dev ) +{ + /* FIXME: update bound rect */ + return TRUE; +} + +static BOOL CDECL EMFDRV_StrokePath( PHYSDEV dev ) +{ + /* FIXME: update bound rect */ + return TRUE; +} + +static BOOL CDECL EMFDRV_AlphaBlend( PHYSDEV dev_dst, struct bitblt_coords *dst, + PHYSDEV dev_src, struct bitblt_coords *src, + BLENDFUNCTION func ) +{ + /* FIXME: update bound rect */ + return TRUE; +} + +static BOOL CDECL EMFDRV_PatBlt( PHYSDEV dev, struct bitblt_coords *dst, DWORD rop ) +{ + /* FIXME: update bound rect */ + return TRUE; +} + +static INT CDECL EMFDRV_StretchDIBits( PHYSDEV dev, INT x_dst, INT y_dst, INT width_dst, + INT height_dst, INT x_src, INT y_src, INT width_src, + INT height_src, const void *bits, BITMAPINFO *info, + UINT wUsage, DWORD dwRop ) +{ + /* FIXME: Update bound rect */ + return height_src; +} + +static INT CDECL EMFDRV_SetDIBitsToDevice( PHYSDEV dev, INT x_dst, INT y_dst, DWORD width, + DWORD height, INT x_src, INT y_src, UINT startscan, + UINT lines, const void *bits, BITMAPINFO *info, + UINT usage ) +{ + /* FIXME: Update bound rect */ + return lines; +} + +static HBITMAP CDECL EMFDRV_SelectBitmap( PHYSDEV dev, HBITMAP hbitmap ) +{ + return 0; +} + +static HFONT CDECL EMFDRV_SelectFont( PHYSDEV dev, HFONT font, UINT *aa_flags ) +{ + *aa_flags = GGO_BITMAP; /* no point in anti-aliasing on metafiles */ + + dev = GET_NEXT_PHYSDEV( dev, pSelectFont ); + return dev->funcs->pSelectFont( dev, font, aa_flags ); +} + +static INT CDECL EMFDRV_GetDeviceCaps( PHYSDEV dev, INT cap ) +{ + EMFDRV_PDEVICE *physDev = get_emf_physdev( dev ); + + if (cap >= 0 && cap < ARRAY_SIZE( physDev->dev_caps )) + return physDev->dev_caps[cap]; + return 0; +} + +static BOOL CDECL EMFDRV_DeleteDC( PHYSDEV dev ) +{ + EMFDRV_PDEVICE *physDev = get_emf_physdev( dev ); + HeapFree( GetProcessHeap(), 0, physDev ); + return TRUE; +} + +static const struct gdi_dc_funcs emfdrv_driver = +{ + NULL, /* pAbortDoc */ + NULL, /* pAbortPath */ + EMFDRV_AlphaBlend, /* pAlphaBlend */ + NULL, /* pAngleArc */ + EMFDRV_Arc, /* pArc */ + EMFDRV_ArcTo, /* pArcTo */ + NULL, /* pBeginPath */ + NULL, /* pBlendImage */ + EMFDRV_Chord, /* pChord */ + NULL, /* pCloseFigure */ + NULL, /* pCreateCompatibleDC */ + NULL, /* pCreateDC */ + EMFDRV_DeleteDC, /* pDeleteDC */ + NULL, /* pDeleteObject */ + NULL, /* pDeviceCapabilities */ + EMFDRV_Ellipse, /* pEllipse */ + NULL, /* pEndDoc */ + NULL, /* pEndPage */ + NULL, /* pEndPath */ + NULL, /* pEnumFonts */ + NULL, /* pEnumICMProfiles */ + NULL, /* pExtDeviceMode */ + NULL, /* pExtEscape */ + NULL, /* pExtFloodFill */ + EMFDRV_ExtTextOut, /* pExtTextOut */ + EMFDRV_FillPath, /* pFillPath */ + EMFDRV_FillRgn, /* pFillRgn */ + NULL, /* pFontIsLinked */ + EMFDRV_FrameRgn, /* pFrameRgn */ + NULL, /* pGetBoundsRect */ + NULL, /* pGetCharABCWidths */ + NULL, /* pGetCharABCWidthsI */ + NULL, /* pGetCharWidth */ + NULL, /* pGetCharWidthInfo */ + EMFDRV_GetDeviceCaps, /* pGetDeviceCaps */ + NULL, /* pGetDeviceGammaRamp */ + NULL, /* pGetFontData */ + NULL, /* pGetFontRealizationInfo */ + NULL, /* pGetFontUnicodeRanges */ + NULL, /* pGetGlyphIndices */ + NULL, /* pGetGlyphOutline */ + NULL, /* pGetICMProfile */ + NULL, /* pGetImage */ + NULL, /* pGetKerningPairs */ + NULL, /* pGetNearestColor */ + NULL, /* pGetOutlineTextMetrics */ + NULL, /* pGetPixel */ + NULL, /* pGetSystemPaletteEntries */ + NULL, /* pGetTextCharsetInfo */ + NULL, /* pGetTextExtentExPoint */ + NULL, /* pGetTextExtentExPointI */ + NULL, /* pGetTextFace */ + NULL, /* pGetTextMetrics */ + EMFDRV_GradientFill, /* pGradientFill */ + EMFDRV_InvertRgn, /* pInvertRgn */ + EMFDRV_LineTo, /* pLineTo */ + NULL, /* pMoveTo */ + NULL, /* pPaintRgn */ + EMFDRV_PatBlt, /* pPatBlt */ + EMFDRV_Pie, /* pPie */ + EMFDRV_PolyBezier, /* pPolyBezier */ + EMFDRV_PolyBezierTo, /* pPolyBezierTo */ + EMFDRV_PolyDraw, /* pPolyDraw */ + EMFDRV_PolyPolygon, /* pPolyPolygon */ + EMFDRV_PolyPolyline, /* pPolyPolyline */ + EMFDRV_PolylineTo, /* pPolylineTo */ + NULL, /* pPutImage */ + NULL, /* pRealizeDefaultPalette */ + NULL, /* pRealizePalette */ + EMFDRV_Rectangle, /* pRectangle */ + NULL, /* pResetDC */ + EMFDRV_RoundRect, /* pRoundRect */ + EMFDRV_SelectBitmap, /* pSelectBitmap */ + NULL, /* pSelectBrush */ + EMFDRV_SelectFont, /* pSelectFont */ + NULL, /* pSelectPen */ + NULL, /* pSetBkColor */ + NULL, /* pSetBoundsRect */ + NULL, /* pSetDCBrushColor*/ + NULL, /* pSetDCPenColor*/ + EMFDRV_SetDIBitsToDevice, /* pSetDIBitsToDevice */ + NULL, /* pSetDeviceClipping */ + NULL, /* pSetDeviceGammaRamp */ + EMFDRV_SetPixel, /* pSetPixel */ + NULL, /* pSetTextColor */ + NULL, /* pStartDoc */ + NULL, /* pStartPage */ + NULL, /* pStretchBlt */ + EMFDRV_StretchDIBits, /* pStretchDIBits */ + EMFDRV_StrokeAndFillPath, /* pStrokeAndFillPath */ + EMFDRV_StrokePath, /* pStrokePath */ + NULL, /* pUnrealizePalette */ + NULL, /* pD3DKMTCheckVidPnExclusiveOwnership */ + NULL, /* pD3DKMTSetVidPnSourceOwner */ + NULL, /* wine_get_wgl_driver */ + NULL, /* wine_get_vulkan_driver */ + GDI_PRIORITY_GRAPHICS_DRV /* priority */ +}; + + +static BOOL devcap_is_valid( int cap ) +{ + if (cap >= 0 && cap <= ASPECTXY) return !(cap & 1); + if (cap >= PHYSICALWIDTH && cap <= COLORMGMTCAPS) return TRUE; + switch (cap) + { + case LOGPIXELSX: + case LOGPIXELSY: + case CAPS1: + case SIZEPALETTE: + case NUMRESERVED: + case COLORRES: + return TRUE; + } + return FALSE; +} + +/********************************************************************** + * NtGdiCreateMetafileDC (win32u.@) + */ +HDC WINAPI NtGdiCreateMetafileDC( HDC hdc ) +{ + EMFDRV_PDEVICE *physDev; + HDC ref_dc, ret; + int cap; + DC *dc; + + if (!(dc = alloc_dc_ptr( NTGDI_OBJ_ENHMETADC ))) return 0; + + physDev = HeapAlloc( GetProcessHeap(), 0, sizeof(*physDev) ); + if (!physDev) + { + free_dc_ptr( dc ); + return 0; + } + dc->attr->emf = physDev; + + push_dc_driver( &dc->physDev, &physDev->dev, &emfdrv_driver ); + + if (hdc) /* if no ref, use current display */ + ref_dc = hdc; + else + ref_dc = CreateDCW( L"DISPLAY", NULL, NULL, NULL ); + + memset( physDev->dev_caps, 0, sizeof(physDev->dev_caps) ); + for (cap = 0; cap < ARRAY_SIZE( physDev->dev_caps ); cap++) + if (devcap_is_valid( cap )) + physDev->dev_caps[cap] = NtGdiGetDeviceCaps( ref_dc, cap ); + + if (!hdc) NtGdiDeleteObjectApp( ref_dc ); + + NtGdiSetVirtualResolution( dc->hSelf, 0, 0, 0, 0 ); + + ret = dc->hSelf; + release_dc_ptr( dc ); + return ret; +} diff --git a/dlls/gdi32/enhmfdrv/bitblt.c b/dlls/gdi32/enhmfdrv/bitblt.c index 3859cd495a0..4d0a2340367 100644 --- a/dlls/gdi32/enhmfdrv/bitblt.c +++ b/dlls/gdi32/enhmfdrv/bitblt.c @@ -166,19 +166,6 @@ BOOL EMFDC_AlphaBlend( DC_ATTR *dc_attr, INT x_dst, INT y_dst, INT width_dst, IN width_src, height_src, *(DWORD *)&blend_function, EMR_ALPHABLEND ); } -BOOL CDECL EMFDRV_AlphaBlend( PHYSDEV dev_dst, struct bitblt_coords *dst, - PHYSDEV dev_src, struct bitblt_coords *src, BLENDFUNCTION func ) -{ - /* FIXME: update bound rect */ - return TRUE; -} - -BOOL CDECL EMFDRV_PatBlt( PHYSDEV dev, struct bitblt_coords *dst, DWORD rop ) -{ - /* FIXME: update bound rect */ - return TRUE; -} - BOOL EMFDC_PatBlt( DC_ATTR *dc_attr, INT left, INT top, INT width, INT height, DWORD rop ) { EMFDRV_PDEVICE *emf = dc_attr->emf; @@ -240,14 +227,6 @@ BOOL EMFDC_StretchBlt( DC_ATTR *dc_attr, INT x_dst, INT y_dst, INT width_dst, IN height_src, rop, EMR_STRETCHBLT ); } -INT CDECL EMFDRV_StretchDIBits( PHYSDEV dev, INT xDst, INT yDst, INT widthDst, INT heightDst, - INT xSrc, INT ySrc, INT widthSrc, INT heightSrc, const void *bits, - BITMAPINFO *info, UINT wUsage, DWORD dwRop ) -{ - /* FIXME: Update bound rect */ - return heightSrc; -} - BOOL EMFDC_StretchDIBits( DC_ATTR *dc_attr, INT x_dst, INT y_dst, INT width_dst, INT height_dst, INT x_src, INT y_src, INT width_src, INT height_src, const void *bits, const BITMAPINFO *info, UINT usage, DWORD rop ) @@ -305,14 +284,6 @@ BOOL EMFDC_StretchDIBits( DC_ATTR *dc_attr, INT x_dst, INT y_dst, INT width_dst, return ret; } -INT CDECL EMFDRV_SetDIBitsToDevice( PHYSDEV dev, INT xDst, INT yDst, DWORD width, DWORD height, - INT xSrc, INT ySrc, UINT startscan, UINT lines, - LPCVOID bits, BITMAPINFO *info, UINT wUsage ) -{ - /* FIXME: Update bound rect */ - return lines; -} - BOOL EMFDC_SetDIBitsToDevice( DC_ATTR *dc_attr, INT x_dst, INT y_dst, DWORD width, DWORD height, INT x_src, INT y_src, UINT startscan, UINT lines, const void *bits, const BITMAPINFO *info, UINT usage ) diff --git a/dlls/gdi32/enhmfdrv/dc.c b/dlls/gdi32/enhmfdrv/dc.c index 519c3349743..661fc34aaa4 100644 --- a/dlls/gdi32/enhmfdrv/dc.c +++ b/dlls/gdi32/enhmfdrv/dc.c @@ -403,12 +403,3 @@ BOOL EMFDC_WidenPath( DC_ATTR *dc_attr ) emr.emr.nSize = sizeof(emr); return EMFDRV_WriteRecord( dc_attr->emf, &emr.emr ); } - -INT CDECL EMFDRV_GetDeviceCaps(PHYSDEV dev, INT cap) -{ - EMFDRV_PDEVICE *physDev = get_emf_physdev( dev ); - - if (cap >= 0 && cap < ARRAY_SIZE( physDev->dev_caps )) - return physDev->dev_caps[cap]; - return 0; -} diff --git a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h index 334bd41e357..edc7635fd08 100644 --- a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h +++ b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h @@ -56,53 +56,5 @@ extern DWORD EMFDRV_CreateBrushIndirect( PHYSDEV dev, HBRUSH hBrush ) DECLSPEC_H #define HANDLE_LIST_INC 20 -/* Metafile driver functions */ -extern BOOL CDECL EMFDRV_AlphaBlend( PHYSDEV dev_dst, struct bitblt_coords *dst, - PHYSDEV dev_src, struct bitblt_coords *src, BLENDFUNCTION func ) DECLSPEC_HIDDEN; -extern BOOL CDECL EMFDRV_Arc( PHYSDEV dev, INT left, INT top, INT right, - INT bottom, INT xstart, INT ystart, INT xend, INT yend ) DECLSPEC_HIDDEN; -extern BOOL CDECL EMFDRV_ArcTo( PHYSDEV dev, INT left, INT top, INT right, - INT bottom, INT xstart, INT ystart, INT xend, INT yend ) DECLSPEC_HIDDEN; -extern BOOL CDECL EMFDRV_BitBlt( PHYSDEV devDst, INT xDst, INT yDst, INT width, INT height, - PHYSDEV devSrc, INT xSrc, INT ySrc, DWORD rop ) DECLSPEC_HIDDEN; -extern BOOL CDECL EMFDRV_Chord( PHYSDEV dev, INT left, INT top, INT right, INT bottom, - INT xstart, INT ystart, INT xend, INT yend ) DECLSPEC_HIDDEN; -extern BOOL CDECL EMFDRV_Ellipse( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) 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; -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_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, - void *grad_array, ULONG ngrad, ULONG mode ) DECLSPEC_HIDDEN; -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_PatBlt( PHYSDEV dev, struct bitblt_coords *dst, DWORD rop ) DECLSPEC_HIDDEN; -extern BOOL CDECL EMFDRV_Pie( PHYSDEV dev, INT left, INT top, INT right, INT bottom, - INT xstart, INT ystart, INT xend, INT yend ) DECLSPEC_HIDDEN; -extern BOOL CDECL EMFDRV_PolyBezier( PHYSDEV dev, const POINT *pts, DWORD count ) DECLSPEC_HIDDEN; -extern BOOL CDECL EMFDRV_PolyBezierTo( PHYSDEV dev, const POINT *pts, DWORD count ) DECLSPEC_HIDDEN; -extern BOOL CDECL EMFDRV_PolyDraw( PHYSDEV dev, const POINT *pts, const BYTE *types, DWORD count ) DECLSPEC_HIDDEN; -extern BOOL CDECL EMFDRV_PolyPolygon( PHYSDEV dev, const POINT* pt, const INT* counts, UINT polys) DECLSPEC_HIDDEN; -extern BOOL CDECL EMFDRV_PolyPolyline( PHYSDEV dev, const POINT* pt, const DWORD* counts, DWORD polys) DECLSPEC_HIDDEN; -extern BOOL CDECL EMFDRV_PolylineTo( PHYSDEV dev, const POINT* pt,INT count) DECLSPEC_HIDDEN; -extern BOOL CDECL EMFDRV_Rectangle( PHYSDEV dev, INT left, INT top, INT right, INT bottom) DECLSPEC_HIDDEN; -extern BOOL CDECL EMFDRV_RoundRect( PHYSDEV dev, INT left, INT top, INT right, INT bottom, - INT ell_width, INT ell_height ) DECLSPEC_HIDDEN; -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 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; -extern COLORREF CDECL EMFDRV_SetPixel( PHYSDEV dev, INT x, INT y, COLORREF color ) DECLSPEC_HIDDEN; -extern INT CDECL EMFDRV_StretchDIBits( PHYSDEV dev, INT xDst, INT yDst, INT widthDst, INT heightDst, - INT xSrc, INT ySrc, INT widthSrc, INT heightSrc, - const void *bits, BITMAPINFO *info, UINT wUsage, DWORD dwRop ) DECLSPEC_HIDDEN; -extern BOOL CDECL EMFDRV_StrokeAndFillPath( PHYSDEV dev ) DECLSPEC_HIDDEN; -extern BOOL CDECL EMFDRV_StrokePath( PHYSDEV dev ) DECLSPEC_HIDDEN; - #endif /* __WINE_METAFILEDRV_H */ diff --git a/dlls/gdi32/enhmfdrv/graphics.c b/dlls/gdi32/enhmfdrv/graphics.c index 691a53ce98f..fb5ce3dbd09 100644 --- a/dlls/gdi32/enhmfdrv/graphics.c +++ b/dlls/gdi32/enhmfdrv/graphics.c @@ -148,26 +148,6 @@ BOOL EMFDC_LineTo( DC_ATTR *dc_attr, INT x, INT y ) } -/*********************************************************************** - * EMFDRV_LineTo - */ -BOOL CDECL EMFDRV_LineTo( PHYSDEV dev, INT x, INT y ) -{ - EMFDRV_PDEVICE *physDev = get_emf_physdev( dev ); - DC *dc = get_physdev_dc( dev ); - RECTL bounds; - POINT pt; - - pt = dc->attr->cur_pos; - - bounds.left = min(x, pt.x); - bounds.top = min(y, pt.y); - bounds.right = max(x, pt.x); - bounds.bottom = max(y, pt.y); - EMFDRV_UpdateBBox( &physDev->dev, &bounds ); - return TRUE; -} - /*********************************************************************** * EMFDC_ArcChordPie */ @@ -202,158 +182,6 @@ BOOL EMFDC_ArcChordPie( DC_ATTR *dc_attr, INT left, INT top, INT right, INT bott return EMFDRV_WriteRecord( &emf->dev, &emr.emr ); } -/*********************************************************************** - * EMFDRV_ArcChordPie - */ -static BOOL EMFDRV_ArcChordPie( PHYSDEV dev, INT left, INT top, INT right, INT bottom, - INT xstart, INT ystart, INT xend, INT yend, DWORD type ) -{ - DC *dc = get_physdev_dc( dev ); - INT temp, xCentre, yCentre, i; - double angleStart, angleEnd; - double xinterStart, yinterStart, xinterEnd, yinterEnd; - EMRARC emr; - RECTL bounds; - - if(left == right || top == bottom) return FALSE; - - if(left > right) {temp = left; left = right; right = temp;} - if(top > bottom) {temp = top; top = bottom; bottom = temp;} - - if (dc->attr->graphics_mode == GM_COMPATIBLE) - { - right--; - bottom--; - } - - emr.emr.iType = type; - emr.emr.nSize = sizeof(emr); - emr.rclBox.left = left; - emr.rclBox.top = top; - emr.rclBox.right = right; - emr.rclBox.bottom = bottom; - emr.ptlStart.x = xstart; - emr.ptlStart.y = ystart; - emr.ptlEnd.x = xend; - emr.ptlEnd.y = yend; - - - /* Now calculate the BBox */ - xCentre = (left + right + 1) / 2; - yCentre = (top + bottom + 1) / 2; - - xstart -= xCentre; - ystart -= yCentre; - xend -= xCentre; - yend -= yCentre; - - /* invert y co-ords to get angle anti-clockwise from x-axis */ - angleStart = atan2( -(double)ystart, (double)xstart); - angleEnd = atan2( -(double)yend, (double)xend); - - /* These are the intercepts of the start/end lines with the arc */ - - xinterStart = (right - left + 1)/2 * cos(angleStart) + xCentre; - yinterStart = -(bottom - top + 1)/2 * sin(angleStart) + yCentre; - xinterEnd = (right - left + 1)/2 * cos(angleEnd) + xCentre; - yinterEnd = -(bottom - top + 1)/2 * sin(angleEnd) + yCentre; - - if(angleStart < 0) angleStart += 2 * M_PI; - if(angleEnd < 0) angleEnd += 2 * M_PI; - if(angleEnd < angleStart) angleEnd += 2 * M_PI; - - bounds.left = min(xinterStart, xinterEnd); - bounds.top = min(yinterStart, yinterEnd); - bounds.right = max(xinterStart, xinterEnd); - bounds.bottom = max(yinterStart, yinterEnd); - - for(i = 0; i <= 8; i++) { - if(i * M_PI / 2 < angleStart) /* loop until we're past start */ - continue; - if(i * M_PI / 2 > angleEnd) /* if we're past end we're finished */ - break; - - /* the arc touches the rectangle at the start of quadrant i, so adjust - BBox to reflect this. */ - - switch(i % 4) { - case 0: - bounds.right = right; - break; - case 1: - bounds.top = top; - break; - case 2: - bounds.left = left; - break; - case 3: - bounds.bottom = bottom; - break; - } - } - - /* If we're drawing a pie then make sure we include the centre */ - if (type == EMR_PIE) - { - if(bounds.left > xCentre) bounds.left = xCentre; - else if(bounds.right < xCentre) bounds.right = xCentre; - if(bounds.top > yCentre) bounds.top = yCentre; - else if(bounds.bottom < yCentre) bounds.bottom = yCentre; - } - else if (type == EMR_ARCTO) - { - POINT pt; - pt = dc->attr->cur_pos; - bounds.left = min( bounds.left, pt.x ); - bounds.top = min( bounds.top, pt.y ); - bounds.right = max( bounds.right, pt.x ); - bounds.bottom = max( bounds.bottom, pt.y ); - } - EMFDRV_UpdateBBox( dev, &bounds ); - return TRUE; -} - -/*********************************************************************** - * EMFDRV_Arc - */ -BOOL CDECL EMFDRV_Arc( PHYSDEV dev, INT left, INT top, INT right, INT bottom, - INT xstart, INT ystart, INT xend, INT yend ) -{ - return EMFDRV_ArcChordPie( dev, left, top, right, bottom, xstart, ystart, - xend, yend, EMR_ARC ); -} - -/*********************************************************************** - * EMFDRV_ArcTo - */ -BOOL CDECL EMFDRV_ArcTo( PHYSDEV dev, INT left, INT top, INT right, INT bottom, - INT xstart, INT ystart, INT xend, INT yend ) -{ - return EMFDRV_ArcChordPie( dev, left, top, right, bottom, xstart, ystart, - xend, yend, EMR_ARCTO ); -} - -/*********************************************************************** - * EMFDRV_Pie - */ -BOOL CDECL EMFDRV_Pie( PHYSDEV dev, INT left, INT top, INT right, INT bottom, - INT xstart, INT ystart, INT xend, INT yend ) -{ - return EMFDRV_ArcChordPie( dev, left, top, right, bottom, xstart, ystart, - xend, yend, EMR_PIE ); -} - - -/*********************************************************************** - * EMFDRV_Chord - */ -BOOL CDECL EMFDRV_Chord( PHYSDEV dev, INT left, INT top, INT right, INT bottom, - INT xstart, INT ystart, INT xend, INT yend ) -{ - return EMFDRV_ArcChordPie( dev, left, top, right, bottom, xstart, ystart, - xend, yend, EMR_CHORD ); -} - /*********************************************************************** * EMFDC_AngleArc */ @@ -397,30 +225,6 @@ BOOL EMFDC_Ellipse( DC_ATTR *dc_attr, INT left, INT top, INT right, INT bottom ) return EMFDRV_WriteRecord( &emf->dev, &emr.emr ); } -/*********************************************************************** - * EMFDRV_Ellipse - */ -BOOL CDECL EMFDRV_Ellipse( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) -{ - DC *dc = get_physdev_dc( dev ); - RECTL bounds; - - if (left == right || top == bottom) return FALSE; - - bounds.left = min( left, right ); - bounds.top = min( top, bottom ); - bounds.right = max( left, right ); - bounds.bottom = max( top, bottom ); - if (dc->attr->graphics_mode == GM_COMPATIBLE) - { - bounds.right--; - bounds.bottom--; - } - - EMFDRV_UpdateBBox( dev, &bounds ); - return TRUE; -} - /*********************************************************************** * EMFDC_Rectangle */ @@ -446,30 +250,6 @@ BOOL EMFDC_Rectangle( DC_ATTR *dc_attr, INT left, INT top, INT right, INT bottom return EMFDRV_WriteRecord( &emf->dev, &emr.emr ); } -/*********************************************************************** - * EMFDC_Rectangle - */ -BOOL EMFDRV_Rectangle( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) -{ - DC *dc = get_physdev_dc( dev ); - RECTL bounds; - - if (left == right || top == bottom) return FALSE; - - bounds.left = min( left, right ); - bounds.top = min( top, bottom ); - bounds.right = max( left, right ); - bounds.bottom = max( top, bottom ); - if (dc->attr->graphics_mode == GM_COMPATIBLE) - { - bounds.right--; - bounds.bottom--; - } - - EMFDRV_UpdateBBox( dev, &bounds ); - return TRUE; -} - /*********************************************************************** * EMFDC_RoundRect */ @@ -498,31 +278,6 @@ BOOL EMFDC_RoundRect( DC_ATTR *dc_attr, INT left, INT top, INT right, return EMFDRV_WriteRecord( &emf->dev, &emr.emr ); } -/*********************************************************************** - * EMFDRV_RoundRect - */ -BOOL CDECL EMFDRV_RoundRect( PHYSDEV dev, INT left, INT top, INT right, - INT bottom, INT ell_width, INT ell_height ) -{ - DC *dc = get_physdev_dc( dev ); - RECTL bounds; - - if (left == right || top == bottom) return FALSE; - - bounds.left = min( left, right ); - bounds.top = min( top, bottom ); - bounds.right = max( left, right ); - bounds.bottom = max( top, bottom ); - if (dc->attr->graphics_mode == GM_COMPATIBLE) - { - bounds.right--; - bounds.bottom--; - } - - EMFDRV_UpdateBBox( dev, &bounds ); - return TRUE; -} - /*********************************************************************** * EMFDC_SetPixel */ @@ -538,18 +293,6 @@ BOOL EMFDC_SetPixel( DC_ATTR *dc_attr, INT x, INT y, COLORREF color ) return EMFDRV_WriteRecord( dc_attr->emf, &emr.emr ); } -/*********************************************************************** - * EMFDRV_SetPixel - */ -COLORREF CDECL EMFDRV_SetPixel( PHYSDEV dev, INT x, INT y, COLORREF color ) -{ - RECTL bounds; - bounds.left = bounds.right = x; - bounds.top = bounds.bottom = y; - EMFDRV_UpdateBBox( dev, &bounds ); - return CLR_INVALID; -} - /********************************************************************** * EMFDRV_Polylinegon * @@ -601,15 +344,6 @@ BOOL EMFDC_PolylineTo( DC_ATTR *dc_attr, const POINT *points, INT count ) return EMFDC_Polylinegon( dc_attr, points, count, EMR_POLYLINETO ); } -/********************************************************************** - * EMFDRV_PolylineTo - */ -BOOL CDECL EMFDRV_PolylineTo( PHYSDEV dev, const POINT* pt, INT count ) -{ - /* FIXME: update bounding rect */ - return TRUE; -} - /********************************************************************** * EMFDC_Polygon */ @@ -635,25 +369,6 @@ BOOL EMFDC_PolyBezierTo( DC_ATTR *dc_attr, const POINT *pts, DWORD count ) return EMFDC_Polylinegon( dc_attr, pts, count, EMR_POLYBEZIERTO ); } -/********************************************************************** - * EMFDRV_PolyBezier - */ -BOOL CDECL EMFDRV_PolyBezier( PHYSDEV dev, const POINT *pts, DWORD count ) -{ - /* FIXME: update bounding rect */ - return TRUE; -} - -/********************************************************************** - * EMFDRV_PolyBezierTo - */ -BOOL CDECL EMFDRV_PolyBezierTo( PHYSDEV dev, const POINT *pts, DWORD count ) -{ - /* FIXME: update bounding rect */ - return TRUE; -} - - /********************************************************************** * EMFDC_PolyPolylinegon * @@ -718,15 +433,6 @@ BOOL EMFDC_PolyPolyline( DC_ATTR *dc_attr, const POINT *pt, const DWORD *counts, return EMFDC_PolyPolylinegon( dc_attr->emf, pt, (const INT *)counts, polys, EMR_POLYPOLYLINE ); } -/********************************************************************** - * EMFDRV_PolyPoline - */ -BOOL CDECL EMFDRV_PolyPolyline( PHYSDEV dev, const POINT *pt, const DWORD* counts, UINT polys ) -{ - /* FIXME: update bounding rect */ - return TRUE; -} - /********************************************************************** * EMFDC_PolyPolygon */ @@ -735,15 +441,6 @@ BOOL EMFDC_PolyPolygon( DC_ATTR *dc_attr, const POINT *pt, const INT *counts, UI return EMFDC_PolyPolylinegon( dc_attr->emf, pt, counts, polys, EMR_POLYPOLYGON ); } -/********************************************************************** - * EMFDRV_PolyPolygon - */ -BOOL CDECL EMFDRV_PolyPolygon( PHYSDEV dev, const POINT* pt, const INT* counts, UINT polys ) -{ - /* FIXME: update bounding rect */ - return TRUE; -} - /********************************************************************** * EMFDC_PolyDraw */ @@ -781,16 +478,6 @@ BOOL EMFDC_PolyDraw( DC_ATTR *dc_attr, const POINT *pts, const BYTE *types, DWOR } -/********************************************************************** - * EMFDRV_PolyDraw - */ -BOOL CDECL EMFDRV_PolyDraw( PHYSDEV dev, const POINT *pts, const BYTE *types, DWORD count ) -{ - /* FIXME: update bounding rect */ - return TRUE; -} - - /********************************************************************** * EMFDC_ExtFloodFill */ @@ -845,16 +532,6 @@ BOOL EMFDC_FillRgn( DC_ATTR *dc_attr, HRGN hrgn, HBRUSH hbrush ) } -/********************************************************************* - * EMFDRV_FillRgn - */ -BOOL CDECL EMFDRV_FillRgn( PHYSDEV dev, HRGN hrgn, HBRUSH hbrush ) -{ - /* FIXME: update bounding rect */ - return TRUE; -} - - /********************************************************************* * EMFDC_FrameRgn */ @@ -892,15 +569,6 @@ BOOL EMFDC_FrameRgn( DC_ATTR *dc_attr, HRGN hrgn, HBRUSH hbrush, INT width, INT return ret; } -/********************************************************************* - * EMFDRV_FrameRgn - */ -BOOL CDECL EMFDRV_FrameRgn( PHYSDEV dev, HRGN hrgn, HBRUSH hbrush, INT width, INT height ) -{ - /* FIXME: update bounding rect */ - return TRUE; -} - /********************************************************************* * EMF_PaintInvertRgn * @@ -950,25 +618,6 @@ BOOL EMFDC_InvertRgn( DC_ATTR *dc_attr, HRGN hrgn ) return EMF_PaintInvertRgn( dc_attr->emf, hrgn, EMR_INVERTRGN ); } -/********************************************************************* - * EMFDRV_InvertRgn - */ -BOOL CDECL EMFDRV_InvertRgn( PHYSDEV dev, HRGN hrgn ) -{ - /* FIXME: update bounding rect */ - return TRUE; -} - -/********************************************************************** - * EMFDRV_ExtTextOut - */ -BOOL CDECL EMFDRV_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, const RECT *lprect, - LPCWSTR str, UINT count, const INT *lpDx ) -{ - /* FIXME: update bounding rect */ - return TRUE; -} - /********************************************************************** * EMFDC_ExtTextOut */ @@ -1111,16 +760,6 @@ no_bounds: return ret; } -/********************************************************************** - * EMFDRV_GradientFill - */ -BOOL CDECL EMFDRV_GradientFill( PHYSDEV dev, TRIVERTEX *vert_array, ULONG nvert, - void *grad_array, ULONG ngrad, ULONG mode ) -{ - /* FIXME: update bounding rect */ - return TRUE; -} - /********************************************************************** * EMFDC_GradientFill */ @@ -1175,15 +814,6 @@ BOOL EMFDC_GradientFill( DC_ATTR *dc_attr, TRIVERTEX *vert_array, ULONG nvert, return ret; } -/********************************************************************** - * EMFDRV_FillPath - */ -BOOL CDECL EMFDRV_FillPath( PHYSDEV dev ) -{ - /* FIXME: update bound rect */ - return TRUE; -} - /********************************************************************** * EMFDC_FillPath */ @@ -1192,15 +822,6 @@ BOOL EMFDC_FillPath( DC_ATTR *dc_attr ) return emfdrv_stroke_and_fill_path( dc_attr->emf, EMR_FILLPATH ); } -/********************************************************************** - * EMFDRV_StrokeAndFillPath - */ -BOOL CDECL EMFDRV_StrokeAndFillPath( PHYSDEV dev ) -{ - /* FIXME: update bound rect */ - return TRUE; -} - /********************************************************************** * EMFDC_StrokeAndFillPath */ @@ -1209,15 +830,6 @@ BOOL EMFDC_StrokeAndFillPath( DC_ATTR *dc_attr ) return emfdrv_stroke_and_fill_path( dc_attr->emf, EMR_STROKEANDFILLPATH ); } -/********************************************************************** - * EMFDRV_StrokePath - */ -BOOL CDECL EMFDRV_StrokePath( PHYSDEV dev ) -{ - /* FIXME: update bound rect */ - return TRUE; -} - /********************************************************************** * EMFDC_StrokePath */ diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c index 03df3d08547..2715ac39be8 100644 --- a/dlls/gdi32/enhmfdrv/init.c +++ b/dlls/gdi32/enhmfdrv/init.c @@ -32,120 +32,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(enhmetafile); -static BOOL CDECL EMFDRV_DeleteDC( PHYSDEV dev ); - -static const struct gdi_dc_funcs emfdrv_driver = -{ - NULL, /* pAbortDoc */ - NULL, /* pAbortPath */ - EMFDRV_AlphaBlend, /* pAlphaBlend */ - NULL, /* pAngleArc */ - EMFDRV_Arc, /* pArc */ - EMFDRV_ArcTo, /* pArcTo */ - NULL, /* pBeginPath */ - NULL, /* pBlendImage */ - NULL, /* pChord */ - NULL, /* pCloseFigure */ - NULL, /* pCreateCompatibleDC */ - NULL, /* pCreateDC */ - EMFDRV_DeleteDC, /* pDeleteDC */ - NULL, /* pDeleteObject */ - NULL, /* pDeviceCapabilities */ - EMFDRV_Ellipse, /* pEllipse */ - NULL, /* pEndDoc */ - NULL, /* pEndPage */ - NULL, /* pEndPath */ - NULL, /* pEnumFonts */ - NULL, /* pEnumICMProfiles */ - NULL, /* pExtDeviceMode */ - NULL, /* pExtEscape */ - NULL, /* pExtFloodFill */ - EMFDRV_ExtTextOut, /* pExtTextOut */ - EMFDRV_FillPath, /* pFillPath */ - EMFDRV_FillRgn, /* pFillRgn */ - NULL, /* pFontIsLinked */ - EMFDRV_FrameRgn, /* pFrameRgn */ - NULL, /* pGetBoundsRect */ - NULL, /* pGetCharABCWidths */ - NULL, /* pGetCharABCWidthsI */ - NULL, /* pGetCharWidth */ - NULL, /* pGetCharWidthInfo */ - EMFDRV_GetDeviceCaps, /* pGetDeviceCaps */ - NULL, /* pGetDeviceGammaRamp */ - NULL, /* pGetFontData */ - NULL, /* pGetFontRealizationInfo */ - NULL, /* pGetFontUnicodeRanges */ - NULL, /* pGetGlyphIndices */ - NULL, /* pGetGlyphOutline */ - NULL, /* pGetICMProfile */ - NULL, /* pGetImage */ - NULL, /* pGetKerningPairs */ - NULL, /* pGetNearestColor */ - NULL, /* pGetOutlineTextMetrics */ - NULL, /* pGetPixel */ - NULL, /* pGetSystemPaletteEntries */ - NULL, /* pGetTextCharsetInfo */ - NULL, /* pGetTextExtentExPoint */ - NULL, /* pGetTextExtentExPointI */ - NULL, /* pGetTextFace */ - NULL, /* pGetTextMetrics */ - EMFDRV_GradientFill, /* pGradientFill */ - EMFDRV_InvertRgn, /* pInvertRgn */ - EMFDRV_LineTo, /* pLineTo */ - NULL, /* pMoveTo */ - NULL, /* pPaintRgn */ - EMFDRV_PatBlt, /* pPatBlt */ - EMFDRV_Pie, /* pPie */ - EMFDRV_PolyBezier, /* pPolyBezier */ - EMFDRV_PolyBezierTo, /* pPolyBezierTo */ - EMFDRV_PolyDraw, /* pPolyDraw */ - EMFDRV_PolyPolygon, /* pPolyPolygon */ - EMFDRV_PolyPolyline, /* pPolyPolyline */ - EMFDRV_PolylineTo, /* pPolylineTo */ - NULL, /* pPutImage */ - NULL, /* pRealizeDefaultPalette */ - NULL, /* pRealizePalette */ - EMFDRV_Rectangle, /* pRectangle */ - NULL, /* pResetDC */ - EMFDRV_RoundRect, /* pRoundRect */ - EMFDRV_SelectBitmap, /* pSelectBitmap */ - NULL, /* pSelectBrush */ - EMFDRV_SelectFont, /* pSelectFont */ - NULL, /* pSelectPen */ - NULL, /* pSetBkColor */ - NULL, /* pSetBoundsRect */ - NULL, /* pSetDCBrushColor*/ - NULL, /* pSetDCPenColor*/ - EMFDRV_SetDIBitsToDevice, /* pSetDIBitsToDevice */ - NULL, /* pSetDeviceClipping */ - NULL, /* pSetDeviceGammaRamp */ - EMFDRV_SetPixel, /* pSetPixel */ - NULL, /* pSetTextColor */ - NULL, /* pStartDoc */ - NULL, /* pStartPage */ - NULL, /* pStretchBlt */ - EMFDRV_StretchDIBits, /* pStretchDIBits */ - EMFDRV_StrokeAndFillPath, /* pStrokeAndFillPath */ - EMFDRV_StrokePath, /* pStrokePath */ - NULL, /* pUnrealizePalette */ - NULL, /* pD3DKMTCheckVidPnExclusiveOwnership */ - NULL, /* pD3DKMTSetVidPnSourceOwner */ - NULL, /* wine_get_wgl_driver */ - NULL, /* wine_get_vulkan_driver */ - GDI_PRIORITY_GRAPHICS_DRV /* priority */ -}; - - -/********************************************************************** - * EMFDRV_DeleteDC - */ -static BOOL CDECL EMFDRV_DeleteDC( PHYSDEV dev ) -{ - EMFDRV_PDEVICE *physDev = get_emf_physdev( dev ); - HeapFree( GetProcessHeap(), 0, physDev ); - return TRUE; -} - void EMFDC_DeleteDC( DC_ATTR *dc_attr ) { @@ -270,64 +156,6 @@ HDC WINAPI CreateEnhMetaFileA( return hReturnDC; } -static inline BOOL devcap_is_valid( int cap ) -{ - if (cap >= 0 && cap <= ASPECTXY) return !(cap & 1); - if (cap >= PHYSICALWIDTH && cap <= COLORMGMTCAPS) return TRUE; - switch (cap) - { - case LOGPIXELSX: - case LOGPIXELSY: - case CAPS1: - case SIZEPALETTE: - case NUMRESERVED: - case COLORRES: - return TRUE; - } - return FALSE; -} - -/********************************************************************** - * NtGdiCreateMetafileDC (win32u.@) - */ -HDC WINAPI NtGdiCreateMetafileDC( HDC hdc ) -{ - EMFDRV_PDEVICE *physDev; - HDC ref_dc, ret; - int cap; - DC *dc; - - if (!(dc = alloc_dc_ptr( NTGDI_OBJ_ENHMETADC ))) return 0; - - physDev = HeapAlloc( GetProcessHeap(), 0, sizeof(*physDev) ); - if (!physDev) - { - free_dc_ptr( dc ); - return 0; - } - dc->attr->emf = physDev; - - push_dc_driver( &dc->physDev, &physDev->dev, &emfdrv_driver ); - - if (hdc) /* if no ref, use current display */ - ref_dc = hdc; - else - ref_dc = CreateDCW( L"DISPLAY", NULL, NULL, NULL ); - - memset( physDev->dev_caps, 0, sizeof(physDev->dev_caps) ); - for (cap = 0; cap < ARRAY_SIZE( physDev->dev_caps ); cap++) - if (devcap_is_valid( cap )) - physDev->dev_caps[cap] = NtGdiGetDeviceCaps( ref_dc, cap ); - - if (!hdc) NtGdiDeleteObjectApp( ref_dc ); - - NtGdiSetVirtualResolution( dc->hSelf, 0, 0, 0, 0 ); - - ret = dc->hSelf; - release_dc_ptr( dc ); - return ret; -} - /********************************************************************** * CreateEnhMetaFileW (GDI32.@) */ diff --git a/dlls/gdi32/enhmfdrv/objects.c b/dlls/gdi32/enhmfdrv/objects.c index 2243f42a3fc..f1e68be0e1d 100644 --- a/dlls/gdi32/enhmfdrv/objects.c +++ b/dlls/gdi32/enhmfdrv/objects.c @@ -94,15 +94,6 @@ void EMFDC_DeleteObject( HDC hdc, HGDIOBJ obj ) } -/*********************************************************************** - * EMFDRV_SelectBitmap - */ -HBITMAP CDECL EMFDRV_SelectBitmap( PHYSDEV dev, HBITMAP hbitmap ) -{ - return 0; -} - - /*********************************************************************** * EMFDRV_CreateBrushIndirect */ @@ -270,16 +261,6 @@ static BOOL EMFDRV_CreateFontIndirect(PHYSDEV dev, HFONT hFont ) } -/*********************************************************************** - * EMFDRV_SelectFont - */ -HFONT CDECL EMFDRV_SelectFont( PHYSDEV dev, HFONT hFont, UINT *aa_flags ) -{ - *aa_flags = GGO_BITMAP; /* no point in anti-aliasing on metafiles */ - dev = GET_NEXT_PHYSDEV( dev, pSelectFont ); - return dev->funcs->pSelectFont( dev, hFont, aa_flags ); -} - /*********************************************************************** * EMFDC_SelectFont */ diff --git a/include/ntgdi.h b/include/ntgdi.h index 03b476e349c..e1bb6fb901d 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -184,6 +184,7 @@ HBITMAP WINAPI NtGdiCreateBitmap( INT width, INT height, UINT planes, UINT bpp, const void *bits ); HPALETTE WINAPI NtGdiCreateHalftonePalette( HDC hdc ); HBRUSH WINAPI NtGdiCreateHatchBrushInternal( INT style, COLORREF color, BOOL pen ); +HDC WINAPI NtGdiCreateMetafileDC( HDC hdc ); HPALETTE WINAPI NtGdiCreatePaletteInternal( const LOGPALETTE *palette, UINT count ); BOOL WINAPI NtGdiEllipse( HDC hdc, INT left, INT top, INT right, INT bottom ); INT WINAPI NtGdiEndDoc(HDC hdc);