December 2023 - Wine-commits

Gabriel Ivăncescu : mshtml: Implement `url` prop for StorageEvent objs.
by Alexandre Julliard 07 Dec '23

07 Dec '23

Module: wine Branch: master Commit: 79a2fb719f8dd67bf42611702ea402693dc36911 URL: https://gitlab.winehq.org/wine/wine/-/commit/79a2fb719f8dd67bf42611702ea402… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Dec 6 20:16:34 2023 +0200 mshtml: Implement `url` prop for StorageEvent objs. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlevent.c | 62 ++++++++++++++++++++++++++++++++-------------- dlls/mshtml/tests/events.c | 37 ++++++++++++++++++++++++++- 2 files changed, 79 insertions(+), 20 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index f72670ad1c4..36a7fa6c83c 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -346,6 +346,20 @@ static DOMUIEvent *DOMUIEvent_from_DOMEvent(DOMEvent *event) return CONTAINING_RECORD(event, DOMUIEvent, event); } +typedef struct { + DOMEvent event; + IDOMStorageEvent IDOMStorageEvent_iface; + BSTR key; + BSTR old_value; + BSTR new_value; + BSTR url; +} DOMStorageEvent; + +static DOMStorageEvent *DOMStorageEvent_from_DOMEvent(DOMEvent *event) +{ + return CONTAINING_RECORD(event, DOMStorageEvent, event); +} + typedef struct { DispatchEx dispex; IHTMLEventObj IHTMLEventObj_iface; @@ -1765,20 +1779,44 @@ static HRESULT WINAPI HTMLEventObj5_Invoke(IHTMLEventObj5 *iface, DISPID dispIdM static HRESULT WINAPI HTMLEventObj5_put_url(IHTMLEventObj5 *iface, BSTR v) { HTMLEventObj *This = impl_from_IHTMLEventObj5(iface); + IDOMStorageEvent *storage_event; + DOMStorageEvent *p; + BSTR url; - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); - return DISP_E_MEMBERNOTFOUND; + if(!v) + return E_POINTER; + + if(!This->event || FAILED(IDOMEvent_QueryInterface(&This->event->IDOMEvent_iface, &IID_IDOMStorageEvent, (void**)&storage_event))) + return DISP_E_MEMBERNOTFOUND; + IDOMStorageEvent_Release(storage_event); + + if(!(url = SysAllocString(v))) + return E_OUTOFMEMORY; + + p = DOMStorageEvent_from_DOMEvent(This->event); + SysFreeString(p->url); + p->url = url; + return S_OK; } static HRESULT WINAPI HTMLEventObj5_get_url(IHTMLEventObj5 *iface, BSTR *p) { HTMLEventObj *This = impl_from_IHTMLEventObj5(iface); + IDOMStorageEvent *storage_event; + HRESULT hres; - FIXME("(%p)->(%p)\n", This, p); + TRACE("(%p)->(%p)\n", This, p); - *p = NULL; - return S_OK; + if(!This->event || FAILED(IDOMEvent_QueryInterface(&This->event->IDOMEvent_iface, &IID_IDOMStorageEvent, (void**)&storage_event))) { + *p = NULL; + return S_OK; + } + + hres = IDOMStorageEvent_get_url(storage_event, p); + IDOMStorageEvent_Release(storage_event); + return hres; } static HRESULT WINAPI HTMLEventObj5_put_data(IHTMLEventObj5 *iface, BSTR v) @@ -3954,15 +3992,6 @@ static void DOMProgressEvent_unlink(DispatchEx *dispex) unlink_ref(&This->nsevent); } -typedef struct { - DOMEvent event; - IDOMStorageEvent IDOMStorageEvent_iface; - BSTR key; - BSTR old_value; - BSTR new_value; - BSTR url; -} DOMStorageEvent; - static inline DOMStorageEvent *impl_from_IDOMStorageEvent(IDOMStorageEvent *iface) { return CONTAINING_RECORD(iface, DOMStorageEvent, IDOMStorageEvent_iface); @@ -4097,11 +4126,6 @@ static const IDOMStorageEventVtbl DOMStorageEventVtbl = { DOMStorageEvent_initStorageEvent }; -static DOMStorageEvent *DOMStorageEvent_from_DOMEvent(DOMEvent *event) -{ - return CONTAINING_RECORD(event, DOMStorageEvent, event); -} - static void *DOMStorageEvent_query_interface(DispatchEx *dispex, REFIID riid) { DOMStorageEvent *storage_event = DOMStorageEvent_from_DOMEvent(DOMEvent_from_DispatchEx(dispex)); diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index aff6cf7e919..606cbbc74ce 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -3872,9 +3872,11 @@ static void test_storage_event(DISPPARAMS *params, BOOL doc_onstorage) { const WCHAR *expect_key = onstorage_expect_key, *expect_old_value = onstorage_expect_old_value, *expect_new_value = onstorage_expect_new_value; unsigned line = onstorage_expect_line; + IHTMLEventObj5 *event_obj5; IHTMLEventObj *event_obj; IDOMStorageEvent *event; IDispatchEx *dispex; + IDispatch *disp; HRESULT hres; unsigned i; DISPID id; @@ -3898,6 +3900,8 @@ static void test_storage_event(DISPPARAMS *params, BOOL doc_onstorage) hres = IDispatchEx_QueryInterface(dispex, &IID_IHTMLEventObj, (void**)&event_obj); ok_(__FILE__,line)(hres == S_OK, "Could not get IHTMLEventObj: %08lx\n", hres); + hres = IHTMLEventObj_QueryInterface(event_obj, &IID_IHTMLEventObj5, (void**)&event_obj5); + ok_(__FILE__,line)(hres == S_OK, "Could not get IHTMLEventObj5: %08lx\n", hres); IHTMLEventObj_Release(event_obj); for(i = 0; i < ARRAY_SIZE(props); i++) { @@ -3906,8 +3910,39 @@ static void test_storage_event(DISPPARAMS *params, BOOL doc_onstorage) ok_(__FILE__,line)(hres == DISP_E_UNKNOWNNAME, "GetDispID(%s) failed: %08lx\n", wine_dbgstr_w(bstr), hres); SysFreeString(bstr); } - IDispatchEx_Release(dispex); + + hres = IHTMLEventObj5_get_data(event_obj5, &bstr); + ok_(__FILE__,line)(hres == S_OK, "get_data failed: %08lx\n", hres); + ok_(__FILE__,line)(!bstr, "data = %s\n", wine_dbgstr_w(bstr)); + + hres = IHTMLEventObj5_get_origin(event_obj5, &bstr); + ok_(__FILE__,line)(hres == S_OK, "get_origin failed: %08lx\n", hres); + ok_(__FILE__,line)(!bstr, "origin = %s\n", wine_dbgstr_w(bstr)); + + hres = IHTMLEventObj5_get_source(event_obj5, &disp); + ok_(__FILE__,line)(hres == S_OK, "get_source failed: %08lx\n", hres); + ok_(__FILE__,line)(!disp, "source != NULL\n"); + + hres = IHTMLEventObj5_get_url(event_obj5, &bstr); + ok_(__FILE__,line)(hres == S_OK, "get_url failed: %08lx\n", hres); + ok_(__FILE__,line)(!wcscmp(bstr, L"http://winetest.example.org/"), "url = %s\n", wine_dbgstr_w(bstr)); + SysFreeString(bstr); + + bstr = SysAllocString(L"barfoo"); + hres = IHTMLEventObj5_put_url(event_obj5, bstr); + ok_(__FILE__,line)(hres == S_OK, "put_url failed: %08lx\n", hres); + SysFreeString(bstr); + + hres = IHTMLEventObj5_get_url(event_obj5, &bstr); + ok_(__FILE__,line)(hres == S_OK, "get_url after put failed: %08lx\n", hres); + ok_(__FILE__,line)(!wcscmp(bstr, L"barfoo"), "url after put = %s\n", wine_dbgstr_w(bstr)); + SysFreeString(bstr); + + hres = IHTMLEventObj5_put_url(event_obj5, NULL); + ok_(__FILE__,line)(hres == E_POINTER, "put_url NULL returned: %08lx\n", hres); + + IHTMLEventObj5_Release(event_obj5); return; }

