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

Piotr Caban : wineps: Handle EMR_ARC record in spool files.
by Alexandre Julliard March 24, 2023

March 24, 2023

Module: wine Branch: master Commit: 53acff5efb31c3f124213004ae32dc8e41b8772b URL: https://gitlab.winehq.org/wine/wine/-/commit/53acff5efb31c3f124213004ae32dc… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Mar 23 18:29:42 2023 +0100 wineps: Handle EMR_ARC 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 9a3de67489e..13846423a4d 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -225,6 +225,14 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, p->rclBox.top, p->rclBox.right, p->rclBox.bottom, p->szlCorner.cx, p->szlCorner.cy); } + case EMR_ARC: + { + const EMRARC *p = (const EMRARC *)rec; + + return PSDRV_Arc(&data->pdev->dev, p->rclBox.left, p->rclBox.top, + p->rclBox.right, p->rclBox.bottom, p->ptlStart.x, + p->ptlStart.y, p->ptlEnd.x, p->ptlEnd.y); + } case EMR_LINETO: { const EMRLINETO *line = (const EMRLINETO *)rec;

1 0

Piotr Caban : wineps: Handle EMR_ELLIPSE record in spool files.
by Alexandre Julliard March 24, 2023

March 24, 2023

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_POLYBEZIER record in spool files.
by Alexandre Julliard March 24, 2023

March 24, 2023

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_MODIFYWORLDTRANSFORM record in spool files.
by Alexandre Julliard March 24, 2023

March 24, 2023

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_SETWORLDTRANSFORM record in spool files.
by Alexandre Julliard March 24, 2023

March 24, 2023

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_POLYPOLYLINE record in spool files.
by Alexandre Julliard March 24, 2023

March 24, 2023

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_CREATEDIBPATTERNBRUSHPT record in spool files.
by Alexandre Julliard March 24, 2023

March 24, 2023

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_CREATEMONOBRUSH record in spool files.
by Alexandre Julliard March 24, 2023

March 24, 2023

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

Alexandre Julliard : vkd3d: Import upstream release 1.7.
by Alexandre Julliard March 24, 2023

March 24, 2023

Module: wine Branch: master Commit: 75ab8431145a014c7303cca3b4b6b18de2cd08d4 URL: https://gitlab.winehq.org/wine/wine/-/commit/75ab8431145a014c7303cca3b4b6b1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 24 12:55:34 2023 +0100 vkd3d: Import upstream release 1.7. --- include/d3d12.idl | 1 + include/wine/list.h | 24 + libs/vkd3d/AUTHORS | 1 + libs/vkd3d/COPYING | 2 +- libs/vkd3d/include/vkd3d.h | 13 + libs/vkd3d/include/vkd3d_shader.h | 213 ++- libs/vkd3d/libs/vkd3d-shader/d3dbc.c | 110 +- libs/vkd3d/libs/vkd3d-shader/dxbc.c | 366 ++++-- libs/vkd3d/libs/vkd3d-shader/glsl.c | 26 +- libs/vkd3d/libs/vkd3d-shader/hlsl.c | 770 +++++++++-- libs/vkd3d/libs/vkd3d-shader/hlsl.h | 290 ++++- libs/vkd3d/libs/vkd3d-shader/hlsl.l | 6 +- libs/vkd3d/libs/vkd3d-shader/hlsl.y | 1372 ++++++++++++++++---- libs/vkd3d/libs/vkd3d-shader/hlsl_codegen.c | 1025 ++++++++++++--- libs/vkd3d/libs/vkd3d-shader/hlsl_constant_ops.c | 10 +- libs/vkd3d/libs/vkd3d-shader/hlsl_sm1.c | 179 ++- libs/vkd3d/libs/vkd3d-shader/hlsl_sm4.c | 264 ++-- libs/vkd3d/libs/vkd3d-shader/sm4.h | 3 + libs/vkd3d/libs/vkd3d-shader/spirv.c | 48 +- libs/vkd3d/libs/vkd3d-shader/trace.c | 36 +- libs/vkd3d/libs/vkd3d-shader/vkd3d_shader_main.c | 160 ++- .../vkd3d/libs/vkd3d-shader/vkd3d_shader_private.h | 105 +- libs/vkd3d/libs/vkd3d/command.c | 603 ++++----- libs/vkd3d/libs/vkd3d/device.c | 245 +--- libs/vkd3d/libs/vkd3d/resource.c | 198 ++- libs/vkd3d/libs/vkd3d/state.c | 44 +- libs/vkd3d/libs/vkd3d/utils.c | 21 +- libs/vkd3d/libs/vkd3d/vkd3d_private.h | 184 +-- 28 files changed, 4509 insertions(+), 1810 deletions(-)

1 0

Alexandre Julliard : ntdll: Convert WoW context to native context when running in 32-bit code.
by Alexandre Julliard March 24, 2023

March 24, 2023

Module: wine Branch: master Commit: 5031c6d938f119580e8dbc7817ef68724d17954e URL: https://gitlab.winehq.org/wine/wine/-/commit/5031c6d938f119580e8dbc7817ef68… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 24 14:40:46 2023 +0100 ntdll: Convert WoW context to native context when running in 32-bit code. It fixes single-stepping in the kernel32:debugger tests. --- dlls/ntdll/unix/thread.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index bf025a38188..4c8c04cf9fc 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -1068,7 +1068,10 @@ static void contexts_from_server( CONTEXT *context, context_t server_contexts[2] if (native_context) { context_from_server( native_context, &server_contexts[0], native_machine ); - if (wow_context) context_from_server( wow_context, &server_contexts[1], main_image_info.Machine ); + if (wow_context) + context_from_server( wow_context, &server_contexts[1], main_image_info.Machine ); + else + context_from_server( native_context, &server_contexts[1], native_machine ); } else context_from_server( wow_context, &server_contexts[0], main_image_info.Machine ); }

1 0