wine-commits February 2021

wine-commits@winehq.org

2 participants
915 discussions

Jacek Caban : ntdll: Store eflags in x86_64 syscall frame.
by Alexandre Julliard 17 Feb '21

17 Feb '21

Module: wine Branch: master Commit: 9bdd02de0c5cd370a48901ceede12ff946662295 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9bdd02de0c5cd370a48901ce… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 15 21:58:02 2021 +0100 ntdll: Store eflags in x86_64 syscall frame. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_x86_64.c | 2 +- tools/winebuild/import.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 824cfb4febe..9366d8913c0 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -1947,7 +1947,7 @@ NTSTATUS WINAPI NtGetContextThread( HANDLE handle, CONTEXT *context ) context->Rsp = (ULONG64)&frame->ret_addr; context->Rbp = frame->rbp; context->Rip = frame->thunk_addr; - context->EFlags = 0x202; + context->EFlags = frame->eflags; __asm__( "movw %%cs,%0" : "=g" (context->SegCs) ); __asm__( "movw %%ss,%0" : "=g" (context->SegSs) ); context->ContextFlags |= CONTEXT_CONTROL; diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index c70470251a4..8c949a383e3 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -1508,7 +1508,9 @@ void output_syscalls( DLLSPEC *spec ) output_cfi( ".cfi_rel_offset %%rbp,0" ); output( "\tmovq %%rsp,%%rbp\n" ); output_cfi( ".cfi_def_cfa_register %%rbp" ); - output( "\tleaq -0x2a8(%%rbp),%%rsp\n" ); + output( "\tleaq -0x10(%%rbp),%%rsp\n" ); + output( "\tpushfq\n" ); + output( "\tsubq $0x280,%%rsp\n" ); output( "\tandq $~63,%%rsp\n" ); output( "\tmovq %%rbx,-0x90(%%rbp)\n" ); output_cfi( ".cfi_rel_offset %%rbx,-144" );

1 0

Jacek Caban : ntdll: Reserve space for all registers in x86_64 syscall frame.
by Alexandre Julliard 17 Feb '21

17 Feb '21

