June 2021 - Wine-commits - list.winehq.org

Zebediah Figura : configure: Always warn on missing GStreamer if --with-gstreamer was specified.
by Alexandre Julliard 07 Jun '21

07 Jun '21

Module: wine Branch: master Commit: 9c87cdc533dd0d487088277cad1083c97d8c0fd7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9c87cdc533dd0d487088277c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jun 4 17:46:32 2021 -0500 configure: Always warn on missing GStreamer if --with-gstreamer was specified. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 5 ++++- configure.ac | 7 +++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/configure b/configure index e88a03a732a..96ab87e2fbc 100755 --- a/configure +++ b/configure @@ -14708,7 +14708,9 @@ fi CPPFLAGS=$ac_save_CPPFLAGS fi -if test "x$ac_glib2_broken" != xyes -a "x$ac_cv_lib_gstreamer_1_0_gst_pad_new" != xyes -a "x$ac_cv_header_QuickTime_ImageCompression_h" != xyes ; then : +if test "x$with_gstreamer" = xyes -o "x$ac_cv_header_QuickTime_ImageCompression_h" != xyes +then + if test "x$ac_glib2_broken" != xyes -a "x$ac_cv_lib_gstreamer_1_0_gst_pad_new" != xyes; then : case "x$with_gstreamer" in x) as_fn_append wine_notices "|gstreamer-1.0 base plugins ${notice_platform}development files not found, GStreamer won't be supported." ;; xno) ;; @@ -14716,6 +14718,7 @@ if test "x$ac_glib2_broken" != xyes -a "x$ac_cv_lib_gstreamer_1_0_gst_pad_new" ! This is an error since --with-gstreamer was requested." "$LINENO" 5 ;; esac +fi fi test "x$ac_cv_lib_gstreamer_1_0_gst_pad_new" = xyes || enable_winegstreamer=${enable_winegstreamer:-no} diff --git a/configure.ac b/configure.ac index afb4dc7432a..6c7b22b3827 100644 --- a/configure.ac +++ b/configure.ac @@ -1622,8 +1622,11 @@ then ac_glib2_broken=yes WINE_NOTICE([glib-2.0 pkgconfig configuration is for the wrong architecture, winegstreamer won't be built.])])])]) fi -WINE_NOTICE_WITH(gstreamer,[test "x$ac_glib2_broken" != xyes -a "x$ac_cv_lib_gstreamer_1_0_gst_pad_new" != xyes -a "x$ac_cv_header_QuickTime_ImageCompression_h" != xyes ], - [gstreamer-1.0 base plugins ${notice_platform}development files not found, GStreamer won't be supported.]) +if test "x$with_gstreamer" = xyes -o "x$ac_cv_header_QuickTime_ImageCompression_h" != xyes +then + WINE_NOTICE_WITH(gstreamer,[test "x$ac_glib2_broken" != xyes -a "x$ac_cv_lib_gstreamer_1_0_gst_pad_new" != xyes], + [gstreamer-1.0 base plugins ${notice_platform}development files not found, GStreamer won't be supported.]) +fi test "x$ac_cv_lib_gstreamer_1_0_gst_pad_new" = xyes || enable_winegstreamer=${enable_winegstreamer:-no} dnl **** Check for ALSA 1.x ****

1 0

Zebediah Figura : configure: Also warn on missing GStreamer if --without-quicktime was specified.
by Alexandre Julliard 07 Jun '21

07 Jun '21

