November 2021 - Wine-commits

Alexandre Julliard : wldap32: Convert the Unix library to the __wine_unix_call interface.
by Alexandre Julliard 04 Nov '21

04 Nov '21

Module: wine Branch: master Commit: b2009d02c3412c83ef6ed9644613d071e1a9a144 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b2009d02c3412c83ef6ed964… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 4 11:09:04 2021 +0100 wldap32: Convert the Unix library to the __wine_unix_call interface. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wldap32/Makefile.in | 1 + dlls/wldap32/add.c | 14 +- dlls/wldap32/ber.c | 109 +++++---- dlls/wldap32/bind.c | 72 ++++-- dlls/wldap32/compare.c | 15 +- dlls/wldap32/control.c | 19 +- dlls/wldap32/delete.c | 14 +- dlls/wldap32/dn.c | 45 ++-- dlls/wldap32/error.c | 16 +- dlls/wldap32/extended.c | 19 +- dlls/wldap32/init.c | 21 +- dlls/wldap32/libldap.c | 461 ++++++++++++++++++++--------------- dlls/wldap32/libldap.h | 609 ++++++++++++++++++++++++++++++++++++++++------- dlls/wldap32/main.c | 5 +- dlls/wldap32/misc.c | 101 +++++--- dlls/wldap32/modify.c | 14 +- dlls/wldap32/modrdn.c | 36 +-- dlls/wldap32/option.c | 75 +++--- dlls/wldap32/parse.c | 61 +++-- dlls/wldap32/rename.c | 16 +- dlls/wldap32/search.c | 17 +- dlls/wldap32/value.c | 37 +-- 22 files changed, 1232 insertions(+), 545 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b2009d02c3412c83ef6e…

1 0

Alexandre Julliard : kerberos: Move the ticket cache memory allocation to the PE side.
by Alexandre Julliard 04 Nov '21

04 Nov '21

Module: wine Branch: master Commit: de53f5682fcbfa2fbac5ee24ce8b93c7cc5586fa URL: https://source.winehq.org/git/wine.git/?a=commit;h=de53f5682fcbfa2fbac5ee24… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 4 17:37:59 2021 +0100 kerberos: Move the ticket cache memory allocation to the PE side. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kerberos/krb5_ap.c | 102 ++++++++++++++-------------------------------- dlls/kerberos/unixlib.c | 106 ++++++++++++++++++++++++++++++++---------------- dlls/kerberos/unixlib.h | 9 +--- 3 files changed, 101 insertions(+), 116 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=de53f5682fcbfa2fbac5…

1 0

Alexandre Julliard : kerberos: Move timestamp conversion to the PE side.
by Alexandre Julliard 04 Nov '21

04 Nov '21

