April 2016 - Wine-commits - list.winehq.org

Alexandre Julliard : Wine release 1.9.9
by Alexandre Julliard 29 Apr '16

29 Apr '16

Module: website Branch: master Commit: 4c109a2b3decf963e78da1a0f5adcadf5e9e6679 URL: http://source.winehq.org/git/website.git/?a=commit;h=4c109a2b3decf963e78da1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Apr 30 01:06:08 2016 +0900 Wine release 1.9.9 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2016043001.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/en/2016043001.xml b/news/en/2016043001.xml new file mode 100644 index 0000000..5b3f144 --- /dev/null +++ b/news/en/2016043001.xml @@ -0,0 +1,16 @@ +<news> +<date>April 30, 2016</date> +<title>Wine 1.9.9 Released</title> +<body> + The Wine development release 1.9.9 is now available. + <a href="{$root}/announce/1.9.9">What's new</a> in this release: +<ul> + <li>More work towards the WineD3D command stream.</li> + <li>Service proxies in WebServices.</li> + <li>Query support in the builtin reg.exe utility.</li> + <li>Improved support for long URLs in WinInet.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/1.9/wine-1.9.9.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Alexandre Julliard : Release 1.9.9.
by Alexandre Julliard 29 Apr '16

29 Apr '16

Module: wine Branch: master Commit: 5e6f35ffbd8795da71c6fd6cb8adc84bf8a36504 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e6f35ffbd8795da71c6fd6cb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Apr 30 01:04:00 2016 +0900 Release 1.9.9. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 796 ++++++++++++++++++++++++++++++++++---------------------------- AUTHORS | 2 + VERSION | 2 +- configure | 18 +- 4 files changed, 451 insertions(+), 367 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5e6f35ffbd8795da71c6f…

1 0

Tag wine-1.9.9 : Alexandre Julliard : Release 1.9.9
by Alexandre Julliard 29 Apr '16

29 Apr '16

Module: wine Branch: refs/tags/wine-1.9.9 Tag: ed9d390efa7ca45d2d4e944aa96ea11575aece7a URL: http://source.winehq.org/git/wine.git/?a=tag;h=ed9d390efa7ca45d2d4e944aa96e… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Apr 30 01:04:00 2016 +0900 Release 1.9.9

1 0

Piotr Caban : gdi32/enhmfdrv: Don' t update document bounds in Rectangle within a path.
by Alexandre Julliard 29 Apr '16

29 Apr '16

Module: wine Branch: master Commit: 44f860daff9b5667bef2128f19fe30013fd3a4e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44f860daff9b5667bef2128f1… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 28 18:47:30 2016 +0200 gdi32/enhmfdrv: Don't update document bounds in Rectangle within a path. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/enhmfdrv/graphics.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/enhmfdrv/graphics.c b/dlls/gdi32/enhmfdrv/graphics.c index 38a71b6..0484ebf 100644 --- a/dlls/gdi32/enhmfdrv/graphics.c +++ b/dlls/gdi32/enhmfdrv/graphics.c @@ -248,6 +248,7 @@ BOOL EMFDRV_Ellipse( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) */ BOOL EMFDRV_Rectangle(PHYSDEV dev, INT left, INT top, INT right, INT bottom) { + EMFDRV_PDEVICE *physDev = (EMFDRV_PDEVICE*) dev; EMRRECTANGLE emr; INT temp; @@ -270,7 +271,8 @@ BOOL EMFDRV_Rectangle(PHYSDEV dev, INT left, INT top, INT right, INT bottom) emr.rclBox.right = right; emr.rclBox.bottom = bottom; - EMFDRV_UpdateBBox( dev, &emr.rclBox ); + if(!physDev->path) + EMFDRV_UpdateBBox( dev, &emr.rclBox ); return EMFDRV_WriteRecord( dev, &emr.emr ); }

1 0

Piotr Caban : gdi32/enhmfdrv: Don' t update document bounds in LineTo within a path.
by Alexandre Julliard 29 Apr '16

29 Apr '16

