- Wine-Commits - list.winehq.org

Rémi Bernon : mfreadwrite/reader: Introduce a new source_reader_allocate_stream_sample helper.
by Alexandre Julliard Feb. 16, 2024

Feb. 16, 2024

Module: wine Branch: master Commit: 8946e6df7edbcc8b6e2adfb9cce8c337a1daa697 URL: https://gitlab.winehq.org/wine/wine/-/commit/8946e6df7edbcc8b6e2adfb9cce8c3… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jan 23 22:16:10 2024 +0100 mfreadwrite/reader: Introduce a new source_reader_allocate_stream_sample helper. --- dlls/mfreadwrite/reader.c | 51 ++++++++++++++++++++++++++--------------------- 1 file changed, 28 insertions(+), 23 deletions(-) diff --git a/dlls/mfreadwrite/reader.c b/dlls/mfreadwrite/reader.c index 3d3d8a2c31f..ed5ffa3b759 100644 --- a/dlls/mfreadwrite/reader.c +++ b/dlls/mfreadwrite/reader.c @@ -655,42 +655,47 @@ static ULONG WINAPI source_reader_stream_events_callback_Release(IMFAsyncCallbac return source_reader_release(reader); } +static HRESULT source_reader_allocate_stream_sample(MFT_OUTPUT_STREAM_INFO *info, IMFSample **out) +{ + IMFMediaBuffer *buffer; + IMFSample *sample; + HRESULT hr; + + *out = NULL; + if (FAILED(hr = MFCreateSample(&sample))) + return hr; + if (SUCCEEDED(hr = MFCreateAlignedMemoryBuffer(info->cbSize, info->cbAlignment, &buffer))) + { + if (SUCCEEDED(hr = IMFSample_AddBuffer(sample, buffer))) + { + *out = sample; + IMFSample_AddRef(sample); + } + IMFMediaBuffer_Release(buffer); + } + + IMFSample_Release(sample); + return hr; +} + static HRESULT source_reader_pull_transform_samples(struct source_reader *reader, struct media_stream *stream, struct transform_entry *entry) { MFT_OUTPUT_STREAM_INFO stream_info = { 0 }; - MFT_OUTPUT_DATA_BUFFER out_buffer; - unsigned int buffer_size; - IMFMediaBuffer *buffer; DWORD status; HRESULT hr; if (FAILED(hr = IMFTransform_GetOutputStreamInfo(entry->transform, 0, &stream_info))) - { - WARN("Failed to get output stream info, hr %#lx.\n", hr); return hr; - } + stream_info.cbSize = max(stream_info.cbSize, entry->min_buffer_size); for (;;) { - memset(&out_buffer, 0, sizeof(out_buffer)); - - if (!(stream_info.dwFlags & (MFT_OUTPUT_STREAM_PROVIDES_SAMPLES | MFT_OUTPUT_STREAM_CAN_PROVIDE_SAMPLES))) - { - if (FAILED(hr = MFCreateSample(&out_buffer.pSample))) - break; + MFT_OUTPUT_DATA_BUFFER out_buffer = {0}; - buffer_size = max(stream_info.cbSize, entry->min_buffer_size); - - if (FAILED(hr = MFCreateAlignedMemoryBuffer(buffer_size, stream_info.cbAlignment, &buffer))) - { - IMFSample_Release(out_buffer.pSample); - break; - } - - IMFSample_AddBuffer(out_buffer.pSample, buffer); - IMFMediaBuffer_Release(buffer); - } + if (!(stream_info.dwFlags & (MFT_OUTPUT_STREAM_PROVIDES_SAMPLES | MFT_OUTPUT_STREAM_CAN_PROVIDE_SAMPLES)) + && FAILED(hr = source_reader_allocate_stream_sample(&stream_info, &out_buffer.pSample))) + break; if (FAILED(hr = IMFTransform_ProcessOutput(entry->transform, 0, 1, &out_buffer, &status))) {

1 0

Rémi Bernon : mfreadwrite/reader: Introduce source_reader_queue_sample helper.
by Alexandre Julliard Feb. 16, 2024

Feb. 16, 2024

Module: wine Branch: master Commit: cbb343567ac155d581bf484e66238ec1e411c79d URL: https://gitlab.winehq.org/wine/wine/-/commit/cbb343567ac155d581bf484e66238e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jan 23 21:16:06 2024 +0100 mfreadwrite/reader: Introduce source_reader_queue_sample helper. --- dlls/mfreadwrite/reader.c | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/dlls/mfreadwrite/reader.c b/dlls/mfreadwrite/reader.c index 057e771ca99..2ef8ade360d 100644 --- a/dlls/mfreadwrite/reader.c +++ b/dlls/mfreadwrite/reader.c @@ -463,6 +463,17 @@ static HRESULT source_reader_queue_response(struct source_reader *reader, struct return S_OK; } +static HRESULT source_reader_queue_sample(struct source_reader *reader, struct media_stream *stream, + IMFSample *sample) +{ + LONGLONG timestamp = 0; + + if (FAILED(IMFSample_GetSampleTime(sample, &timestamp))) + WARN("Sample time wasn't set.\n"); + + return source_reader_queue_response(reader, stream, S_OK, 0, timestamp, sample); +} + static HRESULT source_reader_request_sample(struct source_reader *reader, struct media_stream *stream) { HRESULT hr = S_OK; @@ -650,7 +661,6 @@ static HRESULT source_reader_pull_stream_samples(struct source_reader *reader, s MFT_OUTPUT_DATA_BUFFER out_buffer; unsigned int buffer_size; IMFMediaBuffer *buffer; - LONGLONG timestamp; DWORD status; HRESULT hr; @@ -688,11 +698,7 @@ static HRESULT source_reader_pull_stream_samples(struct source_reader *reader, s break; } - timestamp = 0; - if (FAILED(IMFSample_GetSampleTime(out_buffer.pSample, &timestamp))) - WARN("Sample time wasn't set.\n"); - - source_reader_queue_response(reader, stream, S_OK /* FIXME */, 0, timestamp, out_buffer.pSample); + source_reader_queue_sample(reader, stream, out_buffer.pSample); if (out_buffer.pSample) IMFSample_Release(out_buffer.pSample); if (out_buffer.pEvents) @@ -705,17 +711,10 @@ static HRESULT source_reader_pull_stream_samples(struct source_reader *reader, s static HRESULT source_reader_process_sample(struct source_reader *reader, struct media_stream *stream, IMFSample *sample) { - LONGLONG timestamp; HRESULT hr; if (!stream->decoder.transform) - { - timestamp = 0; - if (FAILED(IMFSample_GetSampleTime(sample, &timestamp))) - WARN("Sample time wasn't set.\n"); - - return source_reader_queue_response(reader, stream, S_OK, 0, timestamp, sample); - } + return source_reader_queue_sample(reader, stream, sample); /* It's assumed that decoder has 1 input and 1 output, both id's are 0. */