Module: wine Branch: master Commit: 6d2f08cfcbef38750403e1ea7075d99ad1a5a3ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=6d2f08cfcbef38750403e1ea… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 15 21:57:55 2021 +0100 ntdll: Reserve space for all registers in x86_64 syscall frame. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_x86_64.c | 47 ++++++++++++++++++++++++++++------------- tools/winebuild/import.c | 32 ++++++++++++++-------------- 2 files changed, 48 insertions(+), 31 deletions(-) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 5da1a467b71..824cfb4febe 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -275,20 +275,37 @@ C_ASSERT( sizeof(struct syscall_xsave) == 0x200 ); struct syscall_frame { - ULONG64 r12; - ULONG64 r13; - ULONG64 r14; - ULONG64 r15; - ULONG64 rdi; - ULONG64 rsi; - ULONG64 rbx; - ULONG64 rbp; + ULONG64 rax; /* 0000 */ + ULONG64 rbx; /* 0008 */ + ULONG64 rcx; /* 0010 */ + ULONG64 rdx; /* 0018 */ + ULONG64 rsi; /* 0020 */ + ULONG64 rdi; /* 0028 */ + ULONG64 r8; /* 0030 */ + ULONG64 r9; /* 0038 */ + ULONG64 r10; /* 0040 */ + ULONG64 r11; /* 0048 */ + ULONG64 r12; /* 0050 */ + ULONG64 r13; /* 0058 */ + ULONG64 r14; /* 0060 */ + ULONG64 r15; /* 0068 */ + ULONG64 rip; /* 0070 */ + WORD cs; /* 0078 */ + WORD ds; /* 007a */ + WORD es; /* 007c */ + WORD fs; /* 007e */ + ULONG64 eflags; /* 0080 */ + ULONG64 rsp; /* 0088 */ + WORD ss; /* 0090 */ + WORD gs; /* 0092 */ + WORD pad[2]; /* 0094 */ + ULONG64 rbp; /* 0098 */ ULONG64 thunk_addr; ULONG64 ret_addr; }; /* Should match the offset in call_user_apc_dispatcher(). */ -C_ASSERT( offsetof( struct syscall_frame, ret_addr ) == 0x48); +C_ASSERT( offsetof( struct syscall_frame, ret_addr ) == 0xa8); struct amd64_thread_data { @@ -2087,7 +2104,7 @@ __ASM_GLOBAL_FUNC( call_user_apc_dispatcher, "movq 0x98(%rcx),%rdx\n\t" /* context->Rsp */ "jmp 2f\n\t" "1:\tmovq 0x328(%rbx),%rax\n\t" /* amd64_thread_data()->syscall_frame */ - "leaq 0x48(%rax),%rdx\n\t" /* &amd64_thread_data()->syscall_frame->ret_addr */ + "leaq 0xa8(%rax),%rdx\n\t" /* &amd64_thread_data()->syscall_frame->ret_addr */ "2:\tsubq $0x510,%rdx\n\t" /* sizeof(struct apc_stack_layout) */ "andq $~0xf,%rdx\n\t" "addq $8,%rsp\n\t" /* pop return address */ @@ -2135,12 +2152,12 @@ __ASM_GLOBAL_FUNC( call_raise_user_exception_dispatcher, "leaq -0x200(%rax),%r8\n\t" "andq $~63,%r8\n\t" "fxrstor64 (%r8)\n\t" - "movq 0x20(%rax),%rdi\n\t" /* frame->rdi */ - "movq 0x28(%rax),%rsi\n\t" /* frame->rsi */ - "movq 0x30(%rax),%rbx\n\t" /* frame->rbx */ - "movq 0x38(%rax),%rbp\n\t" /* frame->rbp */ + "movq 0x8(%rax),%rbx\n\t" /* frame->rbx */ + "movq 0x20(%rax),%rsi\n\t" /* frame->rsi */ + "movq 0x28(%rax),%rdi\n\t" /* frame->rdi */ + "movq 0x98(%rax),%rbp\n\t" /* frame->rbp */ "movq $0,0x328(%rdx)\n\t" - "leaq 0x48(%rax),%rsp\n\t" + "leaq 0xa8(%rax),%rsp\n\t" "jmpq *%rcx" ) diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index cddc5a2251f..c70470251a4 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -1508,24 +1508,24 @@ void output_syscalls( DLLSPEC *spec ) output_cfi( ".cfi_rel_offset %%rbp,0" ); output( "\tmovq %%rsp,%%rbp\n" ); output_cfi( ".cfi_def_cfa_register %%rbp" ); - output( "\tleaq -0x238(%%rbp),%%rsp\n" ); + output( "\tleaq -0x2a8(%%rbp),%%rsp\n" ); output( "\tandq $~63,%%rsp\n" ); - output( "\tmovq %%gs:0x30,%%rcx\n" ); - output( "\tmovq %%r12,-0x38(%%rbp)\n" ); - output( "\tmovq %%r13,-0x30(%%rbp)\n" ); - output( "\tmovq %%r14,-0x28(%%rbp)\n" ); - output( "\tmovq %%r15,-0x20(%%rbp)\n" ); - output( "\tmovq %%rdi,-0x18(%%rbp)\n" ); - output_cfi( ".cfi_rel_offset %%rdi,-24" ); - output( "\tmovq %%rsi,-0x10(%%rbp)\n" ); - output_cfi( ".cfi_rel_offset %%rsi,-16" ); - output( "\tmovq %%rbx,-0x08(%%rbp)\n" ); - output_cfi( ".cfi_rel_offset %%rbx,-8" ); + output( "\tmovq %%rbx,-0x90(%%rbp)\n" ); + output_cfi( ".cfi_rel_offset %%rbx,-144" ); + output( "\tmovq %%rsi,-0x78(%%rbp)\n" ); + output_cfi( ".cfi_rel_offset %%rsi,-120" ); + output( "\tmovq %%rdi,-0x70(%%rbp)\n" ); + output_cfi( ".cfi_rel_offset %%rdi,-112" ); + output( "\tmovq %%r12,-0x48(%%rbp)\n" ); + output( "\tmovq %%r13,-0x40(%%rbp)\n" ); + output( "\tmovq %%r14,-0x38(%%rbp)\n" ); + output( "\tmovq %%r15,-0x30(%%rbp)\n" ); output( "\tfxsave64 (%%rsp)\n" ); /* Legends of Runeterra hooks the first system call return instruction, and * depends on us returning to it. Adjust the return address accordingly. */ output( "\tsubq $0xb,0x8(%%rbp)\n" ); - output( "\tleaq -0x38(%%rbp),%%rbx\n" ); + output( "\tmovq %%gs:0x30,%%rcx\n" ); + output( "\tleaq -0x98(%%rbp),%%rbx\n" ); output( "\tmovq %%rbx,0x328(%%rcx)\n" ); /* amd64_thread_data()->syscall_frame */ output( "\tcmpq $%u,%%rax\n", count ); output( "\tjae 3f\n" ); @@ -1546,11 +1546,11 @@ void output_syscalls( DLLSPEC *spec ) output( "\tcallq *(%%r10,%%rax,8)\n" ); output( "2:\tmovq %%gs:0x30,%%rcx\n" ); output( "\tmovq $0,0x328(%%rcx)\n" ); - output( "\tmovq -0x18(%%rbp),%%rdi\n" ); + output( "\tmovq -0x70(%%rbp),%%rdi\n" ); output_cfi( ".cfi_same_value %%rdi" ); - output( "\tmovq -0x10(%%rbp),%%rsi\n" ); + output( "\tmovq -0x78(%%rbp),%%rsi\n" ); output_cfi( ".cfi_same_value %%rsi" ); - output( "\tmovq -0x8(%%rbp),%%rbx\n" ); + output( "\tmovq -0x90(%%rbp),%%rbx\n" ); output_cfi( ".cfi_same_value %%rbx" ); output_cfi( ".cfi_def_cfa_register %%rsp" ); output( "\tleave\n" );

1 0

Jacek Caban : winebuild: Remove no longer needed stack alignment in x86_64 syscall dispatcher.
by Alexandre Julliard 17 Feb '21

17 Feb '21

Module: wine Branch: master Commit: 877f06d123354827640109dd25185eb8d3f608be URL: https://source.winehq.org/git/wine.git/?a=commit;h=877f06d123354827640109dd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 15 21:57:48 2021 +0100 winebuild: Remove no longer needed stack alignment in x86_64 syscall dispatcher. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/import.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index fda1fe90541..cddc5a2251f 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -1528,25 +1528,23 @@ void output_syscalls( DLLSPEC *spec ) output( "\tleaq -0x38(%%rbp),%%rbx\n" ); output( "\tmovq %%rbx,0x328(%%rcx)\n" ); /* amd64_thread_data()->syscall_frame */ output( "\tcmpq $%u,%%rax\n", count ); - output( "\tjae 4f\n" ); + output( "\tjae 3f\n" ); output( "\tleaq .Lsyscall_args(%%rip),%%rcx\n" ); output( "\tmovzbl (%%rcx,%%rax),%%ecx\n" ); output( "\tsubq $0x20,%%rcx\n" ); - output( "\tja 1f\n" ); - output( "\tandq $~15,%%rsp\n\t" ); - output( "\tjmp 2f\n" ); - output( "1:\tsubq %%rcx,%%rsp\n" ); + output( "\tjbe 1f\n" ); + output( "\tsubq %%rcx,%%rsp\n" ); output( "\tshrq $3,%%rcx\n" ); output( "\tleaq 0x38(%%rbp),%%rsi\n" ); output( "\tandq $~15,%%rsp\n\t" ); output( "\tmovq %%rsp,%%rdi\n" ); output( "\tcld\n" ); output( "\trep; movsq\n" ); - output( "2:\tmovq %%r10,%%rcx\n" ); + output( "1:\tmovq %%r10,%%rcx\n" ); output( "\tsubq $0x20,%%rsp\n" ); output( "\tleaq .Lsyscall_table(%%rip),%%r10\n" ); output( "\tcallq *(%%r10,%%rax,8)\n" ); - output( "3:\tmovq %%gs:0x30,%%rcx\n" ); + output( "2:\tmovq %%gs:0x30,%%rcx\n" ); output( "\tmovq $0,0x328(%%rcx)\n" ); output( "\tmovq -0x18(%%rbp),%%rdi\n" ); output_cfi( ".cfi_same_value %%rdi" ); @@ -1559,8 +1557,8 @@ void output_syscalls( DLLSPEC *spec ) output_cfi( ".cfi_adjust_cfa_offset -8" ); output_cfi( ".cfi_same_value %%rbp" ); output( "\tret\n" ); - output( "4:\tmovl $0x%x,%%eax\n", invalid_param ); - output( "\tjmp 3b\n" ); + output( "3:\tmovl $0x%x,%%eax\n", invalid_param ); + output( "\tjmp 2b\n" ); break; case CPU_ARM: output( "\tpush {r5-r11,lr}\n" );

1 0

Jacek Caban : ntdll: Store entire XMM context in x86_64 syscall frame.
by Alexandre Julliard 17 Feb '21

17 Feb '21

Module: wine Branch: master Commit: 8f50dde9cd3f4ea7856106f5b1691827d4cf8713 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8f50dde9cd3f4ea7856106f5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 15 21:57:42 2021 +0100 ntdll: Store entire XMM context in x86_64 syscall frame. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_x86_64.c | 58 ++++++++++++++++++----------------------- tools/winebuild/import.c | 18 ++++--------- 2 files changed, 30 insertions(+), 46 deletions(-) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 12e40853397..5da1a467b71 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -266,10 +266,15 @@ struct apc_stack_layout C_ASSERT( offsetof(struct apc_stack_layout, context) == 0x30 ); C_ASSERT( sizeof(struct apc_stack_layout) == 0x510 ); +struct syscall_xsave +{ + XMM_SAVE_AREA32 xsave; +}; + +C_ASSERT( sizeof(struct syscall_xsave) == 0x200 ); + struct syscall_frame { - ULONG64 xmm[10 * 2]; /* xmm6-xmm15 */ - ULONG64 mxcsr; ULONG64 r12; ULONG64 r13; ULONG64 r14; @@ -283,7 +288,7 @@ struct syscall_frame }; /* Should match the offset in call_user_apc_dispatcher(). */ -C_ASSERT( offsetof( struct syscall_frame, ret_addr ) == 0xf0); +C_ASSERT( offsetof( struct syscall_frame, ret_addr ) == 0x48); struct amd64_thread_data { @@ -316,6 +321,11 @@ void set_syscall_frame(void *frame) amd64_thread_data()->syscall_frame = frame; } +static struct syscall_xsave *get_syscall_xsave( struct syscall_frame *frame ) +{ + return (struct syscall_xsave *)((ULONG_PTR)((struct syscall_xsave *)frame - 1) & ~63); +} + /*********************************************************************** * Definitions for Dwarf unwind tables */ @@ -1935,10 +1945,8 @@ NTSTATUS WINAPI NtGetContextThread( HANDLE handle, CONTEXT *context ) } if (needed_flags & CONTEXT_FLOATING_POINT) { - __asm__( "fxsave %0" : "=m" (context->u.FltSave) ); - context->MxCsr = frame->mxcsr; - memset( &context->u.s.Xmm0, 0, 6 * sizeof(context->u.s.Xmm0) ); - memcpy( &context->u.s.Xmm6, frame->xmm, 10 * sizeof(context->u.s.Xmm0) ); + context->u.FltSave = get_syscall_xsave(frame)->xsave; + context->MxCsr = context->u.FltSave.MxCsr; context->ContextFlags |= CONTEXT_FLOATING_POINT; } /* update the cached version of the debug registers */ @@ -2079,7 +2087,7 @@ __ASM_GLOBAL_FUNC( call_user_apc_dispatcher, "movq 0x98(%rcx),%rdx\n\t" /* context->Rsp */ "jmp 2f\n\t" "1:\tmovq 0x328(%rbx),%rax\n\t" /* amd64_thread_data()->syscall_frame */ - "leaq 0xf0(%rax),%rdx\n\t" /* &amd64_thread_data()->syscall_frame->ret_addr */ + "leaq 0x48(%rax),%rdx\n\t" /* &amd64_thread_data()->syscall_frame->ret_addr */ "2:\tsubq $0x510,%rdx\n\t" /* sizeof(struct apc_stack_layout) */ "andq $~0xf,%rdx\n\t" "addq $8,%rsp\n\t" /* pop return address */ @@ -2124,27 +2132,15 @@ __ASM_GLOBAL_FUNC( call_user_apc_dispatcher, __ASM_GLOBAL_FUNC( call_raise_user_exception_dispatcher, "movq %gs:0x30,%rdx\n\t" "movq 0x328(%rdx),%rax\n\t" /* amd64_thread_data()->syscall_frame */ - "movdqu 0x0(%rax),%xmm6\n\t" /* frame->xmm[0..19] */ - "movdqu 0x10(%rax),%xmm7\n\t" - "movdqu 0x20(%rax),%xmm8\n\t" - "movdqu 0x30(%rax),%xmm9\n\t" - "movdqu 0x40(%rax),%xmm10\n\t" - "movdqu 0x50(%rax),%xmm11\n\t" - "movdqu 0x60(%rax),%xmm12\n\t" - "movdqu 0x70(%rax),%xmm13\n\t" - "movdqu 0x80(%rax),%xmm14\n\t" - "movdqu 0x90(%rax),%xmm15\n\t" - "ldmxcsr 0xa0(%rax)\n\t" /* frame->mxcsr */ - "movq 0xa8(%rax),%r12\n\t" /* frame->r12 */ - "movq 0xb0(%rax),%r13\n\t" /* frame->r13 */ - "movq 0xb8(%rax),%r14\n\t" /* frame->r14 */ - "movq 0xc0(%rax),%r15\n\t" /* frame->r15 */ - "movq 0xc8(%rax),%rdi\n\t" /* frame->rdi */ - "movq 0xd0(%rax),%rsi\n\t" /* frame->rsi */ - "movq 0xd8(%rax),%rbx\n\t" /* frame->rbx */ - "movq 0xe0(%rax),%rbp\n\t" /* frame->rbp */ + "leaq -0x200(%rax),%r8\n\t" + "andq $~63,%r8\n\t" + "fxrstor64 (%r8)\n\t" + "movq 0x20(%rax),%rdi\n\t" /* frame->rdi */ + "movq 0x28(%rax),%rsi\n\t" /* frame->rsi */ + "movq 0x30(%rax),%rbx\n\t" /* frame->rbx */ + "movq 0x38(%rax),%rbp\n\t" /* frame->rbp */ "movq $0,0x328(%rdx)\n\t" - "leaq 0xf0(%rax),%rsp\n\t" + "leaq 0x48(%rax),%rsp\n\t" "jmpq *%rcx" ) @@ -2398,11 +2394,7 @@ static BOOL handle_syscall_fault( ucontext_t *sigcontext, EXCEPTION_RECORD *rec, R15_sig(sigcontext) = frame->r15; RSP_sig(sigcontext) = (ULONG_PTR)&frame->ret_addr; RIP_sig(sigcontext) = frame->thunk_addr; - if (fpu) - { - fpu->MxCsr =frame->mxcsr; - memcpy( fpu->XmmRegisters + 6, frame->xmm, sizeof(frame->xmm) ); - } + if (fpu) *fpu = get_syscall_xsave( frame )->xsave; amd64_thread_data()->syscall_frame = NULL; } return TRUE; diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index bc2d8497a47..fda1fe90541 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -1508,19 +1508,9 @@ void output_syscalls( DLLSPEC *spec ) output_cfi( ".cfi_rel_offset %%rbp,0" ); output( "\tmovq %%rsp,%%rbp\n" ); output_cfi( ".cfi_def_cfa_register %%rbp" ); - output( "\tleaq -0xe0(%%rbp),%%rsp\n" ); + output( "\tleaq -0x238(%%rbp),%%rsp\n" ); + output( "\tandq $~63,%%rsp\n" ); output( "\tmovq %%gs:0x30,%%rcx\n" ); - output( "\tmovdqu %%xmm6,-0xe0(%%rbp)\n" ); - output( "\tmovdqu %%xmm7,-0xd0(%%rbp)\n" ); - output( "\tmovdqu %%xmm8,-0xc0(%%rbp)\n" ); - output( "\tmovdqu %%xmm9,-0xb0(%%rbp)\n" ); - output( "\tmovdqu %%xmm10,-0xa0(%%rbp)\n" ); - output( "\tmovdqu %%xmm11,-0x90(%%rbp)\n" ); - output( "\tmovdqu %%xmm12,-0x80(%%rbp)\n" ); - output( "\tmovdqu %%xmm13,-0x70(%%rbp)\n" ); - output( "\tmovdqu %%xmm14,-0x60(%%rbp)\n" ); - output( "\tmovdqu %%xmm15,-0x50(%%rbp)\n" ); - output( "\tstmxcsr -0x40(%%rbp)\n" ); output( "\tmovq %%r12,-0x38(%%rbp)\n" ); output( "\tmovq %%r13,-0x30(%%rbp)\n" ); output( "\tmovq %%r14,-0x28(%%rbp)\n" ); @@ -1531,10 +1521,12 @@ void output_syscalls( DLLSPEC *spec ) output_cfi( ".cfi_rel_offset %%rsi,-16" ); output( "\tmovq %%rbx,-0x08(%%rbp)\n" ); output_cfi( ".cfi_rel_offset %%rbx,-8" ); + output( "\tfxsave64 (%%rsp)\n" ); /* Legends of Runeterra hooks the first system call return instruction, and * depends on us returning to it. Adjust the return address accordingly. */ output( "\tsubq $0xb,0x8(%%rbp)\n" ); - output( "\tmovq %%rsp,0x328(%%rcx)\n" ); /* amd64_thread_data()->syscall_frame */ + output( "\tleaq -0x38(%%rbp),%%rbx\n" ); + output( "\tmovq %%rbx,0x328(%%rcx)\n" ); /* amd64_thread_data()->syscall_frame */ output( "\tcmpq $%u,%%rax\n", count ); output( "\tjae 4f\n" ); output( "\tleaq .Lsyscall_args(%%rip),%%rcx\n" );

1 0

Erich E. Hoover : kernelbase: Reimplement GetVolumeInformation on top of GetVolumeInformationByHandle.
by Alexandre Julliard 17 Feb '21

17 Feb '21

Module: wine Branch: master Commit: 50903a15046354e405564aff6430ee505c01100a URL: https://source.winehq.org/git/wine.git/?a=commit;h=50903a15046354e405564aff… Author: Erich E. Hoover <erich.e.hoover(a)gmail.com> Date: Fri May 15 22:07:10 2020 -0600 kernelbase: Reimplement GetVolumeInformation on top of GetVolumeInformationByHandle. Signed-off-by: Erich E. Hoover <erich.e.hoover(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/volume.c | 39 +++ dlls/kernelbase/volume.c | 584 +------------------------------------------ 2 files changed, 45 insertions(+), 578 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=50903a15046354e40556…

1 0

Zebediah Figura : winegstreamer: Retrieve and complete read requests through Unix library functions.
by Alexandre Julliard 17 Feb '21

17 Feb '21

Module: wine Branch: master Commit: 86333a20c87d35825da30f9208777f3b556ee7fa URL: https://source.winehq.org/git/wine.git/?a=commit;h=86333a20c87d35825da30f92… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Feb 16 19:28:31 2021 -0600 winegstreamer: Retrieve and complete read requests through Unix library functions. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gst_private.h | 4 ++++ dlls/winegstreamer/gstdemux.c | 21 +++++++-------------- dlls/winegstreamer/wg_parser.c | 35 +++++++++++++++++++++++++++++++++++ 3 files changed, 46 insertions(+), 14 deletions(-) diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index 068cb47adc2..33c87f2c1ec 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -226,6 +226,10 @@ struct unix_funcs void (CDECL *wg_parser_begin_flush)(struct wg_parser *parser); void (CDECL *wg_parser_end_flush)(struct wg_parser *parser); + bool (CDECL *wg_parser_get_read_request)(struct wg_parser *parser, + GstBuffer **buffer, uint64_t *offset, uint32_t *size); + void (CDECL *wg_parser_complete_read_request)(struct wg_parser *parser, GstFlowReturn ret); + uint32_t (CDECL *wg_parser_get_stream_count)(struct wg_parser *parser); struct wg_parser_stream *(CDECL *wg_parser_get_stream)(struct wg_parser *parser, uint32_t index); diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 2a7383111b1..4e476c78e9e 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -822,29 +822,22 @@ static GstFlowReturn read_buffer(struct parser *This, guint64 ofs, guint len, Gs static DWORD CALLBACK read_thread(void *arg) { struct parser *filter = arg; - struct wg_parser *parser = filter->wg_parser; TRACE("Starting read thread for filter %p.\n", filter); - pthread_mutex_lock(&parser->mutex); - while (filter->sink_connected) { - while (parser->sink_connected && !parser->read_request.buffer) - pthread_cond_wait(&parser->read_cond, &parser->mutex); + GstBuffer *buffer; + uint64_t offset; + uint32_t size; - if (!parser->sink_connected) - break; + if (!unix_funcs->wg_parser_get_read_request(filter->wg_parser, &buffer, &offset, &size)) + continue; - parser->read_request.done = true; - parser->read_request.ret = read_buffer(filter, parser->read_request.offset, - parser->read_request.size, parser->read_request.buffer); - parser->read_request.buffer = NULL; - pthread_cond_signal(&parser->read_done_cond); + unix_funcs->wg_parser_complete_read_request(filter->wg_parser, + read_buffer(filter, offset, size, buffer)); } - pthread_mutex_unlock(&parser->mutex); - TRACE("Streaming stopped; exiting.\n"); return 0; } diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index de066f83881..96c6fc1e715 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -349,6 +349,38 @@ static void CDECL wg_parser_end_flush(struct wg_parser *parser) pthread_mutex_unlock(&parser->mutex); } +static bool CDECL wg_parser_get_read_request(struct wg_parser *parser, + GstBuffer **buffer, uint64_t *offset, uint32_t *size) +{ + pthread_mutex_lock(&parser->mutex); + + while (parser->sink_connected && !parser->read_request.buffer) + pthread_cond_wait(&parser->read_cond, &parser->mutex); + + if (!parser->sink_connected) + { + pthread_mutex_unlock(&parser->mutex); + return false; + } + + *buffer = parser->read_request.buffer; + *offset = parser->read_request.offset; + *size = parser->read_request.size; + + pthread_mutex_unlock(&parser->mutex); + return true; +} + +static void CDECL wg_parser_complete_read_request(struct wg_parser *parser, GstFlowReturn ret) +{ + pthread_mutex_lock(&parser->mutex); + parser->read_request.done = true; + parser->read_request.ret = ret; + parser->read_request.buffer = NULL; + pthread_mutex_unlock(&parser->mutex); + pthread_cond_signal(&parser->read_done_cond); +} + static void CDECL wg_parser_stream_get_preferred_format(struct wg_parser_stream *stream, struct wg_format *format) { *format = stream->preferred_format; @@ -1663,6 +1695,9 @@ static const struct unix_funcs funcs = wg_parser_begin_flush, wg_parser_end_flush, + wg_parser_get_read_request, + wg_parser_complete_read_request, + wg_parser_get_stream_count, wg_parser_get_stream,

1 0

Zebediah Figura : winegstreamer: Avoid using gst_util_uint64_scale() in send_sample().
by Alexandre Julliard 17 Feb '21

17 Feb '21

Module: wine Branch: master Commit: 1babfe7d49175260b1aeee8c3607f1e63e7a1e1f URL: https://source.winehq.org/git/wine.git/?a=commit;h=1babfe7d49175260b1aeee8c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Feb 16 19:28:30 2021 -0600 winegstreamer: Avoid using gst_util_uint64_scale() in send_sample(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 51 +++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 49 insertions(+), 2 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index c256d963273..2a7383111b1 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -566,6 +566,53 @@ static bool amt_to_wg_format(const AM_MEDIA_TYPE *mt, struct wg_format *format) return false; } +/* + * scale_uint64() is based on gst_util_scale_int() from GStreamer, which is + * covered by the following license: + * + * GStreamer + * Copyright (C) 1999,2000 Erik Walthinsen <omega(a)cse.ogi.edu> + * 2000 Wim Taymans <wtay(a)chello.be> + * 2002 Thomas Vander Stichele <thomas(a)apestaart.org> + * 2004 Wim Taymans <wim(a)fluendo.com> + * 2015 Jan Schmidt <jan(a)centricular.com> + * + * gstutils.c: Utility functions + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, + * Boston, MA 02110-1301, USA. + */ +static uint64_t scale_uint64(uint64_t value, uint32_t numerator, uint32_t denominator) +{ + ULARGE_INTEGER i, high, low; + + if (!value) + return 0; + + i.QuadPart = value; + low.QuadPart = i.u.LowPart * numerator; + high.QuadPart = i.u.HighPart * numerator + low.u.HighPart; + low.u.HighPart = 0; + + if (high.u.HighPart >= denominator) + return ULLONG_MAX; + + low.QuadPart += (high.QuadPart % denominator) << 32; + return ((high.QuadPart / denominator) << 32) + (low.QuadPart / denominator); +} + /* Fill and send a single IMediaSample. */ static HRESULT send_sample(struct parser_source *pin, IMediaSample *sample, const struct wg_parser_event *event, uint32_t offset, uint32_t size, DWORD bytes_per_second) @@ -594,7 +641,7 @@ static HRESULT send_sample(struct parser_source *pin, IMediaSample *sample, REFERENCE_TIME start_pts = event->u.buffer.pts; if (offset) - start_pts += gst_util_uint64_scale(offset, 10000000, bytes_per_second); + start_pts += scale_uint64(offset, 10000000, bytes_per_second); start_pts -= pin->seek.llCurrent; start_pts *= pin->seek.dRate; @@ -603,7 +650,7 @@ static HRESULT send_sample(struct parser_source *pin, IMediaSample *sample, REFERENCE_TIME end_pts = event->u.buffer.pts + event->u.buffer.duration; if (offset + size < event->u.buffer.size) - end_pts = event->u.buffer.pts + gst_util_uint64_scale(offset + size, 10000000, bytes_per_second); + end_pts = event->u.buffer.pts + scale_uint64(offset + size, 10000000, bytes_per_second); end_pts -= pin->seek.llCurrent; end_pts *= pin->seek.dRate;

1 0

Zebediah Figura : winegstreamer: Map the output sample buffer in the Unix library.
by Alexandre Julliard 17 Feb '21

17 Feb '21

Module: wine Branch: master Commit: e848a00d26c6c4c4fdfe47cac93e3d3736e6137a URL: https://source.winehq.org/git/wine.git/?a=commit;h=e848a00d26c6c4c4fdfe47ca… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Feb 16 19:28:29 2021 -0600 winegstreamer: Map the output sample buffer in the Unix library. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gst_private.h | 13 +++++- dlls/winegstreamer/gstdemux.c | 89 ++++++++++++++++++++----------------- dlls/winegstreamer/wg_parser.c | 94 ++++++++++++++++++++++++++++++++-------- 3 files changed, 138 insertions(+), 58 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e848a00d26c6c4c4fdfe…

1 0

Zebediah Figura : winegstreamer: Use wg_parser_stream_seek() in GST_ChangeRate().
by Alexandre Julliard 17 Feb '21

17 Feb '21

Module: wine Branch: master Commit: e103c75ab3d1f6b3a21908003b011f03e1b4862e URL: https://source.winehq.org/git/wine.git/?a=commit;h=e103c75ab3d1f6b3a2190800… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Feb 16 19:28:28 2021 -0600 winegstreamer: Use wg_parser_stream_seek() in GST_ChangeRate(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index f4573c75f86..cc55b4fa60a 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1178,12 +1178,11 @@ static HRESULT WINAPI GST_ChangeStop(IMediaSeeking *iface) static HRESULT WINAPI GST_ChangeRate(IMediaSeeking *iface) { - struct parser_source *This = impl_from_IMediaSeeking(iface); - struct wg_parser_stream *stream = This->wg_stream; - GstEvent *ev = gst_event_new_seek(This->seek.dRate, GST_FORMAT_TIME, 0, GST_SEEK_TYPE_NONE, -1, GST_SEEK_TYPE_NONE, -1); - TRACE("(%p) New rate %g\n", This, This->seek.dRate); + struct parser_source *pin = impl_from_IMediaSeeking(iface); + mark_wine_thread(); - gst_pad_push_event(stream->my_sink, ev); + unix_funcs->wg_parser_stream_seek(pin->wg_stream, pin->seek.dRate, 0, 0, + AM_SEEKING_NoPositioning, AM_SEEKING_NoPositioning); return S_OK; }

1 0

Zebediah Figura : winegstreamer: Move videoflip configuration to wg_parser_stream_set_current_format().
by Alexandre Julliard 17 Feb '21

17 Feb '21

Module: wine Branch: master Commit: 5167b8c39af12d14b14f6dcab14cc97d82a1a4c8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5167b8c39af12d14b14f6dca… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Feb 16 19:28:27 2021 -0600 winegstreamer: Move videoflip configuration to wg_parser_stream_set_current_format(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 5 ----- dlls/winegstreamer/wg_parser.c | 27 +++++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 5 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 1af34441984..f4573c75f86 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1430,7 +1430,6 @@ static HRESULT WINAPI GSTOutPin_DecideBufferSize(struct strmbase_source *iface, IMemAllocator *allocator, ALLOCATOR_PROPERTIES *props) { struct parser_source *pin = impl_source_from_IPin(&iface->pin.IPin_iface); - struct wg_parser_stream *stream = pin->wg_stream; unsigned int buffer_size = 16384; ALLOCATOR_PROPERTIES ret_props; struct wg_format format; @@ -1440,10 +1439,6 @@ static HRESULT WINAPI GSTOutPin_DecideBufferSize(struct strmbase_source *iface, { VIDEOINFOHEADER *format = (VIDEOINFOHEADER *)pin->pin.pin.mt.pbFormat; buffer_size = format->bmiHeader.biSizeImage; - - gst_util_set_object_arg(G_OBJECT(stream->flip), "method", - (format->bmiHeader.biCompression == BI_RGB - || format->bmiHeader.biCompression == BI_BITFIELDS) ? "vertical-flip" : "none"); } else if (IsEqualGUID(&pin->pin.pin.mt.formattype, &FORMAT_WaveFormatEx) && (IsEqualGUID(&pin->pin.pin.mt.subtype, &MEDIASUBTYPE_PCM) diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index 0738df150b2..8437dc1897d 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -358,6 +358,33 @@ static void CDECL wg_parser_stream_enable(struct wg_parser_stream *stream, const { stream->current_format = *format; stream->enabled = true; + + if (format->major_type == WG_MAJOR_TYPE_VIDEO) + { + switch (format->u.video.format) + { + case WG_VIDEO_FORMAT_BGRA: + case WG_VIDEO_FORMAT_BGRx: + case WG_VIDEO_FORMAT_BGR: + case WG_VIDEO_FORMAT_RGB15: + case WG_VIDEO_FORMAT_RGB16: + gst_util_set_object_arg(G_OBJECT(stream->flip), "method", "vertical-flip"); + break; + + case WG_VIDEO_FORMAT_AYUV: + case WG_VIDEO_FORMAT_I420: + case WG_VIDEO_FORMAT_NV12: + case WG_VIDEO_FORMAT_UYVY: + case WG_VIDEO_FORMAT_YUY2: + case WG_VIDEO_FORMAT_YV12: + case WG_VIDEO_FORMAT_YVYU: + case WG_VIDEO_FORMAT_UNKNOWN: + case WG_VIDEO_FORMAT_CINEPAK: + gst_util_set_object_arg(G_OBJECT(stream->flip), "method", "none"); + break; + } + } + gst_pad_push_event(stream->my_sink, gst_event_new_reconfigure()); }

1 0

← Newer
1
...
40
41
42
43
44
45
46
...
92
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2021