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

Piotr Caban : wineps: Handle EMR_GRADIENTFILL record in spool files.
by Alexandre Julliard 13 Apr '23

13 Apr '23

Module: wine Branch: master Commit: b51d9e2cfbf7c628ec2a886461cf87026d2737b8 URL: https://gitlab.winehq.org/wine/wine/-/commit/b51d9e2cfbf7c628ec2a886461cf87… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 13 09:49:38 2023 +0200 wineps: Handle EMR_GRADIENTFILL record in spool files. --- dlls/wineps.drv/printproc.c | 133 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 133 insertions(+) diff --git a/dlls/wineps.drv/printproc.c b/dlls/wineps.drv/printproc.c index a48b2d3c273..f38a6b1d67d 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -800,6 +800,132 @@ static int poly_draw(PHYSDEV dev, const POINT *points, const BYTE *types, DWORD return TRUE; } +static inline void reset_bounds(RECT *bounds) +{ + bounds->left = bounds->top = INT_MAX; + bounds->right = bounds->bottom = INT_MIN; +} + +static BOOL gradient_fill(PHYSDEV dev, const TRIVERTEX *vert_array, DWORD nvert, + const void *grad_array, DWORD ngrad, ULONG mode) +{ + char buffer[FIELD_OFFSET(BITMAPINFO, bmiColors[256])]; + BITMAPINFO *info = (BITMAPINFO *)buffer; + struct bitblt_coords src, dst; + struct gdi_image_bits bits; + HBITMAP bmp, old_bmp; + BOOL ret = FALSE; + TRIVERTEX *pts; + unsigned int i; + HDC hdc_src; + HRGN rgn; + + if (!(pts = malloc(nvert * sizeof(*pts)))) return FALSE; + memcpy(pts, vert_array, sizeof(*pts) * nvert); + for (i = 0; i < nvert; i++) + LPtoDP(dev->hdc, (POINT *)&pts[i], 1); + + /* compute bounding rect of all the rectangles/triangles */ + reset_bounds(&dst.visrect); + for (i = 0; i < ngrad * (mode == GRADIENT_FILL_TRIANGLE ? 3 : 2); i++) + { + ULONG v = ((ULONG *)grad_array)[i]; + dst.visrect.left = min(dst.visrect.left, pts[v].x); + dst.visrect.top = min(dst.visrect.top, pts[v].y); + dst.visrect.right = max(dst.visrect.right, pts[v].x); + dst.visrect.bottom = max(dst.visrect.bottom, pts[v].y); + } + + dst.x = dst.visrect.left; + dst.y = dst.visrect.top; + dst.width = dst.visrect.right - dst.visrect.left; + dst.height = dst.visrect.bottom - dst.visrect.top; + clip_visrect(dev->hdc, &dst.visrect, &dst.visrect); + + info->bmiHeader.biSize = sizeof(info->bmiHeader); + info->bmiHeader.biPlanes = 1; + info->bmiHeader.biBitCount = 24; + info->bmiHeader.biCompression = BI_RGB; + info->bmiHeader.biXPelsPerMeter = 0; + info->bmiHeader.biYPelsPerMeter = 0; + info->bmiHeader.biClrUsed = 0; + info->bmiHeader.biClrImportant = 0; + info->bmiHeader.biWidth = dst.visrect.right - dst.visrect.left; + info->bmiHeader.biHeight = dst.visrect.bottom - dst.visrect.top; + info->bmiHeader.biSizeImage = 0; + memset(&bits, 0, sizeof(bits)); + hdc_src = CreateCompatibleDC(NULL); + if (!hdc_src) + { + free(pts); + return FALSE; + } + bmp = CreateDIBSection(hdc_src, info, DIB_RGB_COLORS, &bits.ptr, NULL, 0); + if (!bmp) + { + DeleteObject(hdc_src); + free(pts); + return FALSE; + } + old_bmp = SelectObject(hdc_src, bmp); + + /* make src and points relative to the bitmap */ + src = dst; + src.x -= dst.visrect.left; + src.y -= dst.visrect.top; + OffsetRect(&src.visrect, -dst.visrect.left, -dst.visrect.top); + for (i = 0; i < nvert; i++) + { + pts[i].x -= dst.visrect.left; + pts[i].y -= dst.visrect.top; + } + ret = GdiGradientFill(hdc_src, pts, nvert, (void *)grad_array, ngrad, mode); + SelectObject(hdc_src, old_bmp); + DeleteObject(hdc_src); + + rgn = CreateRectRgn(0, 0, 0, 0); + if (mode == GRADIENT_FILL_TRIANGLE) + { + const GRADIENT_TRIANGLE *gt = grad_array; + POINT triangle[3]; + HRGN tmp; + + for (i = 0; i < ngrad; i++) + { + triangle[0].x = pts[gt[i].Vertex1].x; + triangle[0].y = pts[gt[i].Vertex1].y; + triangle[1].x = pts[gt[i].Vertex2].x; + triangle[1].y = pts[gt[i].Vertex2].y; + triangle[2].x = pts[gt[i].Vertex3].x; + triangle[2].y = pts[gt[i].Vertex3].y; + tmp = CreatePolygonRgn(triangle, 3, ALTERNATE); + CombineRgn(rgn, rgn, tmp, RGN_OR); + DeleteObject(tmp); + } + } + else + { + const GRADIENT_RECT *gr = grad_array; + HRGN tmp = CreateRectRgn(0, 0, 0, 0); + + for (i = 0; i < ngrad; i++) + { + SetRectRgn(tmp, pts[gr[i].UpperLeft].x, pts[gr[i].UpperLeft].y, + pts[gr[i].LowerRight].x, pts[gr[i].LowerRight].y); + CombineRgn(rgn, rgn, tmp, RGN_OR); + } + DeleteObject(tmp); + } + free(pts); + + OffsetRgn(rgn, dst.visrect.left, dst.visrect.top); + if (ret) + ret = (PSDRV_PutImage(dev, rgn, info, &bits, &src, &dst, SRCCOPY) == ERROR_SUCCESS); + DeleteObject(rgn); + DeleteObject(bmp); + return ret; +} + static HGDIOBJ get_object_handle(struct pp_data *data, HANDLETABLE *handletable, DWORD i, struct brush_pattern **pattern) { @@ -1332,6 +1458,13 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, data->patterns[p->ihBrush].bits.ptr = (BYTE *)p + p->offBits; return 1; } + case EMR_GRADIENTFILL: + { + const EMRGRADIENTFILL *p = (const EMRGRADIENTFILL *)rec; + + return gradient_fill(&data->pdev->dev, p->Ver, p->nVer, + p->Ver + p->nVer, p->nTri, p->ulMode); + } case EMR_SETWINDOWEXTEX: case EMR_SETWINDOWORGEX:

1 0

Piotr Caban : wineps: Handle EMR_ENDPATH record in spool files.
by Alexandre Julliard 13 Apr '23

13 Apr '23

Module: wine Branch: master Commit: e92309043baf0a6c0e21154a33bcc4677d0459ad URL: https://gitlab.winehq.org/wine/wine/-/commit/e92309043baf0a6c0e21154a33bcc4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 13 09:51:42 2023 +0200 wineps: Handle EMR_ENDPATH 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 f38a6b1d67d..e14923b55fa 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -43,6 +43,7 @@ struct pp_data PSDRV_PDEVICE *pdev; DWORD brush; struct brush_pattern *patterns; + BOOL path; }; typedef enum @@ -1183,6 +1184,11 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, return poly_draw(&data->pdev->dev, pts, (BYTE *)(p->aptl + p->cptl), p->cptl) && MoveToEx(data->pdev->dev.hdc, pts[p->cptl - 1].x, pts[p->cptl - 1].y, NULL); } + case EMR_ENDPATH: + { + data->path = FALSE; + return PlayEnhMetaFileRecord(data->pdev->dev.hdc, htable, rec, n); + } case EMR_FILLRGN: { const EMRFILLRGN *p = (const EMRFILLRGN *)rec;

1 0

Piotr Caban : wineps: Handle EMR_ABORTPATH record in spool files.
by Alexandre Julliard 13 Apr '23

13 Apr '23

Module: wine Branch: master Commit: f623ec60b5c774cdadd9a4a2adf8cc0252b498f1 URL: https://gitlab.winehq.org/wine/wine/-/commit/f623ec60b5c774cdadd9a4a2adf8cc… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 13 09:52:51 2023 +0200 wineps: Handle EMR_ABORTPATH record in spool files. --- dlls/wineps.drv/printproc.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/wineps.drv/printproc.c b/dlls/wineps.drv/printproc.c index e14923b55fa..6151338d125 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -1189,6 +1189,11 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, data->path = FALSE; return PlayEnhMetaFileRecord(data->pdev->dev.hdc, htable, rec, n); } + case EMR_ABORTPATH: + { + data->path = FALSE; + return PlayEnhMetaFileRecord(data->pdev->dev.hdc, htable, rec, n); + } case EMR_FILLRGN: { const EMRFILLRGN *p = (const EMRFILLRGN *)rec;