1 0

Gabriel Ivăncescu : mshtml/tests: Fix VariantClear on uninitialized variable.
by Alexandre Julliard 07 Dec '23

07 Dec '23

Module: wine Branch: master Commit: 3545c35d2988295116e907305e77f64995e40fba URL: https://gitlab.winehq.org/wine/wine/-/commit/3545c35d2988295116e907305e77f6… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Dec 6 20:16:34 2023 +0200 mshtml/tests: Fix VariantClear on uninitialized variable. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/tests/dom.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 58a1cc6cf20..de3ff54966c 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -3672,6 +3672,8 @@ static LONG test_attr_collection_attr(IDispatch *attr, LONG i) VARIANT val; BSTR name; + V_VT(&val) = VT_EMPTY; + hres = IDispatch_QueryInterface(attr, &IID_IHTMLDOMAttribute, (void**)&dom_attr); ok(hres == S_OK, "%ld) QueryInterface failed: %08lx\n", i, hres);

1 0

Zebediah Figura : configure: Use -mpreferred-stack-boundary=2 on i386.
by Alexandre Julliard 07 Dec '23

07 Dec '23

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

Akihiro Sagawa : dwmapi: Implement DwmGetWindowAttribute(DWMWA_EXTENDED_FRAME_BOUNDS).
by Alexandre Julliard 07 Dec '23