Module: wine Branch: master Commit: b1c58098ebfc3133789680aba2afa3b069f2565b URL: https://source.winehq.org/git/wine.git/?a=commit;h=b1c58098ebfc3133789680ab… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 4 17:54:56 2021 +0100 kerberos: Move timestamp conversion to the PE side. Restore expiry time dropped in 6e9a9d670185f5a18d860602eb23e5a4c0fc1c2e, spotted by Dmitry Timoshkov. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kerberos/krb5_ap.c | 34 +++++++++++++++++++++++++++++----- dlls/kerberos/unixlib.c | 22 ++++++---------------- dlls/kerberos/unixlib.h | 6 +++--- 3 files changed, 38 insertions(+), 24 deletions(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index 92436ca2bf4..9105e3d2c5d 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -83,6 +83,17 @@ static const char *debugstr_us( const UNICODE_STRING *us ) return debugstr_wn( us->Buffer, us->Length / sizeof(WCHAR) ); } +static void expiry_to_timestamp( ULONG expiry, TimeStamp *timestamp ) +{ + LARGE_INTEGER time; + + NtQuerySystemTime( &time ); + RtlSystemTimeToLocalTime( &time, &time ); + time.QuadPart += expiry * (ULONGLONG)10000000; + timestamp->LowPart = time.QuadPart; + timestamp->HighPart = time.QuadPart >> 32; +} + static NTSTATUS NTAPI kerberos_LsaApInitializePackage(ULONG package_id, PLSA_DISPATCH_TABLE dispatch, PLSA_STRING database, PLSA_STRING confidentiality, PLSA_STRING *package_name) { @@ -267,6 +278,7 @@ static NTSTATUS NTAPI kerberos_SpAcquireCredentialsHandle( char *principal = NULL, *username = NULL, *password = NULL; SEC_WINNT_AUTH_IDENTITY_W *id = auth_data; NTSTATUS status = SEC_E_INSUFFICIENT_MEMORY; + ULONG exptime; TRACE( "(%s 0x%08x %p %p %p %p %p %p)\n", debugstr_us(principal_us), credential_use, logon_id, auth_data, get_key_fn, get_key_arg, credential, expiry ); @@ -285,7 +297,9 @@ static NTSTATUS NTAPI kerberos_SpAcquireCredentialsHandle( } status = krb5_funcs->acquire_credentials_handle( principal, credential_use, username, password, credential, - expiry ); + &exptime ); + expiry_to_timestamp( exptime, expiry ); + done: free( principal ); free( username ); @@ -310,6 +324,7 @@ static NTSTATUS NTAPI kerberos_SpInitLsaModeContext( LSA_SEC_HANDLE credential, ISC_REQ_IDENTIFY | ISC_REQ_CONNECTION; char *target = NULL; NTSTATUS status; + ULONG exptime; TRACE( "(%lx %lx %s 0x%08x %u %p %p %p %p %p %p %p)\n", credential, context, debugstr_us(target_name), context_req, target_data_rep, input, new_context, output, context_attr, expiry, @@ -320,8 +335,12 @@ static NTSTATUS NTAPI kerberos_SpInitLsaModeContext( LSA_SEC_HANDLE credential, if (target_name && !(target = get_str_unixcp( target_name ))) return SEC_E_INSUFFICIENT_MEMORY; status = krb5_funcs->initialize_context( credential, context, target, context_req, input, new_context, output, - context_attr, expiry ); - if (!status) *mapped_context = TRUE; + context_attr, &exptime ); + if (!status) + { + *mapped_context = TRUE; + expiry_to_timestamp( exptime, expiry ); + } /* FIXME: initialize context_data */ free( target ); return status; @@ -332,6 +351,7 @@ static NTSTATUS NTAPI kerberos_SpAcceptLsaModeContext( LSA_SEC_HANDLE credential SecBufferDesc *output, ULONG *context_attr, TimeStamp *expiry, BOOLEAN *mapped_context, SecBuffer *context_data ) { NTSTATUS status; + ULONG exptime; TRACE( "(%lx %lx 0x%08x %u %p %p %p %p %p %p %p)\n", credential, context, context_req, target_data_rep, input, new_context, output, context_attr, expiry, mapped_context, context_data ); @@ -339,8 +359,12 @@ static NTSTATUS NTAPI kerberos_SpAcceptLsaModeContext( LSA_SEC_HANDLE credential if (!context && !input && !credential) return SEC_E_INVALID_HANDLE; - status = krb5_funcs->accept_context( credential, context, input, new_context, output, context_attr, expiry ); - if (!status) *mapped_context = TRUE; + status = krb5_funcs->accept_context( credential, context, input, new_context, output, context_attr, &exptime ); + if (!status) + { + *mapped_context = TRUE; + expiry_to_timestamp( exptime, expiry ); + } /* FIXME: initialize context_data */ return status; } diff --git a/dlls/kerberos/unixlib.c b/dlls/kerberos/unixlib.c index 1a47b0a39ff..4024cc4bec1 100644 --- a/dlls/kerberos/unixlib.c +++ b/dlls/kerberos/unixlib.c @@ -505,16 +505,6 @@ static inline void credhandle_gss_to_sspi( gss_cred_id_t handle, LSA_SEC_HANDLE *cred = (LSA_SEC_HANDLE)handle; } -static void expirytime_gss_to_sspi( OM_uint32 expirytime, TimeStamp *timestamp ) -{ - LARGE_INTEGER time; - - NtQuerySystemTime( &time ); - RtlSystemTimeToLocalTime( &time, &time ); - timestamp->LowPart = time.QuadPart; - timestamp->HighPart = time.QuadPart >> 32; -} - static ULONG flags_gss_to_asc_ret( ULONG flags ) { ULONG ret = 0; @@ -532,7 +522,7 @@ static ULONG flags_gss_to_asc_ret( ULONG flags ) static NTSTATUS CDECL accept_context( LSA_SEC_HANDLE credential, LSA_SEC_HANDLE context, SecBufferDesc *input, LSA_SEC_HANDLE *new_context, SecBufferDesc *output, ULONG *context_attr, - TimeStamp *expiry ) + ULONG *expiry ) { OM_uint32 ret, minor_status, ret_flags = 0, expiry_time; gss_cred_id_t cred_handle = credhandle_sspi_to_gss( credential ); @@ -571,7 +561,7 @@ static NTSTATUS CDECL accept_context( LSA_SEC_HANDLE credential, LSA_SEC_HANDLE ctxhandle_gss_to_sspi( ctx_handle, new_context ); if (context_attr) *context_attr = flags_gss_to_asc_ret( ret_flags ); - expirytime_gss_to_sspi( expiry_time, expiry ); + *expiry = expiry_time; } return status_gss_to_sspi( ret ); @@ -621,7 +611,7 @@ static NTSTATUS import_name( const char *src, gss_name_t *dst ) } static NTSTATUS CDECL acquire_credentials_handle( const char *principal, ULONG credential_use, const char *username, - const char *password, LSA_SEC_HANDLE *credential, TimeStamp *expiry ) + const char *password, LSA_SEC_HANDLE *credential, ULONG *expiry ) { OM_uint32 ret, minor_status, expiry_time; gss_name_t name = GSS_C_NO_NAME; @@ -654,7 +644,7 @@ static NTSTATUS CDECL acquire_credentials_handle( const char *principal, ULONG c if (ret == GSS_S_COMPLETE) { credhandle_gss_to_sspi( cred_handle, credential ); - expirytime_gss_to_sspi( expiry_time, expiry ); + *expiry = expiry_time; } if (name != GSS_C_NO_NAME) pgss_release_name( &minor_status, &name ); @@ -715,7 +705,7 @@ static ULONG flags_gss_to_isc_ret( ULONG flags ) static NTSTATUS CDECL initialize_context( LSA_SEC_HANDLE credential, LSA_SEC_HANDLE context, const char *target_name, ULONG context_req, SecBufferDesc *input, LSA_SEC_HANDLE *new_context, - SecBufferDesc *output, ULONG *context_attr, TimeStamp *expiry ) + SecBufferDesc *output, ULONG *context_attr, ULONG *expiry ) { OM_uint32 ret, minor_status, ret_flags = 0, expiry_time, req_flags = flags_isc_req_to_gss( context_req ); gss_cred_id_t cred_handle = credhandle_sspi_to_gss( credential ); @@ -758,7 +748,7 @@ static NTSTATUS CDECL initialize_context( LSA_SEC_HANDLE credential, LSA_SEC_HAN ctxhandle_gss_to_sspi( ctx_handle, new_context ); if (context_attr) *context_attr = flags_gss_to_isc_ret( ret_flags ); - expirytime_gss_to_sspi( expiry_time, expiry ); + *expiry = expiry_time; } if (target != GSS_C_NO_NAME) pgss_release_name( &minor_status, &target ); diff --git a/dlls/kerberos/unixlib.h b/dlls/kerberos/unixlib.h index 5648f344431..2d0cb45f979 100644 --- a/dlls/kerberos/unixlib.h +++ b/dlls/kerberos/unixlib.h @@ -24,13 +24,13 @@ struct krb5_funcs { NTSTATUS (CDECL *accept_context)(LSA_SEC_HANDLE, LSA_SEC_HANDLE, SecBufferDesc *, LSA_SEC_HANDLE *, - SecBufferDesc *, ULONG *, TimeStamp *); + SecBufferDesc *, ULONG *, ULONG *); NTSTATUS (CDECL *acquire_credentials_handle)(const char *, ULONG, const char *, const char *, LSA_SEC_HANDLE *, - TimeStamp *); + ULONG *); NTSTATUS (CDECL *delete_context)(LSA_SEC_HANDLE); NTSTATUS (CDECL *free_credentials_handle)(LSA_SEC_HANDLE); NTSTATUS (CDECL *initialize_context)(LSA_SEC_HANDLE, LSA_SEC_HANDLE, const char *, ULONG, SecBufferDesc *, - LSA_SEC_HANDLE *, SecBufferDesc *, ULONG *, TimeStamp *); + LSA_SEC_HANDLE *, SecBufferDesc *, ULONG *, ULONG *); NTSTATUS (CDECL *make_signature)(LSA_SEC_HANDLE, SecBufferDesc *); NTSTATUS (CDECL *query_context_attributes)(LSA_SEC_HANDLE, ULONG, void *); NTSTATUS (CDECL *query_ticket_cache)( KERB_QUERY_TKT_CACHE_RESPONSE *resp, ULONG *out_size );

