July 2022 - Wine-commits - list.winehq.org

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 : 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 : 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 : 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 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: Implement unlink_name() for registry keys.
by Alexandre Julliard 06 Jul '22

06 Jul '22

Module: wine Branch: master Commit: 5414f648eeb00fcc29a37c90d76db211455b10b3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5414f648eeb00fcc29a37c90… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 6 15:53:05 2022 +0200 server: Implement unlink_name() for registry keys. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/reg.c | 2 +- server/registry.c | 104 ++++++++++++++++++++++++------------------------- 2 files changed, 51 insertions(+), 55 deletions(-) diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index 54e9b10e530..5e141b1370d 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -940,7 +940,7 @@ static void test_NtDeleteKey(void) ok(status == STATUS_KEY_DELETED, "got %#lx\n", status); status = pNtDeleteKey(hkey); - todo_wine ok(!status, "got %#lx\n", status); + ok(!status, "got %#lx\n", status); RtlInitUnicodeString(&string, L"subkey"); InitializeObjectAttributes(&attr, &string, OBJ_CASE_INSENSITIVE, hkey, NULL); diff --git a/server/registry.c b/server/registry.c index 985c124179a..b32b4eb08a0 100644 --- a/server/registry.c +++ b/server/registry.c @@ -434,6 +434,37 @@ static WCHAR *key_get_full_name( struct object *obj, data_size_t *ret_len ) static void key_unlink_name( struct object *obj, struct object_name *name ) { + struct key *key = (struct key *)obj; + struct key *parent = (struct key *)name->parent; + int i, nb_subkeys; + + if (!parent) return; + + if (parent->obj.ops != &key_ops) + { + default_unlink_name( obj, name ); + return; + } + + for (i = 0; i <= parent->last_subkey; i++) if (parent->subkeys[i] == key) break; + assert( i <= parent->last_subkey ); + for ( ; i < parent->last_subkey; i++) parent->subkeys[i] = parent->subkeys[i + 1]; + parent->last_subkey--; + name->parent = NULL; + if (parent->wow6432node == key) parent->wow6432node = NULL; + release_object( key ); + + /* try to shrink the array */ + nb_subkeys = parent->nb_subkeys; + if (nb_subkeys > MIN_SUBKEYS && parent->last_subkey < nb_subkeys / 2) + { + struct key **new_subkeys; + nb_subkeys -= nb_subkeys / 3; /* shrink by 33% */ + if (nb_subkeys < MIN_SUBKEYS) nb_subkeys = MIN_SUBKEYS; + if (!(new_subkeys = realloc( parent->subkeys, nb_subkeys * sizeof(*new_subkeys) ))) return; + parent->subkeys = new_subkeys; + parent->nb_subkeys = nb_subkeys; + } } /* close the notification associated with a handle */ @@ -648,36 +679,6 @@ static struct key *alloc_subkey( struct key *parent, const struct unicode_str *n return key; } -/* free a subkey of a given key */ -static void free_subkey( struct key *parent, int index ) -{ - struct key *key; - int i, nb_subkeys; - - assert( index >= 0 ); - assert( index <= parent->last_subkey ); - - key = parent->subkeys[index]; - for (i = index; i < parent->last_subkey; i++) parent->subkeys[i] = parent->subkeys[i + 1]; - parent->last_subkey--; - key->flags |= KEY_DELETED; - key->obj.name->parent = NULL; - if (parent->wow6432node == key) parent->wow6432node = NULL; - release_object( key ); - - /* try to shrink the array */ - nb_subkeys = parent->nb_subkeys; - if (nb_subkeys > MIN_SUBKEYS && parent->last_subkey < nb_subkeys / 2) - { - struct key **new_subkeys; - nb_subkeys -= nb_subkeys / 3; /* shrink by 33% */ - if (nb_subkeys < MIN_SUBKEYS) nb_subkeys = MIN_SUBKEYS; - if (!(new_subkeys = realloc( parent->subkeys, nb_subkeys * sizeof(*new_subkeys) ))) return; - parent->subkeys = new_subkeys; - parent->nb_subkeys = nb_subkeys; - } -} - /* 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 ) { @@ -903,7 +904,7 @@ static struct key *create_key_recursive( struct key *key, const struct unicode_s /* we know the index is always 0 in a new key */ if (!(key = alloc_subkey( key, &token, 0, modif ))) { - free_subkey( base, index ); + unlink_named_object( &base->obj ); return NULL; } } @@ -1075,42 +1076,37 @@ 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 ) { - int index; struct key *parent = get_parent( key ); - /* must find parent and index */ - if (key == root_key) + if (key->flags & KEY_DELETED) return 1; + + if (!parent) { set_error( STATUS_ACCESS_DENIED ); - return -1; + return 0; } - assert( parent ); - if (key->flags & KEY_PREDEF) { set_error( STATUS_INVALID_HANDLE ); - return -1; + return 0; } - while (recurse && (key->last_subkey>=0)) - if (0 > delete_key(key->subkeys[key->last_subkey], 1)) - return -1; - - for (index = 0; index <= parent->last_subkey; index++) - if (parent->subkeys[index] == key) break; - assert( index <= parent->last_subkey ); - - /* we can only delete a key that has no subkeys */ - if (key->last_subkey >= 0) + if (recurse) + { + while (key->last_subkey >= 0) + if (!delete_key( key->subkeys[key->last_subkey], 1 )) return 0; + } + else if (key->last_subkey >= 0) /* we can only delete a key that has no subkeys */ { set_error( STATUS_ACCESS_DENIED ); - return -1; + return 0; } if (debug_level > 1) dump_operation( key, NULL, "Delete" ); - free_subkey( parent, index ); + key->flags |= KEY_DELETED; + unlink_named_object( &key->obj ); touch_key( parent, REG_NOTIFY_CHANGE_NAME ); - return 0; + return 1; } /* try to grow the array of values; return 1 if OK, 0 on error */ @@ -2254,11 +2250,11 @@ DECL_HANDLER(open_key) /* delete a registry key */ DECL_HANDLER(delete_key) { - struct key *key; + struct key *key = (struct key *)get_handle_obj( current->process, req->hkey, DELETE, &key_ops ); - if ((key = get_hkey_obj( req->hkey, DELETE ))) + if (key) { - delete_key( key, 0); + delete_key( key, 0 ); release_object( key ); } }

