March 2024 - Wine-commits - list.winehq.org

Paul Gofman : urlmon: Force debug info in critical sections.
by Alexandre Julliard 07 Mar '24

07 Mar '24

Module: wine Branch: master Commit: 8857df969c1ea917dafe46c143ed3f7905d404d4 URL: https://gitlab.winehq.org/wine/wine/-/commit/8857df969c1ea917dafe46c143ed3f… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Mar 4 10:33:37 2024 -0600 urlmon: Force debug info in critical sections. --- dlls/urlmon/binding.c | 2 +- dlls/urlmon/bindprot.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index 07a00558eec..b36fa161781 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -1474,7 +1474,7 @@ static HRESULT Binding_Create(IMoniker *mon, Binding *binding_ctx, IUri *uri, IB ret->bindinfo.cbSize = sizeof(BINDINFO); - InitializeCriticalSection(&ret->section); + InitializeCriticalSectionEx(&ret->section, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); ret->section.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": Binding.section"); hres = get_callback(pbc, &ret->callback); diff --git a/dlls/urlmon/bindprot.c b/dlls/urlmon/bindprot.c index ec52ac5e999..0a7afc75e1b 100644 --- a/dlls/urlmon/bindprot.c +++ b/dlls/urlmon/bindprot.c @@ -1468,7 +1468,7 @@ HRESULT create_binding_protocol(BindProtocol **protocol) ret->notif_hwnd = get_notif_hwnd(); ret->protocol_handler = &ret->default_protocol_handler.IInternetProtocol_iface; ret->protocol_sink_handler = &ret->default_protocol_handler.IInternetProtocolSink_iface; - InitializeCriticalSection(&ret->section); + InitializeCriticalSectionEx(&ret->section, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); ret->section.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": BindProtocol.section"); URLMON_LockModule();

1 0

Paul Gofman : winegstreamer: Force debug info in critical sections.
by Alexandre Julliard 07 Mar '24

07 Mar '24

Module: wine Branch: master Commit: 3fd83279c07cfc94c79bcc348d9c8c9a323ae97f URL: https://gitlab.winehq.org/wine/wine/-/commit/3fd83279c07cfc94c79bcc348d9c8c… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Mar 4 10:36:44 2024 -0600 winegstreamer: Force debug info in critical sections. --- dlls/winegstreamer/media_sink.c | 2 +- dlls/winegstreamer/media_source.c | 2 +- dlls/winegstreamer/quartz_parser.c | 4 ++-- dlls/winegstreamer/wg_sample.c | 2 +- dlls/winegstreamer/wm_reader.c | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/winegstreamer/media_sink.c b/dlls/winegstreamer/media_sink.c index 6c8d69f73df..5ee2c44dc70 100644 --- a/dlls/winegstreamer/media_sink.c +++ b/dlls/winegstreamer/media_sink.c @@ -1243,7 +1243,7 @@ static HRESULT media_sink_create(IMFByteStream *bytestream, const char *format, media_sink->async_callback.lpVtbl = &media_sink_callback_vtbl; media_sink->refcount = 1; media_sink->state = STATE_OPENED; - InitializeCriticalSection(&media_sink->cs); + InitializeCriticalSectionEx(&media_sink->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); media_sink->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": cs"); IMFByteStream_AddRef((media_sink->bytestream = bytestream)); list_init(&media_sink->stream_sinks); diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index 9cc54f8e146..3b5469932f3 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -1634,7 +1634,7 @@ static HRESULT media_source_create(struct object_context *context, IMFMediaSourc IMFByteStream_AddRef(context->stream); object->file_size = context->file_size; object->rate = 1.0f; - InitializeCriticalSection(&object->cs); + InitializeCriticalSectionEx(&object->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); object->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": cs"); if (FAILED(hr = MFCreateEventQueue(&object->event_queue))) diff --git a/dlls/winegstreamer/quartz_parser.c b/dlls/winegstreamer/quartz_parser.c index 44e13d05c2a..6c126fa13e2 100644 --- a/dlls/winegstreamer/quartz_parser.c +++ b/dlls/winegstreamer/quartz_parser.c @@ -1663,7 +1663,7 @@ static HRESULT parser_create(enum wg_parser_type type, BOOL output_compressed, s return E_OUTOFMEMORY; } - InitializeCriticalSection(&object->streaming_cs); + InitializeCriticalSectionEx(&object->streaming_cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); object->streaming_cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": parser.streaming_cs"); InitializeConditionVariable(&object->flushing_cv); @@ -2145,7 +2145,7 @@ static struct parser_source *create_pin(struct parser *filter, GST_ChangeCurrent, GST_ChangeRate); BaseFilterImpl_IncrementPinVersion(&filter->filter); - InitializeCriticalSection(&pin->flushing_cs); + InitializeCriticalSectionEx(&pin->flushing_cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); pin->flushing_cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": pin.flushing_cs"); InitializeConditionVariable(&pin->eos_cv); diff --git a/dlls/winegstreamer/wg_sample.c b/dlls/winegstreamer/wg_sample.c index 31281066957..9427dad0f93 100644 --- a/dlls/winegstreamer/wg_sample.c +++ b/dlls/winegstreamer/wg_sample.c @@ -283,7 +283,7 @@ HRESULT wg_sample_queue_create(struct wg_sample_queue **out) if (!(queue = calloc(1, sizeof(*queue)))) return E_OUTOFMEMORY; - InitializeCriticalSection(&queue->cs); + InitializeCriticalSectionEx(&queue->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); queue->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": cs"); list_init(&queue->samples); diff --git a/dlls/winegstreamer/wm_reader.c b/dlls/winegstreamer/wm_reader.c index e3a2bfc343b..18910f87d40 100644 --- a/dlls/winegstreamer/wm_reader.c +++ b/dlls/winegstreamer/wm_reader.c @@ -2658,9 +2658,9 @@ HRESULT WINAPI winegstreamer_create_wm_sync_reader(IUnknown *outer, void **out) object->outer = outer ? outer : &object->IUnknown_inner; object->refcount = 1; - InitializeCriticalSection(&object->cs); + InitializeCriticalSectionEx(&object->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); object->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": reader.cs"); - InitializeCriticalSection(&object->shutdown_cs); + InitializeCriticalSectionEx(&object->shutdown_cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); object->shutdown_cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": reader.shutdown_cs"); TRACE("Created reader %p.\n", object);