Module: wine Branch: master Commit: a1d029c9e16a87a9a3fd1c06bcca5603f73d0c0c URL: https://source.winehq.org/git/wine.git/?a=commit;h=a1d029c9e16a87a9a3fd1c06… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jun 4 17:46:33 2021 -0500 configure: Also warn on missing GStreamer if --without-quicktime was specified. Based on a patch by Gijs Vermeulen. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 96ab87e2fbc..9acc579ca11 100755 --- a/configure +++ b/configure @@ -14708,7 +14708,7 @@ fi CPPFLAGS=$ac_save_CPPFLAGS fi -if test "x$with_gstreamer" = xyes -o "x$ac_cv_header_QuickTime_ImageCompression_h" != xyes +if test "x$with_gstreamer" = xyes -o "x$with_quicktime" = xno -o "x$ac_cv_header_QuickTime_ImageCompression_h" != xyes then if test "x$ac_glib2_broken" != xyes -a "x$ac_cv_lib_gstreamer_1_0_gst_pad_new" != xyes; then : case "x$with_gstreamer" in diff --git a/configure.ac b/configure.ac index 6c7b22b3827..bf7efa0690c 100644 --- a/configure.ac +++ b/configure.ac @@ -1622,7 +1622,7 @@ then ac_glib2_broken=yes WINE_NOTICE([glib-2.0 pkgconfig configuration is for the wrong architecture, winegstreamer won't be built.])])])]) fi -if test "x$with_gstreamer" = xyes -o "x$ac_cv_header_QuickTime_ImageCompression_h" != xyes +if test "x$with_gstreamer" = xyes -o "x$with_quicktime" = xno -o "x$ac_cv_header_QuickTime_ImageCompression_h" != xyes then WINE_NOTICE_WITH(gstreamer,[test "x$ac_glib2_broken" != xyes -a "x$ac_cv_lib_gstreamer_1_0_gst_pad_new" != xyes], [gstreamer-1.0 base plugins ${notice_platform}development files not found, GStreamer won't be supported.])

1 0

Alexandre Julliard : ntdll: Validate the extended context before modifying the other registers.
by Alexandre Julliard 07 Jun '21

07 Jun '21

Module: wine Branch: master Commit: ba5d73d796e5ed5b3da857162eb8c9097c03807d URL: https://source.winehq.org/git/wine.git/?a=commit;h=ba5d73d796e5ed5b3da85716… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 7 13:16:24 2021 +0200 ntdll: Validate the extended context before modifying the other registers. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_i386.c | 27 ++++++++++++++++----------- dlls/ntdll/unix/signal_x86_64.c | 27 ++++++++++++++++----------- 2 files changed, 32 insertions(+), 22 deletions(-) diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index c3f8c01d350..b66a7bd8995 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -994,7 +994,19 @@ NTSTATUS WINAPI NtSetContextThread( HANDLE handle, const CONTEXT *context ) struct syscall_frame *frame = x86_thread_data()->syscall_frame; DWORD flags = context->ContextFlags & ~CONTEXT_i386; BOOL self = (handle == GetCurrentThread()); - XSTATE *xs; + + if ((flags & CONTEXT_XSTATE) && (cpu_info.ProcessorFeatureBits & CPU_FEATURE_AVX)) + { + CONTEXT_EX *context_ex = (CONTEXT_EX *)(context + 1); + XSTATE *xs = (XSTATE *)((char *)context_ex + context_ex->XState.Offset); + + if (context_ex->XState.Length < offsetof(XSTATE, YmmContext) || + context_ex->XState.Length > sizeof(XSTATE)) + return STATUS_INVALID_PARAMETER; + if ((xs->Mask & XSTATE_MASK_GSSE) && (context_ex->XState.Length < sizeof(XSTATE))) + return STATUS_BUFFER_OVERFLOW; + } + else flags &= ~CONTEXT_XSTATE; /* debug registers require a server call */ if (self && (flags & CONTEXT_DEBUG_REGISTERS)) @@ -1066,25 +1078,18 @@ NTSTATUS WINAPI NtSetContextThread( HANDLE handle, const CONTEXT *context ) } xsave->xstate.mask |= XSTATE_MASK_LEGACY_FLOATING_POINT; } - if ((cpu_info.ProcessorFeatureBits & CPU_FEATURE_AVX) && (xs = xstate_from_context( context ))) + if (flags & CONTEXT_XSTATE) { struct syscall_xsave *xsave = get_syscall_xsave( frame ); CONTEXT_EX *context_ex = (CONTEXT_EX *)(context + 1); - - if (context_ex->XState.Length < offsetof(XSTATE, YmmContext) - || context_ex->XState.Length > sizeof(XSTATE)) - return STATUS_INVALID_PARAMETER; + XSTATE *xs = (XSTATE *)((char *)context_ex + context_ex->XState.Offset); if (xs->Mask & XSTATE_MASK_GSSE) { - if (context_ex->XState.Length < sizeof(XSTATE)) - return STATUS_BUFFER_OVERFLOW; - xsave->xstate.mask |= XSTATE_MASK_GSSE; memcpy( &xsave->xstate.ymm_high, &xs->YmmContext, sizeof(xsave->xstate.ymm_high) ); } - else - xsave->xstate.mask &= ~XSTATE_MASK_GSSE; + else xsave->xstate.mask &= ~XSTATE_MASK_GSSE; } return STATUS_SUCCESS; diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 59c030ae6a4..086bfdfe066 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -1618,7 +1618,19 @@ NTSTATUS WINAPI NtSetContextThread( HANDLE handle, const CONTEXT *context ) BOOL self = (handle == GetCurrentThread()); struct syscall_frame *frame; struct syscall_xsave *xsave; - XSTATE *xs; + + if ((flags & CONTEXT_XSTATE) && (cpu_info.ProcessorFeatureBits & CPU_FEATURE_AVX)) + { + CONTEXT_EX *context_ex = (CONTEXT_EX *)(context + 1); + XSTATE *xs = (XSTATE *)((char *)context_ex + context_ex->XState.Offset); + + if (context_ex->XState.Length < offsetof(XSTATE, YmmContext) || + context_ex->XState.Length > sizeof(XSTATE)) + return STATUS_INVALID_PARAMETER; + if ((xs->Mask & XSTATE_MASK_GSSE) && (context_ex->XState.Length < sizeof(XSTATE))) + return STATUS_BUFFER_OVERFLOW; + } + else flags &= ~CONTEXT_XSTATE; /* debug registers require a server call */ if (self && (flags & CONTEXT_DEBUG_REGISTERS)) @@ -1684,24 +1696,17 @@ NTSTATUS WINAPI NtSetContextThread( HANDLE handle, const CONTEXT *context ) xsave->xsave = context->u.FltSave; xsave->xstate.Mask |= XSTATE_MASK_LEGACY; } - if ((cpu_info.ProcessorFeatureBits & CPU_FEATURE_AVX) && (xs = xstate_from_context( context ))) + if (flags & CONTEXT_XSTATE) { CONTEXT_EX *context_ex = (CONTEXT_EX *)(context + 1); - - if (context_ex->XState.Length < offsetof(XSTATE, YmmContext) - || context_ex->XState.Length > sizeof(XSTATE)) - return STATUS_INVALID_PARAMETER; + XSTATE *xs = (XSTATE *)((char *)context_ex + context_ex->XState.Offset); if (xs->Mask & XSTATE_MASK_GSSE) { - if (context_ex->XState.Length < sizeof(XSTATE)) - return STATUS_BUFFER_OVERFLOW; - xsave->xstate.Mask |= XSTATE_MASK_GSSE; memcpy( &xsave->xstate.YmmContext, &xs->YmmContext, sizeof(xs->YmmContext) ); } - else - xsave->xstate.Mask &= ~XSTATE_MASK_GSSE; + else xsave->xstate.Mask &= ~XSTATE_MASK_GSSE; } return STATUS_SUCCESS; }

