December 2023 - Wine-Commits

Zebediah Figura : configure: Use -mpreferred-stack-boundary=2 on i386.
by Alexandre Julliard Dec. 7, 2023

Dec. 7, 2023

Module: wine Branch: master Commit: 4b458775bb8c9492ac859cfd167c5f54f245dec1 URL: https://gitlab.winehq.org/wine/wine/-/commit/4b458775bb8c9492ac859cfd167c5f… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Sep 21 15:38:15 2023 -0500 configure: Use -mpreferred-stack-boundary=2 on i386. gcc currently assumes the stack alignment for i686-w64-mingw32 is 16, which is essentially wrong. It works around this in most cases by applying -mstackrealign when SSE is in use. However, this doesn't address the case of manually aligned types (i.e. DECLSPEC_ALIGN), and it also for some reason doesn't seem to apply when -mavx512f is in use, which seems to be an independent gcc bug. The correct solution on the gcc end is not to assume that the stack is 4-byte aligned. -mpreferred-stack-boundary=2 achieves exactly this, and there is motion upstream to address this by effectively making this setting the default. Since this will take time to propagate downstream, though, it seems prudent to address this bug locally by essentially applying the same fix downstream. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55007 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55899 --- configure | 34 ++++++++++++++++++++++++++++++++++ configure.ac | 1 + 2 files changed, 35 insertions(+) diff --git a/configure b/configure index 9219276d336..644d38e7288 100755 --- a/configure +++ b/configure @@ -11550,6 +11550,40 @@ printf "%s\n" "$ac_res" >&6; } if eval test \"x\$"$as_ac_var"\" = x"yes" then : as_fn_append ${wine_arch}_EXTRACFLAGS " -fno-omit-frame-pointer" +fi } + { as_ac_var=`printf "%s\n" "ac_cv_${wine_arch}_cflags_-mpreferred-stack-boundary=2" | $as_tr_sh` +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC supports -mpreferred-stack-boundary=2" >&5 +printf %s "checking whether $CC supports -mpreferred-stack-boundary=2... " >&6; } +if eval test \${$as_ac_var+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_wine_try_cflags_saved=$CFLAGS +ac_wine_try_cflags_saved_exeext=$ac_exeext +CFLAGS="$CFLAGS -nostdlib -nodefaultlibs -mpreferred-stack-boundary=2" +ac_exeext=".exe" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +void *__os_arm64x_dispatch_ret = 0; +int __cdecl mainCRTStartup(void) { return 0; } +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + eval "$as_ac_var=yes" +else $as_nop + eval "$as_ac_var=no" +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext +CFLAGS=$ac_wine_try_cflags_saved +ac_exeext=$ac_wine_try_cflags_saved_exeext +fi +eval ac_res=\$$as_ac_var + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } +if eval test \"x\$"$as_ac_var"\" = x"yes" +then : + as_fn_append ${wine_arch}_EXTRACFLAGS " -mpreferred-stack-boundary=2" fi } { as_ac_var=`printf "%s\n" "ac_cv_${wine_arch}_cflags_-Wl,--disable-stdcall-fixup" | $as_tr_sh` { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC supports -Wl,--disable-stdcall-fixup" >&5 diff --git a/configure.ac b/configure.ac index 26bcc3f6c21..078856efe6f 100644 --- a/configure.ac +++ b/configure.ac @@ -991,6 +991,7 @@ This is an error since --enable-archs=$wine_arch was requested.])]) case $wine_arch in i386) WINE_TRY_PE_CFLAGS([-fno-omit-frame-pointer]) + WINE_TRY_PE_CFLAGS([-mpreferred-stack-boundary=2]) WINE_TRY_PE_CFLAGS([-Wl,--disable-stdcall-fixup], [AS_VAR_APPEND([${wine_arch}_LDFLAGS],[" -Wl,--disable-stdcall-fixup"])]) ;; x86_64) WINE_TRY_PE_CFLAGS([-Wformat-overflow])

1 0

Gabriel Ivăncescu : mshtml: Don't expose "restricted" members.
by Alexandre Julliard Dec. 7, 2023

Dec. 7, 2023

Module: wine Branch: master Commit: 7ca9e4ac9ff1dc8da3512dc2bcb0bb2743fb3dbf URL: https://gitlab.winehq.org/wine/wine/-/commit/7ca9e4ac9ff1dc8da3512dc2bcb0bb… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Dec 6 20:16:34 2023 +0200 mshtml: Don't expose "restricted" members. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/dispex.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index e47e4d2dc45..07c26e2e762 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -277,6 +277,8 @@ static void add_func_info(dispex_data_t *data, tid_t tid, const FUNCDESC *desc, if(name_override) name = SysAllocString(name_override); + else if(desc->wFuncFlags & FUNCFLAG_FRESTRICTED) + return; else { hres = ITypeInfo_GetDocumentation(dti, desc->memid, &name, NULL, NULL, NULL); if(FAILED(hres)) {