1 0

Paul Gofman : ntdll: Don't hardcode xstate size in exception stack layout.
by Alexandre Julliard Feb. 16, 2024

Feb. 16, 2024

Module: wine Branch: master Commit: dfe2b717a622fd551053d880d2185281fb237a65 URL: https://gitlab.winehq.org/wine/wine/-/commit/dfe2b717a622fd551053d880d21852… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Jan 31 16:26:16 2024 -0600 ntdll: Don't hardcode xstate size in exception stack layout. --- dlls/ntdll/unix/signal_i386.c | 63 +++++++++++++++++++---------------------- dlls/ntdll/unix/signal_x86_64.c | 47 +++++++++++++++--------------- 2 files changed, 53 insertions(+), 57 deletions(-)

1 0

Rémi Bernon : mfreadwrite/reader: Pass the transform to source_reader_pull_stream_samples.
by Alexandre Julliard Feb. 16, 2024

Feb. 16, 2024

Module: wine Branch: master Commit: dd6e8198e0af73449e5ed9550e4f9053cf40c985 URL: https://gitlab.winehq.org/wine/wine/-/commit/dd6e8198e0af73449e5ed9550e4f90… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jan 23 22:07:59 2024 +0100 mfreadwrite/reader: Pass the transform to source_reader_pull_stream_samples. --- dlls/mfreadwrite/reader.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/mfreadwrite/reader.c b/dlls/mfreadwrite/reader.c index 2ef8ade360d..3d3d8a2c31f 100644 --- a/dlls/mfreadwrite/reader.c +++ b/dlls/mfreadwrite/reader.c @@ -71,7 +71,7 @@ enum media_stream_flags STREAM_FLAG_STOPPED = 0x8, /* Received MEStreamStopped */ }; -struct stream_transform +struct transform_entry { IMFTransform *transform; unsigned int min_buffer_size; @@ -81,7 +81,7 @@ struct media_stream { IMFMediaStream *stream; IMFMediaType *current; - struct stream_transform decoder; + struct transform_entry decoder; IMFVideoSampleAllocatorEx *allocator; DWORD id; unsigned int index; @@ -655,7 +655,8 @@ static ULONG WINAPI source_reader_stream_events_callback_Release(IMFAsyncCallbac return source_reader_release(reader); } -static HRESULT source_reader_pull_stream_samples(struct source_reader *reader, struct media_stream *stream) +static HRESULT source_reader_pull_transform_samples(struct source_reader *reader, struct media_stream *stream, + struct transform_entry *entry) { MFT_OUTPUT_STREAM_INFO stream_info = { 0 }; MFT_OUTPUT_DATA_BUFFER out_buffer; @@ -664,7 +665,7 @@ static HRESULT source_reader_pull_stream_samples(struct source_reader *reader, s DWORD status; HRESULT hr; - if (FAILED(hr = IMFTransform_GetOutputStreamInfo(stream->decoder.transform, 0, &stream_info))) + if (FAILED(hr = IMFTransform_GetOutputStreamInfo(entry->transform, 0, &stream_info))) { WARN("Failed to get output stream info, hr %#lx.\n", hr); return hr; @@ -679,7 +680,7 @@ static HRESULT source_reader_pull_stream_samples(struct source_reader *reader, s if (FAILED(hr = MFCreateSample(&out_buffer.pSample))) break; - buffer_size = max(stream_info.cbSize, stream->decoder.min_buffer_size); + buffer_size = max(stream_info.cbSize, entry->min_buffer_size); if (FAILED(hr = MFCreateAlignedMemoryBuffer(buffer_size, stream_info.cbAlignment, &buffer))) { @@ -691,7 +692,7 @@ static HRESULT source_reader_pull_stream_samples(struct source_reader *reader, s IMFMediaBuffer_Release(buffer); } - if (FAILED(hr = IMFTransform_ProcessOutput(stream->decoder.transform, 0, 1, &out_buffer, &status))) + if (FAILED(hr = IMFTransform_ProcessOutput(entry->transform, 0, 1, &out_buffer, &status))) { if (out_buffer.pSample) IMFSample_Release(out_buffer.pSample); @@ -718,7 +719,7 @@ static HRESULT source_reader_process_sample(struct source_reader *reader, struct /* It's assumed that decoder has 1 input and 1 output, both id's are 0. */ - hr = source_reader_pull_stream_samples(reader, stream); + hr = source_reader_pull_transform_samples(reader, stream, &stream->decoder); if (hr == MF_E_TRANSFORM_NEED_MORE_INPUT) { if (FAILED(hr = IMFTransform_ProcessInput(stream->decoder.transform, 0, sample, 0))) @@ -727,7 +728,7 @@ static HRESULT source_reader_process_sample(struct source_reader *reader, struct return hr; } - if ((hr = source_reader_pull_stream_samples(reader, stream)) == MF_E_TRANSFORM_NEED_MORE_INPUT) + if ((hr = source_reader_pull_transform_samples(reader, stream, &stream->decoder)) == MF_E_TRANSFORM_NEED_MORE_INPUT) return S_OK; } else @@ -821,7 +822,7 @@ static HRESULT source_reader_media_stream_state_handler(struct source_reader *re if (stream->decoder.transform && SUCCEEDED(IMFTransform_ProcessMessage(stream->decoder.transform, MFT_MESSAGE_COMMAND_DRAIN, 0))) { - if ((hr = source_reader_pull_stream_samples(reader, stream)) != MF_E_TRANSFORM_NEED_MORE_INPUT) + if ((hr = source_reader_pull_transform_samples(reader, stream, &stream->decoder)) != MF_E_TRANSFORM_NEED_MORE_INPUT) WARN("Failed to pull pending samples, hr %#lx.\n", hr); }

