January 2024 - Wine-commits

Zebediah Figura : wined3d: Collapse some trivially nested ifs into a single condition.
by Alexandre Julliard 26 Jan '24

26 Jan '24

Module: wine Branch: master Commit: 34232874adadb198d1715b22e6faf504c560612e URL: https://gitlab.winehq.org/wine/wine/-/commit/34232874adadb198d1715b22e6faf5… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jan 22 17:07:04 2024 -0600 wined3d: Collapse some trivially nested ifs into a single condition. --- dlls/wined3d/utils.c | 54 +++++++++++++++++++++++++++------------------------- 1 file changed, 28 insertions(+), 26 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index a0b1fded9f5..24bbad0f6fa 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -6477,35 +6477,37 @@ void wined3d_ffp_get_fs_settings(const struct wined3d_context *context, const st aarg0 = (args[aop] & ARG0) ? state->texture_states[i][WINED3D_TSS_ALPHA_ARG0] : ARG_UNUSED; } - if (!i && texture && state->render_states[WINED3D_RS_COLORKEYENABLE]) + if (!i && state->render_states[WINED3D_RS_COLORKEYENABLE] + && texture && !(texture->resource.usage & WINED3DUSAGE_LEGACY_CUBEMAP) + && (texture->async.color_key_flags & WINED3D_CKEY_SRC_BLT) && !texture->resource.format->alpha_size) { - if (!(texture->resource.usage & WINED3DUSAGE_LEGACY_CUBEMAP)) + if (aop == WINED3D_TOP_DISABLE) { - if (texture->async.color_key_flags & WINED3D_CKEY_SRC_BLT && !texture->resource.format->alpha_size) + aarg1 = WINED3DTA_TEXTURE; + aop = WINED3D_TOP_SELECT_ARG1; + } + else if (aop == WINED3D_TOP_SELECT_ARG1 && aarg1 != WINED3DTA_TEXTURE) + { + if (state->blend_state && state->blend_state->desc.rt[0].enable) { - if (aop == WINED3D_TOP_DISABLE) - { - aarg1 = WINED3DTA_TEXTURE; - aop = WINED3D_TOP_SELECT_ARG1; - } - else if (aop == WINED3D_TOP_SELECT_ARG1 && aarg1 != WINED3DTA_TEXTURE) - { - if (state->blend_state && state->blend_state->desc.rt[0].enable) - { - aarg2 = WINED3DTA_TEXTURE; - aop = WINED3D_TOP_MODULATE; - } - else aarg1 = WINED3DTA_TEXTURE; - } - else if (aop == WINED3D_TOP_SELECT_ARG2 && aarg2 != WINED3DTA_TEXTURE) - { - if (state->blend_state && state->blend_state->desc.rt[0].enable) - { - aarg1 = WINED3DTA_TEXTURE; - aop = WINED3D_TOP_MODULATE; - } - else aarg2 = WINED3DTA_TEXTURE; - } + aarg2 = WINED3DTA_TEXTURE; + aop = WINED3D_TOP_MODULATE; + } + else + { + aarg1 = WINED3DTA_TEXTURE; + } + } + else if (aop == WINED3D_TOP_SELECT_ARG2 && aarg2 != WINED3DTA_TEXTURE) + { + if (state->blend_state && state->blend_state->desc.rt[0].enable) + { + aarg1 = WINED3DTA_TEXTURE; + aop = WINED3D_TOP_MODULATE; + } + else + { + aarg2 = WINED3DTA_TEXTURE; } } }

1 0

Alexandre Julliard : Release 9.1.
by Alexandre Julliard 26 Jan '24

26 Jan '24

Module: wine Branch: master Commit: c963c4141a0d4f6601c37f11d79de186be0da6a9 URL: https://gitlab.winehq.org/wine/wine/-/commit/c963c4141a0d4f6601c37f11d79de1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 26 23:56:23 2024 +0100 Release 9.1. --- .mailmap | 1 + ANNOUNCE.md | 724 ++++++++++++++++++++++++++++++++++-------------------------- AUTHORS | 5 + VERSION | 2 +- configure | 18 +- 5 files changed, 424 insertions(+), 326 deletions(-)

1 0

Tag wine-9.1 : Alexandre Julliard : Release 9.1
by Alexandre Julliard 26 Jan '24

26 Jan '24

