December 2023 - Wine-Commits

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

Dec. 14, 2023

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

Sven Baars : sapi/tests: Remove registry keys created by SetId() in the SpVoice tests.
by Alexandre Julliard Dec. 14, 2023

Dec. 14, 2023

Module: wine Branch: master Commit: 5def0d2e78f97794e1753f070e020cac8b621c9a URL: https://gitlab.winehq.org/wine/wine/-/commit/5def0d2e78f97794e1753f070e020c… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Thu Dec 14 12:48:05 2023 +0100 sapi/tests: Remove registry keys created by SetId() in the SpVoice tests. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55288 --- dlls/sapi/tests/tts.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/sapi/tests/tts.c b/dlls/sapi/tests/tts.c index 6912dc08e0d..38ec1d31bfc 100644 --- a/dlls/sapi/tests/tts.c +++ b/dlls/sapi/tests/tts.c @@ -686,6 +686,8 @@ done: ISpVoice_Release(voice); ISpObjectToken_Release(token); ISpMMSysAudio_Release(audio_out); + + RegDeleteTreeA( HKEY_LOCAL_MACHINE, "Software\\Wine\\Winetest\\sapi" ); } START_TEST(tts)

1 0

Alexandre Julliard : ntdll: Only free reserved memory for DYNAMIC_BASE binaries.
by Alexandre Julliard Dec. 14, 2023

Dec. 14, 2023

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 Dec. 14, 2023

Dec. 14, 2023

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

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

Dec. 14, 2023

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: Switch to the kernel stack before restoring the pthread TEB.
by Alexandre Julliard Dec. 14, 2023

Dec. 14, 2023

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

Bernhard Übelacker : uxtheme: Add stub for IsDarkModeAllowedForWindow.
by Alexandre Julliard Dec. 14, 2023

Dec. 14, 2023

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

Henri Verbeet : vkd3d-shader/ir: Pass a uint32_t swizzle to vkd3d_swizzle_get_component64().
by Alexandre Julliard Dec. 14, 2023

Dec. 14, 2023

Module: vkd3d Branch: master Commit: f96a791807701a4583e6c613c2f5bd47c00ea767 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/f96a791807701a4583e6c613c2f5b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Dec 5 23:08:59 2023 +0100 vkd3d-shader/ir: Pass a uint32_t swizzle to vkd3d_swizzle_get_component64(). --- libs/vkd3d-shader/spirv.c | 4 ++-- libs/vkd3d-shader/vkd3d_shader_private.h | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 9b628a36..45f46a91 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -3702,7 +3702,7 @@ static uint32_t spirv_compiler_emit_load_constant(struct spirv_compiler *compile } static uint32_t spirv_compiler_emit_load_constant64(struct spirv_compiler *compiler, - const struct vkd3d_shader_register *reg, DWORD swizzle, uint32_t write_mask) + const struct vkd3d_shader_register *reg, uint32_t swizzle, uint32_t write_mask) { unsigned int component_count = vsir_write_mask_component_count(write_mask); uint64_t values[VKD3D_DVEC2_SIZE] = {0}; @@ -3720,7 +3720,7 @@ static uint32_t spirv_compiler_emit_load_constant64(struct spirv_compiler *compi for (i = 0, j = 0; i < VKD3D_DVEC2_SIZE; ++i) { if (write_mask & (VKD3DSP_WRITEMASK_0 << i)) - values[j++] = reg->u.immconst_uint64[vkd3d_swizzle_get_component64(swizzle, i)]; + values[j++] = reg->u.immconst_uint64[vsir_swizzle_get_component64(swizzle, i)]; } } diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 70c5f4fc..f1cc9ad7 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -1562,8 +1562,7 @@ static inline unsigned int vsir_swizzle_get_component(uint32_t swizzle, unsigned return (swizzle >> VKD3D_SHADER_SWIZZLE_SHIFT(idx)) & VKD3D_SHADER_SWIZZLE_MASK; } -static inline unsigned int vkd3d_swizzle_get_component64(DWORD swizzle, - unsigned int idx) +static inline unsigned int vsir_swizzle_get_component64(uint32_t swizzle, unsigned int idx) { return ((swizzle >> VKD3D_SHADER_SWIZZLE_SHIFT(idx * 2)) & VKD3D_SHADER_SWIZZLE_MASK) / 2u; }

1 0

Zebediah Figura : vkd3d-shader: Do not scan DCL instructions which do not declare resources.
by Alexandre Julliard Dec. 14, 2023

Dec. 14, 2023

Module: vkd3d Branch: master Commit: 2bc40385d9b4a51a0d66462a6f708fbc888ecfa3 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/2bc40385d9b4a51a0d66462a6f708… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Oct 25 13:58:13 2023 -0500 vkd3d-shader: Do not scan DCL instructions which do not declare resources. --- libs/vkd3d-shader/vkd3d_shader_main.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 0600e722..49ce886a 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -1073,6 +1073,9 @@ static int vkd3d_shader_scan_instruction(struct vkd3d_shader_scan_context *conte vkd3d_shader_scan_sampler_declaration(context, instruction); break; case VKD3DSIH_DCL: + if (instruction->declaration.semantic.resource_type == VKD3D_SHADER_RESOURCE_NONE) + break; + if (instruction->declaration.semantic.resource.reg.reg.type == VKD3DSPR_COMBINED_SAMPLER) { vkd3d_shader_scan_combined_sampler_declaration(context, &instruction->declaration.semantic);

1 0

Henri Verbeet : vkd3d-shader/ir: Pass a uint32_t swizzle to vkd3d_swizzle_get_component().
by Alexandre Julliard Dec. 14, 2023

Dec. 14, 2023

Module: vkd3d Branch: master Commit: 8a1de71fb1e6e0b3ce59afe260708fdfe67b3bfa URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/8a1de71fb1e6e0b3ce59afe260708… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Dec 5 23:05:40 2023 +0100 vkd3d-shader/ir: Pass a uint32_t swizzle to vkd3d_swizzle_get_component(). --- libs/vkd3d-shader/d3d_asm.c | 8 ++--- libs/vkd3d-shader/d3dbc.c | 10 +++---- libs/vkd3d-shader/ir.c | 4 +-- libs/vkd3d-shader/spirv.c | 50 ++++++++++++++++---------------- libs/vkd3d-shader/tpf.c | 18 ++++++------ libs/vkd3d-shader/vkd3d_shader_private.h | 7 ++--- 6 files changed, 48 insertions(+), 49 deletions(-)

1 0