1 0

Alexandre Julliard : ntdll: Implement EC_CONTEXT unwinding operation on ARM64.
by Alexandre Julliard Feb. 16, 2024

Feb. 16, 2024

Module: wine Branch: master Commit: f4ac9b35c2c587919be6c3539dfdd833e200e777 URL: https://gitlab.winehq.org/wine/wine/-/commit/f4ac9b35c2c587919be6c3539dfdd8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 16 13:06:31 2024 +0100 ntdll: Implement EC_CONTEXT unwinding operation on ARM64. --- dlls/ntdll/tests/exception.c | 38 ++++++++++++++++++++++++++++++++++++++ dlls/ntdll/unwind.c | 4 ++++ 2 files changed, 42 insertions(+) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index a4f1a706c3f..41bf0a2d273 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -8096,6 +8096,7 @@ static void test_collided_unwind(void) #define UWOP_TRAP_FRAME 0xE8 #define UWOP_MACHINE_FRAME 0xE9 #define UWOP_CONTEXT 0xEA +#define UWOP_EC_CONTEXT 0xEB #define UWOP_CLEAR_UNWOUND_TO_CALL 0xEC struct results @@ -8969,6 +8970,42 @@ static void test_virtual_unwind(void) { 0x14, 0x00, 0, 0x08, 0x020, TRUE, { {x29, 0x00}, {lr, 0x08}, {x19,0x10}, {x20,0x18}, {-1,-1} }}, }; + static const BYTE function_16[] = + { + 0xff, 0x43, 0x00, 0xd1, /* 00: sub sp, sp, #16 */ + 0x1f, 0x20, 0x03, 0xd5, /* 04: nop */ + 0xff, 0x43, 0x00, 0xd1, /* 08: sub sp, sp, #16 */ + 0x1f, 0x20, 0x03, 0xd5, /* 0c: nop */ + 0xc0, 0x03, 0x5f, 0xd6, /* 10: ret */ + }; + + static const DWORD unwind_info_16_header = + (sizeof(function_16)/4) | /* function length */ + (0 << 20) | /* X */ + (0 << 21) | /* E */ + (0 << 22) | /* epilog */ + (1 << 27); /* codes */ + + static const BYTE unwind_info_16[] = + { + DW(unwind_info_16_header), + + UWOP_ALLOC_SMALL(16), /* sub sp, sp, #16 */ + UWOP_EC_CONTEXT, + UWOP_ALLOC_SMALL(16), /* sub sp, sp, #16 */ + UWOP_END, + }; + + static const struct results results_16[] = + { + /* offset fp handler pc frame offset registers */ + { 0x00, 0x00, 0, ORIG_LR, 0x010, TRUE, { {-1,-1} }}, + { 0x04, 0x00, 0 , 0x00f8, 0x0a8, FALSE, { {x0, 0x80}, {x1, 0x88}, {x2, 0xb8}, {x3, 0xc0}, {x4, 0xc8}, {x5, 0xd0}, {x6, 0x130}, {x7, 0x140}, {x8, 0x78}, {x9, 0x150}, {x10, 0x160}, {x11, 0x170}, {x12, 0x180}, {x13, 0}, {x14, 0}, {x15, 0x190}, {x16, 0x0158014801380128}, {x17, 0x0198018801780168}, {x18, 0}, {x19, 0xd8}, {x20, 0xe0}, {x21, 0xe8}, {x22, 0x0f0}, {x23, 0}, {x24, 0}, {x25, 0xa8}, {x26, 0xb0}, {x27, 0x90}, {x28, 0}, {x29, 0xa0}, {lr, 0x120}, {d0, 0x1a0}, {d1, 0x1b0}, {d2, 0x1c0}, {d3, 0x1d0}, {d4, 0x1e0}, {d5, 0x1f0}, {d6, 0x200}, {d7, 0x210}, {d8, 0x220}, {d9, 0x230}, {d10, 0x240}, {d11, 0x250}, {d12, 0x260}, {d13, 0x270}, {d14, 0x280}, {d15, 0x290}, {-1,-1} }}, + { 0x08, 0x00, 0 , 0x0108, 0x0b8, FALSE, { {x0, 0x90}, {x1, 0x98}, {x2, 0xc8}, {x3, 0xd0}, {x4, 0xd8}, {x5, 0xe0}, {x6, 0x140}, {x7, 0x150}, {x8, 0x88}, {x9, 0x160}, {x10, 0x170}, {x11, 0x180}, {x12, 0x190}, {x13, 0}, {x14, 0}, {x15, 0x1a0}, {x16, 0x0168015801480138}, {x17, 0x01a8019801880178}, {x18, 0}, {x19, 0xe8}, {x20, 0xf0}, {x21, 0xf8}, {x22, 0x100}, {x23, 0}, {x24, 0}, {x25, 0xb8}, {x26, 0xc0}, {x27, 0xa0}, {x28, 0}, {x29, 0xb0}, {lr, 0x130}, {d0, 0x1b0}, {d1, 0x1c0}, {d2, 0x1d0}, {d3, 0x1e0}, {d4, 0x1f0}, {d5, 0x200}, {d6, 0x210}, {d7, 0x220}, {d8, 0x230}, {d9, 0x240}, {d10, 0x250}, {d11, 0x260}, {d12, 0x270}, {d13, 0x280}, {d14, 0x290}, {d15, 0x2a0}, {-1,-1} }}, + { 0x0c, 0x00, 0 , 0x0108, 0x0b8, FALSE, { {x0, 0x90}, {x1, 0x98}, {x2, 0xc8}, {x3, 0xd0}, {x4, 0xd8}, {x5, 0xe0}, {x6, 0x140}, {x7, 0x150}, {x8, 0x88}, {x9, 0x160}, {x10, 0x170}, {x11, 0x180}, {x12, 0x190}, {x13, 0}, {x14, 0}, {x15, 0x1a0}, {x16, 0x0168015801480138}, {x17, 0x01a8019801880178}, {x18, 0}, {x19, 0xe8}, {x20, 0xf0}, {x21, 0xf8}, {x22, 0x100}, {x23, 0}, {x24, 0}, {x25, 0xb8}, {x26, 0xc0}, {x27, 0xa0}, {x28, 0}, {x29, 0xb0}, {lr, 0x130}, {d0, 0x1b0}, {d1, 0x1c0}, {d2, 0x1d0}, {d3, 0x1e0}, {d4, 0x1f0}, {d5, 0x200}, {d6, 0x210}, {d7, 0x220}, {d8, 0x230}, {d9, 0x240}, {d10, 0x250}, {d11, 0x260}, {d12, 0x270}, {d13, 0x280}, {d14, 0x290}, {d15, 0x2a0}, {-1,-1} }}, + { 0x10, 0x00, 0 , 0x0108, 0x0b8, FALSE, { {x0, 0x90}, {x1, 0x98}, {x2, 0xc8}, {x3, 0xd0}, {x4, 0xd8}, {x5, 0xe0}, {x6, 0x140}, {x7, 0x150}, {x8, 0x88}, {x9, 0x160}, {x10, 0x170}, {x11, 0x180}, {x12, 0x190}, {x13, 0}, {x14, 0}, {x15, 0x1a0}, {x16, 0x0168015801480138}, {x17, 0x01a8019801880178}, {x18, 0}, {x19, 0xe8}, {x20, 0xf0}, {x21, 0xf8}, {x22, 0x100}, {x23, 0}, {x24, 0}, {x25, 0xb8}, {x26, 0xc0}, {x27, 0xa0}, {x28, 0}, {x29, 0xb0}, {lr, 0x130}, {d0, 0x1b0}, {d1, 0x1c0}, {d2, 0x1d0}, {d3, 0x1e0}, {d4, 0x1f0}, {d5, 0x200}, {d6, 0x210}, {d7, 0x220}, {d8, 0x230}, {d9, 0x240}, {d10, 0x250}, {d11, 0x260}, {d12, 0x270}, {d13, 0x280}, {d14, 0x290}, {d15, 0x2a0}, {-1,-1} }}, + }; + static const struct unwind_test tests[] = { #define TEST(func, unwind, unwind_packed, results) \ @@ -8989,6 +9026,7 @@ static void test_virtual_unwind(void) TEST(function_13, unwind_info_13, 1, results_13), TEST(function_14, unwind_info_14, 0, results_14), TEST(function_15, unwind_info_15, 0, results_15), + TEST(function_16, unwind_info_16, 0, results_16), #undef TEST }; unsigned int i; diff --git a/dlls/ntdll/unwind.c b/dlls/ntdll/unwind.c index d6e86dd717a..9e50e0fd67b 100644 --- a/dlls/ntdll/unwind.c +++ b/dlls/ntdll/unwind.c @@ -471,6 +471,10 @@ static void process_unwind_codes( BYTE *ptr, BYTE *end, ARM64_NT_CONTEXT *contex { memcpy( context, (DWORD64 *)context->Sp, sizeof(CONTEXT) ); } + else if (*ptr == 0xeb) /* MSFT_OP_EC_CONTEXT */ + { + context_x64_to_arm( context, (ARM64EC_NT_CONTEXT *)context->Sp ); + } else if (*ptr == 0xfc) /* pac_sign_lr */ { do_pac_auth( context );