1 0

Gabriel Ivăncescu : mshtml: Send proper legacy storage event with actual url.
by Alexandre Julliard Dec. 7, 2023

Dec. 7, 2023

Module: wine Branch: master Commit: cfefbb8f458d6096fe25a2f7a9b73e87b8e6c755 URL: https://gitlab.winehq.org/wine/wine/-/commit/cfefbb8f458d6096fe25a2f7a9b73e… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Dec 6 20:16:34 2023 +0200 mshtml: Send proper legacy storage event with actual url. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmldoc.c | 2 +- dlls/mshtml/htmlevent.c | 4 ++-- dlls/mshtml/htmlevent.h | 2 +- dlls/mshtml/htmlstorage.c | 15 ++++++++++++--- 4 files changed, 16 insertions(+), 7 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index a20472d22b8..e7eca058c23 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -3045,7 +3045,7 @@ static HRESULT WINAPI HTMLDocument4_createEventObject(IHTMLDocument4 *iface, return E_NOTIMPL; } - return create_event_obj(dispex_compat_mode(&This->node.event_target.dispex), ppEventObj); + return create_event_obj(NULL, dispex_compat_mode(&This->node.event_target.dispex), ppEventObj); } static HRESULT WINAPI HTMLDocument4_fireEvent(IHTMLDocument4 *iface, BSTR bstrEventName, diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 50f40ea62ae..f72670ad1c4 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -2035,11 +2035,11 @@ static HTMLEventObj *alloc_event_obj(DOMEvent *event, compat_mode_t compat_mode) return event_obj; } -HRESULT create_event_obj(compat_mode_t compat_mode, IHTMLEventObj **ret) +HRESULT create_event_obj(DOMEvent *event, compat_mode_t compat_mode, IHTMLEventObj **ret) { HTMLEventObj *event_obj; - event_obj = alloc_event_obj(NULL, compat_mode); + event_obj = alloc_event_obj(event, compat_mode); if(!event_obj) return E_OUTOFMEMORY; diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index b50c74c029f..2d86ba08782 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -107,7 +107,7 @@ HRESULT fire_event(HTMLDOMNode*,const WCHAR*,VARIANT*,VARIANT_BOOL*); void update_doc_cp_events(HTMLDocumentNode*,cp_static_data_t*); HRESULT doc_init_events(HTMLDocumentNode*); void detach_events(HTMLDocumentNode *doc); -HRESULT create_event_obj(compat_mode_t,IHTMLEventObj**); +HRESULT create_event_obj(DOMEvent*,compat_mode_t,IHTMLEventObj**); void bind_target_event(HTMLDocumentNode*,EventTarget*,const WCHAR*,IDispatch*); HRESULT ensure_doc_nsevent_handler(HTMLDocumentNode*,nsIDOMNode*,eventid_t); diff --git a/dlls/mshtml/htmlstorage.c b/dlls/mshtml/htmlstorage.c index 06d16e4e4aa..68452794449 100644 --- a/dlls/mshtml/htmlstorage.c +++ b/dlls/mshtml/htmlstorage.c @@ -208,12 +208,21 @@ static void storage_event_proc(event_task_t *_task) struct storage_event_task *task = (struct storage_event_task*)_task; HTMLInnerWindow *window = task->header.window; DOMEvent *event = task->event; + compat_mode_t compat_mode; VARIANT_BOOL cancelled; + HRESULT hres; + VARIANT var; - if(event->event_id == EVENTID_STORAGE && dispex_compat_mode(&window->event_target.dispex) >= COMPAT_MODE_IE9) { + if(event->event_id == EVENTID_STORAGE && (compat_mode = dispex_compat_mode(&window->event_target.dispex)) >= COMPAT_MODE_IE9) { dispatch_event(&window->event_target, event); - if(window->doc) - fire_event(&window->doc->node, L"onstorage", NULL, &cancelled); + if(window->doc) { + hres = create_event_obj(event, compat_mode, (IHTMLEventObj**)&V_DISPATCH(&var)); + if(SUCCEEDED(hres)) { + V_VT(&var) = VT_DISPATCH; + fire_event(&window->doc->node, L"onstorage", &var, &cancelled); + IDispatch_Release(V_DISPATCH(&var)); + } + } }else if(window->doc) { dispatch_event(&window->doc->node.event_target, event); }

1 0

Gabriel Ivăncescu : mshtml: Expose the other IHTMLEventObj* interfaces.
by Alexandre Julliard Dec. 7, 2023