1 0

Piotr Caban : wineps: Handle EMR_BEGINPATH record in spool files.
by Alexandre Julliard 13 Apr '23

13 Apr '23

Module: wine Branch: master Commit: 254a82382489d964e27d6fee0eb01dea481b1a68 URL: https://gitlab.winehq.org/wine/wine/-/commit/254a82382489d964e27d6fee0eb01d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 13 09:53:34 2023 +0200 wineps: Handle EMR_BEGINPATH record in spool files. --- dlls/wineps.drv/printproc.c | 46 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/dlls/wineps.drv/printproc.c b/dlls/wineps.drv/printproc.c index 6151338d125..240f448e707 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -953,11 +953,52 @@ static BOOL fill_rgn(struct pp_data *data, HANDLETABLE *htable, DWORD brush, HRG return ret; } +static BOOL is_path_record(int type) +{ + switch(type) + { + case EMR_POLYBEZIER: + case EMR_POLYGON: + case EMR_POLYLINE: + case EMR_POLYBEZIERTO: + case EMR_POLYLINETO: + case EMR_POLYPOLYLINE: + case EMR_POLYPOLYGON: + case EMR_MOVETOEX: + case EMR_ANGLEARC: + case EMR_ELLIPSE: + case EMR_RECTANGLE: + case EMR_ROUNDRECT: + case EMR_ARC: + case EMR_CHORD: + case EMR_PIE: + case EMR_LINETO: + case EMR_ARCTO: + case EMR_POLYDRAW: + case EMR_EXTTEXTOUTA: + case EMR_EXTTEXTOUTW: + case EMR_POLYBEZIER16: + case EMR_POLYGON16: + case EMR_POLYLINE16: + case EMR_POLYBEZIERTO16: + case EMR_POLYLINETO16: + case EMR_POLYPOLYLINE16: + case EMR_POLYPOLYGON16: + case EMR_POLYDRAW16: + return TRUE; + default: + return FALSE; + } +} + static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, const ENHMETARECORD *rec, int n, LPARAM arg) { struct pp_data *data = (struct pp_data *)arg; + if (data->path && is_path_record(rec->iType)) + return PlayEnhMetaFileRecord(data->pdev->dev.hdc, htable, rec, n); + switch (rec->iType) { case EMR_HEADER: @@ -1184,6 +1225,11 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, return poly_draw(&data->pdev->dev, pts, (BYTE *)(p->aptl + p->cptl), p->cptl) && MoveToEx(data->pdev->dev.hdc, pts[p->cptl - 1].x, pts[p->cptl - 1].y, NULL); } + case EMR_BEGINPATH: + { + data->path = TRUE; + return PlayEnhMetaFileRecord(data->pdev->dev.hdc, htable, rec, n); + } case EMR_ENDPATH: { data->path = FALSE;

1 0

Piotr Caban : wineps: Handle EMR_FILLPATH record in spool files.
by Alexandre Julliard 13 Apr '23

13 Apr '23

Module: wine Branch: master Commit: bd5a3400435eb4ed8963c96a0d88146faf2bebc5 URL: https://gitlab.winehq.org/wine/wine/-/commit/bd5a3400435eb4ed8963c96a0d8814… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 13 09:54:11 2023 +0200 wineps: Handle EMR_FILLPATH record in spool files. --- dlls/wineps.drv/printproc.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wineps.drv/printproc.c b/dlls/wineps.drv/printproc.c index 240f448e707..6b7b5cafe84 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -1235,6 +1235,8 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, data->path = FALSE; return PlayEnhMetaFileRecord(data->pdev->dev.hdc, htable, rec, n); } + case EMR_FILLPATH: + return PSDRV_FillPath(&data->pdev->dev); case EMR_ABORTPATH: { data->path = FALSE;

1 0

Piotr Caban : wineps: Handle EMR_STROKEANDFILLPATH record in spool files.
by Alexandre Julliard 13 Apr '23

13 Apr '23

