December 2023 - Wine-commits

Biswapriyo Nath : include: Add SampleGrabber coclass definition in qedit.idl.
by Alexandre Julliard 14 Dec '23

14 Dec '23

Module: wine Branch: master Commit: 6fed2f967b267269f73f20f95ad5d3b9237038f7 URL: https://gitlab.winehq.org/wine/wine/-/commit/6fed2f967b267269f73f20f95ad5d3… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Thu Dec 14 14:07:50 2023 +0000 include: Add SampleGrabber coclass definition in qedit.idl. --- include/qedit.idl | 8 ++++++++ include/uuids.h | 1 - 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/include/qedit.idl b/include/qedit.idl index 753ac15bf43..88c24435270 100644 --- a/include/qedit.idl +++ b/include/qedit.idl @@ -80,6 +80,14 @@ interface ISampleGrabber: IUnknown ); } +[ + uuid(c1f400a0-3f08-11d3-9f0b-006008039e37) +] +coclass SampleGrabber +{ + [default] interface ISampleGrabber; +} + [ object, uuid(65bd0710-24d2-4FF7-9324-ed2e5d3abafa), diff --git a/include/uuids.h b/include/uuids.h index 6842429ffec..2ae1ed21139 100644 --- a/include/uuids.h +++ b/include/uuids.h @@ -151,7 +151,6 @@ OUR_GUID_ENTRY(CLSID_SBE2File, 0x93a094d7, 0x51e8, 0x485b, OUR_GUID_ENTRY(CLSID_SBE2FileScan, 0x3e458037, 0x0ca6, 0x41aa, 0xa5, 0x94, 0x2a, 0xa6, 0xc0, 0x2d, 0x70, 0x9b) OUR_GUID_ENTRY(CLSID_SBE2MediaTypeProfile, 0x1f26a602, 0x2b5c, 0x4b63, 0xb8, 0xe8, 0x9e, 0xa5, 0xc1, 0xa7, 0xdc, 0x2e) OUR_GUID_ENTRY(CLSID_SBE2Sink, 0xe2448508, 0x95da, 0x4205, 0x9a, 0x27, 0x7e, 0xc8, 0x1e, 0x72, 0x3b, 0x1a) -OUR_GUID_ENTRY(CLSID_SampleGrabber, 0xc1f400a0, 0x3f08, 0x11d3, 0x9f, 0x0b, 0x00, 0x60, 0x08, 0x03, 0x9e, 0x37) OUR_GUID_ENTRY(CLSID_SeekingPassThru, 0x060af76c, 0x68dd, 0x11d0, 0x8f, 0xc1, 0x00, 0xc0, 0x4f, 0xd9, 0x18, 0x9d) OUR_GUID_ENTRY(CLSID_SimpleCutList, 0xa5ea8d30, 0x253d, 0x11d1, 0xb3, 0xf1, 0x00, 0xaa, 0x00, 0x37, 0x61, 0xc5) OUR_GUID_ENTRY(CLSID_SmartTee, 0xcc58e280, 0x8aa1, 0x11d1, 0xb3, 0xf1, 0x00, 0xaa, 0x00, 0x37, 0x61, 0xc5)

1 0

Alexandros Frantzis : winewayland.drv: Consider implicit fullscreen clip for pointer locking.
by Alexandre Julliard 14 Dec '23

14 Dec '23

