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

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

24 Mar '23

Module: wine Branch: master Commit: 4c02a51d9777dc8ce9a2e2bcabbdef520b78e980 URL: https://gitlab.winehq.org/wine/wine/-/commit/4c02a51d9777dc8ce9a2e2bcabbdef… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Mar 23 18:18:40 2023 +0100 wineps: Handle EMR_CREATEMONOBRUSH record in spool files. --- dlls/wineps.drv/printproc.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/wineps.drv/printproc.c b/dlls/wineps.drv/printproc.c index 30ca6ef0ce9..f3678d110ec 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -188,6 +188,17 @@ 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_CREATEMONOBRUSH: + { + const EMRCREATEMONOBRUSH *p = (const EMRCREATEMONOBRUSH *)rec; + + if (!PlayEnhMetaFileRecord(data->pdev->dev.hdc, htable, rec, n)) + return 0; + data->patterns[p->ihBrush].usage = p->iUsage; + data->patterns[p->ihBrush].info = (BITMAPINFO *)((BYTE *)p + p->offBmi); + data->patterns[p->ihBrush].bits.ptr = (BYTE *)p + p->offBits; + return 1; + } case EMR_MOVETOEX: return PlayEnhMetaFileRecord(data->pdev->dev.hdc, htable, rec, n);

1 0

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

24 Mar '23

Module: wine Branch: master Commit: 18bdfd1e9ffa34297c6168cd014b2c346aaef876 URL: https://gitlab.winehq.org/wine/wine/-/commit/18bdfd1e9ffa34297c6168cd014b2c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Mar 23 18:19:36 2023 +0100 wineps: Handle EMR_CREATEDIBPATTERNBRUSHPT record in spool files. --- dlls/wineps.drv/printproc.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/wineps.drv/printproc.c b/dlls/wineps.drv/printproc.c index f3678d110ec..2d0c7c9780b 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -199,6 +199,17 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, data->patterns[p->ihBrush].bits.ptr = (BYTE *)p + p->offBits; return 1; } + case EMR_CREATEDIBPATTERNBRUSHPT: + { + const EMRCREATEDIBPATTERNBRUSHPT *p = (const EMRCREATEDIBPATTERNBRUSHPT *)rec; + + if (!PlayEnhMetaFileRecord(data->pdev->dev.hdc, htable, rec, n)) + return 0; + data->patterns[p->ihBrush].usage = p->iUsage; + data->patterns[p->ihBrush].info = (BITMAPINFO *)((BYTE *)p + p->offBmi); + data->patterns[p->ihBrush].bits.ptr = (BYTE *)p + p->offBits; + return 1; + } case EMR_MOVETOEX: return PlayEnhMetaFileRecord(data->pdev->dev.hdc, htable, rec, n);

1 0

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

24 Mar '23

Module: wine Branch: master Commit: 5c7c1c22c359f3c755fb1e0755d35b4d8b0ebcb0 URL: https://gitlab.winehq.org/wine/wine/-/commit/5c7c1c22c359f3c755fb1e0755d35b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Mar 23 18:21:43 2023 +0100 wineps: Handle EMR_SETWORLDTRANSFORM record in spool files. --- dlls/wineps.drv/printproc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wineps.drv/printproc.c b/dlls/wineps.drv/printproc.c index 2d0c7c9780b..6419000acbc 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -212,6 +212,7 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, } case EMR_MOVETOEX: + case EMR_SETWORLDTRANSFORM: return PlayEnhMetaFileRecord(data->pdev->dev.hdc, htable, rec, n); default: FIXME("unsupported record: %ld\n", rec->iType);

1 0

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

24 Mar '23

Module: wine Branch: master Commit: f83dc1cdb5ab380a3399e699841ba7ec037b0b56 URL: https://gitlab.winehq.org/wine/wine/-/commit/f83dc1cdb5ab380a3399e699841ba7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Mar 23 18:22:54 2023 +0100 wineps: Handle EMR_MODIFYWORLDTRANSFORM record in spool files. --- dlls/wineps.drv/printproc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wineps.drv/printproc.c b/dlls/wineps.drv/printproc.c index 6419000acbc..91fd914ce78 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -213,6 +213,7 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, case EMR_MOVETOEX: case EMR_SETWORLDTRANSFORM: + case EMR_MODIFYWORLDTRANSFORM: return PlayEnhMetaFileRecord(data->pdev->dev.hdc, htable, rec, n); default: FIXME("unsupported record: %ld\n", rec->iType);

1 0

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

24 Mar '23

Module: wine Branch: master Commit: 53d2a32d06379915df0c7b73355316cb7a7d1579 URL: https://gitlab.winehq.org/wine/wine/-/commit/53d2a32d06379915df0c7b73355316… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Mar 23 18:24:08 2023 +0100 wineps: Handle EMR_POLYBEZIER record in spool files. --- dlls/wineps.drv/printproc.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/wineps.drv/printproc.c b/dlls/wineps.drv/printproc.c index 91fd914ce78..b2f61a98fe7 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -145,6 +145,12 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, data->patterns = calloc(sizeof(*data->patterns), header->nHandles); return data->patterns && PSDRV_StartPage(&data->pdev->dev); } + case EMR_POLYBEZIER: + { + const EMRPOLYBEZIER *p = (const EMRPOLYBEZIER *)rec; + + return PSDRV_PolyBezier(&data->pdev->dev, (const POINT *)p->aptl, p->cptl); + } case EMR_EOF: return PSDRV_EndPage(&data->pdev->dev); case EMR_SELECTOBJECT:

1 0

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

24 Mar '23

Module: wine Branch: master Commit: fd107041ae04a1c98f7b6a20fec2e36fd08f4bae URL: https://gitlab.winehq.org/wine/wine/-/commit/fd107041ae04a1c98f7b6a20fec2e3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Mar 23 18:25:03 2023 +0100 wineps: Handle EMR_POLYPOLYLINE record in spool files. --- dlls/wineps.drv/printproc.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/wineps.drv/printproc.c b/dlls/wineps.drv/printproc.c index b2f61a98fe7..3c9f506c885 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -151,6 +151,14 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, return PSDRV_PolyBezier(&data->pdev->dev, (const POINT *)p->aptl, p->cptl); } + case EMR_POLYPOLYLINE: + { + const EMRPOLYPOLYLINE *p = (const EMRPOLYPOLYLINE *)rec; + + return PSDRV_PolyPolyline(&data->pdev->dev, + (const POINT *)(p->aPolyCounts + p->nPolys), + p->aPolyCounts, p->nPolys); + } case EMR_EOF: return PSDRV_EndPage(&data->pdev->dev); case EMR_SELECTOBJECT:

1 0

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

24 Mar '23

Module: wine Branch: master Commit: a0b644f4322be7c4b74cc8c0e8624e0f8ee0a004 URL: https://gitlab.winehq.org/wine/wine/-/commit/a0b644f4322be7c4b74cc8c0e8624e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Mar 23 18:26:01 2023 +0100 wineps: Handle EMR_POLYPOLYGON record in spool files. --- dlls/wineps.drv/printproc.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/wineps.drv/printproc.c b/dlls/wineps.drv/printproc.c index 3c9f506c885..13154d66dfa 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -159,6 +159,14 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, (const POINT *)(p->aPolyCounts + p->nPolys), p->aPolyCounts, p->nPolys); } + case EMR_POLYPOLYGON: + { + const EMRPOLYPOLYGON *p = (const EMRPOLYPOLYGON *)rec; + + return PSDRV_PolyPolygon(&data->pdev->dev, + (const POINT *)(p->aPolyCounts + p->nPolys), + (const INT *)p->aPolyCounts, p->nPolys); + } case EMR_EOF: return PSDRV_EndPage(&data->pdev->dev); case EMR_SELECTOBJECT:

1 0

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

24 Mar '23

Module: wine Branch: master Commit: 9bea58da96547a886811c699a48e62f7d7439c7e URL: https://gitlab.winehq.org/wine/wine/-/commit/9bea58da96547a886811c699a48e62… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Mar 23 18:26:51 2023 +0100 wineps: Handle EMR_SETPIXELV record in spool files. --- dlls/wineps.drv/printproc.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/wineps.drv/printproc.c b/dlls/wineps.drv/printproc.c index 13154d66dfa..8e5f2af874c 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -169,6 +169,13 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, } case EMR_EOF: return PSDRV_EndPage(&data->pdev->dev); + case EMR_SETPIXELV: + { + const EMRSETPIXELV *p = (const EMRSETPIXELV *)rec; + + return PSDRV_SetPixel(&data->pdev->dev, p->ptlPixel.x, + p->ptlPixel.y, p->crColor); + } case EMR_SELECTOBJECT: { const EMRSELECTOBJECT *so = (const EMRSELECTOBJECT *)rec;

1 0

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

24 Mar '23

Module: wine Branch: master Commit: 7d01f643f7a9f2fa1c776a058167babdff522fb3 URL: https://gitlab.winehq.org/wine/wine/-/commit/7d01f643f7a9f2fa1c776a058167ba… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Mar 23 18:27:37 2023 +0100 wineps: Handle EMR_ELLIPSE record in spool files. --- dlls/wineps.drv/printproc.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/wineps.drv/printproc.c b/dlls/wineps.drv/printproc.c index 8e5f2af874c..42dd28e7571 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -203,6 +203,13 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, return 1; } } + case EMR_ELLIPSE: + { + const EMRELLIPSE *p = (const EMRELLIPSE *)rec; + const RECTL *r = &p->rclBox; + + return PSDRV_Ellipse(&data->pdev->dev, r->left, r->top, r->right, r->bottom); + } case EMR_RECTANGLE: { const EMRRECTANGLE *rect = (const EMRRECTANGLE *)rec;

1 0

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

24 Mar '23

Module: wine Branch: master Commit: 3a1341aada897a2565dd773838918ce0a04f70da URL: https://gitlab.winehq.org/wine/wine/-/commit/3a1341aada897a2565dd773838918c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Mar 23 18:28:39 2023 +0100 wineps: Handle EMR_ROUNDRECT record in spool files. --- dlls/wineps.drv/printproc.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/wineps.drv/printproc.c b/dlls/wineps.drv/printproc.c index 42dd28e7571..9a3de67489e 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -217,6 +217,14 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, return PSDRV_Rectangle(&data->pdev->dev, rect->rclBox.left, rect->rclBox.top, rect->rclBox.right, rect->rclBox.bottom); } + case EMR_ROUNDRECT: + { + const EMRROUNDRECT *p = (const EMRROUNDRECT *)rec; + + return PSDRV_RoundRect(&data->pdev->dev, p->rclBox.left, + p->rclBox.top, p->rclBox.right, p->rclBox.bottom, + p->szlCorner.cx, p->szlCorner.cy); + } case EMR_LINETO: { const EMRLINETO *line = (const EMRLINETO *)rec;

1 0