- Wine-Commits - list.winehq.org

Piotr Caban : wineps: Handle EMR_EXTESCAPE record in spool files.
by Alexandre Julliard April 14, 2023

April 14, 2023

Module: wine Branch: master Commit: dcf8b5cd4b779f16eec1ebe8c0fdf5f715635e0d URL: https://gitlab.winehq.org/wine/wine/-/commit/dcf8b5cd4b779f16eec1ebe8c0fdf5… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 13 20:20:18 2023 +0200 wineps: Handle EMR_EXTESCAPE record in spool files. --- dlls/wineps.drv/printproc.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/wineps.drv/printproc.c b/dlls/wineps.drv/printproc.c index 849afc625b8..a9961b0a7b8 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -1559,6 +1559,19 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, data->patterns[p->ihBrush].bits.ptr = (BYTE *)p + p->offBits; return 1; } + case EMR_EXTESCAPE: + { + const struct EMREXTESCAPE + { + EMR emr; + DWORD escape; + DWORD size; + BYTE data[1]; + } *p = (const struct EMREXTESCAPE *)rec; + + PSDRV_ExtEscape(&data->pdev->dev, p->escape, p->size, p->data, 0, NULL); + return 1; + } case EMR_GRADIENTFILL: { const EMRGRADIENTFILL *p = (const EMRGRADIENTFILL *)rec;

1 0

Piotr Caban : wineps: Handle EMR_SETPOLYFILLMODE record in spool files.
by Alexandre Julliard April 14, 2023

April 14, 2023

Module: wine Branch: master Commit: 0ee21cc04f2f4750ae0c8daa96676c82ff1e41a6 URL: https://gitlab.winehq.org/wine/wine/-/commit/0ee21cc04f2f4750ae0c8daa96676c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 13 20:25:39 2023 +0200 wineps: Handle EMR_SETPOLYFILLMODE 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 94cb1e11ea2..fd0e5f21772 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -1592,6 +1592,7 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, case EMR_SETMAPPERFLAGS: case EMR_SETMAPMODE: case EMR_SETBKMODE: + case EMR_SETPOLYFILLMODE: case EMR_SETROP2: case EMR_SETSTRETCHBLTMODE: case EMR_SETTEXTALIGN:

1 0

Piotr Caban : wineps: Handle EMR_SETMAPMODE record in spool files.
by Alexandre Julliard April 14, 2023

April 14, 2023

Module: wine Branch: master Commit: 0afe5837f69eba07fb4d1b4469f45e83426612c9 URL: https://gitlab.winehq.org/wine/wine/-/commit/0afe5837f69eba07fb4d1b4469f45e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 13 20:24:27 2023 +0200 wineps: Handle EMR_SETMAPMODE 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 97dbc933e6e..d81fa9c9ee1 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -1590,6 +1590,7 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, case EMR_SETVIEWPORTORGEX: case EMR_SETBRUSHORGEX: case EMR_SETMAPPERFLAGS: + case EMR_SETMAPMODE: case EMR_SETROP2: case EMR_SETSTRETCHBLTMODE: case EMR_SETTEXTALIGN:

1 0

Piotr Caban : wineps: Handle EMR_SETMAPPERFLAGS record in spool files.
by Alexandre Julliard April 14, 2023

April 14, 2023

Module: wine Branch: master Commit: d282f40895038d3819ea5736794a9fb6116c4be9 URL: https://gitlab.winehq.org/wine/wine/-/commit/d282f40895038d3819ea5736794a9f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 13 20:23:50 2023 +0200 wineps: Handle EMR_SETMAPPERFLAGS 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 94de63da075..97dbc933e6e 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -1589,6 +1589,7 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, case EMR_SETVIEWPORTEXTEX: case EMR_SETVIEWPORTORGEX: case EMR_SETBRUSHORGEX: + case EMR_SETMAPPERFLAGS: case EMR_SETROP2: case EMR_SETSTRETCHBLTMODE: case EMR_SETTEXTALIGN:

1 0

Piotr Caban : wineps: Handle EMR_SETBKMODE record in spool files.
by Alexandre Julliard April 14, 2023

April 14, 2023

Module: wine Branch: master Commit: 021d2ca11475e3fb86f53665f5f418694b948918 URL: https://gitlab.winehq.org/wine/wine/-/commit/021d2ca11475e3fb86f53665f5f418… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 13 20:25:01 2023 +0200 wineps: Handle EMR_SETBKMODE 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 d81fa9c9ee1..94cb1e11ea2 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -1591,6 +1591,7 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, case EMR_SETBRUSHORGEX: case EMR_SETMAPPERFLAGS: case EMR_SETMAPMODE: + case EMR_SETBKMODE: case EMR_SETROP2: case EMR_SETSTRETCHBLTMODE: case EMR_SETTEXTALIGN:

1 0

Piotr Caban : wineps: Silence FIXME message on EMR_EXTFLOODFILL record.
by Alexandre Julliard April 14, 2023

April 14, 2023