1 0

Paul Gofman : wmiutil: Force debug info in critical sections.
by Alexandre Julliard 07 Mar '24

07 Mar '24

Module: wine Branch: master Commit: 5152e737793f60ea045601f289f89111bcd71236 URL: https://gitlab.winehq.org/wine/wine/-/commit/5152e737793f60ea045601f289f891… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Mar 4 10:37:29 2024 -0600 wmiutil: Force debug info in critical sections. --- dlls/wmiutils/path.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wmiutils/path.c b/dlls/wmiutils/path.c index 48b79ccdb23..152f933e3a6 100644 --- a/dlls/wmiutils/path.c +++ b/dlls/wmiutils/path.c @@ -1282,7 +1282,7 @@ HRESULT WbemPath_create( LPVOID *ppObj ) path->IWbemPath_iface.lpVtbl = &path_vtbl; path->refs = 1; - InitializeCriticalSection( &path->cs ); + InitializeCriticalSectionEx( &path->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO ); path->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": wmiutils_path.cs"); init_path( path );

1 0

Paul Gofman : windows.gaming.input: Force debug info in critical sections.
by Alexandre Julliard 07 Mar '24

07 Mar '24

Module: wine Branch: master Commit: 84cb31556a81d753536487321ee5e012e87c14b9 URL: https://gitlab.winehq.org/wine/wine/-/commit/84cb31556a81d753536487321ee5e0… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Mar 4 10:38:50 2024 -0600 windows.gaming.input: Force debug info in critical sections. --- dlls/windows.gaming.input/async.c | 2 +- dlls/windows.gaming.input/force_feedback.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/windows.gaming.input/async.c b/dlls/windows.gaming.input/async.c index a30004f2d24..d70994289f1 100644 --- a/dlls/windows.gaming.input/async.c +++ b/dlls/windows.gaming.input/async.c @@ -356,7 +356,7 @@ static HRESULT async_info_create( IUnknown *invoker, IUnknown *param, async_oper if ((impl->invoker = invoker)) IUnknown_AddRef( impl->invoker ); if ((impl->param = param)) IUnknown_AddRef( impl->param ); - InitializeCriticalSection( &impl->cs ); + InitializeCriticalSectionEx( &impl->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO ); impl->cs.DebugInfo->Spare[0] = (DWORD_PTR)( __FILE__ ": async_info.cs" ); *out = &impl->IWineAsyncInfoImpl_iface; diff --git a/dlls/windows.gaming.input/force_feedback.c b/dlls/windows.gaming.input/force_feedback.c index 39a450f3778..a272daee25f 100644 --- a/dlls/windows.gaming.input/force_feedback.c +++ b/dlls/windows.gaming.input/force_feedback.c @@ -420,7 +420,7 @@ HRESULT force_feedback_effect_create( enum WineForceFeedbackEffectType type, IIn impl->axes[1] = DIJOFS_Y; impl->axes[2] = DIJOFS_Z; - InitializeCriticalSection( &impl->cs ); + InitializeCriticalSectionEx( &impl->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO ); impl->cs.DebugInfo->Spare[0] = (DWORD_PTR)( __FILE__ ": effect.cs" ); *out = &impl->IWineForceFeedbackEffectImpl_iface;