Module: wine Branch: refs/tags/wine-9.1 Tag: 7b300159847be9eec65067a5c0cd07f0f96d4c22 URL: https://gitlab.winehq.org/wine/wine/-/tags/7b300159847be9eec65067a5c0cd07f0… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 26 23:56:23 2024 +0100 Release 9.1

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 26 Jan '24

26 Jan '24

Module: wine Branch: master Commit: ebb5bd64a0f003cd1ef40932e0b0a0dcd2928d0c URL: https://gitlab.winehq.org/wine/wine/-/commit/ebb5bd64a0f003cd1ef40932e0b0a0… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Fri Jan 26 00:52:14 2024 +0200 po: Update Lithuanian translation. --- po/lt.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/lt.po b/po/lt.po index a5ee4c6e152..2279a84969a 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2023-12-08 23:56+0200\n" +"PO-Revision-Date: 2024-01-26 00:51+0200\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -7114,7 +7114,7 @@ msgstr "Neteisingas argumentas.\n" #: dlls/kernelbase/winerror.mc:3778 msgid "Cannot assign requested address.\n" -msgstr "" +msgstr "Nepavyko priskirti užklausto adreso.\n" #: dlls/kernelbase/winerror.mc:3783 msgid "Connection reset by peer.\n"

1 0

Aida Jonikienė : opengl32: Add a FIXME when doing a mapped buffer copy.
by Alexandre Julliard 26 Jan '24

26 Jan '24

Module: wine Branch: master Commit: 5529b00a4479948d279ccc8cad0a53de01a97f46 URL: https://gitlab.winehq.org/wine/wine/-/commit/5529b00a4479948d279ccc8cad0a53… Author: Aida Jonikienė <aidas957(a)gmail.com> Date: Sun Nov 26 11:51:27 2023 +0200 opengl32: Add a FIXME when doing a mapped buffer copy. The copies of mapped buffers introduce significant performance overhead. --- dlls/opengl32/unix_wgl.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/opengl32/unix_wgl.c b/dlls/opengl32/unix_wgl.c index e03bbc0a9c0..453a9824046 100644 --- a/dlls/opengl32/unix_wgl.c +++ b/dlls/opengl32/unix_wgl.c @@ -1855,10 +1855,15 @@ static void unmap_named_buffer( TEB *teb, GLint buffer ) static NTSTATUS wow64_map_buffer( TEB *teb, GLint buffer, GLenum target, void *ptr, SIZE_T size, GLbitfield access, PTR32 *ret ) { + static unsigned int once; + if (*ret) /* wow64 pointer provided, map buffer to it */ { if (!(access & (GL_MAP_INVALIDATE_RANGE_BIT | GL_MAP_INVALIDATE_BUFFER_BIT))) { + if (!once++) + FIXME( "Doing a copy of a mapped buffer (expect performance issues)\n" ); + TRACE( "Copying %#zx from buffer at %p to wow64 buffer %p\n", size, ptr, UlongToPtr(*ret) ); memcpy( UlongToPtr(*ret), ptr, size ); }

1 0

Paul Gofman : winhttp: Always return result at once if available in WinHttpQueryDataAvailable().
by Alexandre Julliard 26 Jan '24

26 Jan '24

