Skip to content

W
wine-cw
Commit 1323ff84 authored by Jacek Caban's avatar Jacek Caban Committed by Alexandre Julliard
Browse files
Options

gdi32: Use struct emf for EMF helpers.

Signed-off-by: 's avatarJacek Caban <jacek@codeweavers.com> Signed-off-by: 's avatarHuw Davies <huw@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 56efbd02
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 140 additions and 146 deletions
dlls/gdi32/enhmfdrv/bitblt.c
View file @ 1323ff84
......@@ -28,7 +28,7 @@
#include "enhmetafiledrv.h"
/* Generate an EMRBITBLT, EMRSTRETCHBLT or EMRALPHABLEND record depending on the type parameter */
static BOOL emfdrv_stretchblt( PHYSDEV dev_dst, INT x_dst, INT y_dst, INT width_dst, INT height_dst,
static BOOL emfdrv_stretchblt( struct emf *emf, INT x_dst, INT y_dst, INT width_dst, INT height_dst,
HDC hdc_src, INT x_src, INT y_src, INT width_src, INT height_src,
DWORD rop, DWORD type )
{
......@@ -147,8 +147,8 @@ static BOOL emfdrv_stretchblt( PHYSDEV dev_dst, INT x_dst, INT y_dst, INT width_
bmi, DIB_RGB_COLORS );
if (ret)
{
ret = EMFDRV_WriteRecord( dev_dst, (EMR *)emr );
if (ret) EMFDRV_UpdateBBox( dev_dst, &emr->rclBounds );
ret = emfdc_record( emf, (EMR *)emr );
if (ret) emfdc_update_bounds( emf, &emr->rclBounds );
}
err:
......@@ -198,9 +198,9 @@ BOOL EMFDC_PatBlt( DC_ATTR *dc_attr, INT left, INT top, INT width, INT height, D
emr.offBitsSrc = 0;
emr.cbBitsSrc = 0;
ret = EMFDRV_WriteRecord( &emf->dev, &emr.emr );
ret = emfdc_record( emf, &emr.emr );
if(ret)
EMFDRV_UpdateBBox( &emf->dev, &emr.rclBounds );
emfdc_update_bounds( emf, &emr.rclBounds );
return ret;
}
......@@ -275,9 +275,9 @@ BOOL EMFDC_StretchDIBits( DC_ATTR *dc_attr, INT x_dst, INT y_dst, INT width_dst,
emr->rclBounds.bottom = y_dst + height_dst;
/* save the record we just created */
ret = EMFDRV_WriteRecord( dc_attr->emf, &emr->emr );
ret = emfdc_record( dc_attr->emf, &emr->emr );
if(ret)
EMFDRV_UpdateBBox( dc_attr->emf, &emr->rclBounds );
emfdc_update_bounds( dc_attr->emf, &emr->rclBounds );
HeapFree(GetProcessHeap(), 0, emr);
......@@ -318,8 +318,8 @@ BOOL EMFDC_SetDIBitsToDevice( DC_ATTR *dc_attr, INT x_dst, INT y_dst, DWORD widt
memcpy((BYTE*)pEMR + pEMR->offBmiSrc, info, bmiSize);
memcpy((BYTE*)pEMR + pEMR->offBitsSrc, bits, info->bmiHeader.biSizeImage);
if ((ret = EMFDRV_WriteRecord( dc_attr->emf, (EMR*)pEMR )))
EMFDRV_UpdateBBox( dc_attr->emf, &pEMR->rclBounds );
if ((ret = emfdc_record( dc_attr->emf, (EMR*)pEMR )))
emfdc_update_bounds( dc_attr->emf, &pEMR->rclBounds );
HeapFree( GetProcessHeap(), 0, pEMR);
return ret;
......
dlls/gdi32/enhmfdrv/enhmetafiledrv.h
View file @ 1323ff84
......@@ -31,7 +31,7 @@
/* Enhanced Metafile driver physical DC */
typedef struct
typedef struct emf
{
struct gdi_physdev dev;
ENHMETAHEADER *emh; /* Pointer to enhanced metafile header */
......@@ -50,9 +50,9 @@ static inline EMFDRV_PDEVICE *get_emf_physdev( PHYSDEV dev )
return CONTAINING_RECORD( dev, EMFDRV_PDEVICE, dev );
}
extern BOOL EMFDRV_WriteRecord( PHYSDEV dev, EMR *emr ) DECLSPEC_HIDDEN;
extern void EMFDRV_UpdateBBox( PHYSDEV dev, RECTL *rect ) DECLSPEC_HIDDEN;
extern DWORD EMFDRV_CreateBrushIndirect( PHYSDEV dev, HBRUSH hBrush ) DECLSPEC_HIDDEN;
extern BOOL emfdc_record( struct emf *emf, EMR *emr ) DECLSPEC_HIDDEN;
extern void emfdc_update_bounds( struct emf *emf, RECTL *rect ) DECLSPEC_HIDDEN;
extern DWORD emfdc_create_brush( struct emf *emf, HBRUSH hBrush ) DECLSPEC_HIDDEN;
#define HANDLE_LIST_INC 20
......
dlls/gdi32/enhmfdrv/graphics.c
View file @ 1323ff84
......@@ -92,9 +92,9 @@ static void get_points_bounds( RECTL *bounds, const POINT *pts, UINT count, DC_A
}
/* helper for path stroke and fill functions */
static BOOL emfdrv_stroke_and_fill_path( PHYSDEV dev, INT type )
static BOOL emfdrv_stroke_and_fill_path( struct emf *emf, INT type )
{
DC *dc = get_physdev_dc( dev );
DC *dc = get_physdev_dc( &emf->dev );
EMRSTROKEANDFILLPATH emr;
struct gdi_path *path;
POINT *points;
......@@ -111,9 +111,9 @@ static BOOL emfdrv_stroke_and_fill_path( PHYSDEV dev, INT type )
}
else emr.rclBounds = empty_bounds;
if (!EMFDRV_WriteRecord( dev, &emr.emr )) return FALSE;
if (!emfdc_record( emf, &emr.emr )) return FALSE;
if (!path) return FALSE;
EMFDRV_UpdateBBox( dev, &emr.rclBounds );
emfdc_update_bounds( emf, &emr.rclBounds );
return TRUE;
}
......@@ -130,7 +130,7 @@ BOOL EMFDC_MoveTo( DC_ATTR *dc_attr, INT x, INT y )
emr.ptl.x = x;
emr.ptl.y = y;
return EMFDRV_WriteRecord( &emf->dev, &emr.emr );
return emfdc_record( emf, &emr.emr );
}
/***********************************************************************
......@@ -144,7 +144,7 @@ BOOL EMFDC_LineTo( DC_ATTR *dc_attr, INT x, INT y )
emr.emr.nSize = sizeof(emr);
emr.ptl.x = x;
emr.ptl.y = y;
return EMFDRV_WriteRecord( dc_attr->emf, &emr.emr );
return emfdc_record( dc_attr->emf, &emr.emr );
}
......@@ -179,7 +179,7 @@ BOOL EMFDC_ArcChordPie( DC_ATTR *dc_attr, INT left, INT top, INT right, INT bott
emr.ptlStart.y = ystart;
emr.ptlEnd.x = xend;
emr.ptlEnd.y = yend;
return EMFDRV_WriteRecord( &emf->dev, &emr.emr );
return emfdc_record( emf, &emr.emr );
}
/***********************************************************************
......@@ -197,7 +197,7 @@ BOOL EMFDC_AngleArc( DC_ATTR *dc_attr, INT x, INT y, DWORD radius, FLOAT start,
emr.eStartAngle = start;
emr.eSweepAngle = sweep;
return EMFDRV_WriteRecord( dc_attr->emf, &emr.emr );
return emfdc_record( dc_attr->emf, &emr.emr );
}
/***********************************************************************
......@@ -222,7 +222,7 @@ BOOL EMFDC_Ellipse( DC_ATTR *dc_attr, INT left, INT top, INT right, INT bottom )
emr.rclBox.bottom--;
}
return EMFDRV_WriteRecord( &emf->dev, &emr.emr );
return emfdc_record( emf, &emr.emr );
}
/***********************************************************************
......@@ -247,7 +247,7 @@ BOOL EMFDC_Rectangle( DC_ATTR *dc_attr, INT left, INT top, INT right, INT bottom
emr.rclBox.bottom--;
}
return EMFDRV_WriteRecord( &emf->dev, &emr.emr );
return emfdc_record( emf, &emr.emr );
}
/***********************************************************************
......@@ -275,7 +275,7 @@ BOOL EMFDC_RoundRect( DC_ATTR *dc_attr, INT left, INT top, INT right,
emr.rclBox.bottom--;
}
return EMFDRV_WriteRecord( &emf->dev, &emr.emr );
return emfdc_record( emf, &emr.emr );
}
/***********************************************************************
......@@ -290,7 +290,7 @@ BOOL EMFDC_SetPixel( DC_ATTR *dc_attr, INT x, INT y, COLORREF color )
emr.ptlPixel.x = x;
emr.ptlPixel.y = y;
emr.crColor = color;
return EMFDRV_WriteRecord( dc_attr->emf, &emr.emr );
return emfdc_record( dc_attr->emf, &emr.emr );
}
/**********************************************************************
......@@ -320,9 +320,9 @@ static BOOL EMFDC_Polylinegon( DC_ATTR *dc_attr, const POINT *points, INT count,
else
emr->rclBounds = empty_bounds;
ret = EMFDRV_WriteRecord( &emf->dev, &emr->emr );
ret = emfdc_record( emf, &emr->emr );
if (ret && !emf->path)
EMFDRV_UpdateBBox( &emf->dev, &emr->rclBounds );
emfdc_update_bounds( emf, &emr->rclBounds );
HeapFree( GetProcessHeap(), 0, emr );
return ret;
}
......@@ -413,14 +413,14 @@ static BOOL EMFDC_PolyPolylinegon( EMFDRV_PDEVICE *emf, const POINT *pt, const I
store_points( (POINTL *)(emr->aPolyCounts + polys), pt, cptl, use_small_emr );
}
ret = EMFDRV_WriteRecord( &emf->dev, &emr->emr );
ret = emfdc_record( emf, &emr->emr );
if(ret && !bounds_valid)
{
ret = FALSE;
SetLastError( ERROR_INVALID_PARAMETER );
}
if(ret && !emf->path)
EMFDRV_UpdateBBox( &emf->dev, &emr->rclBounds );
emfdc_update_bounds( emf, &emr->rclBounds );
HeapFree( GetProcessHeap(), 0, emr );
return ret;
}
......@@ -471,8 +471,8 @@ BOOL EMFDC_PolyDraw( DC_ATTR *dc_attr, const POINT *pts, const BYTE *types, DWOR
else
emr->rclBounds = empty_bounds;
ret = EMFDRV_WriteRecord( &emf->dev, &emr->emr );
if (ret && !emf->path) EMFDRV_UpdateBBox( &emf->dev, &emr->rclBounds );
ret = emfdc_record( emf, &emr->emr );
if (ret && !emf->path) emfdc_update_bounds( emf, &emr->rclBounds );
HeapFree( GetProcessHeap(), 0, emr );
return ret;
}
......@@ -492,7 +492,7 @@ BOOL EMFDC_ExtFloodFill( DC_ATTR *dc_attr, INT x, INT y, COLORREF color, UINT fi
emr.crColor = color;
emr.iMode = fill_type;
return EMFDRV_WriteRecord( dc_attr->emf, &emr.emr );
return emfdc_record( dc_attr->emf, &emr.emr );
}
......@@ -506,7 +506,7 @@ BOOL EMFDC_FillRgn( DC_ATTR *dc_attr, HRGN hrgn, HBRUSH hbrush )
DWORD size, rgnsize, index;
BOOL ret;
index = EMFDRV_CreateBrushIndirect( &emf->dev, hbrush );
index = emfdc_create_brush( emf, hbrush );
if(!index) return FALSE;
rgnsize = NtGdiGetRegionData( hrgn, 0, NULL );
......@@ -524,9 +524,9 @@ BOOL EMFDC_FillRgn( DC_ATTR *dc_attr, HRGN hrgn, HBRUSH hbrush )
emr->cbRgnData = rgnsize;
emr->ihBrush = index;
ret = EMFDRV_WriteRecord( &emf->dev, &emr->emr );
ret = emfdc_record( emf, &emr->emr );
if(ret)
EMFDRV_UpdateBBox( &emf->dev, &emr->rclBounds );
emfdc_update_bounds( emf, &emr->rclBounds );
HeapFree( GetProcessHeap(), 0, emr );
return ret;
}
......@@ -542,7 +542,7 @@ BOOL EMFDC_FrameRgn( DC_ATTR *dc_attr, HRGN hrgn, HBRUSH hbrush, INT width, INT
DWORD size, rgnsize, index;
BOOL ret;
index = EMFDRV_CreateBrushIndirect( &emf->dev, hbrush );
index = emfdc_create_brush( emf, hbrush );
if(!index) return FALSE;
rgnsize = NtGdiGetRegionData( hrgn, 0, NULL );
......@@ -562,9 +562,9 @@ BOOL EMFDC_FrameRgn( DC_ATTR *dc_attr, HRGN hrgn, HBRUSH hbrush, INT width, INT
emr->szlStroke.cx = width;
emr->szlStroke.cy = height;
ret = EMFDRV_WriteRecord( &emf->dev, &emr->emr );
ret = emfdc_record( emf, &emr->emr );
if(ret)
EMFDRV_UpdateBBox( &emf->dev, &emr->rclBounds );
emfdc_update_bounds( emf, &emr->rclBounds );
HeapFree( GetProcessHeap(), 0, emr );
return ret;
}
......@@ -574,13 +574,12 @@ BOOL EMFDC_FrameRgn( DC_ATTR *dc_attr, HRGN hrgn, HBRUSH hbrush, INT width, INT
*
* Helper for EMFDRV_{Paint|Invert}Rgn
*/
static BOOL EMF_PaintInvertRgn( PHYSDEV dev, HRGN hrgn, DWORD iType )
static BOOL EMF_PaintInvertRgn( struct emf *emf, HRGN hrgn, DWORD iType )
{
EMRINVERTRGN *emr;
DWORD size, rgnsize;
BOOL ret;
rgnsize = NtGdiGetRegionData( hrgn, 0, NULL );
size = rgnsize + offsetof(EMRINVERTRGN,RgnData);
emr = HeapAlloc( GetProcessHeap(), 0, size );
......@@ -595,9 +594,9 @@ static BOOL EMF_PaintInvertRgn( PHYSDEV dev, HRGN hrgn, DWORD iType )
emr->rclBounds.bottom = ((RGNDATA *)&emr->RgnData)->rdh.rcBound.bottom - 1;
emr->cbRgnData = rgnsize;
ret = EMFDRV_WriteRecord( dev, &emr->emr );
ret = emfdc_record( emf, &emr->emr );
if(ret)
EMFDRV_UpdateBBox( dev, &emr->rclBounds );
emfdc_update_bounds( emf, &emr->rclBounds );
HeapFree( GetProcessHeap(), 0, emr );
return ret;
}
......@@ -752,10 +751,10 @@ BOOL EMFDC_ExtTextOut( DC_ATTR *dc_attr, INT x, INT y, UINT flags, const RECT *l
pemr->rclBounds.bottom = y + textHeight + 1;
}
}
EMFDRV_UpdateBBox( &emf->dev, &pemr->rclBounds );
emfdc_update_bounds( emf, &pemr->rclBounds );
no_bounds:
ret = EMFDRV_WriteRecord( &emf->dev, &pemr->emr );
ret = emfdc_record( emf, &pemr->emr );
HeapFree( GetProcessHeap(), 0, pemr );
return ret;
}
......@@ -808,8 +807,8 @@ BOOL EMFDC_GradientFill( DC_ATTR *dc_attr, TRIVERTEX *vert_array, ULONG nvert,
memcpy( emr->Ver, vert_array, nvert * sizeof(vert_array[0]) );
memcpy( emr->Ver + nvert, pts, num_pts * sizeof(pts[0]) );
EMFDRV_UpdateBBox( dc_attr->emf, &emr->rclBounds );
ret = EMFDRV_WriteRecord( dc_attr->emf, &emr->emr );
emfdc_update_bounds( dc_attr->emf, &emr->rclBounds );
ret = emfdc_record( dc_attr->emf, &emr->emr );
HeapFree( GetProcessHeap(), 0, emr );
return ret;
}
......
dlls/gdi32/enhmfdrv/init.c
View file @ 1323ff84
......@@ -51,44 +51,41 @@ void EMFDC_DeleteDC( DC_ATTR *dc_attr )
*
* Warning: this function can change the pointer to the metafile header.
*/
BOOL EMFDRV_WriteRecord( PHYSDEV dev, EMR *emr )
BOOL emfdc_record( struct emf *emf, EMR *emr )
{
DWORD len, size;
ENHMETAHEADER *emh;
EMFDRV_PDEVICE *physDev = get_emf_physdev( dev );
TRACE("record %d, size %d %s\n",
emr->iType, emr->nSize, physDev->hFile ? "(to disk)" : "");
TRACE( "record %d, size %d\n", emr->iType, emr->nSize );
assert( !(emr->nSize & 3) );
physDev->emh->nBytes += emr->nSize;
physDev->emh->nRecords++;
emf->emh->nBytes += emr->nSize;
emf->emh->nRecords++;
size = HeapSize(GetProcessHeap(), 0, physDev->emh);
len = physDev->emh->nBytes;
if (len > size) {
size = HeapSize( GetProcessHeap(), 0, emf->emh );
len = emf->emh->nBytes;
if (len > size)
{
size += (size / 2) + emr->nSize;
emh = HeapReAlloc(GetProcessHeap(), 0, physDev->emh, size);
emh = HeapReAlloc( GetProcessHeap(), 0, emf->emh, size );
if (!emh) return FALSE;
physDev->emh = emh;
emf->emh = emh;
}
memcpy((CHAR *)physDev->emh + physDev->emh->nBytes - emr->nSize, emr,
emr->nSize);
memcpy( (char *)emf->emh + emf->emh->nBytes - emr->nSize, emr, emr->nSize );
return TRUE;
}
/******************************************************************
* EMFDRV_UpdateBBox
* emfdc_update_bounds
*/
void EMFDRV_UpdateBBox( PHYSDEV dev, RECTL *rect )
void emfdc_update_bounds( struct emf *emf, RECTL *rect )
{
EMFDRV_PDEVICE *physDev = get_emf_physdev( dev );
RECTL *bounds = &physDev->dc_attr->emf_bounds;
RECTL *bounds = &emf->dc_attr->emf_bounds;
RECTL vportRect = *rect;
LPtoDP( dev->hdc, (LPPOINT)&vportRect, 2 );
LPtoDP( emf->dev.hdc, (POINT *)&vportRect, 2 );
/* The coordinate systems may be mirrored
(LPtoDP handles points, not rectangles) */
......@@ -274,7 +271,7 @@ HDC WINAPI CreateEnhMetaFileW(
HENHMETAFILE WINAPI CloseEnhMetaFile(HDC hdc) /* [in] metafile DC */
{
HENHMETAFILE hmf;
EMFDRV_PDEVICE *emf;
struct emf *emf;
DC_ATTR *dc_attr;
EMREOF emr;
HANDLE hMapping = 0;
......@@ -295,7 +292,7 @@ HENHMETAFILE WINAPI CloseEnhMetaFile(HDC hdc) /* [in] metafile DC */
emr.nPalEntries = 0;
emr.offPalEntries = FIELD_OFFSET(EMREOF, nSizeLast);
emr.nSizeLast = emr.emr.nSize;
EMFDRV_WriteRecord( &emf->dev, &emr.emr );
emfdc_record( emf, &emr.emr );
emf->emh->rclBounds = dc_attr->emf_bounds;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment