wine-commits April 2016

wine-commits@winehq.org

2 participants
750 discussions

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 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: 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 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: 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: Add ExtTextOut tests with unmatched BeginPath/EndPath calls.
by Alexandre Julliard 29 Apr '16

29 Apr '16

Module: wine Branch: master Commit: 3a12eb2083cced856f99fd93ab9dc5f3b0f2d5cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a12eb2083cced856f99fd93a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 28 18:47:20 2016 +0200 gdi32/enhmfdrv: Add ExtTextOut tests with unmatched BeginPath/EndPath calls. 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 | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index ebe7e02..c61f870 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -240,6 +240,16 @@ static void test_ExtTextOut(void) ret = ExtTextOutA(hdcMetafile, 0, 40, 0, NULL, text, lstrlenA(text), NULL); ok( ret, "ExtTextOutA error %d\n", GetLastError()); + /* 4. test with unmatched BeginPath/EndPath calls */ + ret = BeginPath(hdcMetafile); + ok( ret, "BeginPath error %d\n", GetLastError()); + ret = BeginPath(hdcMetafile); + ok( ret, "BeginPath error %d\n", GetLastError()); + ret = EndPath(hdcMetafile); + ok( ret, "BeginPath error %d\n", GetLastError()); + ret = ExtTextOutA(hdcMetafile, 0, 60, 0, NULL, text, lstrlenA(text), NULL); + ok( ret, "ExtTextOutA error %d\n", GetLastError()); + hFont = SelectObject(hdcMetafile, hFont); ret = DeleteObject(hFont); ok( ret, "DeleteObject error %d\n", GetLastError());

1 0

Piotr Caban : gdi32/enhmfdrv: Always set ExtTextOut bounding rect if we' re not inside path bracket.
by Alexandre Julliard 29 Apr '16

29 Apr '16