1 0

Rémi Bernon : win32u: Add invisible winstation virtual monitor outside of nulldrv.
by Alexandre Julliard 06 Jul '22

06 Jul '22

Module: wine Branch: master Commit: 0f96698b6c2d4d13db4794917ce3871461545321 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0f96698b6c2d4d13db479491… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jul 5 08:17:19 2022 +0200 win32u: Add invisible winstation virtual monitor outside of nulldrv. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/win32u/driver.c | 1 - dlls/win32u/sysparams.c | 27 +++++++++++++-------------- 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/dlls/win32u/driver.c b/dlls/win32u/driver.c index 4a853b516f4..af6d0d610fe 100644 --- a/dlls/win32u/driver.c +++ b/dlls/win32u/driver.c @@ -767,7 +767,6 @@ static BOOL nulldrv_EnumDisplaySettingsEx( LPCWSTR name, DWORD num, LPDEVMODEW m static void nulldrv_UpdateDisplayDevices( const struct gdi_device_manager *manager, BOOL force, void *param ) { - manager->add_monitor( NULL, param ); /* use virtual monitor */ } static BOOL nulldrv_CreateDesktopWindow( HWND hwnd ) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 3fa361c61a5..ca5c1377ccf 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -192,8 +192,6 @@ static const WCHAR guid_devinterface_monitorW[] = {'{','E','6','F','0','7','B','5','F','-','E','E','9','7','-','4','A','9','0','-', 'B','0','7','6','-','3','3','F','5','7','B','F','4','E','A','A','7','}',0}; -#define NULLDRV_DEFAULT_HMONITOR ((HMONITOR)(UINT_PTR)(0x10000 + 1)) - /* Cached display device information */ struct display_device { @@ -233,9 +231,10 @@ static pthread_mutex_t display_lock = PTHREAD_MUTEX_INITIALIZER; BOOL enable_thunk_lock = FALSE; +#define VIRTUAL_HMONITOR ((HMONITOR)(UINT_PTR)(0x10000 + 1)) static struct monitor virtual_monitor = { - .handle = NULLDRV_DEFAULT_HMONITOR, + .handle = VIRTUAL_HMONITOR, .flags = MONITORINFOF_PRIMARY, .rc_monitor.right = 1024, .rc_monitor.bottom = 768, @@ -804,7 +803,6 @@ struct device_manager_ctx WCHAR gpu_guid[64]; LUID gpu_luid; HKEY adapter_key; - BOOL virtual_monitor; }; static void link_device( const WCHAR *instance, const WCHAR *class ) @@ -1078,12 +1076,6 @@ static void add_monitor( const struct gdi_monitor *monitor, void *param ) static const WCHAR default_monitorW[] = {'M','O','N','I','T','O','R','\\','D','e','f','a','u','l','t','_','M','o','n','i','t','o','r',0,0}; - if (!monitor) - { - ctx->virtual_monitor = TRUE; - return; - } - TRACE( "%s %s %s\n", debugstr_w(monitor->name), wine_dbgstr_rect(&monitor->rc_monitor), wine_dbgstr_rect(&monitor->rc_work) ); @@ -1319,17 +1311,24 @@ static BOOL update_display_cache_from_registry(void) static BOOL update_display_cache(void) { - struct device_manager_ctx ctx = { 0 }; + HWINSTA winstation = NtUserGetProcessWindowStation(); + struct device_manager_ctx ctx = {0}; + USEROBJECTFLAGS flags; - user_driver->pUpdateDisplayDevices( &device_manager, FALSE, &ctx ); - release_display_manager_ctx( &ctx ); - if (ctx.virtual_monitor) + /* services do not have any adapters, only a virtual monitor */ + if (NtUserGetObjectInformation( winstation, UOI_FLAGS, &flags, sizeof(flags), NULL ) + && !(flags.dwFlags & WSF_VISIBLE)) { + pthread_mutex_lock( &display_lock ); clear_display_devices(); list_add_tail( &monitors, &virtual_monitor.entry ); + pthread_mutex_unlock( &display_lock ); return TRUE; } + user_driver->pUpdateDisplayDevices( &device_manager, FALSE, &ctx ); + release_display_manager_ctx( &ctx ); + if (update_display_cache_from_registry()) return TRUE; if (ctx.gpu_count) {

1 0

Rémi Bernon : win32u: Move default UpdateDisplayDevices implementation out of nulldrv.
by Alexandre Julliard 06 Jul '22

06 Jul '22

Module: wine Branch: master Commit: 360f12d307296dfa268bac963e1f8c8028c3f238 URL: https://source.winehq.org/git/wine.git/?a=commit;h=360f12d307296dfa268bac96… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jul 5 08:57:18 2022 +0200 win32u: Move default UpdateDisplayDevices implementation out of nulldrv. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/win32u/driver.c | 9 ++++----- dlls/win32u/sysparams.c | 38 +++++++++++++++++++------------------- dlls/wineandroid.drv/init.c | 12 ++++++++++-- dlls/winemac.drv/display.c | 8 ++++---- dlls/winemac.drv/macdrv.h | 2 +- dlls/winex11.drv/display.c | 9 ++++----- dlls/winex11.drv/x11drv.h | 2 +- include/wine/gdi_driver.h | 4 ++-- 8 files changed, 45 insertions(+), 39 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=360f12d307296dfa268b…

1 0

Rémi Bernon : win32u: Set generic DEVMODEW fields in NtUserEnumDisplaySettings.
by Alexandre Julliard 06 Jul '22

06 Jul '22

Module: wine Branch: master Commit: 4ce220e4e837186217e69537d7888d8d5bf6dde5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4ce220e4e837186217e69537… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun Jun 26 17:48:42 2022 +0200 win32u: Set generic DEVMODEW fields in NtUserEnumDisplaySettings. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/win32u/sysparams.c | 27 +++++++++++++++------------ dlls/wineandroid.drv/init.c | 8 -------- dlls/winemac.drv/display.c | 9 --------- dlls/winex11.drv/display.c | 25 ++++++++----------------- 4 files changed, 23 insertions(+), 46 deletions(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 4528454f5b9..fa82566e24c 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -1926,14 +1926,14 @@ LONG WINAPI NtUserChangeDisplaySettings( UNICODE_STRING *devname, DEVMODEW *devm /*********************************************************************** * NtUserEnumDisplaySettings (win32u.@) */ -BOOL WINAPI NtUserEnumDisplaySettings( UNICODE_STRING *device, DWORD mode, - DEVMODEW *dev_mode, DWORD flags ) +BOOL WINAPI NtUserEnumDisplaySettings( UNICODE_STRING *device, DWORD index, DEVMODEW *devmode, DWORD flags ) { + static const WCHAR wine_display_driverW[] = {'W','i','n','e',' ','D','i','s','p','l','a','y',' ','D','r','i','v','e','r',0}; WCHAR device_name[CCHDEVICENAME]; struct adapter *adapter; BOOL ret; - TRACE( "%s %#x %p %#x\n", debugstr_us(device), mode, dev_mode, flags ); + TRACE( "device %s, index %#x, devmode %p, flags %#x\n", debugstr_us(device), index, devmode, flags ); if (!lock_display_devices()) return FALSE; if ((adapter = find_adapter( device ))) lstrcpyW( device_name, adapter->dev.device_name ); @@ -1944,15 +1944,18 @@ BOOL WINAPI NtUserEnumDisplaySettings( UNICODE_STRING *device, DWORD mode, return FALSE; } - ret = user_driver->pEnumDisplaySettingsEx( device_name, mode, dev_mode, flags ); - if (ret) - TRACE( "device:%s mode index:%#x position:(%d,%d) resolution:%ux%u frequency:%uHz " - "depth:%ubits orientation:%#x.\n", debugstr_w(device_name), mode, - dev_mode->dmPosition.x, dev_mode->dmPosition.y, dev_mode->dmPelsWidth, - dev_mode->dmPelsHeight, dev_mode->dmDisplayFrequency, dev_mode->dmBitsPerPel, - dev_mode->dmDisplayOrientation ); - else - WARN( "Failed to query %s display settings.\n", wine_dbgstr_w(device_name) ); + lstrcpynW( devmode->dmDeviceName, wine_display_driverW, ARRAY_SIZE(devmode->dmDeviceName) ); + devmode->dmSpecVersion = DM_SPECVERSION; + devmode->dmDriverVersion = DM_SPECVERSION; + devmode->dmSize = offsetof(DEVMODEW, dmICMMethod); + memset( &devmode->dmDriverExtra, 0, devmode->dmSize - offsetof(DEVMODEW, dmDriverExtra) ); + + ret = user_driver->pEnumDisplaySettingsEx( device_name, index, devmode, flags ); + + if (!ret) WARN( "Failed to query %s display settings.\n", debugstr_w(device_name) ); + else TRACE( "position %dx%d, resolution %ux%u, frequency %u, depth %u, orientation %#x.\n", + devmode->dmPosition.x, devmode->dmPosition.y, devmode->dmPelsWidth, devmode->dmPelsHeight, + devmode->dmDisplayFrequency, devmode->dmBitsPerPel, devmode->dmDisplayOrientation ); return ret; } diff --git a/dlls/wineandroid.drv/init.c b/dlls/wineandroid.drv/init.c index 5d1c81a77bf..e2cebb974c3 100644 --- a/dlls/wineandroid.drv/init.c +++ b/dlls/wineandroid.drv/init.c @@ -303,14 +303,6 @@ BOOL ANDROID_UpdateDisplayDevices( const struct gdi_device_manager *device_manag */ BOOL ANDROID_EnumDisplaySettingsEx( LPCWSTR name, DWORD n, LPDEVMODEW devmode, DWORD flags ) { - static const WCHAR dev_name[CCHDEVICENAME] = - { 'W','i','n','e',' ','A','n','d','r','o','i','d',' ','d','r','i','v','e','r',0 }; - - devmode->dmSize = offsetof( DEVMODEW, dmICMMethod ); - devmode->dmSpecVersion = DM_SPECVERSION; - devmode->dmDriverVersion = DM_SPECVERSION; - memcpy( devmode->dmDeviceName, dev_name, sizeof(dev_name) ); - devmode->dmDriverExtra = 0; devmode->u2.dmDisplayFlags = 0; devmode->dmDisplayFrequency = 0; devmode->u1.s2.dmPosition.x = 0; diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index 0507acae1a9..191dc1f789b 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -1044,8 +1044,6 @@ better: */ BOOL macdrv_EnumDisplaySettingsEx(LPCWSTR devname, DWORD mode, DEVMODEW *devmode, DWORD flags) { - static const WCHAR dev_name[CCHDEVICENAME] = - { 'W','i','n','e',' ','M','a','c',' ','d','r','i','v','e','r',0 }; struct macdrv_display *displays = NULL; int num_displays; CGDisplayModeRef display_mode; @@ -1058,13 +1056,6 @@ BOOL macdrv_EnumDisplaySettingsEx(LPCWSTR devname, DWORD mode, DEVMODEW *devmode init_original_display_mode(); - memcpy(devmode->dmDeviceName, dev_name, sizeof(dev_name)); - devmode->dmSpecVersion = DM_SPECVERSION; - devmode->dmDriverVersion = DM_SPECVERSION; - devmode->dmSize = FIELD_OFFSET(DEVMODEW, dmICMMethod); - devmode->dmDriverExtra = 0; - memset(&devmode->dmFields, 0, devmode->dmSize - FIELD_OFFSET(DEVMODEW, dmFields)); - if (mode == ENUM_REGISTRY_SETTINGS) { TRACE("mode %d (registry) -- getting default mode\n", mode); diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index 31f73898897..740e018247b 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -464,9 +464,7 @@ static DWORD get_display_depth(ULONG_PTR display_id) */ BOOL X11DRV_EnumDisplaySettingsEx( LPCWSTR name, DWORD n, LPDEVMODEW devmode, DWORD flags) { - static const WCHAR dev_name[CCHDEVICENAME] = - { 'W','i','n','e',' ','X','1','1',' ','d','r','i','v','e','r',0 }; - DEVMODEW *modes; + DEVMODEW *modes, mode; UINT mode_count; ULONG_PTR id; @@ -477,21 +475,20 @@ BOOL X11DRV_EnumDisplaySettingsEx( LPCWSTR name, DWORD n, LPDEVMODEW devmode, DW ERR("Failed to get %s registry display settings.\n", wine_dbgstr_w(name)); return FALSE; } - goto done; + return TRUE; } if (n == ENUM_CURRENT_SETTINGS) { - if (!settings_handler.get_id(name, &id) || !settings_handler.get_current_mode(id, devmode)) + if (!settings_handler.get_id( name, &id ) || !settings_handler.get_current_mode( id, &mode )) { ERR("Failed to get %s current display settings.\n", wine_dbgstr_w(name)); return FALSE; } - if (!is_detached_mode(devmode)) - devmode->dmBitsPerPel = get_display_depth(id); - - goto done; + memcpy( &devmode->dmFields, &mode.dmFields, devmode->dmSize - offsetof(DEVMODEW, dmFields) ); + if (!is_detached_mode( devmode )) devmode->dmBitsPerPel = get_display_depth( id ); + return TRUE; } pthread_mutex_lock( &settings_mutex ); @@ -522,16 +519,10 @@ BOOL X11DRV_EnumDisplaySettingsEx( LPCWSTR name, DWORD n, LPDEVMODEW devmode, DW return FALSE; } - memcpy(devmode, (BYTE *)cached_modes + (sizeof(*cached_modes) + cached_modes[0].dmDriverExtra) * n, sizeof(*devmode)); + mode = *(DEVMODEW *)((BYTE *)cached_modes + (sizeof(*cached_modes) + cached_modes[0].dmDriverExtra) * n); pthread_mutex_unlock( &settings_mutex ); -done: - /* Set generic fields */ - devmode->dmSize = FIELD_OFFSET(DEVMODEW, dmICMMethod); - devmode->dmDriverExtra = 0; - devmode->dmSpecVersion = DM_SPECVERSION; - devmode->dmDriverVersion = DM_SPECVERSION; - lstrcpyW(devmode->dmDeviceName, dev_name); + memcpy( &devmode->dmFields, &mode.dmFields, devmode->dmSize - offsetof(DEVMODEW, dmFields) ); return TRUE; }

1 0

Zebediah Figura : d3d9/tests: Make getPixelColor() checks into actual ok() calls.
by Alexandre Julliard 06 Jul '22

06 Jul '22

Module: wine Branch: master Commit: c6da35514847ae6dfc9c814a756f02c4b254af67 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c6da35514847ae6dfc9c814a… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Jul 3 22:31:05 2022 -0500 d3d9/tests: Make getPixelColor() checks into actual ok() calls. These should never fail. --- dlls/d3d9/tests/visual.c | 24 +++++------------------- 1 file changed, 5 insertions(+), 19 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 025cd556ee4..24e28e74257 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -141,18 +141,11 @@ static DWORD getPixelColorFromSurface(IDirect3DSurface9 *surface, UINT x, UINT y D3DLOCKED_RECT lockedRect; hr = IDirect3DSurface9_GetDesc(surface, &desc); - if(FAILED(hr)) /* This is not a test */ - { - trace("Can't get the surface description, hr=%08x\n", hr); - return 0xdeadbeef; - } + ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IDirect3DSurface9_LockRect(surface, &lockedRect, &rectToLock, D3DLOCK_READONLY); - if(FAILED(hr)) /* This is not a test */ - { - trace("Can't lock the surface, hr=%08x\n", hr); - return 0xdeadbeef; - } + ok(hr == S_OK, "Got hr %#x.\n", hr); + switch(desc.Format) { case D3DFMT_A8R8G8B8: { @@ -165,10 +158,7 @@ static DWORD getPixelColorFromSurface(IDirect3DSurface9 *surface, UINT x, UINT y break; } hr = IDirect3DSurface9_UnlockRect(surface); - if(FAILED(hr)) - { - trace("Can't unlock the surface, hr=%08x\n", hr); - } + ok(hr == S_OK, "Got hr %#x.\n", hr); return color; } @@ -246,11 +236,7 @@ static DWORD getPixelColor(IDirect3DDevice9 *device, UINT x, UINT y) HRESULT hr; hr = IDirect3DDevice9_GetRenderTarget(device, 0, &rt); - if(FAILED(hr)) - { - trace("Can't get the render target, hr %#x.\n", hr); - return 0xdeadbeed; - } + ok(hr == S_OK, "Got hr %#x.\n", hr); get_rt_readback(rt, &rb); /* Remove the X channel for now. DirectX and OpenGL have different ideas how to treat it apparently, and it isn't

1 0