May 2020 - Wine-Commits - list.winehq.org

Jacek Caban : riched20: Include wine/asm.h in editstr.h.
by Alexandre Julliard May 4, 2020

May 4, 2020

Module: wine Branch: master Commit: 9763f5189f1312c82c98b3ce25cb8100ae4cb420 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9763f5189f1312c82c98b3ce… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun May 3 14:09:42 2020 +0200 riched20: Include wine/asm.h in editstr.h. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49068 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editstr.h | 1 + dlls/riched20/txthost.c | 1 - dlls/riched20/txtsrv.c | 1 - 3 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/riched20/editstr.h b/dlls/riched20/editstr.h index a65169056e..2c5737f3e9 100644 --- a/dlls/riched20/editstr.h +++ b/dlls/riched20/editstr.h @@ -43,6 +43,7 @@ #include <textserv.h> #include "usp10.h" +#include "wine/asm.h" #include "wine/debug.h" #include "wine/heap.h" #include "wine/list.h" diff --git a/dlls/riched20/txthost.c b/dlls/riched20/txthost.c index 5992fc0b06..99f446e581 100644 --- a/dlls/riched20/txthost.c +++ b/dlls/riched20/txthost.c @@ -25,7 +25,6 @@ #include "richole.h" #include "imm.h" #include "textserv.h" -#include "wine/asm.h" #include "wine/debug.h" #include "editstr.h" diff --git a/dlls/riched20/txtsrv.c b/dlls/riched20/txtsrv.c index 12761621c4..622d851928 100644 --- a/dlls/riched20/txtsrv.c +++ b/dlls/riched20/txtsrv.c @@ -27,7 +27,6 @@ #include "tom.h" #include "imm.h" #include "textserv.h" -#include "wine/asm.h" #include "wine/debug.h" #include "editstr.h"

1 0

Alexandre Julliard : include: Use the gcc interlocked functions also on i386 if possible.
by Alexandre Julliard May 4, 2020

May 4, 2020