Module: wine Branch: master Commit: bd61e918595cf1b7ac464ee4765a822650462850 URL: https://gitlab.winehq.org/wine/wine/-/commit/bd61e918595cf1b7ac464ee4765a82… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Tue Dec 12 13:52:29 2023 +0200 winewayland.drv: Consider implicit fullscreen clip for pointer locking. If the foreground window is fullscreen on the whole virtual screen, allow the pointer to be locked (if the cursor is hidden), even if we don't have an explicit fullscreen clip. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56022 --- dlls/winewayland.drv/wayland_pointer.c | 62 +++++++++++++++++++++++----------- 1 file changed, 42 insertions(+), 20 deletions(-) diff --git a/dlls/winewayland.drv/wayland_pointer.c b/dlls/winewayland.drv/wayland_pointer.c index ccd477b3c91..3a0656b6580 100644 --- a/dlls/winewayland.drv/wayland_pointer.c +++ b/dlls/winewayland.drv/wayland_pointer.c @@ -24,7 +24,6 @@ #include "config.h" -#include <assert.h> #include <linux/input.h> #undef SW_MAX /* Also defined in winuser.rh */ #include <math.h> @@ -723,23 +722,46 @@ static void wayland_surface_calc_confine(struct wayland_surface *surface, (int *)&confine->right, (int *)&confine->bottom); } +/********************************************************************** + * wayland_surface_client_covers_vscreen + * + * Whether a surface window client area covers the whole virtual screen. + */ +static BOOL wayland_surface_client_covers_vscreen(struct wayland_surface *surface) +{ + RECT vscreen_rect, rect; + + /* Get individual system metrics to get coords in thread dpi + * (NtUserGetVirtualScreenRect would return values in system dpi). */ + vscreen_rect.left = NtUserGetSystemMetrics(SM_XVIRTUALSCREEN); + vscreen_rect.top = NtUserGetSystemMetrics(SM_YVIRTUALSCREEN); + vscreen_rect.right = vscreen_rect.left + + NtUserGetSystemMetrics(SM_CXVIRTUALSCREEN); + vscreen_rect.bottom = vscreen_rect.top + + NtUserGetSystemMetrics(SM_CYVIRTUALSCREEN); + + /* FIXME: surface->window.client_rect is in window dpi, whereas + * vscreen_rect is in thread dpi. */ + intersect_rect(&rect, &surface->window.client_rect, &vscreen_rect); + + return EqualRect(&vscreen_rect, &rect); +} + /*********************************************************************** * wayland_pointer_update_constraint * * Enables/disables pointer confinement. - * - * Passing a NULL confine_rect disables all constraints. */ -static void wayland_pointer_update_constraint(RECT *confine_rect, - struct wl_surface *wl_surface) +static void wayland_pointer_update_constraint(struct wl_surface *wl_surface, + RECT *confine_rect, + BOOL covers_vscreen) { struct wayland_pointer *pointer = &process_wayland.pointer; BOOL needs_relative, needs_lock, needs_confine; - assert(!confine_rect || wl_surface); - - needs_lock = confine_rect && !pointer->cursor.wl_surface; - needs_confine = confine_rect && pointer->cursor.wl_surface; + needs_lock = wl_surface && (confine_rect || covers_vscreen) && + !pointer->cursor.wl_surface; + needs_confine = wl_surface && confine_rect && pointer->cursor.wl_surface; if (!needs_confine && pointer->zwp_confined_pointer_v1) { @@ -838,7 +860,7 @@ static void wayland_pointer_update_constraint(RECT *confine_rect, void wayland_pointer_clear_constraint(void) { - wayland_pointer_update_constraint(NULL, NULL); + wayland_pointer_update_constraint(NULL, NULL, FALSE); } /*********************************************************************** @@ -858,27 +880,27 @@ BOOL WAYLAND_ClipCursor(const RECT *clip, BOOL reset) { struct wayland_pointer *pointer = &process_wayland.pointer; struct wl_surface *wl_surface = NULL; + struct wayland_surface *surface = NULL; + BOOL covers_vscreen = FALSE; RECT confine_rect; TRACE("clip=%s reset=%d\n", wine_dbgstr_rect(clip), reset); - if (clip) + if ((surface = wayland_surface_lock_hwnd(NtUserGetForegroundWindow()))) { - struct wayland_surface *surface = NULL; - - if ((surface = wayland_surface_lock_hwnd(NtUserGetForegroundWindow()))) - { - wl_surface = surface->wl_surface; - wayland_surface_calc_confine(surface, clip, &confine_rect); - pthread_mutex_unlock(&surface->mutex); - } + wl_surface = surface->wl_surface; + if (clip) wayland_surface_calc_confine(surface, clip, &confine_rect); + covers_vscreen = wayland_surface_client_covers_vscreen(surface); + pthread_mutex_unlock(&surface->mutex); } /* Since we are running in the context of the foreground thread we know * that the wl_surface of the foreground HWND will not be invalidated, * so we can access it without having the surface lock. */ pthread_mutex_lock(&pointer->mutex); - wayland_pointer_update_constraint(wl_surface ? &confine_rect : NULL, wl_surface); + wayland_pointer_update_constraint(wl_surface, + (clip && wl_surface) ? &confine_rect : NULL, + covers_vscreen); pthread_mutex_unlock(&pointer->mutex); wl_display_flush(process_wayland.wl_display);

1 0

Alexandre Julliard : ntdll: Switch to the kernel stack before restoring the pthread TEB.
by Alexandre Julliard 14 Dec '23

14 Dec '23