Dec. 7, 2023

Module: wine Branch: master Commit: 39f86db516b8ae5018521e90e3a659f8fd300488 URL: https://gitlab.winehq.org/wine/wine/-/commit/39f86db516b8ae5018521e90e3a659… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Dec 6 20:16:34 2023 +0200 mshtml: Expose the other IHTMLEventObj* interfaces. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlevent.c | 1107 +++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/tests/events.c | 58 ++- dlls/mshtml/tests/events.html | 9 + 3 files changed, 1166 insertions(+), 8 deletions(-)

1 0

Alexandre Julliard : msvcrt: Add a stub ARM64EC CPU backend.
by Alexandre Julliard Dec. 7, 2023

Dec. 7, 2023

Module: wine Branch: master Commit: 457a6fd4b468772d15d2abb80d4ead472944dab8 URL: https://gitlab.winehq.org/wine/wine/-/commit/457a6fd4b468772d15d2abb80d4ead… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 7 14:49:51 2023 +0100 msvcrt: Add a stub ARM64EC CPU backend. --- dlls/crtdll/Makefile.in | 1 + dlls/msvcr100/Makefile.in | 1 + dlls/msvcr110/Makefile.in | 1 + dlls/msvcr120/Makefile.in | 1 + dlls/msvcr70/Makefile.in | 1 + dlls/msvcr71/Makefile.in | 1 + dlls/msvcr80/Makefile.in | 1 + dlls/msvcr90/Makefile.in | 1 + dlls/msvcrt/Makefile.in | 1 + dlls/msvcrt/except_arm64ec.c | 158 +++++++++++++++++++++++++++++++++++++++++++ dlls/msvcrt/except_x86_64.c | 2 +- dlls/msvcrtd/Makefile.in | 1 + dlls/ucrtbase/Makefile.in | 1 + 13 files changed, 170 insertions(+), 1 deletion(-) diff --git a/dlls/crtdll/Makefile.in b/dlls/crtdll/Makefile.in index b2559f3b91e..40b12eba29a 100644 --- a/dlls/crtdll/Makefile.in +++ b/dlls/crtdll/Makefile.in @@ -15,6 +15,7 @@ SOURCES = \ except.c \ except_arm.c \ except_arm64.c \ + except_arm64ec.c \ except_i386.c \ except_x86_64.c \ exception_ptr.c \ diff --git a/dlls/msvcr100/Makefile.in b/dlls/msvcr100/Makefile.in index 71bd580a6e7..09939efe08f 100644 --- a/dlls/msvcr100/Makefile.in +++ b/dlls/msvcr100/Makefile.in @@ -17,6 +17,7 @@ SOURCES = \ except.c \ except_arm.c \ except_arm64.c \ + except_arm64ec.c \ except_i386.c \ except_x86_64.c \ exception_ptr.c \ diff --git a/dlls/msvcr110/Makefile.in b/dlls/msvcr110/Makefile.in index a397b04efa2..d3795cecd7c 100644 --- a/dlls/msvcr110/Makefile.in +++ b/dlls/msvcr110/Makefile.in @@ -17,6 +17,7 @@ SOURCES = \ except.c \ except_arm.c \ except_arm64.c \ + except_arm64ec.c \ except_i386.c \ except_x86_64.c \ exception_ptr.c \ diff --git a/dlls/msvcr120/Makefile.in b/dlls/msvcr120/Makefile.in index ea9df276926..5954973cfec 100644 --- a/dlls/msvcr120/Makefile.in +++ b/dlls/msvcr120/Makefile.in @@ -17,6 +17,7 @@ SOURCES = \ except.c \ except_arm.c \ except_arm64.c \ + except_arm64ec.c \ except_i386.c \ except_x86_64.c \ exception_ptr.c \ diff --git a/dlls/msvcr70/Makefile.in b/dlls/msvcr70/Makefile.in index a1d8bf0f001..7979542caa2 100644 --- a/dlls/msvcr70/Makefile.in +++ b/dlls/msvcr70/Makefile.in @@ -16,6 +16,7 @@ SOURCES = \ except.c \ except_arm.c \ except_arm64.c \ + except_arm64ec.c \ except_i386.c \ except_x86_64.c \ exception_ptr.c \ diff --git a/dlls/msvcr71/Makefile.in b/dlls/msvcr71/Makefile.in index 6da68524dc6..2dfa5478544 100644 --- a/dlls/msvcr71/Makefile.in +++ b/dlls/msvcr71/Makefile.in @@ -16,6 +16,7 @@ SOURCES = \ except.c \ except_arm.c \ except_arm64.c \ + except_arm64ec.c \ except_i386.c \ except_x86_64.c \ exception_ptr.c \ diff --git a/dlls/msvcr80/Makefile.in b/dlls/msvcr80/Makefile.in index c6d2bb884f3..1bbabee0dac 100644 --- a/dlls/msvcr80/Makefile.in +++ b/dlls/msvcr80/Makefile.in @@ -16,6 +16,7 @@ SOURCES = \ except.c \ except_arm.c \ except_arm64.c \ + except_arm64ec.c \ except_i386.c \ except_x86_64.c \ exception_ptr.c \ diff --git a/dlls/msvcr90/Makefile.in b/dlls/msvcr90/Makefile.in index f86dfa18105..fb6047297e7 100644 --- a/dlls/msvcr90/Makefile.in +++ b/dlls/msvcr90/Makefile.in @@ -16,6 +16,7 @@ SOURCES = \ except.c \ except_arm.c \ except_arm64.c \ + except_arm64ec.c \ except_i386.c \ except_x86_64.c \ exception_ptr.c \ diff --git a/dlls/msvcrt/Makefile.in b/dlls/msvcrt/Makefile.in index 7dd1f9ed1a8..aa068b62e51 100644 --- a/dlls/msvcrt/Makefile.in +++ b/dlls/msvcrt/Makefile.in @@ -21,6 +21,7 @@ SOURCES = \ except.c \ except_arm.c \ except_arm64.c \ + except_arm64ec.c \ except_i386.c \ except_x86_64.c \ exception_ptr.c \ diff --git a/dlls/msvcrt/except_arm64ec.c b/dlls/msvcrt/except_arm64ec.c new file mode 100644 index 00000000000..f098449892a --- /dev/null +++ b/dlls/msvcrt/except_arm64ec.c @@ -0,0 +1,158 @@ +/* + * msvcrt C++ exception handling + * + * Copyright 2011 Alexandre Julliard + * Copyright 2013 André Hentschel + * Copyright 2017 Martin Storsjo + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifdef __arm64ec__ + +#include <setjmp.h> +#include <stdarg.h> +#include <fpieee.h> + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "windef.h" +#include "winbase.h" +#include "winternl.h" +#include "msvcrt.h" +#include "wine/exception.h" +#include "excpt.h" +#include "wine/debug.h" + +#include "cppexcept.h" + +WINE_DEFAULT_DEBUG_CHANNEL(seh); + +/********************************************************************* + * __CxxExceptionFilter (MSVCRT.@) + */ +int CDECL __CxxExceptionFilter( PEXCEPTION_POINTERS ptrs, + const type_info *ti, int flags, void **copy ) +{ + FIXME( "%p %p %x %p: not implemented\n", ptrs, ti, flags, copy ); + return EXCEPTION_CONTINUE_SEARCH; +} + +/********************************************************************* + * __CxxFrameHandler (MSVCRT.@) + */ +EXCEPTION_DISPOSITION CDECL __CxxFrameHandler( EXCEPTION_RECORD *rec, ULONG64 frame, CONTEXT *context, + DISPATCHER_CONTEXT *dispatch ) +{ + FIXME("%p %I64x %p %p: not implemented\n", rec, frame, context, dispatch); + return ExceptionContinueSearch; +} + + +/********************************************************************* + * __CppXcptFilter (MSVCRT.@) + */ +int CDECL __CppXcptFilter( NTSTATUS ex, PEXCEPTION_POINTERS ptr ) +{ + /* only filter c++ exceptions */ + if (ex != CXX_EXCEPTION) return EXCEPTION_CONTINUE_SEARCH; + return _XcptFilter(ex, ptr); +} + + +/********************************************************************* + * __CxxDetectRethrow (MSVCRT.@) + */ +BOOL CDECL __CxxDetectRethrow( PEXCEPTION_POINTERS ptrs ) +{ + PEXCEPTION_RECORD rec; + + if (!ptrs) + return FALSE; + + rec = ptrs->ExceptionRecord; + + if (rec->ExceptionCode == CXX_EXCEPTION && + rec->NumberParameters == 3 && + rec->ExceptionInformation[0] == CXX_FRAME_MAGIC_VC6 && + rec->ExceptionInformation[2]) + { + ptrs->ExceptionRecord = msvcrt_get_thread_data()->exc_record; + return TRUE; + } + return (msvcrt_get_thread_data()->exc_record == rec); +} + + +/********************************************************************* + * __CxxQueryExceptionSize (MSVCRT.@) + */ +unsigned int CDECL __CxxQueryExceptionSize(void) +{ + return sizeof(cxx_exception_type); +} + + +/******************************************************************* + * _setjmp (MSVCRT.@) + */ +int __attribute__((naked)) MSVCRT__setjmp( jmp_buf buf ) +{ + asm( "b " __ASM_NAME("__wine_setjmpex") ); +} + + +/******************************************************************* + * longjmp (MSVCRT.@) + */ +void __cdecl MSVCRT_longjmp( _JUMP_BUFFER *jmp, int retval ) +{ + EXCEPTION_RECORD rec; + + if (!retval) retval = 1; + if (jmp->Frame) + { + rec.ExceptionCode = STATUS_LONGJUMP; + rec.ExceptionFlags = 0; + rec.ExceptionRecord = NULL; + rec.ExceptionAddress = NULL; + rec.NumberParameters = 1; + rec.ExceptionInformation[0] = (DWORD_PTR)jmp; + RtlUnwind( (void *)jmp->Frame, (void *)jmp->Rip, &rec, IntToPtr(retval) ); + } + __wine_longjmp( (__wine_jmp_buf *)jmp, retval ); +} + +/********************************************************************* + * _fpieee_flt (MSVCRT.@) + */ +int __cdecl _fpieee_flt( __msvcrt_ulong exception_code, EXCEPTION_POINTERS *ep, + int (__cdecl *handler)(_FPIEEE_RECORD*) ) +{ + FIXME("(%lx %p %p)\n", exception_code, ep, handler); + return EXCEPTION_CONTINUE_SEARCH; +} + +#if _MSVCR_VER>=110 && _MSVCR_VER<=120 +/********************************************************************* + * __crtCapturePreviousContext (MSVCR110.@) + */ +void __cdecl __crtCapturePreviousContext( CONTEXT *ctx ) +{ + FIXME("not implemented\n"); +} +#endif + +#endif /* __arm64ec__ */ diff --git a/dlls/msvcrt/except_x86_64.c b/dlls/msvcrt/except_x86_64.c index b07a7b83772..9b8db6d0d67 100644 --- a/dlls/msvcrt/except_x86_64.c +++ b/dlls/msvcrt/except_x86_64.c @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#ifdef __x86_64__ +#if defined(__x86_64__) && !defined(__arm64ec__) #include <setjmp.h> #include <stdarg.h> diff --git a/dlls/msvcrtd/Makefile.in b/dlls/msvcrtd/Makefile.in index 8bfae2270f8..a06a244747e 100644 --- a/dlls/msvcrtd/Makefile.in +++ b/dlls/msvcrtd/Makefile.in @@ -17,6 +17,7 @@ SOURCES = \ except.c \ except_arm.c \ except_arm64.c \ + except_arm64ec.c \ except_i386.c \ except_x86_64.c \ exception_ptr.c \ diff --git a/dlls/ucrtbase/Makefile.in b/dlls/ucrtbase/Makefile.in index 433ca5d4b48..a3bb54750af 100644 --- a/dlls/ucrtbase/Makefile.in +++ b/dlls/ucrtbase/Makefile.in @@ -21,6 +21,7 @@ SOURCES = \ except.c \ except_arm.c \ except_arm64.c \ + except_arm64ec.c \ except_i386.c \ except_x86_64.c \ exception_ptr.c \

