March 2023 - Wine-commits - list.winehq.org

Piotr Caban : wineps: Handle EMR_POLYLINETO record in spool files.
by Alexandre Julliard 27 Mar '23

27 Mar '23

Module: wine Branch: master Commit: 751d93c55fb959d2f181ba568a1810d327c456c4 URL: https://gitlab.winehq.org/wine/wine/-/commit/751d93c55fb959d2f181ba568a1810… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sun Mar 26 12:08:22 2023 +0200 wineps: Handle EMR_POLYLINETO record in spool files. --- dlls/wineps.drv/printproc.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/dlls/wineps.drv/printproc.c b/dlls/wineps.drv/printproc.c index 67099365032..2b7ffaa5e4c 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -172,6 +172,24 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, return PSDRV_PolyBezierTo(&data->pdev->dev, (const POINT *)p->aptl, p->cptl) && MoveToEx(data->pdev->dev.hdc, p->aptl[p->cptl - 1].x, p->aptl[p->cptl - 1].y, NULL); } + case EMR_POLYLINETO: + { + const EMRPOLYLINETO *p = (const EMRPOLYLINETO *)rec; + POINT *pts; + DWORD cnt; + int ret; + + cnt = p->cptl + 1; + pts = malloc(sizeof(*pts) * cnt); + if (!pts) return 0; + + GetCurrentPositionEx(data->pdev->dev.hdc, pts); + memcpy(pts + 1, p->aptl, sizeof(*pts) * p->cptl); + ret = PSDRV_PolyPolyline(&data->pdev->dev, pts, &cnt, 1) && + MoveToEx(data->pdev->dev.hdc, pts[cnt - 1].x, pts[cnt - 1].y, NULL); + free(pts); + return ret; + } case EMR_POLYPOLYLINE: { const EMRPOLYPOLYLINE *p = (const EMRPOLYPOLYLINE *)rec;

1 0

Piotr Caban : wineps: Handle EMR_ARCTO record in spool files.
by Alexandre Julliard 27 Mar '23

27 Mar '23

Module: wine Branch: master Commit: 25c7330954712bd64f9c7c966f9d214a4a928218 URL: https://gitlab.winehq.org/wine/wine/-/commit/25c7330954712bd64f9c7c966f9d21… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sun Mar 26 12:10:08 2023 +0200 wineps: Handle EMR_ARCTO record in spool files. --- dlls/wineps.drv/printproc.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/dlls/wineps.drv/printproc.c b/dlls/wineps.drv/printproc.c index 2b7ffaa5e4c..4c13801b580 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -295,6 +295,35 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, return PSDRV_LineTo(&data->pdev->dev, line->ptl.x, line->ptl.y) && MoveToEx(data->pdev->dev.hdc, line->ptl.x, line->ptl.y, NULL); } + case EMR_ARCTO: + { + const EMRARCTO *p = (const EMRARCTO *)rec; + POINT pt; + BOOL ret; + + ret = GetCurrentPositionEx(data->pdev->dev.hdc, &pt); + if (ret) + { + ret = ArcTo(data->pdev->dev.hdc, p->rclBox.left, p->rclBox.top, + p->rclBox.right, p->rclBox.bottom, p->ptlStart.x, + p->ptlStart.y, p->ptlStart.x, p->ptlStart.y); + } + if (ret) + ret = PSDRV_LineTo(&data->pdev->dev, pt.x, pt.y); + if (ret) + { + ret = PSDRV_Arc(&data->pdev->dev, p->rclBox.left, p->rclBox.top, + p->rclBox.right, p->rclBox.bottom, p->ptlStart.x, + p->ptlStart.y, p->ptlEnd.x, p->ptlEnd.y); + } + if (ret) + { + ret = ArcTo(data->pdev->dev.hdc, p->rclBox.left, p->rclBox.top, + p->rclBox.right, p->rclBox.bottom, p->ptlEnd.x, + p->ptlEnd.y, p->ptlEnd.x, p->ptlEnd.y); + } + return ret; + } case EMR_CREATEMONOBRUSH: { const EMRCREATEMONOBRUSH *p = (const EMRCREATEMONOBRUSH *)rec;

1 0

Piotr Caban : wineps: Handle EMR_POLYBEZIER16 record in spool files.
by Alexandre Julliard 27 Mar '23

27 Mar '23

