December 2021 - Wine-devel - list.winehq.org

[PATCH v2] ntdll: Support both HP-UX-like libunwind and LLVM libunwind error codes.
by Jinoh Kang 09 Dec '21

09 Dec '21

HP-UX libunwind uses the sign of error code to indicate whether the operation was successful; however, LLVM always returns positive error codes. Normalise the sign of the error code so that it handles all flavours of libunwind. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- dlls/ntdll/unix/signal_arm.c | 5 +++-- dlls/ntdll/unix/signal_arm64.c | 5 +++-- dlls/ntdll/unix/signal_x86_64.c | 1 + 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/unix/signal_arm.c b/dlls/ntdll/unix/signal_arm.c index f4987f902e0..48c2bc159b5 100644 --- a/dlls/ntdll/unix/signal_arm.c +++ b/dlls/ntdll/unix/signal_arm.c @@ -248,12 +248,13 @@ NTSTATUS CDECL unwind_builtin_dll( ULONG type, struct _DISPATCHER_CONTEXT *dispa return STATUS_INVALID_DISPOSITION; } rc = unw_get_proc_info( &cursor, &info ); - if (rc != UNW_ESUCCESS && rc != -UNW_ENOINFO) + if (rc < 0) rc = -rc; /* libunwind may return negative error codes */ + if (rc != UNW_ESUCCESS && rc != UNW_ENOINFO) { WARN( "failed to get info: %d\n", rc ); return STATUS_INVALID_DISPOSITION; } - if (rc == -UNW_ENOINFO || ip < info.start_ip || ip > info.end_ip) + if (rc == UNW_ENOINFO || ip < info.start_ip || ip > info.end_ip) { NTSTATUS status = context->Pc != context->Lr ? STATUS_SUCCESS : STATUS_INVALID_DISPOSITION; diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c index ae44fb02982..4cdbd888bf0 100644 --- a/dlls/ntdll/unix/signal_arm64.c +++ b/dlls/ntdll/unix/signal_arm64.c @@ -212,12 +212,13 @@ NTSTATUS CDECL unwind_builtin_dll( ULONG type, DISPATCHER_CONTEXT *dispatch, CON return STATUS_INVALID_DISPOSITION; } rc = unw_get_proc_info( &cursor, &info ); - if (rc != UNW_ESUCCESS && rc != -UNW_ENOINFO) + if (rc < 0) rc = -rc; /* libunwind may return negative error codes */ + if (rc != UNW_ESUCCESS && rc != UNW_ENOINFO) { WARN( "failed to get info: %d\n", rc ); return STATUS_INVALID_DISPOSITION; } - if (rc == -UNW_ENOINFO || ip < info.start_ip || ip > info.end_ip) + if (rc == UNW_ENOINFO || ip < info.start_ip || ip > info.end_ip) { TRACE( "no info found for %lx ip %lx-%lx, assuming leaf function\n", ip, info.start_ip, info.end_ip ); diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 3d7b8e256b4..d1e2e27c46c 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -1415,6 +1415,7 @@ static NTSTATUS libunwind_virtual_unwind( ULONG64 ip, ULONG64 *frame, CONTEXT *c *frame = context->Rsp; rc = unw_get_proc_info(&cursor, &info); + if (rc < 0) rc = -rc; /* libunwind may return negative error codes */ if (rc != UNW_ESUCCESS && rc != UNW_ENOINFO) { WARN( "failed to get info: %d\n", rc ); -- 2.34.1

1 0

[PATCH v5 1/4] include: Define fast fail codes and the __fastfail() intrinsic.
by Jinoh Kang 09 Dec '21

09 Dec '21

Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- include/winnt.h | 116 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 116 insertions(+) diff --git a/include/winnt.h b/include/winnt.h index c80efee077d..e80c10bd49c 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -915,6 +915,122 @@ NTSYSAPI PSLIST_ENTRY WINAPI RtlInterlockedPushEntrySList(PSLIST_HEADER, PSLIST_ NTSYSAPI WORD WINAPI RtlQueryDepthSList(PSLIST_HEADER); +/* Fast fail (__fastfail) codes */ + +#define FAST_FAIL_LEGACY_GS_VIOLATION 0 +#define FAST_FAIL_VTGUARD_CHECK_FAILURE 1 +#define FAST_FAIL_STACK_COOKIE_CHECK_FAILURE 2 +#define FAST_FAIL_CORRUPT_LIST_ENTRY 3 +#define FAST_FAIL_INCORRECT_STACK 4 +#define FAST_FAIL_INVALID_ARG 5 +#define FAST_FAIL_GS_COOKIE_INIT 6 +#define FAST_FAIL_FATAL_APP_EXIT 7 +#define FAST_FAIL_RANGE_CHECK_FAILURE 8 +#define FAST_FAIL_UNSAFE_REGISTRY_ACCESS 9 +#define FAST_FAIL_GUARD_ICALL_CHECK_FAILURE 10 +#define FAST_FAIL_GUARD_WRITE_CHECK_FAILURE 11 +#define FAST_FAIL_INVALID_FIBER_SWITCH 12 +#define FAST_FAIL_INVALID_SET_OF_CONTEXT 13 +#define FAST_FAIL_INVALID_REFERENCE_COUNT 14 +#define FAST_FAIL_INVALID_JUMP_BUFFER 18 +#define FAST_FAIL_MRDATA_MODIFIED 19 +#define FAST_FAIL_CERTIFICATION_FAILURE 20 +#define FAST_FAIL_INVALID_EXCEPTION_CHAIN 21 +#define FAST_FAIL_CRYPTO_LIBRARY 22 +#define FAST_FAIL_INVALID_CALL_IN_DLL_CALLOUT 23 +#define FAST_FAIL_INVALID_IMAGE_BASE 24 +#define FAST_FAIL_DLOAD_PROTECTION_FAILURE 25 +#define FAST_FAIL_UNSAFE_EXTENSION_CALL 26 +#define FAST_FAIL_DEPRECATED_SERVICE_INVOKED 27 +#define FAST_FAIL_INVALID_BUFFER_ACCESS 28 +#define FAST_FAIL_INVALID_BALANCED_TREE 29 +#define FAST_FAIL_INVALID_NEXT_THREAD 30 +#define FAST_FAIL_GUARD_ICALL_CHECK_SUPPRESSED 31 +#define FAST_FAIL_APCS_DISABLED 32 +#define FAST_FAIL_INVALID_IDLE_STATE 33 +#define FAST_FAIL_MRDATA_PROTECTION_FAILURE 34 +#define FAST_FAIL_UNEXPECTED_HEAP_EXCEPTION 35 +#define FAST_FAIL_INVALID_LOCK_STATE 36 +#define FAST_FAIL_GUARD_JUMPTABLE 37 +#define FAST_FAIL_INVALID_LONGJUMP_TARGET 38 +#define FAST_FAIL_INVALID_DISPATCH_CONTEXT 39 +#define FAST_FAIL_INVALID_THREAD 40 +#define FAST_FAIL_INVALID_SYSCALL_NUMBER 41 +#define FAST_FAIL_INVALID_FILE_OPERATION 42 +#define FAST_FAIL_LPAC_ACCESS_DENIED 43 +#define FAST_FAIL_GUARD_SS_FAILURE 44 +#define FAST_FAIL_LOADER_CONTINUITY_FAILURE 45 +#define FAST_FAIL_GUARD_EXPORT_SUPPRESSION_FAILURE 46 +#define FAST_FAIL_INVALID_CONTROL_STACK 47 +#define FAST_FAIL_SET_CONTEXT_DENIED 48 +#define FAST_FAIL_INVALID_IAT 49 +#define FAST_FAIL_HEAP_METADATA_CORRUPTION 50 +#define FAST_FAIL_PAYLOAD_RESTRICTION_VIOLATION 51 +#define FAST_FAIL_LOW_LABEL_ACCESS_DENIED 52 +#define FAST_FAIL_ENCLAVE_CALL_FAILURE 53 +#define FAST_FAIL_UNHANDLED_LSS_EXCEPTON 54 +#define FAST_FAIL_ADMINLESS_ACCESS_DENIED 55 +#define FAST_FAIL_UNEXPECTED_CALL 56 +#define FAST_FAIL_CONTROL_INVALID_RETURN_ADDRESS 57 +#define FAST_FAIL_UNEXPECTED_HOST_BEHAVIOR 58 +#define FAST_FAIL_FLAGS_CORRUPTION 59 +#define FAST_FAIL_VEH_CORRUPTION 60 +#define FAST_FAIL_ETW_CORRUPTION 61 +#define FAST_FAIL_RIO_ABORT 62 +#define FAST_FAIL_INVALID_PFN 63 +#define FAST_FAIL_GUARD_ICALL_CHECK_FAILURE_XFG 64 +#define FAST_FAIL_CAST_GUARD 65 +#define FAST_FAIL_HOST_VISIBILITY_CHANGE 66 +#define FAST_FAIL_KERNEL_CET_SHADOW_STACK_ASSIST 67 +#define FAST_FAIL_PATCH_CALLBACK_FAILED 68 +#define FAST_FAIL_NTDLL_PATCH_FAILED 69 +#define FAST_FAIL_INVALID_FLS_DATA 70 +#define FAST_FAIL_INVALID_FAST_FAIL_CODE 0xFFFFFFFF + +#if defined(__GNUC__) +#if defined(__x86_64__) +static FORCEINLINE DECLSPEC_NORETURN void __fastfail(unsigned int code) +{ + register ULONGLONG val __asm__("rcx") = code; + __asm__ __volatile__( "int $0x29" :: "r" (val) : "memory" ); +#if defined(__GNUC__) && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 5))) + __builtin_unreachable(); +#endif +} +#elif defined(__i386__) +static FORCEINLINE DECLSPEC_NORETURN void __fastfail(unsigned int code) +{ + register ULONG val __asm__("ecx") = code; + __asm__ __volatile__( "int $0x29" :: "r" (val) : "memory" ); +#if defined(__GNUC__) && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 5))) + __builtin_unreachable(); +#endif +} +#elif defined(__aarch64__) +static FORCEINLINE DECLSPEC_NORETURN void __fastfail(unsigned int code) +{ + register ULONGLONG val __asm__("x0") = code; + __asm__ __volatile__( "brk #0xf003" :: "r" (val) : "memory" ); +#if defined(__GNUC__) && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 5))) + __builtin_unreachable(); +#endif +} +#elif defined(__arm__) +static FORCEINLINE DECLSPEC_NORETURN void __fastfail(unsigned int code) +{ + register ULONG val __asm__("r0") = code; + __asm__ __volatile__( "udf #0xfb" :: "r" (val) : "memory" ); +#if defined(__GNUC__) && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 5))) + __builtin_unreachable(); +#endif +} +#endif /* __x86_64__ */ +#elif defined(_MSC_VER) && (_MSC_VER >= 1610) +DECLSPEC_NORETURN void __fastfail(unsigned int); +#pragma intrinsic(__fastfail) +#endif /* __GNUC__ */ + + /* Heap flags */ #define HEAP_NO_SERIALIZE 0x00000001 -- 2.31.1

1 3

[PATCH] ntdll: Fix unwinding leaf functions of builtin modules in ARM/ARM64.
by Jinoh Kang 09 Dec '21

09 Dec '21

Commit 5c101ed58f5 (ntdll: Fix unwinding of leaf functions on ARM64., 2019-10-23) changed the sign of UNW_ENOINFO when testing for error from libunwind. However, unw_get_proc_info() does not return a sign-flipped error code. Thus, comparing it with -UNW_ENOINFO is a no-op. Fix this by not negating UNW_ENOINFO. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- Notes: As a result of this change, Unix-side non-leaf functions that lack asynchronous unwind tables may erroneously be recognised as leaf functions. To fix this, ideally unwind_builtin_dll shall never be called for PE modules (builtin or not). dlls/ntdll/unix/signal_arm.c | 4 ++-- dlls/ntdll/unix/signal_arm64.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/unix/signal_arm.c b/dlls/ntdll/unix/signal_arm.c index f4987f902e0..4f65a03793e 100644 --- a/dlls/ntdll/unix/signal_arm.c +++ b/dlls/ntdll/unix/signal_arm.c @@ -248,12 +248,12 @@ NTSTATUS CDECL unwind_builtin_dll( ULONG type, struct _DISPATCHER_CONTEXT *dispa return STATUS_INVALID_DISPOSITION; } rc = unw_get_proc_info( &cursor, &info ); - if (rc != UNW_ESUCCESS && rc != -UNW_ENOINFO) + if (rc != UNW_ESUCCESS && rc != UNW_ENOINFO) { WARN( "failed to get info: %d\n", rc ); return STATUS_INVALID_DISPOSITION; } - if (rc == -UNW_ENOINFO || ip < info.start_ip || ip > info.end_ip) + if (rc == UNW_ENOINFO || ip < info.start_ip || ip > info.end_ip) { NTSTATUS status = context->Pc != context->Lr ? STATUS_SUCCESS : STATUS_INVALID_DISPOSITION; diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c index ae44fb02982..40c484c530b 100644 --- a/dlls/ntdll/unix/signal_arm64.c +++ b/dlls/ntdll/unix/signal_arm64.c @@ -212,12 +212,12 @@ NTSTATUS CDECL unwind_builtin_dll( ULONG type, DISPATCHER_CONTEXT *dispatch, CON return STATUS_INVALID_DISPOSITION; } rc = unw_get_proc_info( &cursor, &info ); - if (rc != UNW_ESUCCESS && rc != -UNW_ENOINFO) + if (rc != UNW_ESUCCESS && rc != UNW_ENOINFO) { WARN( "failed to get info: %d\n", rc ); return STATUS_INVALID_DISPOSITION; } - if (rc == -UNW_ENOINFO || ip < info.start_ip || ip > info.end_ip) + if (rc == UNW_ENOINFO || ip < info.start_ip || ip > info.end_ip) { TRACE( "no info found for %lx ip %lx-%lx, assuming leaf function\n", ip, info.start_ip, info.end_ip ); -- 2.34.1

2 2

[PATCH 1/9] mshtml: Implement value construction for HTMLOptionElementFactory.
by Gabriel Ivăncescu 09 Dec '21

09 Dec '21

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlselect.c | 46 +++++++++++++++++++++++++++++++++++++++- dlls/mshtml/tests/dom.c | 22 ++++++++++++++++++- 2 files changed, 66 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlselect.c b/dlls/mshtml/htmlselect.c index 7869a8e..b2c10f7 100644 --- a/dlls/mshtml/htmlselect.c +++ b/dlls/mshtml/htmlselect.c @@ -590,14 +590,58 @@ static const IHTMLOptionElementFactoryVtbl HTMLOptionElementFactoryVtbl = { HTMLOptionElementFactory_create }; +static inline HTMLOptionElementFactory *HTMLOptionElementFactory_from_DispatchEx(DispatchEx *iface) +{ + return CONTAINING_RECORD(iface, HTMLOptionElementFactory, dispex); +} + +static HRESULT HTMLOptionElementFactory_value(DispatchEx *dispex, LCID lcid, + WORD flags, DISPPARAMS *params, VARIANT *res, EXCEPINFO *ei, + IServiceProvider *caller) +{ + HTMLOptionElementFactory *This = HTMLOptionElementFactory_from_DispatchEx(dispex); + unsigned int i, argc = params->cArgs - params->cNamedArgs; + IHTMLOptionElement *opt; + VARIANT empty, *arg[4]; + HRESULT hres; + + if(flags != DISPATCH_CONSTRUCT) { + FIXME("flags %x not supported\n", flags); + return E_NOTIMPL; + } + + V_VT(res) = VT_NULL; + V_VT(&empty) = VT_EMPTY; + + for(i = 0; i < ARRAY_SIZE(arg); i++) + arg[i] = argc > i ? &params->rgvarg[params->cArgs - 1 - i] : ∅ + + hres = IHTMLOptionElementFactory_create(&This->IHTMLOptionElementFactory_iface, + *arg[0], *arg[1], *arg[2], *arg[3], &opt); + if(FAILED(hres)) + return hres; + + V_VT(res) = VT_DISPATCH; + V_DISPATCH(res) = (IDispatch*)opt; + + return S_OK; +} + static const tid_t HTMLOptionElementFactory_iface_tids[] = { IHTMLOptionElementFactory_tid, 0 }; +static const dispex_static_data_vtbl_t HTMLOptionElementFactory_dispex_vtbl = { + HTMLOptionElementFactory_value, + NULL, + NULL, + NULL +}; + static dispex_static_data_t HTMLOptionElementFactory_dispex = { L"Function", - NULL, + &HTMLOptionElementFactory_dispex_vtbl, IHTMLOptionElementFactory_tid, HTMLOptionElementFactory_iface_tids, HTMLElement_init_dispex_info diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index ea5b210..0c065a2 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2190,10 +2190,12 @@ static void _set_object_name(unsigned line, IHTMLElement *elem, const WCHAR *nam static IHTMLOptionElement *_create_option_elem(unsigned line, IHTMLDocument2 *doc, const WCHAR *txt, const WCHAR *val) { + VARIANT text, value, empty, option_var, args[2]; + DISPPARAMS dp = { args, NULL, 2, 0 }; IHTMLOptionElementFactory *factory; IHTMLOptionElement *option; IHTMLWindow2 *window; - VARIANT text, value, empty; + IDispatch *disp; HRESULT hres; hres = IHTMLDocument2_get_parentWindow(doc, &window); @@ -2211,6 +2213,24 @@ static IHTMLOptionElement *_create_option_elem(unsigned line, IHTMLDocument2 *do V_BSTR(&value) = SysAllocString(val); V_VT(&empty) = VT_EMPTY; + hres = IHTMLOptionElementFactory_QueryInterface(factory, &IID_IDispatch, (void**)&disp); + ok_(__FILE__,line)(hres == S_OK, "Could not get IDispatch: %08x\n", hres); + + args[1] = text; + args[0] = value; + hres = IDispatch_Invoke(disp, DISPID_VALUE, &IID_NULL, 0, DISPATCH_CONSTRUCT, &dp, &option_var, NULL, NULL); + IDispatch_Release(disp); + ok_(__FILE__,line)(hres == S_OK, "Invoke(DISPID_VALUE) returned: %08x\n", hres); + ok_(__FILE__,line)(V_VT(&option_var) == VT_DISPATCH, "VT(option_var) = %d\n", V_VT(&option_var)); + hres = IDispatch_QueryInterface(V_DISPATCH(&option_var), &IID_IHTMLOptionElement, (void**)&option); + ok_(__FILE__,line)(hres == S_OK, "Could not get IHTMLOptionElement: %08x\n", hres); + VariantClear(&option_var); + + _test_option_text(line, option, txt); + _test_option_value(line, option, val); + _test_option_selected(line, option, VARIANT_FALSE); + IHTMLOptionElement_Release(option); + hres = IHTMLOptionElementFactory_create(factory, text, value, empty, empty, &option); ok_(__FILE__,line) (hres == S_OK, "create failed: %08x\n", hres); -- 2.31.1

3 49

[PATCH 1/5] winebus.sys: Scale the force feedback gain value to the Linux FF_GAIN range.
by Rémi Bernon 09 Dec '21

09 Dec '21

From: Ivo Ivanov <logos128(a)gmail.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51922 Signed-off-by: Ivo Ivanov <logos128(a)gmail.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/winebus.sys/bus_udev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 540a4da508f..88b5bddf532 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -949,7 +949,7 @@ static NTSTATUS lnxev_device_physical_device_set_gain(struct unix_device *iface, { .type = EV_FF, .code = FF_GAIN, - .value = percent, + .value = 0xffff * percent / 100, }; TRACE("iface %p, percent %#x.\n", iface, percent); -- 2.34.0

1 4

[PATCH 5/6] winevulkan: Support using __wine_unix_call interface for Vulkan functions.
by Jacek Caban 09 Dec '21

09 Dec '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- vkEndCommandBuffer is used just as an example. dlls/winevulkan/make_vulkan | 152 +++++++++++++++++++++++++++++++----- 1 file changed, 131 insertions(+), 21 deletions(-)

2 2

[PATCH] wined3d: Decrement reference count and take the lock atomically for cached objects.
by Jan Sikorski 09 Dec '21

09 Dec '21

Samplers, blend states, rasterizer states and depth stencil states can be retrieved from the cache in struct d3d_device even after the reference count reaches zero, causing memory corruption. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> --- dlls/wined3d/sampler.c | 3 +-- dlls/wined3d/state.c | 9 +++------ dlls/wined3d/wined3d_private.h | 20 ++++++++++++++++++++ 3 files changed, 24 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/sampler.c b/dlls/wined3d/sampler.c index bba3165316e..fa648304d07 100644 --- a/dlls/wined3d/sampler.c +++ b/dlls/wined3d/sampler.c @@ -35,13 +35,12 @@ ULONG CDECL wined3d_sampler_incref(struct wined3d_sampler *sampler) ULONG CDECL wined3d_sampler_decref(struct wined3d_sampler *sampler) { - ULONG refcount = InterlockedDecrement(&sampler->refcount); + ULONG refcount = wined3d_atomic_decrement_mutex_lock(&sampler->refcount); TRACE("%p decreasing refcount to %u.\n", sampler, refcount); if (!refcount) { - wined3d_mutex_lock(); sampler->parent_ops->wined3d_object_destroyed(sampler->parent); sampler->device->adapter->adapter_ops->adapter_destroy_sampler(sampler); wined3d_mutex_unlock(); diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index c76e0c2b604..87ebefea9d0 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -55,14 +55,13 @@ static void wined3d_blend_state_destroy_object(void *object) ULONG CDECL wined3d_blend_state_decref(struct wined3d_blend_state *state) { - ULONG refcount = InterlockedDecrement(&state->refcount); + ULONG refcount = wined3d_atomic_decrement_mutex_lock(&state->refcount); struct wined3d_device *device = state->device; TRACE("%p decreasing refcount to %u.\n", state, refcount); if (!refcount) { - wined3d_mutex_lock(); state->parent_ops->wined3d_object_destroyed(state->parent); wined3d_cs_destroy_object(device->cs, wined3d_blend_state_destroy_object, state); wined3d_mutex_unlock(); @@ -131,14 +130,13 @@ static void wined3d_depth_stencil_state_destroy_object(void *object) ULONG CDECL wined3d_depth_stencil_state_decref(struct wined3d_depth_stencil_state *state) { - ULONG refcount = InterlockedDecrement(&state->refcount); + ULONG refcount = wined3d_atomic_decrement_mutex_lock(&state->refcount); struct wined3d_device *device = state->device; TRACE("%p decreasing refcount to %u.\n", state, refcount); if (!refcount) { - wined3d_mutex_lock(); state->parent_ops->wined3d_object_destroyed(state->parent); wined3d_cs_destroy_object(device->cs, wined3d_depth_stencil_state_destroy_object, state); wined3d_mutex_unlock(); @@ -196,14 +194,13 @@ static void wined3d_rasterizer_state_destroy_object(void *object) ULONG CDECL wined3d_rasterizer_state_decref(struct wined3d_rasterizer_state *state) { - ULONG refcount = InterlockedDecrement(&state->refcount); + ULONG refcount = wined3d_atomic_decrement_mutex_lock(&state->refcount); struct wined3d_device *device = state->device; TRACE("%p decreasing refcount to %u.\n", state, refcount); if (!refcount) { - wined3d_mutex_lock(); state->parent_ops->wined3d_object_destroyed(state->parent); wined3d_cs_destroy_object(device->cs, wined3d_rasterizer_state_destroy_object, state); wined3d_mutex_unlock(); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 2fce585c6b1..6047defcc2e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4155,6 +4155,26 @@ const char *wined3d_debug_view_desc(const struct wined3d_view_desc *d, const struct wined3d_resource *resource) DECLSPEC_HIDDEN; const char *wined3d_debug_vkresult(VkResult vr) DECLSPEC_HIDDEN; +static inline ULONG wined3d_atomic_decrement_mutex_lock(volatile LONG *refcount) +{ + ULONG count, old_count = *refcount; + do + { + if ((count = old_count) == 1) + { + wined3d_mutex_lock(); + count = InterlockedDecrement(refcount); + if (count) wined3d_mutex_unlock(); + return count; + } + + old_count = InterlockedCompareExchange(refcount, count - 1, count); + } + while (old_count != count); + + return count - 1; +} + struct wined3d_client_resource { /* The resource's persistently mapped address, which we may use to perform -- 2.32.0

3 2

[PATCH] d2d1: Implement ID2D1Factory2::CreateStrokeStyle1().
by Dmitry Timoshkov 09 Dec '21

09 Dec '21

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/d2d1/d2d1_private.h | 6 ++-- dlls/d2d1/factory.c | 35 ++++++++++++++++--- dlls/d2d1/stroke.c | 75 +++++++++++++++++++++++----------------- 3 files changed, 78 insertions(+), 38 deletions(-) diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index e823b2092bf..de5e986f7f2 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -337,17 +337,17 @@ struct d2d_brush *unsafe_impl_from_ID2D1Brush(ID2D1Brush *iface) DECLSPEC_HIDDEN struct d2d_stroke_style { - ID2D1StrokeStyle ID2D1StrokeStyle_iface; + ID2D1StrokeStyle1 ID2D1StrokeStyle1_iface; LONG refcount; ID2D1Factory *factory; - D2D1_STROKE_STYLE_PROPERTIES desc; + D2D1_STROKE_STYLE_PROPERTIES1 desc; float *dashes; UINT32 dash_count; }; HRESULT d2d_stroke_style_init(struct d2d_stroke_style *style, ID2D1Factory *factory, - const D2D1_STROKE_STYLE_PROPERTIES *desc, const float *dashes, UINT32 dash_count) DECLSPEC_HIDDEN; + const D2D1_STROKE_STYLE_PROPERTIES1 *desc, const float *dashes, UINT32 dash_count) DECLSPEC_HIDDEN; struct d2d_layer { diff --git a/dlls/d2d1/factory.c b/dlls/d2d1/factory.c index 5f081a1c12d..7ddd6bbc87c 100644 --- a/dlls/d2d1/factory.c +++ b/dlls/d2d1/factory.c @@ -283,6 +283,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateStrokeStyle(ID2D1Factory2 *if ID2D1StrokeStyle **stroke_style) { struct d2d_stroke_style *object; + D2D1_STROKE_STYLE_PROPERTIES1 desc1; HRESULT hr; TRACE("iface %p, desc %p, dashes %p, dash_count %u, stroke_style %p.\n", @@ -291,7 +292,16 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateStrokeStyle(ID2D1Factory2 *if if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; - if (FAILED(hr = d2d_stroke_style_init(object, (ID2D1Factory *)iface, desc, dashes, dash_count))) + desc1.startCap = desc->startCap; + desc1.endCap = desc->endCap; + desc1.dashCap = desc->dashCap; + desc1.lineJoin = desc->lineJoin; + desc1.miterLimit = desc->miterLimit; + desc1.dashStyle = desc->dashStyle; + desc1.dashOffset = desc->dashOffset; + desc1.transformType = D2D1_STROKE_TRANSFORM_TYPE_NORMAL; + + if (FAILED(hr = d2d_stroke_style_init(object, (ID2D1Factory *)iface, &desc1, dashes, dash_count))) { WARN("Failed to initialize stroke style, hr %#x.\n", hr); heap_free(object); @@ -299,7 +309,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateStrokeStyle(ID2D1Factory2 *if } TRACE("Created stroke style %p.\n", object); - *stroke_style = &object->ID2D1StrokeStyle_iface; + *stroke_style = (ID2D1StrokeStyle *)&object->ID2D1StrokeStyle1_iface; return S_OK; } @@ -485,10 +495,27 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateStrokeStyle1(ID2D1Factory2 *i const D2D1_STROKE_STYLE_PROPERTIES1 *desc, const float *dashes, UINT32 dash_count, ID2D1StrokeStyle1 **stroke_style) { - FIXME("iface %p, desc %p, dashes %p, dash_count %u, stroke_style %p stub!\n", + struct d2d_stroke_style *object; + HRESULT hr; + + TRACE("iface %p, desc %p, dashes %p, dash_count %u, stroke_style %p.\n", iface, desc, dashes, dash_count, stroke_style); - return E_NOTIMPL; + if (!(object = heap_alloc_zero(sizeof(*object)))) + return E_OUTOFMEMORY; + + if (FAILED(hr = d2d_stroke_style_init(object, (ID2D1Factory *)iface, + desc, dashes, dash_count))) + { + WARN("Failed to initialize stroke style, hr %#x.\n", hr); + heap_free(object); + return hr; + } + + TRACE("Created stroke style %p.\n", object); + *stroke_style = &object->ID2D1StrokeStyle1_iface; + + return S_OK; } static HRESULT STDMETHODCALLTYPE d2d_factory_CreatePathGeometry1(ID2D1Factory2 *iface, ID2D1PathGeometry1 **geometry) diff --git a/dlls/d2d1/stroke.c b/dlls/d2d1/stroke.c index 0ba44e0b1d0..da412540753 100644 --- a/dlls/d2d1/stroke.c +++ b/dlls/d2d1/stroke.c @@ -20,12 +20,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(d2d); -static inline struct d2d_stroke_style *impl_from_ID2D1StrokeStyle(ID2D1StrokeStyle *iface) +static inline struct d2d_stroke_style *impl_from_ID2D1StrokeStyle1(ID2D1StrokeStyle1 *iface) { - return CONTAINING_RECORD(iface, struct d2d_stroke_style, ID2D1StrokeStyle_iface); + return CONTAINING_RECORD(iface, struct d2d_stroke_style, ID2D1StrokeStyle1_iface); } -static HRESULT STDMETHODCALLTYPE d2d_stroke_style_QueryInterface(ID2D1StrokeStyle *iface, REFIID iid, void **out) +static HRESULT STDMETHODCALLTYPE d2d_stroke_style_QueryInterface(ID2D1StrokeStyle1 *iface, REFIID iid, void **out) { TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); @@ -33,7 +33,7 @@ static HRESULT STDMETHODCALLTYPE d2d_stroke_style_QueryInterface(ID2D1StrokeStyl || IsEqualGUID(iid, &IID_ID2D1Resource) || IsEqualGUID(iid, &IID_IUnknown)) { - ID2D1StrokeStyle_AddRef(iface); + ID2D1StrokeStyle1_AddRef(iface); *out = iface; return S_OK; } @@ -44,9 +44,9 @@ static HRESULT STDMETHODCALLTYPE d2d_stroke_style_QueryInterface(ID2D1StrokeStyl return E_NOINTERFACE; } -static ULONG STDMETHODCALLTYPE d2d_stroke_style_AddRef(ID2D1StrokeStyle *iface) +static ULONG STDMETHODCALLTYPE d2d_stroke_style_AddRef(ID2D1StrokeStyle1 *iface) { - struct d2d_stroke_style *style = impl_from_ID2D1StrokeStyle(iface); + struct d2d_stroke_style *style = impl_from_ID2D1StrokeStyle1(iface); ULONG refcount = InterlockedIncrement(&style->refcount); TRACE("%p increasing refcount to %u.\n", iface, refcount); @@ -54,9 +54,9 @@ static ULONG STDMETHODCALLTYPE d2d_stroke_style_AddRef(ID2D1StrokeStyle *iface) return refcount; } -static ULONG STDMETHODCALLTYPE d2d_stroke_style_Release(ID2D1StrokeStyle *iface) +static ULONG STDMETHODCALLTYPE d2d_stroke_style_Release(ID2D1StrokeStyle1 *iface) { - struct d2d_stroke_style *style = impl_from_ID2D1StrokeStyle(iface); + struct d2d_stroke_style *style = impl_from_ID2D1StrokeStyle1(iface); ULONG refcount = InterlockedDecrement(&style->refcount); TRACE("%p decreasing refcount to %u.\n", iface, refcount); @@ -72,90 +72,90 @@ static ULONG STDMETHODCALLTYPE d2d_stroke_style_Release(ID2D1StrokeStyle *iface) return refcount; } -static void STDMETHODCALLTYPE d2d_stroke_style_GetFactory(ID2D1StrokeStyle *iface, ID2D1Factory **factory) +static void STDMETHODCALLTYPE d2d_stroke_style_GetFactory(ID2D1StrokeStyle1 *iface, ID2D1Factory **factory) { - struct d2d_stroke_style *style = impl_from_ID2D1StrokeStyle(iface); + struct d2d_stroke_style *style = impl_from_ID2D1StrokeStyle1(iface); TRACE("iface %p, factory %p.\n", iface, factory); ID2D1Factory_AddRef(*factory = style->factory); } -static D2D1_CAP_STYLE STDMETHODCALLTYPE d2d_stroke_style_GetStartCap(ID2D1StrokeStyle *iface) +static D2D1_CAP_STYLE STDMETHODCALLTYPE d2d_stroke_style_GetStartCap(ID2D1StrokeStyle1 *iface) { - struct d2d_stroke_style *style = impl_from_ID2D1StrokeStyle(iface); + struct d2d_stroke_style *style = impl_from_ID2D1StrokeStyle1(iface); TRACE("iface %p.\n", iface); return style->desc.startCap; } -static D2D1_CAP_STYLE STDMETHODCALLTYPE d2d_stroke_style_GetEndCap(ID2D1StrokeStyle *iface) +static D2D1_CAP_STYLE STDMETHODCALLTYPE d2d_stroke_style_GetEndCap(ID2D1StrokeStyle1 *iface) { - struct d2d_stroke_style *style = impl_from_ID2D1StrokeStyle(iface); + struct d2d_stroke_style *style = impl_from_ID2D1StrokeStyle1(iface); TRACE("iface %p.\n", iface); return style->desc.endCap; } -static D2D1_CAP_STYLE STDMETHODCALLTYPE d2d_stroke_style_GetDashCap(ID2D1StrokeStyle *iface) +static D2D1_CAP_STYLE STDMETHODCALLTYPE d2d_stroke_style_GetDashCap(ID2D1StrokeStyle1 *iface) { - struct d2d_stroke_style *style = impl_from_ID2D1StrokeStyle(iface); + struct d2d_stroke_style *style = impl_from_ID2D1StrokeStyle1(iface); TRACE("iface %p.\n", iface); return style->desc.dashCap; } -static float STDMETHODCALLTYPE d2d_stroke_style_GetMiterLimit(ID2D1StrokeStyle *iface) +static float STDMETHODCALLTYPE d2d_stroke_style_GetMiterLimit(ID2D1StrokeStyle1 *iface) { - struct d2d_stroke_style *style = impl_from_ID2D1StrokeStyle(iface); + struct d2d_stroke_style *style = impl_from_ID2D1StrokeStyle1(iface); TRACE("iface %p.\n", iface); return style->desc.miterLimit; } -static D2D1_LINE_JOIN STDMETHODCALLTYPE d2d_stroke_style_GetLineJoin(ID2D1StrokeStyle *iface) +static D2D1_LINE_JOIN STDMETHODCALLTYPE d2d_stroke_style_GetLineJoin(ID2D1StrokeStyle1 *iface) { - struct d2d_stroke_style *style = impl_from_ID2D1StrokeStyle(iface); + struct d2d_stroke_style *style = impl_from_ID2D1StrokeStyle1(iface); TRACE("iface %p.\n", iface); return style->desc.lineJoin; } -static float STDMETHODCALLTYPE d2d_stroke_style_GetDashOffset(ID2D1StrokeStyle *iface) +static float STDMETHODCALLTYPE d2d_stroke_style_GetDashOffset(ID2D1StrokeStyle1 *iface) { - struct d2d_stroke_style *style = impl_from_ID2D1StrokeStyle(iface); + struct d2d_stroke_style *style = impl_from_ID2D1StrokeStyle1(iface); TRACE("iface %p.\n", iface); return style->desc.dashOffset; } -static D2D1_DASH_STYLE STDMETHODCALLTYPE d2d_stroke_style_GetDashStyle(ID2D1StrokeStyle *iface) +static D2D1_DASH_STYLE STDMETHODCALLTYPE d2d_stroke_style_GetDashStyle(ID2D1StrokeStyle1 *iface) { - struct d2d_stroke_style *style = impl_from_ID2D1StrokeStyle(iface); + struct d2d_stroke_style *style = impl_from_ID2D1StrokeStyle1(iface); TRACE("iface %p.\n", iface); return style->desc.dashStyle; } -static UINT32 STDMETHODCALLTYPE d2d_stroke_style_GetDashesCount(ID2D1StrokeStyle *iface) +static UINT32 STDMETHODCALLTYPE d2d_stroke_style_GetDashesCount(ID2D1StrokeStyle1 *iface) { - struct d2d_stroke_style *style = impl_from_ID2D1StrokeStyle(iface); + struct d2d_stroke_style *style = impl_from_ID2D1StrokeStyle1(iface); TRACE("iface %p.\n", iface); return style->dash_count; } -static void STDMETHODCALLTYPE d2d_stroke_style_GetDashes(ID2D1StrokeStyle *iface, float *dashes, UINT32 dash_count) +static void STDMETHODCALLTYPE d2d_stroke_style_GetDashes(ID2D1StrokeStyle1 *iface, float *dashes, UINT32 dash_count) { - struct d2d_stroke_style *style = impl_from_ID2D1StrokeStyle(iface); + struct d2d_stroke_style *style = impl_from_ID2D1StrokeStyle1(iface); TRACE("iface %p, dashes %p, count %u.\n", iface, dashes, dash_count); @@ -164,7 +164,16 @@ static void STDMETHODCALLTYPE d2d_stroke_style_GetDashes(ID2D1StrokeStyle *iface memset(dashes + style->dash_count, 0, (dash_count - style->dash_count) * sizeof(*dashes)); } -static const struct ID2D1StrokeStyleVtbl d2d_stroke_style_vtbl = +static D2D1_STROKE_TRANSFORM_TYPE STDMETHODCALLTYPE d2d_stroke_style_GetStrokeTransformType(ID2D1StrokeStyle1 *iface) +{ + struct d2d_stroke_style *style = impl_from_ID2D1StrokeStyle1(iface); + + TRACE("iface %p.\n", iface); + + return style->desc.transformType; +} + +static const struct ID2D1StrokeStyle1Vtbl d2d_stroke_style_vtbl = { d2d_stroke_style_QueryInterface, d2d_stroke_style_AddRef, @@ -179,10 +188,11 @@ static const struct ID2D1StrokeStyleVtbl d2d_stroke_style_vtbl = d2d_stroke_style_GetDashStyle, d2d_stroke_style_GetDashesCount, d2d_stroke_style_GetDashes, + d2d_stroke_style_GetStrokeTransformType }; HRESULT d2d_stroke_style_init(struct d2d_stroke_style *style, ID2D1Factory *factory, - const D2D1_STROKE_STYLE_PROPERTIES *desc, const float *dashes, UINT32 dash_count) + const D2D1_STROKE_STYLE_PROPERTIES1 *desc, const float *dashes, UINT32 dash_count) { static const struct { @@ -201,7 +211,10 @@ HRESULT d2d_stroke_style_init(struct d2d_stroke_style *style, ID2D1Factory *fact if (desc->dashStyle > D2D1_DASH_STYLE_CUSTOM) return E_INVALIDARG; - style->ID2D1StrokeStyle_iface.lpVtbl = &d2d_stroke_style_vtbl; + if (desc->transformType != D2D1_STROKE_TRANSFORM_TYPE_NORMAL) + FIXME("transformType %d is not supported\n", desc->transformType); + + style->ID2D1StrokeStyle1_iface.lpVtbl = &d2d_stroke_style_vtbl; style->refcount = 1; if (desc->dashStyle == D2D1_DASH_STYLE_CUSTOM) -- 2.34.1

2 1

[PATCH] ntdll/tests: Add tests for ProcessWorkingSetWatch[Ex] process info class.
by Paul Gofman 09 Dec '21

09 Dec '21

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/ntdll/tests/virtual.c | 116 +++++++++++++++++++++++++++++++++++++ 1 file changed, 116 insertions(+) diff --git a/dlls/ntdll/tests/virtual.c b/dlls/ntdll/tests/virtual.c index adc9b1ae6dc..c41a50c5da7 100644 --- a/dlls/ntdll/tests/virtual.c +++ b/dlls/ntdll/tests/virtual.c @@ -24,6 +24,7 @@ #define WIN32_NO_STATUS #include "windef.h" #include "winternl.h" +#include "psapi.h" #include "wine/test.h" #include "ddk/wdm.h" @@ -1132,6 +1133,120 @@ static void test_syscalls(void) UnmapViewOfFile( ptr ); } +#define ws_watch_check_page(a, b, c, d) ws_watch_check_page_(__LINE__, a, b, c, d) +static void ws_watch_check_page_(unsigned int line, void *addr, void *info, unsigned int info_count, BOOL extended) +{ + static const ULONG_PTR mask = ~(ULONG_PTR)0xfff; + PSAPI_WS_WATCH_INFORMATION_EX *ws; + unsigned int i, size; + + size = extended ? sizeof(PSAPI_WS_WATCH_INFORMATION_EX) : sizeof(PSAPI_WS_WATCH_INFORMATION); + + ok_(__FILE__, line)(info_count, "Got zero info_count.\n"); + if (!info_count) + return; + ws = (PSAPI_WS_WATCH_INFORMATION_EX *)((char *)info + size * (info_count - 1)); + ok_(__FILE__, line)(!ws->BasicInfo.FaultingVa || broken(ws->BasicInfo.FaultingVa == (void *)1) /* Win8 */, + "Got unexpected FaultingVa %p.\n", ws->BasicInfo.FaultingVa); + ok_(__FILE__, line)(!ws->BasicInfo.FaultingPc, "Got unexpected FaultingPc %p.\n", ws->BasicInfo.FaultingPc); + if (extended) + { + ok_(__FILE__, line)(!ws->Flags, "Got unexpected Flags %#lx.\n", ws->Flags); + ok_(__FILE__, line)(!ws->FaultingThreadId, "Got unexpected Flags %#lx.\n", ws->FaultingThreadId); + } + + for(i = 0; i < info_count; ++i) + { + ws = (PSAPI_WS_WATCH_INFORMATION_EX *)((char *)info + size * i); + if (((ULONG_PTR)ws->BasicInfo.FaultingVa & mask) != ((ULONG_PTR)addr & mask)) + continue; + + if (extended) + { + ok_(__FILE__, line)(!ws->Flags, "Got unexpected flags %#lx.\n", ws->Flags); + ok_(__FILE__, line)(ws->FaultingThreadId == GetCurrentThreadId(), + "Got unexpected FaultingThreadId %#lx.\n", ws->FaultingThreadId); + } + return; + } + ok_(__FILE__, line)(0, "Page not found.\n"); +} + +static void test_ws_watches(void) +{ + PSAPI_WS_WATCH_INFORMATION_EX ws_ex[1024]; + PSAPI_WS_WATCH_INFORMATION *ws; + unsigned int value; + NTSTATUS status; + ULONG size; + char *addr; + BOOL ret; + + status = NtSetInformationProcess(GetCurrentProcess(), ProcessWorkingSetWatch, (void *)0xdeadbeef, 1); + todo_wine ok(status == STATUS_DATATYPE_MISALIGNMENT, "Got unexpected status %#x.\n", status); + + status = NtSetInformationProcess(GetCurrentProcess(), ProcessWorkingSetWatchEx, (void *)0xdeadbeef, 1); + todo_wine ok(status == STATUS_DATATYPE_MISALIGNMENT, "Got unexpected status %#x.\n", status); + + status = NtSetInformationProcess(GetCurrentProcess(), ProcessWorkingSetWatch, (void *)0xdeadbee8, 1); + todo_wine ok(!status || broken(status == STATUS_ACCESS_VIOLATION) /* before Win10 */, + "Got unexpected status %#x.\n", status); + + status = NtSetInformationProcess(GetCurrentProcess(), ProcessWorkingSetWatch, (void *)0xdeadbee8, 0); + todo_wine ok(status == STATUS_PORT_ALREADY_SET || broken(!status) /* before Win10, as previous attempt failed */, + "Got unexpected status %#x.\n", status); + + status = NtSetInformationProcess(GetCurrentProcess(), ProcessWorkingSetWatchEx, NULL, 0); + todo_wine ok(status == STATUS_PORT_ALREADY_SET, "Got unexpected status %#x.\n", status); + + addr = VirtualAlloc(NULL, 4 * 0x1000, MEM_COMMIT, PAGE_READWRITE); + ok(!!addr, "VirtualAlloc failed, error %u.\n", GetLastError()); + + *addr = 1; + ret = ReadProcessMemory(GetCurrentProcess(), addr + 0x1000, &value, sizeof(value), NULL); + ok(ret, "Got unexpected ret %u, error %u.\n", ret, GetLastError()); + addr[0x2000] = 3; + + ws = (PSAPI_WS_WATCH_INFORMATION *)ws_ex; + + size = 0xdeadbeef; + status = NtQueryInformationProcess(GetCurrentProcess(), ProcessWorkingSetWatchEx, NULL, 0, &size); + todo_wine ok(status == STATUS_BUFFER_TOO_SMALL, "Got unexpected status %#x.\n", status); + todo_wine ok(size && !(size % sizeof(PSAPI_WS_WATCH_INFORMATION_EX)), "Got unexpected size %u.\n", size); + + size = 0xdeadbeef; + status = NtQueryInformationProcess(GetCurrentProcess(), ProcessWorkingSetWatch, NULL, 0, &size); + todo_wine ok(status == STATUS_BUFFER_TOO_SMALL, "Got unexpected status %#x.\n", status); + todo_wine ok(size && !(size % sizeof(PSAPI_WS_WATCH_INFORMATION)), "Got unexpected size %u.\n", size); + + memset(ws, 0xcc, sizeof(*ws)); + status = NtQueryInformationProcess(GetCurrentProcess(), ProcessWorkingSetWatch, ws, + sizeof(PSAPI_WS_WATCH_INFORMATION), &size); + todo_wine ok(status == STATUS_BUFFER_TOO_SMALL, "Got unexpected status %#x.\n", status); + ok(ws->FaultingVa == (void *)(ULONG_PTR)0xcccccccccccccccc, "Got unexpected FaultingVa %p.\n", ws->FaultingVa); + + memset(ws_ex, 0xcc, sizeof(ws_ex)); + size = 0; + status = NtQueryInformationProcess(GetCurrentProcess(), ProcessWorkingSetWatchEx, ws_ex, sizeof(ws_ex), &size); + todo_wine ok(!status, "Got unexpected status %#x.\n", status); + todo_wine ws_watch_check_page(addr, ws_ex, size / sizeof(PSAPI_WS_WATCH_INFORMATION_EX), TRUE); + if (!is_wow64) + todo_wine ws_watch_check_page(addr + 0x1000, ws_ex, size / sizeof(PSAPI_WS_WATCH_INFORMATION_EX), TRUE); + todo_wine ws_watch_check_page(addr + 0x2000, ws_ex, size / sizeof(PSAPI_WS_WATCH_INFORMATION_EX), TRUE); + + EmptyWorkingSet(GetCurrentProcess()); + + ok(*addr == 1, "Got unexpected *addr %#x.\n", *addr); + ok(addr[0x2000] == 3, "Got unexpected *addr %#x.\n", *addr); + memset(ws_ex, 0xcc, sizeof(ws_ex)); + status = NtQueryInformationProcess(GetCurrentProcess(), ProcessWorkingSetWatch, ws, sizeof(ws_ex), &size); + todo_wine ok(!status, "Got unexpected status %#x.\n", status); + todo_wine ws_watch_check_page(addr, ws_ex, size / sizeof(PSAPI_WS_WATCH_INFORMATION), FALSE); + todo_wine ws_watch_check_page(addr + 0x2000, ws_ex, size / sizeof(PSAPI_WS_WATCH_INFORMATION), FALSE); + + VirtualFree(addr, 0, MEM_RELEASE); +} + START_TEST(virtual) { HMODULE mod; @@ -1171,4 +1286,5 @@ START_TEST(virtual) test_NtMapViewOfSection(); test_user_shared_data(); test_syscalls(); + test_ws_watches(); } -- 2.33.1

1 0

[PATCH] ntdll: Fix valid frame detection in ARM/ARM64.
by Jinoh Kang 09 Dec '21

09 Dec '21

Today, Wine cannot properly handle the end of call stack when unwinding in ARM/ARM64, erroneously setting EH_STACK_INVALID in the exception record when the base of the thread stack is reached. This is because the is_valid_frame function was copied from i386, where every function sets up a frame pointer next to the return address. However, this does not hold on any other architectures (e.g. x86-64), which instead rely on stack unwinding information tables to properly recognise stack frames. On these architectures, reaching the bottom of the call stack means the stack pointer equals StackBase. This is why signal_x86_64.c explicitly recognises Rsp == StackBase to be a valid condition; however, this was not copied to ARM/ARM64 when unwinding was implemented on these architectures. Fix this by allowing frame pointer to equal StackBase, just like X86-64. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- dlls/ntdll/signal_arm.c | 2 +- dlls/ntdll/signal_arm64.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index 72f3b023e45..12ffbb3663a 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -89,7 +89,7 @@ static inline BOOL is_valid_frame( ULONG_PTR frame ) { if (frame & 3) return FALSE; return ((void *)frame >= NtCurrentTeb()->Tib.StackLimit && - (void **)frame < (void **)NtCurrentTeb()->Tib.StackBase - 1); + (void *)frame <= NtCurrentTeb()->Tib.StackBase); } diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 290639b676b..034c78f6b4d 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -96,7 +96,7 @@ static inline BOOL is_valid_frame( ULONG_PTR frame ) { if (frame & 7) return FALSE; return ((void *)frame >= NtCurrentTeb()->Tib.StackLimit && - (void **)frame < (void **)NtCurrentTeb()->Tib.StackBase - 1); + (void *)frame <= NtCurrentTeb()->Tib.StackBase); } -- 2.34.1

1 0