Module: wine Branch: master Commit: fd2534422ba66d66cc811c75d012b2b1060d1770 URL: https://gitlab.winehq.org/wine/wine/-/commit/fd2534422ba66d66cc811c75d012b2… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Jan 23 16:34:49 2024 -0600 winhttp: Always return result at once if available in WinHttpQueryDataAvailable(). --- dlls/winhttp/request.c | 59 +++++++++++++++++++++++++++++++++++---- dlls/winhttp/tests/notification.c | 11 +++++++- dlls/winhttp/winhttp_private.h | 13 +++++++++ 3 files changed, 77 insertions(+), 6 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 84af8e58988..59431e3a9f2 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -257,6 +257,16 @@ static BOOL cancel_queue( struct queue *queue ) return cancelled; } +static void task_send_callback( void *ctx, BOOL abort ) +{ + struct send_callback *s = ctx; + + if (abort) return; + + TRACE( "running %p\n", ctx ); + send_callback( s->task_hdr.obj, s->status, s->info, s->buflen ); +} + static void free_header( struct header *header ) { free( header->field ); @@ -3052,9 +3062,10 @@ static DWORD query_data_ready( struct request *request ) return count; } -static BOOL skip_async_queue( struct request *request ) +static BOOL skip_async_queue( struct request *request, BOOL *wont_block ) { - return request->hdr.recursion_count < 3 && (end_of_read_data( request ) || query_data_ready( request )); + *wont_block = end_of_read_data( request ) || query_data_ready( request ); + return request->hdr.recursion_count < 3 && *wont_block; } static DWORD query_data_available( struct request *request, DWORD *available, BOOL async ) @@ -3106,6 +3117,7 @@ BOOL WINAPI WinHttpQueryDataAvailable( HINTERNET hrequest, LPDWORD available ) DWORD ret; struct request *request; BOOL async; + BOOL wont_block = FALSE; TRACE("%p, %p\n", hrequest, available); @@ -3121,7 +3133,44 @@ BOOL WINAPI WinHttpQueryDataAvailable( HINTERNET hrequest, LPDWORD available ) return FALSE; } - if ((async = request->connect->hdr.flags & WINHTTP_FLAG_ASYNC) && !skip_async_queue( request )) + if (!(async = request->connect->hdr.flags & WINHTTP_FLAG_ASYNC) || skip_async_queue( request, &wont_block )) + { + ret = query_data_available( request, available, async ); + } + else if (wont_block) + { + /* Data available but recursion limit reached, only queue callback. */ + struct send_callback *s; + + if (!(s = malloc( sizeof(*s) ))) + { + release_object( &request->hdr ); + SetLastError( ERROR_OUTOFMEMORY ); + return FALSE; + } + + if (!(ret = query_data_available( request, &s->count, FALSE ))) + { + if (available) *available = s->count; + s->status = WINHTTP_CALLBACK_STATUS_DATA_AVAILABLE; + s->info = &s->count; + s->buflen = sizeof(s->count); + } + else + { + s->result.dwResult = API_QUERY_DATA_AVAILABLE; + s->result.dwError = ret; + s->status = WINHTTP_CALLBACK_STATUS_REQUEST_ERROR; + s->info = &s->result; + s->buflen = sizeof(s->result); + } + + if ((ret = queue_task( &request->queue, task_send_callback, &s->task_hdr, &request->hdr ))) + free( s ); + else + ret = ERROR_IO_PENDING; + } + else { struct query_data *q; @@ -3139,7 +3188,6 @@ BOOL WINAPI WinHttpQueryDataAvailable( HINTERNET hrequest, LPDWORD available ) else ret = ERROR_IO_PENDING; } - else ret = query_data_available( request, available, async ); release_object( &request->hdr ); SetLastError( ret ); @@ -3165,6 +3213,7 @@ BOOL WINAPI WinHttpReadData( HINTERNET hrequest, void *buffer, DWORD to_read, DW DWORD ret; struct request *request; BOOL async; + BOOL wont_block; TRACE( "%p, %p, %lu, %p\n", hrequest, buffer, to_read, read ); @@ -3180,7 +3229,7 @@ BOOL WINAPI WinHttpReadData( HINTERNET hrequest, void *buffer, DWORD to_read, DW return FALSE; } - if ((async = request->connect->hdr.flags & WINHTTP_FLAG_ASYNC) && !skip_async_queue( request )) + if ((async = request->connect->hdr.flags & WINHTTP_FLAG_ASYNC) && !skip_async_queue( request, &wont_block )) { struct read_data *r; diff --git a/dlls/winhttp/tests/notification.c b/dlls/winhttp/tests/notification.c index 78319f0df5c..98df1571464 100644 --- a/dlls/winhttp/tests/notification.c +++ b/dlls/winhttp/tests/notification.c @@ -1929,6 +1929,9 @@ static void CALLBACK test_recursion_callback( HINTERNET handle, DWORD_PTR contex break; case WINHTTP_CALLBACK_STATUS_READ_COMPLETE: + { + static DWORD len; + if (!buflen) { SetEvent( context->wait ); @@ -1939,13 +1942,19 @@ static void CALLBACK test_recursion_callback( HINTERNET handle, DWORD_PTR contex context->max_recursion_read = max( context->max_recursion_read, context->recursion_count ); context->read_from_callback = TRUE; InterlockedIncrement( &context->recursion_count ); - ret = WinHttpQueryDataAvailable( context->request, NULL ); + len = 0xdeadbeef; + /* Use static variable len here so write to it doesn't destroy the stack on old Windows which + * doesn't set the value at once. */ + ret = WinHttpQueryDataAvailable( context->request, &len ); err = GetLastError(); ok( ret, "failed to query data available, GetLastError() %lu\n", err ); ok( err == ERROR_SUCCESS || err == ERROR_IO_PENDING, "got %lu\n", err ); + ok( len != 0xdeadbeef || broken( len == 0xdeadbeef ) /* Win7 */, "got %lu.\n", len ); if (err == ERROR_SUCCESS) context->have_sync_callback = TRUE; InterlockedDecrement( &context->recursion_count ); break; + } + case WINHTTP_CALLBACK_STATUS_RECEIVING_RESPONSE: if (!context->headers_available && context->call_receive_response_status == WINHTTP_CALLBACK_STATUS_SENDREQUEST_COMPLETE) diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index 0bf1c5bc6b0..80ce2614ca1 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -312,6 +312,19 @@ struct task_header volatile LONG completion_sent; }; +struct send_callback +{ + struct task_header task_hdr; + DWORD status; + void *info; + DWORD buflen; + union + { + WINHTTP_ASYNC_RESULT result; + DWORD count; + }; +}; + struct send_request { struct task_header task_hdr;