Module: wine Branch: master Commit: eeb8d8106c25964c5571b7059c1ce9346a13bea0 URL: https://gitlab.winehq.org/wine/wine/-/commit/eeb8d8106c25964c5571b7059c1ce9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sun Mar 26 12:11:42 2023 +0200 wineps: Handle EMR_POLYBEZIER16 record in spool files. --- dlls/wineps.drv/printproc.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/dlls/wineps.drv/printproc.c b/dlls/wineps.drv/printproc.c index 4c13801b580..116d540b303 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -324,6 +324,23 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, } return ret; } + case EMR_POLYBEZIER16: + { + const EMRPOLYBEZIER16 *p = (const EMRPOLYBEZIER16 *)rec; + POINT *pts; + int i; + + pts = malloc(sizeof(*pts) * p->cpts); + if (!pts) return 0; + for (i = 0; i < p->cpts; i++) + { + pts[i].x = p->apts[i].x; + pts[i].y = p->apts[i].y; + } + i = PSDRV_PolyBezier(&data->pdev->dev, pts, p->cpts); + free(pts); + return i; + } case EMR_CREATEMONOBRUSH: { const EMRCREATEMONOBRUSH *p = (const EMRCREATEMONOBRUSH *)rec;

1 0

Piotr Caban : wineps: Handle EMR_POLYGON16 record in spool files.
by Alexandre Julliard 27 Mar '23

27 Mar '23

Module: wine Branch: master Commit: 31d7e943420b7ff5ea1250d04f30dfad8d168f27 URL: https://gitlab.winehq.org/wine/wine/-/commit/31d7e943420b7ff5ea1250d04f30df… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sun Mar 26 12:12:42 2023 +0200 wineps: Handle EMR_POLYGON16 record in spool files. --- dlls/wineps.drv/printproc.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/dlls/wineps.drv/printproc.c b/dlls/wineps.drv/printproc.c index 116d540b303..4475da96560 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -341,6 +341,23 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, free(pts); return i; } + case EMR_POLYGON16: + { + const EMRPOLYGON16 *p = (const EMRPOLYGON16 *)rec; + POINT *pts; + int i; + + pts = malloc(sizeof(*pts) * p->cpts); + if (!pts) return 0; + for (i = 0; i < p->cpts; i++) + { + pts[i].x = p->apts[i].x; + pts[i].y = p->apts[i].y; + } + i = PSDRV_PolyPolygon(&data->pdev->dev, pts, (const INT *)&p->cpts, 1); + free(pts); + return i; + } case EMR_CREATEMONOBRUSH: { const EMRCREATEMONOBRUSH *p = (const EMRCREATEMONOBRUSH *)rec;

1 0

Piotr Caban : wineps: Handle EMR_POLYLINE16 record in spool files.
by Alexandre Julliard 27 Mar '23

27 Mar '23

Module: wine Branch: master Commit: 33c401f31afce11cc3d5f9bf297dd5e688c238fd URL: https://gitlab.winehq.org/wine/wine/-/commit/33c401f31afce11cc3d5f9bf297dd5… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sun Mar 26 12:13:36 2023 +0200 wineps: Handle EMR_POLYLINE16 record in spool files. --- dlls/wineps.drv/printproc.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/dlls/wineps.drv/printproc.c b/dlls/wineps.drv/printproc.c index 4475da96560..5b088650409 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -358,6 +358,23 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, free(pts); return i; } + case EMR_POLYLINE16: + { + const EMRPOLYLINE16 *p = (const EMRPOLYLINE16 *)rec; + POINT *pts; + int i; + + pts = malloc(sizeof(*pts) * p->cpts); + if (!pts) return 0; + for (i = 0; i < p->cpts; i++) + { + pts[i].x = p->apts[i].x; + pts[i].y = p->apts[i].y; + } + i = PSDRV_PolyPolyline(&data->pdev->dev, pts, &p->cpts, 1); + free(pts); + return i; + } case EMR_CREATEMONOBRUSH: { const EMRCREATEMONOBRUSH *p = (const EMRCREATEMONOBRUSH *)rec;

1 0

Piotr Caban : wineps: Handle EMR_POLYBEZIERTO16 record in spool files.
by Alexandre Julliard 27 Mar '23

27 Mar '23

