January 2021 - Wine-Commits

Alexandre Julliard : winebuild: Simplify ARM64 import thunks.
by Alexandre Julliard Jan. 18, 2021

Jan. 18, 2021

Module: wine Branch: master Commit: 90ac46fe334fb758dcd7a4eae8c9d1a9bd18be26 URL: https://source.winehq.org/git/wine.git/?a=commit;h=90ac46fe334fb758dcd7a4ea… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jan 16 10:51:45 2021 +0100 winebuild: Simplify ARM64 import thunks. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/import.c | 57 ++++++++++++++++++++---------------------------- 1 file changed, 24 insertions(+), 33 deletions(-) diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index bd25ec5ee70..e6dff564f79 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -760,14 +760,11 @@ static void output_import_thunk( const char *name, const char *table, int pos ) output( "1:\t.long %s+%u-(1b+4)\n", table, pos ); break; case CPU_ARM64: - output( "\tadrp x9, %s\n", arm64_page( table ) ); - output( "\tadd x9, x9, #%s\n", arm64_pageoff( table ) ); - if (pos & 0xf000) output( "\tadd x9, x9, #%u\n", pos & 0xf000 ); - if (pos & 0x0f00) output( "\tadd x9, x9, #%u\n", pos & 0x0f00 ); - if (pos & 0x00f0) output( "\tadd x9, x9, #%u\n", pos & 0x00f0 ); - if (pos & 0x000f) output( "\tadd x9, x9, #%u\n", pos & 0x000f ); - output( "\tldur x9, [x9, #0]\n" ); - output( "\tbr x9\n" ); + output( "\tadrp x16, %s\n", arm64_page( table ) ); + output( "\tadd x16, x16, #%s\n", arm64_pageoff( table ) ); + if (pos & ~0x7fff) output( "\tadd x16, x16, #%u\n", pos & ~0x7fff ); + output( "\tldr x16, [x16, #%u]\n", pos & 0x7fff ); + output( "\tbr x16\n" ); break; case CPU_POWERPC: output( "\tmr %s, %s\n", ppc_reg(0), ppc_reg(31) ); @@ -1078,18 +1075,21 @@ static void output_delayed_import_thunks( const DLLSPEC *spec ) output( "2:\t.long %s-1b\n", asm_name("__wine_spec_delay_load") ); break; case CPU_ARM64: - output( "\tstp x29, x30, [sp,#-16]!\n" ); + output( "\tstp x29, x30, [sp,#-80]!\n" ); output( "\tmov x29, sp\n" ); - output( "\tadrp x9, %s\n", arm64_page( asm_name("__wine_spec_delay_load") ) ); - output( "\tadd x9, x9, #%s\n", arm64_pageoff( asm_name("__wine_spec_delay_load") ) ); - output( "\tblr x9\n" ); - output( "\tmov x9, x0\n" ); - output( "\tldp x29, x30, [sp],#16\n" ); + output( "\tstp x0, x1, [sp,#16]\n" ); + output( "\tstp x2, x3, [sp,#32]\n" ); + output( "\tstp x4, x5, [sp,#48]\n" ); + output( "\tstp x6, x7, [sp,#64]\n" ); + output( "\tmov x0, x16\n" ); + output( "\tbl %s\n", asm_name("__wine_spec_delay_load") ); + output( "\tmov x16, x0\n" ); output( "\tldp x0, x1, [sp,#16]\n" ); output( "\tldp x2, x3, [sp,#32]\n" ); output( "\tldp x4, x5, [sp,#48]\n" ); - output( "\tldp x6, x7, [sp],#80\n" ); - output( "\tbr x9\n" ); /* or "ret x9" */ + output( "\tldp x6, x7, [sp,#64]\n" ); + output( "\tldp x29, x30, [sp],#80\n" ); + output( "\tbr x16\n" ); break; case CPU_POWERPC: if (target_platform == PLATFORM_APPLE) extra_stack_storage = 56; @@ -1176,20 +1176,13 @@ static void output_delayed_import_thunks( const DLLSPEC *spec ) break; } case CPU_ARM64: - output( "\tstp x6, x7, [sp,#-80]!\n" ); - output( "\tstp x4, x5, [sp,#48]\n" ); - output( "\tstp x2, x3, [sp,#32]\n" ); - output( "\tstp x0, x1, [sp,#16]\n" ); - output( "\tmov x0, #%d\n", idx ); - output( "\tmov x1, #16384\n" ); - output( "\tmul x1, x0, x1\n" ); - output( "\tmov x0, x1\n" ); - output( "\tmov x1, #4\n" ); - output( "\tmul x1, x0, x1\n" ); - output( "\tmov x0, x1\n" ); - output( "\tadd x0, x0, #%d\n", j ); - output( "\tadr x9, %s\n", asm_name("__wine_delay_load_asm") ); - output( "\tbr x9\n" ); + if (idx) + { + output( "\tmov x16, #0x%x\n", idx << 16 ); + if (j) output( "\tmovk x16, #0x%x\n", j ); + } + else output( "\tmov x16, #0x%x\n", j ); + output( "\tb %s\n", asm_name("__wine_delay_load_asm") ); break; case CPU_POWERPC: switch(target_platform) @@ -1378,9 +1371,7 @@ void output_stubs( DLLSPEC *spec ) } else output( "\tmov x1, %u\n", odp->ordinal ); - output( "\tadrp x2, %s\n", arm64_page( asm_name("__wine_spec_unimplemented_stub") ) ); - output( "\tadd x2, x2, #%s\n", arm64_pageoff( asm_name("__wine_spec_unimplemented_stub") ) ); - output( "\tblr x2\n" ); + output( "\tbl %s\n", asm_name("__wine_spec_unimplemented_stub") ); break; default: assert(0);

1 0

Alexandre Julliard : wordpad: Make qsort callback function cdecl.
by Alexandre Julliard Jan. 18, 2021

Jan. 18, 2021

Module: wine Branch: master Commit: 04f0729d94f486a0ec188d86d22aa9bbe4c33b45 URL: https://source.winehq.org/git/wine.git/?a=commit;h=04f0729d94f486a0ec188d86… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jan 16 11:45:39 2021 +0100 wordpad: Make qsort callback function cdecl. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wordpad/wordpad.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index 5ba5cc857f6..d48346e3c4a 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -657,7 +657,7 @@ static int CALLBACK enum_font_proc(const LOGFONTW *lpelfe, const TEXTMETRICW *lp return 1; } -static int fonts_desc_compare(const void *a, const void *b) +static int __cdecl fonts_desc_compare(const void *a, const void *b) { const struct font_desc *left = a, *right = b; return lstrcmpiW(left->name, right->name);

1 0

Zebediah Figura : winegstreamer: Avoid leaking GstEvent objects.
by Alexandre Julliard Jan. 18, 2021

Jan. 18, 2021