07 Dec '23

Module: wine Branch: master Commit: 3681a68e7804e0398b3f15f16af4ae19ef2e5dba URL: https://gitlab.winehq.org/wine/wine/-/commit/3681a68e7804e0398b3f15f16af4ae… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Nov 30 23:00:09 2023 +0900 dwmapi: Implement DwmGetWindowAttribute(DWMWA_EXTENDED_FRAME_BOUNDS). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55968 --- dlls/dwmapi/dwmapi_main.c | 41 ++++++++++++++++++++++++++++++-- dlls/dwmapi/tests/dwmapi.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 97 insertions(+), 2 deletions(-) diff --git a/dlls/dwmapi/dwmapi_main.c b/dlls/dwmapi/dwmapi_main.c index 9ec03185f36..adc02552ba7 100644 --- a/dlls/dwmapi/dwmapi_main.c +++ b/dlls/dwmapi/dwmapi_main.c @@ -196,9 +196,46 @@ BOOL WINAPI DwmDefWindowProc(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam, */ HRESULT WINAPI DwmGetWindowAttribute(HWND hwnd, DWORD attribute, PVOID pv_attribute, DWORD size) { - FIXME("(%p %ld %p %ld) stub\n", hwnd, attribute, pv_attribute, size); + BOOL enabled = FALSE; + HRESULT hr; - return E_NOTIMPL; + TRACE("(%p %ld %p %ld)\n", hwnd, attribute, pv_attribute, size); + + if (DwmIsCompositionEnabled(&enabled) == S_OK && !enabled) + return E_HANDLE; + if (!IsWindow(hwnd)) + return E_HANDLE; + + switch (attribute) { + case DWMWA_EXTENDED_FRAME_BOUNDS: + { + RECT *rect = (RECT *)pv_attribute; + DPI_AWARENESS_CONTEXT context; + + if (!rect) + return E_INVALIDARG; + if (size < sizeof(*rect)) + return E_NOT_SUFFICIENT_BUFFER; + if (GetWindowLongW(hwnd, GWL_STYLE) & WS_CHILD) + return E_HANDLE; + + /* DWM frame bounds are always in physical coords */ + context = SetThreadDpiAwarenessContext(DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE); + if (GetWindowRect(hwnd, rect)) + hr = S_OK; + else + hr = HRESULT_FROM_WIN32(GetLastError()); + + SetThreadDpiAwarenessContext(context); + break; + } + default: + FIXME("attribute %ld not implemented.\n", attribute); + hr = E_NOTIMPL; + break; + } + + return hr; } /********************************************************************** diff --git a/dlls/dwmapi/tests/dwmapi.c b/dlls/dwmapi/tests/dwmapi.c index 29dbcbe74bd..a89a1fd705b 100644 --- a/dlls/dwmapi/tests/dwmapi.c +++ b/dlls/dwmapi/tests/dwmapi.c @@ -83,8 +83,66 @@ static void test_DwmGetCompositionTimingInfo(void) "Got wrong monitor refresh period %s.\n", wine_dbgstr_longlong(timing_info.qpcRefreshPeriod)); } +static void test_DWMWA_EXTENDED_FRAME_BOUNDS(void) +{ + DPI_AWARENESS_CONTEXT (WINAPI *pSetThreadDpiAwarenessContext)(DPI_AWARENESS_CONTEXT); + DPI_AWARENESS_CONTEXT old_context = NULL; + BOOL enabled; + HRESULT hr; + RECT rect, window_rect, intersection; + HWND hwnd, child; + + pSetThreadDpiAwarenessContext = (void *)GetProcAddress(GetModuleHandleA("user32.dll"), + "SetThreadDpiAwarenessContext"); + if (pSetThreadDpiAwarenessContext) + old_context = pSetThreadDpiAwarenessContext(DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE); + + hwnd = CreateWindowW(L"static", L"static", WS_OVERLAPPEDWINDOW | WS_POPUP | WS_VISIBLE, 10, 10, 200, 200, NULL, NULL, NULL, NULL); + child = CreateWindowW(L"edit", L"edit", WS_CHILD | WS_VISIBLE, 0, 0, 50, 50, hwnd, NULL, NULL, NULL); + + DwmIsCompositionEnabled(&enabled); + hr = DwmGetWindowAttribute(hwnd, DWMWA_EXTENDED_FRAME_BOUNDS, &rect, sizeof(rect)); + if (!enabled) { + ok(hr == E_HANDLE, "Got hr %#lx.\n", hr); + skip("DWM is disabled.\n"); + goto cleanup; + } + + hr = DwmGetWindowAttribute(NULL, DWMWA_EXTENDED_FRAME_BOUNDS, &rect, sizeof(rect)); + ok(hr == E_HANDLE, "Got hr %#lx.\n", hr); + hr = DwmGetWindowAttribute(hwnd, DWMWA_EXTENDED_FRAME_BOUNDS, &enabled, sizeof(enabled)); + ok(hr == E_NOT_SUFFICIENT_BUFFER, "Got hr %#lx.\n", hr); + hr = DwmGetWindowAttribute(hwnd, DWMWA_EXTENDED_FRAME_BOUNDS, NULL, 0); + ok(hr == E_INVALIDARG, "Got hr %#lx.\n", hr); + hr = DwmGetWindowAttribute(child, DWMWA_EXTENDED_FRAME_BOUNDS, &rect, sizeof(rect)); + ok(hr == E_HANDLE, "Got hr %#lx.\n", hr); + hr = DwmGetWindowAttribute(hwnd, DWMWA_EXTENDED_FRAME_BOUNDS, &rect, sizeof(rect)); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + /* Window rectangle covers extended frame */ + GetWindowRect(hwnd, &window_rect); + IntersectRect(&intersection, &window_rect, &rect); + ok(EqualRect(&intersection, &rect), "Got wrong frame %s, window %s.\n", wine_dbgstr_rect(&rect), wine_dbgstr_rect(&window_rect)); + + /* Extended frame bounds aren't adjusted for DPI */ + if (pSetThreadDpiAwarenessContext) { + RECT unaware_rect; + pSetThreadDpiAwarenessContext(DPI_AWARENESS_CONTEXT_UNAWARE); + hr = DwmGetWindowAttribute(hwnd, DWMWA_EXTENDED_FRAME_BOUNDS, &unaware_rect, sizeof(unaware_rect)); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(EqualRect(&rect, &unaware_rect), "Expected %s, got %s.\n", wine_dbgstr_rect(&rect), wine_dbgstr_rect(&unaware_rect)); + } + +cleanup: + if (pSetThreadDpiAwarenessContext) + pSetThreadDpiAwarenessContext(old_context); + DestroyWindow(child); + DestroyWindow(hwnd); +} + START_TEST(dwmapi) { test_DwmIsCompositionEnabled(); test_DwmGetCompositionTimingInfo(); + test_DWMWA_EXTENDED_FRAME_BOUNDS(); }