Module: wine Branch: master Commit: bbf0ef285cb06ecee04077c3356ef59f240d8fd6 URL: https://gitlab.winehq.org/wine/wine/-/commit/bbf0ef285cb06ecee04077c3356ef5… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sun Mar 26 12:14:24 2023 +0200 wineps: Handle EMR_POLYBEZIERTO16 record in spool files. --- dlls/wineps.drv/printproc.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/dlls/wineps.drv/printproc.c b/dlls/wineps.drv/printproc.c index 5b088650409..ac09623b56e 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -375,6 +375,24 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, free(pts); return i; } + case EMR_POLYBEZIERTO16: + { + const EMRPOLYBEZIERTO16 *p = (const EMRPOLYBEZIERTO16 *)rec; + POINT *pts; + int i; + + pts = malloc(sizeof(*pts) * p->cpts); + if (!pts) return 0; + for (i = 0; i < p->cpts; i++) + { + pts[i].x = p->apts[i].x; + pts[i].y = p->apts[i].y; + } + i = PSDRV_PolyBezierTo(&data->pdev->dev, pts, p->cpts) && + MoveToEx(data->pdev->dev.hdc, pts[p->cpts - 1].x, pts[p->cpts - 1].y, NULL); + free(pts); + return i; + } case EMR_CREATEMONOBRUSH: { const EMRCREATEMONOBRUSH *p = (const EMRCREATEMONOBRUSH *)rec;

1 0

Piotr Caban : wineps: Handle EMR_POLYLINETO16 record in spool files.
by Alexandre Julliard 27 Mar '23

27 Mar '23

Module: wine Branch: master Commit: db076a5b3578ee995db9e70372fa9548ee7e1cb2 URL: https://gitlab.winehq.org/wine/wine/-/commit/db076a5b3578ee995db9e70372fa95… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sun Mar 26 12:15:11 2023 +0200 wineps: Handle EMR_POLYLINETO16 record in spool files. --- dlls/wineps.drv/printproc.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/dlls/wineps.drv/printproc.c b/dlls/wineps.drv/printproc.c index ac09623b56e..a4a9debe1e0 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -393,6 +393,27 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, free(pts); return i; } + case EMR_POLYLINETO16: + { + const EMRPOLYLINETO16 *p = (const EMRPOLYLINETO16 *)rec; + POINT *pts; + DWORD cnt; + int i; + + cnt = p->cpts + 1; + pts = malloc(sizeof(*pts) * cnt); + if (!pts) return 0; + GetCurrentPositionEx(data->pdev->dev.hdc, pts); + for (i = 0; i < p->cpts; i++) + { + pts[i + 1].x = p->apts[i].x; + pts[i + 1].y = p->apts[i].y; + } + i = PSDRV_PolyPolyline(&data->pdev->dev, pts, &cnt, 1) && + MoveToEx(data->pdev->dev.hdc, pts[cnt - 1].x, pts[cnt - 1].y, NULL); + free(pts); + return i; + } case EMR_CREATEMONOBRUSH: { const EMRCREATEMONOBRUSH *p = (const EMRCREATEMONOBRUSH *)rec;

1 0

Piotr Caban : wineps: Handle EMR_POLYPOLYLINE16 record in spool files.
by Alexandre Julliard 27 Mar '23

27 Mar '23

Module: wine Branch: master Commit: e214d60449e1ee8aa92b21b6c6ead66e0d7e96c1 URL: https://gitlab.winehq.org/wine/wine/-/commit/e214d60449e1ee8aa92b21b6c6ead6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sun Mar 26 12:15:55 2023 +0200 wineps: Handle EMR_POLYPOLYLINE16 record in spool files. --- dlls/wineps.drv/printproc.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/dlls/wineps.drv/printproc.c b/dlls/wineps.drv/printproc.c index a4a9debe1e0..f153226d06f 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -414,6 +414,23 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, free(pts); return i; } + case EMR_POLYPOLYLINE16: + { + const EMRPOLYPOLYLINE16 *p = (const EMRPOLYPOLYLINE16 *)rec; + POINT *pts; + int i; + + pts = malloc(sizeof(*pts) * p->cpts); + if (!pts) return 0; + for (i = 0; i < p->cpts; i++) + { + pts[i].x = ((const POINTS *)(p->aPolyCounts + p->nPolys))[i].x; + pts[i].y = ((const POINTS *)(p->aPolyCounts + p->nPolys))[i].y; + } + i = PSDRV_PolyPolyline(&data->pdev->dev, pts, p->aPolyCounts, p->nPolys); + free(pts); + return i; + } case EMR_CREATEMONOBRUSH: { const EMRCREATEMONOBRUSH *p = (const EMRCREATEMONOBRUSH *)rec;