1 0

Alexandre Julliard : ntdll: Ignore home parameters saving when unwinding epilog on ARM64.
by Alexandre Julliard Feb. 16, 2024

Feb. 16, 2024

Module: wine Branch: master Commit: 41d7baa0139252f66042313f366b199e710f7b7b URL: https://gitlab.winehq.org/wine/wine/-/commit/41d7baa0139252f66042313f366b19… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 16 12:41:03 2024 +0100 ntdll: Ignore home parameters saving when unwinding epilog on ARM64. --- dlls/ntdll/tests/exception.c | 8 ++++---- dlls/ntdll/unwind.c | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 6fb02a62bc8..a4f1a706c3f 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -8724,10 +8724,10 @@ static void test_virtual_unwind(void) { 0x14, 0x00, 0, ORIG_LR, 0x050, TRUE, { {x19, 0x00}, {-1,-1} }}, { 0x18, 0x00, 0, ORIG_LR, 0x070, TRUE, { {x19, 0x20}, {-1,-1} }}, { 0x1c, 0x00, 0, ORIG_LR, 0x070, TRUE, { {x19, 0x20}, {-1,-1} }}, - { 0x20, 0x00, 0, ORIG_LR, 0x050, TRUE, { {x19, 0x00}, {-1,-1} }}, - { 0x24, 0x00, 0, ORIG_LR, 0x050, TRUE, { {x19, 0x00}, {-1,-1} }}, - { 0x28, 0x00, 0, ORIG_LR, 0x050, TRUE, { {x19, 0x00}, {-1,-1} }}, - { 0x2c, 0x00, 0, ORIG_LR, 0x050, TRUE, { {x19, 0x00}, {-1,-1} }}, + { 0x20, 0x00, 0, ORIG_LR, 0x070, TRUE, { {x19, 0x20}, {-1,-1} }}, + { 0x24, 0x00, 0, ORIG_LR, 0x070, TRUE, { {x19, 0x20}, {-1,-1} }}, + { 0x28, 0x00, 0, ORIG_LR, 0x070, TRUE, { {x19, 0x20}, {-1,-1} }}, + { 0x2c, 0x00, 0, ORIG_LR, 0x070, TRUE, { {x19, 0x20}, {-1,-1} }}, { 0x30, 0x00, 0, ORIG_LR, 0x050, TRUE, { {x19, 0x00}, {-1,-1} }}, { 0x34, 0x00, 0, ORIG_LR, 0x000, TRUE, { {-1,-1} }}, }; diff --git a/dlls/ntdll/unwind.c b/dlls/ntdll/unwind.c index 7ca744bc4f8..f13d3ba09ae 100644 --- a/dlls/ntdll/unwind.c +++ b/dlls/ntdll/unwind.c @@ -489,7 +489,7 @@ static void *unwind_packed_data( ULONG_PTR base, ULONG_PTR pc, ARM64_RUNTIME_FUN { int i; unsigned int len, offset, skip = 0; - unsigned int int_size = func->RegI * 8, fp_size = func->RegF * 8, regsave, local_size; + unsigned int int_size = func->RegI * 8, fp_size = func->RegF * 8, h_size = func->H * 4, regsave, local_size; unsigned int int_regs, fp_regs, saved_regs, local_size_regs; TRACE( "function %I64x-%I64x: len=%#x flag=%x regF=%u regI=%u H=%u CR=%u frame=%x\n", @@ -530,14 +530,14 @@ static void *unwind_packed_data( ULONG_PTR base, ULONG_PTR pc, ARM64_RUNTIME_FUN if (local_size > 4088) len++; /* sub sp,sp,#4088 */ break; } - len += 4 * func->H; - if (offset < len) /* prolog */ + if (offset < len + h_size) /* prolog */ { - skip = len - offset; + skip = len + h_size - offset; } else if (offset >= func->FunctionLength - (len + 1)) /* epilog */ { skip = offset - (func->FunctionLength - (len + 1)); + h_size = 0; } } } @@ -584,7 +584,7 @@ static void *unwind_packed_data( ULONG_PTR base, ULONG_PTR pc, ARM64_RUNTIME_FUN break; } - if (func->H) pos += 4; + pos += h_size; if (fp_size) {