1 0

Alexandre Julliard : winex11: Use UINT instead of BOOL to avoid warnings for one-bit variables.
by Alexandre Julliard Dec. 7, 2023

Dec. 7, 2023

Module: wine Branch: master Commit: 3c9423618673702ab7a3129f0ca61a0605adab35 URL: https://gitlab.winehq.org/wine/wine/-/commit/3c9423618673702ab7a3129f0ca61a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 7 08:37:30 2023 +0100 winex11: Use UINT instead of BOOL to avoid warnings for one-bit variables. --- dlls/winex11.drv/x11drv.h | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index baa903e5099..9996b1f687d 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -621,16 +621,16 @@ struct x11drv_win_data RECT whole_rect; /* X window rectangle for the whole window relative to win32 parent window client area */ RECT client_rect; /* client area relative to win32 parent window client area */ XIC xic; /* X input context */ - BOOL managed : 1; /* is window managed? */ - BOOL mapped : 1; /* is window mapped? (in either normal or iconic state) */ - BOOL iconic : 1; /* is window in iconic state? */ - BOOL embedded : 1; /* is window an XEMBED client? */ - BOOL shaped : 1; /* is window using a custom region shape? */ - BOOL layered : 1; /* is window layered and with valid attributes? */ - BOOL use_alpha : 1; /* does window use an alpha channel? */ - BOOL skip_taskbar : 1; /* does window should be deleted from taskbar */ - BOOL add_taskbar : 1; /* does window should be added to taskbar regardless of style */ - BOOL net_wm_fullscreen_monitors_set : 1; /* is _NET_WM_FULLSCREEN_MONITORS set */ + UINT managed : 1; /* is window managed? */ + UINT mapped : 1; /* is window mapped? (in either normal or iconic state) */ + UINT iconic : 1; /* is window in iconic state? */ + UINT embedded : 1; /* is window an XEMBED client? */ + UINT shaped : 1; /* is window using a custom region shape? */ + UINT layered : 1; /* is window layered and with valid attributes? */ + UINT use_alpha : 1; /* does window use an alpha channel? */ + UINT skip_taskbar : 1; /* does window should be deleted from taskbar */ + UINT add_taskbar : 1; /* does window should be added to taskbar regardless of style */ + UINT net_wm_fullscreen_monitors_set : 1; /* is _NET_WM_FULLSCREEN_MONITORS set */ int wm_state; /* current value of the WM_STATE property */ DWORD net_wm_state; /* bit mask of active x11drv_net_wm_state values */ Window embedder; /* window id of embedder */