1 0

Paul Gofman : windows.media.speech: Force debug info in critical sections.
by Alexandre Julliard 07 Mar '24

07 Mar '24

Module: wine Branch: master Commit: d30dafa14d799c4b605391ef27a56baa241824cc URL: https://gitlab.winehq.org/wine/wine/-/commit/d30dafa14d799c4b605391ef27a56b… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Mar 4 10:39:56 2024 -0600 windows.media.speech: Force debug info in critical sections. --- dlls/windows.media.speech/async.c | 4 ++-- dlls/windows.media.speech/recognizer.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/windows.media.speech/async.c b/dlls/windows.media.speech/async.c index 3c5f450cc65..2b2dc394305 100644 --- a/dlls/windows.media.speech/async.c +++ b/dlls/windows.media.speech/async.c @@ -366,7 +366,7 @@ HRESULT async_action_create( IInspectable *invoker, async_action_callback callba if (invoker) IInspectable_AddRef((impl->invoker = invoker)); - InitializeCriticalSection(&impl->cs); + InitializeCriticalSectionEx(&impl->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); impl->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": async_action.cs"); /* AddRef to keep the obj alive in the callback. */ @@ -745,7 +745,7 @@ HRESULT async_operation_inspectable_create( const GUID *iid, if (invoker) IInspectable_AddRef((impl->invoker = invoker)); - InitializeCriticalSection(&impl->cs); + InitializeCriticalSectionEx(&impl->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); impl->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": async_operation.cs"); /* AddRef to keep the obj alive in the callback. */ diff --git a/dlls/windows.media.speech/recognizer.c b/dlls/windows.media.speech/recognizer.c index 790d127fc64..a98970d35f9 100644 --- a/dlls/windows.media.speech/recognizer.c +++ b/dlls/windows.media.speech/recognizer.c @@ -1126,7 +1126,7 @@ static HRESULT WINAPI recognizer_factory_Create( ISpeechRecognizerFactory *iface if (FAILED(hr = recognizer_factory_create_audio_capture(session))) goto error; - InitializeCriticalSection(&session->cs); + InitializeCriticalSectionEx(&session->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); session->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": recognition_session.cs"); /* Init ISpeechRecognizer */

1 0

Esme Povirk : mscoree: Implement CLRRuntimeHost_Start.
by Alexandre Julliard 07 Mar '24

07 Mar '24

Module: wine Branch: master Commit: 934cfb86b5e2b485b4b90e1eeac4021733559591 URL: https://gitlab.winehq.org/wine/wine/-/commit/934cfb86b5e2b485b4b90e1eeac402… Author: Esme Povirk <esme(a)codeweavers.com> Date: Thu Mar 7 20:18:03 2024 +0000 mscoree: Implement CLRRuntimeHost_Start. --- dlls/mscoree/corruntimehost.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c index 1a546f343e0..f5a3831c90e 100644 --- a/dlls/mscoree/corruntimehost.c +++ b/dlls/mscoree/corruntimehost.c @@ -814,8 +814,12 @@ static ULONG WINAPI CLRRuntimeHost_Release(ICLRRuntimeHost* iface) static HRESULT WINAPI CLRRuntimeHost_Start(ICLRRuntimeHost* iface) { - FIXME("(%p)\n", iface); - return E_NOTIMPL; + RuntimeHost *This = impl_from_ICLRRuntimeHost( iface ); + MonoDomain *dummy; + + TRACE("%p\n", This); + + return RuntimeHost_GetDefaultDomain(This, NULL, &dummy); } static HRESULT WINAPI CLRRuntimeHost_Stop(ICLRRuntimeHost* iface)