Module: wine Branch: master Commit: 45e0e603b3b108fcf912d52c77c1544934ac6470 URL: https://gitlab.winehq.org/wine/wine/-/commit/45e0e603b3b108fcf912d52c77c154… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 13 09:54:46 2023 +0200 wineps: Handle EMR_STROKEANDFILLPATH record in spool files. --- dlls/wineps.drv/printproc.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wineps.drv/printproc.c b/dlls/wineps.drv/printproc.c index 6b7b5cafe84..69e92dca28f 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -1237,6 +1237,8 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, } case EMR_FILLPATH: return PSDRV_FillPath(&data->pdev->dev); + case EMR_STROKEANDFILLPATH: + return PSDRV_StrokeAndFillPath(&data->pdev->dev); case EMR_ABORTPATH: { data->path = FALSE;

1 0

Piotr Caban : wineps: Handle EMR_STROKEPATH record in spool files.
by Alexandre Julliard 13 Apr '23

13 Apr '23

Module: wine Branch: master Commit: 7afe71cd531673da9ca3fc9b21a5bf436e82f62b URL: https://gitlab.winehq.org/wine/wine/-/commit/7afe71cd531673da9ca3fc9b21a5bf… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 13 09:55:28 2023 +0200 wineps: Handle EMR_STROKEPATH record in spool files. --- dlls/wineps.drv/printproc.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wineps.drv/printproc.c b/dlls/wineps.drv/printproc.c index 69e92dca28f..f3ee1fc99da 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -1239,6 +1239,8 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, return PSDRV_FillPath(&data->pdev->dev); case EMR_STROKEANDFILLPATH: return PSDRV_StrokeAndFillPath(&data->pdev->dev); + case EMR_STROKEPATH: + return PSDRV_StrokePath(&data->pdev->dev); case EMR_ABORTPATH: { data->path = FALSE;

1 0

Piotr Caban : wineps: Handle EMR_CLOSEFIGURE record in spool files.
by Alexandre Julliard 13 Apr '23

13 Apr '23

Module: wine Branch: master Commit: 0b018bbc681bfdf0e0f72d2a410eb5509b97ebda URL: https://gitlab.winehq.org/wine/wine/-/commit/0b018bbc681bfdf0e0f72d2a410eb5… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 13 09:56:10 2023 +0200 wineps: Handle EMR_CLOSEFIGURE 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 f3ee1fc99da..9ef67ff5bd4 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -1548,6 +1548,7 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, case EMR_CREATEPEN: case EMR_CREATEBRUSHINDIRECT: case EMR_SETARCDIRECTION: + case EMR_CLOSEFIGURE: case EMR_SELECTCLIPPATH: case EMR_EXTSELECTCLIPRGN: return PlayEnhMetaFileRecord(data->pdev->dev.hdc, htable, rec, n);

1 0

Piotr Caban : wineps: Handle EMR_FLATTENPATH record in spool files.
by Alexandre Julliard 13 Apr '23

13 Apr '23

Module: wine Branch: master Commit: 266097d59fca040fdc1763c382324a4e2e138db1 URL: https://gitlab.winehq.org/wine/wine/-/commit/266097d59fca040fdc1763c382324a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 13 09:56:38 2023 +0200 wineps: Handle EMR_FLATTENPATH 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 9ef67ff5bd4..235e01416bf 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -1549,6 +1549,7 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, case EMR_CREATEBRUSHINDIRECT: case EMR_SETARCDIRECTION: case EMR_CLOSEFIGURE: + case EMR_FLATTENPATH: case EMR_SELECTCLIPPATH: case EMR_EXTSELECTCLIPRGN: return PlayEnhMetaFileRecord(data->pdev->dev.hdc, htable, rec, n);

1 0

Piotr Caban : wineps: Handle EMR_WIDENPATH record in spool files.
by Alexandre Julliard 13 Apr '23

13 Apr '23

Module: wine Branch: master Commit: 63615abbb9054d0f56a788609e9da4cca4471de9 URL: https://gitlab.winehq.org/wine/wine/-/commit/63615abbb9054d0f56a788609e9da4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 13 09:57:08 2023 +0200 wineps: Handle EMR_WIDENPATH 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 235e01416bf..f46f7752a3c 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -1550,6 +1550,7 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, case EMR_SETARCDIRECTION: case EMR_CLOSEFIGURE: case EMR_FLATTENPATH: + case EMR_WIDENPATH: case EMR_SELECTCLIPPATH: case EMR_EXTSELECTCLIPRGN: return PlayEnhMetaFileRecord(data->pdev->dev.hdc, htable, rec, n);

1 0