Module: wine Branch: master Commit: b5564cc130cf9a2c5ab8e8456b6534ef338d9fa2 URL: https://gitlab.winehq.org/wine/wine/-/commit/b5564cc130cf9a2c5ab8e8456b6534… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 14 11:27:24 2023 +0100 ntdll: Switch to the kernel stack before restoring the pthread TEB. Based on a patch by Rémi Bernon. --- dlls/ntdll/unix/signal_x86_64.c | 61 ++++++++++++++++++++--------------------- 1 file changed, 30 insertions(+), 31 deletions(-) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 0c291633ac6..911b4ad5d12 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -2666,23 +2666,9 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher, __ASM_CFI_REG_IS_AT1(r14, rbp, 0x48) __ASM_CFI_REG_IS_AT1(r15, rbp, 0x50) __ASM_CFI_REG_IS_AT1(rbp, rbp, 0x00) -#ifdef __linux__ - "testl $12,%r14d\n\t" /* SYSCALL_HAVE_PTHREAD_TEB | SYSCALL_HAVE_WRFSGSBASE */ - "jz 2f\n\t" - "movq %gs:0x320,%rsi\n\t" /* amd64_thread_data()->pthread_teb */ - "testl $8,%r14d\n\t" /* SYSCALL_HAVE_WRFSGSBASE */ - "jz 1f\n\t" - "wrfsbase %rsi\n\t" - "jmp 2f\n" - "1:\tmov $0x1002,%edi\n\t" /* ARCH_SET_FS */ - "mov $158,%eax\n\t" /* SYS_arch_prctl */ - "syscall\n\t" - "leaq -0x98(%rbp),%rcx\n" - "2:\n\t" -#endif "movq 0x28(%rsp),%r12\n\t" /* 5th argument */ "movq 0x30(%rsp),%r13\n\t" /* 6th argument */ - "leaq 0x38(%rsp),%rsi\n\t" /* 7th argument */ + "leaq 0x38(%rsp),%r15\n\t" /* 7th argument */ /* switch to kernel stack */ "movq %rcx,%rsp\n\t" /* we're now on the kernel stack, stitch unwind info with previous frame */ @@ -2696,6 +2682,20 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher, __ASM_CFI(".cfi_offset %r15,-0x38\n\t") __ASM_CFI(".cfi_undefined %rdi\n\t") __ASM_CFI(".cfi_undefined %rsi\n\t") +#ifdef __linux__ + "testl $12,%r14d\n\t" /* SYSCALL_HAVE_PTHREAD_TEB | SYSCALL_HAVE_WRFSGSBASE */ + "jz 2f\n\t" + "movq %gs:0x320,%rsi\n\t" /* amd64_thread_data()->pthread_teb */ + "testl $8,%r14d\n\t" /* SYSCALL_HAVE_WRFSGSBASE */ + "jz 1f\n\t" + "wrfsbase %rsi\n\t" + "jmp 2f\n" + "1:\tmov $0x1002,%edi\n\t" /* ARCH_SET_FS */ + "mov $158,%eax\n\t" /* SYS_arch_prctl */ + "syscall\n\t" + "leaq -0x98(%rbp),%rcx\n" + "2:\n\t" +#endif "movq 0x00(%rcx),%rax\n\t" "movq 0x18(%rcx),%r11\n\t" /* 2nd argument */ "movl %eax,%ebx\n\t" @@ -2719,6 +2719,7 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher, "shrq $3,%rcx\n\t" "andq $~15,%rsp\n\t" "movq %rsp,%rdi\n\t" + "movq %r15,%rsi\n\t" "cld\n\t" "rep; movsq\n" "1:\tmovq %r10,%rdi\n\t" /* 1st argument */ @@ -2873,6 +2874,19 @@ __ASM_GLOBAL_FUNC( __wine_unix_call_dispatcher, "movdqa %xmm14,0x240(%rcx)\n\t" "movdqa %xmm15,0x250(%rcx)\n\t" "movl 0xb0(%rcx),%r14d\n\t" /* frame->syscall_flags */ + /* switch to kernel stack */ + "movq %rcx,%rsp\n\t" + /* we're now on the kernel stack, stitch unwind info with previous frame */ + __ASM_CFI_CFA_IS_AT2(rsp, 0xa8, 0x01) /* frame->syscall_cfa */ + __ASM_CFI(".cfi_offset %rip,-0x08\n\t") + __ASM_CFI(".cfi_offset %rbp,-0x10\n\t") + __ASM_CFI(".cfi_offset %rbx,-0x18\n\t") + __ASM_CFI(".cfi_offset %r12,-0x20\n\t") + __ASM_CFI(".cfi_offset %r13,-0x28\n\t") + __ASM_CFI(".cfi_offset %r14,-0x30\n\t") + __ASM_CFI(".cfi_offset %r15,-0x38\n\t") + __ASM_CFI(".cfi_undefined %rdi\n\t") + __ASM_CFI(".cfi_undefined %rsi\n\t") #ifdef __linux__ "testl $12,%r14d\n\t" /* SYSCALL_HAVE_PTHREAD_TEB | SYSCALL_HAVE_WRFSGSBASE */ "jz 2f\n\t" @@ -2883,27 +2897,12 @@ __ASM_GLOBAL_FUNC( __wine_unix_call_dispatcher, "jmp 2f\n" "1:\tmov $0x1002,%edi\n\t" /* ARCH_SET_FS */ "mov $158,%eax\n\t" /* SYS_arch_prctl */ - "mov %rcx,%r9\n\t" "syscall\n\t" - "mov %r9,%rcx\n\t" "2:\n\t" #endif - /* switch to kernel stack */ - "movq %rcx,%rsp\n" - /* we're now on the kernel stack, stitch unwind info with previous frame */ - __ASM_CFI_CFA_IS_AT2(rsp, 0xa8, 0x01) /* frame->syscall_cfa */ - __ASM_CFI(".cfi_offset %rip,-0x08\n\t") - __ASM_CFI(".cfi_offset %rbp,-0x10\n\t") - __ASM_CFI(".cfi_offset %rbx,-0x18\n\t") - __ASM_CFI(".cfi_offset %r12,-0x20\n\t") - __ASM_CFI(".cfi_offset %r13,-0x28\n\t") - __ASM_CFI(".cfi_offset %r14,-0x30\n\t") - __ASM_CFI(".cfi_offset %r15,-0x38\n\t") - __ASM_CFI(".cfi_undefined %rdi\n\t") - __ASM_CFI(".cfi_undefined %rsi\n\t") "movq %r8,%rdi\n\t" /* args */ "callq *(%r10,%rdx,8)\n\t" - "movq %rsp,%rcx\n" + "movq %rsp,%rcx\n\t" "movdqa 0x1c0(%rcx),%xmm6\n\t" "movdqa 0x1d0(%rcx),%xmm7\n\t" "movdqa 0x1e0(%rcx),%xmm8\n\t"

