[PATCH 0/11] MR2522: wineps: Add support for more spool file records
From: Piotr Caban <piotr(a)codeweavers.com> --- dlls/wineps.drv/graphics.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/wineps.drv/graphics.c b/dlls/wineps.drv/graphics.c index 3ea663ccb2d..94ae51d5764 100644 --- a/dlls/wineps.drv/graphics.c +++ b/dlls/wineps.drv/graphics.c @@ -226,7 +226,10 @@ static BOOL PSDRV_DrawArc( PHYSDEV dev, INT left, INT top, else PSDRV_WriteNewPath( dev ); - PSDRV_WriteArc(dev, x, y, w, h, start_angle, end_angle); + if(GetArcDirection(dev->hdc) == AD_COUNTERCLOCKWISE) + PSDRV_WriteArc(dev, x, y, w, h, start_angle, end_angle); + else + PSDRV_WriteArc(dev, x, y, w, h, end_angle, start_angle); if(lines == 1 || lines == 2) { /* chord or pie */ PSDRV_WriteClosePath(dev); PSDRV_Brush(dev,0); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/2522
From: Piotr Caban <piotr(a)codeweavers.com> --- dlls/wineps.drv/printproc.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/dlls/wineps.drv/printproc.c b/dlls/wineps.drv/printproc.c index 71db4488b41..97af61664ac 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <math.h> #include <stdlib.h> #include <windows.h> @@ -131,6 +132,11 @@ static struct pp_data* get_handle_data(HANDLE pp) return ret; } +static inline INT GDI_ROUND(double val) +{ + return (int)floor(val + 0.5); +} + static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, const ENHMETARECORD *rec, int n, LPARAM arg) { @@ -242,6 +248,32 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, return 1; } } + case EMR_ANGLEARC: + { + const EMRANGLEARC *p = (const EMRANGLEARC *)rec; + int arc_dir = SetArcDirection(data->pdev->dev.hdc, + p->eSweepAngle >= 0 ? AD_COUNTERCLOCKWISE : AD_CLOCKWISE); + EMRARCTO arcto; + int ret; + + arcto.emr.iType = EMR_ARCTO; + arcto.rclBox.left = p->ptlCenter.x - p->nRadius; + arcto.rclBox.top = p->ptlCenter.y - p->nRadius; + arcto.rclBox.right = p->ptlCenter.x + p->nRadius; + arcto.rclBox.bottom = p->ptlCenter.y + p->nRadius; + arcto.ptlStart.x = GDI_ROUND(p->ptlCenter.x + + cos(p->eStartAngle * M_PI / 180) * p->nRadius); + arcto.ptlStart.y = GDI_ROUND(p->ptlCenter.y - + sin(p->eStartAngle * M_PI / 180) * p->nRadius); + arcto.ptlEnd.x = GDI_ROUND(p->ptlCenter.x + + cos((p->eStartAngle + p->eSweepAngle) * M_PI / 180) * p->nRadius); + arcto.ptlEnd.y = GDI_ROUND(p->ptlCenter.y - + sin((p->eStartAngle + p->eSweepAngle) * M_PI / 180) * p->nRadius); + + ret = hmf_proc(hdc, htable, (ENHMETARECORD *)&arcto, n, arg); + SetArcDirection(data->pdev->dev.hdc, arc_dir); + return ret; + } case EMR_ELLIPSE: { const EMRELLIPSE *p = (const EMRELLIPSE *)rec; -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/2522
From: Piotr Caban <piotr(a)codeweavers.com> --- dlls/wineps.drv/printproc.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/wineps.drv/printproc.c b/dlls/wineps.drv/printproc.c index 97af61664ac..702e04b3f63 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -356,6 +356,16 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, } return ret; } + case EMR_PAINTRGN: + { + const EMRPAINTRGN *p = (const EMRPAINTRGN *)rec; + HRGN rgn = ExtCreateRegion(NULL, p->cbRgnData, (const RGNDATA *)p->RgnData); + int ret; + + ret = PSDRV_PaintRgn(&data->pdev->dev, rgn); + DeleteObject(rgn); + return ret; + } case EMR_POLYBEZIER16: { const EMRPOLYBEZIER16 *p = (const EMRPOLYBEZIER16 *)rec; -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/2522
From: Piotr Caban <piotr(a)codeweavers.com> --- 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 702e04b3f63..03f46a98616 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -513,6 +513,7 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, return 1; } + case EMR_SETWINDOWEXTEX: case EMR_MOVETOEX: case EMR_SETWORLDTRANSFORM: case EMR_MODIFYWORLDTRANSFORM: -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/2522
From: Piotr Caban <piotr(a)codeweavers.com> --- 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 03f46a98616..49d2a401e23 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -514,6 +514,7 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, } case EMR_SETWINDOWEXTEX: + case EMR_SETWINDOWORGEX: case EMR_MOVETOEX: case EMR_SETWORLDTRANSFORM: case EMR_MODIFYWORLDTRANSFORM: -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/2522
From: Piotr Caban <piotr(a)codeweavers.com> --- 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 49d2a401e23..fd0d3cd2e90 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -515,6 +515,7 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, case EMR_SETWINDOWEXTEX: case EMR_SETWINDOWORGEX: + case EMR_SETVIEWPORTEXTEX: case EMR_MOVETOEX: case EMR_SETWORLDTRANSFORM: case EMR_MODIFYWORLDTRANSFORM: -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/2522
From: Piotr Caban <piotr(a)codeweavers.com> --- 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 fd0d3cd2e90..0cdfebce0df 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -516,6 +516,7 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, case EMR_SETWINDOWEXTEX: case EMR_SETWINDOWORGEX: case EMR_SETVIEWPORTEXTEX: + case EMR_SETVIEWPORTORGEX: case EMR_MOVETOEX: case EMR_SETWORLDTRANSFORM: case EMR_MODIFYWORLDTRANSFORM: -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/2522
From: Piotr Caban <piotr(a)codeweavers.com> --- 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 0cdfebce0df..572003613b9 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -517,6 +517,7 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, case EMR_SETWINDOWORGEX: case EMR_SETVIEWPORTEXTEX: case EMR_SETVIEWPORTORGEX: + case EMR_SETBRUSHORGEX: case EMR_MOVETOEX: case EMR_SETWORLDTRANSFORM: case EMR_MODIFYWORLDTRANSFORM: -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/2522
From: Piotr Caban <piotr(a)codeweavers.com> --- 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 572003613b9..6dc90ed99c0 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -521,6 +521,7 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, case EMR_MOVETOEX: case EMR_SETWORLDTRANSFORM: case EMR_MODIFYWORLDTRANSFORM: + case EMR_SETARCDIRECTION: return PlayEnhMetaFileRecord(data->pdev->dev.hdc, htable, rec, n); default: FIXME("unsupported record: %ld\n", rec->iType); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/2522
From: Piotr Caban <piotr(a)codeweavers.com> --- dlls/wineps.drv/printproc.c | 135 ++++++++++++++++++++++++++++++++++++ 1 file changed, 135 insertions(+) diff --git a/dlls/wineps.drv/printproc.c b/dlls/wineps.drv/printproc.c index 6dc90ed99c0..39850af9311 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -137,6 +137,133 @@ static inline INT GDI_ROUND(double val) return (int)floor(val + 0.5); } +static void translate(RECT *rect, const XFORM *xform) +{ + double x, y; + + x = rect->left; + y = rect->top; + rect->left = GDI_ROUND(x * xform->eM11 + y * xform->eM21 + xform->eDx); + rect->top = GDI_ROUND(x * xform->eM12 + y * xform->eM22 + xform->eDy); + + x = rect->right; + y = rect->bottom; + rect->right = GDI_ROUND(x * xform->eM11 + y * xform->eM21 + xform->eDx); + rect->bottom = GDI_ROUND(x * xform->eM12 + y * xform->eM22 + xform->eDy); +} + +static inline void get_bounding_rect(RECT *rect, int x, int y, int width, int height) +{ + rect->left = x; + rect->right = x + width; + rect->top = y; + rect->bottom = y + height; + if (rect->left > rect->right) + { + int tmp = rect->left; + rect->left = rect->right + 1; + rect->right = tmp + 1; + } + if (rect->top > rect->bottom) + { + int tmp = rect->top; + rect->top = rect->bottom + 1; + rect->bottom = tmp + 1; + } +} + +static void get_vis_rectangles(HDC hdc, struct bitblt_coords *dst, + const XFORM *xform, DWORD width, DWORD height, struct bitblt_coords *src) +{ + RECT rect; + + rect.left = dst->log_x; + rect.top = dst->log_y; + rect.right = dst->log_x + dst->log_width; + rect.bottom = dst->log_y + dst->log_height; + LPtoDP(hdc, (POINT *)&rect, 2); + dst->x = rect.left; + dst->y = rect.top; + dst->width = rect.right - rect.left; + dst->height = rect.bottom - rect.top; + if (dst->layout & LAYOUT_RTL && dst->layout & LAYOUT_BITMAPORIENTATIONPRESERVED) + { + dst->x += dst->width; + dst->width = -dst->width; + } + get_bounding_rect(&rect, dst->x, dst->y, dst->width, dst->height); + dst->visrect = rect; + + if (!src) return; + + rect.left = src->log_x; + rect.top = src->log_y; + rect.right = src->log_x + src->log_width; + rect.bottom = src->log_y + src->log_height; + translate(&rect, xform); + src->x = rect.left; + src->y = rect.top; + src->width = rect.right - rect.left; + src->height = rect.bottom - rect.top; + get_bounding_rect( &rect, src->x, src->y, src->width, src->height ); + src->visrect = rect; +} + +static int stretch_blt(PHYSDEV dev, const EMRSTRETCHBLT *blt, + const BITMAPINFO *bi, const BYTE *src_bits) +{ + char dst_buffer[FIELD_OFFSET(BITMAPINFO, bmiColors[256])]; + BITMAPINFO *dst_info = (BITMAPINFO *)dst_buffer; + struct bitblt_coords src, dst; + struct gdi_image_bits bits; + DWORD err; + + dst.log_x = blt->xDest; + dst.log_y = blt->yDest; + dst.log_width = blt->cxDest; + dst.log_height = blt->cyDest; + dst.layout = GetLayout(dev->hdc); + if (blt->dwRop & NOMIRRORBITMAP) + dst.layout |= LAYOUT_BITMAPORIENTATIONPRESERVED; + + if (!blt->cbBmiSrc) + { + get_vis_rectangles(dev->hdc, &dst, NULL, 0, 0, NULL); + return PSDRV_PatBlt(dev, &dst, blt->dwRop); + } + + src.log_x = blt->xSrc; + src.log_y = blt->ySrc; + src.log_width = blt->cxSrc; + src.log_height = blt->cySrc; + src.layout = 0; + + get_vis_rectangles(dev->hdc, &dst, &blt->xformSrc, + bi->bmiHeader.biWidth, bi->bmiHeader.biHeight, &src); + + memcpy(dst_info, bi, blt->cbBmiSrc); + memset(&bits, 0, sizeof(bits)); + bits.ptr = (BYTE *)src_bits; + err = PSDRV_PutImage(dev, 0, dst_info, &bits, &src, &dst, blt->dwRop); + if (err == ERROR_BAD_FORMAT) + { + HDC hdc = CreateCompatibleDC(NULL); + HBITMAP bitmap; + + bits.is_copy = TRUE; + bitmap = CreateDIBSection(hdc, dst_info, DIB_RGB_COLORS, &bits.ptr, NULL, 0); + SetDIBits(hdc, bitmap, 0, bi->bmiHeader.biHeight, src_bits, bi, blt->iUsageSrc); + + err = PSDRV_PutImage(dev, 0, dst_info, &bits, &src, &dst, blt->dwRop); + DeleteObject(bitmap); + DeleteObject(hdc); + } + + if (err != ERROR_SUCCESS) + FIXME("PutImage returned %ld\n", err); + return !err; +} + static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, const ENHMETARECORD *rec, int n, LPARAM arg) { @@ -366,6 +493,14 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, DeleteObject(rgn); return ret; } + case EMR_STRETCHBLT: + { + const EMRSTRETCHBLT *p = (const EMRSTRETCHBLT *)rec; + const BITMAPINFO *bi = (const BITMAPINFO *)((BYTE *)p + p->offBmiSrc); + const BYTE *src_bits = (BYTE *)p + p->offBitsSrc; + + return stretch_blt(&data->pdev->dev, p, bi, src_bits); + } case EMR_POLYBEZIER16: { const EMRPOLYBEZIER16 *p = (const EMRPOLYBEZIER16 *)rec; -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/2522
From: Piotr Caban <piotr(a)codeweavers.com> --- dlls/wineps.drv/printproc.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/dlls/wineps.drv/printproc.c b/dlls/wineps.drv/printproc.c index 39850af9311..22713229c26 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -493,6 +493,34 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, DeleteObject(rgn); return ret; } + case EMR_BITBLT: + { + const EMRBITBLT *p = (const EMRBITBLT *)rec; + const BITMAPINFO *bi = (const BITMAPINFO *)((BYTE *)p + p->offBmiSrc); + const BYTE *src_bits = (BYTE *)p + p->offBitsSrc; + EMRSTRETCHBLT blt; + + + blt.rclBounds = p->rclBounds; + blt.xDest = p->xDest; + blt.yDest = p->yDest; + blt.cxDest = p->cxDest; + blt.cyDest = p->cyDest; + blt.dwRop = p->dwRop; + blt.xSrc = p->xSrc; + blt.ySrc = p->ySrc; + blt.xformSrc = p->xformSrc; + blt.crBkColorSrc = p->crBkColorSrc; + blt.iUsageSrc = p->iUsageSrc; + blt.offBmiSrc = p->offBmiSrc; + blt.cbBmiSrc = p->cbBmiSrc; + blt.offBitsSrc = p->offBitsSrc; + blt.cbBitsSrc = p->cbBitsSrc; + blt.cxSrc = p->cxDest; + blt.cySrc = p->cyDest; + + return stretch_blt(&data->pdev->dev, &blt, bi, src_bits); + } case EMR_STRETCHBLT: { const EMRSTRETCHBLT *p = (const EMRSTRETCHBLT *)rec; -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/2522
This merge request was approved by Huw Davies. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/2522
participants (3)
-
Huw Davies (＠huw) -
Piotr Caban
-
Piotr Caban (＠piotr)