Module: wine Branch: master Commit: 5bf693ed86b78212d6b68389b1fe8f6073afa7fc URL: https://gitlab.winehq.org/wine/wine/-/commit/5bf693ed86b78212d6b68389b1fe8f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 13 20:23:01 2023 +0200 wineps: Silence FIXME message on EMR_EXTFLOODFILL record. --- 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 24f6157c835..94de63da075 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -1580,6 +1580,7 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, p->Ver + p->nVer, p->nTri, p->ulMode); } + case EMR_EXTFLOODFILL: case EMR_ALPHABLEND: break;

1 0

Piotr Caban : wineps: Handle EMR_SAVEDC in spool files.
by Alexandre Julliard April 14, 2023

April 14, 2023

Module: wine Branch: master Commit: fe3abe4ff289767942a7e7e316ec658f12a1637c URL: https://gitlab.winehq.org/wine/wine/-/commit/fe3abe4ff289767942a7e7e316ec65… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 13 20:17:45 2023 +0200 wineps: Handle EMR_SAVEDC 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 5e6b5489b0d..29cb718f199 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -1569,6 +1569,7 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, case EMR_INTERSECTCLIPRECT: case EMR_SCALEVIEWPORTEXTEX: case EMR_SCALEWINDOWEXTEX: + case EMR_SAVEDC: case EMR_SETWORLDTRANSFORM: case EMR_MODIFYWORLDTRANSFORM: case EMR_CREATEPEN:

1 0

Piotr Caban : wineps: Handle EMR_SETBKCOLOR record in spool files.
by Alexandre Julliard April 14, 2023

April 14, 2023

Module: wine Branch: master Commit: e26b3ba30a2e18ff55851e98e64210eba1b7a728 URL: https://gitlab.winehq.org/wine/wine/-/commit/e26b3ba30a2e18ff55851e98e64210… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 13 20:17:02 2023 +0200 wineps: Handle EMR_SETBKCOLOR 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 c6b2651ee0b..5e6b5489b0d 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -1102,6 +1102,14 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, PSDRV_SetTextColor(&data->pdev->dev, p->crColor); return 1; } + case EMR_SETBKCOLOR: + { + const EMRSETBKCOLOR *p = (const EMRSETBKCOLOR *)rec; + + SetBkColor(data->pdev->dev.hdc, p->crColor); + PSDRV_SetBkColor(&data->pdev->dev, p->crColor); + return 1; + } case EMR_SELECTOBJECT: { const EMRSELECTOBJECT *so = (const EMRSELECTOBJECT *)rec;

1 0

Piotr Caban : wineps: Handle EMR_RESTOREDC record in spool files.
by Alexandre Julliard April 14, 2023

April 14, 2023

Module: wine Branch: master Commit: 5104fcd797bd0ec29197c82e98e3e7092def2182 URL: https://gitlab.winehq.org/wine/wine/-/commit/5104fcd797bd0ec29197c82e98e3e7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 13 20:19:19 2023 +0200 wineps: Handle EMR_RESTOREDC record in spool files. --- dlls/wineps.drv/printproc.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dlls/wineps.drv/printproc.c b/dlls/wineps.drv/printproc.c index 29cb718f199..849afc625b8 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -1110,6 +1110,18 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, PSDRV_SetBkColor(&data->pdev->dev, p->crColor); return 1; } + case EMR_RESTOREDC: + { + HDC hdc = data->pdev->dev.hdc; + int ret = PlayEnhMetaFileRecord(hdc, htable, rec, n); + + select_hbrush(data, htable, n, GetCurrentObject(hdc, OBJ_BRUSH)); + /* TODO: reselect font */ + PSDRV_SelectPen(&data->pdev->dev, GetCurrentObject(hdc, OBJ_PEN), NULL); + PSDRV_SetBkColor(&data->pdev->dev, GetBkColor(hdc)); + PSDRV_SetTextColor(&data->pdev->dev, GetTextColor(hdc)); + return ret; + } case EMR_SELECTOBJECT: { const EMRSELECTOBJECT *so = (const EMRSELECTOBJECT *)rec;

1 0

Piotr Caban : wineps: Handle EMR_SETTEXTCOLOR record in spool files.
by Alexandre Julliard April 14, 2023

April 14, 2023

Module: wine Branch: master Commit: 90191dbacc2d8d61f5f6f3a364e713605843b94d URL: https://gitlab.winehq.org/wine/wine/-/commit/90191dbacc2d8d61f5f6f3a364e713… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 13 20:16:08 2023 +0200 wineps: Handle EMR_SETTEXTCOLOR 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 9993d5e236b..c6b2651ee0b 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -1094,6 +1094,14 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, return PSDRV_SetPixel(&data->pdev->dev, p->ptlPixel.x, p->ptlPixel.y, p->crColor); } + case EMR_SETTEXTCOLOR: + { + const EMRSETTEXTCOLOR *p = (const EMRSETTEXTCOLOR *)rec; + + SetTextColor(data->pdev->dev.hdc, p->crColor); + PSDRV_SetTextColor(&data->pdev->dev, p->crColor); + return 1; + } case EMR_SELECTOBJECT: { const EMRSELECTOBJECT *so = (const EMRSELECTOBJECT *)rec;

1 0