Module: wine Branch: master Commit: 85d81ae9a9ca3e64b33218074f5ff934a8f2718f URL: https://source.winehq.org/git/wine.git/?a=commit;h=85d81ae9a9ca3e64b3321807… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jan 15 17:59:18 2021 -0600 winegstreamer: Avoid leaking GstEvent objects. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 040da3f2ce0..f30264f1c88 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -624,12 +624,14 @@ static gboolean gst_base_src_perform_seek(struct parser *This, GstEvent *event) static gboolean event_src(GstPad *pad, GstObject *parent, GstEvent *event) { struct parser *This = gst_pad_get_element_private(pad); + gboolean ret = TRUE; TRACE("filter %p, type \"%s\".\n", This, GST_EVENT_TYPE_NAME(event)); switch (event->type) { case GST_EVENT_SEEK: - return gst_base_src_perform_seek(This, event); + ret = gst_base_src_perform_seek(This, event); + break; case GST_EVENT_FLUSH_START: EnterCriticalSection(&This->filter.csFilter); if (This->reader) @@ -649,13 +651,13 @@ static gboolean event_src(GstPad *pad, GstObject *parent, GstEvent *event) case GST_EVENT_RECONFIGURE: return gst_pad_event_default(pad, parent, event); } - return TRUE; + gst_event_unref(event); + return ret; } static gboolean event_sink(GstPad *pad, GstObject *parent, GstEvent *event) { struct parser_source *pin = gst_pad_get_element_private(pad); - gboolean ret; TRACE("pin %p, type \"%s\".\n", pin, GST_EVENT_TYPE_NAME(event)); @@ -675,7 +677,7 @@ static gboolean event_sink(GstPad *pad, GstObject *parent, GstEvent *event) if (segment->format != GST_FORMAT_TIME) { FIXME("Unhandled format \"%s\".\n", gst_format_get_name(segment->format)); - return TRUE; + break; } gst_segment_copy_into(segment, pin->segment); @@ -688,14 +690,14 @@ static gboolean event_sink(GstPad *pad, GstObject *parent, GstEvent *event) if (pin->pin.pin.peer) IPin_NewSegment(pin->pin.pin.peer, pos, stop, rate*applied_rate); - return TRUE; + break; } case GST_EVENT_EOS: if (pin->pin.pin.peer) IPin_EndOfStream(pin->pin.pin.peer); else SetEvent(pin->eos_event); - return TRUE; + break; case GST_EVENT_FLUSH_START: if (impl_from_strmbase_filter(pin->pin.pin.filter)->ignore_flush) { /* gst-plugins-base prior to 1.7 contains a bug which causes @@ -706,24 +708,28 @@ static gboolean event_sink(GstPad *pad, GstObject *parent, GstEvent *event) * unset the flushing flag to avoid the problem. */ TRACE("Working around gst <1.7 bug, ignoring FLUSH_START\n"); GST_PAD_UNSET_FLUSHING (pad); - return TRUE; + break; } if (pin->pin.pin.peer) IPin_BeginFlush(pin->pin.pin.peer); - return TRUE; + break; case GST_EVENT_FLUSH_STOP: gst_segment_init(pin->segment, GST_FORMAT_TIME); if (pin->pin.pin.peer) IPin_EndFlush(pin->pin.pin.peer); - return TRUE; + break; case GST_EVENT_CAPS: - ret = gst_pad_event_default(pad, parent, event); + { + gboolean ret = gst_pad_event_default(pad, parent, event); SetEvent(pin->caps_event); return ret; + } default: WARN("Ignoring \"%s\" event.\n", GST_EVENT_TYPE_NAME(event)); return gst_pad_event_default(pad, parent, event); } + gst_event_unref(event); + return TRUE; } static DWORD CALLBACK push_data(LPVOID iface)

1 0

Alexandre Julliard : evr: Make qsort and bsearch callback functions cdecl.
by Alexandre Julliard Jan. 18, 2021

Jan. 18, 2021