1 0

Alexandre Julliard : kernelbase: Implement SwitchToFiber on ARM64EC.
by Alexandre Julliard Dec. 7, 2023

Dec. 7, 2023

Module: wine Branch: master Commit: 158a2bada765ff4fafa9ee42a1512ed3c7ab88c3 URL: https://gitlab.winehq.org/wine/wine/-/commit/158a2bada765ff4fafa9ee42a1512e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 7 14:45:07 2023 +0100 kernelbase: Implement SwitchToFiber on ARM64EC. --- dlls/kernelbase/thread.c | 38 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 36 insertions(+), 2 deletions(-) diff --git a/dlls/kernelbase/thread.c b/dlls/kernelbase/thread.c index bb1145e3f66..8867029a854 100644 --- a/dlls/kernelbase/thread.c +++ b/dlls/kernelbase/thread.c @@ -787,8 +787,8 @@ struct fiber_data struct fiber_actctx actctx; /* activation context state */ }; -extern void WINAPI switch_fiber( CONTEXT *old, CONTEXT *new ); #ifdef __i386__ +extern void WINAPI switch_fiber( CONTEXT *old, CONTEXT *new ); __ASM_STDCALL_FUNC( switch_fiber, 8, "movl 4(%esp),%ecx\n\t" /* old */ "movl %edi,0x9c(%ecx)\n\t" /* old->Edi */ @@ -806,7 +806,36 @@ __ASM_STDCALL_FUNC( switch_fiber, 8, "movl 0xb4(%ecx),%ebp\n\t" /* new->Ebp */ "movl 0xc4(%ecx),%esp\n\t" /* new->Esp */ "jmp *0xb8(%ecx)" ) /* new->Eip */ +#elif defined(__arm64ec__) +static void __attribute__((naked)) WINAPI switch_fiber( CONTEXT *old, CONTEXT *new ) +{ + asm( "mov x2, sp\n\t" + "stp x27, x2, [x0, #0x90]\n\t" /* old->Rbx,Rsp */ + "str x29, [x0, #0xa0]\n\t" /* old->Rbp */ + "stp x25, x26, [x0, #0xa8]\n\t" /* old->Rsi,Rdi */ + "stp x19, x20, [x0, #0xd8]\n\t" /* old->R12,R13 */ + "stp x21, x22, [x0, #0xe8]\n\t" /* old->R14,R15 */ + "str x30, [x0, #0xf8]\n\t" /* old->Rip */ + "stp q8, q9, [x0, #0x220]\n\t" /* old->Xmm8,Xmm9 */ + "stp q10, q11, [x0, #0x240]\n\t" /* old->Xmm10,Xmm11 */ + "stp q12, q13, [x0, #0x260]\n\t" /* old->Xmm12,Xmm13 */ + "stp q14, q15, [x0, #0x280]\n\t" /* old->Xmm14,Xmm15 */ + /* FIXME: MxCsr */ + "ldp x27, x2, [x1, #0x90]\n\t" /* old->Rbx,Rsp */ + "ldr x29, [x1, #0xa0]\n\t" /* old->Rbp */ + "ldp x25, x26, [x1, #0xa8]\n\t" /* old->Rsi,Rdi */ + "ldp x19, x20, [x1, #0xd8]\n\t" /* old->R12,R13 */ + "ldp x21, x22, [x1, #0xe8]\n\t" /* old->R14,R15 */ + "ldr x30, [x1, #0xf8]\n\t" /* old->Rip */ + "ldp q8, q9, [x1, #0x220]\n\t" /* old->Xmm8,Xmm9 */ + "ldp q10, q11, [x1, #0x240]\n\t" /* old->Xmm10,Xmm11 */ + "ldp q12, q13, [x1, #0x260]\n\t" /* old->Xmm12,Xmm13 */ + "ldp q14, q15, [x1, #0x280]\n\t" /* old->Xmm14,Xmm15 */ + "mov sp, x2\n\t" + "ret" ); +} #elif defined(__x86_64__) +extern void WINAPI switch_fiber( CONTEXT *old, CONTEXT *new ); __ASM_GLOBAL_FUNC( switch_fiber, "movq %rbx,0x90(%rcx)\n\t" /* old->Rbx */ "leaq 0x8(%rsp),%rax\n\t" @@ -851,6 +880,7 @@ __ASM_GLOBAL_FUNC( switch_fiber, "movq 0x98(%rdx),%rsp\n\t" /* new->Rsp */ "jmp *0xf8(%rdx)" ) /* new->Rip */ #elif defined(__arm__) +extern void WINAPI switch_fiber( CONTEXT *old, CONTEXT *new ); __ASM_GLOBAL_FUNC( switch_fiber, "str r4, [r0, #0x14]\n\t" /* old->R4 */ "str r5, [r0, #0x18]\n\t" /* old->R5 */ @@ -874,6 +904,7 @@ __ASM_GLOBAL_FUNC( switch_fiber, "ldr r2, [r1, #0x40]\n\t" /* new->Pc */ "bx r2" ) #elif defined(__aarch64__) +extern void WINAPI switch_fiber( CONTEXT *old, CONTEXT *new ); __ASM_GLOBAL_FUNC( switch_fiber, "stp x19, x20, [x0, #0xa0]\n\t" /* old->X19,X20 */ "stp x21, x22, [x0, #0xb0]\n\t" /* old->X21,X22 */ @@ -895,7 +926,7 @@ __ASM_GLOBAL_FUNC( switch_fiber, "mov sp, x2\n\t" "ret" ) #else -void WINAPI switch_fiber( CONTEXT *old, CONTEXT *new ) +static void WINAPI switch_fiber( CONTEXT *old, CONTEXT *new ) { FIXME( "not implemented\n" ); DbgBreakPoint(); @@ -925,6 +956,9 @@ static void init_fiber_context( struct fiber_data *fiber ) #ifdef __i386__ fiber->context.Esp = (ULONG_PTR)fiber->stack_base - 4; fiber->context.Eip = (ULONG_PTR)start_fiber; +#elif defined(__arm64ec__) + fiber->context.Rsp = (ULONG_PTR)fiber->stack_base; + fiber->context.Rip = (ULONG_PTR)start_fiber; #elif defined(__x86_64__) fiber->context.Rsp = (ULONG_PTR)fiber->stack_base - 0x28; fiber->context.Rip = (ULONG_PTR)start_fiber;