1 0

Alexandre Julliard : ntdll: Only restore the modified parts of the syscall frame on x86-64.
by Alexandre Julliard 07 Jun '21

07 Jun '21

Module: wine Branch: master Commit: 32f1bfd0f0ff5a109042c6ac9a53cf773acdae27 URL: https://source.winehq.org/git/wine.git/?a=commit;h=32f1bfd0f0ff5a109042c6ac… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 7 13:17:15 2021 +0200 ntdll: Only restore the modified parts of the syscall frame on x86-64. Based on a patch by Jacek Caban. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_x86_64.c | 92 +++++++++++++---------------------------- tools/winebuild/import.c | 23 ++++++++++- 2 files changed, 50 insertions(+), 65 deletions(-) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 086bfdfe066..524c9348ec2 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -281,31 +281,31 @@ C_ASSERT( sizeof(struct syscall_xsave) == 0x340 ); struct syscall_frame { - 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 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 */ + DWORD restore_flags; /* 0094 */ + ULONG64 rbp; /* 0098 */ }; C_ASSERT( sizeof( struct syscall_frame ) == 0xa0); @@ -1558,34 +1558,6 @@ static void restore_context( const struct xcontext *xcontext, ucontext_t *sigcon } -/*********************************************************************** - * set_full_cpu_context - * - * Set the new CPU context. - */ -extern void set_full_cpu_context(void) DECLSPEC_HIDDEN; -__ASM_GLOBAL_FUNC( set_full_cpu_context, - "movq %gs:0x30,%rdx\n\t" - "movq 0x328(%rdx),%rsp\n\t" /* amd64_thread_data()->syscall_frame */ - "movq $0,0x328(%rdx)\n\t" - "movq 0x00(%rsp),%rax\n\t" - "movq 0x08(%rsp),%rbx\n\t" - "movq 0x10(%rsp),%rcx\n\t" - "movq 0x18(%rsp),%rdx\n\t" - "movq 0x20(%rsp),%rsi\n\t" - "movq 0x28(%rsp),%rdi\n\t" - "movq 0x30(%rsp),%r8\n\t" - "movq 0x38(%rsp),%r9\n\t" - "movq 0x40(%rsp),%r10\n\t" - "movq 0x48(%rsp),%r11\n\t" - "movq 0x50(%rsp),%r12\n\t" - "movq 0x58(%rsp),%r13\n\t" - "movq 0x60(%rsp),%r14\n\t" - "movq 0x68(%rsp),%r15\n\t" - "movq 0x98(%rsp),%rbp\n\t" - "leaq 0x70(%rsp),%rsp\n\t" - "iretq" ) - /*********************************************************************** * signal_restore_full_cpu_context * @@ -1593,17 +1565,7 @@ __ASM_GLOBAL_FUNC( set_full_cpu_context, */ void signal_restore_full_cpu_context(void) { - struct syscall_xsave *xsave = get_syscall_xsave( amd64_thread_data()->syscall_frame ); - - if (cpu_info.ProcessorFeatureBits & CPU_FEATURE_XSAVE) - { - __asm__ volatile( "xrstor64 %0" : : "m"(xsave->xsave), "a" (7), "d" (0) ); - } - else - { - __asm__ volatile( "fxrstor64 %0" : : "m"(xsave->xsave) ); - } - set_full_cpu_context(); + amd64_thread_data()->syscall_frame->restore_flags |= CONTEXT_INTEGER; } @@ -1708,6 +1670,8 @@ NTSTATUS WINAPI NtSetContextThread( HANDLE handle, const CONTEXT *context ) } else xsave->xstate.Mask &= ~XSTATE_MASK_GSSE; } + + frame->restore_flags |= flags & ~CONTEXT_INTEGER; return STATUS_SUCCESS; } diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 3acf720e1c6..3bd139a2b31 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -1614,6 +1614,7 @@ static void output_syscall_dispatcher(void) output( "\tmovw %%fs,-0x1a(%%rbp)\n" ); output( "\tmovw %%ss,-0x8(%%rbp)\n" ); output( "\tmovw %%gs,-0x6(%%rbp)\n" ); + output( "\tmovl $0,-0x4(%%rbp)\n" ); output( "\tmovq %%rsp,%%r12\n" ); output( "\tmovq %%rax,%%r13\n" ); output( "\tmovl %s(%%rip),%%r14d\n", asm_name("__wine_syscall_flags") ); @@ -1667,6 +1668,9 @@ static void output_syscall_dispatcher(void) output( "\tcallq *(%%r10,%%r13,8)\n" ); output( "2:\tmovq %%gs:0x30,%%rcx\n" ); output( "\tmovq $0,0x328(%%rcx)\n" ); + output( "\tmovl -4(%%rbp),%%ecx\n" ); /* frame->restore_flags */ + output( "\ttestl $0x48,%%ecx\n" ); /* CONTEXT_FLOATING_POINT | CONTEXT_XSTATE */ + output( "\tjz 4f\n" ); output( "\ttestl $3,%%r14d\n" ); /* SYSCALL_HAVE_XSAVE | SYSCALL_HAVE_XSAVEC */ output( "\tjz 3f\n" ); output( "\tmovq %%rax,%%r11\n" ); @@ -1687,7 +1691,24 @@ static void output_syscall_dispatcher(void) output_cfi( ".cfi_same_value %%rsi" ); output( "\tmovq -0x90(%%rbp),%%rbx\n" ); output_cfi( ".cfi_same_value %%rbx" ); - output( "\tleaq -0x28(%%rbp),%%rsp\n" ); + output( "\ttestl $0x3,%%ecx\n" ); /* CONTEXT_CONTROL | CONTEXT_INTEGER */ + output( "\tjnz 1f\n" ); + output( "\tmovq -0x28(%%rbp),%%rcx\n" ); /* frame->rip */ + output( "\tleaq -0x10(%%rbp),%%rsp\n" ); /* frame->rsp */ + output( "\tmovq (%%rbp),%%rbp\n" ); + output_cfi( ".cfi_same_value %%rbp" ); + output( "\tpopq %%rsp\n" ); + output( "\tjmpq *%%rcx\n" ); + output( "1:\ttestl $0x2,%%ecx\n" ); /* CONTEXT_INTEGER */ + output( "\tjz 1f\n" ); + output( "\tmovq -0x98(%%rbp),%%rax\n" ); + output( "\tmovq -0x88(%%rbp),%%rcx\n" ); + output( "\tmovq -0x80(%%rbp),%%rdx\n" ); + output( "\tmovq -0x68(%%rbp),%%r8\n" ); + output( "\tmovq -0x60(%%rbp),%%r9\n" ); + output( "\tmovq -0x58(%%rbp),%%r10\n" ); + output( "\tmovq -0x50(%%rbp),%%r11\n" ); + output( "1:\tleaq -0x28(%%rbp),%%rsp\n" ); output_cfi( ".cfi_def_cfa_register %%rsp" ); output_cfi( ".cfi_adjust_cfa_offset 40" ); output( "\tmovq (%%rbp),%%rbp\n" );

