wine-commits July 2022

wine-commits@winehq.org

1 participants
639 discussions

Alexandre Julliard : server: Store the key parent in the standard object name structure.
by Alexandre Julliard 06 Jul '22

06 Jul '22

Module: wine Branch: master Commit: 617cc989f0501305e51547157a17a9470d75fce5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=617cc989f0501305e5154715… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 6 15:40:39 2022 +0200 server: Store the key parent in the standard object name structure. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/registry.c | 58 +++++++++++++++++++++++++++---------------------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/server/registry.c b/server/registry.c index 87e2f1c0835..985c124179a 100644 --- a/server/registry.c +++ b/server/registry.c @@ -80,7 +80,6 @@ struct key struct object obj; /* object header */ WCHAR *class; /* key class */ data_size_t classlen; /* length of class name */ - struct key *parent; /* parent key */ int last_subkey; /* last in use subkey */ int nb_subkeys; /* count of allocated subkeys */ struct key **subkeys; /* subkeys array */ @@ -199,6 +198,13 @@ static inline int is_wow6432node( const WCHAR *name, unsigned int len ) return (len == sizeof(wow6432node) && !memicmp_strW( name, wow6432node, sizeof( wow6432node ))); } +static inline struct key *get_parent( const struct key *key ) +{ + struct object *parent = key->obj.name->parent; + + return (struct key *)parent; +} + /* * The registry text file format v2 used by this code is similar to the one * used by REGEDIT import/export functionality, with the following differences: @@ -211,9 +217,9 @@ static inline int is_wow6432node( const WCHAR *name, unsigned int len ) /* dump the full path of a key */ static void dump_path( const struct key *key, const struct key *base, FILE *f ) { - if (key->parent && key->parent != base) + if (get_parent( key ) && get_parent( key ) != base) { - dump_path( key->parent, base, f ); + dump_path( get_parent( key ), base, f ); fprintf( f, "\\\\" ); } dump_strW( key->obj.name->name, key->obj.name->len, f, "[]" ); @@ -411,12 +417,12 @@ static WCHAR *key_get_full_name( struct object *obj, data_size_t *ret_len ) return NULL; } - for (key = (struct key *)obj; key != root_key; key = key->parent) len += key->obj.name->len + sizeof(WCHAR); + for (key = (struct key *)obj; key != root_key; key = get_parent( key )) len += key->obj.name->len + sizeof(WCHAR); if (!(ret = malloc( len ))) return NULL; *ret_len = len; key = (struct key *)obj; - for (key = (struct key *)obj; key != root_key; key = key->parent) + for (key = (struct key *)obj; key != root_key; key = get_parent( key )) { memcpy( ret + len - key->obj.name->len, key->obj.name->name, key->obj.name->len ); len -= key->obj.name->len + sizeof(WCHAR); @@ -455,7 +461,7 @@ static void key_destroy( struct object *obj ) free( key->values ); for (i = 0; i <= key->last_subkey; i++) { - key->subkeys[i]->parent = NULL; + key->subkeys[i]->obj.name->parent = NULL; release_object( key->subkeys[i] ); } free( key->subkeys ); @@ -530,7 +536,6 @@ static struct key *alloc_key( const struct unicode_str *name, timeout_t modif ) key->last_value = -1; key->values = NULL; key->modif = modif; - key->parent = NULL; list_init( &key->notify_list ); name_ptr->obj = &key->obj; @@ -549,7 +554,7 @@ static void make_dirty( struct key *key ) { if (key->flags & (KEY_DIRTY|KEY_VOLATILE)) return; /* nothing to do */ key->flags |= KEY_DIRTY; - key = key->parent; + key = get_parent( key ); } } @@ -580,15 +585,12 @@ static void check_notify( struct key *key, unsigned int change, int not_subtree /* update key modification time */ static void touch_key( struct key *key, unsigned int change ) { - struct key *k; - key->modif = current_time; make_dirty( key ); /* do notifications */ check_notify( key, change, 1 ); - for ( k = key->parent; k; k = k->parent ) - check_notify( k, change, 0 ); + 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 */ @@ -635,7 +637,7 @@ static struct key *alloc_subkey( struct key *parent, const struct unicode_str *n } if ((key = alloc_key( name, modif )) != NULL) { - key->parent = parent; + 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; @@ -659,7 +661,7 @@ static void free_subkey( struct key *parent, int index ) for (i = index; i < parent->last_subkey; i++) parent->subkeys[i] = parent->subkeys[i + 1]; parent->last_subkey--; key->flags |= KEY_DELETED; - key->parent = NULL; + key->obj.name->parent = NULL; if (parent->wow6432node == key) parent->wow6432node = NULL; release_object( key ); @@ -757,7 +759,7 @@ static struct key *open_key_prefix( struct key *key, const struct unicode_str *n if ((key->flags & KEY_WOWSHARE) && !(access & KEY_WOW64_64KEY)) { /* try in the 64-bit parent */ - key = key->parent; + key = get_parent( key ); subkey = find_subkey( key, token, index ); } } @@ -863,7 +865,7 @@ static struct key *create_key( struct key *key, const struct unicode_str *name, free(key->class); if (!(key->class = memdup( class->str, key->classlen ))) key->classlen = 0; } - touch_key( key->parent, REG_NOTIFY_CHANGE_NAME ); + touch_key( get_parent( key ), REG_NOTIFY_CHANGE_NAME ); grab_object( key ); return key; } @@ -1013,7 +1015,7 @@ static int rename_key( struct key *key, const struct unicode_str *new_name ) { struct unicode_str token, name; struct object_name *new_name_ptr; - struct key *subkey; + struct key *subkey, *parent = get_parent( key ); int i, index, cur_index; token.str = NULL; @@ -1026,13 +1028,13 @@ static int rename_key( struct key *key, const struct unicode_str *new_name ) } /* check for existing subkey with the same name */ - if (!key->parent || (subkey = find_subkey( key->parent, new_name, &index ))) + if (!parent || (subkey = find_subkey( parent, new_name, &index ))) { set_error( STATUS_CANNOT_DELETE ); return -1; } - if (key == key->parent->wow6432node || is_wow6432node( new_name->str, new_name->len )) + if (key == parent->wow6432node || is_wow6432node( new_name->str, new_name->len )) { set_error( STATUS_INVALID_PARAMETER ); return -1; @@ -1043,25 +1045,23 @@ static int rename_key( struct key *key, const struct unicode_str *new_name ) new_name_ptr->obj = &key->obj; new_name_ptr->len = new_name->len; - new_name_ptr->parent = NULL; + new_name_ptr->parent = &parent->obj; memcpy( new_name_ptr->name, new_name->str, new_name->len ); name.str = key->obj.name->name; name.len = key->obj.name->len; - find_subkey( key->parent, &name, &cur_index ); + find_subkey( parent, &name, &cur_index ); if (cur_index < index && (index - cur_index) > 1) { --index; - for (i = cur_index; i < index; ++i) - key->parent->subkeys[i] = key->parent->subkeys[i+1]; + for (i = cur_index; i < index; ++i) parent->subkeys[i] = parent->subkeys[i+1]; } else if (cur_index > index) { - for (i = cur_index; i > index; --i) - key->parent->subkeys[i] = key->parent->subkeys[i-1]; + for (i = cur_index; i > index; --i) parent->subkeys[i] = parent->subkeys[i-1]; } - key->parent->subkeys[index] = key; + parent->subkeys[index] = key; free( key->obj.name ); key->obj.name = new_name_ptr; @@ -1076,7 +1076,7 @@ static int rename_key( struct key *key, const struct unicode_str *new_name ) static int delete_key( struct key *key, int recurse ) { int index; - struct key *parent = key->parent; + struct key *parent = get_parent( key ); /* must find parent and index */ if (key == root_key) @@ -1522,7 +1522,7 @@ static void update_key_time( struct key *key, timeout_t modif ) while (key && !key->modif) { key->modif = modif; - key = key->parent; + key = get_parent( key ); } } @@ -1735,7 +1735,7 @@ static int get_prefix_len( struct key *key, const char *name, struct file_load_i for (res = 1; key != root_key; res++) { if (len == key->obj.name->len && !memicmp_strW( info->tmp, key->obj.name->name, len )) break; - key = key->parent; + key = get_parent( key ); } if (key == root_key) res = 0; /* no matching name */ return res;

1 0

Alexandre Julliard : server: Use the standard object name for registry keys.
by Alexandre Julliard 06 Jul '22

06 Jul '22

Module: wine Branch: master Commit: e3c32904b27c14e2a9ecde973458f25441587534 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e3c32904b27c14e2a9ecde97… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 6 15:38:58 2022 +0200 server: Use the standard object name for registry keys. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/registry.c | 76 ++++++++++++++++++++++++++++++++----------------------- 1 file changed, 44 insertions(+), 32 deletions(-) diff --git a/server/registry.c b/server/registry.c index 3c5f72a699c..87e2f1c0835 100644 --- a/server/registry.c +++ b/server/registry.c @@ -78,10 +78,8 @@ struct type_descr key_type = struct key { struct object obj; /* object header */ - WCHAR *name; /* key name */ WCHAR *class; /* key class */ - unsigned short namelen; /* length of key name */ - unsigned short classlen; /* length of class name */ + data_size_t classlen; /* length of class name */ struct key *parent; /* parent key */ int last_subkey; /* last in use subkey */ int nb_subkeys; /* count of allocated subkeys */ @@ -167,6 +165,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 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 ); @@ -187,7 +186,7 @@ static const struct object_ops key_ops = key_get_full_name, /* get_full_name */ no_lookup_name, /* lookup_name */ no_link_name, /* link_name */ - NULL, /* unlink_name */ + key_unlink_name, /* unlink_name */ no_open_file, /* open_file */ no_kernel_obj_list, /* get_kernel_obj_list */ key_close_handle, /* close_handle */ @@ -217,7 +216,7 @@ static void dump_path( const struct key *key, const struct key *base, FILE *f ) dump_path( key->parent, base, f ); fprintf( f, "\\\\" ); } - dump_strW( key->name, key->namelen, f, "[]" ); + dump_strW( key->obj.name->name, key->obj.name->len, f, "[]" ); } /* dump a value to a text file */ @@ -412,21 +411,25 @@ static WCHAR *key_get_full_name( struct object *obj, data_size_t *ret_len ) return NULL; } - for (key = (struct key *)obj; key != root_key; key = key->parent) len += key->namelen + sizeof(WCHAR); + for (key = (struct key *)obj; key != root_key; key = key->parent) len += key->obj.name->len + sizeof(WCHAR); if (!(ret = malloc( len ))) return NULL; *ret_len = len; key = (struct key *)obj; for (key = (struct key *)obj; key != root_key; key = key->parent) { - memcpy( ret + len - key->namelen, key->name, key->namelen ); - len -= key->namelen + sizeof(WCHAR); + memcpy( ret + len - key->obj.name->len, key->obj.name->name, key->obj.name->len ); + len -= key->obj.name->len + sizeof(WCHAR); memcpy( ret + len, &backslash, sizeof(WCHAR) ); } memcpy( ret, root_name, sizeof(root_name) - sizeof(WCHAR) ); return (WCHAR *)ret; } +static void key_unlink_name( struct object *obj, struct object_name *name ) +{ +} + /* close the notification associated with a handle */ static int key_close_handle( struct object *obj, struct process *process, obj_handle_t handle ) { @@ -443,7 +446,6 @@ static void key_destroy( struct object *obj ) struct key *key = (struct key *)obj; assert( obj->ops == &key_ops ); - free( key->name ); free( key->class ); for (i = 0; i <= key->last_value; i++) { @@ -508,12 +510,16 @@ static struct unicode_str *get_path_token( const struct unicode_str *path, struc /* allocate a key object */ static struct key *alloc_key( const struct unicode_str *name, timeout_t modif ) { + struct object_name *name_ptr; struct key *key; + + if (!(name_ptr = mem_alloc( offsetof( struct object_name, name[name->len / sizeof(WCHAR)] )))) + return NULL; + if ((key = alloc_object( &key_ops ))) { - key->name = NULL; + key->obj.name = name_ptr; key->class = NULL; - key->namelen = name->len; key->classlen = 0; key->flags = 0; key->last_subkey = -1; @@ -526,12 +532,13 @@ static struct key *alloc_key( const struct unicode_str *name, timeout_t modif ) key->modif = modif; key->parent = NULL; list_init( &key->notify_list ); - if (name->len && !(key->name = memdup( name->str, name->len ))) - { - release_object( key ); - key = NULL; - } + + name_ptr->obj = &key->obj; + name_ptr->len = name->len; + name_ptr->parent = NULL; + memcpy( name_ptr->name, name->str, name->len ); } + else free( name_ptr ); return key; } @@ -632,7 +639,8 @@ static struct key *alloc_subkey( struct key *parent, const struct unicode_str *n for (i = ++parent->last_subkey; i > index; i--) parent->subkeys[i] = parent->subkeys[i-1]; parent->subkeys[index] = key; - if (is_wow6432node( key->name, key->namelen ) && !is_wow6432node( parent->name, parent->namelen )) + 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; @@ -679,9 +687,9 @@ static struct key *find_subkey( const struct key *key, const struct unicode_str while (min <= max) { i = (min + max) / 2; - len = min( key->subkeys[i]->namelen, name->len ); - res = memicmp_strW( key->subkeys[i]->name, name->str, len ); - if (!res) res = key->subkeys[i]->namelen - name->len; + 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; @@ -929,7 +937,7 @@ static void enum_key( struct key *key, int index, int info_class, struct enum_ke key = key->subkeys[index]; } - namelen = key->namelen; + namelen = key->obj.name->len; classlen = key->classlen; switch(info_class) @@ -950,7 +958,7 @@ static void enum_key( struct key *key, int index, int info_class, struct enum_ke case KeyCachedInformation: for (i = 0; i <= key->last_subkey; i++) { - if (key->subkeys[i]->namelen > max_subkey) max_subkey = key->subkeys[i]->namelen; + if (key->subkeys[i]->obj.name->len > max_subkey) max_subkey = key->subkeys[i]->obj.name->len; if (key->subkeys[i]->classlen > max_class) max_class = key->subkeys[i]->classlen; } for (i = 0; i <= key->last_value; i++) @@ -982,7 +990,7 @@ static void enum_key( struct key *key, int index, int info_class, struct enum_ke if (len > namelen) { reply->namelen = namelen; - memcpy( data, key->name, namelen ); + memcpy( data, key->obj.name->name, namelen ); memcpy( data + namelen, key->class, len - namelen ); } else if (info_class == KeyNameInformation) @@ -993,7 +1001,7 @@ static void enum_key( struct key *key, int index, int info_class, struct enum_ke else { reply->namelen = len; - memcpy( data, key->name, len ); + memcpy( data, key->obj.name->name, len ); } } free( fullname ); @@ -1004,9 +1012,9 @@ static void enum_key( struct key *key, int index, int info_class, struct enum_ke static int rename_key( struct key *key, const struct unicode_str *new_name ) { struct unicode_str token, name; + struct object_name *new_name_ptr; struct key *subkey; int i, index, cur_index; - WCHAR *ptr; token.str = NULL; @@ -1030,11 +1038,16 @@ static int rename_key( struct key *key, const struct unicode_str *new_name ) return -1; } + if (!(new_name_ptr = mem_alloc( offsetof( struct object_name, name[new_name->len / sizeof(WCHAR)] )))) + return -1; - if (!(ptr = memdup( new_name->str, new_name->len ))) return -1; + new_name_ptr->obj = &key->obj; + new_name_ptr->len = new_name->len; + new_name_ptr->parent = NULL; + memcpy( new_name_ptr->name, new_name->str, new_name->len ); - name.str = key->name; - name.len = key->namelen; + name.str = key->obj.name->name; + name.len = key->obj.name->len; find_subkey( key->parent, &name, &cur_index ); if (cur_index < index && (index - cur_index) > 1) @@ -1050,9 +1063,8 @@ static int rename_key( struct key *key, const struct unicode_str *new_name ) } key->parent->subkeys[index] = key; - free( key->name ); - key->name = ptr; - key->namelen = new_name->len; + free( key->obj.name ); + key->obj.name = new_name_ptr; if (debug_level > 1) dump_operation( key, NULL, "Rename" ); make_dirty( key ); @@ -1722,7 +1734,7 @@ static int get_prefix_len( struct key *key, const char *name, struct file_load_i len = (p - info->tmp) * sizeof(WCHAR); for (res = 1; key != root_key; res++) { - if (len == key->namelen && !memicmp_strW( info->tmp, key->name, len )) break; + if (len == key->obj.name->len && !memicmp_strW( info->tmp, key->obj.name->name, len )) break; key = key->parent; } if (key == root_key) res = 0; /* no matching name */

1 0

Alexandre Julliard : server: Store a pointer to the Wow6432Node subkey.
by Alexandre Julliard 06 Jul '22

06 Jul '22

Module: wine Branch: master Commit: 6bed417bb75668cf923bea84a87e9600d8beef74 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6bed417bb75668cf923bea84… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 6 15:38:14 2022 +0200 server: Store a pointer to the Wow6432Node subkey. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/registry.c | 34 +++++++++++++++------------------- 1 file changed, 15 insertions(+), 19 deletions(-) diff --git a/server/registry.c b/server/registry.c index d3c1e5e7ad1..3c5f72a699c 100644 --- a/server/registry.c +++ b/server/registry.c @@ -86,6 +86,7 @@ struct key int last_subkey; /* last in use subkey */ int nb_subkeys; /* count of allocated subkeys */ struct key **subkeys; /* subkeys array */ + struct key *wow6432node; /* Wow6432Node subkey */ int last_value; /* last in use value */ int nb_values; /* count of allocated values in array */ struct key_value *values; /* values array */ @@ -99,9 +100,8 @@ struct key #define KEY_DELETED 0x0002 /* key has been deleted */ #define KEY_DIRTY 0x0004 /* key has been modified */ #define KEY_SYMLINK 0x0008 /* key is a symbolic link */ -#define KEY_WOW64 0x0010 /* key contains a Wow6432Node subkey */ -#define KEY_WOWSHARE 0x0020 /* key is a Wow64 shared key (used for Software\Classes) */ -#define KEY_PREDEF 0x0040 /* key is marked as predefined */ +#define KEY_WOWSHARE 0x0010 /* key is a Wow64 shared key (used for Software\Classes) */ +#define KEY_PREDEF 0x0020 /* key is marked as predefined */ /* a key value */ struct key_value @@ -519,6 +519,7 @@ static struct key *alloc_key( const struct unicode_str *name, timeout_t modif ) key->last_subkey = -1; key->nb_subkeys = 0; key->subkeys = NULL; + key->wow6432node = NULL; key->nb_values = 0; key->last_value = -1; key->values = NULL; @@ -632,7 +633,7 @@ static struct key *alloc_subkey( struct key *parent, const struct unicode_str *n parent->subkeys[i] = parent->subkeys[i-1]; parent->subkeys[index] = key; if (is_wow6432node( key->name, key->namelen ) && !is_wow6432node( parent->name, parent->namelen )) - parent->flags |= KEY_WOW64; + parent->wow6432node = key; } return key; } @@ -651,7 +652,7 @@ static void free_subkey( struct key *parent, int index ) parent->last_subkey--; key->flags |= KEY_DELETED; key->parent = NULL; - if (is_wow6432node( key->name, key->namelen )) parent->flags &= ~KEY_WOW64; + if (parent->wow6432node == key) parent->wow6432node = NULL; release_object( key ); /* try to shrink the array */ @@ -696,15 +697,8 @@ static struct key *find_subkey( const struct key *key, const struct unicode_str /* 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 ) { - static const struct unicode_str wow6432node_str = { wow6432node, sizeof(wow6432node) }; - int index; - - if (!(key->flags & KEY_WOW64)) return key; - if (!is_wow6432node( name->str, name->len )) - { - key = find_subkey( key, &wow6432node_str, &index ); - assert( key ); /* if KEY_WOW64 is set we must find it */ - } + if (!key->wow6432node) return key; + if (!is_wow6432node( name->str, name->len )) return key->wow6432node; return key; } @@ -1015,11 +1009,6 @@ static int rename_key( struct key *key, const struct unicode_str *new_name ) WCHAR *ptr; token.str = NULL; - if (is_wow6432node( key->name, key->namelen )) - { - set_error( STATUS_INVALID_PARAMETER ); - return -1; - } /* changing to a path is not allowed */ if (!new_name->len || !get_path_token( new_name, &token ) || token.len != new_name->len) @@ -1035,6 +1024,13 @@ static int rename_key( struct key *key, const struct unicode_str *new_name ) return -1; } + if (key == key->parent->wow6432node || is_wow6432node( new_name->str, new_name->len )) + { + set_error( STATUS_INVALID_PARAMETER ); + return -1; + } + + if (!(ptr = memdup( new_name->str, new_name->len ))) return -1; name.str = key->name;

1 0

Alexandre Julliard : win32u: Add missing terminating null on a GUID string.
by Alexandre Julliard 06 Jul '22

06 Jul '22

Module: wine Branch: master Commit: 42fe58a45289b897ae5c0dc89e64360cfe0085d2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=42fe58a45289b897ae5c0dc8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 6 09:45:33 2022 +0200 win32u: Add missing terminating null on a GUID string. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/win32u/sysparams.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index a5a69a84bd9..3fa361c61a5 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -177,8 +177,8 @@ static const WCHAR guid_devclass_displayW[] = static const char guid_devclass_monitorA[] = "{4D36E96E-E325-11CE-BFC1-08002BE10318}"; static const WCHAR guid_devclass_monitorW[] = - {'{','4','D','3','6','E','9','6','E','-','E','3','2','5','-','1','1','C','E','-' - ,'B','F','C','1','-','0','8','0','0','2','B','E','1','0','3','1','8','}'}; + {'{','4','D','3','6','E','9','6','E','-','E','3','2','5','-','1','1','C','E','-', + 'B','F','C','1','-','0','8','0','0','2','B','E','1','0','3','1','8','}',0}; static const WCHAR guid_devinterface_display_adapterW[] = {'{','5','B','4','5','2','0','1','D','-','F','2','F','2','-','4','F','3','B','-',

1 0

Alexandre Julliard : ntdll: Fix the return value of NtQueryKey for a short buffer.
by Alexandre Julliard 06 Jul '22

06 Jul '22

Module: wine Branch: master Commit: 4bf9d2403f269e7f3595ad075a4afee9adbda51f URL: https://source.winehq.org/git/wine.git/?a=commit;h=4bf9d2403f269e7f3595ad07… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 6 12:46:50 2022 +0200 ntdll: Fix the return value of NtQueryKey for a short buffer. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/reg.c | 16 +++++++++++++++- dlls/ntdll/unix/registry.c | 8 ++------ 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index 242a5b5e898..54e9b10e530 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -1817,10 +1817,23 @@ static void test_NtQueryKey(void) pNtClose(key); return; } - todo_wine ok(status == STATUS_BUFFER_TOO_SMALL, "NtQueryKey Failed: 0x%08lx\n", status); + ok(status == STATUS_BUFFER_TOO_SMALL, "NtQueryKey Failed: 0x%08lx\n", status); info = HeapAlloc(GetProcessHeap(), 0, length); /* non-zero buffer size, but insufficient */ + len = 0; + status = pNtQueryKey(key, KeyNameInformation, info, 1, &len); + ok(status == STATUS_BUFFER_TOO_SMALL, "NtQueryKey Failed: 0x%08lx\n", status); + ok(length == len, "got %ld, expected %ld\n", len, length); + len = 0; + status = pNtQueryKey(key, KeyNameInformation, info, offsetof( KEY_NAME_INFORMATION, Name ) - 1, &len); + ok(status == STATUS_BUFFER_TOO_SMALL, "NtQueryKey Failed: 0x%08lx\n", status); + ok(length == len, "got %ld, expected %ld\n", len, length); + len = 0; + status = pNtQueryKey(key, KeyNameInformation, info, offsetof( KEY_NAME_INFORMATION, Name ), &len); + ok(status == STATUS_BUFFER_OVERFLOW, "NtQueryKey Failed: 0x%08lx\n", status); + ok(length == len, "got %ld, expected %ld\n", len, length); + len = 0; status = pNtQueryKey(key, KeyNameInformation, info, sizeof(*info), &len); ok(status == STATUS_BUFFER_OVERFLOW, "NtQueryKey Failed: 0x%08lx\n", status); ok(length == len, "got %ld, expected %ld\n", len, length); @@ -1828,6 +1841,7 @@ static void test_NtQueryKey(void) info->NameLength, winetestpath.Length); /* correct buffer size */ + len = 0; status = pNtQueryKey(key, KeyNameInformation, info, length, &len); ok(status == STATUS_SUCCESS, "NtQueryKey Failed: 0x%08lx\n", status); ok(length == len, "got %ld, expected %ld\n", len, length); diff --git a/dlls/ntdll/unix/registry.c b/dlls/ntdll/unix/registry.c index 9c98bf48399..428f8c9eb3c 100644 --- a/dlls/ntdll/unix/registry.c +++ b/dlls/ntdll/unix/registry.c @@ -268,7 +268,6 @@ static NTSTATUS enumerate_key( HANDLE handle, int index, KEY_INFORMATION_CLASS i case KeyBasicInformation: { KEY_BASIC_INFORMATION keyinfo; - fixed_size = (char *)keyinfo.Name - (char *)&keyinfo; keyinfo.LastWriteTime.QuadPart = reply->modif; keyinfo.TitleIndex = 0; keyinfo.NameLength = reply->namelen; @@ -279,7 +278,6 @@ static NTSTATUS enumerate_key( HANDLE handle, int index, KEY_INFORMATION_CLASS i case KeyFullInformation: { KEY_FULL_INFORMATION keyinfo; - fixed_size = (char *)keyinfo.Class - (char *)&keyinfo; keyinfo.LastWriteTime.QuadPart = reply->modif; keyinfo.TitleIndex = 0; keyinfo.ClassLength = wine_server_reply_size(reply); @@ -297,7 +295,6 @@ static NTSTATUS enumerate_key( HANDLE handle, int index, KEY_INFORMATION_CLASS i case KeyNodeInformation: { KEY_NODE_INFORMATION keyinfo; - fixed_size = (char *)keyinfo.Name - (char *)&keyinfo; keyinfo.LastWriteTime.QuadPart = reply->modif; keyinfo.TitleIndex = 0; if (reply->namelen < wine_server_reply_size(reply)) @@ -318,7 +315,6 @@ static NTSTATUS enumerate_key( HANDLE handle, int index, KEY_INFORMATION_CLASS i case KeyNameInformation: { KEY_NAME_INFORMATION keyinfo; - fixed_size = (char *)keyinfo.Name - (char *)&keyinfo; keyinfo.NameLength = reply->namelen; memcpy( info, &keyinfo, min( length, fixed_size ) ); break; @@ -327,7 +323,6 @@ static NTSTATUS enumerate_key( HANDLE handle, int index, KEY_INFORMATION_CLASS i case KeyCachedInformation: { KEY_CACHED_INFORMATION keyinfo; - fixed_size = sizeof(keyinfo); keyinfo.LastWriteTime.QuadPart = reply->modif; keyinfo.TitleIndex = 0; keyinfo.SubKeys = reply->subkeys; @@ -344,7 +339,8 @@ static NTSTATUS enumerate_key( HANDLE handle, int index, KEY_INFORMATION_CLASS i break; } *result_len = fixed_size + reply->total; - if (length < *result_len) ret = STATUS_BUFFER_OVERFLOW; + if (length < fixed_size) ret = STATUS_BUFFER_TOO_SMALL; + else if (length < *result_len) ret = STATUS_BUFFER_OVERFLOW; } } SERVER_END_REQ;

1 0

Alexandre Julliard : ntdll/tests: Remove todo from tests that succeed now.
by Alexandre Julliard 06 Jul '22

06 Jul '22

Module: wine Branch: master Commit: 41751e61707f893df3e5dfc66fb399413e830471 URL: https://source.winehq.org/git/wine.git/?a=commit;h=41751e61707f893df3e5dfc6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 6 08:20:24 2022 +0200 ntdll/tests: Remove todo from tests that succeed now. Tests fixed by 95ddb7576d13d3b4bb1aa213a045771cb70a3d17. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/om.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index f151d55d800..ebe39931048 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -929,7 +929,6 @@ static void test_name_limits(void) for (i = 0; i < 65536 / sizeof(WCHAR); i++) str.Buffer[i + wcslen(registryW)] = 'a'; str.Length = 0; status = pNtCreateKey( &ret, GENERIC_ALL, &attr, 0, NULL, 0, NULL ); - todo_wine ok( status == STATUS_OBJECT_PATH_SYNTAX_BAD, "%u: NtCreateKey failed %lx\n", str.Length, status ); status = pNtCreateKey( &ret, GENERIC_ALL, &attr2, 0, NULL, 0, NULL ); ok( status == STATUS_INVALID_HANDLE, "%u: NtCreateKey failed %lx\n", str.Length, status ); @@ -1052,11 +1051,9 @@ static void test_name_limits(void) attr3.RootDirectory = 0; attr2.ObjectName = attr3.ObjectName = NULL; status = pNtCreateKey( &ret, GENERIC_ALL, &attr2, 0, NULL, 0, NULL ); - todo_wine ok( status == STATUS_ACCESS_VIOLATION || status == STATUS_INVALID_HANDLE /* vista wow64 */, "NULL: NtCreateKey failed %lx\n", status ); status = pNtCreateKey( &ret, GENERIC_ALL, &attr3, 0, NULL, 0, NULL ); - todo_wine ok( status == STATUS_ACCESS_VIOLATION, "NULL: NtCreateKey failed %lx\n", status ); status = pNtCreateKey( &ret, GENERIC_ALL, NULL, 0, NULL, 0, NULL ); ok( status == STATUS_ACCESS_VIOLATION, "NULL: NtCreateKey failed %lx\n", status );

1 0

Claire Girka : winepulse: Don't probe default devices twice.
by Alexandre Julliard 06 Jul '22

06 Jul '22

Module: wine Branch: master Commit: 7dff198c7c558840522d28fcfeb25fe536b0a437 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7dff198c7c558840522d28fc… Author: Claire Girka <claire(a)sitedethib.com> Date: Mon Jul 4 21:40:59 2022 +0200 winepulse: Don't probe default devices twice. Also drop global format and period variables --- dlls/winepulse.drv/pulse.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/dlls/winepulse.drv/pulse.c b/dlls/winepulse.drv/pulse.c index 097c65a282d..bd918b6f260 100644 --- a/dlls/winepulse.drv/pulse.c +++ b/dlls/winepulse.drv/pulse.c @@ -99,10 +99,6 @@ typedef struct _PhysDevice { static pa_context *pulse_ctx; static pa_mainloop *pulse_ml; -/* Mixer format + period times */ -static WAVEFORMATEXTENSIBLE pulse_fmt[2]; -static REFERENCE_TIME pulse_min_period[2], pulse_def_period[2]; - static struct list g_phys_speakers = LIST_INIT(g_phys_speakers); static struct list g_phys_sources = LIST_INIT(g_phys_sources); @@ -797,9 +793,6 @@ static NTSTATUS pulse_test_connect(void *args) pa_context_get_server(pulse_ctx), pa_context_get_server_protocol_version(pulse_ctx)); - pulse_probe_settings(1, NULL, &pulse_fmt[0], &pulse_def_period[0], &pulse_min_period[0]); - pulse_probe_settings(0, NULL, &pulse_fmt[1], &pulse_def_period[1], &pulse_min_period[1]); - free_phys_device_lists(); list_init(&g_phys_speakers); list_init(&g_phys_sources);

1 0

Claire Girka : winepulse: Use stream-specific period in pulse_get_latency.
by Alexandre Julliard 06 Jul '22

06 Jul '22

Module: wine Branch: master Commit: 45a3bfa2236265a0f4dffd6ebad6428ded4c36de URL: https://source.winehq.org/git/wine.git/?a=commit;h=45a3bfa2236265a0f4dffd6e… Author: Claire Girka <claire(a)sitedethib.com> Date: Mon Jul 4 21:37:47 2022 +0200 winepulse: Use stream-specific period in pulse_get_latency. --- dlls/winepulse.drv/pulse.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winepulse.drv/pulse.c b/dlls/winepulse.drv/pulse.c index caf9a1c9c51..097c65a282d 100644 --- a/dlls/winepulse.drv/pulse.c +++ b/dlls/winepulse.drv/pulse.c @@ -2118,7 +2118,7 @@ static NTSTATUS pulse_get_latency(void *args) lat = attr->minreq / pa_frame_size(&stream->ss); else lat = attr->fragsize / pa_frame_size(&stream->ss); - *params->latency = (lat * 10000000) / stream->ss.rate + pulse_def_period[0]; + *params->latency = (lat * 10000000) / stream->ss.rate + stream->def_period; pulse_unlock(); TRACE("Latency: %u ms\n", (unsigned)(*params->latency / 10000)); params->result = S_OK;

1 0

Claire Girka : winepulse: Store and use device period on stream creation.
by Alexandre Julliard 06 Jul '22

06 Jul '22

Module: wine Branch: master Commit: b4aa68c9c711a7b6572fbe7cdf6d7cd7fb9303b9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b4aa68c9c711a7b6572fbe7c… Author: Claire Girka <claire(a)sitedethib.com> Date: Mon Jul 4 21:37:00 2022 +0200 winepulse: Store and use device period on stream creation. --- dlls/winepulse.drv/pulse.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/winepulse.drv/pulse.c b/dlls/winepulse.drv/pulse.c index 40f5f66c129..caf9a1c9c51 100644 --- a/dlls/winepulse.drv/pulse.c +++ b/dlls/winepulse.drv/pulse.c @@ -57,6 +57,8 @@ struct pulse_stream HANDLE event; float vol[PA_CHANNELS_MAX]; + REFERENCE_TIME def_period; + INT32 locked; BOOL started; SIZE_T bufsize_frames, real_bufsize_bytes, period_bytes; @@ -1123,10 +1125,16 @@ static NTSTATUS pulse_create_stream(void *args) if (FAILED(hr)) goto exit; - period = pulse_def_period[stream->dataflow == eCapture]; + period = 0; + hr = get_device_period_helper(params->dataflow, params->pulse_name, &period, NULL); + if (FAILED(hr)) + goto exit; + if (duration < 3 * period) duration = 3 * period; + stream->def_period = period; + stream->period_bytes = pa_frame_size(&stream->ss) * muldiv(period, stream->ss.rate, 10000000); stream->bufsize_frames = ceil((duration / 10000000.) * params->fmt->nSamplesPerSec);

1 0

Claire Girka : winepulse: Fix memory leak in pulse_create_stream in some error cases.
by Alexandre Julliard 06 Jul '22

06 Jul '22

Module: wine Branch: master Commit: 32a6380825cc05972a95a8f3138088da3a846203 URL: https://source.winehq.org/git/wine.git/?a=commit;h=32a6380825cc05972a95a8f3… Author: Claire Girka <claire(a)sitedethib.com> Date: Tue Jul 5 17:13:08 2022 +0200 winepulse: Fix memory leak in pulse_create_stream in some error cases. --- dlls/winepulse.drv/pulse.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winepulse.drv/pulse.c b/dlls/winepulse.drv/pulse.c index a7f7cceb873..40f5f66c129 100644 --- a/dlls/winepulse.drv/pulse.c +++ b/dlls/winepulse.drv/pulse.c @@ -1188,8 +1188,8 @@ exit: if (stream->stream) { pa_stream_disconnect(stream->stream); pa_stream_unref(stream->stream); - free(stream); } + free(stream); } pulse_unlock();

1 0

← Newer
1
...
48
49
50
51
52
53
54
...
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