1 0

Paul Gofman : winhttp: Always return result at once if available in WinHttpReadData().
by Alexandre Julliard 26 Jan '24

26 Jan '24

Module: wine Branch: master Commit: bd2a2c25f54e33b5ffae1f28f5ead4b020f55456 URL: https://gitlab.winehq.org/wine/wine/-/commit/bd2a2c25f54e33b5ffae1f28f5ead4… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Jan 23 16:56:09 2024 -0600 winhttp: Always return result at once if available in WinHttpReadData(). --- dlls/winhttp/request.c | 42 ++++++++++++++++++++++++++++++++++++--- dlls/winhttp/tests/notification.c | 10 +++++++++- 2 files changed, 48 insertions(+), 4 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 59431e3a9f2..29b30fc2583 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -3213,7 +3213,7 @@ BOOL WINAPI WinHttpReadData( HINTERNET hrequest, void *buffer, DWORD to_read, DW DWORD ret; struct request *request; BOOL async; - BOOL wont_block; + BOOL wont_block = FALSE; TRACE( "%p, %p, %lu, %p\n", hrequest, buffer, to_read, read ); @@ -3229,7 +3229,44 @@ BOOL WINAPI WinHttpReadData( HINTERNET hrequest, void *buffer, DWORD to_read, DW return FALSE; } - if ((async = request->connect->hdr.flags & WINHTTP_FLAG_ASYNC) && !skip_async_queue( request, &wont_block )) + if (!(async = request->connect->hdr.flags & WINHTTP_FLAG_ASYNC) || skip_async_queue( request, &wont_block )) + { + ret = read_data( request, buffer, to_read, read, async ); + } + else if (wont_block) + { + /* Data available but recursion limit reached, only queue callback. */ + struct send_callback *s; + + if (!(s = malloc( sizeof(*s) ))) + { + release_object( &request->hdr ); + SetLastError( ERROR_OUTOFMEMORY ); + return FALSE; + } + + if (!(ret = read_data( request, buffer, to_read, &s->count, FALSE ))) + { + if (read) *read = s->count; + s->status = WINHTTP_CALLBACK_STATUS_READ_COMPLETE; + s->info = buffer; + s->buflen = s->count; + } + else + { + s->result.dwResult = API_READ_DATA; + s->result.dwError = ret; + s->status = WINHTTP_CALLBACK_STATUS_REQUEST_ERROR; + s->info = &s->result; + s->buflen = sizeof(s->result); + } + + if ((ret = queue_task( &request->queue, task_send_callback, &s->task_hdr, &request->hdr ))) + free( s ); + else + ret = ERROR_IO_PENDING; + } + else { struct read_data *r; @@ -3248,7 +3285,6 @@ BOOL WINAPI WinHttpReadData( HINTERNET hrequest, void *buffer, DWORD to_read, DW else ret = ERROR_IO_PENDING; } - else ret = read_data( request, buffer, to_read, read, async ); release_object( &request->hdr ); SetLastError( ret ); diff --git a/dlls/winhttp/tests/notification.c b/dlls/winhttp/tests/notification.c index 98df1571464..3e67c439bb5 100644 --- a/dlls/winhttp/tests/notification.c +++ b/dlls/winhttp/tests/notification.c @@ -1904,6 +1904,9 @@ static void CALLBACK test_recursion_callback( HINTERNET handle, DWORD_PTR contex break; case WINHTTP_CALLBACK_STATUS_DATA_AVAILABLE: + { + DWORD len; + if (!context->read_from_callback) { SetEvent( context->wait ); @@ -1920,13 +1923,18 @@ static void CALLBACK test_recursion_callback( HINTERNET handle, DWORD_PTR contex "got %lu, thread %#lx\n", context->recursion_count, GetCurrentThreadId() ); context->max_recursion_query = max( context->max_recursion_query, context->recursion_count ); InterlockedIncrement( &context->recursion_count ); - ret = WinHttpReadData( context->request, &b, 1, NULL ); + b = 0xff; + len = 0xdeadbeef; + ret = WinHttpReadData( context->request, &b, 1, &len ); err = GetLastError(); ok( ret, "failed to read data, GetLastError() %lu\n", err ); ok( err == ERROR_SUCCESS || err == ERROR_IO_PENDING, "got %lu\n", err ); + ok( b != 0xff, "got %#x.\n", b ); + ok( len == 1, "got %lu.\n", len ); if (err == ERROR_SUCCESS) context->have_sync_callback = TRUE; InterlockedDecrement( &context->recursion_count ); break; + } case WINHTTP_CALLBACK_STATUS_READ_COMPLETE: {