1 0

Alexandre Julliard : ntdll: Switch to the user stack before restoring the %fs register.
by Alexandre Julliard 14 Dec '23

14 Dec '23

Module: wine Branch: master Commit: 0a5f7a710365a9766fc2b31528ab29cdec2c2d2f URL: https://gitlab.winehq.org/wine/wine/-/commit/0a5f7a710365a9766fc2b31528ab29… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 14 11:39:17 2023 +0100 ntdll: Switch to the user stack before restoring the %fs register. Based on a patch by Rémi Bernon. --- dlls/ntdll/unix/signal_x86_64.c | 56 ++++++++++++++++++----------------------- 1 file changed, 24 insertions(+), 32 deletions(-) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 911b4ad5d12..ab544908883 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -1596,14 +1596,14 @@ __ASM_GLOBAL_FUNC( call_user_mode_callback, "movl %r14d,0xb0(%rsp)\n\t" /* frame->syscall_flags */ "movq %r10,0xa0(%rsp)\n\t" /* frame->prev_frame */ "movq %rsp,0x328(%r8)\n\t" /* amd64_thread_data()->syscall_frame */ + /* switch to user stack */ + "movq %rdi,%rsp\n\t" /* user_rsp */ #ifdef __linux__ "testl $12,%r14d\n\t" /* SYSCALL_HAVE_PTHREAD_TEB | SYSCALL_HAVE_WRFSGSBASE */ "jz 1f\n\t" "movw 0x338(%r8),%fs\n" /* amd64_thread_data()->fs */ "1:\n\t" #endif - /* switch to user stack */ - "movq %rdi,%rsp\n\t" /* user_rsp */ "jmpq *%rcx" ) /* func */ @@ -2733,12 +2733,6 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher, "leaq -0x98(%rbp),%rcx\n\t" __ASM_LOCAL_LABEL("__wine_syscall_dispatcher_return") ":\n\t" "movl 0xb4(%rcx),%edx\n\t" /* frame->restore_flags */ -#ifdef __linux__ - "testl $12,%r14d\n\t" /* SYSCALL_HAVE_PTHREAD_TEB | SYSCALL_HAVE_WRFSGSBASE */ - "jz 1f\n\t" - "movw %gs:0x338,%fs\n" /* amd64_thread_data()->fs */ - "1:\n\t" -#endif "testl $0x48,%edx\n\t" /* CONTEXT_FLOATING_POINT | CONTEXT_XSTATE */ "jnz 2f\n\t" "movaps 0x1c0(%rcx),%xmm6\n\t" @@ -2764,25 +2758,30 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher, "3:\tfxrstor64 0xc0(%rcx)\n" "4:\tmovq 0x98(%rcx),%rbp\n\t" /* push rbp-based kernel stack cfi */ - __ASM_CFI("\t.cfi_remember_state\n") + __ASM_CFI(".cfi_remember_state\n\t") __ASM_CFI_CFA_IS_AT2(rcx, 0xa8, 0x01) /* frame->syscall_cfa */ "movq 0x68(%rcx),%r15\n\t" - "movq 0x60(%rcx),%r14\n\t" "movq 0x58(%rcx),%r13\n\t" "movq 0x50(%rcx),%r12\n\t" + "movq 0x80(%rcx),%r11\n\t" /* frame->eflags */ "movq 0x28(%rcx),%rdi\n\t" "movq 0x20(%rcx),%rsi\n\t" "movq 0x08(%rcx),%rbx\n\t" + "leaq 0x70(%rcx),%rsp\n\t" /* %rsp > frame means no longer inside syscall */ +#ifdef __linux__ + "testl $12,%r14d\n\t" /* SYSCALL_HAVE_PTHREAD_TEB | SYSCALL_HAVE_WRFSGSBASE */ + "jz 1f\n\t" + "movw %gs:0x338,%fs\n" /* amd64_thread_data()->fs */ + "1:\n\t" +#endif + "movq 0x60(%rcx),%r14\n\t" "testl $0x3,%edx\n\t" /* CONTEXT_CONTROL | CONTEXT_INTEGER */ "jnz 1f\n\t" - "movq 0x80(%rcx),%r11\n\t" /* frame->eflags */ - "pushq %r11\n\t" - "popfq\n\t" /* switch to user stack */ "movq 0x88(%rcx),%rsp\n\t" /* push rcx-based kernel stack cfi */ - __ASM_CFI("\t.cfi_remember_state\n") + __ASM_CFI(".cfi_remember_state\n\t") __ASM_CFI(".cfi_def_cfa %rsp, 0\n\t") __ASM_CFI_REG_IS_AT2(rip, rcx, 0xf0, 0x00) __ASM_CFI(".cfi_same_value %rbp\n\t") @@ -2795,16 +2794,18 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher, __ASM_CFI(".cfi_same_value %rsi\n\t") "movq 0x70(%rcx),%rcx\n\t" /* frame->rip */ __ASM_CFI(".cfi_register rip, rcx\n\t") + "pushq %r11\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset 8\n\t") + "popfq\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset -8\n\t") "pushq %rcx\n\t" __ASM_CFI(".cfi_adjust_cfa_offset 8\n\t") "ret\n\t" /* pop rcx-based kernel stack cfi */ - __ASM_CFI("\t.cfi_restore_state\n") + __ASM_CFI(".cfi_restore_state\n") - "1:\tleaq 0x70(%rcx),%rsp\n\t" - "testl $0x2,%edx\n\t" /* CONTEXT_INTEGER */ + "1:\ttestl $0x2,%edx\n\t" /* CONTEXT_INTEGER */ "jnz 1f\n\t" - "movq 0x10(%rsp),%r11\n\t" /* frame->eflags */ "movq (%rsp),%rcx\n\t" /* frame->rip */ "iretq\n" "1:\tmovq 0x00(%rcx),%rax\n\t" @@ -2813,7 +2814,7 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher, "movq 0x38(%rcx),%r9\n\t" "movq 0x40(%rcx),%r10\n\t" "movq 0x48(%rcx),%r11\n\t" - "movq 0x10(%rcx),%rcx\n" + "movq 0x10(%rcx),%rcx\n\t" "iretq\n" /* pop rbp-based kernel stack cfi */ @@ -2877,6 +2878,7 @@ __ASM_GLOBAL_FUNC( __wine_unix_call_dispatcher, /* switch to kernel stack */ "movq %rcx,%rsp\n\t" /* we're now on the kernel stack, stitch unwind info with previous frame */ + __ASM_CFI(".cfi_remember_state\n\t") __ASM_CFI_CFA_IS_AT2(rsp, 0xa8, 0x01) /* frame->syscall_cfa */ __ASM_CFI(".cfi_offset %rip,-0x08\n\t") __ASM_CFI(".cfi_offset %rbp,-0x10\n\t") @@ -2915,6 +2917,9 @@ __ASM_GLOBAL_FUNC( __wine_unix_call_dispatcher, "movdqa 0x250(%rcx),%xmm15\n\t" "testl $0xffff,0xb4(%rcx)\n\t" /* frame->restore_flags */ "jnz " __ASM_LOCAL_LABEL("__wine_syscall_dispatcher_return") "\n\t" + /* switch to user stack */ + "movq 0x88(%rcx),%rsp\n\t" + __ASM_CFI(".cfi_restore_state\n\t") #ifdef __linux__ "testl $12,%r14d\n\t" /* SYSCALL_HAVE_PTHREAD_TEB | SYSCALL_HAVE_WRFSGSBASE */ "jz 1f\n\t" @@ -2924,20 +2929,7 @@ __ASM_GLOBAL_FUNC( __wine_unix_call_dispatcher, "movq 0x60(%rcx),%r14\n\t" "movq 0x28(%rcx),%rdi\n\t" "movq 0x20(%rcx),%rsi\n\t" - /* switch to user stack */ - "movq 0x88(%rcx),%rsp\n\t" - __ASM_CFI(".cfi_def_cfa %rsp, 0\n\t") - __ASM_CFI_REG_IS_AT2(rip, rcx, 0x70, 0x00) - __ASM_CFI(".cfi_undefined %rbp\n\t") - __ASM_CFI(".cfi_undefined %rbx\n\t") - __ASM_CFI(".cfi_undefined %r12\n\t") - __ASM_CFI(".cfi_undefined %r13\n\t") - __ASM_CFI(".cfi_same_value %r14\n\t") - __ASM_CFI(".cfi_undefined %r15\n\t") - __ASM_CFI(".cfi_same_value %rdi\n\t") - __ASM_CFI(".cfi_same_value %rsi\n\t") "pushq 0x70(%rcx)\n\t" /* frame->rip */ - __ASM_CFI(".cfi_adjust_cfa_offset 8\n\t") "ret" ) asm( ".data\n\t"