Module: wine Branch: master Commit: adb45d2294c0b165970a9b7d03713c8bc768ba0a URL: https://source.winehq.org/git/wine.git/?a=commit;h=adb45d2294c0b165970a9b7d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat May 2 15:09:58 2020 +0200 include: Use the gcc interlocked functions also on i386 if possible. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winbase.h | 85 ++++++++++++++++++++++++------------------------------ include/winternl.h | 1 + 2 files changed, 38 insertions(+), 48 deletions(-) diff --git a/include/winbase.h b/include/winbase.h index 1f36782d20..f92d864c78 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2975,71 +2975,63 @@ static FORCEINLINE void *WINAPI InterlockedExchangePointer( void *volatile *dest #endif -#elif defined(__i386__) -# if defined(__GNUC__) && !defined(_NTSYSTEM_) && ((__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 2))) +#elif defined(__GNUC__) static FORCEINLINE LONG WINAPI InterlockedCompareExchange( LONG volatile *dest, LONG xchg, LONG compare ) { +#ifdef __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4 + return __sync_val_compare_and_swap( dest, compare, xchg ); +#else LONG ret; __asm__ __volatile__( "lock; cmpxchgl %2,(%1)" : "=a" (ret) : "r" (dest), "r" (xchg), "0" (compare) : "memory" ); return ret; +#endif } 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 ) { +#ifdef __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4 + return __sync_fetch_and_add( dest, incr ); +#else LONG ret; __asm__ __volatile__( "lock; xaddl %0,(%1)" : "=r" (ret) : "r" (dest), "0" (incr) : "memory" ); return ret; +#endif } static FORCEINLINE LONG WINAPI InterlockedIncrement( LONG volatile *dest ) { +#ifdef __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4 + return __sync_add_and_fetch( dest, 1 ); +#else return InterlockedExchangeAdd( dest, 1 ) + 1; +#endif } static FORCEINLINE LONG WINAPI InterlockedDecrement( LONG volatile *dest ) { +#ifdef __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4 + return __sync_add_and_fetch( dest, -1 ); +#else return InterlockedExchangeAdd( dest, -1 ) - 1; +#endif } -# else /* __GNUC__ */ - -WINBASEAPI LONG WINAPI InterlockedCompareExchange(LONG volatile*,LONG,LONG); -WINBASEAPI LONG WINAPI InterlockedDecrement(LONG volatile*); -WINBASEAPI LONG WINAPI InterlockedExchange(LONG volatile*,LONG); -WINBASEAPI LONG WINAPI InterlockedExchangeAdd(LONG volatile*,LONG); -WINBASEAPI LONG WINAPI InterlockedIncrement(LONG volatile*); - -# endif /* __GNUC__ */ - -static FORCEINLINE PVOID WINAPI InterlockedCompareExchangePointer( PVOID volatile *dest, PVOID xchg, PVOID compare ) -{ - return (PVOID)InterlockedCompareExchange( (LONG volatile*)dest, (LONG)xchg, (LONG)compare ); -} - -static FORCEINLINE PVOID WINAPI InterlockedExchangePointer( PVOID volatile *dest, PVOID val ) -{ - return (PVOID)InterlockedExchange( (LONG volatile*)dest, (LONG)val ); -} - -WINBASEAPI LONGLONG WINAPI InterlockedCompareExchange64(LONGLONG volatile*,LONGLONG,LONGLONG); - -#elif defined(__GNUC__) - -static FORCEINLINE LONG WINAPI InterlockedCompareExchange( LONG volatile *dest, LONG xchg, LONG compare ) -{ - return __sync_val_compare_and_swap( dest, compare, xchg ); -} +#ifdef _WIN64 static FORCEINLINE PVOID WINAPI InterlockedCompareExchangePointer( PVOID volatile *dest, PVOID xchg, PVOID compare ) { @@ -3051,17 +3043,6 @@ static FORCEINLINE LONGLONG WINAPI InterlockedCompareExchange64( LONGLONG volati return __sync_val_compare_and_swap( dest, compare, xchg ); } -static FORCEINLINE LONG WINAPI InterlockedExchange( LONG volatile *dest, LONG val ) -{ - LONG ret; -#ifdef __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 PVOID WINAPI InterlockedExchangePointer( PVOID volatile *dest, PVOID val ) { PVOID ret; @@ -3073,22 +3054,30 @@ static FORCEINLINE PVOID WINAPI InterlockedExchangePointer( PVOID volatile *dest return ret; } -static FORCEINLINE LONG WINAPI InterlockedExchangeAdd( LONG volatile *dest, LONG incr ) +#else + +static FORCEINLINE PVOID WINAPI InterlockedCompareExchangePointer( PVOID volatile *dest, PVOID xchg, PVOID compare ) { - return __sync_fetch_and_add( dest, incr ); + return (PVOID)InterlockedCompareExchange( (LONG volatile*)dest, (LONG)xchg, (LONG)compare ); } -static FORCEINLINE LONG WINAPI InterlockedIncrement( LONG volatile *dest ) +static FORCEINLINE PVOID WINAPI InterlockedExchangePointer( PVOID volatile *dest, PVOID val ) { - return __sync_add_and_fetch( dest, 1 ); + return (PVOID)InterlockedExchange( (LONG volatile*)dest, (LONG)val ); } -static FORCEINLINE LONG WINAPI InterlockedDecrement( LONG volatile *dest ) +#ifdef __GCC_HAVE_SYNC_COMPARE_AND_SWAP_8 +static FORCEINLINE LONGLONG WINAPI InterlockedCompareExchange64( LONGLONG volatile *dest, LONGLONG xchg, LONGLONG compare ) { - return __sync_add_and_fetch( dest, -1 ); + return __sync_val_compare_and_swap( dest, compare, xchg ); } +#else +WINBASEAPI LONGLONG WINAPI InterlockedCompareExchange64(LONGLONG volatile*,LONGLONG,LONGLONG); +#endif + +#endif -#endif /* __i386__ */ +#endif /* __GNUC__ */ #ifdef __WINESRC__ diff --git a/include/winternl.h b/include/winternl.h index 87d0bde295..fec0741204 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -3078,6 +3078,7 @@ NTSYSAPI UINT WINAPI RtlEnlargedUnsignedDivide(ULONGLONG,UINT,UINT *); NTSYSAPI LONGLONG WINAPI RtlExtendedMagicDivide(LONGLONG,LONGLONG,INT); NTSYSAPI LONGLONG WINAPI RtlExtendedIntegerMultiply(LONGLONG,INT); NTSYSAPI LONGLONG WINAPI RtlExtendedLargeIntegerDivide(LONGLONG,INT,INT *); +NTSYSAPI LONGLONG WINAPI RtlInterlockedCompareExchange64(LONGLONG*,LONGLONG,LONGLONG); NTSYSAPI LONGLONG WINAPI RtlLargeIntegerAdd(LONGLONG,LONGLONG); NTSYSAPI LONGLONG WINAPI RtlLargeIntegerArithmeticShift(LONGLONG,INT); NTSYSAPI ULONGLONG WINAPI RtlLargeIntegerDivide( ULONGLONG,ULONGLONG,ULONGLONG *);