1 0

Alexandre Julliard : ntdll: Only restore the modified parts of the syscall frame on i386.
by Alexandre Julliard 07 Jun '21

07 Jun '21

Module: wine Branch: master Commit: 050378d4d75bac651a8e18be989953d8be3afb9b URL: https://source.winehq.org/git/wine.git/?a=commit;h=050378d4d75bac651a8e18be… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 7 13:22:15 2021 +0200 ntdll: Only restore the modified parts of the syscall frame on i386. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_i386.c | 125 ++++++++++-------------------------------- tools/winebuild/import.c | 92 +++++++++++++++++++------------ 2 files changed, 85 insertions(+), 132 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=050378d4d75bac651a8e…

1 0

Hiroki Awata : dsound: Notify DSBPN_OFFSETSTOP earlier.
by Alexandre Julliard 07 Jun '21

07 Jun '21

Module: wine Branch: master Commit: 8116d4e11cd11ba466c1cd92a6a81ca015e230e0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8116d4e11cd11ba466c1cd92… Author: Hiroki Awata <castaneai(a)by.black> Date: Sat Jun 5 12:28:47 2021 +0900 dsound: Notify DSBPN_OFFSETSTOP earlier. Some games may not receive the DSBPN_OFFSETSTOP event and get stuck if CloseHandle is called immediately after IDirectSoundBuffer::Stop. To solve this problem, IDirectSoundBuffer::Stop will immediately notify the DSBPN_OFFSETSTOP event. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=41292 Signed-off-by: Hiroki Awata <castaneai(a)by.black> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsound/buffer.c | 7 ++----- dlls/dsound/mixer.c | 6 +----- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c index fafa6fc6015..dc3b54906ce 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -296,8 +296,7 @@ static HRESULT WINAPI IDirectSoundBufferImpl_Play(IDirectSoundBuffer8 *iface, DW if (This->state == STATE_STOPPED) { This->leadin = TRUE; This->state = STATE_STARTING; - } else if (This->state == STATE_STOPPING) - This->state = STATE_PLAYING; + } for (i = 0; i < This->num_filters; i++) { IMediaObject_Discontinuity(This->filters[i].obj, 0); @@ -317,9 +316,7 @@ static HRESULT WINAPI IDirectSoundBufferImpl_Stop(IDirectSoundBuffer8 *iface) AcquireSRWLockExclusive(&This->lock); - if (This->state == STATE_PLAYING) - This->state = STATE_STOPPING; - else if (This->state == STATE_STARTING) + if (This->state == STATE_PLAYING || This->state == STATE_STARTING) { This->state = STATE_STOPPED; DSOUND_CheckEvent(This, 0, 0); diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c index a6402b09eff..124d1e4fba1 100644 --- a/dlls/dsound/mixer.c +++ b/dlls/dsound/mixer.c @@ -593,11 +593,7 @@ static void DSOUND_MixToPrimary(const DirectSoundDevice *device, float *mix_buff if (dsb->buflen && dsb->state) { TRACE("Checking %p, frames=%d\n", dsb, frames); AcquireSRWLockShared(&dsb->lock); - /* if buffer is stopping it is stopped now */ - if (dsb->state == STATE_STOPPING) { - dsb->state = STATE_STOPPED; - DSOUND_CheckEvent(dsb, 0, 0); - } else if (dsb->state != STATE_STOPPED) { + if (dsb->state != STATE_STOPPED) { /* if the buffer was starting, it must be playing now */ if (dsb->state == STATE_STARTING)

1 0

Roberto Pungartnik : po: Update Brazilian Portuguese translation.
by Alexandre Julliard 07 Jun '21

07 Jun '21

Module: wine Branch: master Commit: e1056d64ca5cd646d63899be626daf12362729ed URL: https://source.winehq.org/git/wine.git/?a=commit;h=e1056d64ca5cd646d63899be… Author: Roberto Pungartnik <rpungartnik(a)gmail.com> Date: Sat Jun 5 11:37:07 2021 -0300 po: Update Brazilian Portuguese translation. Signed-off-by: Roberto Augusto Pungartnik <rpungartnik(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/pt_BR.po | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/po/pt_BR.po b/po/pt_BR.po index 22102d68ecd..80dbc1a64b3 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2021-06-03 11:15-0300\n" +"PO-Revision-Date: 2021-06-05 11:28-0300\n" "Last-Translator: Roberto Augusto Pungartnik <rpungartnik(a)gmail.com>\n" "Language-Team: Portuguese (Brazil)\n" "Language: pt_BR\n" @@ -15251,12 +15251,10 @@ msgid "reg: The source and destination keys cannot be the same\n" msgstr "reg: Chaves de origem e destino não podem ser as mesmas\n" #: programs/reg/reg.rc:205 -#, fuzzy -#| msgid "The file '%1' already exists. Do you want to overwrite it?" msgid "" "The value '%1\\%2' already exists in the destination key. Do you want to " "overwrite it?" -msgstr "O arquivo '%1' já existe. Deseja sobrescrevê-lo?" +msgstr "O valor '%1\\%2' já existe na chave de destino. Deseja sobrescrevê-lo?" #: programs/reg/reg.rc:133 msgid "Are you sure you want to delete the registry value '%1'?"

1 0

Alistair Leslie-Hughes : msado15/test: Remove Reference count tests.
by Alexandre Julliard 07 Jun '21

07 Jun '21

Module: wine Branch: master Commit: 9c5bb97465a0e687444982b62986aa06c6f1afe2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9c5bb97465a0e687444982b6… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Jun 7 16:28:55 2021 +1000 msado15/test: Remove Reference count tests. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msado15/tests/msado15.c | 80 +++----------------------------------------- 1 file changed, 4 insertions(+), 76 deletions(-) diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index b5f1b70dedd..e097239910d 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -43,24 +43,6 @@ static BOOL is_eof( _Recordset *recordset ) return eof == VARIANT_TRUE; } -static LONG get_refs_field( Field *field ) -{ - Field_AddRef( field ); - return Field_Release( field ); -} - -static LONG get_refs_fields( Fields *fields ) -{ - Fields_AddRef( fields ); - return Fields_Release( fields ); -} - -static LONG get_refs_recordset( _Recordset *recordset ) -{ - _Recordset_AddRef( recordset ); - return _Recordset_Release( recordset ); -} - static void test_Recordset(void) { _Recordset *recordset; @@ -70,7 +52,7 @@ static void test_Recordset(void) Field *field; Properties *props; Property *prop; - LONG refs, count, state; + LONG count, state; VARIANT missing, val, index; CursorLocationEnum location; CursorTypeEnum cursor; @@ -89,39 +71,15 @@ static void test_Recordset(void) errorinfo = NULL; hr = _Recordset_QueryInterface( recordset, &IID_ISupportErrorInfo, (void **)&errorinfo ); ok( hr == S_OK, "got %08x\n", hr ); - refs = get_refs_recordset( recordset ); - ok( refs == 2, "got %d\n", refs ); if (errorinfo) ISupportErrorInfo_Release( errorinfo ); - refs = get_refs_recordset( recordset ); - ok( refs == 1, "got %d\n", refs ); - /* handing out fields object increases recordset refcount */ - refs = get_refs_recordset( recordset ); - ok( refs == 1, "got %d\n", refs ); hr = _Recordset_get_Fields( recordset, &fields ); ok( hr == S_OK, "got %08x\n", hr ); - refs = get_refs_recordset( recordset ); - ok( refs == 2, "got %d\n", refs ); - refs = get_refs_fields( fields ); - ok( refs == 1, "got %d\n", refs ); - - /* releasing fields object decreases recordset refcount, but fields refcount doesn't drop to zero */ - Fields_Release( fields ); - refs = get_refs_recordset( recordset ); - ok( refs == 1, "got %d\n", refs ); - refs = get_refs_fields( fields ); - ok( refs == 1, "got %d\n", refs ); - /* calling get_Fields again returns the same object with the same refcount and increases recordset refcount */ + /* calling get_Fields again returns the same object */ hr = _Recordset_get_Fields( recordset, &fields2 ); ok( hr == S_OK, "got %08x\n", hr ); - refs = get_refs_recordset( recordset ); - ok( refs == 2, "got %d\n", refs ); - refs = get_refs_fields( fields2 ); - ok( refs == 1, "got %d\n", refs ); ok( fields2 == fields, "expected same object\n" ); - refs = Fields_Release( fields2 ); - ok( refs == 1, "got %d\n", refs ); count = -1; hr = Fields_get_Count( fields2, &count ); @@ -131,12 +89,7 @@ static void test_Recordset(void) hr = _Recordset_Close( recordset ); ok( hr == MAKE_ADO_HRESULT( adErrObjectClosed ), "got %08x\n", hr ); - refs = _Recordset_Release( recordset ); - ok( !refs, "got %d\n", refs ); - - /* fields object still has a reference */ - refs = Fields_Release( fields2 ); - ok( refs == 1, "got %d\n", refs ); + Fields_Release( fields2 ); hr = CoCreateInstance( &CLSID_Recordset, NULL, CLSCTX_INPROC_SERVER, &IID__Recordset, (void **)&recordset ); ok( hr == S_OK, "got %08x\n", hr ); @@ -678,7 +631,7 @@ static void test_Fields(void) Field *field, *field2; VARIANT val, index; BSTR name; - LONG refs, count, size; + LONG count, size; DataTypeEnum type; FieldAttributeEnum attrs; HRESULT hr; @@ -693,11 +646,7 @@ static void test_Fields(void) errorinfo = NULL; hr = Fields_QueryInterface( fields, &IID_ISupportErrorInfo, (void **)&errorinfo ); ok( hr == S_OK, "got %08x\n", hr ); - refs = get_refs_fields( fields ); - ok( refs == 2, "got %d\n", refs ); if (errorinfo) ISupportErrorInfo_Release( errorinfo ); - refs = get_refs_fields( fields ); - ok( refs == 1, "got %d\n", refs ); count = -1; hr = Fields_get_Count( fields, &count ); @@ -727,29 +676,12 @@ static void test_Fields(void) name = SysAllocString( L"field" ); V_VT( &index ) = VT_BSTR; V_BSTR( &index ) = name; - refs = get_refs_recordset( recordset ); - ok( refs == 2, "got %d\n", refs ); - refs = get_refs_fields( fields ); - ok( refs == 1, "got %d\n", refs ); hr = Fields_get_Item( fields, index, &field ); - ok( hr == S_OK, "got %08x\n", hr ); - refs = get_refs_field( field ); - ok( refs == 1, "got %d\n", refs ); - refs = get_refs_recordset( recordset ); - ok( refs == 2, "got %d\n", refs ); - refs = get_refs_fields( fields ); - ok( refs == 1, "got %d\n", refs ); /* calling get_Item again returns the same object and adds reference */ hr = Fields_get_Item( fields, index, &field2 ); ok( hr == S_OK, "got %08x\n", hr ); ok( field2 == field, "expected same object\n" ); - refs = get_refs_field( field2 ); - ok( refs == 2, "got %d\n", refs ); - refs = get_refs_recordset( recordset ); - ok( refs == 2, "got %d\n", refs ); - refs = get_refs_fields( fields ); - ok( refs == 1, "got %d\n", refs ); Field_Release( field2 ); SysFreeString( name ); @@ -757,11 +689,7 @@ static void test_Fields(void) errorinfo = NULL; hr = Field_QueryInterface( field, &IID_ISupportErrorInfo, (void **)&errorinfo ); ok( hr == S_OK, "got %08x\n", hr ); - refs = get_refs_field( field ); - ok( refs == 2, "got %d\n", refs ); if (errorinfo) ISupportErrorInfo_Release( errorinfo ); - refs = get_refs_field( field ); - ok( refs == 1, "got %d\n", refs ); /* verify values set with _Append */ hr = Field_get_Name( field, &name );

1 0

Alistair Leslie-Hughes : msado15/tests: Add Field tests.
by Alexandre Julliard 07 Jun '21

07 Jun '21

Module: wine Branch: master Commit: 5a0dfa15ee6c8fedc735510b7f4582b6610ee243 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5a0dfa15ee6c8fedc735510b… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Jun 7 16:28:56 2021 +1000 msado15/tests: Add Field tests. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msado15/tests/msado15.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index e097239910d..16faefef550 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -271,6 +271,13 @@ static void test_Recordset(void) hr = _Recordset_Close( recordset ); ok( hr == S_OK, "got %08x\n", hr ); + count = -1; + hr = Fields_get_Count( fields, &count ); + todo_wine ok( !count, "got %d\n", count ); + + hr = Field_get_Name(field, &name); + todo_wine ok( hr == MAKE_ADO_HRESULT( adErrObjectNotSet ), "got %08x\n", hr ); + state = -1; hr = _Recordset_get_State( recordset, &state ); ok( hr == S_OK, "got %08x\n", hr ); @@ -639,6 +646,9 @@ static void test_Fields(void) hr = CoCreateInstance( &CLSID_Recordset, NULL, CLSCTX_INPROC_SERVER, &IID__Recordset, (void **)&recordset ); ok( hr == S_OK, "got %08x\n", hr ); + hr = _Recordset_QueryInterface( recordset, &IID_Fields, (void **)&fields ); + ok( hr == E_NOINTERFACE, "got %08x\n", hr ); + hr = _Recordset_get_Fields( recordset, &fields ); ok( hr == S_OK, "got %08x\n", hr );

1 0

Alistair Leslie-Hughes : msado15: Correct field reference value.
by Alexandre Julliard 07 Jun '21

07 Jun '21

Module: wine Branch: master Commit: 4522c54a131a0eebbe2b70b6ae1cd72bf6e6e62d URL: https://source.winehq.org/git/wine.git/?a=commit;h=4522c54a131a0eebbe2b70b6… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Jun 7 16:28:57 2021 +1000 msado15: Correct field reference value. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msado15/recordset.c | 9 +++++++++ dlls/msado15/tests/msado15.c | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index 2b32dc6cf94..8d7619d9161 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -594,6 +594,7 @@ static HRESULT Field_create( const WCHAR *name, LONG index, struct recordset *re field->Field_iface.lpVtbl = &field_vtbl; field->ISupportErrorInfo_iface.lpVtbl = &field_supporterrorinfo_vtbl; field->Properties_iface.lpVtbl = &field_properties_vtbl; + field->refs = 1; if (!(field->name = strdupW( name ))) { heap_free( field ); @@ -998,6 +999,7 @@ static ULONG WINAPI recordset_AddRef( _Recordset *iface ) static void close_recordset( struct recordset *recordset ) { ULONG row, col, col_count; + ULONG i; if ( recordset->row_set ) IRowset_Release( recordset->row_set ); recordset->row_set = NULL; @@ -1005,6 +1007,13 @@ static void close_recordset( struct recordset *recordset ) if (!recordset->fields) return; col_count = get_column_count( recordset ); + for (i = 0; i < col_count; i++) + { + struct field *field = impl_from_Field( recordset->fields->field[i] ); + field->recordset = NULL; + Field_Release(&field->Field_iface); + } + recordset->fields->count = 0; Fields_Release( &recordset->fields->Fields_iface ); recordset->fields = NULL; diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index 16faefef550..97a578b0618 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -273,7 +273,7 @@ static void test_Recordset(void) count = -1; hr = Fields_get_Count( fields, &count ); - todo_wine ok( !count, "got %d\n", count ); + ok( !count, "got %d\n", count ); hr = Field_get_Name(field, &name); todo_wine ok( hr == MAKE_ADO_HRESULT( adErrObjectNotSet ), "got %08x\n", hr );

1 0