1 0

Alexandre Julliard : ntdll: Implement KiUserCallbackDispatcher for ARM64EC.
by Alexandre Julliard Dec. 7, 2023

Dec. 7, 2023

Module: wine Branch: master Commit: 9e0f2e3b92666fec9e6efa6e3f19c3887b6ac8c9 URL: https://gitlab.winehq.org/wine/wine/-/commit/9e0f2e3b92666fec9e6efa6e3f19c3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 7 14:44:32 2023 +0100 ntdll: Implement KiUserCallbackDispatcher for ARM64EC. --- dlls/ntdll/signal_arm64ec.c | 31 ++++++++++++++++++++++++++++--- 1 file changed, 28 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/signal_arm64ec.c b/dlls/ntdll/signal_arm64ec.c index fc92a453b56..75b4c71bc9c 100644 --- a/dlls/ntdll/signal_arm64ec.c +++ b/dlls/ntdll/signal_arm64ec.c @@ -1694,10 +1694,35 @@ void WINAPI KiUserApcDispatcher( CONTEXT *context, ULONG_PTR arg1, ULONG_PTR arg /******************************************************************* * KiUserCallbackDispatcher (NTDLL.@) */ -void WINAPI KiUserCallbackDispatcher( ULONG id, void *args, ULONG len ) +void WINAPI dispatch_callback( void *args, ULONG len, ULONG id ) { - FIXME( "not implemented\n" ); -} + NTSTATUS status; + + __TRY + { + NTSTATUS (WINAPI *func)(void *, ULONG) = ((void **)NtCurrentTeb()->Peb->KernelCallbackTable)[id]; + status = NtCallbackReturn( NULL, 0, func( args, len )); + } + __EXCEPT_ALL + { + ERR_(seh)( "ignoring exception\n" ); + status = NtCallbackReturn( 0, 0, 0 ); + } + __ENDTRY + + RtlRaiseStatus( status ); +} +__ASM_GLOBAL_FUNC( "#KiUserCallbackDispatcher", + __ASM_SEH(".seh_pushframe\n\t") + "nop\n\t" + __ASM_SEH(".seh_stackalloc 0x20\n\t") + "nop\n\t" + __ASM_SEH(".seh_save_reg lr, 0x18\n\t") + __ASM_SEH(".seh_endprologue\n\t") + "ldr x0, [sp]\n\t" /* args */ + "ldp w1, w2, [sp, #0x08]\n\t" /* len, id */ + "bl " __ASM_NAME("dispatch_callback") "\n\t" + "brk #1" ) /**************************************************************************

