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

Zebediah Figura : include: Add D3D10CalcSubresource().
by Alexandre Julliard March 23, 2023

March 23, 2023

Module: wine Branch: master Commit: d8d8774568a6fc16bc4cb60c1e9438d3619bb2ff URL: https://gitlab.winehq.org/wine/wine/-/commit/d8d8774568a6fc16bc4cb60c1e9438… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Sep 2 13:16:19 2022 +0530 include: Add D3D10CalcSubresource(). --- include/d3d10.idl | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/include/d3d10.idl b/include/d3d10.idl index c35e44a0d92..794fa33ce67 100644 --- a/include/d3d10.idl +++ b/include/d3d10.idl @@ -252,6 +252,13 @@ cpp_quote("#define MAKE_D3D10_STATUS(code) MAKE_HRESULT( 0, _ cpp_quote("#define D3D10_ERROR_TOO_MANY_UNIQUE_STATE_OBJECTS MAKE_D3D10_HRESULT(1)") cpp_quote("#define D3D10_ERROR_FILE_NOT_FOUND MAKE_D3D10_HRESULT(2)") +cpp_quote("#if defined(__cplusplus) && !defined(D3D10_NO_HELPERS)") +cpp_quote("inline unsigned int D3D10CalcSubresource(unsigned int level, unsigned int layer, unsigned int level_count)") +cpp_quote("{") +cpp_quote(" return layer * level_count + level;") +cpp_quote("}") +cpp_quote("#endif") + typedef enum D3D10_BLEND { D3D10_BLEND_ZERO = 1, D3D10_BLEND_ONE = 2,

1 0

Rémi Bernon : widl: Rename (error|warning)_loc_info to (error|warning)_at.
by Alexandre Julliard March 23, 2023

March 23, 2023

Module: wine Branch: master Commit: edca5937fba5874f6550bd7f0f0f0d4ec1b8beab URL: https://gitlab.winehq.org/wine/wine/-/commit/edca5937fba5874f6550bd7f0f0f0d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Mar 21 10:40:25 2023 +0100 widl: Rename (error|warning)_loc_info to (error|warning)_at. --- tools/widl/expr.c | 62 ++++++++++------------- tools/widl/parser.y | 64 ++++++++++------------- tools/widl/typetree.c | 134 ++++++++++++++++++++++++++----------------------- tools/widl/typetree.h | 2 +- tools/widl/utils.c | 70 ++++++++++---------------- tools/widl/utils.h | 8 +-- tools/widl/widltypes.h | 9 ++-- 7 files changed, 157 insertions(+), 192 deletions(-)

1 0

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

March 23, 2023

Module: wine Branch: master Commit: c1dd7d6f52a7e8fb7eb36df992b12497e9bcb6f4 URL: https://gitlab.winehq.org/wine/wine/-/commit/c1dd7d6f52a7e8fb7eb36df992b124… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Mar 23 12:41:38 2023 +0100 wineps: Handle EMR_LINETO 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 c7c7d61437d..30ca6ef0ce9 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -181,6 +181,13 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, return PSDRV_Rectangle(&data->pdev->dev, rect->rclBox.left, rect->rclBox.top, rect->rclBox.right, rect->rclBox.bottom); } + case EMR_LINETO: + { + const EMRLINETO *line = (const EMRLINETO *)rec; + + 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_MOVETOEX: return PlayEnhMetaFileRecord(data->pdev->dev.hdc, htable, rec, n);

1 0

Brendan Shanks : ntdll: Print correct thread rename trace when using current thread ID with exception method.
by Alexandre Julliard March 23, 2023

March 23, 2023

