diff --git a/dlls/gdi32/enhmfdrv/dc.c b/dlls/gdi32/enhmfdrv/dc.c index e5d5a2a31a7..1e5eed8c276 100644 --- a/dlls/gdi32/enhmfdrv/dc.c +++ b/dlls/gdi32/enhmfdrv/dc.c @@ -22,14 +22,6 @@ #include #include "enhmfdrv/enhmetafiledrv.h" -/* get the emf physdev from the path physdev */ -static inline PHYSDEV get_emfdev( PHYSDEV path ) -{ - return &CONTAINING_RECORD( path, EMFDRV_PDEVICE, pathdev )->dev; -} - -static const struct gdi_dc_funcs emfpath_driver; - INT CDECL EMFDRV_SaveDC( PHYSDEV dev ) { PHYSDEV next = GET_NEXT_PHYSDEV( dev, pSaveDC ); @@ -580,199 +572,3 @@ INT CDECL EMFDRV_GetDeviceCaps(PHYSDEV dev, INT cap) return physDev->dev_caps[cap]; return 0; } - - -/*********************************************************************** - * emfpathdrv_AbortPath - */ -static BOOL CDECL emfpathdrv_AbortPath( PHYSDEV dev ) -{ - PHYSDEV emfdev = get_emfdev( dev ); - PHYSDEV next = GET_NEXT_PHYSDEV( dev, pAbortPath ); - DC *dc = get_physdev_dc( dev ); - - emfpath_driver.pDeleteDC( pop_dc_driver( dc, &emfpath_driver )); - emfdev->funcs->pAbortPath( emfdev ); - return next->funcs->pAbortPath( next ); -} - -/*********************************************************************** - * emfpathdrv_BeginPath - */ -static BOOL CDECL emfpathdrv_BeginPath( PHYSDEV dev ) -{ - PHYSDEV emfdev = get_emfdev( dev ); - PHYSDEV next = GET_NEXT_PHYSDEV( dev, pBeginPath ); - - return (emfdev->funcs->pBeginPath( emfdev ) && next->funcs->pBeginPath( next )); -} - -/*********************************************************************** - * emfpathdrv_CreateDC - */ -static BOOL CDECL emfpathdrv_CreateDC( PHYSDEV *dev, LPCWSTR driver, LPCWSTR device, - LPCWSTR output, const DEVMODEW *devmode ) -{ - assert( 0 ); /* should never be called */ - return TRUE; -} - -/************************************************************* - * emfpathdrv_DeleteDC - */ -static BOOL CDECL emfpathdrv_DeleteDC( PHYSDEV dev ) -{ - EMFDRV_PDEVICE *physdev = (EMFDRV_PDEVICE *)get_emfdev( dev ); - - physdev->path = FALSE; - return TRUE; -} - -/*********************************************************************** - * emfpathdrv_EndPath - */ -static BOOL CDECL emfpathdrv_EndPath( PHYSDEV dev ) -{ - PHYSDEV emfdev = get_emfdev( dev ); - PHYSDEV next = GET_NEXT_PHYSDEV( dev, pEndPath ); - DC *dc = get_physdev_dc( dev ); - - emfpath_driver.pDeleteDC( pop_dc_driver( dc, &emfpath_driver )); - emfdev->funcs->pEndPath( emfdev ); - return next->funcs->pEndPath( next ); -} - - -static const struct gdi_dc_funcs emfpath_driver = -{ - NULL, /* pAbortDoc */ - emfpathdrv_AbortPath, /* pAbortPath */ - NULL, /* pAlphaBlend */ - NULL, /* pAngleArc */ - NULL, /* pArc */ - NULL, /* pArcTo */ - emfpathdrv_BeginPath, /* pBeginPath */ - NULL, /* pBlendImage */ - NULL, /* pChord */ - NULL, /* pCloseFigure */ - NULL, /* pCreateCompatibleDC */ - emfpathdrv_CreateDC, /* pCreateDC */ - emfpathdrv_DeleteDC, /* pDeleteDC */ - NULL, /* pDeleteObject */ - NULL, /* pDeviceCapabilities */ - NULL, /* pEllipse */ - NULL, /* pEndDoc */ - NULL, /* pEndPage */ - emfpathdrv_EndPath, /* pEndPath */ - NULL, /* pEnumFonts */ - NULL, /* pEnumICMProfiles */ - NULL, /* pExcludeClipRect */ - NULL, /* pExtDeviceMode */ - NULL, /* pExtEscape */ - NULL, /* pExtFloodFill */ - NULL, /* pExtSelectClipRgn */ - NULL, /* pExtTextOut */ - NULL, /* pFillPath */ - NULL, /* pFillRgn */ - NULL, /* pFlattenPath */ - NULL, /* pFontIsLinked */ - NULL, /* pFrameRgn */ - NULL, /* pGdiComment */ - NULL, /* pGetBoundsRect */ - NULL, /* pGetCharABCWidths */ - NULL, /* pGetCharABCWidthsI */ - NULL, /* pGetCharWidth */ - NULL, /* pGetCharWidthInfo */ - NULL, /* 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 */ - NULL, /* pGradientFill */ - NULL, /* pIntersectClipRect */ - NULL, /* pInvertRgn */ - NULL, /* pLineTo */ - NULL, /* pModifyWorldTransform */ - NULL, /* pMoveTo */ - NULL, /* pOffsetClipRgn */ - NULL, /* pOffsetViewportOrg */ - NULL, /* pOffsetWindowOrg */ - NULL, /* pPaintRgn */ - NULL, /* pPatBlt */ - NULL, /* pPie */ - NULL, /* pPolyBezier */ - NULL, /* pPolyBezierTo */ - NULL, /* pPolyDraw */ - NULL, /* pPolyPolygon */ - NULL, /* pPolyPolyline */ - NULL, /* pPolylineTo */ - NULL, /* pPutImage */ - NULL, /* pRealizeDefaultPalette */ - NULL, /* pRealizePalette */ - NULL, /* pRectangle */ - NULL, /* pResetDC */ - NULL, /* pRestoreDC */ - NULL, /* pRoundRect */ - NULL, /* pSaveDC */ - NULL, /* pScaleViewportExt */ - NULL, /* pScaleWindowExt */ - NULL, /* pSelectBitmap */ - NULL, /* pSelectBrush */ - NULL, /* pSelectClipPath */ - NULL, /* pSelectFont */ - NULL, /* pSelectPalette */ - NULL, /* pSelectPen */ - NULL, /* pSetArcDirection */ - NULL, /* pSetBkColor */ - NULL, /* pSetBkMode */ - NULL, /* pSetBoundsRect */ - NULL, /* pSetDCBrushColor */ - NULL, /* pSetDCPenColor */ - NULL, /* pSetDIBitsToDevice */ - NULL, /* pSetDeviceClipping */ - NULL, /* pSetDeviceGammaRamp */ - NULL, /* pSetLayout */ - NULL, /* pSetMapMode */ - NULL, /* pSetMapperFlags */ - NULL, /* pSetPixel */ - NULL, /* pSetPolyFillMode */ - NULL, /* pSetROP2 */ - NULL, /* pSetRelAbs */ - NULL, /* pSetStretchBltMode */ - NULL, /* pSetTextAlign */ - NULL, /* pSetTextCharacterExtra */ - NULL, /* pSetTextColor */ - NULL, /* pSetTextJustification */ - NULL, /* pSetViewportExt */ - NULL, /* pSetViewportOrg */ - NULL, /* pSetWindowExt */ - NULL, /* pSetWindowOrg */ - NULL, /* pSetWorldTransform */ - NULL, /* pStartDoc */ - NULL, /* pStartPage */ - NULL, /* pStretchBlt */ - NULL, /* pStretchDIBits */ - NULL, /* pStrokeAndFillPath */ - NULL, /* pStrokePath */ - NULL, /* pUnrealizePalette */ - NULL, /* pWidenPath */ - NULL, /* pD3DKMTCheckVidPnExclusiveOwnership */ - NULL, /* pD3DKMTSetVidPnSourceOwner */ - NULL, /* wine_get_wgl_driver */ - NULL, /* wine_get_vulkan_driver */ - GDI_PRIORITY_PATH_DRV + 1 /* priority */ -}; diff --git a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h index 6ee721582a0..e9ef3159888 100644 --- a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h +++ b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h @@ -34,7 +34,6 @@ typedef struct { struct gdi_physdev dev; - struct gdi_physdev pathdev; ENHMETAHEADER *emh; /* Pointer to enhanced metafile header */ UINT handles_size, cur_handles; HGDIOBJ *handles;