1 0

Alexandre Julliard : ntdll: Export longjmp.
by Alexandre Julliard 07 Mar '24

07 Mar '24

Module: wine Branch: master Commit: e1d624a06f7b1748bbaa94f2861fdf138ac85b8e URL: https://gitlab.winehq.org/wine/wine/-/commit/e1d624a06f7b1748bbaa94f2861fdf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 7 10:33:46 2024 +0100 ntdll: Export longjmp. --- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/signal_arm.c | 19 ++++++++++++++++++ dlls/ntdll/signal_arm64.c | 19 ++++++++++++++++++ dlls/ntdll/signal_arm64ec.c | 20 ++++++++++++++++++ dlls/ntdll/signal_x86_64.c | 49 +++++++++++++++++++++++++++++++++++++++++++++ tools/winebuild/import.c | 1 + 6 files changed, 109 insertions(+) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 6fb91e8c9f1..2c5a69a410c 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1630,6 +1630,7 @@ @ cdecl isxdigit(long) @ cdecl labs(long) abs @ cdecl log(double) +@ cdecl -arch=!i386 longjmp(ptr long) NTDLL_longjmp @ cdecl mbstowcs(ptr str long) @ cdecl memchr(ptr long long) @ cdecl memcmp(ptr ptr long) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index dd259322368..b59384c986c 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -732,6 +732,25 @@ __ASM_GLOBAL_FUNC( NTDLL__setjmpex, "bx lr" ) +/******************************************************************* + * longjmp (NTDLL.@) + */ +void __cdecl NTDLL_longjmp( _JUMP_BUFFER *buf, int retval ) +{ + EXCEPTION_RECORD rec; + + if (!retval) retval = 1; + + rec.ExceptionCode = STATUS_LONGJUMP; + rec.ExceptionFlags = 0; + rec.ExceptionRecord = NULL; + rec.ExceptionAddress = NULL; + rec.NumberParameters = 1; + rec.ExceptionInformation[0] = (DWORD_PTR)buf; + RtlUnwind( (void *)buf->Frame, (void *)buf->Pc, &rec, IntToPtr(retval) ); +} + + /*********************************************************************** * RtlUserThreadStart (NTDLL.@) */ diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index c53d3382207..3ad0a7daa97 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -852,6 +852,25 @@ __ASM_GLOBAL_FUNC( NTDLL__setjmpex, "ret" ) +/******************************************************************* + * longjmp (NTDLL.@) + */ +void __cdecl NTDLL_longjmp( _JUMP_BUFFER *buf, int retval ) +{ + EXCEPTION_RECORD rec; + + if (!retval) retval = 1; + + rec.ExceptionCode = STATUS_LONGJUMP; + rec.ExceptionFlags = 0; + rec.ExceptionRecord = NULL; + rec.ExceptionAddress = NULL; + rec.NumberParameters = 1; + rec.ExceptionInformation[0] = (DWORD_PTR)buf; + RtlUnwind( (void *)buf->Frame, (void *)buf->Lr, &rec, IntToPtr(retval) ); +} + + /*********************************************************************** * RtlUserThreadStart (NTDLL.@) */ diff --git a/dlls/ntdll/signal_arm64ec.c b/dlls/ntdll/signal_arm64ec.c index f56931a9e4b..c307714e56e 100644 --- a/dlls/ntdll/signal_arm64ec.c +++ b/dlls/ntdll/signal_arm64ec.c @@ -22,6 +22,7 @@ #include <stdlib.h> #include <stdarg.h> +#include <setjmp.h> #include "ntstatus.h" #define WIN32_NO_STATUS @@ -2019,6 +2020,25 @@ void __attribute((naked)) RtlRaiseException( EXCEPTION_RECORD *rec ) } +/******************************************************************* + * longjmp (NTDLL.@) + */ +void __cdecl NTDLL_longjmp( _JUMP_BUFFER *buf, int retval ) +{ + EXCEPTION_RECORD rec; + + if (!retval) retval = 1; + + rec.ExceptionCode = STATUS_LONGJUMP; + rec.ExceptionFlags = 0; + rec.ExceptionRecord = NULL; + rec.ExceptionAddress = NULL; + rec.NumberParameters = 1; + rec.ExceptionInformation[0] = (DWORD_PTR)buf; + RtlUnwind( (void *)buf->Frame, (void *)buf->Rip, &rec, IntToPtr(retval) ); +} + + /*********************************************************************** * RtlUserThreadStart (NTDLL.@) */ diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 6e88877ee78..b49ec23860f 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -1058,6 +1058,55 @@ __ASM_GLOBAL_FUNC( NTDLL__setjmpex, "retq" ) +void __cdecl DECLSPEC_NORETURN longjmp_regs( _JUMP_BUFFER *buf, int retval ); +__ASM_GLOBAL_FUNC( longjmp_regs, + __ASM_SEH(".seh_endprologue\n\t") + "movq %rdx,%rax\n\t" /* retval */ + "movq 0x8(%rcx),%rbx\n\t" /* jmp_buf->Rbx */ + "movq 0x18(%rcx),%rbp\n\t" /* jmp_buf->Rbp */ + "movq 0x20(%rcx),%rsi\n\t" /* jmp_buf->Rsi */ + "movq 0x28(%rcx),%rdi\n\t" /* jmp_buf->Rdi */ + "movq 0x30(%rcx),%r12\n\t" /* jmp_buf->R12 */ + "movq 0x38(%rcx),%r13\n\t" /* jmp_buf->R13 */ + "movq 0x40(%rcx),%r14\n\t" /* jmp_buf->R14 */ + "movq 0x48(%rcx),%r15\n\t" /* jmp_buf->R15 */ + "movq 0x50(%rcx),%rdx\n\t" /* jmp_buf->Rip */ + "ldmxcsr 0x58(%rcx)\n\t" /* jmp_buf->MxCsr */ + "fnclex\n\t" + "fldcw 0x5c(%rcx)\n\t" /* jmp_buf->FpCsr */ + "movdqa 0x60(%rcx),%xmm6\n\t" /* jmp_buf->Xmm6 */ + "movdqa 0x70(%rcx),%xmm7\n\t" /* jmp_buf->Xmm7 */ + "movdqa 0x80(%rcx),%xmm8\n\t" /* jmp_buf->Xmm8 */ + "movdqa 0x90(%rcx),%xmm9\n\t" /* jmp_buf->Xmm9 */ + "movdqa 0xa0(%rcx),%xmm10\n\t" /* jmp_buf->Xmm10 */ + "movdqa 0xb0(%rcx),%xmm11\n\t" /* jmp_buf->Xmm11 */ + "movdqa 0xc0(%rcx),%xmm12\n\t" /* jmp_buf->Xmm12 */ + "movdqa 0xd0(%rcx),%xmm13\n\t" /* jmp_buf->Xmm13 */ + "movdqa 0xe0(%rcx),%xmm14\n\t" /* jmp_buf->Xmm14 */ + "movdqa 0xf0(%rcx),%xmm15\n\t" /* jmp_buf->Xmm15 */ + "movq 0x10(%rcx),%rsp\n\t" /* jmp_buf->Rsp */ + "jmp *%rdx" ) + +/******************************************************************* + * longjmp (MSVCRT.@) + */ +void __cdecl NTDLL_longjmp( _JUMP_BUFFER *buf, int retval ) +{ + EXCEPTION_RECORD rec; + + if (!retval) retval = 1; + if (!buf->Frame) longjmp_regs( buf, retval ); + + rec.ExceptionCode = STATUS_LONGJUMP; + rec.ExceptionFlags = 0; + rec.ExceptionRecord = NULL; + rec.ExceptionAddress = NULL; + rec.NumberParameters = 1; + rec.ExceptionInformation[0] = (DWORD_PTR)buf; + RtlUnwind( (void *)buf->Frame, (void *)buf->Rip, &rec, IntToPtr(retval) ); +} + + /*********************************************************************** * RtlUserThreadStart (NTDLL.@) */ diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index eb9f0205eb5..9cefb2afdfe 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -62,6 +62,7 @@ static const char *stdc_names[] = "isxdigit", "labs", "log", + "longjmp", "mbstowcs", "memchr", "memcmp",