Module: wine Branch: master Commit: 5f74cb94f1da140eafa5645f69416e47fd5dad13 URL: https://gitlab.winehq.org/wine/wine/-/commit/5f74cb94f1da140eafa5645f69416e… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Wed Mar 22 10:53:26 2023 -0700 ntdll: Print correct thread rename trace when using current thread ID with exception method. --- dlls/ntdll/signal_arm.c | 2 +- dlls/ntdll/signal_arm64.c | 2 +- dlls/ntdll/signal_i386.c | 2 +- dlls/ntdll/signal_x86_64.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index 47b535b69c5..4d6792f42db 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -478,7 +478,7 @@ NTSTATUS WINAPI KiUserExceptionDispatcher( EXCEPTION_RECORD *rec, CONTEXT *conte } else if (rec->ExceptionCode == EXCEPTION_WINE_NAME_THREAD && rec->ExceptionInformation[0] == 0x1000) { - if ((DWORD)rec->ExceptionInformation[2] == -1) + if ((DWORD)rec->ExceptionInformation[2] == -1 || (DWORD)rec->ExceptionInformation[2] == GetCurrentThreadId()) WARN_(threadname)( "Thread renamed to %s\n", debugstr_a((char *)rec->ExceptionInformation[1]) ); else WARN_(threadname)( "Thread ID %04lx renamed to %s\n", (DWORD)rec->ExceptionInformation[2], diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 90be8fc2232..3a2dea28b95 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -514,7 +514,7 @@ NTSTATUS WINAPI KiUserExceptionDispatcher( EXCEPTION_RECORD *rec, CONTEXT *conte } else if (rec->ExceptionCode == EXCEPTION_WINE_NAME_THREAD && rec->ExceptionInformation[0] == 0x1000) { - if ((DWORD)rec->ExceptionInformation[2] == -1) + if ((DWORD)rec->ExceptionInformation[2] == -1 || (DWORD)rec->ExceptionInformation[2] == GetCurrentThreadId()) WARN_(threadname)( "Thread renamed to %s\n", debugstr_a((char *)rec->ExceptionInformation[1]) ); else WARN_(threadname)( "Thread ID %04lx renamed to %s\n", (DWORD)rec->ExceptionInformation[2], diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 9709be34f8c..b2f251bf26a 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -192,7 +192,7 @@ NTSTATUS WINAPI dispatch_exception( EXCEPTION_RECORD *rec, CONTEXT *context ) } else if (rec->ExceptionCode == EXCEPTION_WINE_NAME_THREAD && rec->ExceptionInformation[0] == 0x1000) { - if ((DWORD)rec->ExceptionInformation[2] == -1) + if ((DWORD)rec->ExceptionInformation[2] == -1 || (DWORD)rec->ExceptionInformation[2] == GetCurrentThreadId()) WARN_(threadname)( "Thread renamed to %s\n", debugstr_a((char *)rec->ExceptionInformation[1]) ); else WARN_(threadname)( "Thread ID %04lx renamed to %s\n", (DWORD)rec->ExceptionInformation[2], diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 7ebd52766e6..5378a1ebee9 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -528,7 +528,7 @@ NTSTATUS WINAPI dispatch_exception( EXCEPTION_RECORD *rec, CONTEXT *context ) } else if (rec->ExceptionCode == EXCEPTION_WINE_NAME_THREAD && rec->ExceptionInformation[0] == 0x1000) { - if ((DWORD)rec->ExceptionInformation[2] == -1) + if ((DWORD)rec->ExceptionInformation[2] == -1 || (DWORD)rec->ExceptionInformation[2] == GetCurrentThreadId()) WARN_(threadname)( "Thread renamed to %s\n", debugstr_a((char *)rec->ExceptionInformation[1]) ); else WARN_(threadname)( "Thread ID %04lx renamed to %s\n", (DWORD)rec->ExceptionInformation[2],

1 0

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

March 23, 2023

Module: wine Branch: master Commit: 16489549f055b33764e591593407fa7d7cb47777 URL: https://gitlab.winehq.org/wine/wine/-/commit/16489549f055b33764e591593407fa… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Mar 23 12:40:26 2023 +0100 wineps: Handle EMR_MOVETOEX record in spool files. --- dlls/wineps.drv/printproc.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/wineps.drv/printproc.c b/dlls/wineps.drv/printproc.c index f0acc6dd5f1..c7c7d61437d 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -181,6 +181,9 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, return PSDRV_Rectangle(&data->pdev->dev, rect->rclBox.left, rect->rclBox.top, rect->rclBox.right, rect->rclBox.bottom); } + + case EMR_MOVETOEX: + return PlayEnhMetaFileRecord(data->pdev->dev.hdc, htable, rec, n); default: FIXME("unsupported record: %ld\n", rec->iType); }