1 0

Alexandre Julliard : ntdll: Only free reserved memory for DYNAMIC_BASE binaries.
by Alexandre Julliard 14 Dec '23

14 Dec '23

Module: wine Branch: master Commit: 7a7b82880a73e654933b7866e79f3e9a62a565ef URL: https://gitlab.winehq.org/wine/wine/-/commit/7a7b82880a73e654933b7866e79f3e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 14 15:43:39 2023 +0100 ntdll: Only free reserved memory for DYNAMIC_BASE binaries. To avoid triggering more pointer-truncation bugs in applications. --- dlls/ntdll/unix/virtual.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 5bdeef4c1bc..e805c349eac 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -4397,7 +4397,8 @@ void virtual_set_large_address_space(void) if (is_wow64()) user_space_wow_limit = ((main_image_info.ImageCharacteristics & IMAGE_FILE_LARGE_ADDRESS_AWARE) ? limit_4g : limit_2g) - 1; #ifndef __APPLE__ /* don't free the zerofill section on macOS */ - else if (main_image_info.DllCharacteristics & IMAGE_DLLCHARACTERISTICS_HIGH_ENTROPY_VA) + else if ((main_image_info.DllCharacteristics & IMAGE_DLLCHARACTERISTICS_HIGH_ENTROPY_VA) && + (main_image_info.DllCharacteristics & IMAGE_DLLCHARACTERISTICS_DYNAMIC_BASE)) free_reserved_memory( 0, (char *)0x7ffe0000 ); #endif }