1 0

Alexandre Julliard : ntdll: Implement _setjmpex on ARM64EC.
by Alexandre Julliard 07 Mar '24

07 Mar '24

Module: wine Branch: master Commit: 1edd53f00ffbc32d38d7ef71f91c63c84c3a330c URL: https://gitlab.winehq.org/wine/wine/-/commit/1edd53f00ffbc32d38d7ef71f91c63… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 7 13:39:51 2024 +0100 ntdll: Implement _setjmpex on ARM64EC. --- dlls/ntdll/signal_arm64ec.c | 78 +++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 72 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/signal_arm64ec.c b/dlls/ntdll/signal_arm64ec.c index c307714e56e..6f73919c886 100644 --- a/dlls/ntdll/signal_arm64ec.c +++ b/dlls/ntdll/signal_arm64ec.c @@ -1755,12 +1755,19 @@ BOOLEAN WINAPI RtlIsEcCode( ULONG_PTR ptr ) } +/* unwind context by one call frame */ +static void unwind_one_frame( CONTEXT *context ) +{ + void *data; + ULONG_PTR base, frame, pc = context->Rip - 4; + RUNTIME_FUNCTION *func = RtlLookupFunctionEntry( pc, &base, NULL ); + + RtlVirtualUnwind( UNW_FLAG_NHANDLER, base, pc, func, context, &data, &frame, NULL ); +} + /* capture context information; helper for RtlCaptureContext */ static void __attribute__((used)) capture_context( CONTEXT *context, UINT cpsr, UINT fpcr, UINT fpsr ) { - RUNTIME_FUNCTION *func; - void *handler_data; - ULONG_PTR pc, base, frame; CONTEXT unwind_context; context->ContextFlags = CONTEXT_AMD64_FULL; @@ -1772,9 +1779,7 @@ static void __attribute__((used)) capture_context( CONTEXT *context, UINT cpsr, /* unwind one level to get register values from caller function */ unwind_context = *context; - pc = context->Rip - 4; - func = RtlLookupFunctionEntry( pc, &base, NULL ); - RtlVirtualUnwind( UNW_FLAG_NHANDLER, base, pc, func, &unwind_context, &handler_data, &frame, NULL ); + unwind_one_frame( &unwind_context ); memcpy( &context->Rax, &unwind_context.Rax, offsetof(CONTEXT,FltSave) - offsetof(CONTEXT,Rax) ); } @@ -1826,6 +1831,67 @@ void __attribute__((naked)) RtlCaptureContext( CONTEXT *context ) ".seh_endproc" ); } +/* fixup jump buffer information; helper for _setjmpex */ +static int __attribute__((used)) do_setjmpex( _JUMP_BUFFER *buf, UINT fpcr, UINT fpsr ) +{ + CONTEXT context = { .ContextFlags = CONTEXT_FULL }; + + buf->MxCsr = fpcsr_to_mxcsr( fpcr, fpsr ); + buf->FpCsr = 0x27f; + + context.Rbx = buf->Rbx; + context.Rsp = buf->Rsp; + context.Rbp = buf->Rbp; + context.Rsi = buf->Rsi; + context.Rdi = buf->Rdi; + context.R12 = buf->R12; + context.R13 = buf->R13; + context.R14 = buf->R14; + context.R15 = buf->R15; + context.Rip = buf->Rip; + memcpy( &context.Xmm6, &buf->Xmm6, 10 * sizeof(context.Xmm6) ); + unwind_one_frame( &context ); + if (!RtlIsEcCode( context.Rip )) /* caller is x64, use its context instead of the ARM one */ + { + buf->Rbx = context.Rbx; + buf->Rsp = context.Rsp; + buf->Rbp = context.Rbp; + buf->Rsi = context.Rsi; + buf->Rdi = context.Rdi; + buf->R12 = context.R12; + buf->R13 = context.R13; + buf->R14 = context.R14; + buf->R15 = context.R15; + buf->Rip = context.Rip; + memcpy( &buf->Xmm6, &context.Xmm6, 10 * sizeof(context.Xmm6) ); + } + return 0; +} + +/*********************************************************************** + * _setjmpex (NTDLL.@) + */ +int __attribute__((naked)) NTDLL__setjmpex( _JUMP_BUFFER *buf, void *frame ) +{ + asm( ".seh_proc NTDLL__setjmpex\n\t" + ".seh_endprologue\n\t" + "stp x1, x27, [x0]\n\t" /* jmp_buf->Frame,Rbx */ + "mov x1, sp\n\t" + "stp x1, x29, [x0, #0x10]\n\t" /* jmp_buf->Rsp,Rbp */ + "stp x25, x26, [x0, #0x20]\n\t" /* jmp_buf->Rsi,Rdi */ + "stp x19, x20, [x0, #0x30]\n\t" /* jmp_buf->R12,R13 */ + "stp x21, x22, [x0, #0x40]\n\t" /* jmp_buf->R14,R15 */ + "str x30, [x0, #0x50]\n\t" /* jmp_buf->Rip */ + "stp d8, d9, [x0, #0x80]\n\t" /* jmp_buf->Xmm8,Xmm9 */ + "stp d10, d11, [x0, #0xa0]\n\t" /* jmp_buf->Xmm10,Xmm11 */ + "stp d12, d13, [x0, #0xc0]\n\t" /* jmp_buf->Xmm12,Xmm13 */ + "stp d14, d15, [x0, #0xe0]\n\t" /* jmp_buf->Xmm14,Xmm15 */ + "mrs x1, fpcr\n\t" + "mrs x2, fpsr\n\t" + "b do_setjmpex\n\t" + ".seh_endproc" ); +} + /******************************************************************* * RtlRestoreContext (NTDLL.@)

