January 2021 - Wine-commits

Henri Verbeet : ddraw: Use BitBlt() for exclusive mode frontbuffer updates if the swapchain window is not in the foreground.
by Alexandre Julliard 19 Jan '21

19 Jan '21

Module: wine Branch: master Commit: 4ce1d7f93a35322d149cbde29d619e2580159a80 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4ce1d7f93a35322d149cbde2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 19 14:34:55 2021 +0100 ddraw: Use BitBlt() for exclusive mode frontbuffer updates if the swapchain window is not in the foreground. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/surface.c | 41 ++++++++++++++++++++++++++++++++++------- 1 file changed, 34 insertions(+), 7 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index fd788a96ac0..0ca19d4f8a5 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -39,6 +39,16 @@ static BOOL ddraw_surface_is_lost(const struct ddraw_surface *surface) && (surface->ddraw->device_state != DDRAW_DEVICE_STATE_OK || surface->is_lost); } +static BOOL ddraw_gdi_is_front(struct ddraw *ddraw) +{ + struct ddraw_surface *surface; + + if (!ddraw->gdi_surface || !(surface = wined3d_texture_get_sub_resource_parent(ddraw->gdi_surface, 0))) + return FALSE; + + return surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_FRONTBUFFER; +} + /* This is slow, of course. Also, in case of locks, we can't prevent other * applications from drawing to the screen while we've locked the frontbuffer. * We'd like to do this in wined3d instead, but for that to work wined3d needs @@ -46,6 +56,7 @@ static BOOL ddraw_surface_is_lost(const struct ddraw_surface *surface) HRESULT ddraw_surface_update_frontbuffer(struct ddraw_surface *surface, const RECT *rect, BOOL read, unsigned int swap_interval) { + struct ddraw *ddraw = surface->ddraw; struct wined3d_texture *dst_texture; HDC surface_dc, screen_dc; int x, y, w, h; @@ -53,9 +64,9 @@ HRESULT ddraw_surface_update_frontbuffer(struct ddraw_surface *surface, BOOL ret; RECT r; - if (surface->ddraw->flags & DDRAW_SWAPPED && !read) + if (ddraw->flags & DDRAW_SWAPPED && !read) { - surface->ddraw->flags &= ~DDRAW_SWAPPED; + ddraw->flags &= ~DDRAW_SWAPPED; rect = NULL; } @@ -73,7 +84,23 @@ HRESULT ddraw_surface_update_frontbuffer(struct ddraw_surface *surface, if (w <= 0 || h <= 0) return DD_OK; - if (surface->ddraw->swapchain_window) + /* The interaction between ddraw and GDI drawing is not all that well + * documented, and somewhat arcane. In ddraw exclusive mode, GDI draws + * seemingly go to the *original* frontbuffer/primary surface, while ddraw + * draws/flips go to the *current* frontbuffer surface. The bottom line is + * that if the current frontbuffer is not the GDI frontbuffer, and there's + * e.g. a popup window in front of the ddraw swapchain window, we can't + * use wined3d_swapchain_present() to get the ddraw contents to the screen + * while in exclusive mode, since it would get obscured by the popup + * window. On the other hand, if the current frontbuffer *is* the GDI + * frontbuffer, that's what's supposed to happen; the popup should obscure + * (oart of) the ddraw swapchain window. + * + * This affects the "Deer Hunter" demo, which uses a popup window and GDI + * draws to draw part of the user interface. See also the "fswindow" + * sample is the DirectX 7 SDK. */ + if (ddraw->swapchain_window && (!(ddraw->cooperative_level & DDSCL_EXCLUSIVE) + || ddraw->swapchain_window == GetForegroundWindow() || ddraw_gdi_is_front(ddraw))) { /* Nothing to do, we control the frontbuffer, or at least the parts we * care about. */ @@ -81,15 +108,15 @@ HRESULT ddraw_surface_update_frontbuffer(struct ddraw_surface *surface, return DD_OK; if (swap_interval) - dst_texture = wined3d_swapchain_get_back_buffer(surface->ddraw->wined3d_swapchain, 0); + dst_texture = wined3d_swapchain_get_back_buffer(ddraw->wined3d_swapchain, 0); else - dst_texture = surface->ddraw->wined3d_frontbuffer; + dst_texture = ddraw->wined3d_frontbuffer; if (SUCCEEDED(hr = wined3d_texture_blt(dst_texture, 0, rect, surface->wined3d_texture, surface->sub_resource_idx, rect, 0, NULL, WINED3D_TEXF_POINT)) && swap_interval) { - hr = wined3d_swapchain_present(surface->ddraw->wined3d_swapchain, rect, rect, NULL, swap_interval, 0); - surface->ddraw->flags |= DDRAW_SWAPPED; + hr = wined3d_swapchain_present(ddraw->wined3d_swapchain, rect, rect, NULL, swap_interval, 0); + ddraw->flags |= DDRAW_SWAPPED; } return hr; }

1 0

Henri Verbeet : wined3d: Introduce wined3d_context_vk_reference_resource().
by Alexandre Julliard 19 Jan '21

19 Jan '21

Module: wine Branch: master Commit: e2e776462d08d9b83bd98dcd5001c75d56d5f2b7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e2e776462d08d9b83bd98dcd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 19 14:34:56 2021 +0100 wined3d: Introduce wined3d_context_vk_reference_resource(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/wined3d_private.h | 30 ++++++++++++------------------ 1 file changed, 12 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index bd848f61e32..50b512365f5 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -6043,6 +6043,15 @@ static inline void wined3d_context_vk_reference_texture(const struct wined3d_con texture_vk->command_buffer_id = context_vk->current_command_buffer.id; } +static inline void wined3d_context_vk_reference_resource(const struct wined3d_context_vk *context_vk, + struct wined3d_resource *resource) +{ + if (resource->type == WINED3D_RTYPE_BUFFER) + wined3d_context_vk_reference_bo(context_vk, &wined3d_buffer_vk(buffer_from_resource(resource))->bo); + else + wined3d_context_vk_reference_texture(context_vk, wined3d_texture_vk(texture_from_resource(resource))); +} + static inline void wined3d_context_vk_reference_query(const struct wined3d_context_vk *context_vk, struct wined3d_query_vk *query_vk) { @@ -6058,36 +6067,21 @@ static inline void wined3d_context_vk_reference_sampler(const struct wined3d_con static inline void wined3d_context_vk_reference_rendertarget_view(const struct wined3d_context_vk *context_vk, struct wined3d_rendertarget_view_vk *rtv_vk) { - struct wined3d_resource *resource = rtv_vk->v.resource; - - if (resource->type == WINED3D_RTYPE_BUFFER) - wined3d_context_vk_reference_bo(context_vk, &wined3d_buffer_vk(buffer_from_resource(resource))->bo); - else - wined3d_context_vk_reference_texture(context_vk, wined3d_texture_vk(texture_from_resource(resource))); + wined3d_context_vk_reference_resource(context_vk, rtv_vk->v.resource); rtv_vk->command_buffer_id = context_vk->current_command_buffer.id; } static inline void wined3d_context_vk_reference_shader_resource_view(const struct wined3d_context_vk *context_vk, struct wined3d_shader_resource_view_vk *srv_vk) { - struct wined3d_resource *resource = srv_vk->v.resource; - - if (resource->type == WINED3D_RTYPE_BUFFER) - wined3d_context_vk_reference_bo(context_vk, &wined3d_buffer_vk(buffer_from_resource(resource))->bo); - else - wined3d_context_vk_reference_texture(context_vk, wined3d_texture_vk(texture_from_resource(resource))); + wined3d_context_vk_reference_resource(context_vk, srv_vk->v.resource); srv_vk->view_vk.command_buffer_id = context_vk->current_command_buffer.id; } static inline void wined3d_context_vk_reference_unordered_access_view(const struct wined3d_context_vk *context_vk, struct wined3d_unordered_access_view_vk *uav_vk) { - struct wined3d_resource *resource = uav_vk->v.resource; - - if (resource->type == WINED3D_RTYPE_BUFFER) - wined3d_context_vk_reference_bo(context_vk, &wined3d_buffer_vk(buffer_from_resource(resource))->bo); - else - wined3d_context_vk_reference_texture(context_vk, wined3d_texture_vk(texture_from_resource(resource))); + wined3d_context_vk_reference_resource(context_vk, uav_vk->v.resource); uav_vk->view_vk.command_buffer_id = context_vk->current_command_buffer.id; }

1 0

Henri Verbeet : wined3d: Add some barriers between resource usage on different bind points.
by Alexandre Julliard 19 Jan '21

19 Jan '21

Module: wine Branch: master Commit: 82a9e8006321f5957963c4accc2f08887f724dd9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=82a9e8006321f5957963c4ac… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 19 14:34:57 2021 +0100 wined3d: Add some barriers between resource usage on different bind points. A typical case would be between using a texture as render target and using it as a shader resource. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 31 +++++++++++++++++++++++++++++++ dlls/wined3d/context_vk.c | 34 ++++++++++++++++++++++++++-------- dlls/wined3d/resource.c | 24 +++++++++++++++++++++++- dlls/wined3d/swapchain.c | 1 + dlls/wined3d/texture.c | 37 ++++++++++++++++++++++--------------- dlls/wined3d/wined3d_private.h | 34 ++++++++++++++++++++++++++++++++++ 6 files changed, 137 insertions(+), 24 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=82a9e8006321f5957963…

1 0

Hans Leidekker : wldap32: Properly initialize the context in ldap_sslinitW.
by Alexandre Julliard 19 Jan '21

19 Jan '21

Module: wine Branch: master Commit: be34e08a875431df144d2cebd02fcb01987f9bc4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=be34e08a875431df144d2ceb… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jan 19 15:55:31 2021 +0100 wldap32: Properly initialize the context in ldap_sslinitW. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wldap32/init.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wldap32/init.c b/dlls/wldap32/init.c index afaef3b52f2..0072ede6772 100644 --- a/dlls/wldap32/init.c +++ b/dlls/wldap32/init.c @@ -567,9 +567,9 @@ WLDAP32_LDAP * CDECL ldap_sslinitW( PWCHAR hostname, ULONG portnumber, int secur url = urlify_hostnames( "ldaps://", hostnameU, portnumber ); else url = urlify_hostnames( "ldap://", hostnameU, portnumber ); - if (!url) goto exit; - ldap_initialize( &ld->ld, url ); + + ld = create_context( url ); exit: strfreeU( hostnameU );

1 0

Hans Leidekker : winhttp: Avoid a crash when the connection is closed while handling a redirect.
by Alexandre Julliard 19 Jan '21

19 Jan '21

Module: wine Branch: master Commit: 83afd177b3735f88e38f926aaf3aa0a20178e458 URL: https://source.winehq.org/git/wine.git/?a=commit;h=83afd177b3735f88e38f926a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jan 19 16:52:08 2021 +0100 winhttp: Avoid a crash when the connection is closed while handling a redirect. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48870 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/request.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 31296cd02ba..2ff211255ee 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2739,7 +2739,7 @@ static DWORD receive_response( struct request *request, BOOL async ) break; } - netconn_set_timeout( request->netconn, FALSE, request->receive_timeout ); + if (request->netconn) netconn_set_timeout( request->netconn, FALSE, request->receive_timeout ); if (request->content_length) ret = refill_buffer( request, FALSE ); if (async)

1 0

Daniel Lehman : ntdll/tests: Fix error messages for mutant test.
by Alexandre Julliard 19 Jan '21

19 Jan '21

Module: wine Branch: master Commit: 37e00a8743053808a852fb314f726b6e19bd0c9a URL: https://source.winehq.org/git/wine.git/?a=commit;h=37e00a8743053808a852fb31… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Tue Jan 19 07:47:16 2021 -0800 ntdll/tests: Fix error messages for mutant test. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/om.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index 1bc94f984b5..ff0b9c939e4 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -1984,13 +1984,13 @@ static void test_mutant(void) prev = 0xdeadbeef; status = pNtReleaseMutant(mutant, &prev); - ok( status == STATUS_SUCCESS, "NtQueryRelease failed %08x\n", status ); - ok( prev == -1, "NtQueryRelease failed, expected -1, got %d\n", prev ); + ok( status == STATUS_SUCCESS, "NtReleaseMutant failed %08x\n", status ); + ok( prev == -1, "NtReleaseMutant failed, expected -1, got %d\n", prev ); prev = 0xdeadbeef; status = pNtReleaseMutant(mutant, &prev); - ok( status == STATUS_SUCCESS, "NtQueryRelease failed %08x\n", status ); - ok( prev == 0, "NtQueryRelease failed, expected 0, got %d\n", prev ); + ok( status == STATUS_SUCCESS, "NtReleaseMutant failed %08x\n", status ); + ok( prev == 0, "NtReleaseMutant failed, expected 0, got %d\n", prev ); memset(&info, 0xcc, sizeof(info)); status = pNtQueryMutant(mutant, MutantBasicInformation, &info, sizeof(info), NULL);

1 0

Jacek Caban : ntdll: Honour alertable argument in NtContinue.
by Alexandre Julliard 19 Jan '21

19 Jan '21

Module: wine Branch: master Commit: 46a81fa966d5049952faf8b7d5bea390f5b97769 URL: https://source.winehq.org/git/wine.git/?a=commit;h=46a81fa966d5049952faf8b7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 11 20:04:33 2021 +0100 ntdll: Honour alertable argument in NtContinue. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/server.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c index a9608abfb73..db09d7759da 100644 --- a/dlls/ntdll/unix/server.c +++ b/dlls/ntdll/unix/server.c @@ -721,8 +721,11 @@ NTSTATUS WINAPI NtContinue( CONTEXT *context, BOOLEAN alertable ) user_apc_t apc; NTSTATUS status; - status = server_select( NULL, 0, SELECT_INTERRUPTIBLE | SELECT_ALERTABLE, 0, NULL, NULL, &apc ); - if (status == STATUS_USER_APC) invoke_apc( context, &apc ); + if (alertable) + { + status = server_select( NULL, 0, SELECT_INTERRUPTIBLE | SELECT_ALERTABLE, 0, NULL, NULL, &apc ); + if (status == STATUS_USER_APC) invoke_apc( context, &apc ); + } return NtSetContextThread( GetCurrentThread(), context ); }

1 0

Alistair Leslie-Hughes : include: Add more sal.h macros.
by Alexandre Julliard 19 Jan '21

19 Jan '21

Module: wine Branch: master Commit: c8ad4650b8995b82f474a09f0b90c1aa8f79e249 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c8ad4650b8995b82f474a09f… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Jan 17 18:23:46 2021 +1100 include: Add more sal.h macros. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/sal.h | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/include/sal.h b/include/sal.h index ca8b824f1bf..5e51719d35b 100644 --- a/include/sal.h +++ b/include/sal.h @@ -19,10 +19,15 @@ #ifndef __WINE_SAL_H__ #define __WINE_SAL_H__ +/* These belong in driverspecs.h */ +#define __drv_allocatesMem(ptr) +#define __drv_freesMem(ptr) #define _Always_(exp) -#define _At_ +#define _Analysis_noreturn_ + +#define _At_(a, b) #define _At_buffer_(a, b, c, d) #define _Check_return_ @@ -31,10 +36,12 @@ #define _COM_Outptr_ #define _COM_Outptr_result_maybenull_ +#define _Deref_in_range_(cnt) #define _Deref_out_ #define _Deref_out_z_ #define _Deref_out_opt_ #define _Deref_out_opt_z_ +#define _Deref_out_range_(x, y) #define _Deref_post_maybenull_ #define _Deref_post_opt_cap_(count) #define _Deref_post_opt_valid_ @@ -48,6 +55,8 @@ #define _Field_range_(min, max) +#define _Frees_ptr_opt_ + #define __in #define __in_opt #define _In_ @@ -106,6 +115,9 @@ #define _Inout_z_cap_(count) #define _Inout_z_cap_c_(count) +#define _Must_inspect_result_ + +#define _Null_ #define _Null_terminated_ #define __out @@ -168,7 +180,11 @@ #define _Out_z_cap_post_count_(count1, count2) #define _Outptr_opt_ +#define _Outptr_opt_result_buffer_(count) +#define _Outptr_opt_result_maybenull_ +#define _Outptr_opt_result_z_ #define _Outptr_result_buffer_(count) +#define _Outptr_result_buffer_all_maybenull_(ptr) #define _Outptr_result_buffer_maybenull_(count) #define _Outptr_result_maybenull_ #define _Outptr_result_maybenull_z_

1 0

Zebediah Figura : include: Move InterlockedCompareExchange128 next to the other InterlockedCompareExchange* functions.
by Alexandre Julliard 19 Jan '21

19 Jan '21

Module: wine Branch: master Commit: 04a9c9eba77f56d61d615f1147590c67b466bdf8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=04a9c9eba77f56d61d615f11… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jan 19 11:29:23 2021 -0600 include: Move InterlockedCompareExchange128 next to the other InterlockedCompareExchange* functions. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winnt.h | 62 ++++++++++++++++++++++++++++----------------------------- 1 file changed, 30 insertions(+), 32 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index 7bbe0185139..e48c884cd4c 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -6898,6 +6898,9 @@ static inline BOOLEAN BitScanReverse(DWORD *index, DWORD mask) #pragma intrinsic(_InterlockedCompareExchange) #pragma intrinsic(_InterlockedCompareExchange64) +#ifdef _WIN64 +#pragma intrinsic(_InterlockedCompareExchange128) +#endif #pragma intrinsic(_InterlockedExchange) #pragma intrinsic(_InterlockedExchangeAdd) #pragma intrinsic(_InterlockedIncrement) @@ -6905,6 +6908,9 @@ static inline BOOLEAN BitScanReverse(DWORD *index, DWORD mask) long _InterlockedCompareExchange(long volatile*,long,long); long long _InterlockedCompareExchange64(long long volatile*,long long,long long); +#ifdef _WIN64 +unsigned char _InterlockedCompareExchange128(volatile __int64 *, __int64, __int64, __int64 *); +#endif long _InterlockedDecrement(long volatile*); long _InterlockedExchange(long volatile*,long); long _InterlockedExchangeAdd(long volatile*,long); @@ -6920,6 +6926,13 @@ static FORCEINLINE LONGLONG WINAPI InterlockedCompareExchange64( LONGLONG volati return _InterlockedCompareExchange64( (long long volatile *)dest, compare, xchg ); } +#ifdef _WIN64 +static FORCEINLINE unsigned char WINAPI InterlockedCompareExchange128( volatile __int64 *dest, __int64 xchg_high, __int64 xchg_low, __int64 *compare ) +{ + return _InterlockedCompareExchange128( dest, xchg_high, xchg_low, compare ); +} +#endif + static FORCEINLINE LONG WINAPI InterlockedExchange( LONG volatile *dest, LONG val ) { return _InterlockedExchange( (long volatile *)dest, val ); @@ -6982,6 +6995,23 @@ static FORCEINLINE LONGLONG WINAPI InterlockedCompareExchange64( LONGLONG volati return __sync_val_compare_and_swap( dest, compare, xchg ); } +#ifdef _WIN64 +static FORCEINLINE unsigned char InterlockedCompareExchange128( volatile __int64 *dest, __int64 xchg_high, __int64 xchg_low, __int64 *compare ) +{ +#ifdef __x86_64__ + unsigned char ret; + __asm__ __volatile__( "lock cmpxchg16b %0; setz %b2" + : "=m" (dest[0]), "=m" (dest[1]), "=r" (ret), + "=a" (compare[0]), "=d" (compare[1]) + : "m" (dest[0]), "m" (dest[1]), "3" (compare[0]), "4" (compare[1]), + "c" (xchg_high), "b" (xchg_low) ); + return ret; +#else + return __sync_bool_compare_and_swap( (__int128 *)dest, *(__int128 *)compare, ((__int128)xchg_high << 64) | xchg_low ); +#endif +} +#endif + static FORCEINLINE LONG WINAPI InterlockedExchange( LONG volatile *dest, LONG val ) { LONG ret; @@ -7024,38 +7054,6 @@ static FORCEINLINE void * WINAPI InterlockedExchangePointer( void *volatile *des #endif /* __GNUC__ */ -#ifdef _WIN64 - -#if defined(_MSC_VER) - -#define InterlockedCompareExchange128 _InterlockedCompareExchange128 -unsigned char _InterlockedCompareExchange128(volatile __int64 *dest, __int64 xchg_high, __int64 xchg_low, __int64 *compare); -#pragma intrinsic(_InterlockedCompareExchange128) - -#elif defined(__x86_64__) - -static inline unsigned char InterlockedCompareExchange128(__int64 *dest, __int64 xchg_high, __int64 xchg_low, __int64 *compare) -{ - unsigned char ret; - __asm__ __volatile__( "lock cmpxchg16b %0; setz %b2" - : "=m" (dest[0]), "=m" (dest[1]), "=r" (ret), - "=a" (compare[0]), "=d" (compare[1]) - : "m" (dest[0]), "m" (dest[1]), "3" (compare[0]), "4" (compare[1]), - "c" (xchg_high), "b" (xchg_low) ); - return ret; -} - -#elif defined(__GNUC__) - -static inline unsigned char InterlockedCompareExchange128(__int64 *dest, __int64 xchg_high, __int64 xchg_low, __int64 *compare) -{ - return __sync_bool_compare_and_swap( (__int128 *)dest, *(__int128 *)compare, ((__int128)xchg_high << 64) | xchg_low ); -} - -#endif - -#endif /* _WIN64 */ - #ifdef __cplusplus } #endif

1 0

Zebediah Figura : strmbase: Move strmbase_renderer.csRenderLock into the strmbase_filter structure.
by Alexandre Julliard 19 Jan '21

19 Jan '21

Module: wine Branch: master Commit: e468aab053e961a594abeea6f982d4133420b221 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e468aab053e961a594abeea6… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jan 18 21:57:20 2021 -0600 strmbase: Move strmbase_renderer.csRenderLock into the strmbase_filter structure. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/videorenderer.c | 16 ++++++++-------- dlls/quartz/vmr9.c | 10 +++++----- dlls/strmbase/filter.c | 6 ++++++ dlls/strmbase/renderer.c | 19 +++++++------------ include/wine/strmbase.h | 2 +- 5 files changed, 27 insertions(+), 26 deletions(-) diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index 2ad479a6301..a925340a676 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -112,9 +112,9 @@ static HRESULT WINAPI VideoRenderer_DoRenderSample(struct strmbase_renderer *ifa filter->current_sample = pSample; SetEvent(filter->renderer.state_event); - LeaveCriticalSection(&filter->renderer.csRenderLock); + LeaveCriticalSection(&filter->renderer.filter.stream_cs); WaitForMultipleObjects(2, events, FALSE, INFINITE); - EnterCriticalSection(&filter->renderer.csRenderLock); + EnterCriticalSection(&filter->renderer.filter.stream_cs); filter->current_sample = NULL; } @@ -258,33 +258,33 @@ static HRESULT video_renderer_get_current_image(struct video_window *iface, LONG size_t image_size; BYTE *sample_data; - EnterCriticalSection(&filter->renderer.csRenderLock); + EnterCriticalSection(&filter->renderer.filter.stream_cs); bih = get_bitmap_header(&filter->renderer.sink.pin.mt); image_size = bih->biWidth * bih->biHeight * bih->biBitCount / 8; if (!image) { - LeaveCriticalSection(&filter->renderer.csRenderLock); + LeaveCriticalSection(&filter->renderer.filter.stream_cs); *size = sizeof(BITMAPINFOHEADER) + image_size; return S_OK; } if (filter->renderer.filter.state != State_Paused) { - LeaveCriticalSection(&filter->renderer.csRenderLock); + LeaveCriticalSection(&filter->renderer.filter.stream_cs); return VFW_E_NOT_PAUSED; } if (!filter->current_sample) { - LeaveCriticalSection(&filter->renderer.csRenderLock); + LeaveCriticalSection(&filter->renderer.filter.stream_cs); return E_UNEXPECTED; } if (*size < sizeof(BITMAPINFOHEADER) + image_size) { - LeaveCriticalSection(&filter->renderer.csRenderLock); + LeaveCriticalSection(&filter->renderer.filter.stream_cs); return E_OUTOFMEMORY; } @@ -292,7 +292,7 @@ static HRESULT video_renderer_get_current_image(struct video_window *iface, LONG IMediaSample_GetPointer(filter->current_sample, &sample_data); memcpy((char *)image + sizeof(BITMAPINFOHEADER), sample_data, image_size); - LeaveCriticalSection(&filter->renderer.csRenderLock); + LeaveCriticalSection(&filter->renderer.filter.stream_cs); return S_OK; } diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 37bb09b399b..57b219a6d26 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -317,9 +317,9 @@ static HRESULT WINAPI VMR9_DoRenderSample(struct strmbase_renderer *iface, IMedi if (filter->renderer.filter.state == State_Paused) { SetEvent(filter->renderer.state_event); - LeaveCriticalSection(&filter->renderer.csRenderLock); + LeaveCriticalSection(&filter->renderer.filter.stream_cs); WaitForMultipleObjects(2, events, FALSE, INFINITE); - EnterCriticalSection(&filter->renderer.csRenderLock); + EnterCriticalSection(&filter->renderer.filter.stream_cs); } return hr; @@ -687,7 +687,7 @@ static HRESULT vmr_get_current_image(struct video_window *iface, LONG *size, LON char *dst; HRESULT hr; - EnterCriticalSection(&filter->renderer.csRenderLock); + EnterCriticalSection(&filter->renderer.filter.stream_cs); device = filter->allocator_d3d9_dev; bih = *get_bitmap_header(&filter->renderer.sink.pin.mt); @@ -696,7 +696,7 @@ static HRESULT vmr_get_current_image(struct video_window *iface, LONG *size, LON if (!image) { *size = sizeof(BITMAPINFOHEADER) + bih.biSizeImage; - LeaveCriticalSection(&filter->renderer.csRenderLock); + LeaveCriticalSection(&filter->renderer.filter.stream_cs); return S_OK; } @@ -732,7 +732,7 @@ static HRESULT vmr_get_current_image(struct video_window *iface, LONG *size, LON out: if (surface) IDirect3DSurface9_Release(surface); if (rt) IDirect3DSurface9_Release(rt); - LeaveCriticalSection(&filter->renderer.csRenderLock); + LeaveCriticalSection(&filter->renderer.filter.stream_cs); return hr; } diff --git a/dlls/strmbase/filter.c b/dlls/strmbase/filter.c index 4f2fe5967d7..93593e4c189 100644 --- a/dlls/strmbase/filter.c +++ b/dlls/strmbase/filter.c @@ -527,6 +527,9 @@ void strmbase_filter_init(struct strmbase_filter *filter, IUnknown *outer, InitializeCriticalSection(&filter->filter_cs); if (filter->filter_cs.DebugInfo != (RTL_CRITICAL_SECTION_DEBUG *)-1) filter->filter_cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": strmbase_filter.filter_cs"); + InitializeCriticalSection(&filter->stream_cs); + if (filter->stream_cs.DebugInfo != (RTL_CRITICAL_SECTION_DEBUG *)-1) + filter->stream_cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": strmbase_filter.stream_cs"); filter->clsid = *clsid; filter->pin_version = 1; filter->ops = ops; @@ -541,4 +544,7 @@ void strmbase_filter_cleanup(struct strmbase_filter *filter) if (filter->filter_cs.DebugInfo != (RTL_CRITICAL_SECTION_DEBUG *)-1) filter->filter_cs.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&filter->filter_cs); + if (filter->stream_cs.DebugInfo != (RTL_CRITICAL_SECTION_DEBUG *)-1) + filter->stream_cs.DebugInfo->Spare[0] = 0; + DeleteCriticalSection(&filter->stream_cs); } diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index 24d209703ca..b63129e0e87 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -192,7 +192,7 @@ static HRESULT WINAPI BaseRenderer_Receive(struct strmbase_sink *pin, IMediaSamp DeleteMediaType(mt); } - EnterCriticalSection(&filter->csRenderLock); + EnterCriticalSection(&filter->filter.stream_cs); if (filter->filter.clock && SUCCEEDED(IMediaSample_GetTime(sample, &start, &stop))) { @@ -229,7 +229,7 @@ static HRESULT WINAPI BaseRenderer_Receive(struct strmbase_sink *pin, IMediaSamp if (ret == 1) { - LeaveCriticalSection(&filter->csRenderLock); + LeaveCriticalSection(&filter->filter.stream_cs); TRACE("Flush signaled; discarding current sample.\n"); return S_OK; } @@ -245,7 +245,7 @@ static HRESULT WINAPI BaseRenderer_Receive(struct strmbase_sink *pin, IMediaSamp QualityControlRender_DoQOS(&filter->qc); - LeaveCriticalSection(&filter->csRenderLock); + LeaveCriticalSection(&filter->filter.stream_cs); return hr; } @@ -273,7 +273,7 @@ static HRESULT sink_eos(struct strmbase_sink *iface) IFilterGraph *graph = filter->filter.graph; IMediaEventSink *event_sink; - EnterCriticalSection(&filter->csRenderLock); + EnterCriticalSection(&filter->filter.stream_cs); filter->eos = TRUE; @@ -287,7 +287,7 @@ static HRESULT sink_eos(struct strmbase_sink *iface) strmbase_passthrough_eos(&filter->passthrough); SetEvent(filter->state_event); - LeaveCriticalSection(&filter->csRenderLock); + LeaveCriticalSection(&filter->filter.stream_cs); return S_OK; } @@ -304,14 +304,14 @@ static HRESULT sink_end_flush(struct strmbase_sink *iface) { struct strmbase_renderer *filter = impl_from_IPin(&iface->pin.IPin_iface); - EnterCriticalSection(&filter->csRenderLock); + EnterCriticalSection(&filter->filter.stream_cs); filter->eos = FALSE; QualityControlRender_Start(&filter->qc, filter->stream_start); strmbase_passthrough_invalidate_time(&filter->passthrough); ResetEvent(filter->flush_event); - LeaveCriticalSection(&filter->csRenderLock); + LeaveCriticalSection(&filter->filter.stream_cs); return S_OK; } @@ -336,9 +336,6 @@ void strmbase_renderer_cleanup(struct strmbase_renderer *filter) strmbase_passthrough_cleanup(&filter->passthrough); - filter->csRenderLock.DebugInfo->Spare[0] = 0; - DeleteCriticalSection(&filter->csRenderLock); - CloseHandle(filter->state_event); CloseHandle(filter->advise_event); CloseHandle(filter->flush_event); @@ -358,8 +355,6 @@ void strmbase_renderer_init(struct strmbase_renderer *filter, IUnknown *outer, strmbase_sink_init(&filter->sink, &filter->filter, sink_name, &sink_ops, NULL); - InitializeCriticalSection(&filter->csRenderLock); - filter->csRenderLock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__": strmbase_renderer.csRenderLock"); filter->state_event = CreateEventW(NULL, TRUE, TRUE, NULL); filter->advise_event = CreateEventW(NULL, FALSE, FALSE, NULL); filter->flush_event = CreateEventW(NULL, TRUE, TRUE, NULL); diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index c56a8d96037..4bb9d898a1a 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -127,6 +127,7 @@ struct strmbase_filter IUnknown *outer_unk; LONG refcount; CRITICAL_SECTION filter_cs; + CRITICAL_SECTION stream_cs; FILTER_STATE state; IReferenceClock *clock; @@ -295,7 +296,6 @@ struct strmbase_renderer struct strmbase_sink sink; - CRITICAL_SECTION csRenderLock; /* Signaled when the filter has completed a state change. The filter waits * for this event in IBaseFilter::GetState(). */ HANDLE state_event;

1 0