1 0

Alexandre Julliard : krnl386: Don't release the Win16 lock when exiting a task.
by Alexandre Julliard 14 Dec '23

14 Dec '23

Module: wine Branch: master Commit: aa7a0f5198a98ff02d588ad934b47988fa1f3149 URL: https://gitlab.winehq.org/wine/wine/-/commit/aa7a0f5198a98ff02d588ad934b479… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 14 13:24:12 2023 +0100 krnl386: Don't release the Win16 lock when exiting a task. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54402 --- dlls/krnl386.exe16/interrupts.c | 3 --- dlls/krnl386.exe16/task.c | 9 +-------- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/dlls/krnl386.exe16/interrupts.c b/dlls/krnl386.exe16/interrupts.c index 23c12f2a244..e062b497853 100644 --- a/dlls/krnl386.exe16/interrupts.c +++ b/dlls/krnl386.exe16/interrupts.c @@ -96,9 +96,6 @@ static void WINAPI DOSVM_DefaultHandler( CONTEXT *context ) */ void DOSVM_Exit( WORD retval ) { - DWORD count; - - ReleaseThunkLock( &count ); ExitThread( retval ); } diff --git a/dlls/krnl386.exe16/task.c b/dlls/krnl386.exe16/task.c index 54d7a4c64ee..534b912e884 100644 --- a/dlls/krnl386.exe16/task.c +++ b/dlls/krnl386.exe16/task.c @@ -549,15 +549,8 @@ void TASK_ExitTask(void) TDB *pTask; DWORD lockCount; - /* Enter the Win16Lock to protect global data structures */ - _EnterWin16Lock(); - pTask = TASK_GetCurrent(); - if ( !pTask ) - { - _LeaveWin16Lock(); - return; - } + if (!pTask) return; TRACE("Killing task %04x\n", pTask->hSelf );

1 0

Bernhard Übelacker : uxtheme: Add stub for IsDarkModeAllowedForWindow.
by Alexandre Julliard 14 Dec '23

14 Dec '23