1 0

Alexandre Julliard : kerberos: Convert the Unix library to the __wine_unix_call interface.
by Alexandre Julliard 04 Nov '21

04 Nov '21

Module: wine Branch: master Commit: 099063f0fc37ddb49d30050b1637ffe9c11b23e1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=099063f0fc37ddb49d30050b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 4 20:50:53 2021 +0100 kerberos: Convert the Unix library to the __wine_unix_call interface. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kerberos/Makefile.in | 1 + dlls/kerberos/krb5_ap.c | 102 +++++++++++++++++++---------- dlls/kerberos/unixlib.c | 159 +++++++++++++++++++++++----------------------- dlls/kerberos/unixlib.h | 114 +++++++++++++++++++++++++++------ 4 files changed, 245 insertions(+), 131 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=099063f0fc37ddb49d30…

1 0

Zebediah Figura : wined3d: Protect access to the Vulkan wined3d_allocator with a mutex.
by Alexandre Julliard 04 Nov '21

04 Nov '21

Module: wine Branch: master Commit: ce0f12acc9b97437c4c11d0d8e98302088b5b39c URL: https://source.winehq.org/git/wine.git/?a=commit;h=ce0f12acc9b97437c4c11d0d… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Nov 3 23:46:55 2021 -0500 wined3d: Protect access to the Vulkan wined3d_allocator with a mutex. So that it can be accessed from the client thread. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_vk.c | 9 ++++++++ dlls/wined3d/context_vk.c | 50 ++++++++++++++++++++++++++++++++---------- dlls/wined3d/wined3d_private.h | 11 ++++++++++ 3 files changed, 59 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 02a359c4f07..cbf7c94fd3a 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -521,6 +521,10 @@ static HRESULT adapter_vk_create_device(struct wined3d *wined3d, const struct wi goto fail; } + InitializeCriticalSection(&device_vk->allocator_cs); + if (device_vk->allocator_cs.DebugInfo != (RTL_CRITICAL_SECTION_DEBUG *)-1) + device_vk->allocator_cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": wined3d_device_vk.allocator_cs"); + *device = &device_vk->d; return WINED3D_OK; @@ -538,6 +542,11 @@ static void adapter_vk_destroy_device(struct wined3d_device *device) wined3d_device_cleanup(&device_vk->d); wined3d_allocator_cleanup(&device_vk->allocator); + + if (device_vk->allocator_cs.DebugInfo != (RTL_CRITICAL_SECTION_DEBUG *)-1) + device_vk->allocator_cs.DebugInfo->Spare[0] = 0; + DeleteCriticalSection(&device_vk->allocator_cs); + VK_CALL(vkDestroyDevice(device_vk->vk_device, NULL)); heap_free(device_vk); } diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index ad7b0a8ba86..54c5eb6bc24 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -313,27 +313,43 @@ static struct wined3d_allocator_block *wined3d_context_vk_allocate_memory(struct struct wined3d_allocator *allocator = &device_vk->allocator; struct wined3d_allocator_block *block; + wined3d_device_vk_allocator_lock(device_vk); + if (size > WINED3D_ALLOCATOR_CHUNK_SIZE / 2) { *vk_memory = wined3d_context_vk_allocate_vram_chunk_memory(context_vk, memory_type, size); + wined3d_device_vk_allocator_unlock(device_vk); return NULL; } if (!(block = wined3d_allocator_allocate(allocator, &context_vk->c, memory_type, size))) { + wined3d_device_vk_allocator_unlock(device_vk); *vk_memory = VK_NULL_HANDLE; return NULL; } *vk_memory = wined3d_allocator_chunk_vk(block->chunk)->vk_memory; + wined3d_device_vk_allocator_unlock(device_vk); return block; } +static void wined3d_context_vk_free_memory(struct wined3d_context_vk *context_vk, struct wined3d_allocator_block *block) +{ + struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device); + + assert(block->chunk->allocator == &device_vk->allocator); + wined3d_device_vk_allocator_lock(device_vk); + wined3d_allocator_block_free(block); + wined3d_device_vk_allocator_unlock(device_vk); +} + static bool wined3d_context_vk_create_slab_bo(struct wined3d_context_vk *context_vk, VkDeviceSize size, VkBufferUsageFlags usage, VkMemoryPropertyFlags memory_type, struct wined3d_bo_vk *bo) { const struct wined3d_adapter_vk *adapter_vk = wined3d_adapter_vk(context_vk->c.device->adapter); + struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device); const VkPhysicalDeviceLimits *limits = &adapter_vk->device_limits; struct wined3d_bo_slab_vk_key key; struct wined3d_bo_slab_vk *slab; @@ -360,6 +376,8 @@ static bool wined3d_context_vk_create_slab_bo(struct wined3d_context_vk *context key.usage = usage; key.size = 32 * object_size; + wined3d_device_vk_allocator_lock(device_vk); + if ((entry = wine_rb_get(&context_vk->bo_slab_available, &key))) { slab = WINE_RB_ENTRY_VALUE(entry, struct wined3d_bo_slab_vk, entry); @@ -369,26 +387,29 @@ static bool wined3d_context_vk_create_slab_bo(struct wined3d_context_vk *context { if (!(slab = heap_alloc_zero(sizeof(*slab)))) { + wined3d_device_vk_allocator_unlock(device_vk); ERR("Failed to allocate bo slab.\n"); return false; } - slab->requested_memory_type = memory_type; - if (!wined3d_context_vk_create_bo(context_vk, key.size, usage, memory_type, &slab->bo)) + if (wine_rb_put(&context_vk->bo_slab_available, &key, &slab->entry) < 0) { - ERR("Failed to create slab bo.\n"); + wined3d_device_vk_allocator_unlock(device_vk); + ERR("Failed to add slab to available tree.\n"); heap_free(slab); return false; } - slab->map = ~0u; - if (wine_rb_put(&context_vk->bo_slab_available, &key, &slab->entry) < 0) + slab->requested_memory_type = memory_type; + if (!wined3d_context_vk_create_bo(context_vk, key.size, usage, memory_type, &slab->bo)) { - ERR("Failed to add slab to available tree.\n"); - wined3d_context_vk_destroy_bo(context_vk, &slab->bo); + wined3d_device_vk_allocator_unlock(device_vk); + ERR("Failed to create slab bo.\n"); + wine_rb_remove(&context_vk->bo_slab_available, &slab->entry); heap_free(slab); return false; } + slab->map = ~0u; TRACE("Created new bo slab %p.\n", slab); } @@ -407,6 +428,8 @@ static bool wined3d_context_vk_create_slab_bo(struct wined3d_context_vk *context } } + wined3d_device_vk_allocator_unlock(device_vk); + *bo = slab->bo; bo->memory = NULL; bo->slab = slab; @@ -480,7 +503,7 @@ BOOL wined3d_context_vk_create_bo(struct wined3d_context_vk *context_vk, VkDevic { ERR("Failed to bind buffer memory, vr %s.\n", wined3d_debug_vkresult(vr)); if (bo->memory) - wined3d_allocator_block_free(bo->memory); + wined3d_context_vk_free_memory(context_vk, bo->memory); else VK_CALL(vkFreeMemory(device_vk->vk_device, bo->vk_memory, NULL)); VK_CALL(vkDestroyBuffer(device_vk->vk_device, bo->vk_buffer, NULL)); @@ -574,7 +597,7 @@ BOOL wined3d_context_vk_create_image(struct wined3d_context_vk *context_vk, VkIm { VK_CALL(vkDestroyImage(device_vk->vk_device, image->vk_image, NULL)); if (image->memory) - wined3d_allocator_block_free(image->memory); + wined3d_context_vk_free_memory(context_vk, image->memory); else VK_CALL(vkFreeMemory(device_vk->vk_device, image->vk_memory, NULL)); ERR("Failed to bind image memory, vr %s.\n", wined3d_debug_vkresult(vr)); @@ -688,7 +711,7 @@ void wined3d_context_vk_destroy_allocator_block(struct wined3d_context_vk *conte if (context_vk->completed_command_buffer_id > command_buffer_id) { - wined3d_allocator_block_free(block); + wined3d_context_vk_free_memory(context_vk, block); TRACE("Freed block %p.\n", block); return; } @@ -707,11 +730,14 @@ void wined3d_context_vk_destroy_allocator_block(struct wined3d_context_vk *conte static void wined3d_bo_slab_vk_free_slice(struct wined3d_bo_slab_vk *slab, SIZE_T idx, struct wined3d_context_vk *context_vk) { + struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device); struct wined3d_bo_slab_vk_key key; struct wine_rb_entry *entry; TRACE("slab %p, idx %lu, context_vk %p.\n", slab, idx, context_vk); + wined3d_device_vk_allocator_lock(device_vk); + if (!slab->map) { key.memory_type = slab->requested_memory_type; @@ -729,6 +755,8 @@ static void wined3d_bo_slab_vk_free_slice(struct wined3d_bo_slab_vk *slab, } } slab->map |= 1u << idx; + + wined3d_device_vk_allocator_unlock(device_vk); } static void wined3d_context_vk_destroy_bo_slab_slice(struct wined3d_context_vk *context_vk, @@ -1000,7 +1028,7 @@ static void wined3d_context_vk_cleanup_resources(struct wined3d_context_vk *cont case WINED3D_RETIRED_ALLOCATOR_BLOCK_VK: TRACE("Destroying block %p.\n", o->u.block); - wined3d_allocator_block_free(o->u.block); + wined3d_context_vk_free_memory(context_vk, o->u.block); break; case WINED3D_RETIRED_BO_SLAB_SLICE_VK: diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index aa8974366a6..62b92ce7c34 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4084,6 +4084,7 @@ struct wined3d_device_vk struct wined3d_null_resources_vk null_resources_vk; struct wined3d_null_views_vk null_views_vk; + CRITICAL_SECTION allocator_cs; struct wined3d_allocator allocator; struct wined3d_uav_clear_state_vk uav_clear_state; @@ -4094,6 +4095,16 @@ static inline struct wined3d_device_vk *wined3d_device_vk(struct wined3d_device return CONTAINING_RECORD(device, struct wined3d_device_vk, d); } +static inline void wined3d_device_vk_allocator_lock(struct wined3d_device_vk *device_vk) +{ + EnterCriticalSection(&device_vk->allocator_cs); +} + +static inline void wined3d_device_vk_allocator_unlock(struct wined3d_device_vk *device_vk) +{ + LeaveCriticalSection(&device_vk->allocator_cs); +} + bool wined3d_device_vk_create_null_resources(struct wined3d_device_vk *device_vk, struct wined3d_context_vk *context_vk) DECLSPEC_HIDDEN; bool wined3d_device_vk_create_null_views(struct wined3d_device_vk *device_vk,