Module: wine Branch: master Commit: c019c68b451fae067d7348efd362817ba5a0fe47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c019c68b451fae067d7348efd… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 28 18:47:43 2016 +0200 gdi32/enhmfdrv: Don't update document bounds in LineTo within a path. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/enhmfdrv/graphics.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/enhmfdrv/graphics.c b/dlls/gdi32/enhmfdrv/graphics.c index 0484ebf..a5918a9 100644 --- a/dlls/gdi32/enhmfdrv/graphics.c +++ b/dlls/gdi32/enhmfdrv/graphics.c @@ -53,6 +53,7 @@ BOOL EMFDRV_MoveTo(PHYSDEV dev, INT x, INT y) */ BOOL EMFDRV_LineTo( PHYSDEV dev, INT x, INT y ) { + EMFDRV_PDEVICE *physDev = (EMFDRV_PDEVICE*) dev; POINT pt; EMRLINETO emr; RECTL bounds; @@ -72,7 +73,8 @@ BOOL EMFDRV_LineTo( PHYSDEV dev, INT x, INT y ) bounds.right = max(x, pt.x); bounds.bottom = max(y, pt.y); - EMFDRV_UpdateBBox( dev, &bounds ); + if(!physDev->path) + EMFDRV_UpdateBBox( dev, &bounds ); return TRUE; }

1 0

Piotr Caban : gdi32/enhmfdrv: Add enhanced metafile bounds tests.
by Alexandre Julliard 29 Apr '16

29 Apr '16