Module: wine Branch: master Commit: 269b2519a7ac17a6f7a832cc39c2b3a8c965c773 URL: http://source.winehq.org/git/wine.git/?a=commit;h=269b2519a7ac17a6f7a832cc3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 28 18:47:14 2016 +0200 gdi32/enhmfdrv: Always set ExtTextOut bounding rect if we're not inside path bracket. 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/dc.c | 6 ++++++ dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 1 + dlls/gdi32/enhmfdrv/graphics.c | 4 +++- dlls/gdi32/enhmfdrv/init.c | 1 + dlls/gdi32/tests/metafile.c | 11 +++++++++++ 5 files changed, 22 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/enhmfdrv/dc.c b/dlls/gdi32/enhmfdrv/dc.c index cbf3f5c..8525067 100644 --- a/dlls/gdi32/enhmfdrv/dc.c +++ b/dlls/gdi32/enhmfdrv/dc.c @@ -420,8 +420,11 @@ BOOL EMFDRV_AbortPath( PHYSDEV dev ) BOOL EMFDRV_BeginPath( PHYSDEV dev ) { + EMFDRV_PDEVICE *physDev = (EMFDRV_PDEVICE*) dev; EMRBEGINPATH emr; + physDev->path = TRUE; + emr.emr.iType = EMR_BEGINPATH; emr.emr.nSize = sizeof(emr); @@ -440,8 +443,11 @@ BOOL EMFDRV_CloseFigure( PHYSDEV dev ) BOOL EMFDRV_EndPath( PHYSDEV dev ) { + EMFDRV_PDEVICE *physDev = (EMFDRV_PDEVICE*) dev; EMRENDPATH emr; + physDev->path = FALSE; + emr.emr.iType = EMR_ENDPATH; emr.emr.nSize = sizeof(emr); diff --git a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h index 721c82f..8aa1b2d 100644 --- a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h +++ b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h @@ -42,6 +42,7 @@ typedef struct HDC ref_dc; /* Reference device */ HDC screen_dc; /* Screen DC if no reference device specified */ INT restoring; /* RestoreDC counter */ + BOOL path; } EMFDRV_PDEVICE; diff --git a/dlls/gdi32/enhmfdrv/graphics.c b/dlls/gdi32/enhmfdrv/graphics.c index e5553e0..38a71b6 100644 --- a/dlls/gdi32/enhmfdrv/graphics.c +++ b/dlls/gdi32/enhmfdrv/graphics.c @@ -746,6 +746,7 @@ BOOL EMFDRV_InvertRgn( PHYSDEV dev, HRGN hrgn ) BOOL EMFDRV_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, const RECT *lprect, LPCWSTR str, UINT count, const INT *lpDx ) { + EMFDRV_PDEVICE *physDev = (EMFDRV_PDEVICE*) dev; EMREXTTEXTOUTW *pemr; DWORD nSize; BOOL ret; @@ -827,13 +828,14 @@ BOOL EMFDRV_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, const RECT *lprec } } - if (!lprect) + if (physDev->path) { pemr->rclBounds.left = pemr->rclBounds.top = 0; pemr->rclBounds.right = pemr->rclBounds.bottom = -1; goto no_bounds; } + /* FIXME: handle font escapement */ switch (textAlign & (TA_LEFT | TA_RIGHT | TA_CENTER)) { case TA_CENTER: { pemr->rclBounds.left = x - (textWidth / 2) - 1; diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c index e0cbcae..f618e85 100644 --- a/dlls/gdi32/enhmfdrv/init.c +++ b/dlls/gdi32/enhmfdrv/init.c @@ -352,6 +352,7 @@ HDC WINAPI CreateEnhMetaFileW( physDev->dc_pen = 0; physDev->screen_dc = 0; physDev->restoring = 0; + physDev->path = FALSE; if (hdc) /* if no ref, use current display */ physDev->ref_dc = hdc; else diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index c77112d..ebe7e02 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -148,6 +148,13 @@ static int CALLBACK eto_emf_enum_proc(HDC hdc, HANDLETABLE *handle_table, ok(!memcmp(&orig_lf, &device_lf, FIELD_OFFSET(LOGFONTA, lfOutPrecision)), "fonts don't match\n"); ok(!lstrcmpA(orig_lf.lfFaceName, device_lf.lfFaceName), "font names don't match\n"); + ok(!emr_ExtTextOutW->rclBounds.left, "emr_ExtTextOutW->rclBounds.left = %d\n", + emr_ExtTextOutW->rclBounds.left); + ok(emr_ExtTextOutW->rclBounds.right != -1, "emr_ExtTextOutW->rclBounds.right = %d\n", + emr_ExtTextOutW->rclBounds.right); + ok(emr_ExtTextOutW->rclBounds.bottom != -1, "emr_ExtTextOutW->rclBounds.bottom = %d\n", + emr_ExtTextOutW->rclBounds.bottom); + for(i = 0; i < emr_ExtTextOutW->emrtext.nChars; i++) { ok(orig_dx[i] == dx[i], "pass %d: dx[%d] (%d) didn't match %d\n", @@ -229,6 +236,10 @@ static void test_ExtTextOut(void) ret = ExtTextOutA(hdcMetafile, 0, 20, 0, &rc, text, lstrlenA(text), dx); ok( ret, "ExtTextOutA error %d\n", GetLastError()); + /* 3. pass NULL lprc */ + ret = ExtTextOutA(hdcMetafile, 0, 40, 0, NULL, text, lstrlenA(text), NULL); + ok( ret, "ExtTextOutA error %d\n", GetLastError()); + hFont = SelectObject(hdcMetafile, hFont); ret = DeleteObject(hFont); ok( ret, "DeleteObject error %d\n", GetLastError());

1 0

Piotr Caban : gdi32/enhmfdrv: Fix PolyBezierTo bounding box computation.
by Alexandre Julliard 29 Apr '16

29 Apr '16