1 0

Jacek Caban : ntdll: Remove unused valgrind_make_readable function.
by Alexandre Julliard 07 Dec '23

07 Dec '23

Module: wine Branch: master Commit: 04b3f6ee511696c2e3b1700475f775738d7fe24d URL: https://gitlab.winehq.org/wine/wine/-/commit/04b3f6ee511696c2e3b1700475f775… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 7 00:28:10 2023 +0100 ntdll: Remove unused valgrind_make_readable function. --- dlls/ntdll/heap.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index e3388e1bc8a..4dc3e7296b6 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -460,16 +460,6 @@ static inline void valgrind_make_noaccess( void const *ptr, SIZE_T size ) #endif } -/* mark a block of memory as initialized for debugging purposes */ -static inline void valgrind_make_readable( void const *ptr, SIZE_T size ) -{ -#if defined(VALGRIND_MAKE_MEM_DEFINED) - VALGRIND_DISCARD( VALGRIND_MAKE_MEM_DEFINED( ptr, size ) ); -#elif defined(VALGRIND_MAKE_READABLE) - VALGRIND_DISCARD( VALGRIND_MAKE_READABLE( ptr, size ) ); -#endif -} - /* mark a block of memory as uninitialized for debugging purposes */ static inline void valgrind_make_writable( void const *ptr, SIZE_T size ) {

1 0

Alexandre Julliard : winex11: Use UINT instead of BOOL to avoid warnings for one-bit variables.
by Alexandre Julliard 07 Dec '23

07 Dec '23

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 : ntdll: Implement KiUserCallbackDispatcher for ARM64EC.
by Alexandre Julliard 07 Dec '23

07 Dec '23

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 : ntdll: Implement KiUserApcDispatcher for ARM64EC.
by Alexandre Julliard 07 Dec '23

07 Dec '23

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

Alexandre Julliard : kernelbase: Implement DebugBreak() for ARM64EC.
by Alexandre Julliard 07 Dec '23

07 Dec '23

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 : kernelbase: Implement SwitchToFiber on ARM64EC.
by Alexandre Julliard 07 Dec '23

07 Dec '23

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