Module: wine Branch: master Commit: 715b9d86f4ecffd81afa87704ff402ca3b0c1595 URL: https://gitlab.winehq.org/wine/wine/-/commit/715b9d86f4ecffd81afa87704ff402… Author: Bernhard Übelacker <bernhardu(a)mailbox.org> Date: Wed Dec 13 23:23:58 2023 +0100 uxtheme: Add stub for IsDarkModeAllowedForWindow. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56006 --- dlls/uxtheme/system.c | 10 ++++++++++ dlls/uxtheme/uxtheme.spec | 1 + 2 files changed, 11 insertions(+) diff --git a/dlls/uxtheme/system.c b/dlls/uxtheme/system.c index adf90a12cfb..3c0eb3c66f4 100644 --- a/dlls/uxtheme/system.c +++ b/dlls/uxtheme/system.c @@ -1315,3 +1315,13 @@ int WINAPI SetPreferredAppMode(int app_mode) FIXME("%d: stub\n", app_mode); return 0; } + +/********************************************************************** + * IsDarkModeAllowedForWindow (UXTHEME.137) + * + */ +BOOL WINAPI IsDarkModeAllowedForWindow(HWND hwnd) +{ + FIXME("%p: stub\n", hwnd); + return FALSE; +} diff --git a/dlls/uxtheme/uxtheme.spec b/dlls/uxtheme/uxtheme.spec index 26dc54d5805..bacc4869e69 100644 --- a/dlls/uxtheme/uxtheme.spec +++ b/dlls/uxtheme/uxtheme.spec @@ -46,6 +46,7 @@ 132 stdcall -noname ShouldAppsUseDarkMode() 133 stdcall -noname AllowDarkModeForWindow(ptr long) 135 stdcall -noname SetPreferredAppMode(long) +137 stdcall -noname IsDarkModeAllowedForWindow(ptr) 138 stdcall -noname ShouldSystemUseDarkMode() # Standard functions

1 0

Conor McCarthy : tests/shader-runner: Check for float64 support in the d3d11 runner.
by Alexandre Julliard 14 Dec '23

14 Dec '23