1 0

Alexandre Julliard : d3d10_1/tests: Mark a failing test as todo.
by Alexandre Julliard 07 Mar '24

07 Mar '24

Module: wine Branch: master Commit: 27b22fedde802f71101d1025c731d555fb107287 URL: https://gitlab.winehq.org/wine/wine/-/commit/27b22fedde802f71101d1025c731d5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 7 20:49:19 2024 +0100 d3d10_1/tests: Mark a failing test as todo. Triggered by the vkd3d 1.11 import. --- dlls/d3d10_1/tests/d3d10_1.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/d3d10_1/tests/d3d10_1.c b/dlls/d3d10_1/tests/d3d10_1.c index e3cd3943594..105a7d46dfb 100644 --- a/dlls/d3d10_1/tests/d3d10_1.c +++ b/dlls/d3d10_1/tests/d3d10_1.c @@ -1074,6 +1074,7 @@ static void test_compile_effect(void) /* Compilation fails due to 10.1 feature incompatibility with fx_4_0 profile. */ hr = D3D10CompileEffectFromMemory(bs_source2, strlen(bs_source2), NULL, NULL, NULL, 0, 0, &blob, NULL); + todo_wine ok(hr == E_FAIL, "Unexpected hr %#lx.\n", hr); }

1 0

Alexandre Julliard : d3dx9/tests: Mark failing tests as todo.
by Alexandre Julliard 07 Mar '24

