gdi32/enhmfdrv: Don't update document bounds in Ellipse within a path.
Signed-off-by: Piotr Caban <piotr@codeweavers.com> Signed-off-by: Huw Davies <huw@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
c36f365329
commit
661bc10bfe
|
@ -221,6 +221,7 @@ BOOL EMFDRV_Chord( PHYSDEV dev, INT left, INT top, INT right, INT bottom,
|
||||||
*/
|
*/
|
||||||
BOOL EMFDRV_Ellipse( PHYSDEV dev, INT left, INT top, INT right, INT bottom )
|
BOOL EMFDRV_Ellipse( PHYSDEV dev, INT left, INT top, INT right, INT bottom )
|
||||||
{
|
{
|
||||||
|
EMFDRV_PDEVICE *physDev = (EMFDRV_PDEVICE*) dev;
|
||||||
EMRELLIPSE emr;
|
EMRELLIPSE emr;
|
||||||
INT temp;
|
INT temp;
|
||||||
|
|
||||||
|
@ -243,7 +244,8 @@ BOOL EMFDRV_Ellipse( PHYSDEV dev, INT left, INT top, INT right, INT bottom )
|
||||||
emr.rclBox.right = right;
|
emr.rclBox.right = right;
|
||||||
emr.rclBox.bottom = bottom;
|
emr.rclBox.bottom = bottom;
|
||||||
|
|
||||||
EMFDRV_UpdateBBox( dev, &emr.rclBox );
|
if(!physDev->path)
|
||||||
|
EMFDRV_UpdateBBox( dev, &emr.rclBox );
|
||||||
return EMFDRV_WriteRecord( dev, &emr.emr );
|
return EMFDRV_WriteRecord( dev, &emr.emr );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -3585,7 +3585,7 @@ static const unsigned char EMF_PATH_BITS[] =
|
||||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||||
0xef, 0xff, 0xff, 0xff, 0xea, 0xff, 0xff, 0xff,
|
0xef, 0xff, 0xff, 0xff, 0xea, 0xff, 0xff, 0xff,
|
||||||
0x20, 0x45, 0x4d, 0x46, 0x00, 0x00, 0x01, 0x00,
|
0x20, 0x45, 0x4d, 0x46, 0x00, 0x00, 0x01, 0x00,
|
||||||
0x70, 0x01, 0x00, 0x00, 0x0d, 0x00, 0x00, 0x00,
|
0x88, 0x01, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00,
|
||||||
0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||||
0x80, 0x07, 0x00, 0x00, 0x3e, 0x04, 0x00, 0x00,
|
0x80, 0x07, 0x00, 0x00, 0x3e, 0x04, 0x00, 0x00,
|
||||||
|
@ -3621,7 +3621,10 @@ static const unsigned char EMF_PATH_BITS[] =
|
||||||
0x15, 0x00, 0x00, 0x00, 0x26, 0x00, 0x00, 0x00,
|
0x15, 0x00, 0x00, 0x00, 0x26, 0x00, 0x00, 0x00,
|
||||||
0x1c, 0x00, 0x00, 0x00, 0x27, 0x00, 0x00, 0x00,
|
0x1c, 0x00, 0x00, 0x00, 0x27, 0x00, 0x00, 0x00,
|
||||||
0x1d, 0x00, 0x00, 0x00, 0x15, 0x00, 0x00, 0x00,
|
0x1d, 0x00, 0x00, 0x00, 0x15, 0x00, 0x00, 0x00,
|
||||||
0x15, 0x00, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x00,
|
0x15, 0x00, 0x00, 0x00, 0x2a, 0x00, 0x00, 0x00,
|
||||||
|
0x18, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00,
|
||||||
|
0x0a, 0x00, 0x00, 0x00, 0x13, 0x00, 0x00, 0x00,
|
||||||
|
0x13, 0x00, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x00,
|
||||||
0x08, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00,
|
0x08, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00,
|
||||||
0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||||
0x10, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00
|
0x10, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00
|
||||||
|
@ -3653,10 +3656,11 @@ static void test_emf_GetPath(void)
|
||||||
Arc(hdcMetafile, 21, 21, 39, 29, 39, 29, 21, 21);
|
Arc(hdcMetafile, 21, 21, 39, 29, 39, 29, 21, 21);
|
||||||
Chord(hdcMetafile, 21, 21, 39, 29, 39, 29, 21, 21);
|
Chord(hdcMetafile, 21, 21, 39, 29, 39, 29, 21, 21);
|
||||||
Pie(hdcMetafile, 21, 21, 39, 29, 39, 29, 21, 21);
|
Pie(hdcMetafile, 21, 21, 39, 29, 39, 29, 21, 21);
|
||||||
|
Ellipse(hdcMetafile, 10, 10, 20, 20);
|
||||||
EndPath(hdcMetafile);
|
EndPath(hdcMetafile);
|
||||||
|
|
||||||
size = GetPath(hdcMetafile, NULL, NULL, 0);
|
size = GetPath(hdcMetafile, NULL, NULL, 0);
|
||||||
todo_wine ok( size == 40, "GetPath returned %d.\n", size);
|
todo_wine ok( size == 53, "GetPath returned %d.\n", size);
|
||||||
|
|
||||||
hemf = CloseEnhMetaFile(hdcMetafile);
|
hemf = CloseEnhMetaFile(hdcMetafile);
|
||||||
ok(hemf != 0, "CloseEnhMetaFile error %d\n", GetLastError());
|
ok(hemf != 0, "CloseEnhMetaFile error %d\n", GetLastError());
|
||||||
|
|
Loading…
Reference in New Issue