Module: vkd3d Branch: master Commit: cd43cb3752d414bb990ed39a5fbb95ffebd3f39b URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/cd43cb3752d414bb990ed39a5fbb9… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Thu Dec 14 18:47:23 2023 +1000 tests/shader-runner: Check for float64 support in the d3d11 runner. --- tests/shader_runner_d3d11.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/tests/shader_runner_d3d11.c b/tests/shader_runner_d3d11.c index abe45520..1a62b20c 100644 --- a/tests/shader_runner_d3d11.c +++ b/tests/shader_runner_d3d11.c @@ -65,6 +65,8 @@ struct d3d11_shader_runner IDXGISwapChain *swapchain; ID3D11DeviceContext *immediate_context; ID3D11RasterizerState *rasterizer_state; + + bool supports_float64; }; static struct d3d11_shader_runner *d3d11_shader_runner(struct shader_runner *r) @@ -252,6 +254,7 @@ static IDXGISwapChain *create_swapchain(ID3D11Device *device, HWND window) static BOOL init_test_context(struct d3d11_shader_runner *runner) { + D3D11_FEATURE_DATA_DOUBLES doubles = {0}; unsigned int rt_width, rt_height; D3D11_RASTERIZER_DESC rs_desc; D3D11_VIEWPORT vp; @@ -266,6 +269,12 @@ static BOOL init_test_context(struct d3d11_shader_runner *runner) return FALSE; } + hr = ID3D11Device_CheckFeatureSupport(runner->device, D3D11_FEATURE_DOUBLES, + &doubles, sizeof(doubles)); + ok(hr == S_OK, "Failed to check double precision feature support, hr %#lx.\n", hr); + trace("DoublePrecisionFloatShaderOps: %u.\n", doubles.DoublePrecisionFloatShaderOps); + runner->supports_float64 = doubles.DoublePrecisionFloatShaderOps; + rt_width = RENDER_TARGET_WIDTH; rt_height = RENDER_TARGET_HEIGHT; SetRect(&rect, 0, 0, rt_width, rt_height); @@ -313,6 +322,16 @@ static void destroy_test_context(struct d3d11_shader_runner *runner) ok(!ref, "Device has %lu references left.\n", ref); } +static bool d3d11_runner_check_requirements(struct shader_runner *r) +{ + struct d3d11_shader_runner *runner = d3d11_shader_runner(r); + + if (runner->r.require_float64 && !runner->supports_float64) + return false; + + return true; +} + static ID3D11Buffer *create_buffer(ID3D11Device *device, unsigned int bind_flags, unsigned int size, const void *data) { D3D11_SUBRESOURCE_DATA resource_data; @@ -724,6 +743,7 @@ static void d3d11_runner_release_readback(struct shader_runner *r, struct resour static const struct shader_runner_ops d3d11_runner_ops = { + .check_requirements = d3d11_runner_check_requirements, .create_resource = d3d11_runner_create_resource, .destroy_resource = d3d11_runner_destroy_resource, .dispatch = d3d11_runner_dispatch,

1 0

Conor McCarthy : tests/shader-runner: Check for float64 support in the Vulkan runner.
by Alexandre Julliard 14 Dec '23

14 Dec '23

Module: vkd3d Branch: master Commit: a80ea8168f157f9c1c4b2ed0ff818f315055a37c URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/a80ea8168f157f9c1c4b2ed0ff818… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Thu Dec 14 18:57:33 2023 +1000 tests/shader-runner: Check for float64 support in the Vulkan runner. --- tests/shader_runner_vulkan.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/tests/shader_runner_vulkan.c b/tests/shader_runner_vulkan.c index f89b4d62..358fd74c 100644 --- a/tests/shader_runner_vulkan.c +++ b/tests/shader_runner_vulkan.c @@ -70,6 +70,8 @@ struct vulkan_shader_runner uint32_t binding; } samplers[MAX_SAMPLERS]; + bool supports_float64; + DECLARE_VK_PFN(vkCreateInstance); #define VK_INSTANCE_PFN DECLARE_VK_PFN #define VK_DEVICE_PFN DECLARE_VK_PFN @@ -81,6 +83,16 @@ static struct vulkan_shader_runner *vulkan_shader_runner(struct shader_runner *r return CONTAINING_RECORD(r, struct vulkan_shader_runner, r); } +static bool vulkan_runner_check_requirements(struct shader_runner *r) +{ + struct vulkan_shader_runner *runner = vulkan_shader_runner(r); + + if (runner->r.require_float64 && !runner->supports_float64) + return false; + + return true; +} + #define VK_CALL(f) (runner->f) static void begin_command_buffer(struct vulkan_shader_runner *runner) @@ -1157,6 +1169,7 @@ static void vulkan_runner_release_readback(struct shader_runner *r, struct resou static const struct shader_runner_ops vulkan_runner_ops = { + .check_requirements = vulkan_runner_check_requirements, .create_resource = vulkan_runner_create_resource, .destroy_resource = vulkan_runner_destroy_resource, .dispatch = vulkan_runner_dispatch, @@ -1321,6 +1334,13 @@ static bool init_vulkan_runner(struct vulkan_shader_runner *runner) ENABLE_FEATURE(shaderImageGatherExtended); ENABLE_FEATURE(shaderStorageImageWriteWithoutFormat); + trace("shaderFloat64: %u.\n", ret_features.shaderFloat64); + if (ret_features.shaderFloat64) + { + features.shaderFloat64 = VK_TRUE; + runner->supports_float64 = true; + } + if ((vr = VK_CALL(vkCreateDevice(runner->phys_device, &device_desc, NULL, &device)))) { skip("Failed to create device, vr %d.\n", vr);

1 0

Conor McCarthy : tests/shader-runner: Check for int64 support in the Vulkan runner.
by Alexandre Julliard 14 Dec '23

14 Dec '23

Module: vkd3d Branch: master Commit: f23426ec32270a27e470c5d52fc5cee718a5eb6d URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/f23426ec32270a27e470c5d52fc5c… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Thu Dec 14 18:59:46 2023 +1000 tests/shader-runner: Check for int64 support in the Vulkan runner. --- tests/shader_runner_vulkan.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/tests/shader_runner_vulkan.c b/tests/shader_runner_vulkan.c index 358fd74c..6da2e86b 100644 --- a/tests/shader_runner_vulkan.c +++ b/tests/shader_runner_vulkan.c @@ -71,6 +71,7 @@ struct vulkan_shader_runner } samplers[MAX_SAMPLERS]; bool supports_float64; + bool supports_int64; DECLARE_VK_PFN(vkCreateInstance); #define VK_INSTANCE_PFN DECLARE_VK_PFN @@ -89,6 +90,8 @@ static bool vulkan_runner_check_requirements(struct shader_runner *r) if (runner->r.require_float64 && !runner->supports_float64) return false; + if (runner->r.require_int64 && !runner->supports_int64) + return false; return true; } @@ -1340,6 +1343,12 @@ static bool init_vulkan_runner(struct vulkan_shader_runner *runner) features.shaderFloat64 = VK_TRUE; runner->supports_float64 = true; } + trace("shaderInt64: %u.\n", ret_features.shaderInt64); + if (ret_features.shaderInt64) + { + features.shaderInt64 = VK_TRUE; + runner->supports_int64 = true; + } if ((vr = VK_CALL(vkCreateDevice(runner->phys_device, &device_desc, NULL, &device)))) {

1 0