07 Mar '24

Module: wine Branch: master Commit: 1c95001f8f383061b4e7495b338dfccd9726c8c0 URL: https://gitlab.winehq.org/wine/wine/-/commit/1c95001f8f383061b4e7495b338dfc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 7 20:49:46 2024 +0100 d3dx9/tests: Mark failing tests as todo. Triggered by the vkd3d 1.11 import. --- dlls/d3dx9_36/tests/effect.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index 3a6bd465df5..5420501c92f 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -8041,6 +8041,7 @@ static void test_create_effect_from_file(void) /* This is apparently broken on native, it ends up using the wrong include. */ hr = D3DXCreateEffectFromFileExW(device, filename_w, NULL, NULL, NULL, 0, NULL, &effect, &messages); + todo_wine ok(hr == E_FAIL, "Unexpected error, hr %#lx.\n", hr); if (messages) { @@ -8066,6 +8067,7 @@ static void test_create_effect_from_file(void) * is "ID3DXEffectCompiler: There were no techniques" */ hr = D3DXCreateEffectFromFileExW(device, filename_w, NULL, &include.ID3DXInclude_iface, NULL, 0, NULL, &effect, &messages); + todo_wine ok(hr == E_FAIL, "D3DXInclude test failed with error %#lx.\n", hr); if (messages) {

1 0