1 0

Alexandre Julliard : kernelbase: Implement DebugBreak() for ARM64EC.
by Alexandre Julliard Dec. 7, 2023

Dec. 7, 2023

Module: wine Branch: master Commit: 8fef79cb41508c4cba7d22d00a0c936d2777278e URL: https://gitlab.winehq.org/wine/wine/-/commit/8fef79cb41508c4cba7d22d00a0c93… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 7 14:44:54 2023 +0100 kernelbase: Implement DebugBreak() for ARM64EC. --- dlls/kernelbase/debug.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/kernelbase/debug.c b/dlls/kernelbase/debug.c index e571378e2df..edb6d321a46 100644 --- a/dlls/kernelbase/debug.c +++ b/dlls/kernelbase/debug.c @@ -120,13 +120,14 @@ BOOL WINAPI DECLSPEC_HOTPATCH DebugActiveProcessStop( DWORD pid ) */ #ifdef __i386__ __ASM_STDCALL_FUNC( DebugBreak, 0, "jmp " __ASM_STDCALL("DbgBreakPoint", 0) ) +#elif defined(__aarch64__) +__ASM_GLOBAL_FUNC( DebugBreak, "brk #0xf000; ret" ) +#elif defined(__arm64ec__) +void __attribute__((naked)) WINAPI DebugBreak(void) { asm( "brk #0xf000; ret" ); } #elif defined(__x86_64__) __ASM_GLOBAL_FUNC( DebugBreak, "jmp " __ASM_NAME("DbgBreakPoint") ) -#else -void WINAPI DebugBreak(void) -{ - DbgBreakPoint(); -} +#elif defined(__arm__) +__ASM_GLOBAL_FUNC( DebugBreak, "udf #0xfe; bx lr" ) #endif