1 0

Paul Gofman : ntdll: Don't hardcode xstate feature mask.
by Alexandre Julliard Feb. 16, 2024

Feb. 16, 2024

Module: wine Branch: master Commit: 1e0728c5d48d87b38c54f655702bf2e639aa4f34 URL: https://gitlab.winehq.org/wine/wine/-/commit/1e0728c5d48d87b38c54f655702bf2… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Jan 31 14:24:24 2024 -0600 ntdll: Don't hardcode xstate feature mask. --- dlls/ntdll/unix/signal_i386.c | 61 +++++++++++++++++++++-------------------- dlls/ntdll/unix/signal_x86_64.c | 61 ++++++++++++++++++++++++++--------------- dlls/ntdll/unix/system.c | 4 +++ dlls/ntdll/unix/unix_private.h | 9 ++++++ 4 files changed, 84 insertions(+), 51 deletions(-)

1 0

Alexandre Julliard : ntdll: Always set non-volatile pointers for ARM64 unwinding.
by Alexandre Julliard Feb. 16, 2024

Feb. 16, 2024

Module: wine Branch: master Commit: af4ef5fa02a1f30f15db0f1724fc3efc045f2757 URL: https://gitlab.winehq.org/wine/wine/-/commit/af4ef5fa02a1f30f15db0f1724fc3e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 16 17:12:02 2024 +0100 ntdll: Always set non-volatile pointers for ARM64 unwinding. --- dlls/ntdll/tests/exception.c | 59 ++++++++++++++++++++++++++------------------ dlls/ntdll/unwind.c | 13 +++++++--- 2 files changed, 44 insertions(+), 28 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 85d3d139e55..722f3126278 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -8119,6 +8119,7 @@ struct unwind_test const struct results *results; unsigned int nb_results; int unwound_clear; + int last_set_reg_ptr; }; enum regs @@ -8170,7 +8171,7 @@ static void call_virtual_unwind( int testnum, const struct unwind_test *test ) for (i = 0; i < test->nb_results; i++) { winetest_push_context( "%u/%u", testnum, i ); - memset( &ctx_ptr, 0, sizeof(ctx_ptr) ); + memset( &ctx_ptr, 0x55, sizeof(ctx_ptr) ); memset( &context, 0x55, sizeof(context) ); memset( &unset_reg, 0x55, sizeof(unset_reg) ); for (j = 0; j < 256; j++) fake_stack[j] = j * 8; @@ -8255,17 +8256,27 @@ static void call_virtual_unwind( int testnum, const struct unwind_test *test ) if (test->results[i].regs[k][0] == j) break; } - if (regptr) - ok( k < nb_regs, "register %s should not be set to %llx\n", reg_names[j], regval ); - if (k < nb_regs) { ok( regval == test->results[i].regs[k][1], "register %s wrong %llx/%llx\n", reg_names[j], regval, test->results[i].regs[k][1] ); + if (regptr) + { + if (test->last_set_reg_ptr && j > test->last_set_reg_ptr && j <= 30) + ok( regptr == (void *)unset_reg, "register %s should not have pointer set\n", reg_names[j] ); + else + { + ok( regptr != (void *)unset_reg, "register %s should have pointer set\n", reg_names[j] ); + if (regptr != (void *)unset_reg) + ok( *regptr == regval, "register %s should have reg pointer to %llx / %llx\n", + reg_names[j], *regptr, regval ); + } + } } else { ok( k == nb_regs, "register %s should be set\n", reg_names[j] ); + ok( !regptr || regptr == (void *)unset_reg, "register %s should not have pointer set\n", reg_names[j] ); if (j == lr) ok( context.Lr == ORIG_LR, "register lr wrong %llx/unset\n", context.Lr ); else if (j == x29) @@ -9052,26 +9063,26 @@ static void test_virtual_unwind(void) static const struct unwind_test tests[] = { -#define TEST(func, unwind, unwind_packed, results, unwound_clear) \ - { func, sizeof(func), unwind, unwind_packed ? 0 : sizeof(unwind), results, ARRAY_SIZE(results), unwound_clear } - TEST(function_0, unwind_info_0, 0, results_0, 0), - TEST(function_1, unwind_info_1, 1, results_1, 0), - TEST(function_2, unwind_info_2, 0, results_2, 1), - TEST(function_3, unwind_info_3, 0, results_3, 1), - TEST(function_4, unwind_info_4, 0, results_4, 0), - TEST(function_5, unwind_info_5, 0, results_5, 0), - TEST(function_6, unwind_info_6, 1, results_6, 0), - TEST(function_7, unwind_info_7, 1, results_7, 0), - TEST(function_8, unwind_info_8, 1, results_8, 0), - TEST(function_9, unwind_info_9, 1, results_9, 0), - TEST(function_10, unwind_info_10, 1, results_10, 0), - TEST(function_11, unwind_info_11, 1, results_11, 0), - TEST(function_12, unwind_info_12, 1, results_12, 0), - TEST(function_13, unwind_info_13, 1, results_13, 0), - TEST(function_14, unwind_info_14, 0, results_14, 0), - TEST(function_15, unwind_info_15, 0, results_15, 0), - TEST(function_16, unwind_info_16, 0, results_16, 1), - TEST(function_17, unwind_info_17, 0, results_17, 2), +#define TEST(func, unwind, unwind_packed, results, unwound_clear, last_ptr) \ + { func, sizeof(func), unwind, unwind_packed ? 0 : sizeof(unwind), results, ARRAY_SIZE(results), unwound_clear, last_ptr } + TEST(function_0, unwind_info_0, 0, results_0, 0, 0), + TEST(function_1, unwind_info_1, 1, results_1, 0, 0), + TEST(function_2, unwind_info_2, 0, results_2, 1, 0), + TEST(function_3, unwind_info_3, 0, results_3, 1, x28), + TEST(function_4, unwind_info_4, 0, results_4, 0, 0), + TEST(function_5, unwind_info_5, 0, results_5, 0, 0), + TEST(function_6, unwind_info_6, 1, results_6, 0, 0), + TEST(function_7, unwind_info_7, 1, results_7, 0, 0), + TEST(function_8, unwind_info_8, 1, results_8, 0, 0), + TEST(function_9, unwind_info_9, 1, results_9, 0, 0), + TEST(function_10, unwind_info_10, 1, results_10, 0, 0), + TEST(function_11, unwind_info_11, 1, results_11, 0, 0), + TEST(function_12, unwind_info_12, 1, results_12, 0, 0), + TEST(function_13, unwind_info_13, 1, results_13, 0, 0), + TEST(function_14, unwind_info_14, 0, results_14, 0, 0), + TEST(function_15, unwind_info_15, 0, results_15, 0, 0), + TEST(function_16, unwind_info_16, 0, results_16, 1, x18), + TEST(function_17, unwind_info_17, 0, results_17, 2, 0), #undef TEST }; unsigned int i; diff --git a/dlls/ntdll/unwind.c b/dlls/ntdll/unwind.c index a7cd28785b8..5c8a01e4e8a 100644 --- a/dlls/ntdll/unwind.c +++ b/dlls/ntdll/unwind.c @@ -388,7 +388,7 @@ static void do_pac_auth( ARM64_NT_CONTEXT *context ) static void process_unwind_codes( BYTE *ptr, BYTE *end, ARM64_NT_CONTEXT *context, KNONVOLATILE_CONTEXT_POINTERS_ARM64 *ptrs, int skip ) { - unsigned int val, len, save_next = 2; + unsigned int i, val, len, save_next = 2; /* skip codes */ while (ptr < end && skip) @@ -473,6 +473,11 @@ static void process_unwind_codes( BYTE *ptr, BYTE *end, ARM64_NT_CONTEXT *contex ARM64_NT_CONTEXT *src_ctx = (ARM64_NT_CONTEXT *)context->Sp; *context = *src_ctx; context->ContextFlags = flags | (src_ctx->ContextFlags & CONTEXT_UNWOUND_TO_CALL); + if (ptrs) + { + for (i = 19; i < 29; i++) (&ptrs->X19)[i - 19] = &src_ctx->X[i]; + for (i = 8; i < 16; i++) (&ptrs->D8)[i - 8] = &src_ctx->V[i].Low; + } } else if (*ptr == 0xeb) /* MSFT_OP_EC_CONTEXT */ { @@ -480,6 +485,7 @@ static void process_unwind_codes( BYTE *ptr, BYTE *end, ARM64_NT_CONTEXT *contex ARM64EC_NT_CONTEXT *src_ctx = (ARM64EC_NT_CONTEXT *)context->Sp; context_x64_to_arm( context, src_ctx ); context->ContextFlags = flags | (src_ctx->ContextFlags & CONTEXT_UNWOUND_TO_CALL); + if (ptrs) for (i = 8; i < 16; i++) (&ptrs->D8)[i - 8] = &src_ctx->V[i].Low; } else if (*ptr == 0xec) /* MSFT_OP_CLEAR_UNWOUND_TO_CALL */ { @@ -562,10 +568,9 @@ static void *unwind_packed_data( ULONG_PTR base, ULONG_PTR pc, ARM64_RUNTIME_FUN { if (func->CR == 3 || func->CR == 2) { - DWORD64 *fp = (DWORD64 *) context->Fp; /* X[29] */ + /* mov x29,sp */ context->Sp = context->Fp; - context->X[29] = fp[0]; - context->X[30] = fp[1]; + restore_regs( 29, 2, 0, context, ptrs ); } context->Sp += local_size; if (fp_size) restore_fpregs( 8, fp_regs, int_regs, context, ptrs );