1 0

Piotr Caban : wineps: Handle EMR_POLYPOLYGON16 record in spool files.
by Alexandre Julliard 27 Mar '23

27 Mar '23

Module: wine Branch: master Commit: 2d48dbf1b3bd2f8f88c1ccdc28d9fd5e9243a47f URL: https://gitlab.winehq.org/wine/wine/-/commit/2d48dbf1b3bd2f8f88c1ccdc28d9fd… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sun Mar 26 12:16:29 2023 +0200 wineps: Handle EMR_POLYPOLYGON16 record in spool files. --- dlls/wineps.drv/printproc.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/dlls/wineps.drv/printproc.c b/dlls/wineps.drv/printproc.c index f153226d06f..71db4488b41 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -431,6 +431,23 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, free(pts); return i; } + case EMR_POLYPOLYGON16: + { + const EMRPOLYPOLYGON16 *p = (const EMRPOLYPOLYGON16 *)rec; + POINT *pts; + int i; + + pts = malloc(sizeof(*pts) * p->cpts); + if (!pts) return 0; + for (i = 0; i < p->cpts; i++) + { + pts[i].x = ((const POINTS *)(p->aPolyCounts + p->nPolys))[i].x; + pts[i].y = ((const POINTS *)(p->aPolyCounts + p->nPolys))[i].y; + } + i = PSDRV_PolyPolygon(&data->pdev->dev, pts, (const INT *)p->aPolyCounts, p->nPolys); + free(pts); + return i; + } case EMR_CREATEMONOBRUSH: { const EMRCREATEMONOBRUSH *p = (const EMRCREATEMONOBRUSH *)rec;

1 0

Biswapriyo Nath : include: Fix c++ compiler error with msxml2.idl.
by Alexandre Julliard 27 Mar '23

27 Mar '23

Module: wine Branch: master Commit: 787c3f73f8a3d4dc9dd653245f4967998d239be1 URL: https://gitlab.winehq.org/wine/wine/-/commit/787c3f73f8a3d4dc9dd653245f4967… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Mon Mar 27 11:44:18 2023 +0530 include: Fix c++ compiler error with msxml2.idl. This moves ISAXXMLFilter declaration after its base class ISAXXMLReader. Otherwise the following error is shown in C++ mode $ wineg++ test-msxml2.cpp In file included from test-msxml2.cpp:1: /usr/include/wine/windows/msxml2.h:16199:24: error: invalid use of incomplete type ‘struct ISAXXMLReader’ 16199 | ISAXXMLFilter : public ISAXXMLReader | ^~~~~~~~~~~~~ /usr/include/wine/windows/msxml2.h:644:19: note: forward declaration of ‘struct ISAXXMLReader’ 644 | typedef interface ISAXXMLReader ISAXXMLReader; | ^~~~~~~~~~~~~ winegcc: /usr/bin/g++ failed Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com> --- include/msxml2.idl | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/include/msxml2.idl b/include/msxml2.idl index 916e0e8ab3d..ede4113ecbf 100644 --- a/include/msxml2.idl +++ b/include/msxml2.idl @@ -2125,20 +2125,7 @@ interface ISAXLocator : IUnknown [ local, object, - uuid(70409222-ca09-4475-acb8-40312fe8d145) -] -interface ISAXXMLFilter : ISAXXMLReader -{ - HRESULT getParent( - [out, retval] ISAXXMLReader ** pReader); - HRESULT putParent( - [in] ISAXXMLReader * reader); -} - -[ -local, -object, -uuid (a4f96ed0-f829-476e-81c0-cdc7bd2a0802) + uuid(a4f96ed0-f829-476e-81c0-cdc7bd2a0802) ] interface ISAXXMLReader : IUnknown { @@ -2192,6 +2179,19 @@ interface ISAXXMLReader : IUnknown [in] const WCHAR * url); } +[ + local, + object, + uuid(70409222-ca09-4475-acb8-40312fe8d145) +] +interface ISAXXMLFilter : ISAXXMLReader +{ + HRESULT getParent( + [out, retval] ISAXXMLReader ** pReader); + HRESULT putParent( + [in] ISAXXMLReader * reader); +} + [ object, dual,

1 0