Module: wine Branch: master Commit: a3e741fd4c4b8ab76c1be19b3bb5a233729eb3f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3e741fd4c4b8ab76c1be19b3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 28 18:47:04 2016 +0200 gdi32/enhmfdrv: Fix PolyBezierTo bounding box computation. 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 ++++++++++++++++++++++++++++++------ 1 file changed, 30 insertions(+), 6 deletions(-) diff --git a/dlls/gdi32/enhmfdrv/graphics.c b/dlls/gdi32/enhmfdrv/graphics.c index ae05378..e5553e0 100644 --- a/dlls/gdi32/enhmfdrv/graphics.c +++ b/dlls/gdi32/enhmfdrv/graphics.c @@ -348,10 +348,22 @@ EMFDRV_Polylinegon( PHYSDEV dev, const POINT* pt, INT count, DWORD iType ) emr->emr.iType = iType; emr->emr.nSize = size; - emr->rclBounds.left = emr->rclBounds.right = pt[0].x; - emr->rclBounds.top = emr->rclBounds.bottom = pt[0].y; + if(iType == EMR_POLYBEZIERTO) { + POINT cur_pt; - for(i = 1; i < count; i++) { + GetCurrentPositionEx( dev->hdc, &cur_pt ); + emr->rclBounds.left = emr->rclBounds.right = cur_pt.x; + emr->rclBounds.top = emr->rclBounds.bottom = cur_pt.y; + i = 0; + } + else + { + emr->rclBounds.left = emr->rclBounds.right = pt[0].x; + emr->rclBounds.top = emr->rclBounds.bottom = pt[0].y; + i = 1; + } + + for(; i < count; i++) { if(pt[i].x < emr->rclBounds.left) emr->rclBounds.left = pt[i].x; else if(pt[i].x > emr->rclBounds.right) @@ -402,10 +414,22 @@ EMFDRV_Polylinegon16( PHYSDEV dev, const POINT* pt, INT count, DWORD iType ) emr->emr.iType = iType; emr->emr.nSize = size; - emr->rclBounds.left = emr->rclBounds.right = pt[0].x; - emr->rclBounds.top = emr->rclBounds.bottom = pt[0].y; + if(iType == EMR_POLYBEZIERTO16) { + POINT cur_pt; + + GetCurrentPositionEx( dev->hdc, &cur_pt ); + emr->rclBounds.left = emr->rclBounds.right = cur_pt.x; + emr->rclBounds.top = emr->rclBounds.bottom = cur_pt.y; + i = 0; + } + else + { + emr->rclBounds.left = emr->rclBounds.right = pt[0].x; + emr->rclBounds.top = emr->rclBounds.bottom = pt[0].y; + i = 1; + } - for(i = 1; i < count; i++) { + for(; i < count; i++) { if(pt[i].x < emr->rclBounds.left) emr->rclBounds.left = pt[i].x; else if(pt[i].x > emr->rclBounds.right)

1 0

Jens Reyer : msiexec: Fix a typo in the manpage.
by Alexandre Julliard 29 Apr '16

29 Apr '16

Module: wine Branch: master Commit: 2ba799037f217c8ce91b217fa01240e846e45fd5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ba799037f217c8ce91b217fa… Author: Jens Reyer <jre.winesim(a)gmail.com> Date: Fri Apr 29 03:03:14 2016 +0200 msiexec: Fix a typo in the manpage. Signed-off-by: Jens Reyer <jre.winesim(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/msiexec/msiexec.man.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/msiexec/msiexec.man.in b/programs/msiexec/msiexec.man.in index e7c3798..f24c226 100644 --- a/programs/msiexec/msiexec.man.in +++ b/programs/msiexec/msiexec.man.in @@ -76,7 +76,7 @@ Log all error messages. .IP "\fBa\fR" Log start of actions. .IP "\fBr\fR" -Log action specifc records. +Log action specific records. .IP "\fBu\fR" Log user requests. .IP "\fBc\fR"

1 0

Nikolay Sivov : mshtml: IBindStatusCallback::OnStopBinding() last argument is string pointer.
by Alexandre Julliard 29 Apr '16

29 Apr '16

Module: wine Branch: master Commit: 508830c3ac0a7dada504839feb750992b3e4d2ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=508830c3ac0a7dada504839fe… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 28 21:54:52 2016 +0300 mshtml: IBindStatusCallback::OnStopBinding() last argument is string pointer. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/navigate.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 1854a70..4b86c40 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -1862,8 +1862,7 @@ HRESULT channelbsc_load_stream(HTMLInnerWindow *pending_window, IMoniker *mon, I if(SUCCEEDED(hres)) hres = async_stop_request(bscallback); if(FAILED(hres)) - IBindStatusCallback_OnStopBinding(&bscallback->bsc.IBindStatusCallback_iface, hres, - ERROR_SUCCESS); + IBindStatusCallback_OnStopBinding(&bscallback->bsc.IBindStatusCallback_iface, hres, NULL); return hres; }

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2016