wine-commits July 2022

wine-commits@winehq.org

1 participants
639 discussions

Alexandre Julliard : server: Implement link_name() for registry keys.
by Alexandre Julliard 07 Jul '22

07 Jul '22

Module: wine Branch: master Commit: 6a7a7bbe97b210af5c5983fd09a707c33538073c URL: https://source.winehq.org/git/wine.git/?a=commit;h=6a7a7bbe97b210af5c5983fd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 7 11:49:50 2022 +0200 server: Implement link_name() for registry keys. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/registry.c | 78 +++++++++++++++++++++++++++++++++---------------------- 1 file changed, 47 insertions(+), 31 deletions(-) diff --git a/server/registry.c b/server/registry.c index c7b56344bae..2c52ec85d29 100644 --- a/server/registry.c +++ b/server/registry.c @@ -164,6 +164,7 @@ static void key_dump( struct object *obj, int verbose ); static unsigned int key_map_access( struct object *obj, unsigned int access ); static struct security_descriptor *key_get_sd( struct object *obj ); static WCHAR *key_get_full_name( struct object *obj, data_size_t *len ); +static int key_link_name( struct object *obj, struct object_name *name, struct object *parent ); static void key_unlink_name( struct object *obj, struct object_name *name ); static int key_close_handle( struct object *obj, struct process *process, obj_handle_t handle ); static void key_destroy( struct object *obj ); @@ -184,7 +185,7 @@ static const struct object_ops key_ops = default_set_sd, /* set_sd */ key_get_full_name, /* get_full_name */ no_lookup_name, /* lookup_name */ - no_link_name, /* link_name */ + key_link_name, /* link_name */ key_unlink_name, /* unlink_name */ no_open_file, /* open_file */ no_kernel_obj_list, /* get_kernel_obj_list */ @@ -202,6 +203,7 @@ static inline struct key *get_parent( const struct key *key ) { struct object *parent = key->obj.name->parent; + if (!parent || parent->ops != &key_ops) return NULL; return (struct key *)parent; } @@ -483,6 +485,40 @@ static WCHAR *key_get_full_name( struct object *obj, data_size_t *ret_len ) return (WCHAR *)ret; } +static int key_link_name( struct object *obj, struct object_name *name, struct object *parent ) +{ + struct key *key = (struct key *)obj; + struct key *parent_key = (struct key *)parent; + struct unicode_str tmp; + int i, index; + + if (parent->ops != &key_ops) + { + /* only the root key can be created inside a normal directory */ + if (!root_key) return directory_link_name( obj, name, parent ); + set_error( STATUS_OBJECT_NAME_NOT_FOUND ); + return 0; + } + + if (parent_key->last_subkey + 1 == parent_key->nb_subkeys) + { + /* need to grow the array */ + if (!grow_subkeys( parent_key )) return 0; + } + tmp.str = name->name; + tmp.len = name->len; + find_subkey( parent_key, &tmp, &index ); + + for (i = ++parent_key->last_subkey; i > index; i--) + parent_key->subkeys[i] = parent_key->subkeys[i - 1]; + parent_key->subkeys[index] = (struct key *)grab_object( key ); + if (is_wow6432node( name->name, name->len ) && + !is_wow6432node( parent_key->obj.name->name, parent_key->obj.name->len )) + parent_key->wow6432node = key; + name->parent = parent; + return 1; +} + static void key_unlink_name( struct object *obj, struct object_name *name ) { struct key *key = (struct key *)obj; @@ -676,33 +712,14 @@ static void touch_key( struct key *key, unsigned int change ) } /* allocate a subkey for a given key, and return its index */ -static struct key *alloc_subkey( struct key *parent, const struct unicode_str *name, - int index, timeout_t modif ) +static struct key *alloc_subkey( struct key *parent, const struct unicode_str *name, timeout_t modif ) { struct key *key; - int i; - if (name->len > MAX_NAME_LEN * sizeof(WCHAR)) - { - set_error( STATUS_INVALID_PARAMETER ); - return NULL; - } - if (parent->last_subkey + 1 == parent->nb_subkeys) - { - /* need to grow the array */ - if (!grow_subkeys( parent )) return NULL; - } - if ((key = alloc_key( name, modif )) != NULL) - { - key->obj.name->parent = &parent->obj; - for (i = ++parent->last_subkey; i > index; i--) - parent->subkeys[i] = parent->subkeys[i-1]; - parent->subkeys[index] = key; - if (is_wow6432node( key->obj.name->name, key->obj.name->len ) && - !is_wow6432node( parent->obj.name->name, parent->obj.name->len )) - parent->wow6432node = key; - } - return key; + if (!(key = alloc_key( name, modif ))) return NULL; + if (key_link_name( &key->obj, key->obj.name, &parent->obj )) return key; + release_object( key ); + return NULL; } /* return the wow64 variant of the key, or the key itself if none */ @@ -850,7 +867,7 @@ static struct key *create_key( struct key *key, const struct unicode_str *name, return NULL; } make_dirty( key ); - if (!(key = alloc_subkey( key, &token, index, current_time ))) return NULL; + if (!(key = alloc_subkey( key, &token, current_time ))) return NULL; if (options & REG_OPTION_CREATE_LINK) key->flags |= KEY_SYMLINK; if (options & REG_OPTION_VOLATILE) key->flags |= KEY_VOLATILE; @@ -895,14 +912,13 @@ static struct key *create_key_recursive( struct key *key, const struct unicode_s if (token.len) { - if (!(key = alloc_subkey( key, &token, index, modif ))) return NULL; + if (!(key = alloc_subkey( key, &token, modif ))) return NULL; base = key; for (;;) { get_path_token( name, &token ); if (!token.len) break; - /* we know the index is always 0 in a new key */ - if (!(key = alloc_subkey( key, &token, 0, modif ))) + if (!(key = alloc_subkey( key, &token, modif ))) { unlink_named_object( &base->obj ); return NULL; @@ -1076,11 +1092,11 @@ static int rename_key( struct key *key, const struct unicode_str *new_name ) /* delete a key and its values */ static int delete_key( struct key *key, int recurse ) { - struct key *parent = get_parent( key ); + struct key *parent; if (key->flags & KEY_DELETED) return 1; - if (!parent) + if (!(parent = get_parent( key ))) { set_error( STATUS_ACCESS_DENIED ); return 0;