1 0

Aida Jonikienė : localspl: Fix a maybe-uninitialized warning in fill_builtin_form_info().
by Alexandre Julliard 26 Jan '24

26 Jan '24

Module: wine Branch: master Commit: 81e9ae96f1eb9ae6f7b9a4ebecbf8d0268d867a0 URL: https://gitlab.winehq.org/wine/wine/-/commit/81e9ae96f1eb9ae6f7b9a4ebecbf8d… Author: Aida Jonikienė <aidas957(a)gmail.com> Date: Thu Nov 30 15:17:54 2023 +0200 localspl: Fix a maybe-uninitialized warning in fill_builtin_form_info(). --- dlls/localspl/provider.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index b1f1e245693..e318736e09a 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -3072,7 +3072,7 @@ static void fill_builtin_form_info( BYTE **base, WCHAR **strings, const struct b DWORD size, DWORD *used ) { FORM_INFO_2W *info = *(FORM_INFO_2W**)base; - DWORD name_len = wcslen( form->name ) + 1, res_len = 0, keyword_len, total_size; + DWORD name_len = wcslen( form->name ) + 1, res_len = 0, keyword_len = 0, total_size; static const WCHAR dll_name[] = L"localspl.dll"; const WCHAR *resource;

1 0

Alexandre Julliard : ntdll: Clear CONTEXT_UNWOUND_TO_CALL in signal frames.
by Alexandre Julliard 26 Jan '24

26 Jan '24