Module: wine Branch: master Commit: d307bba0f4e6d92eeab7d930b204d1e8194d9058 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d307bba0f4e6d92eeab7d930b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 28 18:47:56 2016 +0200 gdi32/enhmfdrv: Add enhanced metafile bounds tests. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/metafile.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index c61f870..b71249f 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -1856,6 +1856,14 @@ static int compare_emf_bits(const HENHMETAFILE mf, const unsigned char *bits, broken(emh1->nSize - diff_nt4 == emh2->nSize) || broken(emh1->nSize - diff_9x == emh2->nSize), "expected nSize %u, got %u\n", emh1->nSize, emh2->nSize); + ok(emh1->rclBounds.left == emh2->rclBounds.left, "%s: expected rclBounds.left = %d, got %d\n", + desc, emh1->rclBounds.left, emh2->rclBounds.left); + ok(emh1->rclBounds.top == emh2->rclBounds.top, "%s: expected rclBounds.top = %d, got %d\n", + desc, emh1->rclBounds.top, emh2->rclBounds.top); + ok(emh1->rclBounds.right == emh2->rclBounds.right, "%s: expected rclBounds.right = %d, got %d\n", + desc, emh1->rclBounds.right, emh2->rclBounds.right); + ok(emh1->rclBounds.bottom == emh2->rclBounds.bottom, "%s: expected rclBounds.bottom = %d, got %d\n", + desc, emh1->rclBounds.bottom, emh2->rclBounds.bottom); ok(emh1->dSignature == emh2->dSignature, "expected dSignature %u, got %u\n", emh1->dSignature, emh2->dSignature); ok(emh1->nBytes == emh2->nBytes || broken(emh1->nBytes - diff_nt4 == emh2->nBytes) ||

1 0

Piotr Caban : gdi32/enhmfdrv: Don't update document bounds in Arc/Chord/ Pie within a path.
by Alexandre Julliard 29 Apr '16

29 Apr '16

Module: wine Branch: master Commit: c36f3653295110f5d4f92a3db7be10f322448c1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c36f3653295110f5d4f92a3db… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 28 18:48:18 2016 +0200 gdi32/enhmfdrv: Don't update document bounds in Arc/Chord/Pie within a path. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/enhmfdrv/graphics.c | 4 +++- dlls/gdi32/tests/metafile.c | 34 ++++++++++++++++++++++++++-------- 2 files changed, 29 insertions(+), 9 deletions(-) diff --git a/dlls/gdi32/enhmfdrv/graphics.c b/dlls/gdi32/enhmfdrv/graphics.c index a5918a9..19cc423 100644 --- a/dlls/gdi32/enhmfdrv/graphics.c +++ b/dlls/gdi32/enhmfdrv/graphics.c @@ -87,6 +87,7 @@ static BOOL EMFDRV_ArcChordPie( PHYSDEV dev, INT left, INT top, INT right, INT bottom, INT xstart, INT ystart, INT xend, INT yend, DWORD iType ) { + EMFDRV_PDEVICE *physDev = (EMFDRV_PDEVICE*) dev; INT temp, xCentre, yCentre, i; double angleStart, angleEnd; double xinterStart, yinterStart, xinterEnd, yinterEnd; @@ -178,7 +179,8 @@ EMFDRV_ArcChordPie( PHYSDEV dev, INT left, INT top, INT right, INT bottom, } if(!EMFDRV_WriteRecord( dev, &emr.emr )) return FALSE; - EMFDRV_UpdateBBox( dev, &bounds ); + if(!physDev->path) + EMFDRV_UpdateBBox( dev, &bounds ); return TRUE; } diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index b71249f..f8ced6e 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -3583,16 +3583,16 @@ static const unsigned char EMF_PATH_BITS[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0xe6, 0xff, 0xff, 0xff, 0xe6, 0xff, 0xff, 0xff, + 0xef, 0xff, 0xff, 0xff, 0xea, 0xff, 0xff, 0xff, 0x20, 0x45, 0x4d, 0x46, 0x00, 0x00, 0x01, 0x00, - 0xf8, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, + 0x70, 0x01, 0x00, 0x00, 0x0d, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x80, 0x07, 0x00, 0x00, 0xd3, 0x03, 0x00, 0x00, - 0xfc, 0x01, 0x00, 0x00, 0x03, 0x01, 0x00, 0x00, + 0x80, 0x07, 0x00, 0x00, 0x3e, 0x04, 0x00, 0x00, + 0x40, 0x01, 0x00, 0x00, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x60, 0xc0, 0x07, 0x00, - 0xd3, 0xf3, 0x03, 0x00, 0x3b, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0xe2, 0x04, 0x00, + 0x80, 0xa9, 0x03, 0x00, 0x3b, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x1b, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x32, 0x00, 0x00, 0x00, 0x32, 0x00, 0x00, 0x00, 0x36, 0x00, 0x00, 0x00, @@ -3606,7 +3606,22 @@ static const unsigned char EMF_PATH_BITS[] = 0x32, 0x00, 0x00, 0x00, 0x2b, 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, + 0x13, 0x00, 0x00, 0x00, 0x2d, 0x00, 0x00, 0x00, + 0x28, 0x00, 0x00, 0x00, 0x15, 0x00, 0x00, 0x00, + 0x15, 0x00, 0x00, 0x00, 0x26, 0x00, 0x00, 0x00, + 0x1c, 0x00, 0x00, 0x00, 0x27, 0x00, 0x00, 0x00, + 0x1d, 0x00, 0x00, 0x00, 0x15, 0x00, 0x00, 0x00, + 0x15, 0x00, 0x00, 0x00, 0x2e, 0x00, 0x00, 0x00, + 0x28, 0x00, 0x00, 0x00, 0x15, 0x00, 0x00, 0x00, + 0x15, 0x00, 0x00, 0x00, 0x26, 0x00, 0x00, 0x00, + 0x1c, 0x00, 0x00, 0x00, 0x27, 0x00, 0x00, 0x00, + 0x1d, 0x00, 0x00, 0x00, 0x15, 0x00, 0x00, 0x00, + 0x15, 0x00, 0x00, 0x00, 0x2f, 0x00, 0x00, 0x00, + 0x28, 0x00, 0x00, 0x00, 0x15, 0x00, 0x00, 0x00, + 0x15, 0x00, 0x00, 0x00, 0x26, 0x00, 0x00, 0x00, + 0x1c, 0x00, 0x00, 0x00, 0x27, 0x00, 0x00, 0x00, + 0x1d, 0x00, 0x00, 0x00, 0x15, 0x00, 0x00, 0x00, + 0x15, 0x00, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00 @@ -3635,10 +3650,13 @@ static void test_emf_GetPath(void) ret = LineTo(hdcMetafile, 50, 50); ok( ret, "LineTo error %d.\n", GetLastError()); Rectangle(hdcMetafile, 10, 10, 20, 20); + Arc(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); EndPath(hdcMetafile); size = GetPath(hdcMetafile, NULL, NULL, 0); - todo_wine ok( size == 9, "GetPath returned %d.\n", size); + todo_wine ok( size == 40, "GetPath returned %d.\n", size); hemf = CloseEnhMetaFile(hdcMetafile); ok(hemf != 0, "CloseEnhMetaFile error %d\n", GetLastError());

1 0

Piotr Caban : gdi32/enhmfdrv: Don' t update document bounds in Ellipse within a path.
by Alexandre Julliard 29 Apr '16

29 Apr '16

Module: wine Branch: master Commit: 661bc10bfed0d515c837be35b7954fe3f8c58223 URL: http://source.winehq.org/git/wine.git/?a=commit;h=661bc10bfed0d515c837be35b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 28 18:48:32 2016 +0200 gdi32/enhmfdrv: Don't update document bounds in Ellipse within a path. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/enhmfdrv/graphics.c | 4 +++- dlls/gdi32/tests/metafile.c | 10 +++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/enhmfdrv/graphics.c b/dlls/gdi32/enhmfdrv/graphics.c index 19cc423..5b1b0a4 100644 --- a/dlls/gdi32/enhmfdrv/graphics.c +++ b/dlls/gdi32/enhmfdrv/graphics.c @@ -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 ) { + EMFDRV_PDEVICE *physDev = (EMFDRV_PDEVICE*) dev; EMRELLIPSE emr; 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.bottom = bottom; - EMFDRV_UpdateBBox( dev, &emr.rclBox ); + if(!physDev->path) + EMFDRV_UpdateBBox( dev, &emr.rclBox ); return EMFDRV_WriteRecord( dev, &emr.emr ); } diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index f8ced6e..3e989c4 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -3585,7 +3585,7 @@ static const unsigned char EMF_PATH_BITS[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xef, 0xff, 0xff, 0xff, 0xea, 0xff, 0xff, 0xff, 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, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0x1c, 0x00, 0x00, 0x00, 0x27, 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, 0x14, 0x00, 0x00, 0x00, 0x00, 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); Chord(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); 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); ok(hemf != 0, "CloseEnhMetaFile error %d\n", GetLastError());

1 0

Piotr Caban : gdi32/enhmfdrv: Don' t update document bounds in RoundRect within a path.
by Alexandre Julliard 29 Apr '16

29 Apr '16

Module: wine Branch: master Commit: 0d84feaf49bfcce1e82930f4e08b577b537710ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d84feaf49bfcce1e82930f4e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 28 18:48:46 2016 +0200 gdi32/enhmfdrv: Don't update document bounds in RoundRect within a path. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/enhmfdrv/graphics.c | 4 +++- dlls/gdi32/tests/metafile.c | 11 ++++++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/enhmfdrv/graphics.c b/dlls/gdi32/enhmfdrv/graphics.c index 5b1b0a4..98121e5 100644 --- a/dlls/gdi32/enhmfdrv/graphics.c +++ b/dlls/gdi32/enhmfdrv/graphics.c @@ -288,6 +288,7 @@ BOOL EMFDRV_Rectangle(PHYSDEV dev, INT left, INT top, INT right, INT bottom) BOOL EMFDRV_RoundRect( PHYSDEV dev, INT left, INT top, INT right, INT bottom, INT ell_width, INT ell_height ) { + EMFDRV_PDEVICE *physDev = (EMFDRV_PDEVICE*) dev; EMRROUNDRECT emr; INT temp; @@ -310,7 +311,8 @@ BOOL EMFDRV_RoundRect( PHYSDEV dev, INT left, INT top, INT right, emr.szlCorner.cx = ell_width; emr.szlCorner.cy = ell_height; - EMFDRV_UpdateBBox( dev, &emr.rclBox ); + if(!physDev->path) + EMFDRV_UpdateBBox( dev, &emr.rclBox ); return EMFDRV_WriteRecord( dev, &emr.emr ); } diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index 3e989c4..bdc2a0a 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -3585,7 +3585,7 @@ static const unsigned char EMF_PATH_BITS[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xef, 0xff, 0xff, 0xff, 0xea, 0xff, 0xff, 0xff, 0x20, 0x45, 0x4d, 0x46, 0x00, 0x00, 0x01, 0x00, - 0x88, 0x01, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, + 0xa8, 0x01, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x07, 0x00, 0x00, 0x3e, 0x04, 0x00, 0x00, @@ -3624,7 +3624,11 @@ static const unsigned char EMF_PATH_BITS[] = 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, + 0x13, 0x00, 0x00, 0x00, 0x2c, 0x00, 0x00, 0x00, + 0x20, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, + 0x0a, 0x00, 0x00, 0x00, 0x13, 0x00, 0x00, 0x00, + 0x13, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, + 0x05, 0x00, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00 @@ -3657,10 +3661,11 @@ static void test_emf_GetPath(void) Chord(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); + RoundRect(hdcMetafile, 10, 10, 20, 20, 3, 5); EndPath(hdcMetafile); size = GetPath(hdcMetafile, NULL, NULL, 0); - todo_wine ok( size == 53, "GetPath returned %d.\n", size); + todo_wine ok( size == 69, "GetPath returned %d.\n", size); hemf = CloseEnhMetaFile(hdcMetafile); ok(hemf != 0, "CloseEnhMetaFile error %d\n", GetLastError());

1 0

Piotr Caban : gdi32/enhmfdrv: Don' t update document bounds in Polyline within a path.
by Alexandre Julliard 29 Apr '16

29 Apr '16

Module: wine Branch: master Commit: 67e26bec8dc5d0ca4d1c60772e57a5d74890b490 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67e26bec8dc5d0ca4d1c60772… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 28 18:48:58 2016 +0200 gdi32/enhmfdrv: Don't update document bounds in Polyline within a path. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/enhmfdrv/graphics.c | 36 +++++++++++++++++++++++++++--------- dlls/gdi32/tests/metafile.c | 20 ++++++++++++++------ 2 files changed, 41 insertions(+), 15 deletions(-) diff --git a/dlls/gdi32/enhmfdrv/graphics.c b/dlls/gdi32/enhmfdrv/graphics.c index 98121e5..1b5d26d 100644 --- a/dlls/gdi32/enhmfdrv/graphics.c +++ b/dlls/gdi32/enhmfdrv/graphics.c @@ -347,6 +347,7 @@ COLORREF EMFDRV_SetPixel( PHYSDEV dev, INT x, INT y, COLORREF color ) static BOOL EMFDRV_Polylinegon( PHYSDEV dev, const POINT* pt, INT count, DWORD iType ) { + EMFDRV_PDEVICE *physDev = (EMFDRV_PDEVICE*) dev; EMRPOLYLINE *emr; DWORD size; INT i; @@ -358,6 +359,17 @@ EMFDRV_Polylinegon( PHYSDEV dev, const POINT* pt, INT count, DWORD iType ) emr->emr.iType = iType; emr->emr.nSize = size; + emr->cptl = count; + memcpy(emr->aptl, pt, count * sizeof(POINTL)); + + if(physDev->path) { + emr->rclBounds.left = emr->rclBounds.top = 0; + emr->rclBounds.right = emr->rclBounds.bottom = -1; + ret = EMFDRV_WriteRecord( dev, &emr->emr ); + HeapFree( GetProcessHeap(), 0, emr ); + return ret; + } + if(iType == EMR_POLYBEZIERTO) { POINT cur_pt; @@ -384,9 +396,6 @@ EMFDRV_Polylinegon( PHYSDEV dev, const POINT* pt, INT count, DWORD iType ) emr->rclBounds.bottom = pt[i].y; } - emr->cptl = count; - memcpy(emr->aptl, pt, count * sizeof(POINTL)); - ret = EMFDRV_WriteRecord( dev, &emr->emr ); if(ret) EMFDRV_UpdateBBox( dev, &emr->rclBounds ); @@ -406,6 +415,7 @@ EMFDRV_Polylinegon( PHYSDEV dev, const POINT* pt, INT count, DWORD iType ) static BOOL EMFDRV_Polylinegon16( PHYSDEV dev, const POINT* pt, INT count, DWORD iType ) { + EMFDRV_PDEVICE *physDev = (EMFDRV_PDEVICE*) dev; EMRPOLYLINE16 *emr; DWORD size; INT i; @@ -424,6 +434,20 @@ EMFDRV_Polylinegon16( PHYSDEV dev, const POINT* pt, INT count, DWORD iType ) emr->emr.iType = iType; emr->emr.nSize = size; + emr->cpts = count; + for(i = 0; i < count; i++ ) { + emr->apts[i].x = pt[i].x; + emr->apts[i].y = pt[i].y; + } + + if(physDev->path) { + emr->rclBounds.left = emr->rclBounds.top = 0; + emr->rclBounds.right = emr->rclBounds.bottom = -1; + ret = EMFDRV_WriteRecord( dev, &emr->emr ); + HeapFree( GetProcessHeap(), 0, emr ); + return ret; + } + if(iType == EMR_POLYBEZIERTO16) { POINT cur_pt; @@ -450,12 +474,6 @@ EMFDRV_Polylinegon16( PHYSDEV dev, const POINT* pt, INT count, DWORD iType ) emr->rclBounds.bottom = pt[i].y; } - emr->cpts = count; - for(i = 0; i < count; i++ ) { - emr->apts[i].x = pt[i].x; - emr->apts[i].y = pt[i].y; - } - ret = EMFDRV_WriteRecord( dev, &emr->emr ); if(ret) EMFDRV_UpdateBBox( dev, &emr->rclBounds ); diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index bdc2a0a..64ad004 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -3585,7 +3585,7 @@ static const unsigned char EMF_PATH_BITS[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xef, 0xff, 0xff, 0xff, 0xea, 0xff, 0xff, 0xff, 0x20, 0x45, 0x4d, 0x46, 0x00, 0x00, 0x01, 0x00, - 0xa8, 0x01, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, + 0xd4, 0x01, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x07, 0x00, 0x00, 0x3e, 0x04, 0x00, 0x00, @@ -3628,14 +3628,21 @@ static const unsigned char EMF_PATH_BITS[] = 0x20, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, 0x13, 0x00, 0x00, 0x00, 0x13, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, - 0x05, 0x00, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x00, - 0x08, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, - 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x10, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00 + 0x05, 0x00, 0x00, 0x00, 0x57, 0x00, 0x00, 0x00, + 0x2c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0x04, 0x00, 0x00, 0x00, + 0x0a, 0x00, 0x0a, 0x00, 0x14, 0x00, 0x0a, 0x00, + 0x0a, 0x00, 0x14, 0x00, 0x14, 0x00, 0x14, 0x00, + 0x3c, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, + 0x0e, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, + 0x14, 0x00, 0x00, 0x00 }; static void test_emf_GetPath(void) { + POINT pts[4] = {{10, 10}, {20, 10}, {10, 20}, {20, 20}}; HDC hdcMetafile; HENHMETAFILE hemf; BOOL ret; @@ -3662,10 +3669,11 @@ static void test_emf_GetPath(void) Pie(hdcMetafile, 21, 21, 39, 29, 39, 29, 21, 21); Ellipse(hdcMetafile, 10, 10, 20, 20); RoundRect(hdcMetafile, 10, 10, 20, 20, 3, 5); + Polyline(hdcMetafile, pts, 4); EndPath(hdcMetafile); size = GetPath(hdcMetafile, NULL, NULL, 0); - todo_wine ok( size == 69, "GetPath returned %d.\n", size); + todo_wine ok( size == 73, "GetPath returned %d.\n", size); hemf = CloseEnhMetaFile(hdcMetafile); ok(hemf != 0, "CloseEnhMetaFile error %d\n", GetLastError());

1 0