1 0

Zebediah Figura : include: Use hexadecimal constants for XAudio flags.
by Alexandre Julliard March 23, 2023

March 23, 2023

Module: wine Branch: master Commit: fae48444afd78312684736e724d9ac0638a05182 URL: https://gitlab.winehq.org/wine/wine/-/commit/fae48444afd78312684736e724d9ac… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Mar 13 16:55:33 2023 -0500 include: Use hexadecimal constants for XAudio flags. --- include/xaudio2.idl | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/include/xaudio2.idl b/include/xaudio2.idl index 3201e86e31a..e9aeacc7ba8 100644 --- a/include/xaudio2.idl +++ b/include/xaudio2.idl @@ -1226,15 +1226,15 @@ interface IXAudio2 : IUnknown [in, defaultvalue(NULL)] void* pReserved); } -const UINT32 XAUDIO2_DEBUG_ENGINE = 1; -const UINT32 XAUDIO2_VOICE_NOPITCH = 2; -const UINT32 XAUDIO2_VOICE_NOSRC = 4; -const UINT32 XAUDIO2_VOICE_USEFILTER = 8; -const UINT32 XAUDIO2_VOICE_MUSIC = 16; -const UINT32 XAUDIO2_PLAY_TAILS = 32; -const UINT32 XAUDIO2_END_OF_STREAM = 64; -const UINT32 XAUDIO2_SEND_USEFILTER = 128; -const UINT32 XAUDIO2_VOICE_NOSAMPLESPLAYED = 256; +const UINT32 XAUDIO2_DEBUG_ENGINE = 0x00000001; +const UINT32 XAUDIO2_VOICE_NOPITCH = 0x00000002; +const UINT32 XAUDIO2_VOICE_NOSRC = 0x00000004; +const UINT32 XAUDIO2_VOICE_USEFILTER = 0x00000008; +const UINT32 XAUDIO2_VOICE_MUSIC = 0x00000010; +const UINT32 XAUDIO2_PLAY_TAILS = 0x00000020; +const UINT32 XAUDIO2_END_OF_STREAM = 0x00000040; +const UINT32 XAUDIO2_SEND_USEFILTER = 0x00000080; +const UINT32 XAUDIO2_VOICE_NOSAMPLESPLAYED = 0x00000100; const XAUDIO2_FILTER_TYPE XAUDIO2_DEFAULT_FILTER_TYPE = LowPassFilter; const float XAUDIO2_DEFAULT_FILTER_FREQUENCY = XAUDIO2_MAX_FILTER_FREQUENCY;

1 0

Piotr Caban : wineps: Handle brush selection in spool files.
by Alexandre Julliard March 23, 2023

March 23, 2023

Module: wine Branch: master Commit: e0cdf885d10cccf557a5480a0b1ce4d6df3de14d URL: https://gitlab.winehq.org/wine/wine/-/commit/e0cdf885d10cccf557a5480a0b1ce4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Mar 23 12:36:08 2023 +0100 wineps: Handle brush selection in spool files. --- dlls/wineps.drv/printproc.c | 36 +++++++++++++++++++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-) diff --git a/dlls/wineps.drv/printproc.c b/dlls/wineps.drv/printproc.c index 722bfc39cc0..5a4504dbd4d 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -40,6 +40,7 @@ struct pp_data WCHAR *doc_name; WCHAR *out_file; PSDRV_PDEVICE *pdev; + struct brush_pattern *patterns; }; typedef enum @@ -138,9 +139,40 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, switch (rec->iType) { case EMR_HEADER: - return PSDRV_StartPage(&data->pdev->dev); + { + const ENHMETAHEADER *header = (const ENHMETAHEADER *)rec; + + data->patterns = calloc(sizeof(*data->patterns), header->nHandles); + return data->patterns && PSDRV_StartPage(&data->pdev->dev); + } case EMR_EOF: return PSDRV_EndPage(&data->pdev->dev); + case EMR_SELECTOBJECT: + { + const EMRSELECTOBJECT *so = (const EMRSELECTOBJECT *)rec; + struct brush_pattern *pattern; + HGDIOBJ obj; + + if (so->ihObject & 0x80000000) + { + obj = GetStockObject(so->ihObject & 0x7fffffff); + pattern = NULL; + } + else + { + obj = (htable->objectHandle)[so->ihObject]; + pattern = data->patterns + so->ihObject; + } + SelectObject(data->pdev->dev.hdc, obj); + + switch (GetObjectType(obj)) + { + case OBJ_BRUSH: return PSDRV_SelectBrush(&data->pdev->dev, obj, pattern) != NULL; + default: + FIXME("unhandled object type %ld\n", GetObjectType(obj)); + return 1; + } + } default: FIXME("unsupported record: %ld\n", rec->iType); } @@ -187,6 +219,8 @@ static BOOL print_metafile(struct pp_data *data, HANDLE hdata) ret = EnumEnhMetaFile(NULL, hmf, hmf_proc, (void *)data, NULL); DeleteEnhMetaFile(hmf); + free(data->patterns); + data->patterns = NULL; return ret; }