1 0

Alexandre Julliard : server: Move some functions to avoid forward declarations.
by Alexandre Julliard 07 Jul '22

07 Jul '22

Module: wine Branch: master Commit: 721cd6e636788829d22955fe48c5e3f81eecfbe0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=721cd6e636788829d22955fe… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 7 11:48:38 2022 +0200 server: Move some functions to avoid forward declarations. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/registry.c | 102 +++++++++++++++++++++++++++--------------------------- 1 file changed, 51 insertions(+), 51 deletions(-) diff --git a/server/registry.c b/server/registry.c index b32b4eb08a0..c7b56344bae 100644 --- a/server/registry.c +++ b/server/registry.c @@ -279,6 +279,57 @@ static void dump_value( const struct key_value *value, FILE *f ) fputc( '\n', f ); } +/* find the named child of a given key and return its index */ +static struct key *find_subkey( const struct key *key, const struct unicode_str *name, int *index ) +{ + int i, min, max, res; + data_size_t len; + + min = 0; + max = key->last_subkey; + while (min <= max) + { + i = (min + max) / 2; + len = min( key->subkeys[i]->obj.name->len, name->len ); + res = memicmp_strW( key->subkeys[i]->obj.name->name, name->str, len ); + if (!res) res = key->subkeys[i]->obj.name->len - name->len; + if (!res) + { + *index = i; + return key->subkeys[i]; + } + if (res > 0) max = i - 1; + else min = i + 1; + } + *index = min; /* this is where we should insert it */ + return NULL; +} + +/* try to grow the array of subkeys; return 1 if OK, 0 on error */ +static int grow_subkeys( struct key *key ) +{ + struct key **new_subkeys; + int nb_subkeys; + + if (key->nb_subkeys) + { + nb_subkeys = key->nb_subkeys + (key->nb_subkeys / 2); /* grow by 50% */ + if (!(new_subkeys = realloc( key->subkeys, nb_subkeys * sizeof(*new_subkeys) ))) + { + set_error( STATUS_NO_MEMORY ); + return 0; + } + } + else + { + nb_subkeys = MIN_SUBKEYS; + if (!(new_subkeys = mem_alloc( nb_subkeys * sizeof(*new_subkeys) ))) return 0; + } + key->subkeys = new_subkeys; + key->nb_subkeys = nb_subkeys; + return 1; +} + /* save a registry and all its subkeys to a text file */ static void save_subkeys( const struct key *key, const struct key *base, FILE *f ) { @@ -624,31 +675,6 @@ static void touch_key( struct key *key, unsigned int change ) for (key = get_parent( key ); key; key = get_parent( key )) check_notify( key, change, 0 ); } -/* try to grow the array of subkeys; return 1 if OK, 0 on error */ -static int grow_subkeys( struct key *key ) -{ - struct key **new_subkeys; - int nb_subkeys; - - if (key->nb_subkeys) - { - nb_subkeys = key->nb_subkeys + (key->nb_subkeys / 2); /* grow by 50% */ - if (!(new_subkeys = realloc( key->subkeys, nb_subkeys * sizeof(*new_subkeys) ))) - { - set_error( STATUS_NO_MEMORY ); - return 0; - } - } - else - { - nb_subkeys = MIN_SUBKEYS; - if (!(new_subkeys = mem_alloc( nb_subkeys * sizeof(*new_subkeys) ))) return 0; - } - key->subkeys = new_subkeys; - key->nb_subkeys = nb_subkeys; - return 1; -} - /* allocate a subkey for a given key, and return its index */ static struct key *alloc_subkey( struct key *parent, const struct unicode_str *name, int index, timeout_t modif ) @@ -679,32 +705,6 @@ static struct key *alloc_subkey( struct key *parent, const struct unicode_str *n return key; } -/* find the named child of a given key and return its index */ -static struct key *find_subkey( const struct key *key, const struct unicode_str *name, int *index ) -{ - int i, min, max, res; - data_size_t len; - - min = 0; - max = key->last_subkey; - while (min <= max) - { - i = (min + max) / 2; - len = min( key->subkeys[i]->obj.name->len, name->len ); - res = memicmp_strW( key->subkeys[i]->obj.name->name, name->str, len ); - if (!res) res = key->subkeys[i]->obj.name->len - name->len; - if (!res) - { - *index = i; - return key->subkeys[i]; - } - if (res > 0) max = i - 1; - else min = i + 1; - } - *index = min; /* this is where we should insert it */ - return NULL; -} - /* return the wow64 variant of the key, or the key itself if none */ static struct key *find_wow64_subkey( struct key *key, const struct unicode_str *name ) {

1 0

Alexandre Julliard : ntdll: Make all registry lookups case-insensitive.
by Alexandre Julliard 07 Jul '22

07 Jul '22

Module: wine Branch: master Commit: 0cb350f19ce911d7be2a823e8066f36c4cec48d1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0cb350f19ce911d7be2a823e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 7 12:29:55 2022 +0200 ntdll: Make all registry lookups case-insensitive. Following recent Windows versions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/registry.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/registry.c b/dlls/ntdll/unix/registry.c index 428f8c9eb3c..693a594e84b 100644 --- a/dlls/ntdll/unix/registry.c +++ b/dlls/ntdll/unix/registry.c @@ -83,6 +83,7 @@ NTSTATUS WINAPI NtCreateKey( HANDLE *key, ACCESS_MASK access, const OBJECT_ATTRI if (attr->Length != sizeof(OBJECT_ATTRIBUTES)) return STATUS_INVALID_PARAMETER; if (!attr->ObjectName->Length && !attr->RootDirectory) return STATUS_OBJECT_PATH_SYNTAX_BAD; if ((ret = alloc_object_attributes( attr, &objattr, &len ))) return ret; + objattr->attributes |= OBJ_OPENIF | OBJ_CASE_INSENSITIVE; TRACE( "(%p,%s,%s,%x,%x,%p)\n", attr->RootDirectory, debugstr_us(attr->ObjectName), debugstr_us(class), options, access, key ); @@ -133,6 +134,7 @@ NTSTATUS WINAPI NtCreateKeyTransacted( HANDLE *key, ACCESS_MASK access, const OB NTSTATUS WINAPI NtOpenKeyEx( HANDLE *key, ACCESS_MASK access, const OBJECT_ATTRIBUTES *attr, ULONG options ) { NTSTATUS ret; + ULONG attributes; *key = 0; if (attr->Length != sizeof(*attr)) return STATUS_INVALID_PARAMETER; @@ -142,11 +144,13 @@ NTSTATUS WINAPI NtOpenKeyEx( HANDLE *key, ACCESS_MASK access, const OBJECT_ATTRI if (options & ~REG_OPTION_OPEN_LINK) FIXME( "options %x not implemented\n", options ); + attributes = attr->Attributes | OBJ_CASE_INSENSITIVE; + SERVER_START_REQ( open_key ) { req->parent = wine_server_obj_handle( attr->RootDirectory ); req->access = access; - req->attributes = attr->Attributes; + req->attributes = attributes; wine_server_add_data( req, attr->ObjectName->Buffer, attr->ObjectName->Length ); ret = wine_server_call( req ); *key = wine_server_ptr_handle( reply->hkey ); @@ -699,6 +703,7 @@ NTSTATUS WINAPI NtLoadKey( const OBJECT_ATTRIBUTES *attr, OBJECT_ATTRIBUTES *fil if (ret) return ret; if ((ret = alloc_object_attributes( attr, &objattr, &len ))) return ret; + objattr->attributes |= OBJ_OPENIF | OBJ_CASE_INSENSITIVE; SERVER_START_REQ( load_registry ) {

1 0

Stefan Dösinger : wined3d: Don't transition GENERAL layouts for blits.
by Alexandre Julliard 07 Jul '22

07 Jul '22

Module: wine Branch: master Commit: 87bdc642a3e7d65a505799459675b5cc9bc1eb05 URL: https://source.winehq.org/git/wine.git/?a=commit;h=87bdc642a3e7d65a50579945… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Apr 25 15:13:29 2022 +0300 wined3d: Don't transition GENERAL layouts for blits. On Radeon GPUs VK_IMAGE_LAYOUT_GENERAL images don't use Delta Color Compression, but SRC/DST optimal images do. Transitioning from GENERAL to SRC/DST causes a big performance hit. As a next step we should try harder to avoid VK_IMAGE_LAYOUT_GENERAL. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> --- dlls/wined3d/texture.c | 48 +++++++++++++++++++++++++++++------------------- 1 file changed, 29 insertions(+), 19 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index a8756f899d7..50049f96d71 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -7043,6 +7043,7 @@ static DWORD vk_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit_ struct wined3d_context_vk *context_vk = wined3d_context_vk(context); const struct wined3d_vk_info *vk_info = context_vk->vk_info; VkImageSubresourceRange vk_src_range, vk_dst_range; + VkImageLayout src_layout, dst_layout; VkCommandBuffer vk_command_buffer; struct wined3d_blitter *next; unsigned src_sample_count; @@ -7103,17 +7104,25 @@ static DWORD vk_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit_ goto next; } + if (src_texture_vk->layout == VK_IMAGE_LAYOUT_GENERAL) + src_layout = VK_IMAGE_LAYOUT_GENERAL; + else + src_layout = VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL; + + if (dst_texture_vk->layout == VK_IMAGE_LAYOUT_GENERAL) + dst_layout = VK_IMAGE_LAYOUT_GENERAL; + else + dst_layout = VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL; + wined3d_context_vk_image_barrier(context_vk, vk_command_buffer, VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT, vk_access_mask_from_bind_flags(src_texture_vk->t.resource.bind_flags), - VK_ACCESS_TRANSFER_READ_BIT, - src_texture_vk->layout, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, + VK_ACCESS_TRANSFER_READ_BIT, src_texture_vk->layout, src_layout, src_texture_vk->image.vk_image, &vk_src_range); wined3d_context_vk_image_barrier(context_vk, vk_command_buffer, VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT, vk_access_mask_from_bind_flags(dst_texture_vk->t.resource.bind_flags), - VK_ACCESS_TRANSFER_WRITE_BIT, - dst_texture_vk->layout, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, + VK_ACCESS_TRANSFER_WRITE_BIT, dst_texture_vk->layout, dst_layout, dst_texture_vk->image.vk_image, &vk_dst_range); if (resolve) @@ -7122,6 +7131,7 @@ static DWORD vk_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit_ const struct wined3d_format_vk *dst_format_vk = wined3d_format_vk(dst_texture->resource.format); const unsigned int usage = VK_IMAGE_USAGE_TRANSFER_SRC_BIT | VK_IMAGE_USAGE_TRANSFER_DST_BIT | VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT; + VkImageLayout resolve_src_layout, resolve_dst_layout; VkImage src_vk_image, dst_vk_image; VkImageSubresourceRange vk_range; VkImageResolve resolve_region; @@ -7211,7 +7221,7 @@ static DWORD vk_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit_ copy_region.extent.depth = 1; VK_CALL(vkCmdCopyImage(vk_command_buffer, src_texture_vk->image.vk_image, - VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, src_vk_image, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, + src_layout, src_vk_image, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, 1, &copy_region)); wined3d_context_vk_image_barrier(context_vk, vk_command_buffer, @@ -7219,6 +7229,7 @@ static DWORD vk_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit_ VK_ACCESS_TRANSFER_WRITE_BIT, VK_ACCESS_TRANSFER_READ_BIT, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, src_vk_image, &vk_range); + resolve_src_layout = VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL; resolve_region.srcSubresource.mipLevel = 0; resolve_region.srcSubresource.baseArrayLayer = 0; @@ -7230,6 +7241,7 @@ static DWORD vk_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit_ else { src_vk_image = src_texture_vk->image.vk_image; + resolve_src_layout = src_layout; resolve_region.srcSubresource.mipLevel = vk_src_range.baseMipLevel; resolve_region.srcSubresource.baseArrayLayer = vk_src_range.baseArrayLayer; @@ -7256,6 +7268,7 @@ static DWORD vk_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit_ wined3d_context_vk_image_barrier(context_vk, vk_command_buffer, VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT, 0, VK_ACCESS_TRANSFER_WRITE_BIT, VK_IMAGE_LAYOUT_UNDEFINED, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, dst_vk_image, &vk_range); + resolve_dst_layout = VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL; resolve_region.dstSubresource.mipLevel = 0; resolve_region.dstSubresource.baseArrayLayer = 0; @@ -7267,6 +7280,7 @@ static DWORD vk_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit_ else { dst_vk_image = dst_texture_vk->image.vk_image; + resolve_dst_layout = dst_layout; resolve_region.dstSubresource.mipLevel = vk_dst_range.baseMipLevel; resolve_region.dstSubresource.baseArrayLayer = vk_dst_range.baseArrayLayer; @@ -7276,15 +7290,15 @@ static DWORD vk_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit_ resolve_region.dstOffset.z = 0; } - VK_CALL(vkCmdResolveImage(vk_command_buffer, src_vk_image, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, - dst_vk_image, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, 1, &resolve_region)); + VK_CALL(vkCmdResolveImage(vk_command_buffer, src_vk_image, resolve_src_layout, + dst_vk_image, resolve_dst_layout, 1, &resolve_region)); if (dst_vk_image != dst_texture_vk->image.vk_image) { wined3d_context_vk_image_barrier(context_vk, vk_command_buffer, VK_PIPELINE_STAGE_TRANSFER_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT, VK_ACCESS_TRANSFER_WRITE_BIT, VK_ACCESS_TRANSFER_READ_BIT, - VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, + resolve_dst_layout, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, dst_vk_image, &vk_range); copy_region.srcSubresource.aspectMask = vk_dst_range.aspectMask; @@ -7306,7 +7320,7 @@ static DWORD vk_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit_ copy_region.extent.depth = 1; VK_CALL(vkCmdCopyImage(vk_command_buffer, dst_vk_image, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, - dst_texture_vk->image.vk_image, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, 1, &copy_region)); + dst_texture_vk->image.vk_image, dst_layout, 1, &copy_region)); } } else @@ -7331,22 +7345,20 @@ static DWORD vk_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit_ region.extent.height = src_rect->bottom - src_rect->top; region.extent.depth = 1; - VK_CALL(vkCmdCopyImage(vk_command_buffer, src_texture_vk->image.vk_image, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, - dst_texture_vk->image.vk_image, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, 1, &region)); + VK_CALL(vkCmdCopyImage(vk_command_buffer, src_texture_vk->image.vk_image, src_layout, + dst_texture_vk->image.vk_image, dst_layout, 1, &region)); } wined3d_context_vk_image_barrier(context_vk, vk_command_buffer, VK_PIPELINE_STAGE_TRANSFER_BIT, VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, VK_ACCESS_TRANSFER_WRITE_BIT, vk_access_mask_from_bind_flags(dst_texture_vk->t.resource.bind_flags), - VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, dst_texture_vk->layout, - dst_texture_vk->image.vk_image, &vk_dst_range); + dst_layout, dst_texture_vk->layout, dst_texture_vk->image.vk_image, &vk_dst_range); wined3d_context_vk_image_barrier(context_vk, vk_command_buffer, VK_PIPELINE_STAGE_TRANSFER_BIT, VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, VK_ACCESS_TRANSFER_READ_BIT, vk_access_mask_from_bind_flags(src_texture_vk->t.resource.bind_flags), - VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, src_texture_vk->layout, - src_texture_vk->image.vk_image, &vk_src_range); + src_layout, src_texture_vk->layout, src_texture_vk->image.vk_image, &vk_src_range); wined3d_texture_validate_location(dst_texture, dst_sub_resource_idx, WINED3D_LOCATION_TEXTURE_RGB); wined3d_texture_invalidate_location(dst_texture, dst_sub_resource_idx, ~WINED3D_LOCATION_TEXTURE_RGB); @@ -7363,14 +7375,12 @@ barrier_next: VK_PIPELINE_STAGE_TRANSFER_BIT, VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, VK_ACCESS_TRANSFER_WRITE_BIT, vk_access_mask_from_bind_flags(dst_texture_vk->t.resource.bind_flags), - VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, dst_texture_vk->layout, - dst_texture_vk->image.vk_image, &vk_dst_range); + dst_layout, dst_texture_vk->layout, dst_texture_vk->image.vk_image, &vk_dst_range); wined3d_context_vk_image_barrier(context_vk, vk_command_buffer, VK_PIPELINE_STAGE_TRANSFER_BIT, VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, VK_ACCESS_TRANSFER_READ_BIT, vk_access_mask_from_bind_flags(src_texture_vk->t.resource.bind_flags), - VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, src_texture_vk->layout, - src_texture_vk->image.vk_image, &vk_src_range); + src_layout, src_texture_vk->layout, src_texture_vk->image.vk_image, &vk_src_range); next: if (!(next = blitter->next))

1 0

Rémi Bernon : dinput/tests: Remove racy IForceFeedbackEffect reference count checks.
by Alexandre Julliard 07 Jul '22

07 Jul '22

Module: wine Branch: master Commit: 1854001c79eb756db667b3e813f14d2aa71a10be URL: https://source.winehq.org/git/wine.git/?a=commit;h=1854001c79eb756db667b3e8… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jul 7 08:52:07 2022 +0200 dinput/tests: Remove racy IForceFeedbackEffect reference count checks. Because the async operation holds a reference on the invoker and the param, it may keep the effect alive until the worker thread releases its reference on the async operation. We have no way to synchronize on that. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53199 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/dinput/tests/force_feedback.c | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/dlls/dinput/tests/force_feedback.c b/dlls/dinput/tests/force_feedback.c index 1bcd56d685a..8fb15e38f13 100644 --- a/dlls/dinput/tests/force_feedback.c +++ b/dlls/dinput/tests/force_feedback.c @@ -5673,7 +5673,6 @@ static void test_windows_gaming_input(void) UINT32 size; HRESULT hr; DWORD ret; - LONG ref; if (!load_combase_functions()) return; @@ -6053,8 +6052,7 @@ static void test_windows_gaming_input(void) todo_wine ok( hr == 0x86854003, "TryUnloadEffectAsync returned %#lx\n", hr ); - ref = IForceFeedbackEffect_Release( effect ); - ok( ref == 0, "Release returned %lu\n", ref ); + IForceFeedbackEffect_Release( effect ); hr = IPeriodicForceEffectFactory_CreateInstance( periodic_factory, PeriodicForceEffectKind_SineWave, &effect ); @@ -6127,8 +6125,7 @@ static void test_windows_gaming_input(void) IAsyncOperation_boolean_Release( bool_async ); set_hid_expect( file, NULL, 0 ); - ref = IForceFeedbackEffect_Release( effect ); - ok( ref == 0, "Release returned %lu\n", ref ); + IForceFeedbackEffect_Release( effect ); IPeriodicForceEffectFactory_Release( periodic_factory ); @@ -6220,8 +6217,7 @@ static void test_windows_gaming_input(void) IAsyncOperation_boolean_Release( bool_async ); set_hid_expect( file, NULL, 0 ); - ref = IForceFeedbackEffect_Release( effect ); - ok( ref == 0, "Release returned %lu\n", ref ); + IForceFeedbackEffect_Release( effect ); IConditionForceEffectFactory_Release( condition_factory ); @@ -6313,8 +6309,7 @@ static void test_windows_gaming_input(void) IAsyncOperation_boolean_Release( bool_async ); set_hid_expect( file, NULL, 0 ); - ref = IForceFeedbackEffect_Release( effect ); - ok( ref == 0, "Release returned %lu\n", ref ); + IForceFeedbackEffect_Release( effect ); hr = pWindowsCreateString( ramp_effect_class_name, wcslen( ramp_effect_class_name ), &str ); @@ -6387,8 +6382,7 @@ static void test_windows_gaming_input(void) IAsyncOperation_boolean_Release( bool_async ); set_hid_expect( file, NULL, 0 ); - ref = IForceFeedbackEffect_Release( effect ); - ok( ref == 0, "Release returned %lu\n", ref ); + IForceFeedbackEffect_Release( effect ); IForceFeedbackMotor_Release( motor );

1 0

Rémi Bernon : dinput/tests: Avoid window activation race conditions with Wine.
by Alexandre Julliard 07 Jul '22

07 Jul '22

Module: wine Branch: master Commit: 2020541b4b42c4534335bdc0520d63ce53d880c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2020541b4b42c4534335bdc0… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jul 7 08:47:39 2022 +0200 dinput/tests: Avoid window activation race conditions with Wine. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53240 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/dinput/tests/device8.c | 40 +++++++++++++++------------------------- 1 file changed, 15 insertions(+), 25 deletions(-) diff --git a/dlls/dinput/tests/device8.c b/dlls/dinput/tests/device8.c index 927bf18949a..ebe376d1127 100644 --- a/dlls/dinput/tests/device8.c +++ b/dlls/dinput/tests/device8.c @@ -1893,7 +1893,6 @@ static void test_sys_mouse( DWORD version ) hwnd = CreateWindowW( L"static", L"static", WS_POPUP | WS_VISIBLE, 50, 50, 200, 200, NULL, NULL, NULL, NULL ); ok( !!hwnd, "CreateWindowW failed, error %lu\n", GetLastError() ); - flush_events(); hr = IDirectInputDevice8_SetCooperativeLevel( device, NULL, DISCL_FOREGROUND ); ok( hr == DIERR_INVALIDPARAM, "SetCooperativeLevel returned %#lx\n", hr ); @@ -1926,7 +1925,6 @@ static void test_sys_mouse( DWORD version ) child = CreateWindowW( L"static", L"static", WS_CHILD | WS_VISIBLE, 10, 10, 50, 50, hwnd, NULL, NULL, NULL ); ok( !!child, "CreateWindowW failed, error %lu\n", GetLastError() ); - flush_events(); hr = IDirectInputDevice8_SetCooperativeLevel( device, child, DISCL_FOREGROUND ); ok( hr == DIERR_INVALIDPARAM, "SetCooperativeLevel returned %#lx\n", hr ); @@ -1966,27 +1964,6 @@ static void test_sys_mouse( DWORD version ) hr = IDirectInputDevice8_Acquire( device ); ok( hr == DI_NOEFFECT, "Acquire returned %#lx\n", hr ); - - tmp_hwnd = CreateWindowW( L"static", L"static", WS_POPUP | WS_VISIBLE, - 50, 250, 200, 200, NULL, NULL, NULL, NULL ); - ok( !!tmp_hwnd, "CreateWindowW failed, error %lu\n", GetLastError() ); - flush_events(); - - hr = IDirectInputDevice8_GetDeviceState( device, sizeof(state), &state ); - ok( hr == DIERR_NOTACQUIRED, "GetDeviceState returned %#lx\n", hr ); - - hr = IDirectInputDevice8_Acquire( device ); - ok( hr == DIERR_OTHERAPPHASPRIO, "Acquire returned %#lx\n", hr ); - - SetActiveWindow( hwnd ); - flush_events(); - - hr = IDirectInputDevice8_SetProperty( device, DIPROP_BUFFERSIZE, (LPCDIPROPHEADER)&prop_dword ); - ok( hr == DI_OK, "SetProperty returned %#lx\n", hr ); - - hr = IDirectInputDevice8_Acquire( device ); - ok( hr == DI_OK, "Acquire returned %#lx\n", hr ); - mouse_event( MOUSEEVENTF_MOVE, 10, 10, 0, 0 ); res = WaitForSingleObject( event, 100 ); if (res == WAIT_TIMEOUT) /* Acquire is asynchronous */ @@ -2058,8 +2035,23 @@ static void test_sys_mouse( DWORD version ) ok( hr == DI_OK, "GetDeviceData returned %#lx\n", hr ); ok( count == 1, "got count %lu\n", count ); + hr = IDirectInputDevice8_Unacquire( device ); + ok( hr == DI_OK, "Unacquire returned %#lx\n", hr ); + + + tmp_hwnd = CreateWindowW( L"static", L"static", WS_POPUP | WS_VISIBLE, + 50, 250, 200, 200, NULL, NULL, NULL, NULL ); + ok( !!tmp_hwnd, "CreateWindowW failed, error %lu\n", GetLastError() ); + + hr = IDirectInputDevice8_GetDeviceState( device, sizeof(state), &state ); + ok( hr == DIERR_NOTACQUIRED, "GetDeviceState returned %#lx\n", hr ); + + hr = IDirectInputDevice8_Acquire( device ); + ok( hr == DIERR_OTHERAPPHASPRIO, "Acquire returned %#lx\n", hr ); + DestroyWindow( tmp_hwnd ); + CloseHandle( event ); DestroyWindow( hwnd ); @@ -2554,7 +2546,6 @@ static void test_sys_keyboard( DWORD version ) hwnd = CreateWindowW( L"static", L"static", WS_POPUP | WS_VISIBLE, 50, 50, 200, 200, NULL, NULL, NULL, NULL ); ok( !!hwnd, "CreateWindowW failed, error %lu\n", GetLastError() ); - flush_events(); hr = IDirectInputDevice8_SetCooperativeLevel( device, NULL, DISCL_FOREGROUND ); ok( hr == DIERR_INVALIDPARAM, "SetCooperativeLevel returned %#lx\n", hr ); @@ -2589,7 +2580,6 @@ static void test_sys_keyboard( DWORD version ) child = CreateWindowW( L"static", L"static", WS_CHILD | WS_VISIBLE, 10, 10, 50, 50, hwnd, NULL, NULL, NULL ); ok( !!child, "CreateWindowW failed, error %lu\n", GetLastError() ); - flush_events(); hr = IDirectInputDevice8_SetCooperativeLevel( device, child, DISCL_FOREGROUND ); ok( hr == DIERR_INVALIDPARAM, "SetCooperativeLevel returned %#lx\n", hr );

1 0

Rémi Bernon : win32u: Move writing mode to registry out of graphics drivers.
by Alexandre Julliard 07 Jul '22

07 Jul '22

Module: wine Branch: master Commit: d83fcafcd3023caba84eadea3f3c6f7a04b1d954 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d83fcafcd3023caba84eadea… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jul 4 11:36:26 2022 +0200 win32u: Move writing mode to registry out of graphics drivers. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/win32u/sysparams.c | 52 +++++++++++++++++++ dlls/winemac.drv/display.c | 104 +------------------------------------- dlls/winex11.drv/display.c | 111 +---------------------------------------- dlls/winex11.drv/x11drv.h | 2 - dlls/winex11.drv/x11drv_main.c | 19 +++++++ 5 files changed, 73 insertions(+), 215 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d83fcafcd3023caba84e…

1 0

Rémi Bernon : win32u: Move NtUserChangeDisplaySettings mode validation to a separate helper.
by Alexandre Julliard 07 Jul '22

07 Jul '22

Module: wine Branch: master Commit: a7e135f4b36822a622de732e1af52ef2f18d8ab3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a7e135f4b36822a622de732e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jun 27 23:52:43 2022 +0200 win32u: Move NtUserChangeDisplaySettings mode validation to a separate helper. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/win32u/sysparams.c | 100 ++++++++++++++++++++++-------------------------- 1 file changed, 45 insertions(+), 55 deletions(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 3414eaaea27..b48afce7bba 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -1896,17 +1896,54 @@ static BOOL is_detached_mode( const DEVMODEW *mode ) mode->dmPelsHeight == 0; } +static DEVMODEW *validate_display_settings( DEVMODEW *default_mode, DEVMODEW *current_mode, DEVMODEW *devmode ) +{ + if (devmode) + { + trace_devmode( devmode ); + + if (devmode->dmSize < offsetof(DEVMODEW, dmICMMethod)) return NULL; + if (!is_detached_mode( devmode ) && + (!(devmode->dmFields & DM_BITSPERPEL) || !devmode->dmBitsPerPel) && + (!(devmode->dmFields & DM_PELSWIDTH) || !devmode->dmPelsWidth) && + (!(devmode->dmFields & DM_PELSHEIGHT) || !devmode->dmPelsHeight) && + (!(devmode->dmFields & DM_DISPLAYFREQUENCY) || !devmode->dmDisplayFrequency)) + devmode = NULL; + } + + if (!devmode) + { + if (!default_mode->dmSize) return NULL; + TRACE( "Return to original display mode\n" ); + devmode = default_mode; + } + + if ((devmode->dmFields & (DM_PELSWIDTH | DM_PELSHEIGHT)) != (DM_PELSWIDTH | DM_PELSHEIGHT)) + { + WARN( "devmode doesn't specify the resolution: %#x\n", devmode->dmFields ); + return NULL; + } + + if (!is_detached_mode( devmode ) && (!devmode->dmPelsWidth || !devmode->dmPelsHeight)) + { + if (!current_mode->dmSize) return NULL; + if (!devmode->dmPelsWidth) devmode->dmPelsWidth = current_mode->dmPelsWidth; + if (!devmode->dmPelsHeight) devmode->dmPelsHeight = current_mode->dmPelsHeight; + } + + return devmode; +} + /*********************************************************************** * NtUserChangeDisplaySettings (win32u.@) */ LONG WINAPI NtUserChangeDisplaySettings( UNICODE_STRING *devname, DEVMODEW *devmode, HWND hwnd, DWORD flags, void *lparam ) { + DEVMODEW default_mode = {.dmSize = sizeof(DEVMODEW)}, current_mode = {.dmSize = sizeof(DEVMODEW)}; WCHAR device_name[CCHDEVICENAME], adapter_path[MAX_PATH]; + LONG ret = DISP_CHANGE_SUCCESSFUL; struct adapter *adapter; - BOOL def_mode = TRUE; - DEVMODEW dm; - LONG ret; TRACE( "%s %p %p %#x %p\n", debugstr_us(devname), devmode, hwnd, flags, lparam ); TRACE( "flags=%s\n", _CDS_flags(flags) ); @@ -1932,60 +1969,13 @@ LONG WINAPI NtUserChangeDisplaySettings( UNICODE_STRING *devname, DEVMODEW *devm return DISP_CHANGE_BADPARAM; } - if (devmode) - { - trace_devmode( devmode ); - - if (devmode->dmSize < FIELD_OFFSET(DEVMODEW, dmICMMethod)) - return DISP_CHANGE_BADMODE; - - if (is_detached_mode(devmode) || - ((devmode->dmFields & DM_BITSPERPEL) && devmode->dmBitsPerPel) || - ((devmode->dmFields & DM_PELSWIDTH) && devmode->dmPelsWidth) || - ((devmode->dmFields & DM_PELSHEIGHT) && devmode->dmPelsHeight) || - ((devmode->dmFields & DM_DISPLAYFREQUENCY) && devmode->dmDisplayFrequency)) - def_mode = FALSE; - } - - if (def_mode) - { - memset( &dm, 0, sizeof(dm) ); - dm.dmSize = sizeof(dm); - if (!read_registry_settings( adapter_path, &dm )) - { - ERR( "Default mode not found!\n" ); - return DISP_CHANGE_BADMODE; - } - - TRACE( "Return to original display mode\n" ); - devmode = &dm; - } - - if ((devmode->dmFields & (DM_PELSWIDTH | DM_PELSHEIGHT)) != (DM_PELSWIDTH | DM_PELSHEIGHT)) - { - WARN( "devmode doesn't specify the resolution: %#x\n", devmode->dmFields ); - return DISP_CHANGE_BADMODE; - } + if (!read_registry_settings( adapter_path, &default_mode )) default_mode.dmSize = 0; + if (!NtUserEnumDisplaySettings( devname, ENUM_CURRENT_SETTINGS, &current_mode, 0 )) current_mode.dmSize = 0; - if (!is_detached_mode(devmode) && (!devmode->dmPelsWidth || !devmode->dmPelsHeight)) - { - memset(&dm, 0, sizeof(dm)); - dm.dmSize = sizeof(dm); - if (!NtUserEnumDisplaySettings( devname, ENUM_CURRENT_SETTINGS, &dm, 0 )) - { - ERR( "Current mode not found!\n" ); - return DISP_CHANGE_BADMODE; - } - - if (!devmode->dmPelsWidth) - devmode->dmPelsWidth = dm.dmPelsWidth; - if (!devmode->dmPelsHeight) - devmode->dmPelsHeight = dm.dmPelsHeight; - } + if (!(devmode = validate_display_settings( &default_mode, &current_mode, devmode ))) ret = DISP_CHANGE_BADMODE; + else ret = user_driver->pChangeDisplaySettingsEx( device_name, devmode, hwnd, flags, lparam ); - ret = user_driver->pChangeDisplaySettingsEx( device_name, devmode, hwnd, flags, lparam ); - if (ret != DISP_CHANGE_SUCCESSFUL) - ERR( "Changing %s display settings returned %d.\n", debugstr_us(devname), ret ); + if (ret) ERR( "Changing %s display settings returned %d.\n", debugstr_us(devname), ret ); return ret; }

1 0

Rémi Bernon : win32u: Move reading mode from registry out of graphics drivers.
by Alexandre Julliard 07 Jul '22

07 Jul '22

Module: wine Branch: master Commit: d9a4bdfdc05ba027fb9ed44f01e6805f349ff8a2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d9a4bdfdc05ba027fb9ed44f… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jul 1 06:56:22 2022 +0200 win32u: Move reading mode from registry out of graphics drivers. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/win32u/sysparams.c | 83 +++++++++++++++++++++++++++++++++++++++++---- dlls/wineandroid.drv/init.c | 2 +- dlls/winemac.drv/display.c | 60 -------------------------------- dlls/winex11.drv/display.c | 62 --------------------------------- 4 files changed, 78 insertions(+), 129 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d9a4bdfdc05ba027fb9e…

1 0

Rémi Bernon : win32u: Fix NtUserChangeDisplaySettings comment.
by Alexandre Julliard 07 Jul '22

07 Jul '22

Module: wine Branch: master Commit: 566dd3af36f3c23cf25f91180297e81c3e219b78 URL: https://source.winehq.org/git/wine.git/?a=commit;h=566dd3af36f3c23cf25f9118… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jul 7 09:46:01 2022 +0200 win32u: Fix NtUserChangeDisplaySettings comment. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/win32u/sysparams.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index fa82566e24c..061cfa9f0a9 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -1835,7 +1835,7 @@ static BOOL is_detached_mode( const DEVMODEW *mode ) } /*********************************************************************** - * NtUserChangeDisplaySettingsExW (win32u.@) + * NtUserChangeDisplaySettings (win32u.@) */ LONG WINAPI NtUserChangeDisplaySettings( UNICODE_STRING *devname, DEVMODEW *devmode, HWND hwnd, DWORD flags, void *lparam )

1 0

← Newer
1
...
45
46
47
48
49
50
51
...
64
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2022