1 0

Alexandre Julliard : libport: Get rid of interlocked functions.
by Alexandre Julliard May 4, 2020

May 4, 2020

Module: wine Branch: master Commit: 7eef40d444b3325f9580ff557afb6bc19c811f5e URL: https://source.winehq.org/git/wine.git/?a=commit;h=7eef40d444b3325f9580ff55… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat May 2 15:10:19 2020 +0200 libport: Get rid of interlocked functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/port.h | 132 --------------- libs/port/Makefile.in | 1 - libs/port/interlocked.c | 437 ------------------------------------------------ libs/wine/debug.c | 2 +- 4 files changed, 1 insertion(+), 571 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7eef40d444b3325f9580…

1 0

Nikolay Sivov : dwrite: Add helper functions to collect default GSUB features.
by Alexandre Julliard May 4, 2020

May 4, 2020

Module: wine Branch: master Commit: bd6a500ab095944a234cc93398d005569c5035a3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bd6a500ab095944a234cc933… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 4 11:29:32 2020 +0300 dwrite: Add helper functions to collect default GSUB features. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 19 +++++++---- dlls/dwrite/dwrite_private.h | 17 ++++++++-- dlls/dwrite/opentype.c | 10 ++++-- dlls/dwrite/shape.c | 80 ++++++++++++++++++++++++++++++++++++++++---- 4 files changed, 108 insertions(+), 18 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=bd6a500ab095944a234c…

1 0

Nikolay Sivov : dwrite: Initialize GSUB offsets in shaping cache.
by Alexandre Julliard May 4, 2020

May 4, 2020