Module: wine Branch: master Commit: 013e5de8ce28676e00c800fa6e95574d5ebdf2f4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=013e5de8ce28676e00c800fa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jan 16 11:46:02 2021 +0100 evr: Make qsort and bsearch callback functions cdecl. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/mixer.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index a7ce3949bec..52fc7d0cfcc 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -159,7 +159,7 @@ static struct video_mixer *impl_from_IMFClockStateSink(IMFClockStateSink *iface) return CONTAINING_RECORD(iface, struct video_mixer, IMFClockStateSink_iface); } -static int video_mixer_compare_input_id(const void *a, const void *b) +static int __cdecl video_mixer_compare_input_id(const void *a, const void *b) { const unsigned int *key = a; const struct input_stream *input = b; @@ -509,7 +509,7 @@ static HRESULT WINAPI video_mixer_transform_DeleteInputStream(IMFTransform *ifac return hr; } -static int video_mixer_add_input_sort_compare(const void *a, const void *b) +static int __cdecl video_mixer_add_input_sort_compare(const void *a, const void *b) { const struct input_stream *left = a, *right = b; return left->id != right->id ? (left->id < right->id ? -1 : 1) : 0; @@ -643,7 +643,7 @@ done: return hr; } -static int rt_formats_sort_compare(const void *left, const void *right) +static int __cdecl rt_formats_sort_compare(const void *left, const void *right) { const struct rt_format *format1 = left, *format2 = right;

1 0

Zebediah Figura : include: Move interlocked functions to winnt.h.
by Alexandre Julliard Jan. 18, 2021

Jan. 18, 2021

Module: wine Branch: master Commit: aef2e01772f7856f0d6e519fdede00aa2b6ad627 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aef2e01772f7856f0d6e519f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jan 15 01:22:02 2021 -0600 include: Move interlocked functions to winnt.h. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winbase.h | 132 ------------------------------------------------------ include/winnt.h | 132 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 132 insertions(+), 132 deletions(-) diff --git a/include/winbase.h b/include/winbase.h index dc8aa081be4..0262e50d980 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2919,138 +2919,6 @@ extern char * CDECL wine_get_unix_file_name( LPCWSTR dos ); extern WCHAR * CDECL wine_get_dos_file_name( LPCSTR str ); -/* Interlocked functions */ - -#ifdef _MSC_VER - -#pragma intrinsic(_InterlockedCompareExchange) -#pragma intrinsic(_InterlockedCompareExchange64) -#pragma intrinsic(_InterlockedExchange) -#pragma intrinsic(_InterlockedExchangeAdd) -#pragma intrinsic(_InterlockedIncrement) -#pragma intrinsic(_InterlockedDecrement) - -long _InterlockedCompareExchange(long volatile*,long,long); -long long _InterlockedCompareExchange64(long long volatile*,long long,long long); -long _InterlockedDecrement(long volatile*); -long _InterlockedExchange(long volatile*,long); -long _InterlockedExchangeAdd(long volatile*,long); -long _InterlockedIncrement(long volatile*); - -static FORCEINLINE LONG WINAPI InterlockedCompareExchange( LONG volatile *dest, LONG xchg, LONG compare ) -{ - return _InterlockedCompareExchange( (long volatile *)dest, xchg, compare ); -} - -static FORCEINLINE LONGLONG WINAPI InterlockedCompareExchange64( LONGLONG volatile *dest, LONGLONG xchg, LONGLONG compare ) -{ - return _InterlockedCompareExchange64( (long long volatile *)dest, compare, xchg ); -} - -static FORCEINLINE LONG WINAPI InterlockedExchange( LONG volatile *dest, LONG val ) -{ - return _InterlockedExchange( (long volatile *)dest, val ); -} - -static FORCEINLINE LONG WINAPI InterlockedExchangeAdd( LONG volatile *dest, LONG incr ) -{ - return _InterlockedExchangeAdd( (long volatile *)dest, incr ); -} - -static FORCEINLINE LONG WINAPI InterlockedIncrement( LONG volatile *dest ) -{ - return _InterlockedIncrement( (long volatile *)dest ); -} - -static FORCEINLINE LONG WINAPI InterlockedDecrement( LONG volatile *dest ) -{ - return _InterlockedDecrement( (long volatile *)dest ); -} - -#ifndef __i386__ - -#pragma intrinsic(_InterlockedCompareExchangePointer) -#pragma intrinsic(_InterlockedExchangePointer) - -#define InterlockedCompareExchangePointer _InterlockedCompareExchangePointer -#define InterlockedExchangePointer _InterlockedExchangePointer - -void *InterlockedCompareExchangePointer(void *volatile*,void*,void*); -void *InterlockedExchangePointer(void *volatile*,void*); - -#else - -static FORCEINLINE void *WINAPI InterlockedCompareExchangePointer( void *volatile *dest, void *xchg, void *compare ) -{ - return (void *)_InterlockedCompareExchange( (long volatile*)dest, (long)xchg, (long)compare ); -} - -static FORCEINLINE void *WINAPI InterlockedExchangePointer( void *volatile *dest, void *val ) -{ - return (void *)_InterlockedExchange( (long volatile*)dest, (long)val ); -} - -#endif - -#elif defined(__GNUC__) - -static FORCEINLINE LONG WINAPI InterlockedCompareExchange( LONG volatile *dest, LONG xchg, LONG compare ) -{ - return __sync_val_compare_and_swap( dest, compare, xchg ); -} - -static FORCEINLINE PVOID WINAPI InterlockedCompareExchangePointer( PVOID volatile *dest, PVOID xchg, PVOID compare ) -{ - return __sync_val_compare_and_swap( dest, compare, xchg ); -} - -static FORCEINLINE LONGLONG WINAPI InterlockedCompareExchange64( LONGLONG volatile *dest, LONGLONG xchg, LONGLONG compare ) -{ - return __sync_val_compare_and_swap( dest, compare, xchg ); -} - -static FORCEINLINE LONG WINAPI InterlockedExchange( LONG volatile *dest, LONG val ) -{ - LONG ret; -#if defined(__i386__) || defined(__x86_64__) - __asm__ __volatile__( "lock; xchgl %0,(%1)" - : "=r" (ret) :"r" (dest), "0" (val) : "memory" ); -#else - do ret = *dest; while (!__sync_bool_compare_and_swap( dest, ret, val )); -#endif - return ret; -} - -static FORCEINLINE LONG WINAPI InterlockedExchangeAdd( LONG volatile *dest, LONG incr ) -{ - return __sync_fetch_and_add( dest, incr ); -} - -static FORCEINLINE LONG WINAPI InterlockedIncrement( LONG volatile *dest ) -{ - return __sync_add_and_fetch( dest, 1 ); -} - -static FORCEINLINE LONG WINAPI InterlockedDecrement( LONG volatile *dest ) -{ - return __sync_add_and_fetch( dest, -1 ); -} - -static FORCEINLINE PVOID WINAPI InterlockedExchangePointer( PVOID volatile *dest, PVOID val ) -{ - PVOID ret; -#ifdef __x86_64__ - __asm__ __volatile__( "lock; xchgq %0,(%1)" : "=r" (ret) :"r" (dest), "0" (val) : "memory" ); -#elif defined(__i386__) - __asm__ __volatile__( "lock; xchgl %0,(%1)" : "=r" (ret) :"r" (dest), "0" (val) : "memory" ); -#else - do ret = *dest; while (!__sync_bool_compare_and_swap( dest, ret, val )); -#endif - return ret; -} - -#endif /* __GNUC__ */ - #ifdef __WINESRC__ static FORCEINLINE HANDLE WINAPI GetCurrentProcess(void) diff --git a/include/winnt.h b/include/winnt.h index 83fcc67c85d..7bbe0185139 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -6892,6 +6892,138 @@ static inline BOOLEAN BitScanReverse(DWORD *index, DWORD mask) #endif +/* Interlocked functions */ + +#ifdef _MSC_VER + +#pragma intrinsic(_InterlockedCompareExchange) +#pragma intrinsic(_InterlockedCompareExchange64) +#pragma intrinsic(_InterlockedExchange) +#pragma intrinsic(_InterlockedExchangeAdd) +#pragma intrinsic(_InterlockedIncrement) +#pragma intrinsic(_InterlockedDecrement) + +long _InterlockedCompareExchange(long volatile*,long,long); +long long _InterlockedCompareExchange64(long long volatile*,long long,long long); +long _InterlockedDecrement(long volatile*); +long _InterlockedExchange(long volatile*,long); +long _InterlockedExchangeAdd(long volatile*,long); +long _InterlockedIncrement(long volatile*); + +static FORCEINLINE LONG WINAPI InterlockedCompareExchange( LONG volatile *dest, LONG xchg, LONG compare ) +{ + return _InterlockedCompareExchange( (long volatile *)dest, xchg, compare ); +} + +static FORCEINLINE LONGLONG WINAPI InterlockedCompareExchange64( LONGLONG volatile *dest, LONGLONG xchg, LONGLONG compare ) +{ + return _InterlockedCompareExchange64( (long long volatile *)dest, compare, xchg ); +} + +static FORCEINLINE LONG WINAPI InterlockedExchange( LONG volatile *dest, LONG val ) +{ + return _InterlockedExchange( (long volatile *)dest, val ); +} + +static FORCEINLINE LONG WINAPI InterlockedExchangeAdd( LONG volatile *dest, LONG incr ) +{ + return _InterlockedExchangeAdd( (long volatile *)dest, incr ); +} + +static FORCEINLINE LONG WINAPI InterlockedIncrement( LONG volatile *dest ) +{ + return _InterlockedIncrement( (long volatile *)dest ); +} + +static FORCEINLINE LONG WINAPI InterlockedDecrement( LONG volatile *dest ) +{ + return _InterlockedDecrement( (long volatile *)dest ); +} + +#ifndef __i386__ + +#pragma intrinsic(_InterlockedCompareExchangePointer) +#pragma intrinsic(_InterlockedExchangePointer) + +#define InterlockedCompareExchangePointer _InterlockedCompareExchangePointer +#define InterlockedExchangePointer _InterlockedExchangePointer + +void *InterlockedCompareExchangePointer(void *volatile*,void*,void*); +void *InterlockedExchangePointer(void *volatile*,void*); + +#else + +static FORCEINLINE void * WINAPI InterlockedCompareExchangePointer( void *volatile *dest, void *xchg, void *compare ) +{ + return (void *)_InterlockedCompareExchange( (long volatile*)dest, (long)xchg, (long)compare ); +} + +static FORCEINLINE void * WINAPI InterlockedExchangePointer( void *volatile *dest, void *val ) +{ + return (void *)_InterlockedExchange( (long volatile*)dest, (long)val ); +} + +#endif + +#elif defined(__GNUC__) + +static FORCEINLINE LONG WINAPI InterlockedCompareExchange( LONG volatile *dest, LONG xchg, LONG compare ) +{ + return __sync_val_compare_and_swap( dest, compare, xchg ); +} + +static FORCEINLINE void * WINAPI InterlockedCompareExchangePointer( void *volatile *dest, void *xchg, void *compare ) +{ + return __sync_val_compare_and_swap( dest, compare, xchg ); +} + +static FORCEINLINE LONGLONG WINAPI InterlockedCompareExchange64( LONGLONG volatile *dest, LONGLONG xchg, LONGLONG compare ) +{ + return __sync_val_compare_and_swap( dest, compare, xchg ); +} + +static FORCEINLINE LONG WINAPI InterlockedExchange( LONG volatile *dest, LONG val ) +{ + LONG ret; +#if defined(__i386__) || defined(__x86_64__) + __asm__ __volatile__( "lock; xchgl %0,(%1)" + : "=r" (ret) :"r" (dest), "0" (val) : "memory" ); +#else + do ret = *dest; while (!__sync_bool_compare_and_swap( dest, ret, val )); +#endif + return ret; +} + +static FORCEINLINE LONG WINAPI InterlockedExchangeAdd( LONG volatile *dest, LONG incr ) +{ + return __sync_fetch_and_add( dest, incr ); +} + +static FORCEINLINE LONG WINAPI InterlockedIncrement( LONG volatile *dest ) +{ + return __sync_add_and_fetch( dest, 1 ); +} + +static FORCEINLINE LONG WINAPI InterlockedDecrement( LONG volatile *dest ) +{ + return __sync_add_and_fetch( dest, -1 ); +} + +static FORCEINLINE void * WINAPI InterlockedExchangePointer( void *volatile *dest, void *val ) +{ + void *ret; +#ifdef __x86_64__ + __asm__ __volatile__( "lock; xchgq %0,(%1)" : "=r" (ret) :"r" (dest), "0" (val) : "memory" ); +#elif defined(__i386__) + __asm__ __volatile__( "lock; xchgl %0,(%1)" : "=r" (ret) :"r" (dest), "0" (val) : "memory" ); +#else + do ret = *dest; while (!__sync_bool_compare_and_swap( dest, ret, val )); +#endif + return ret; +} + +#endif /* __GNUC__ */ + #ifdef _WIN64 #if defined(_MSC_VER)

1 0

Daniel Lehman : ntdll/tests: Add tests for semaphores.
by Alexandre Julliard Jan. 18, 2021

Jan. 18, 2021

Module: wine Branch: master Commit: c2daea89c420c20913d2918ef7e9a54a9cbf2979 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c2daea89c420c20913d2918e… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Sat Jan 16 14:08:20 2021 -0800 ntdll/tests: Add tests for semaphores. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/om.c | 79 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index c92b780541f..1bc94f984b5 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -46,6 +46,7 @@ static NTSTATUS (WINAPI *pNtQueryMutant) ( HANDLE, MUTANT_INFORMATION_CLASS, PVO static NTSTATUS (WINAPI *pNtReleaseMutant)( HANDLE, PLONG ); static NTSTATUS (WINAPI *pNtCreateSemaphore)( PHANDLE, ACCESS_MASK,const POBJECT_ATTRIBUTES,LONG,LONG ); static NTSTATUS (WINAPI *pNtOpenSemaphore)( PHANDLE, ACCESS_MASK, const POBJECT_ATTRIBUTES ); +static NTSTATUS (WINAPI *pNtQuerySemaphore)( PHANDLE, SEMAPHORE_INFORMATION_CLASS, PVOID, ULONG, PULONG ); static NTSTATUS (WINAPI *pNtCreateTimer) ( PHANDLE, ACCESS_MASK, const POBJECT_ATTRIBUTES, TIMER_TYPE ); static NTSTATUS (WINAPI *pNtOpenTimer)( PHANDLE, ACCESS_MASK, const POBJECT_ATTRIBUTES ); static NTSTATUS (WINAPI *pNtCreateSection)( PHANDLE, ACCESS_MASK, const POBJECT_ATTRIBUTES, const PLARGE_INTEGER, @@ -2024,6 +2025,82 @@ static void test_mutant(void) NtClose( mutant ); } +static void test_semaphore(void) +{ + SEMAPHORE_BASIC_INFORMATION info; + OBJECT_ATTRIBUTES attr; + UNICODE_STRING str; + NTSTATUS status; + HANDLE semaphore; + ULONG prev; + ULONG len; + DWORD ret; + + pRtlInitUnicodeString(&str, L"\\BaseNamedObjects\\test_semaphore"); + InitializeObjectAttributes(&attr, &str, 0, 0, NULL); + + status = pNtCreateSemaphore(&semaphore, GENERIC_ALL, &attr, 2, 1); + ok( status == STATUS_INVALID_PARAMETER, "Failed to create Semaphore(%08x)\n", status ); + status = pNtCreateSemaphore(&semaphore, GENERIC_ALL, &attr, 1, 2); + ok( status == STATUS_SUCCESS, "Failed to create Semaphore(%08x)\n", status ); + + /* bogus */ + status = pNtQuerySemaphore(semaphore, SemaphoreBasicInformation, &info, 0, NULL); + ok( status == STATUS_INFO_LENGTH_MISMATCH, + "Failed to NtQuerySemaphore, expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status ); + status = pNtQuerySemaphore(semaphore, 0x42, &info, sizeof(info), NULL); + ok( status == STATUS_INVALID_INFO_CLASS, + "Failed to NtQuerySemaphore, expected STATUS_INVALID_INFO_CLASS, got %08x\n", status ); + status = pNtQuerySemaphore((HANDLE)0xdeadbeef, SemaphoreBasicInformation, &info, sizeof(info), NULL); + ok( status == STATUS_INVALID_HANDLE, + "Failed to NtQuerySemaphore, expected STATUS_INVALID_HANDLE, got %08x\n", status ); + + len = -1; + memset(&info, 0xcc, sizeof(info)); + status = pNtQuerySemaphore(semaphore, SemaphoreBasicInformation, &info, sizeof(info), &len); + ok( status == STATUS_SUCCESS, "NtQuerySemaphore failed %08x\n", status ); + ok( info.CurrentCount == 1, "expected 1, got %d\n", info.CurrentCount ); + ok( info.MaximumCount == 2, "expected 2, got %d\n", info.MaximumCount ); + ok( len == sizeof(info), "got %u\n", len ); + + ret = WaitForSingleObject( semaphore, 1000 ); + ok( ret == WAIT_OBJECT_0, "WaitForSingleObject failed %08x\n", ret ); + + memset(&info, 0xcc, sizeof(info)); + status = pNtQuerySemaphore(semaphore, SemaphoreBasicInformation, &info, sizeof(info), NULL); + ok( status == STATUS_SUCCESS, "NtQuerySemaphore failed %08x\n", status ); + ok( info.CurrentCount == 0, "expected 0, got %d\n", info.CurrentCount ); + ok( info.MaximumCount == 2, "expected 2, got %d\n", info.MaximumCount ); + + prev = 0xdeadbeef; + status = pNtReleaseSemaphore(semaphore, 3, &prev); + ok( status == STATUS_SEMAPHORE_LIMIT_EXCEEDED, "NtReleaseSemaphore failed %08x\n", status ); + ok( prev == 0xdeadbeef, "NtReleaseSemaphore failed, expected 0xdeadbeef, got %d\n", prev ); + + prev = 0xdeadbeef; + status = pNtReleaseSemaphore(semaphore, 1, &prev); + ok( status == STATUS_SUCCESS, "NtReleaseSemaphore failed %08x\n", status ); + ok( prev == 0, "NtReleaseSemaphore failed, expected 0, got %d\n", prev ); + + prev = 0xdeadbeef; + status = pNtReleaseSemaphore(semaphore, 1, &prev); + ok( status == STATUS_SUCCESS, "NtReleaseSemaphore failed %08x\n", status ); + ok( prev == 1, "NtReleaseSemaphore failed, expected 1, got %d\n", prev ); + + prev = 0xdeadbeef; + status = pNtReleaseSemaphore(semaphore, 1, &prev); + ok( status == STATUS_SEMAPHORE_LIMIT_EXCEEDED, "NtReleaseSemaphore failed %08x\n", status ); + ok( prev == 0xdeadbeef, "NtReleaseSemaphore failed, expected 0xdeadbeef, got %d\n", prev ); + + memset(&info, 0xcc, sizeof(info)); + status = pNtQuerySemaphore(semaphore, SemaphoreBasicInformation, &info, sizeof(info), NULL); + ok( status == STATUS_SUCCESS, "NtQuerySemaphore failed %08x\n", status ); + ok( info.CurrentCount == 2, "expected 2, got %d\n", info.CurrentCount ); + ok( info.MaximumCount == 2, "expected 2, got %d\n", info.MaximumCount ); + + NtClose( semaphore ); +} + static void test_wait_on_address(void) { DWORD ticks; @@ -2178,6 +2255,7 @@ START_TEST(om) pNtQuerySymbolicLinkObject = (void *)GetProcAddress(hntdll, "NtQuerySymbolicLinkObject"); pNtCreateSemaphore = (void *)GetProcAddress(hntdll, "NtCreateSemaphore"); pNtOpenSemaphore = (void *)GetProcAddress(hntdll, "NtOpenSemaphore"); + pNtQuerySemaphore = (void *)GetProcAddress(hntdll, "NtQuerySemaphore"); pNtCreateTimer = (void *)GetProcAddress(hntdll, "NtCreateTimer"); pNtOpenTimer = (void *)GetProcAddress(hntdll, "NtOpenTimer"); pNtCreateSection = (void *)GetProcAddress(hntdll, "NtCreateSection"); @@ -2207,6 +2285,7 @@ START_TEST(om) test_type_mismatch(); test_event(); test_mutant(); + test_semaphore(); test_keyed_events(); test_null_device(); test_wait_on_address();

1 0

Ziqing Hui : gdiplus/tests: Add tests for drawing on printer DC.
by Alexandre Julliard Jan. 18, 2021

Jan. 18, 2021

Module: wine Branch: master Commit: ae7d81317bf7a8cd537ee41e972dad4ad635dd3a URL: https://source.winehq.org/git/wine.git/?a=commit;h=ae7d81317bf7a8cd537ee41e… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Sat Jan 16 11:17:48 2021 +0800 gdiplus/tests: Add tests for drawing on printer DC. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/graphics.c | 157 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 157 insertions(+) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 2b1628f4e9c..738656b1c63 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -23,6 +23,7 @@ #include "objbase.h" #include "gdiplus.h" +#include "winspool.h" #include "wine/test.h" #define expect(expected, got) ok((got) == (expected), "Expected %d, got %d\n", (INT)(expected), (INT)(got)) @@ -7071,6 +7072,161 @@ static void test_gdi_interop_hdc(void) DeleteObject(hbm); } +static HDC create_printer_dc(void) +{ + char buffer[260]; + DWORD len; + PRINTER_INFO_2A *pbuf = NULL; + DRIVER_INFO_3A *dbuf = NULL; + HANDLE hprn = 0; + HDC hdc = 0; + HMODULE winspool = LoadLibraryA("winspool.drv"); + BOOL (WINAPI *pOpenPrinterA)(LPSTR, HANDLE *, LPPRINTER_DEFAULTSA); + BOOL (WINAPI *pGetDefaultPrinterA)(LPSTR, LPDWORD); + BOOL (WINAPI *pGetPrinterA)(HANDLE, DWORD, LPBYTE, DWORD, LPDWORD); + BOOL (WINAPI *pGetPrinterDriverA)(HANDLE, LPSTR, DWORD, LPBYTE, DWORD, LPDWORD); + BOOL (WINAPI *pClosePrinter)(HANDLE); + + pGetDefaultPrinterA = (void *)GetProcAddress(winspool, "GetDefaultPrinterA"); + pOpenPrinterA = (void *)GetProcAddress(winspool, "OpenPrinterA"); + pGetPrinterA = (void *)GetProcAddress(winspool, "GetPrinterA"); + pGetPrinterDriverA = (void *)GetProcAddress(winspool, "GetPrinterDriverA"); + pClosePrinter = (void *)GetProcAddress(winspool, "ClosePrinter"); + + if (!pGetDefaultPrinterA || !pOpenPrinterA || !pGetPrinterA || !pGetPrinterDriverA || !pClosePrinter) + goto done; + + len = sizeof(buffer); + if (!pGetDefaultPrinterA(buffer, &len)) goto done; + if (!pOpenPrinterA(buffer, &hprn, NULL)) goto done; + + pGetPrinterA(hprn, 2, NULL, 0, &len); + pbuf = HeapAlloc(GetProcessHeap(), 0, len); + if (!pGetPrinterA(hprn, 2, (LPBYTE)pbuf, len, &len)) goto done; + + pGetPrinterDriverA(hprn, NULL, 3, NULL, 0, &len); + dbuf = HeapAlloc(GetProcessHeap(), 0, len); + if (!pGetPrinterDriverA(hprn, NULL, 3, (LPBYTE)dbuf, len, &len)) goto done; + + hdc = CreateDCA(dbuf->pDriverPath, pbuf->pPrinterName, pbuf->pPortName, pbuf->pDevMode); + trace("hdc %p for driver '%s' printer '%s' port '%s'\n", hdc, + dbuf->pDriverPath, pbuf->pPrinterName, pbuf->pPortName); +done: + HeapFree(GetProcessHeap(), 0, dbuf); + HeapFree(GetProcessHeap(), 0, pbuf); + if (hprn) pClosePrinter(hprn); + if (winspool) FreeLibrary(winspool); + return hdc; +} + +static BOOL check_rect_pixels(const DWORD *pixel, const RectF *rect, UINT width, DWORD expected, Point *failed) +{ + UINT x, y; + BOOL ret = TRUE; + + for (y = (UINT)rect->Y; y < (UINT)(rect->Y + rect->Height); y++) + { + for (x = (UINT)rect->X; x < (UINT)(rect->X + rect->Width); x++) + { + if (pixel[x + y * width] != expected) + { + ret = FALSE; + goto done; + } + } + } + +done: + if (!ret) + { + failed->X = x; + failed->Y = y; + } + else + { + failed->X = 0; + failed->Y = 0; + } + return ret; +} + +static void test_printer_dc(void) +{ + HDC hdc_printer, hdc; + Status status; + GpGraphics *graphics; + REAL dpi_x, dpi_y, pixel_per_unit_x, pixel_per_unit_y; + HBITMAP bitmap; + UINT width = 16, height = 16; + GpUnit unit; + GpSolidFill *brush; + DWORD *pixel; + BOOL match; + RectF rect; + Point pt; + + hdc_printer = create_printer_dc(); + if (!hdc_printer) + { + skip("could not create a DC for the default printer\n"); + return; + } + + hdc = CreateCompatibleDC(hdc_printer); + bitmap = CreateCompatibleBitmap(hdc, width, height); + SelectObject(hdc, bitmap); + + status = GdipCreateFromHDC(hdc, &graphics); + expect(Ok, status); + + GdipGetPageUnit(graphics, &unit); + expect(UnitDisplay, unit); + + GdipGetDpiX(graphics, &dpi_x); + GdipGetDpiY(graphics, &dpi_y); + expectf((REAL)GetDeviceCaps(hdc, LOGPIXELSX), dpi_x); + expectf((REAL)GetDeviceCaps(hdc, LOGPIXELSY), dpi_y); + + /* For graphics created from printer DC, UnitDisplay specifies that a unit is 1/100 inch */ + pixel_per_unit_x = dpi_x / 100.0; + pixel_per_unit_y = dpi_y / 100.0; + + status = GdipCreateSolidFill((ARGB)0xffffffff, &brush); + expect(Ok, status); + + status = GdipFillRectangleI(graphics, (GpBrush *)brush, 1, 1, 1, 1); + expect(Ok, status); + + pixel = GetBitmapPixelBuffer(hdc, bitmap, width, height); + + /* pixels at (0, 0) should all be 0 */ + rect.X = 0; + rect.Y = 0; + rect.Width = pixel_per_unit_x; + rect.Height = pixel_per_unit_y; + match = check_rect_pixels(pixel, &rect, width, 0, &pt); + todo_wine + ok(match, "Expected pixel (%u, %u) to be %08x, got %08x\n", + pt.X, pt.Y, 0, pixel[pt.X + pt.Y * width]); + + /* pixels at (1, 1) should all be 0x00ffffff */ + rect.X = pixel_per_unit_x; + rect.Y = pixel_per_unit_y; + rect.Width = pixel_per_unit_x; + rect.Height = pixel_per_unit_y; + match = check_rect_pixels(pixel, &rect, width, 0x00ffffff, &pt); + todo_wine + ok(match, "Expected pixel (%u, %u) to be %08x, got %08x\n", + pt.X, pt.Y, 0x00ffffff, pixel[pt.X + pt.Y * width]); + + GdipFree(pixel); + GdipDeleteBrush((GpBrush *)brush); + GdipDeleteGraphics(graphics); + DeleteObject(bitmap); + DeleteDC(hdc); + DeleteDC(hdc_printer); +} + START_TEST(graphics) { struct GdiplusStartupInput gdiplusStartupInput; @@ -7166,6 +7322,7 @@ START_TEST(graphics) test_hdc_caching(); test_gdi_interop_bitmap(); test_gdi_interop_hdc(); + test_printer_dc(); GdiplusShutdown(gdiplusToken); DestroyWindow( hwnd );

1 0

Zebediah Figura : winegstreamer: Explicitly store a GstCaps pointer in the parser_source structure.
by Alexandre Julliard Jan. 18, 2021

Jan. 18, 2021

Module: wine Branch: master Commit: c38fcd19b38b0ec1d3f556013bc9dc1ebad769bf URL: https://source.winehq.org/git/wine.git/?a=commit;h=c38fcd19b38b0ec1d3f55601… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jan 15 17:59:19 2021 -0600 winegstreamer: Explicitly store a GstCaps pointer in the parser_source structure. gst_pad_get_current_caps() is not guaranteed to return the updated caps when GST_EVENT_CAPS is handled by the event handler, or even after gst_pad_event_default(). The actual implementation of gst_pad_send_event() in fact sets it later. Avoid a potential race condition by using our own caps pointer. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 36 +++++++++++++----------------------- 1 file changed, 13 insertions(+), 23 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index f30264f1c88..d6b47e871d5 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -83,6 +83,7 @@ struct parser_source GstElement *flip; HANDLE caps_event, eos_event; GstSegment *segment; + GstCaps *caps; SourceSeeking seek; }; @@ -720,9 +721,12 @@ static gboolean event_sink(GstPad *pad, GstObject *parent, GstEvent *event) break; case GST_EVENT_CAPS: { - gboolean ret = gst_pad_event_default(pad, parent, event); + GstCaps *caps; + + gst_event_parse_caps(event, &caps); + gst_caps_replace(&pin->caps, caps); SetEvent(pin->caps_event); - return ret; + break; } default: WARN("Ignoring \"%s\" event.\n", GST_EVENT_TYPE_NAME(event)); @@ -1712,7 +1716,7 @@ static HRESULT decodebin_parser_source_query_accept(struct parser_source *pin, c static HRESULT decodebin_parser_source_get_media_type(struct parser_source *pin, unsigned int index, AM_MEDIA_TYPE *mt) { - GstCaps *caps = gst_pad_get_current_caps(pin->my_sink); + const GstCaps *caps = pin->caps; const GstStructure *structure; const char *type; @@ -1744,10 +1748,7 @@ static HRESULT decodebin_parser_source_get_media_type(struct parser_source *pin, if (amt_from_gst_caps(caps, mt)) { if (!index--) - { - gst_caps_unref(caps); return S_OK; - } FreeMediaType(mt); } @@ -1756,7 +1757,6 @@ static HRESULT decodebin_parser_source_get_media_type(struct parser_source *pin, gint width, height, fps_n, fps_d; GstVideoInfo info; - gst_caps_unref(caps); gst_structure_get_int(structure, "width", &width); gst_structure_get_int(structure, "height", &height); gst_video_info_set_format(&info, video_formats[index], width, height); @@ -1774,7 +1774,6 @@ static HRESULT decodebin_parser_source_get_media_type(struct parser_source *pin, GstAudioInfo info; gint rate; - gst_caps_unref(caps); gst_structure_get_int(structure, "rate", &rate); gst_audio_info_set_format(&info, GST_AUDIO_FORMAT_S16LE, rate, 2, NULL); if (!amt_from_gst_audio_info(&info, mt)) @@ -1782,7 +1781,6 @@ static HRESULT decodebin_parser_source_get_media_type(struct parser_source *pin, return S_OK; } - gst_caps_unref(caps); return VFW_S_NO_MORE_ITEMS; } @@ -2406,20 +2404,12 @@ static BOOL wave_parser_init_gst(struct parser *filter) return TRUE; } -static gboolean get_source_amt(const struct parser_source *pin, AM_MEDIA_TYPE *mt) -{ - GstCaps *caps = gst_pad_get_current_caps(pin->my_sink); - gboolean ret = amt_from_gst_caps(caps, mt); - gst_caps_unref(caps); - return ret; -} - static HRESULT wave_parser_source_query_accept(struct parser_source *pin, const AM_MEDIA_TYPE *mt) { AM_MEDIA_TYPE pad_mt; HRESULT hr; - if (!get_source_amt(pin, &pad_mt)) + if (!amt_from_gst_caps(pin->caps, &pad_mt)) return E_OUTOFMEMORY; hr = compare_media_types(mt, &pad_mt) ? S_OK : S_FALSE; FreeMediaType(&pad_mt); @@ -2431,7 +2421,7 @@ static HRESULT wave_parser_source_get_media_type(struct parser_source *pin, { if (index > 0) return VFW_S_NO_MORE_ITEMS; - if (!get_source_amt(pin, mt)) + if (!amt_from_gst_caps(pin->caps, mt)) return E_OUTOFMEMORY; return S_OK; } @@ -2538,7 +2528,7 @@ static HRESULT avi_splitter_source_query_accept(struct parser_source *pin, const AM_MEDIA_TYPE pad_mt; HRESULT hr; - if (!get_source_amt(pin, &pad_mt)) + if (!amt_from_gst_caps(pin->caps, &pad_mt)) return E_OUTOFMEMORY; hr = compare_media_types(mt, &pad_mt) ? S_OK : S_FALSE; FreeMediaType(&pad_mt); @@ -2550,7 +2540,7 @@ static HRESULT avi_splitter_source_get_media_type(struct parser_source *pin, { if (index > 0) return VFW_S_NO_MORE_ITEMS; - if (!get_source_amt(pin, mt)) + if (!amt_from_gst_caps(pin->caps, mt)) return E_OUTOFMEMORY; return S_OK; } @@ -2671,7 +2661,7 @@ static HRESULT mpeg_splitter_source_query_accept(struct parser_source *pin, cons AM_MEDIA_TYPE pad_mt; HRESULT hr; - if (!get_source_amt(pin, &pad_mt)) + if (!amt_from_gst_caps(pin->caps, &pad_mt)) return E_OUTOFMEMORY; hr = compare_media_types(mt, &pad_mt) ? S_OK : S_FALSE; FreeMediaType(&pad_mt); @@ -2683,7 +2673,7 @@ static HRESULT mpeg_splitter_source_get_media_type(struct parser_source *pin, { if (index > 0) return VFW_S_NO_MORE_ITEMS; - if (!get_source_amt(pin, mt)) + if (!amt_from_gst_caps(pin->caps, mt)) return E_OUTOFMEMORY; return S_OK; }

1 0

Zebediah Figura : winegstreamer: Unify the decodebin parser definitions under the name "decodebin_parser".
by Alexandre Julliard Jan. 18, 2021

Jan. 18, 2021

Module: wine Branch: master Commit: b5540862823ab80924b8967f55f2656a2eb39e49 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b5540862823ab80924b8967f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jan 15 17:59:17 2021 -0600 winegstreamer: Unify the decodebin parser definitions under the name "decodebin_parser". Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gst_guids.h | 2 +- dlls/winegstreamer/gst_private.h | 2 +- dlls/winegstreamer/gstdemux.c | 16 ++++++++-------- dlls/winegstreamer/main.c | 18 +++++++++--------- dlls/winegstreamer/winegstreamer_classes.idl | 4 ++-- 5 files changed, 21 insertions(+), 21 deletions(-) diff --git a/dlls/winegstreamer/gst_guids.h b/dlls/winegstreamer/gst_guids.h index b5ed3139b60..ea859586d7f 100644 --- a/dlls/winegstreamer/gst_guids.h +++ b/dlls/winegstreamer/gst_guids.h @@ -19,5 +19,5 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -DEFINE_GUID(CLSID_Gstreamer_Splitter, 0xf9d8d64e, 0xa144, 0x47dc, 0x8e, 0xe0, 0xf5, 0x34, 0x98, 0x37, 0x2c, 0x29); +DEFINE_GUID(CLSID_decodebin_parser, 0xf9d8d64e, 0xa144, 0x47dc, 0x8e, 0xe0, 0xf5, 0x34, 0x98, 0x37, 0x2c, 0x29); DEFINE_GUID(WINESUBTYPE_Gstreamer, 0xffffffff, 0x128f, 0x4dd1, 0xad, 0x22, 0xbe, 0xcf, 0xa6, 0x6c, 0xe7, 0xaa); diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index 9518f721504..e591a95f3ca 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -67,7 +67,7 @@ static inline const char *debugstr_time(REFERENCE_TIME time) extern LONG object_locks; HRESULT avi_splitter_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; -HRESULT gstdemux_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; +HRESULT decodebin_parser_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; HRESULT mpeg_splitter_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; HRESULT wave_parser_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 19b35e462ed..040da3f2ce0 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1634,7 +1634,7 @@ static const struct strmbase_sink_ops sink_ops = .sink_disconnect = parser_sink_disconnect, }; -static BOOL gstdecoder_init_gst(struct parser *filter) +static BOOL decodebin_parser_init_gst(struct parser *filter) { GstElement *element = gst_element_factory_make("decodebin", NULL); unsigned int i; @@ -1692,7 +1692,7 @@ static BOOL gstdecoder_init_gst(struct parser *filter) return TRUE; } -static HRESULT gstdecoder_source_query_accept(struct parser_source *pin, const AM_MEDIA_TYPE *mt) +static HRESULT decodebin_parser_source_query_accept(struct parser_source *pin, const AM_MEDIA_TYPE *mt) { /* At least make sure we can convert it to GstCaps. */ GstCaps *caps = amt_to_gst_caps(mt); @@ -1703,7 +1703,7 @@ static HRESULT gstdecoder_source_query_accept(struct parser_source *pin, const A return S_OK; } -static HRESULT gstdecoder_source_get_media_type(struct parser_source *pin, +static HRESULT decodebin_parser_source_get_media_type(struct parser_source *pin, unsigned int index, AM_MEDIA_TYPE *mt) { GstCaps *caps = gst_pad_get_current_caps(pin->my_sink); @@ -1788,7 +1788,7 @@ static BOOL parser_init_gstreamer(void) return TRUE; } -HRESULT gstdemux_create(IUnknown *outer, IUnknown **out) +HRESULT decodebin_parser_create(IUnknown *outer, IUnknown **out) { struct parser *object; @@ -1800,14 +1800,14 @@ HRESULT gstdemux_create(IUnknown *outer, IUnknown **out) if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; - strmbase_filter_init(&object->filter, outer, &CLSID_Gstreamer_Splitter, &filter_ops); + strmbase_filter_init(&object->filter, outer, &CLSID_decodebin_parser, &filter_ops); strmbase_sink_init(&object->sink, &object->filter, wcsInputPinName, &sink_ops, NULL); object->no_more_pads_event = CreateEventW(NULL, FALSE, FALSE, NULL); object->error_event = CreateEventW(NULL, TRUE, FALSE, NULL); - object->init_gst = gstdecoder_init_gst; - object->source_query_accept = gstdecoder_source_query_accept; - object->source_get_media_type = gstdecoder_source_get_media_type; + object->init_gst = decodebin_parser_init_gst; + object->source_query_accept = decodebin_parser_source_query_accept; + object->source_get_media_type = decodebin_parser_source_get_media_type; TRACE("Created GStreamer demuxer %p.\n", object); *out = &object->filter.IUnknown_inner; diff --git a/dlls/winegstreamer/main.c b/dlls/winegstreamer/main.c index 385c5550235..3c630a1561f 100644 --- a/dlls/winegstreamer/main.c +++ b/dlls/winegstreamer/main.c @@ -135,7 +135,7 @@ static const IClassFactoryVtbl class_factory_vtbl = }; static struct class_factory avi_splitter_cf = {{&class_factory_vtbl}, avi_splitter_create}; -static struct class_factory gstdemux_cf = {{&class_factory_vtbl}, gstdemux_create}; +static struct class_factory decodebin_parser_cf = {{&class_factory_vtbl}, decodebin_parser_create}; static struct class_factory mpeg_splitter_cf = {{&class_factory_vtbl}, mpeg_splitter_create}; static struct class_factory wave_parser_cf = {{&class_factory_vtbl}, wave_parser_create}; @@ -154,8 +154,8 @@ HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID iid, void **out) if (IsEqualGUID(clsid, &CLSID_AviSplitter)) factory = &avi_splitter_cf; - else if (IsEqualGUID(clsid, &CLSID_Gstreamer_Splitter)) - factory = &gstdemux_cf; + else if (IsEqualGUID(clsid, &CLSID_decodebin_parser)) + factory = &decodebin_parser_cf; else if (IsEqualGUID(clsid, &CLSID_MPEG1Splitter)) factory = &mpeg_splitter_cf; else if (IsEqualGUID(clsid, &CLSID_WAVEParser)) @@ -321,7 +321,7 @@ static const REGFILTER2 reg_wave_parser = .u.s2.rgPins2 = reg_wave_parser_pins, }; -static const REGFILTERPINS2 reg_gstdemux_pins[3] = +static const REGFILTERPINS2 reg_decodebin_parser_pins[3] = { { .nMediaTypes = 1, @@ -339,12 +339,12 @@ static const REGFILTERPINS2 reg_gstdemux_pins[3] = }, }; -static const REGFILTER2 reg_gstdemux = +static const REGFILTER2 reg_decodebin_parser = { .dwVersion = 2, .dwMerit = MERIT_PREFERRED, .u.s2.cPins2 = 3, - .u.s2.rgPins2 = reg_gstdemux_pins, + .u.s2.rgPins2 = reg_decodebin_parser_pins, }; HRESULT WINAPI DllRegisterServer(void) @@ -362,8 +362,8 @@ HRESULT WINAPI DllRegisterServer(void) return hr; IFilterMapper2_RegisterFilter(mapper, &CLSID_AviSplitter, avi_splitterW, NULL, NULL, NULL, &reg_avi_splitter); - IFilterMapper2_RegisterFilter(mapper, &CLSID_Gstreamer_Splitter, - wGstreamer_Splitter, NULL, NULL, NULL, &reg_gstdemux); + IFilterMapper2_RegisterFilter(mapper, &CLSID_decodebin_parser, + wGstreamer_Splitter, NULL, NULL, NULL, &reg_decodebin_parser); IFilterMapper2_RegisterFilter(mapper, &CLSID_MPEG1Splitter, mpeg_splitterW, NULL, NULL, NULL, &reg_mpeg_splitter); IFilterMapper2_RegisterFilter(mapper, &CLSID_WAVEParser, wave_parserW, NULL, NULL, NULL, &reg_wave_parser); @@ -387,7 +387,7 @@ HRESULT WINAPI DllUnregisterServer(void) return hr; IFilterMapper2_UnregisterFilter(mapper, NULL, NULL, &CLSID_AviSplitter); - IFilterMapper2_UnregisterFilter(mapper, NULL, NULL, &CLSID_Gstreamer_Splitter); + IFilterMapper2_UnregisterFilter(mapper, NULL, NULL, &CLSID_decodebin_parser); IFilterMapper2_UnregisterFilter(mapper, NULL, NULL, &CLSID_MPEG1Splitter); IFilterMapper2_UnregisterFilter(mapper, NULL, NULL, &CLSID_WAVEParser); diff --git a/dlls/winegstreamer/winegstreamer_classes.idl b/dlls/winegstreamer/winegstreamer_classes.idl index cf1fc69f38a..072ec90eea4 100644 --- a/dlls/winegstreamer/winegstreamer_classes.idl +++ b/dlls/winegstreamer/winegstreamer_classes.idl @@ -43,11 +43,11 @@ coclass MPEG1Splitter {} coclass WAVEParser {} [ - helpstring("GStreamer splitter"), + helpstring("GStreamer parser using decodebin"), threading(both), uuid(f9d8d64e-a144-47dc-8ee0-f53498372c29) ] -coclass Gstreamer_Splitter {} +coclass decodebin_parser {} [ threading(both),

1 0

Zebediah Figura : winegstreamer: Rename gstdemux to parser.
by Alexandre Julliard Jan. 18, 2021

Jan. 18, 2021

Module: wine Branch: master Commit: 6f18c099784f1c1b2ecb93fa1c00214028c11b98 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f18c099784f1c1b2ecb93fa… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jan 15 17:59:16 2021 -0600 winegstreamer: Rename gstdemux to parser. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 146 +++++++++++++++++++++--------------------- 1 file changed, 73 insertions(+), 73 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6f18c099784f1c1b2ecb…

1 0