1 0

Alexandre Julliard : ntdll: Implement KiUserApcDispatcher for ARM64EC.
by Alexandre Julliard Dec. 7, 2023

Dec. 7, 2023

Module: wine Branch: master Commit: 6a5bb5d7aa893a0a9b868237ba07f910c5846c2e URL: https://gitlab.winehq.org/wine/wine/-/commit/6a5bb5d7aa893a0a9b868237ba07f9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 7 20:19:31 2023 +0100 ntdll: Implement KiUserApcDispatcher for ARM64EC. --- dlls/ntdll/signal_arm64ec.c | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/signal_arm64ec.c b/dlls/ntdll/signal_arm64ec.c index 75b4c71bc9c..9422bdefc0f 100644 --- a/dlls/ntdll/signal_arm64ec.c +++ b/dlls/ntdll/signal_arm64ec.c @@ -1684,11 +1684,27 @@ NTSTATUS WINAPI KiUserExceptionDispatcher( EXCEPTION_RECORD *rec, CONTEXT *conte /******************************************************************* * KiUserApcDispatcher (NTDLL.@) */ -void WINAPI KiUserApcDispatcher( CONTEXT *context, ULONG_PTR arg1, ULONG_PTR arg2, ULONG_PTR arg3, - PNTAPCFUNC apc ) +void WINAPI dispatch_apc( void (CALLBACK *func)(ULONG_PTR,ULONG_PTR,ULONG_PTR,CONTEXT*), + ULONG_PTR arg1, ULONG_PTR arg2, ULONG_PTR arg3, + BOOLEAN alertable, ARM64_NT_CONTEXT *arm_ctx ) { - FIXME( "not implemented\n" ); + CONTEXT context; + + context_arm_to_x64( &context, arm_ctx ); + func( arg1, arg2, arg3, &context ); + NtContinue( &context, alertable ); } +__ASM_GLOBAL_FUNC( "#KiUserApcDispatcher", + __ASM_SEH(".seh_context\n\t") + "nop\n\t" + __ASM_SEH(".seh_stackalloc 0x30\n\t") + __ASM_SEH(".seh_endprologue\n\t") + "ldp x0, x1, [sp]\n\t" /* func, arg1 */ + "ldp x2, x3, [sp, #0x10]\n\t" /* arg2, arg3 */ + "ldr w4, [sp, #0x20]\n\t" /* alertable */ + "add x5, sp, #0x30\n\t" /* context */ + "bl " __ASM_NAME("dispatch_apc") "\n\t" + "brk #1" ) /*******************************************************************

1 0