1 0

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

March 23, 2023

Module: wine Branch: master Commit: 8d2f5f22c4cfaf35893716a35f9716a30b892416 URL: https://gitlab.winehq.org/wine/wine/-/commit/8d2f5f22c4cfaf35893716a35f9716… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Mar 23 12:30:13 2023 +0100 wineps: Handle EMR_EOF 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 62d0dc7c300..722bfc39cc0 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -139,6 +139,8 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, { case EMR_HEADER: return PSDRV_StartPage(&data->pdev->dev); + case EMR_EOF: + return PSDRV_EndPage(&data->pdev->dev); default: FIXME("unsupported record: %ld\n", rec->iType); }

1 0

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

March 23, 2023

Module: wine Branch: master Commit: 713d5d9644f5b68ae49ab934baae479d4c2b6b25 URL: https://gitlab.winehq.org/wine/wine/-/commit/713d5d9644f5b68ae49ab934baae47… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Mar 23 12:39:08 2023 +0100 wineps: Handle EMR_RECTANGLE 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 22985e0827c..f0acc6dd5f1 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -174,6 +174,13 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, return 1; } } + case EMR_RECTANGLE: + { + const EMRRECTANGLE *rect = (const EMRRECTANGLE *)rec; + + return PSDRV_Rectangle(&data->pdev->dev, rect->rclBox.left, + rect->rclBox.top, rect->rclBox.right, rect->rclBox.bottom); + } default: FIXME("unsupported record: %ld\n", rec->iType); }

1 0

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

March 23, 2023

Module: wine Branch: master Commit: 8ce850593726f20a490930078ab1a51ff29a10cd URL: https://gitlab.winehq.org/wine/wine/-/commit/8ce850593726f20a490930078ab1a5… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Mar 23 12:28:32 2023 +0100 wineps: Handle EMR_HEADER record in spool files. --- dlls/wineps.drv/printproc.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/wineps.drv/printproc.c b/dlls/wineps.drv/printproc.c index 8ea2aa09015..62d0dc7c300 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -133,7 +133,16 @@ static struct pp_data* get_handle_data(HANDLE pp) static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, const ENHMETARECORD *rec, int n, LPARAM arg) { - FIXME("unsupported record: %ld\n", rec->iType); + struct pp_data *data = (struct pp_data *)arg; + + switch (rec->iType) + { + case EMR_HEADER: + return PSDRV_StartPage(&data->pdev->dev); + default: + FIXME("unsupported record: %ld\n", rec->iType); + } + return 1; } @@ -174,7 +183,7 @@ static BOOL print_metafile(struct pp_data *data, HANDLE hdata) if (!hmf) return FALSE; - ret = EnumEnhMetaFile(NULL, hmf, hmf_proc, NULL, NULL); + ret = EnumEnhMetaFile(NULL, hmf, hmf_proc, (void *)data, NULL); DeleteEnhMetaFile(hmf); return ret; }

1 0