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

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

Piotr Caban : wineps: Don't store currently selected brush in print processor data.
by Alexandre Julliard April 14, 2023

April 14, 2023

Module: wine Branch: master Commit: 7dc4f9d0017dfda58c757908584ce11296c8a053 URL: https://gitlab.winehq.org/wine/wine/-/commit/7dc4f9d0017dfda58c757908584ce1… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 13 20:13:39 2023 +0200 wineps: Don't store currently selected brush in print processor data. --- dlls/wineps.drv/printproc.c | 36 +++++++++++++++++++++++------------- 1 file changed, 23 insertions(+), 13 deletions(-) diff --git a/dlls/wineps.drv/printproc.c b/dlls/wineps.drv/printproc.c index f46f7752a3c..9993d5e236b 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -41,7 +41,6 @@ struct pp_data WCHAR *doc_name; WCHAR *out_file; PSDRV_PDEVICE *pdev; - DWORD brush; struct brush_pattern *patterns; BOOL path; }; @@ -939,7 +938,24 @@ static HGDIOBJ get_object_handle(struct pp_data *data, HANDLETABLE *handletable, return handletable->objectHandle[i]; } -static BOOL fill_rgn(struct pp_data *data, HANDLETABLE *htable, DWORD brush, HRGN rgn) +static BOOL select_hbrush(struct pp_data *data, HANDLETABLE *htable, int handle_count, HBRUSH brush) +{ + struct brush_pattern *pattern = NULL; + int i; + + for (i = 0; i < handle_count; i++) + { + if (htable->objectHandle[i] == brush) + { + pattern = data->patterns + i; + break; + } + } + + return PSDRV_SelectBrush(&data->pdev->dev, brush, pattern) != NULL; +} + +static BOOL fill_rgn(struct pp_data *data, HANDLETABLE *htable, int handle_count, DWORD brush, HRGN rgn) { struct brush_pattern *pattern; HBRUSH hbrush; @@ -948,7 +964,7 @@ static BOOL fill_rgn(struct pp_data *data, HANDLETABLE *htable, DWORD brush, HRG hbrush = get_object_handle(data, htable, brush, &pattern); PSDRV_SelectBrush(&data->pdev->dev, hbrush, pattern); ret = PSDRV_PaintRgn(&data->pdev->dev, rgn); - hbrush = get_object_handle(data, htable, data->brush, &pattern); + select_hbrush(data, htable, handle_count, GetCurrentObject(data->pdev->dev.hdc, OBJ_BRUSH)); PSDRV_SelectBrush(&data->pdev->dev, hbrush, pattern); return ret; } @@ -1090,13 +1106,7 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, switch (GetObjectType(obj)) { case OBJ_PEN: return PSDRV_SelectPen(&data->pdev->dev, obj, NULL) != NULL; - case OBJ_BRUSH: - if (PSDRV_SelectBrush(&data->pdev->dev, obj, pattern)) - { - data->brush = so->ihObject; - return 1; - } - return 0; + case OBJ_BRUSH: return PSDRV_SelectBrush(&data->pdev->dev, obj, pattern) != NULL; default: FIXME("unhandled object type %ld\n", GetObjectType(obj)); return 1; @@ -1253,7 +1263,7 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, int ret; rgn = ExtCreateRegion(NULL, p->cbRgnData, (const RGNDATA *)p->RgnData); - ret = fill_rgn(data, htable, p->ihBrush, rgn); + ret = fill_rgn(data, htable, n, p->ihBrush, rgn); DeleteObject(rgn); return ret; } @@ -1277,7 +1287,7 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, OffsetRgn(rgn, 0, -p->szlStroke.cy); CombineRgn(frame, rgn, frame, RGN_DIFF); - ret = fill_rgn(data, htable, p->ihBrush, frame); + ret = fill_rgn(data, htable, n, p->ihBrush, frame); DeleteObject(rgn); DeleteObject(frame); return ret; @@ -1290,7 +1300,7 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, rgn = ExtCreateRegion(NULL, p->cbRgnData, (const RGNDATA *)p->RgnData); old_rop = SetROP2(data->pdev->dev.hdc, R2_NOT); - ret = fill_rgn(data, htable, 0x80000000 | BLACK_BRUSH, rgn); + ret = fill_rgn(data, htable, n, 0x80000000 | BLACK_BRUSH, rgn); SetROP2(data->pdev->dev.hdc, old_rop); DeleteObject(rgn); return ret;

1 0

Davide Beatrici : mmdevapi: Add missing includes to mmdevapi_private.h.
by Alexandre Julliard April 14, 2023

April 14, 2023

Module: wine Branch: master Commit: 6cfc37404b95ef5d2af84cc8c838ed23b49c595b URL: https://gitlab.winehq.org/wine/wine/-/commit/6cfc37404b95ef5d2af84cc8c838ed… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Thu Apr 13 21:54:31 2023 +0200 mmdevapi: Add missing includes to mmdevapi_private.h. --- dlls/mmdevapi/mmdevapi_private.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/mmdevapi/mmdevapi_private.h b/dlls/mmdevapi/mmdevapi_private.h index cd5b5a25a55..a468890dffd 100644 --- a/dlls/mmdevapi/mmdevapi_private.h +++ b/dlls/mmdevapi/mmdevapi_private.h @@ -16,13 +16,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "unixlib.h" - +#include <endpointvolume.h> +#include <spatialaudioclient.h> #include <winternl.h> #include <wine/list.h> #include <wine/unixlib.h> +#include "unixlib.h" + extern HRESULT MMDevEnum_Create(REFIID riid, void **ppv) DECLSPEC_HIDDEN; extern void MMDevEnum_Free(void) DECLSPEC_HIDDEN;

1 0

Davide Beatrici : mmdevapi: Add missing includes and typedef to mmdevdrv.h.
by Alexandre Julliard April 14, 2023

April 14, 2023

Module: wine Branch: master Commit: 27d88669b4c48f0c3b904741e50dcb20266be06e URL: https://gitlab.winehq.org/wine/wine/-/commit/27d88669b4c48f0c3b904741e50dcb… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Thu Apr 13 08:44:00 2023 +0200 mmdevapi: Add missing includes and typedef to mmdevdrv.h. --- dlls/mmdevapi/mmdevdrv.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/mmdevapi/mmdevdrv.h b/dlls/mmdevapi/mmdevdrv.h index f184f3cecc9..5c26b1b34d8 100644 --- a/dlls/mmdevapi/mmdevdrv.h +++ b/dlls/mmdevapi/mmdevdrv.h @@ -14,6 +14,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <audiopolicy.h> +#include <mmdeviceapi.h> + +#include <wine/list.h> + +typedef UINT64 stream_handle; + typedef struct audio_client ACImpl; typedef struct audio_session {

1 0