1 0

Zebediah Figura : wined3d: Separate a vk_buffer_usage_from_bind_flags() helper.
by Alexandre Julliard 04 Nov '21

04 Nov '21

Module: wine Branch: master Commit: a7dcbf3edec6819351821a1b2cdb659e43a49390 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a7dcbf3edec6819351821a1b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Nov 3 23:46:56 2021 -0500 wined3d: Separate a vk_buffer_usage_from_bind_flags() helper. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 55dcd9e67e8..886fb95f3e5 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1399,12 +1399,8 @@ HRESULT wined3d_buffer_gl_init(struct wined3d_buffer_gl *buffer_gl, struct wined return wined3d_buffer_init(&buffer_gl->b, device, desc, data, parent, parent_ops, &wined3d_buffer_gl_ops); } -static BOOL wined3d_buffer_vk_create_buffer_object(struct wined3d_buffer_vk *buffer_vk, - struct wined3d_context_vk *context_vk) +static VkBufferUsageFlags vk_buffer_usage_from_bind_flags(uint32_t bind_flags) { - struct wined3d_resource *resource = &buffer_vk->b.resource; - uint32_t bind_flags = resource->bind_flags; - VkMemoryPropertyFlags memory_type; VkBufferUsageFlags usage; usage = VK_BUFFER_USAGE_TRANSFER_SRC_BIT | VK_BUFFER_USAGE_TRANSFER_DST_BIT; @@ -1424,6 +1420,14 @@ static BOOL wined3d_buffer_vk_create_buffer_object(struct wined3d_buffer_vk *buf usage |= VK_BUFFER_USAGE_INDIRECT_BUFFER_BIT; if (bind_flags & (WINED3D_BIND_RENDER_TARGET | WINED3D_BIND_DEPTH_STENCIL)) FIXME("Ignoring some bind flags %#x.\n", bind_flags); + return usage; +} + +static BOOL wined3d_buffer_vk_create_buffer_object(struct wined3d_buffer_vk *buffer_vk, + struct wined3d_context_vk *context_vk) +{ + struct wined3d_resource *resource = &buffer_vk->b.resource; + VkMemoryPropertyFlags memory_type; memory_type = 0; if (resource->access & WINED3D_RESOURCE_ACCESS_MAP_R) @@ -1433,7 +1437,8 @@ static BOOL wined3d_buffer_vk_create_buffer_object(struct wined3d_buffer_vk *buf else if (!(resource->usage & WINED3DUSAGE_DYNAMIC)) memory_type |= VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT; - if (!(wined3d_context_vk_create_bo(context_vk, resource->size, usage, memory_type, &buffer_vk->bo))) + if (!(wined3d_context_vk_create_bo(context_vk, resource->size, + vk_buffer_usage_from_bind_flags(resource->bind_flags), memory_type, &buffer_vk->bo))) { WARN("Failed to create Vulkan buffer.\n"); return FALSE;

1 0

Zebediah Figura : wined3d: Separate a vk_memory_type_from_access_flags() helper.
by Alexandre Julliard 04 Nov '21

04 Nov '21

Module: wine Branch: master Commit: 580fdb494cea3da765f2b3472e0d83795b1b3c50 URL: https://source.winehq.org/git/wine.git/?a=commit;h=580fdb494cea3da765f2b347… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Nov 3 23:46:57 2021 -0500 wined3d: Separate a vk_memory_type_from_access_flags() helper. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 886fb95f3e5..62f84c96f96 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1423,22 +1423,27 @@ static VkBufferUsageFlags vk_buffer_usage_from_bind_flags(uint32_t bind_flags) return usage; } -static BOOL wined3d_buffer_vk_create_buffer_object(struct wined3d_buffer_vk *buffer_vk, - struct wined3d_context_vk *context_vk) +static VkMemoryPropertyFlags vk_memory_type_from_access_flags(uint32_t access, uint32_t usage) { - struct wined3d_resource *resource = &buffer_vk->b.resource; - VkMemoryPropertyFlags memory_type; + VkMemoryPropertyFlags memory_type = 0; - memory_type = 0; - if (resource->access & WINED3D_RESOURCE_ACCESS_MAP_R) + if (access & WINED3D_RESOURCE_ACCESS_MAP_R) memory_type |= VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_CACHED_BIT; - else if (resource->access & WINED3D_RESOURCE_ACCESS_MAP_W) + else if (access & WINED3D_RESOURCE_ACCESS_MAP_W) memory_type |= VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT; - else if (!(resource->usage & WINED3DUSAGE_DYNAMIC)) + else if (!(usage & WINED3DUSAGE_DYNAMIC)) memory_type |= VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT; + return memory_type; +} + +static BOOL wined3d_buffer_vk_create_buffer_object(struct wined3d_buffer_vk *buffer_vk, + struct wined3d_context_vk *context_vk) +{ + struct wined3d_resource *resource = &buffer_vk->b.resource; if (!(wined3d_context_vk_create_bo(context_vk, resource->size, - vk_buffer_usage_from_bind_flags(resource->bind_flags), memory_type, &buffer_vk->bo))) + vk_buffer_usage_from_bind_flags(resource->bind_flags), + vk_memory_type_from_access_flags(resource->access, resource->usage), &buffer_vk->bo))) { WARN("Failed to create Vulkan buffer.\n"); return FALSE;

1 0

Zebediah Figura : wined3d: Protect wined3d_bo_slab_vk map fields with a mutex.
by Alexandre Julliard 04 Nov '21

04 Nov '21

Module: wine Branch: master Commit: b1ae6fd3f4b80f4ef8de4a1e1f43fb7e8db17ee4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b1ae6fd3f4b80f4ef8de4a1e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Nov 3 23:47:00 2021 -0500 wined3d: Protect wined3d_bo_slab_vk map fields with a mutex. So as to allow slabs to be mapped from the client thread. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_vk.c | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index cbf7c94fd3a..a6b3df36002 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -845,28 +845,53 @@ static void wined3d_bo_vk_unmap(struct wined3d_bo_vk *bo, struct wined3d_context VK_CALL(vkUnmapMemory(device_vk->vk_device, bo->vk_memory)); } +static void wined3d_bo_slab_vk_lock(struct wined3d_bo_slab_vk *slab_vk, struct wined3d_context_vk *context_vk) +{ + wined3d_device_vk_allocator_lock(wined3d_device_vk(context_vk->c.device)); +} + +static void wined3d_bo_slab_vk_unlock(struct wined3d_bo_slab_vk *slab_vk, struct wined3d_context_vk *context_vk) +{ + wined3d_device_vk_allocator_unlock(wined3d_device_vk(context_vk->c.device)); +} + void *wined3d_bo_slab_vk_map(struct wined3d_bo_slab_vk *slab_vk, struct wined3d_context_vk *context_vk) { + void *map_ptr; + TRACE("slab_vk %p, context_vk %p.\n", slab_vk, context_vk); + wined3d_bo_slab_vk_lock(slab_vk, context_vk); + if (!slab_vk->map_ptr && !(slab_vk->map_ptr = wined3d_bo_vk_map(&slab_vk->bo, context_vk))) { + wined3d_bo_slab_vk_unlock(slab_vk, context_vk); ERR("Failed to map slab.\n"); return NULL; } ++slab_vk->map_count; + map_ptr = slab_vk->map_ptr; - return slab_vk->map_ptr; + wined3d_bo_slab_vk_unlock(slab_vk, context_vk); + + return map_ptr; } void wined3d_bo_slab_vk_unmap(struct wined3d_bo_slab_vk *slab_vk, struct wined3d_context_vk *context_vk) { + wined3d_bo_slab_vk_lock(slab_vk, context_vk); + if (--slab_vk->map_count) + { + wined3d_bo_slab_vk_unlock(slab_vk, context_vk); return; + } wined3d_bo_vk_unmap(&slab_vk->bo, context_vk); slab_vk->map_ptr = NULL; + + wined3d_bo_slab_vk_unlock(slab_vk, context_vk); } VkAccessFlags vk_access_mask_from_buffer_usage(VkBufferUsageFlags usage)

1 0

Paul Gofman : ntdll: Don't constraint TEB address to 2GB for native x64 process.
by Alexandre Julliard 04 Nov '21

04 Nov '21

Module: wine Branch: master Commit: 1722615b06cba2f04fcd0ca69bbc33d963fb143f URL: https://source.winehq.org/git/wine.git/?a=commit;h=1722615b06cba2f04fcd0ca6… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Nov 4 14:55:42 2021 +0300 ntdll: Don't constraint TEB address to 2GB for native x64 process. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/virtual.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 756a7388a22..f62ca1f5f01 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -3021,6 +3021,7 @@ NTSTATUS virtual_alloc_teb( TEB **ret_teb ) void *ptr = NULL; NTSTATUS status = STATUS_SUCCESS; SIZE_T block_size = signal_stack_mask + 1; + BOOL is_wow = !!NtCurrentTeb()->WowTebOffset; server_enter_uninterrupted_section( &virtual_mutex, &sigset ); if (next_free_teb) @@ -3035,7 +3036,7 @@ NTSTATUS virtual_alloc_teb( TEB **ret_teb ) { SIZE_T total = 32 * block_size; - if ((status = NtAllocateVirtualMemory( NtCurrentProcess(), &ptr, is_win64 ? 0x7fffffff : 0, + if ((status = NtAllocateVirtualMemory( NtCurrentProcess(), &ptr, is_win64 && is_wow ? 0x7fffffff : 0, &total, MEM_RESERVE, PAGE_READWRITE ))) { server_leave_uninterrupted_section( &virtual_mutex, &sigset ); @@ -3048,7 +3049,7 @@ NTSTATUS virtual_alloc_teb( TEB **ret_teb ) NtAllocateVirtualMemory( NtCurrentProcess(), (void **)&ptr, 0, &block_size, MEM_COMMIT, PAGE_READWRITE ); } - *ret_teb = teb = init_teb( ptr, !!NtCurrentTeb()->WowTebOffset ); + *ret_teb = teb = init_teb( ptr, is_wow ); server_leave_uninterrupted_section( &virtual_mutex, &sigset ); if ((status = signal_alloc_thread( teb )))

1 0

Nikolay Sivov : evr/mixer: Pass valid background color parameter to VideoProcessBlt().
by Alexandre Julliard 04 Nov '21

04 Nov '21

Module: wine Branch: master Commit: aad6c57211fd8910c8214898f9adca900b9dde29 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aad6c57211fd8910c8214898… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 4 17:58:44 2021 +0300 evr/mixer: Pass valid background color parameter to VideoProcessBlt(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/mixer.c | 35 +++++++++++++++++++++++++++++++---- 1 file changed, 31 insertions(+), 4 deletions(-) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index 3a2b6830782..2e03535fda3 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -95,7 +95,11 @@ struct video_mixer IMFAttributes *internal_attributes; unsigned int mixing_flags; unsigned int is_streaming; - COLORREF bkgnd_color; + struct + { + COLORREF rgba; + DXVA2_AYUVSample16 ayuv; + } bkgnd_color; LONGLONG lower_bound; LONGLONG upper_bound; CRITICAL_SECTION cs; @@ -1277,7 +1281,6 @@ static void video_mixer_render(struct video_mixer *mixer, IDirect3DSurface9 *rt) zoom_rect.right = zoom_rect.bottom = 1.0f; } - SetRect(&params.TargetRect, 0, 0, rt_desc.Width, rt_desc.Height); video_mixer_scale_rect(&dst, rt_desc.Width, rt_desc.Height, &zoom_rect); for (i = 0; i < mixer->input_count; ++i) @@ -1329,6 +1332,9 @@ static void video_mixer_render(struct video_mixer *mixer, IDirect3DSurface9 *rt) if (SUCCEEDED(hr)) { + SetRect(&params.TargetRect, 0, 0, rt_desc.Width, rt_desc.Height); + params.BackgroundColor = mixer->bkgnd_color.ayuv; + if (FAILED(hr = IDirectXVideoProcessor_VideoProcessBlt(mixer->processor, rt, &params, samples, sample_count, NULL))) { @@ -1983,12 +1989,28 @@ static HRESULT WINAPI video_mixer_processor_GetBackgroundColor(IMFVideoProcessor return E_POINTER; EnterCriticalSection(&mixer->cs); - *color = mixer->bkgnd_color; + *color = mixer->bkgnd_color.rgba; LeaveCriticalSection(&mixer->cs); return S_OK; } +static void video_mixer_rgb_to_ycbcr(COLORREF rgb, DXVA2_AYUVSample16 *ayuv) +{ + int y, cb, cr, r, g, b; + + r = GetRValue(rgb); g = GetGValue(rgb); b = GetBValue(rgb); + /* Coefficients according to SDTV ITU-R BT.601 */ + y = (77 * r + 150 * g + 29 * b + 128) / 256 + 16; + cb = (-44 * r - 87 * g + 131 * b + 128) / 256 + 128; + cr = (131 * r - 110 * g - 21 * b + 128) / 256 + 128; + + ayuv->Y = y * 0x100; + ayuv->Cb = cb * 0x100; + ayuv->Cr = cr * 0x100; + ayuv->Alpha = 0xffff; +} + static HRESULT WINAPI video_mixer_processor_SetBackgroundColor(IMFVideoProcessor *iface, COLORREF color) { struct video_mixer *mixer = impl_from_IMFVideoProcessor(iface); @@ -1996,7 +2018,11 @@ static HRESULT WINAPI video_mixer_processor_SetBackgroundColor(IMFVideoProcessor TRACE("%p, %#x.\n", iface, color); EnterCriticalSection(&mixer->cs); - mixer->bkgnd_color = color; + if (mixer->bkgnd_color.rgba != color) + { + video_mixer_rgb_to_ycbcr(color, &mixer->bkgnd_color.ayuv); + mixer->bkgnd_color.rgba = color; + } LeaveCriticalSection(&mixer->cs); return S_OK; @@ -2528,6 +2554,7 @@ HRESULT evr_mixer_create(IUnknown *outer, void **out) object->upper_bound = MFT_OUTPUT_BOUND_UPPER_UNBOUNDED; video_mixer_init_input(&object->inputs[0]); video_mixer_update_zorder_map(object); + video_mixer_rgb_to_ycbcr(object->bkgnd_color.rgba, &object->bkgnd_color.ayuv); InitializeCriticalSection(&object->cs); if (FAILED(hr = MFCreateAttributes(&object->attributes, 0))) {

1 0