1 0

Alexandre Julliard : ntdll: Implement CLEAR_UNWOUND_TO_CALL unwinding operation on ARM64.
by Alexandre Julliard Feb. 16, 2024

Feb. 16, 2024

Module: wine Branch: master Commit: 14a290e77da9d7d644c95015a980e7d65d4a23fc URL: https://gitlab.winehq.org/wine/wine/-/commit/14a290e77da9d7d644c95015a980e7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 16 15:48:44 2024 +0100 ntdll: Implement CLEAR_UNWOUND_TO_CALL unwinding operation on ARM64. --- dlls/ntdll/tests/exception.c | 83 ++++++++++++++++++++++++++++++++++---------- dlls/ntdll/unwind.c | 26 +++++++++----- 2 files changed, 82 insertions(+), 27 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 41bf0a2d273..85d3d139e55 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -8118,6 +8118,7 @@ struct unwind_test size_t unwind_size; const struct results *results; unsigned int nb_results; + int unwound_clear; }; enum regs @@ -8177,6 +8178,9 @@ static void call_virtual_unwind( int testnum, const struct unwind_test *test ) context.Sp = (ULONG_PTR)fake_stack; context.Lr = (ULONG_PTR)ORIG_LR; context.Fp = (ULONG_PTR)fake_stack + test->results[i].fp_offset; + context.ContextFlags = 0xcccc; + if (test->unwound_clear) context.ContextFlags |= CONTEXT_ARM64_UNWOUND_TO_CALL; + orig_fp = context.Fp; orig_pc = (ULONG64)code_mem + code_offset + test->results[i].pc_offset; @@ -8204,6 +8208,12 @@ static void call_virtual_unwind( int testnum, const struct unwind_test *test ) (void *)context.Pc, (void*)test->results[i].pc ); ok( frame == (test->results[i].frame_offset ? (ULONG64)fake_stack : 0) + test->results[i].frame, "wrong frame %p/%p\n", (void *)frame, (char *)(test->results[i].frame_offset ? fake_stack : NULL) + test->results[i].frame ); + if (!test->unwound_clear || i < test->unwound_clear) + ok( context.ContextFlags == (0xcccc | CONTEXT_ARM64_UNWOUND_TO_CALL), + "wrong flags %lx\n", context.ContextFlags ); + else + ok( context.ContextFlags == 0xcccc, + "wrong flags %lx\n", context.ContextFlags ); sp_offset = 0; for (k = 0; k < nb_regs; k++) @@ -9006,27 +9016,62 @@ static void test_virtual_unwind(void) { 0x10, 0x00, 0 , 0x0108, 0x0b8, FALSE, { {x0, 0x90}, {x1, 0x98}, {x2, 0xc8}, {x3, 0xd0}, {x4, 0xd8}, {x5, 0xe0}, {x6, 0x140}, {x7, 0x150}, {x8, 0x88}, {x9, 0x160}, {x10, 0x170}, {x11, 0x180}, {x12, 0x190}, {x13, 0}, {x14, 0}, {x15, 0x1a0}, {x16, 0x0168015801480138}, {x17, 0x01a8019801880178}, {x18, 0}, {x19, 0xe8}, {x20, 0xf0}, {x21, 0xf8}, {x22, 0x100}, {x23, 0}, {x24, 0}, {x25, 0xb8}, {x26, 0xc0}, {x27, 0xa0}, {x28, 0}, {x29, 0xb0}, {lr, 0x130}, {d0, 0x1b0}, {d1, 0x1c0}, {d2, 0x1d0}, {d3, 0x1e0}, {d4, 0x1f0}, {d5, 0x200}, {d6, 0x210}, {d7, 0x220}, {d8, 0x230}, {d9, 0x240}, {d10, 0x250}, {d11, 0x260}, {d12, 0x270}, {d13, 0x280}, {d14, 0x290}, {d15, 0x2a0}, {-1,-1} }}, }; + static const BYTE function_17[] = + { + 0xff, 0x43, 0x00, 0xd1, /* 00: sub sp, sp, #16 */ + 0xff, 0x43, 0x00, 0xd1, /* 04: sub sp, sp, #16 */ + 0x1f, 0x20, 0x03, 0xd5, /* 08: nop */ + 0xc0, 0x03, 0x5f, 0xd6, /* 0c: ret */ + }; + + static const DWORD unwind_info_17_header = + (sizeof(function_17)/4) | /* function length */ + (0 << 20) | /* X */ + (0 << 21) | /* E */ + (0 << 22) | /* epilog */ + (1 << 27); /* codes */ + + static const BYTE unwind_info_17[] = + { + DW(unwind_info_17_header), + + UWOP_CLEAR_UNWOUND_TO_CALL, + UWOP_ALLOC_SMALL(16), /* sub sp, sp, #16 */ + UWOP_ALLOC_SMALL(16), /* sub sp, sp, #16 */ + UWOP_END, + }; + + static const struct results results_17[] = + { + /* offset fp handler pc frame offset registers */ + { 0x00, 0x00, 0, ORIG_LR, 0x010, TRUE, { {-1,-1} }}, + { 0x04, 0x00, 0, ORIG_LR, 0x020, TRUE, { {-1,-1} }}, + { 0x08, 0x00, 0, ORIG_LR, 0x020, TRUE, { {-1,-1} }}, + { 0x0c, 0x00, 0, ORIG_LR, 0x020, TRUE, { {-1,-1} }}, + }; + static const struct unwind_test tests[] = { -#define TEST(func, unwind, unwind_packed, results) \ - { func, sizeof(func), unwind, unwind_packed ? 0 : sizeof(unwind), results, ARRAY_SIZE(results) } - TEST(function_0, unwind_info_0, 0, results_0), - TEST(function_1, unwind_info_1, 1, results_1), - TEST(function_2, unwind_info_2, 0, results_2), - TEST(function_3, unwind_info_3, 0, results_3), - TEST(function_4, unwind_info_4, 0, results_4), - TEST(function_5, unwind_info_5, 0, results_5), - TEST(function_6, unwind_info_6, 1, results_6), - TEST(function_7, unwind_info_7, 1, results_7), - TEST(function_8, unwind_info_8, 1, results_8), - TEST(function_9, unwind_info_9, 1, results_9), - TEST(function_10, unwind_info_10, 1, results_10), - TEST(function_11, unwind_info_11, 1, results_11), - TEST(function_12, unwind_info_12, 1, results_12), - TEST(function_13, unwind_info_13, 1, results_13), - TEST(function_14, unwind_info_14, 0, results_14), - TEST(function_15, unwind_info_15, 0, results_15), - TEST(function_16, unwind_info_16, 0, results_16), +#define TEST(func, unwind, unwind_packed, results, unwound_clear) \ + { func, sizeof(func), unwind, unwind_packed ? 0 : sizeof(unwind), results, ARRAY_SIZE(results), unwound_clear } + TEST(function_0, unwind_info_0, 0, results_0, 0), + TEST(function_1, unwind_info_1, 1, results_1, 0), + TEST(function_2, unwind_info_2, 0, results_2, 1), + TEST(function_3, unwind_info_3, 0, results_3, 1), + TEST(function_4, unwind_info_4, 0, results_4, 0), + TEST(function_5, unwind_info_5, 0, results_5, 0), + TEST(function_6, unwind_info_6, 1, results_6, 0), + TEST(function_7, unwind_info_7, 1, results_7, 0), + TEST(function_8, unwind_info_8, 1, results_8, 0), + TEST(function_9, unwind_info_9, 1, results_9, 0), + TEST(function_10, unwind_info_10, 1, results_10, 0), + TEST(function_11, unwind_info_11, 1, results_11, 0), + TEST(function_12, unwind_info_12, 1, results_12, 0), + TEST(function_13, unwind_info_13, 1, results_13, 0), + TEST(function_14, unwind_info_14, 0, results_14, 0), + TEST(function_15, unwind_info_15, 0, results_15, 0), + TEST(function_16, unwind_info_16, 0, results_16, 1), + TEST(function_17, unwind_info_17, 0, results_17, 2), #undef TEST }; unsigned int i; diff --git a/dlls/ntdll/unwind.c b/dlls/ntdll/unwind.c index 9e50e0fd67b..a7cd28785b8 100644 --- a/dlls/ntdll/unwind.c +++ b/dlls/ntdll/unwind.c @@ -469,11 +469,22 @@ static void process_unwind_codes( BYTE *ptr, BYTE *end, ARM64_NT_CONTEXT *contex } else if (*ptr == 0xea) /* MSFT_OP_CONTEXT */ { - memcpy( context, (DWORD64 *)context->Sp, sizeof(CONTEXT) ); + DWORD flags = context->ContextFlags & ~CONTEXT_UNWOUND_TO_CALL; + ARM64_NT_CONTEXT *src_ctx = (ARM64_NT_CONTEXT *)context->Sp; + *context = *src_ctx; + context->ContextFlags = flags | (src_ctx->ContextFlags & CONTEXT_UNWOUND_TO_CALL); } else if (*ptr == 0xeb) /* MSFT_OP_EC_CONTEXT */ { - context_x64_to_arm( context, (ARM64EC_NT_CONTEXT *)context->Sp ); + DWORD flags = context->ContextFlags & ~CONTEXT_UNWOUND_TO_CALL; + ARM64EC_NT_CONTEXT *src_ctx = (ARM64EC_NT_CONTEXT *)context->Sp; + context_x64_to_arm( context, src_ctx ); + context->ContextFlags = flags | (src_ctx->ContextFlags & CONTEXT_UNWOUND_TO_CALL); + } + else if (*ptr == 0xec) /* MSFT_OP_CLEAR_UNWOUND_TO_CALL */ + { + context->Pc = context->Lr; + context->ContextFlags &= ~CONTEXT_UNWOUND_TO_CALL; } else if (*ptr == 0xfc) /* pac_sign_lr */ { @@ -766,19 +777,16 @@ PVOID WINAPI RtlVirtualUnwind( ULONG type, ULONG_PTR base, ULONG_PTR pc, TRACE( "type %lx pc %I64x sp %I64x func %I64x\n", type, pc, context->Sp, base + func->BeginAddress ); *handler_data = NULL; + context->ContextFlags |= CONTEXT_UNWOUND_TO_CALL; - context->Pc = 0; if (func->Flag) handler = unwind_packed_data( base, pc, func, context, ctx_ptr ); else handler = unwind_full_data( base, pc, func, context, handler_data, ctx_ptr ); + if (context->ContextFlags & CONTEXT_UNWOUND_TO_CALL) context->Pc = context->Lr; + TRACE( "ret: pc=%I64x lr=%I64x sp=%I64x handler=%p\n", context->Pc, context->Lr, context->Sp, handler ); - if (!context->Pc) - { - context->Pc = context->Lr; - context->ContextFlags |= CONTEXT_UNWOUND_TO_CALL; - } *frame_ret = context->Sp; return handler; } @@ -1798,6 +1806,7 @@ PVOID WINAPI RtlVirtualUnwind( ULONG type, ULONG64 base, ULONG64 pc, #ifdef __arm64ec__ if (RtlIsEcCode( (void *)pc )) { + DWORD flags = context->ContextFlags & ~CONTEXT_UNWOUND_TO_CALL; ARM64_NT_CONTEXT arm_context; void *ret; @@ -1805,6 +1814,7 @@ PVOID WINAPI RtlVirtualUnwind( ULONG type, ULONG64 base, ULONG64 pc, ret = RtlVirtualUnwind_arm64( type, base, pc, (ARM64_RUNTIME_FUNCTION *)function, &arm_context, data, frame_ret, NULL ); context_arm_to_x64( (ARM64EC_NT_CONTEXT *)context, &arm_context ); + context->ContextFlags = flags | (arm_context.ContextFlags & CONTEXT_UNWOUND_TO_CALL); return ret; } #endif

1 0

Alexandre Julliard : ntdll: Move ARM64 context conversion functions to a new header.
by Alexandre Julliard Feb. 16, 2024

Feb. 16, 2024

Module: wine Branch: master Commit: 931c1a6887da46514dbea17866d2010992f0b6c1 URL: https://gitlab.winehq.org/wine/wine/-/commit/931c1a6887da46514dbea17866d201… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 16 13:03:03 2024 +0100 ntdll: Move ARM64 context conversion functions to a new header. --- dlls/ntdll/ntdll_misc.h | 5 - dlls/ntdll/signal_arm64ec.c | 219 +++---------------------------------------- dlls/ntdll/unwind.c | 5 +- dlls/ntdll/unwind.h | 221 ++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 237 insertions(+), 213 deletions(-)

1 0