Module: wine Branch: master Commit: 35c1cc6c81f566b6bbc3f3159583d86dd732b7e4 URL: https://gitlab.winehq.org/wine/wine/-/commit/35c1cc6c81f566b6bbc3f3159583d8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 26 15:05:33 2024 +0100 ntdll: Clear CONTEXT_UNWOUND_TO_CALL in signal frames. --- dlls/ntdll/signal_arm.c | 11 +++++------ dlls/ntdll/signal_arm64.c | 11 +++++------ dlls/ntdll/unix/signal_arm.c | 5 ++++- 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index db8955387ae..f9db361efca 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -148,10 +148,6 @@ static NTSTATUS virtual_unwind( ULONG type, DISPATCHER_CONTEXT *dispatch, CONTEX dispatch->ScopeIndex = 0; dispatch->EstablisherFrame = 0; dispatch->ControlPc = context->Pc; - /* - * TODO: CONTEXT_UNWOUND_TO_CALL should be cleared if unwound past a - * signal frame. - */ dispatch->ControlPcIsUnwound = (context->ContextFlags & CONTEXT_UNWOUND_TO_CALL) != 0; pc = context->Pc - (dispatch->ControlPcIsUnwound ? 2 : 0); @@ -773,6 +769,7 @@ static void ms_opcode( BYTE opcode, CONTEXT *context, case 1: /* MSFT_OP_MACHINE_FRAME */ context->Pc = ((DWORD *)context->Sp)[1]; context->Sp = ((DWORD *)context->Sp)[0]; + context->ContextFlags &= ~CONTEXT_UNWOUND_TO_CALL; break; case 2: /* MSFT_OP_CONTEXT */ { @@ -1171,10 +1168,12 @@ PVOID WINAPI RtlVirtualUnwind( ULONG type, ULONG_PTR base, ULONG_PTR pc, else handler = unwind_full_data( base, pc, func, context, handler_data, ctx_ptr ); - TRACE( "ret: lr=%lx sp=%lx handler=%p\n", context->Lr, context->Sp, handler ); + TRACE( "ret: pc=%lx lr=%lx sp=%lx handler=%p\n", context->Pc, context->Lr, context->Sp, handler ); if (!context->Pc) + { context->Pc = context->Lr; - context->ContextFlags |= CONTEXT_UNWOUND_TO_CALL; + context->ContextFlags |= CONTEXT_UNWOUND_TO_CALL; + } *frame_ret = context->Sp; return handler; } diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 841a4b05d96..19f7121e1e1 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -179,10 +179,6 @@ static NTSTATUS virtual_unwind( ULONG type, DISPATCHER_CONTEXT *dispatch, CONTEX dispatch->ScopeIndex = 0; dispatch->EstablisherFrame = 0; dispatch->ControlPc = context->Pc; - /* - * TODO: CONTEXT_UNWOUND_TO_CALL should be cleared if unwound past a - * signal frame. - */ dispatch->ControlPcIsUnwound = (context->ContextFlags & CONTEXT_UNWOUND_TO_CALL) != 0; pc = context->Pc - (dispatch->ControlPcIsUnwound ? 4 : 0); @@ -786,6 +782,7 @@ static void process_unwind_codes( BYTE *ptr, BYTE *end, CONTEXT *context, { context->Pc = ((DWORD64 *)context->Sp)[1]; context->Sp = ((DWORD64 *)context->Sp)[0]; + context->ContextFlags &= ~CONTEXT_UNWOUND_TO_CALL; } else if (*ptr == 0xea) /* MSFT_OP_CONTEXT */ { @@ -1068,10 +1065,12 @@ PVOID WINAPI RtlVirtualUnwind( ULONG type, ULONG_PTR base, ULONG_PTR pc, else handler = unwind_full_data( base, pc, func, context, handler_data, ctx_ptr ); - TRACE( "ret: lr=%I64x sp=%I64x handler=%p\n", context->Lr, context->Sp, handler ); + 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; + context->ContextFlags |= CONTEXT_UNWOUND_TO_CALL; + } *frame_ret = context->Sp; return handler; } diff --git a/dlls/ntdll/unix/signal_arm.c b/dlls/ntdll/unix/signal_arm.c index 68c8f0c0486..148108646bb 100644 --- a/dlls/ntdll/unix/signal_arm.c +++ b/dlls/ntdll/unix/signal_arm.c @@ -549,9 +549,12 @@ static NTSTATUS ehabi_virtual_unwind( UINT ip, DWORD *frame, CONTEXT *context, *handler = NULL; /* personality */ *handler_data = NULL; /* lsda */ - context->ContextFlags |= CONTEXT_UNWOUND_TO_CALL; if (!set_pc) + { context->Pc = context->Lr; + context->ContextFlags |= CONTEXT_UNWOUND_TO_CALL; + } + else context->ContextFlags &= ~CONTEXT_UNWOUND_TO_CALL; TRACE( "next function pc=%08lx\n", context->Pc ); TRACE(" r0=%08lx r1=%08lx r2=%08lx r3=%08lx\n",

1 0

Alexandre Julliard : ntdll/tests: Port the exception unwinding tests to ARM64.
by Alexandre Julliard 26 Jan '24

26 Jan '24

Module: wine Branch: master Commit: 32f5efcdb20d4342fc4023bbc28d67d727830a72 URL: https://gitlab.winehq.org/wine/wine/-/commit/32f5efcdb20d4342fc4023bbc28d67… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 26 15:06:07 2024 +0100 ntdll/tests: Port the exception unwinding tests to ARM64. --- dlls/ntdll/tests/exception.c | 239 +++++++++++++++++++++++++++++++++++++++---- 1 file changed, 221 insertions(+), 18 deletions(-)

1 0