Module: wine Branch: master Commit: 7208bc40dcbea8638c4679b451f88ce06f8ab981 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7208bc40dcbea8638c4679b4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 4 11:29:31 2020 +0300 dwrite: Initialize GSUB offsets in shaping cache. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 1 + dlls/dwrite/opentype.c | 10 ++++++++++ dlls/dwrite/shape.c | 1 + 3 files changed, 12 insertions(+) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index d89dacb3a4..4516189445 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -448,6 +448,7 @@ struct scriptshaping_cache void *context; UINT16 upem; + struct ot_gsubgpos_table gsub; struct ot_gsubgpos_table gpos; struct diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 66c3398316..a2af5ce954 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -2942,6 +2942,16 @@ DWRITE_CONTAINER_TYPE opentype_analyze_container_type(void const *data, UINT32 d void opentype_layout_scriptshaping_cache_init(struct scriptshaping_cache *cache) { + cache->font->grab_font_table(cache->context, MS_GSUB_TAG, &cache->gsub.table.data, &cache->gsub.table.size, + &cache->gsub.table.context); + + if (cache->gsub.table.data) + { + cache->gsub.script_list = table_read_be_word(&cache->gsub.table, FIELD_OFFSET(struct gpos_gsub_header, script_list)); + cache->gsub.feature_list = table_read_be_word(&cache->gsub.table, FIELD_OFFSET(struct gpos_gsub_header, feature_list)); + cache->gsub.lookup_list = table_read_be_word(&cache->gsub.table, FIELD_OFFSET(struct gpos_gsub_header, lookup_list)); + } + cache->font->grab_font_table(cache->context, MS_GPOS_TAG, &cache->gpos.table.data, &cache->gpos.table.size, &cache->gpos.table.context); diff --git a/dlls/dwrite/shape.c b/dlls/dwrite/shape.c index d7d1261f35..bd53f03513 100644 --- a/dlls/dwrite/shape.c +++ b/dlls/dwrite/shape.c @@ -52,6 +52,7 @@ void release_scriptshaping_cache(struct scriptshaping_cache *cache) return; cache->font->release_font_table(cache->context, cache->gdef.table.context); + cache->font->release_font_table(cache->context, cache->gsub.table.context); cache->font->release_font_table(cache->context, cache->gpos.table.context); heap_free(cache); }

1 0

Zebediah Figura : ntdll: Export RtlCopyMemoryNonTemporal.
by Alexandre Julliard May 4, 2020

May 4, 2020

Module: wine Branch: master Commit: 74f820fccca59b553b802c67731763fa7cb56e08 URL: https://source.winehq.org/git/wine.git/?a=commit;h=74f820fccca59b553b802c67… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat May 2 20:55:55 2020 -0500 ntdll: Export RtlCopyMemoryNonTemporal. Needed by Blindwrite 7's kernel driver. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 1 + dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 1 + include/ddk/wdm.h | 5 +++++ 3 files changed, 7 insertions(+) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 4f5fa8c21d..cb6a8ec8c4 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -526,6 +526,7 @@ @ stdcall RtlCopyLuid(ptr ptr) @ stdcall RtlCopyLuidAndAttributesArray(long ptr ptr) @ stdcall -arch=x86_64 RtlCopyMemory(ptr ptr long) +@ stdcall -arch=x86_64 RtlCopyMemoryNonTemporal(ptr ptr long) RtlCopyMemory # @ stub RtlCopyMemoryStreamTo # @ stub RtlCopyOutOfProcessMemoryStreamTo # @ stub RtlCopyRangeList diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 7e52751608..14d95a47f8 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -1002,6 +1002,7 @@ @ stdcall RtlCopyLuid(ptr ptr) @ stdcall RtlCopyLuidAndAttributesArray(long ptr ptr) @ stdcall -arch=x86_64 RtlCopyMemory(ptr ptr long) +@ stdcall -arch=x86_64 RtlCopyMemoryNonTemporal(ptr ptr long) RtlCopyMemory @ stub RtlCopyRangeList @ stdcall RtlCopySid(long ptr ptr) @ stdcall RtlCopyString(ptr ptr) diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index b180d11556..60396779fc 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1696,6 +1696,11 @@ HANDLE WINAPI PsGetProcessInheritedFromUniqueProcessId(PEPROCESS); BOOLEAN WINAPI PsGetVersion(ULONG*,ULONG*,ULONG*,UNICODE_STRING*); NTSTATUS WINAPI PsTerminateSystemThread(NTSTATUS); +#ifdef __x86_64__ +void WINAPI RtlCopyMemoryNonTemporal(void*,const void*,SIZE_T); +#else +#define RtlCopyMemoryNonTemporal RtlCopyMemory +#endif BOOLEAN WINAPI RtlIsNtDdiVersionAvailable(ULONG); NTSTATUS WINAPI ZwAddBootEntry(PUNICODE_STRING,PUNICODE_STRING);

1 0

Alexandre Julliard : server: Avoid using interlocked functions.
by Alexandre Julliard May 4, 2020

May 4, 2020

Module: wine Branch: master Commit: 2633a5c1ae542f08f127ba737fa59fb03ed6180b URL: https://source.winehq.org/git/wine.git/?a=commit;h=2633a5c1ae542f08f127ba73… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat May 2 15:10:14 2020 +0200 server: Avoid using interlocked functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/change.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/server/change.c b/server/change.c index 6091d21f7f..a8f3329c72 100644 --- a/server/change.c +++ b/server/change.c @@ -88,7 +88,7 @@ struct dir uid_t uid; /* file stat.st_uid */ struct list entry; /* entry in global change notifications list */ unsigned int filter; /* notification filter */ - int notified; /* SIGIO counter */ + volatile int notified; /* SIGIO counter */ int want_data; /* return change data */ int subtree; /* do we want to watch subdirectories? */ struct list change_records; /* data for the change */ @@ -307,7 +307,7 @@ void do_change_notify( int unix_fd ) LIST_FOR_EACH_ENTRY( dir, &change_list, struct dir, entry ) { if (get_unix_fd( dir->fd ) != unix_fd) continue; - interlocked_xchg_add( &dir->notified, 1 ); + dir->notified = 1; break; } } @@ -319,8 +319,9 @@ void sigio_callback(void) LIST_FOR_EACH_ENTRY( dir, &change_list, struct dir, entry ) { - if (interlocked_xchg( &dir->notified, 0 )) - fd_async_wake_up( dir->fd, ASYNC_TYPE_WAIT, STATUS_ALERTED ); + if (!dir->notified) continue; + dir->notified = 0; + fd_async_wake_up( dir->fd, ASYNC_TYPE_WAIT, STATUS_ALERTED ); } }

1 0

Zebediah Figura : quartz/vmr9: Remove the "force" parameter of VMR9_maybe_init().
by Alexandre Julliard May 4, 2020

May 4, 2020

Module: wine Branch: master Commit: 7da087b76a54221d62c474c0ba8211ba46ba07fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=7da087b76a54221d62c474c0… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri May 1 22:52:03 2020 -0500 quartz/vmr9: Remove the "force" parameter of VMR9_maybe_init(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/vmr9.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 113cb7cea4..93fc3417e7 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -387,7 +387,7 @@ static HRESULT initialize_device(struct quartz_vmr *filter, VMR9AllocationInfo * return hr; } -static HRESULT VMR9_maybe_init(struct quartz_vmr *filter, BOOL force, const AM_MEDIA_TYPE *mt) +static HRESULT allocate_surfaces(struct quartz_vmr *filter, const AM_MEDIA_TYPE *mt) { VMR9AllocationInfo info = {}; HRESULT hr = E_FAIL; @@ -418,11 +418,9 @@ static HRESULT VMR9_maybe_init(struct quartz_vmr *filter, BOOL force, const AM_M TRACE("Initializing in mode %u, our window %p, clipping window %p.\n", filter->mode, filter->baseControlWindow.hwnd, filter->hWndClippingWindow); - if (filter->num_surfaces) - return S_OK; if (filter->mode == VMR9Mode_Windowless && !filter->hWndClippingWindow) - return (force ? VFW_E_RUNTIME_ERROR : S_OK); + return S_OK; info.dwWidth = filter->source_rect.right; info.dwHeight = filter->source_rect.bottom; @@ -542,7 +540,7 @@ static HRESULT vmr_connect(struct strmbase_renderer *iface, const AM_MEDIA_TYPE if (filter->mode || SUCCEEDED(hr = IVMRFilterConfig9_SetRenderingMode(&filter->IVMRFilterConfig9_iface, VMR9Mode_Windowed))) - hr = VMR9_maybe_init(filter, FALSE, mt); + hr = allocate_surfaces(filter, mt); return hr; }

1 0

Alexandre Julliard : user32: Use the standard Interlocked* functions.
by Alexandre Julliard May 4, 2020

May 4, 2020

Module: wine Branch: master Commit: 5d5b6a1f35c6fee51dcef60818028061f03ce0ce URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d5b6a1f35c6fee51dcef608… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat May 2 15:10:10 2020 +0200 user32: Use the standard Interlocked* functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/hook.c | 2 +- dlls/user32/input.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/hook.c b/dlls/user32/hook.c index d3e78bb473..b6a3b3661f 100644 --- a/dlls/user32/hook.c +++ b/dlls/user32/hook.c @@ -449,7 +449,7 @@ static LRESULT call_hook( struct hook_info *info, INT code, WPARAM wparam, LPARA } if (info->id == WH_KEYBOARD_LL || info->id == WH_MOUSE_LL) - interlocked_xchg_add( &global_key_state_counter, 1 ); /* force refreshing the key state cache */ + InterlockedIncrement( &global_key_state_counter ); /* force refreshing the key state cache */ return ret; } diff --git a/dlls/user32/input.c b/dlls/user32/input.c index 0325e2ce3d..b7cdbd84ef 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -433,7 +433,7 @@ SHORT WINAPI DECLSPEC_HOTPATCH GetAsyncKeyState( INT key ) * (like Adobe Photoshop CS5) expect that changes to the async key state * are also immediately available in other threads. */ if (prev_key_state != key_state_info->state[key]) - counter = interlocked_xchg_add( &global_key_state_counter, 1 ) + 1; + counter = InterlockedIncrement( &global_key_state_counter ); key_state_info->time = GetTickCount(); key_state_info->counter = counter;

1 0

Zebediah Figura : quartz/vmr9: Validate the window in IVMRWindowlessControl9::SetVideoClippingWindow().
by Alexandre Julliard May 4, 2020

May 4, 2020

Module: wine Branch: master Commit: f1de733a03affcfda9878fe9a3d7c0942160bd5e URL: https://source.winehq.org/git/wine.git/?a=commit;h=f1de733a03affcfda9878fe9… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri May 1 22:52:00 2020 -0500 quartz/vmr9: Validate the window in IVMRWindowlessControl9::SetVideoClippingWindow(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/vmr9.c | 4 ++-- dlls/quartz/vmr9.c | 8 ++++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index a098416bb2..0bd37fe7f1 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -3226,9 +3226,9 @@ static void test_clipping_window(void) ok(!!window, "Failed to create a window.\n"); hr = IVMRWindowlessControl9_SetVideoClippingWindow(windowless_control, NULL); - todo_wine ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); hr = IVMRWindowlessControl9_SetVideoClippingWindow(windowless_control, (HWND)0xdeadbeef); - todo_wine ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); hr = IFilterGraph2_ConnectDirect(graph, &source.source.pin.IPin_iface, pin, &mt); ok(hr == S_OK, "Got hr %#x.\n", hr); diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index f611a3a7cf..06e545eedf 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -1852,12 +1852,16 @@ static HRESULT WINAPI VMR9WindowlessControl_SetVideoClippingWindow(IVMRWindowles TRACE("(%p/%p)->(%p)\n", iface, This, hwnd); + if (!IsWindow(hwnd)) + { + WARN("Invalid window %p, returning E_INVALIDARG.\n", hwnd); + return E_INVALIDARG; + } + EnterCriticalSection(&This->renderer.filter.csFilter); This->hWndClippingWindow = hwnd; if (This->renderer.sink.pin.peer) VMR9_maybe_init(This, FALSE, &This->renderer.sink.pin.mt); - if (!hwnd) - IVMRSurfaceAllocatorEx9_TerminateDevice(This->allocator, This->cookie); LeaveCriticalSection(&This->renderer.filter.csFilter); return S_OK; }

1 0