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

Eric Pouech : winedbg: Store result of types_get_info(TI_GET_TYPE) in dbg_type.
by Alexandre Julliard 29 Jul '22

29 Jul '22

Module: wine Branch: master Commit: dd977e4a8564f3230fe9cc1f9386f3a46b30bac9 URL: https://gitlab.winehq.org/wine/wine/-/commit/dd977e4a8564f3230fe9cc1f9386f3… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Jul 29 10:28:54 2022 +0200 winedbg: Store result of types_get_info(TI_GET_TYPE) in dbg_type. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- programs/winedbg/expr.c | 10 ++++----- programs/winedbg/types.c | 58 ++++++++++++++++++++++++++---------------------- 2 files changed, 37 insertions(+), 31 deletions(-)

1 0

Eric Pouech : winedbg: Synthetize pointer to type when not available.
by Alexandre Julliard 29 Jul '22

29 Jul '22

Module: wine Branch: master Commit: 16bcc3bc29dfdb435fee48061d7dd8304ae21d11 URL: https://gitlab.winehq.org/wine/wine/-/commit/16bcc3bc29dfdb435fee48061d7dd8… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Jul 29 10:28:54 2022 +0200 winedbg: Synthetize pointer to type when not available. This ensures that we always have a type as pointer to a known <type> (either because it exists in <type>'s module, or it's synthetized inside debugger). Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- programs/winedbg/debugger.h | 5 +++ programs/winedbg/tgt_active.c | 1 + programs/winedbg/types.c | 83 +++++++++++++++++++++++++++++++++++++++---- programs/winedbg/winedbg.c | 3 ++ 4 files changed, 86 insertions(+), 6 deletions(-) diff --git a/programs/winedbg/debugger.h b/programs/winedbg/debugger.h index c3eac423a13..1cfdfb9386b 100644 --- a/programs/winedbg/debugger.h +++ b/programs/winedbg/debugger.h @@ -67,6 +67,8 @@ enum dbg_line_status enum dbg_internal_types { + /* types that we synthetize inside the debugger */ + dbg_itype_synthetized = 0xf0000000, /* order here must match types.c:basic_types_details table */ dbg_itype_first = 0xffffff00, dbg_itype_void = dbg_itype_first, @@ -282,6 +284,8 @@ struct dbg_process int source_start_line; int source_end_line; const struct data_model* data_model; + struct dbg_type* synthetized_types; + unsigned num_synthetized_types; }; /* describes the way the debugger interacts with a given process */ @@ -499,6 +503,7 @@ extern BOOL types_is_integral_type(const struct dbg_lvalue*); extern BOOL types_is_float_type(const struct dbg_lvalue*); extern BOOL types_is_pointer_type(const struct dbg_lvalue*); extern BOOL types_find_basic(const WCHAR*, const char*, struct dbg_type* type); +extern BOOL types_unload_module(DWORD_PTR linear); /* winedbg.c */ #ifdef __GNUC__ diff --git a/programs/winedbg/tgt_active.c b/programs/winedbg/tgt_active.c index b3b385ee2b4..943ac7a5891 100644 --- a/programs/winedbg/tgt_active.c +++ b/programs/winedbg/tgt_active.c @@ -500,6 +500,7 @@ static unsigned dbg_handle_debug_event(DEBUG_EVENT* de) de->dwProcessId, de->dwThreadId, de->u.UnloadDll.lpBaseOfDll); break_delete_xpoints_from_module((DWORD_PTR)de->u.UnloadDll.lpBaseOfDll); + types_unload_module((DWORD_PTR)de->u.UnloadDll.lpBaseOfDll); SymUnloadModule64(dbg_curr_process->handle, (DWORD_PTR)de->u.UnloadDll.lpBaseOfDll); break; diff --git a/programs/winedbg/types.c b/programs/winedbg/types.c index 48c72122688..dd162eb8987 100644 --- a/programs/winedbg/types.c +++ b/programs/winedbg/types.c @@ -371,19 +371,56 @@ static BOOL CALLBACK types_cb(PSYMBOL_INFO sym, ULONG size, void* _user) /****************************************************************** * types_find_pointer * - * Should look up in module based at linear whether (typeid*) exists - * Otherwise, we could create it locally + * There's no simple API in dbghelp for looking up the pointer type of a given type + * - SymEnumTypes would do, but it'll enumerate all types, which could be long + * - and more impacting, there's no guarantee such a type exists + * Hence, we synthetize inside Winedbg all needed pointer types. + * That's cumbersome as we end up with dbg_type in different modules between pointer + * and pointee types. */ BOOL types_find_pointer(const struct dbg_type* type, struct dbg_type* outtype) { struct type_find_t f; + unsigned i; + struct dbg_type* new; + if (!dbg_curr_process) return FALSE; + + /* first lookup if pointer to type exists in module */ f.type.id = dbg_itype_none; f.tag = SymTagPointerType; f.ptr_typeid = type->id; - if (!SymEnumTypes(dbg_curr_process->handle, type->module, types_cb, &f) || f.type.id == dbg_itype_none) + SymEnumTypes(dbg_curr_process->handle, type->module, types_cb, &f); + if (f.type.id != dbg_itype_none) + { + *outtype = f.type; + return TRUE; + } + + /* then look up in synthetized types */ + for (i = 0; i < dbg_curr_process->num_synthetized_types; i++) + if (!memcmp(type, &dbg_curr_process->synthetized_types[i], sizeof(*type))) + { + outtype->module = 0; + outtype->id = dbg_itype_synthetized + i; + return TRUE; + } + if (dbg_itype_synthetized + dbg_curr_process->num_synthetized_types >= dbg_itype_first) + { + /* for now, we don't reuse old slots... */ + FIXME("overflow in pointer types\n"); return FALSE; - *outtype = f.type; + } + /* otherwise, synthetize it */ + new = realloc(dbg_curr_process->synthetized_types, + (dbg_curr_process->num_synthetized_types + 1) * sizeof(*new)); + if (!new) return FALSE; + dbg_curr_process->synthetized_types = new; + dbg_curr_process->synthetized_types[dbg_curr_process->num_synthetized_types] = *type; + outtype->module = 0; + outtype->id = dbg_itype_synthetized + dbg_curr_process->num_synthetized_types; + dbg_curr_process->num_synthetized_types++; + return TRUE; } @@ -1041,6 +1078,7 @@ static BOOL lookup_base_type_in_data_model(DWORD64 module, unsigned bt, unsigned * - module & type id on input are in dbg_type structure * - for TI_GET_TYPE a pointer to a dbg_type is expected for pInfo * (instead of DWORD* for SymGetTypeInfo) + * - handles also internal types, and synthetized types. */ BOOL types_get_info(const struct dbg_type* type, IMAGEHLP_SYMBOL_TYPE_INFO ti, void* pInfo) { @@ -1074,6 +1112,24 @@ BOOL types_get_info(const struct dbg_type* type, IMAGEHLP_SYMBOL_TYPE_INFO ti, v return SymGetTypeInfo(dbg_curr_process->handle, type->module, type->id, ti, pInfo); } + if (type->id >= dbg_itype_synthetized && type->id < dbg_itype_first) + { + unsigned i = type->id - dbg_itype_synthetized; + if (i >= dbg_curr_process->num_synthetized_types) return FALSE; + switch (ti) + { + case TI_GET_SYMTAG: X(DWORD) = SymTagPointerType; break; + case TI_GET_LENGTH: X(DWORD64) = ADDRSIZE; break; + case TI_GET_TYPE: if (dbg_curr_process->synthetized_types[i].module == 0 && + dbg_curr_process->synthetized_types[i].id == dbg_itype_none) return FALSE; + + X(struct dbg_type) = dbg_curr_process->synthetized_types[i]; + break; + default: WINE_FIXME("unsupported %u for pointer type %d\n", ti, i); return FALSE; + } + return TRUE; + } + assert(type->id >= dbg_itype_first); if (type->id >= dbg_itype_first && type->id < dbg_itype_last) @@ -1143,6 +1199,21 @@ BOOL types_get_info(const struct dbg_type* type, IMAGEHLP_SYMBOL_TYPE_INFO ti, v return TRUE; } +BOOL types_unload_module(DWORD_PTR linear) +{ + unsigned i; + if (!dbg_curr_process) return FALSE; + for (i = 0; i < dbg_curr_process->num_synthetized_types; i++) + { + if (dbg_curr_process->synthetized_types[i].module == linear) + { + dbg_curr_process->synthetized_types[i].module = 0; + dbg_curr_process->synthetized_types[i].id = dbg_itype_none; + } + } + return TRUE; +} + static BOOL types_compare_name(struct dbg_type type1, struct dbg_type type2, BOOL* equal) { LPWSTR name1, name2; @@ -1299,7 +1370,7 @@ BOOL types_is_integral_type(const struct dbg_lvalue* lv) struct dbg_type type = lv->type; DWORD tag, bt; if (lv->bitlen) return TRUE; - if (!types_get_real_type(&type, &tag) || + if (!types_get_real_type(&type, &tag) || tag != SymTagBaseType || !types_get_info(&type, TI_GET_BASETYPE, &bt)) return FALSE; return is_basetype_integer(bt); } @@ -1309,7 +1380,7 @@ BOOL types_is_float_type(const struct dbg_lvalue* lv) struct dbg_type type = lv->type; DWORD tag, bt; if (lv->bitlen) return FALSE; - if (!types_get_real_type(&type, &tag) || + if (!types_get_real_type(&type, &tag) || tag != SymTagBaseType || !types_get_info(&type, TI_GET_BASETYPE, &bt)) return FALSE; return bt == btFloat; } diff --git a/programs/winedbg/winedbg.c b/programs/winedbg/winedbg.c index 1bf627fd53c..84ec7802396 100644 --- a/programs/winedbg/winedbg.c +++ b/programs/winedbg/winedbg.c @@ -285,6 +285,8 @@ struct dbg_process* dbg_add_process(const struct be_process_io* pio, DWORD pid, p->source_start_line = -1; p->source_end_line = -1; p->data_model = NULL; + p->synthetized_types = NULL; + p->num_synthetized_types = 0; list_add_head(&dbg_process_list, &p->entry); @@ -330,6 +332,7 @@ void dbg_del_process(struct dbg_process* p) if (p == dbg_curr_process) dbg_curr_process = NULL; if (p->event_on_first_exception) CloseHandle(p->event_on_first_exception); free((char*)p->imageName); + free(p->synthetized_types); free(p); }

1 0

Alexandre Julliard : makefiles: Work directly with Makefile.in names in make_makefiles.
by Alexandre Julliard 28 Jul '22

28 Jul '22

Module: wine Branch: master Commit: 56fea67c534df9f7d07fb10c20af6df1e5fb5c80 URL: https://gitlab.winehq.org/wine/wine/-/commit/56fea67c534df9f7d07fb10c20af6d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 28 15:31:17 2022 +0200 makefiles: Work directly with Makefile.in names in make_makefiles. --- tools/make_makefiles | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/tools/make_makefiles b/tools/make_makefiles index c7afd4080ac..2025b45b75c 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -132,7 +132,7 @@ sub replace_makefile_variables($) my $old; my $new; - open OLD_FILE, "$file.in" or die "cannot open $file.in"; + open OLD_FILE, $file or die "cannot open $file"; while (<OLD_FILE>) { $old .= $_; @@ -180,7 +180,7 @@ sub replace_makefile_variables($) $replaced{$var} = 1; foreach my $val (@values) { - die "$file.in: duplicate file $val" if defined $files{$val}; + die "$file: duplicate file $val" if defined $files{$val}; $files{$val} = 1; } next; @@ -201,7 +201,7 @@ sub replace_makefile_variables($) } } close OLD_FILE; - update_file("$file.in", $new) if $old ne $new; + update_file($file, $new) if $old ne $new; } # parse the specified makefile and load the variables @@ -212,7 +212,7 @@ sub parse_makefile($) ($make{"=dir"} = $file) =~ s/[^\/]+$//; - open MAKE, "$file.in" or die "cannot open $file.in\n"; + open MAKE, $file or die "cannot open $file\n"; while (<MAKE>) { @@ -223,7 +223,7 @@ sub parse_makefile($) if (/\@[A-Z_]+\@/) # config.status substitution variable { - die "Configure substitution is not allowed in $file" unless $file eq "Makefile"; + die "Configure substitution is not allowed in $file" unless $file eq "Makefile.in"; } if (/^\s*(MODULE|IMPORTLIB|TESTDLL|STATICLIB|PARENTSRC|EXTRADLLFLAGS)\s*=\s*(.*)/) { @@ -241,7 +241,7 @@ sub parse_makefile($) } if (/^\s*(TOPSRCDIR|TOPOBJDIR|SRCDIR|VPATH)\s*=\s*(.*)/) { - die "Variable $1 in $file.in is obsolete"; + die "Variable $1 in $file is obsolete"; } } @@ -293,13 +293,13 @@ sub get_parent_makefile($) my %make = %{$makefiles{$file}}; my $reldir = $make{"PARENTSRC"} || ""; return "" unless $reldir; - (my $path = $file) =~ s/\/Makefile$/\//; + (my $path = $file) =~ s/\/Makefile\.in$/\//; while ($reldir =~ /^\.\.\//) { $reldir =~ s/^\.\.\///; $path =~ s/[^\/]+\/$//; } - return "$path$reldir/Makefile"; + return "$path$reldir/Makefile.in"; } # preserve shared source files that are listed in the existing makefile @@ -329,13 +329,13 @@ sub assign_sources_to_makefiles(@) my $dir = dirname( $file ); my $subdir = $dir; - while ($dir && !defined $makefiles{"$dir/Makefile"}) { $dir = dirname( $dir ); } + while ($dir && !defined $makefiles{"$dir/Makefile.in"}) { $dir = dirname( $dir ); } $subdir =~ s/^$dir\/?//; next unless $dir; - die "no makefile found for $file\n" unless defined $makefiles{"$dir/Makefile"}; + die "no makefile found for $file\n" unless defined $makefiles{"$dir/Makefile.in"}; - my $make = $makefiles{"$dir/Makefile"}; + my $make = $makefiles{"$dir/Makefile.in"}; my $name = substr( $file, length($dir) + 1 ); if ($name =~ /\.m$/) { push @{${$make}{"=OBJC_SRCS"}}, $name; } @@ -417,13 +417,13 @@ sub update_makefiles(@) foreach my $file (sort @_) { - next if $file eq "Makefile"; + next if $file eq "Makefile.in"; my %make = %{$makefiles{$file}}; - (my $dir = $file) =~ s/^(.*)\/Makefile/$1/; + (my $dir = $file) =~ s/^(.*)\/Makefile\.in/$1/; my $args = ""; if (defined($make{"TESTDLL"})) # test { - die "TESTDLL should not be defined in $file" unless $file =~ /\/tests\/Makefile$/; + die "TESTDLL should not be defined in $file" unless $file =~ /\/tests\/Makefile\.in$/; die "MODULE should not be defined in $file" if defined $make{"MODULE"}; die "STATICLIB should not be defined in $file" if defined $make{"STATICLIB"}; } @@ -434,7 +434,7 @@ sub update_makefiles(@) } elsif (defined($make{"MODULE"})) # dll or program { - (my $name = $file) =~ s/^(dlls|programs)\/(.*)\/Makefile/$2/; + (my $name = $file) =~ s/^(dlls|programs)\/(.*)\/Makefile\.in/$2/; my $dllflags = $make{"EXTRADLLFLAGS"} || ""; die "invalid MODULE name" if $make{"MODULE"} =~ /\.a$/; die "MODULE should not be defined in $file" unless $file =~ /^(dlls|programs)\//; @@ -457,7 +457,7 @@ sub update_makefiles(@) } $args = ",enable_win16" if $make{"MODULE"} =~ /16$/ || $modules16{$make{"MODULE"}}; } - elsif ($file =~ /^tools.*\/Makefile$/) + elsif ($file =~ /^tools.*\/Makefile\.in$/) { die "MODULE should not be defined in $file" if defined $make{"MODULE"}; die "STATICLIB should not be defined in $file" if defined $make{"STATICLIB"}; @@ -489,7 +489,7 @@ die "needs to be run from a git checkout" unless -e $git_dir; my @all_files = split /\0/, `git ls-files -c -z`; map { $ignored_source_files{$_} = 1; } split /\0/, `git ls-files -d -z`; -(a)makefiles = map { (my $ret = $_) =~ s/\.in$//; $ret; } grep /Makefile.in$/, @all_files; +(a)makefiles = grep /Makefile.in$/, @all_files; foreach my $file (sort @makefiles) {

1 0

Alexandre Julliard : makefiles: Look for source files in the makefile before trying to open them.
by Alexandre Julliard 28 Jul '22

28 Jul '22

Module: wine Branch: master Commit: e31276e9a2a76c66452c24c08b3ae054f8777eb6 URL: https://gitlab.winehq.org/wine/wine/-/commit/e31276e9a2a76c66452c24c08b3ae0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 28 15:32:17 2022 +0200 makefiles: Look for source files in the makefile before trying to open them. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 65 ++++++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 46 insertions(+), 19 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 0e8daf3a960..b84090fef21 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -66,6 +66,7 @@ struct file struct incl_file { struct list entry; + struct list hash_entry; struct file *file; char *name; char *filename; @@ -116,9 +117,10 @@ static const struct { FLAG_IDL_HEADER, ".h" } }; -#define HASH_SIZE 997 +#define HASH_SIZE 197 static struct list files[HASH_SIZE]; +static struct list global_includes[HASH_SIZE]; enum install_rules { INSTALL_LIB, INSTALL_DEV, NB_INSTALL_RULES }; @@ -748,6 +750,15 @@ static struct incl_file *find_src_file( const struct makefile *make, const char { struct incl_file *file; + if (make == include_makefile) + { + unsigned int hash = hash_filename( name ); + + LIST_FOR_EACH_ENTRY( file, &global_includes[hash], struct incl_file, hash_entry ) + if (!strcmp( name, file->name )) return file; + return NULL; + } + LIST_FOR_EACH_ENTRY( file, &make->sources, struct incl_file, entry ) if (!strcmp( name, file->name )) return file; return NULL; @@ -827,6 +838,11 @@ static struct incl_file *add_generated_source( struct makefile *make, file->file->flags = FLAG_GENERATED; file->use_msvcrt = make->use_msvcrt; list_add_tail( &make->sources, &file->entry ); + if (make == include_makefile) + { + unsigned int hash = hash_filename( name ); + list_add_tail( &global_includes[hash], &file->hash_entry ); + } return file; } @@ -1270,16 +1286,16 @@ static struct file *open_local_file( const struct makefile *make, const char *pa static struct file *open_local_generated_file( const struct makefile *make, struct incl_file *file, const char *ext, const char *src_ext ) { - char *filename; - struct file *ret = NULL; + struct incl_file *include; if (strendswith( file->name, ext ) && - (ret = open_local_file( make, replace_extension( file->name, ext, src_ext ), &filename ))) + (include = find_src_file( make, replace_extension( file->name, ext, src_ext ) ))) { - file->sourcename = filename; + file->sourcename = include->filename; file->filename = obj_dir_path( make, file->name ); + return include->file; } - return ret; + return NULL; } @@ -1288,7 +1304,7 @@ static struct file *open_local_generated_file( const struct makefile *make, stru * * Open a file in the top-level source directory. */ -static struct file *open_global_file( const struct makefile *make, const char *path, char **filename ) +static struct file *open_global_file( const char *path, char **filename ) { char *src_path = root_src_dir_path( path ); struct file *ret = load_file( src_path ); @@ -1303,10 +1319,13 @@ static struct file *open_global_file( const struct makefile *make, const char *p * * Open a file in the global include source directory. */ -static struct file *open_global_header( const struct makefile *make, const char *path, char **filename ) +static struct file *open_global_header( const char *path, char **filename ) { - if (!strncmp( path, "../", 3 )) return NULL; - return open_global_file( make, strmake( "include/%s", path ), filename ); + struct incl_file *include = find_src_file( include_makefile, path ); + + if (!include) return NULL; + *filename = include->filename; + return include->file; } @@ -1318,16 +1337,16 @@ static struct file *open_global_header( const struct makefile *make, const char static struct file *open_global_generated_file( const struct makefile *make, struct incl_file *file, const char *ext, const char *src_ext ) { - char *filename; - struct file *ret = NULL; + struct incl_file *include; if (strendswith( file->name, ext ) && - (ret = open_global_header( make, replace_extension( file->name, ext, src_ext ), &filename ))) + (include = find_src_file( include_makefile, replace_extension( file->name, ext, src_ext ) ))) { - file->sourcename = filename; + file->sourcename = include->filename; file->filename = strmake( "include/%s", file->name ); + return include->file; } - return ret; + return NULL; } @@ -1407,11 +1426,11 @@ static struct file *open_include_file( const struct makefile *make, struct incl_ (file = open_global_generated_file( make, pFile, ".h", ".x" ))) return file; /* check in global includes source dir */ - if ((file = open_global_header( make, pFile->name, &pFile->filename ))) return file; + if ((file = open_global_header( pFile->name, &pFile->filename ))) return file; /* check in global msvcrt includes */ if (pFile->use_msvcrt && - (file = open_global_header( make, strmake( "msvcrt/%s", pFile->name ), &pFile->filename ))) + (file = open_global_header( strmake( "msvcrt/%s", pFile->name ), &pFile->filename ))) return file; /* now search in include paths */ @@ -1425,7 +1444,7 @@ static struct file *open_include_file( const struct makefile *make, struct incl_ if (!strncmp( dir, root_src_dir, len ) && (!dir[len] || dir[len] == '/')) { while (dir[len] == '/') len++; - file = open_global_file( make, concat_paths( dir + len, pFile->name ), &pFile->filename ); + file = open_global_file( concat_paths( dir + len, pFile->name ), &pFile->filename ); } } else @@ -1569,6 +1588,11 @@ static struct incl_file *add_src_file( struct makefile *make, const char *name ) file->use_msvcrt = make->use_msvcrt; file->is_external = !!make->extlib; list_add_tail( &make->sources, &file->entry ); + if (make == include_makefile) + { + unsigned int hash = hash_filename( name ); + list_add_tail( &global_includes[hash], &file->hash_entry ); + } parse_file( make, file, 1 ); return file; } @@ -4311,6 +4335,7 @@ int main( int argc, char *argv[] ) #endif for (i = 0; i < HASH_SIZE; i++) list_init( &files[i] ); + for (i = 0; i < HASH_SIZE; i++) list_init( &global_includes[i] ); top_makefile = parse_makefile( NULL ); @@ -4372,7 +4397,9 @@ int main( int argc, char *argv[] ) for (i = 0; i < subdirs.count; i++) submakes[i] = parse_makefile( subdirs.str[i] ); load_sources( top_makefile ); - for (i = 0; i < subdirs.count; i++) load_sources( submakes[i] ); + load_sources( include_makefile ); + for (i = 0; i < subdirs.count; i++) + if (submakes[i] != include_makefile) load_sources( submakes[i] ); output_dependencies( top_makefile ); for (i = 0; i < subdirs.count; i++) output_dependencies( submakes[i] );

1 0

Rémi Bernon : win32u: Use a static size array for rawinput device path.
by Alexandre Julliard 28 Jul '22

28 Jul '22

Module: wine Branch: master Commit: 37a3c916b447bab5932ae202c053bceaba46e594 URL: https://gitlab.winehq.org/wine/wine/-/commit/37a3c916b447bab5932ae202c053bc… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Jun 25 21:53:16 2022 +0200 win32u: Use a static size array for rawinput device path. --- dlls/win32u/rawinput.c | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/dlls/win32u/rawinput.c b/dlls/win32u/rawinput.c index 34accc3c4a0..b391bca1370 100644 --- a/dlls/win32u/rawinput.c +++ b/dlls/win32u/rawinput.c @@ -196,9 +196,9 @@ static bool rawinput_from_hardware_message( RAWINPUT *rawinput, const struct har struct device { - WCHAR *path; HANDLE file; HANDLE handle; + WCHAR path[MAX_PATH]; RID_DEVICE_INFO info; struct hid_preparsed_data *data; }; @@ -238,7 +238,7 @@ static bool array_reserve( void **elements, unsigned int *capacity, unsigned int static struct device *add_device( HKEY key, DWORD type ) { static const WCHAR symbolic_linkW[] = {'S','y','m','b','o','l','i','c','L','i','n','k',0}; - char value_buffer[4096]; + char value_buffer[offsetof(KEY_VALUE_PARTIAL_INFORMATION, Data[MAX_PATH * sizeof(WCHAR)])]; KEY_VALUE_PARTIAL_INFORMATION *value = (KEY_VALUE_PARTIAL_INFORMATION *)value_buffer; static const RID_DEVICE_INFO_KEYBOARD keyboard_info = {0, 0, 1, 12, 3, 101}; static const RID_DEVICE_INFO_MOUSE mouse_info = {1, 5, 0, FALSE}; @@ -249,27 +249,24 @@ static struct device *add_device( HKEY key, DWORD type ) struct device *device; RID_DEVICE_INFO info; IO_STATUS_BLOCK io; - WCHAR *path, *pos; NTSTATUS status; unsigned int i; UINT32 handle; void *buffer; SIZE_T size; HANDLE file; + WCHAR *path; - if (!query_reg_value( key, symbolic_linkW, value, sizeof(value_buffer) )) + if (!query_reg_value( key, symbolic_linkW, value, sizeof(value_buffer) - sizeof(WCHAR) )) { ERR( "failed to get symbolic link value\n" ); return NULL; } - - if (!(path = malloc( value->DataLength + sizeof(WCHAR) ))) - return NULL; - memcpy( path, value->Data, value->DataLength ); - path[value->DataLength / sizeof(WCHAR)] = 0; + memset( value->Data + value->DataLength, 0, sizeof(WCHAR) ); /* upper case everything but the GUID */ - for (pos = path; *pos && *pos != '{'; pos++) *pos = towupper( *pos ); + for (path = (WCHAR *)value->Data; *path && *path != '{'; path++) *path = towupper( *path ); + path = (WCHAR *)value->Data; /* path is in DOS format and begins with \\?\ prefix */ path[1] = '?'; @@ -280,7 +277,6 @@ static struct device *add_device( HKEY key, DWORD type ) FILE_SHARE_READ | FILE_SHARE_WRITE, FILE_SYNCHRONOUS_IO_NONALERT ))) { ERR( "Failed to open device file %s, status %#x.\n", debugstr_w(path), status ); - free( path ); return NULL; } @@ -376,7 +372,7 @@ static struct device *add_device( HKEY key, DWORD type ) goto fail; } - device->path = path; + wcscpy( device->path, path ); device->file = file; device->handle = ULongToHandle(handle); device->info = info; @@ -387,7 +383,6 @@ static struct device *add_device( HKEY key, DWORD type ) fail: free( preparsed ); NtClose( file ); - free( path ); return NULL; } @@ -466,7 +461,6 @@ static void rawinput_update_device_list(void) { free( rawinput_devices[i].data ); NtClose( rawinput_devices[i].file ); - free( rawinput_devices[i].path ); } rawinput_devices_count = 0;

1 0

Rémi Bernon : win32u: Use a struct list to keep rawinput devices.
by Alexandre Julliard 28 Jul '22

28 Jul '22

Module: wine Branch: master Commit: c484e4b87ead26389b6192b3be672348d4218520 URL: https://gitlab.winehq.org/wine/wine/-/commit/c484e4b87ead26389b6192b3be6723… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Jun 25 22:10:38 2022 +0200 win32u: Use a struct list to keep rawinput devices. --- dlls/win32u/rawinput.c | 109 +++++++++++++++++-------------------------------- 1 file changed, 37 insertions(+), 72 deletions(-) diff --git a/dlls/win32u/rawinput.c b/dlls/win32u/rawinput.c index b391bca1370..b2698d5eb3e 100644 --- a/dlls/win32u/rawinput.c +++ b/dlls/win32u/rawinput.c @@ -198,43 +198,15 @@ struct device { HANDLE file; HANDLE handle; + struct list entry; WCHAR path[MAX_PATH]; RID_DEVICE_INFO info; struct hid_preparsed_data *data; }; -static struct device *rawinput_devices; -static unsigned int rawinput_devices_count, rawinput_devices_max; - +static struct list devices = LIST_INIT( devices ); static pthread_mutex_t rawinput_mutex = PTHREAD_MUTEX_INITIALIZER; -static bool array_reserve( void **elements, unsigned int *capacity, unsigned int count, unsigned int size ) -{ - unsigned int new_capacity, max_capacity; - void *new_elements; - - if (count <= *capacity) - return true; - - max_capacity = ~(unsigned int)0 / size; - if (count > max_capacity) - return false; - - new_capacity = max( 4, *capacity ); - while (new_capacity < count && new_capacity <= max_capacity / 2) - new_capacity *= 2; - if (new_capacity < count) - new_capacity = max_capacity; - - if (!(new_elements = realloc( *elements, new_capacity * size ))) - return false; - - *elements = new_elements; - *capacity = new_capacity; - - return true; -} - static struct device *add_device( HKEY key, DWORD type ) { static const WCHAR symbolic_linkW[] = {'S','y','m','b','o','l','i','c','L','i','n','k',0}; @@ -250,7 +222,6 @@ static struct device *add_device( HKEY key, DWORD type ) RID_DEVICE_INFO info; IO_STATUS_BLOCK io; NTSTATUS status; - unsigned int i; UINT32 handle; void *buffer; SIZE_T size; @@ -290,9 +261,9 @@ static struct device *add_device( HKEY key, DWORD type ) goto fail; } - for (i = 0; i < rawinput_devices_count; ++i) + LIST_FOR_EACH_ENTRY( device, &devices, struct device, entry ) { - if (rawinput_devices[i].handle == UlongToHandle(handle)) + if (device->handle == UlongToHandle( handle )) { TRACE( "Ignoring already added device %#x / %s.\n", handle, debugstr_w(path) ); goto fail; @@ -360,23 +331,19 @@ static struct device *add_device( HKEY key, DWORD type ) break; } - if (array_reserve( (void **)&rawinput_devices, &rawinput_devices_max, - rawinput_devices_count + 1, sizeof(*rawinput_devices) )) - { - device = &rawinput_devices[rawinput_devices_count++]; - TRACE( "Adding device %#x / %s.\n", handle, debugstr_w(path) ); - } - else + if (!(device = calloc( 1, sizeof(*device) ))) { ERR( "Failed to allocate memory.\n" ); goto fail; } + TRACE( "Adding device %#x / %s.\n", handle, debugstr_w(path) ); wcscpy( device->path, path ); device->file = file; device->handle = ULongToHandle(handle); device->info = info; device->data = preparsed; + list_add_tail( &devices, &device->entry ); return device; @@ -452,17 +419,17 @@ static void enumerate_devices( DWORD type, const WCHAR *class ) static void rawinput_update_device_list(void) { - unsigned int i; + struct device *device, *next; TRACE( "\n" ); - /* destroy previous list */ - for (i = 0; i < rawinput_devices_count; ++i) + LIST_FOR_EACH_ENTRY_SAFE( device, next, &devices, struct device, entry ) { - free( rawinput_devices[i].data ); - NtClose( rawinput_devices[i].file ); + list_remove( &device->entry ); + NtClose( device->file ); + free( device->data ); + free( device ); } - rawinput_devices_count = 0; enumerate_devices( RIM_TYPEMOUSE, guid_devinterface_mouseW ); enumerate_devices( RIM_TYPEKEYBOARD, guid_devinterface_keyboardW ); @@ -471,21 +438,16 @@ static void rawinput_update_device_list(void) static struct device *find_device_from_handle( HANDLE handle ) { - unsigned int i; + struct device *device; - for (i = 0; i < rawinput_devices_count; ++i) - { - if (rawinput_devices[i].handle == handle) - return rawinput_devices + i; - } + LIST_FOR_EACH_ENTRY( device, &devices, struct device, entry ) + if (device->handle == handle) return device; rawinput_update_device_list(); - for (i = 0; i < rawinput_devices_count; ++i) - { - if (rawinput_devices[i].handle == handle) - return rawinput_devices + i; - } + LIST_FOR_EACH_ENTRY( device, &devices, struct device, entry ) + if (device->handle == handle) return device; + return NULL; } @@ -511,14 +473,15 @@ BOOL rawinput_device_get_usages( HANDLE handle, USAGE *usage_page, USAGE *usage /********************************************************************** * NtUserGetRawInputDeviceList (win32u.@) */ -UINT WINAPI NtUserGetRawInputDeviceList( RAWINPUTDEVICELIST *devices, UINT *device_count, UINT size ) +UINT WINAPI NtUserGetRawInputDeviceList( RAWINPUTDEVICELIST *device_list, UINT *device_count, UINT size ) { + unsigned int count = 0, ticks = NtGetTickCount(); static unsigned int last_check; - unsigned int i, ticks = NtGetTickCount(); + struct device *device; - TRACE("devices %p, device_count %p, size %u.\n", devices, device_count, size); + TRACE( "device_list %p, device_count %p, size %u.\n", device_list, device_count, size ); - if (size != sizeof(*devices)) + if (size != sizeof(*device_list)) { SetLastError( ERROR_INVALID_PARAMETER ); return ~0u; @@ -538,28 +501,30 @@ UINT WINAPI NtUserGetRawInputDeviceList( RAWINPUTDEVICELIST *devices, UINT *devi rawinput_update_device_list(); } + LIST_FOR_EACH_ENTRY( device, &devices, struct device, entry ) + { + if (*device_count < ++count || !device_list) continue; + device_list->hDevice = device->handle; + device_list->dwType = device->info.dwType; + device_list++; + } + pthread_mutex_unlock( &rawinput_mutex ); - if (!devices) + if (!device_list) { - *device_count = rawinput_devices_count; + *device_count = count; return 0; } - if (*device_count < rawinput_devices_count) + if (*device_count < count) { SetLastError( ERROR_INSUFFICIENT_BUFFER ); - *device_count = rawinput_devices_count; + *device_count = count; return ~0u; } - for (i = 0; i < rawinput_devices_count; ++i) - { - devices[i].hDevice = rawinput_devices[i].handle; - devices[i].dwType = rawinput_devices[i].info.dwType; - } - - return rawinput_devices_count; + return count; } /**********************************************************************

1 0

Rémi Bernon : win32u: Implement NtUserGetRegisteredRawInputDevices on the client side.
by Alexandre Julliard 28 Jul '22

28 Jul '22

Module: wine Branch: master Commit: 1587e9db88c8ad1afe4401290ce130664a5a4a40 URL: https://gitlab.winehq.org/wine/wine/-/commit/1587e9db88c8ad1afe4401290ce130… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Jun 25 23:45:27 2022 +0200 win32u: Implement NtUserGetRegisteredRawInputDevices on the client side. --- dlls/win32u/rawinput.c | 117 ++++++++++++++++++++++++----------------- include/wine/server_protocol.h | 19 +------ server/protocol.def | 7 --- server/queue.c | 21 -------- server/request.h | 5 -- server/trace.c | 13 ----- 6 files changed, 71 insertions(+), 111 deletions(-)

1 0

Rémi Bernon : server: Use the client provided rawinput registered device array.
by Alexandre Julliard 28 Jul '22

28 Jul '22

Module: wine Branch: master Commit: a2395ecf963b85ca0ea2f002982af07fc8241db9 URL: https://gitlab.winehq.org/wine/wine/-/commit/a2395ecf963b85ca0ea2f002982af0… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jul 28 10:27:30 2022 +0200 server: Use the client provided rawinput registered device array. --- dlls/win32u/rawinput.c | 24 ++++++++++------------ server/process.c | 12 +++-------- server/process.h | 9 ++------ server/queue.c | 56 ++++++++++++++++---------------------------------- 4 files changed, 34 insertions(+), 67 deletions(-) diff --git a/dlls/win32u/rawinput.c b/dlls/win32u/rawinput.c index 683641afeaf..8e3f3ace15a 100644 --- a/dlls/win32u/rawinput.c +++ b/dlls/win32u/rawinput.c @@ -860,29 +860,27 @@ BOOL WINAPI NtUserRegisterRawInputDevices( const RAWINPUTDEVICE *devices, UINT d registered_devices = realloc( registered_devices, size ); if (registered_devices) for (i = 0; i < device_count; ++i) register_rawinput_device( devices + i ); - pthread_mutex_unlock( &rawinput_mutex ); - - if (!registered_devices) + server_devices = malloc( registered_device_count * sizeof(*server_devices) ); + if (server_devices) for (i = 0; i < registered_device_count; ++i) { - SetLastError( ERROR_OUTOFMEMORY ); - return FALSE; + server_devices[i].usage_page = registered_devices[i].usUsagePage; + server_devices[i].usage = registered_devices[i].usUsage; + server_devices[i].flags = registered_devices[i].dwFlags; + server_devices[i].target = wine_server_user_handle( registered_devices[i].hwndTarget ); } - if (!(server_devices = malloc( device_count * sizeof(*server_devices) ))) return FALSE; + pthread_mutex_unlock( &rawinput_mutex ); - for (i = 0; i < device_count; ++i) + if (!registered_devices || !server_devices) { - - server_devices[i].usage_page = devices[i].usUsagePage; - server_devices[i].usage = devices[i].usUsage; - server_devices[i].flags = devices[i].dwFlags; - server_devices[i].target = wine_server_user_handle( devices[i].hwndTarget ); + SetLastError( ERROR_OUTOFMEMORY ); + return FALSE; } SERVER_START_REQ( update_rawinput_devices ) { wine_server_add_data( req, server_devices, device_count * sizeof(*server_devices) ); - ret = !wine_server_call( req ); + ret = !wine_server_call_err( req ); } SERVER_END_REQ; diff --git a/server/process.c b/server/process.c index d1407204718..9bde05dc942 100644 --- a/server/process.c +++ b/server/process.c @@ -678,6 +678,8 @@ struct process *create_process( int fd, struct process *parent, unsigned int fla process->desktop = 0; process->token = NULL; process->trace_data = 0; + process->rawinput_devices = NULL; + process->rawinput_device_count = 0; process->rawinput_mouse = NULL; process->rawinput_kbd = NULL; memset( &process->image_info, 0, sizeof(process->image_info) ); @@ -687,7 +689,6 @@ struct process *create_process( int fd, struct process *parent, unsigned int fla list_init( &process->asyncs ); list_init( &process->classes ); list_init( &process->views ); - list_init( &process->rawinput_devices ); process->end_time = 0; @@ -782,6 +783,7 @@ static void process_destroy( struct object *obj ) if (process->idle_event) release_object( process->idle_event ); if (process->id) free_ptid( process->id ); if (process->token) release_object( process->token ); + free( process->rawinput_devices ); free( process->dir_cache ); free( process->image ); } @@ -959,8 +961,6 @@ void kill_console_processes( struct thread *renderer, int exit_code ) /* a process has been killed (i.e. its last thread died) */ static void process_killed( struct process *process ) { - struct list *ptr; - assert( list_empty( &process->thread_list )); process->end_time = current_time; close_process_desktop( process ); @@ -972,12 +972,6 @@ static void process_killed( struct process *process ) process->idle_event = NULL; assert( !process->console ); - while ((ptr = list_head( &process->rawinput_devices ))) - { - struct rawinput_device_entry *entry = LIST_ENTRY( ptr, struct rawinput_device_entry, entry ); - list_remove( &entry->entry ); - free( entry ); - } destroy_process_classes( process ); free_mapped_views( process ); free_process_user_handles( process ); diff --git a/server/process.h b/server/process.h index 632faf9c4bf..97e0d455ece 100644 --- a/server/process.h +++ b/server/process.h @@ -33,12 +33,6 @@ enum startup_state { STARTUP_IN_PROGRESS, STARTUP_DONE, STARTUP_ABORTED }; /* process structures */ -struct rawinput_device_entry -{ - struct list entry; - struct rawinput_device device; -}; - struct process { struct object obj; /* object header */ @@ -85,7 +79,8 @@ struct process client_ptr_t ldt_copy; /* pointer to LDT copy in client addr space */ struct dir_cache *dir_cache; /* map of client-side directory cache */ unsigned int trace_data; /* opaque data used by the process tracing mechanism */ - struct list rawinput_devices;/* list of registered rawinput devices */ + struct rawinput_device *rawinput_devices; /* list of registered rawinput devices */ + unsigned int rawinput_device_count; /* number of registered rawinput devices */ const struct rawinput_device *rawinput_mouse; /* rawinput mouse device, if any */ const struct rawinput_device *rawinput_kbd; /* rawinput keyboard device, if any */ struct list kernel_object; /* list of kernel object pointers */ diff --git a/server/queue.c b/server/queue.c index 09636b762dd..d98d645065f 100644 --- a/server/queue.c +++ b/server/queue.c @@ -1532,40 +1532,19 @@ static user_handle_t find_hardware_message_window( struct desktop *desktop, stru return win; } -static struct rawinput_device_entry *find_rawinput_device( struct process *process, unsigned short usage_page, unsigned short usage ) +static struct rawinput_device *find_rawinput_device( struct process *process, unsigned short usage_page, unsigned short usage ) { - struct rawinput_device_entry *e; + struct rawinput_device *device, *end; - LIST_FOR_EACH_ENTRY( e, &process->rawinput_devices, struct rawinput_device_entry, entry ) + for (device = process->rawinput_devices, end = device + process->rawinput_device_count; device != end; device++) { - if (e->device.usage_page != usage_page || e->device.usage != usage) continue; - return e; + if (device->usage_page != usage_page || device->usage != usage) continue; + return device; } return NULL; } -static void update_rawinput_device(const struct rawinput_device *device) -{ - struct rawinput_device_entry *e; - - if (!(e = find_rawinput_device( current->process, device->usage_page, device->usage ))) - { - if (!(e = mem_alloc( sizeof(*e) ))) return; - list_add_tail( &current->process->rawinput_devices, &e->entry ); - } - - if (device->flags & RIDEV_REMOVE) - { - list_remove( &e->entry ); - free( e ); - return; - } - - e->device = *device; - e->device.target = get_user_full_handle( e->device.target ); -} - static void prepend_cursor_history( int x, int y, unsigned int time, lparam_t info ) { cursor_pos_t *pos = &cursor_history[--cursor_history_latest % ARRAY_SIZE(cursor_history)]; @@ -1714,7 +1693,6 @@ struct rawinput_message static int queue_rawinput_message( struct process* process, void *arg ) { const struct rawinput_message* raw_msg = arg; - const struct rawinput_device_entry *entry; const struct rawinput_device *device = NULL; struct desktop *target_desktop = NULL, *desktop = NULL; struct thread *target_thread = NULL, *foreground = NULL; @@ -1726,8 +1704,8 @@ static int queue_rawinput_message( struct process* process, void *arg ) device = process->rawinput_mouse; else if (raw_msg->data.rawinput.type == RIM_TYPEKEYBOARD) device = process->rawinput_kbd; - else if ((entry = find_rawinput_device( process, raw_msg->data.rawinput.hid.usage_page, raw_msg->data.rawinput.hid.usage ))) - device = &entry->device; + else + device = find_rawinput_device( process, raw_msg->data.rawinput.hid.usage_page, raw_msg->data.rawinput.hid.usage ); if (!device) return 0; if (raw_msg->message == WM_INPUT_DEVICE_CHANGE && !(device->flags & RIDEV_DEVNOTIFY)) return 0; @@ -3397,18 +3375,20 @@ DECL_HANDLER(get_rawinput_buffer) DECL_HANDLER(update_rawinput_devices) { - const struct rawinput_device *devices = get_req_data(); + const struct rawinput_device *tmp, *devices = get_req_data(); unsigned int device_count = get_req_data_size() / sizeof (*devices); - const struct rawinput_device_entry *e; - unsigned int i; + size_t size = device_count * sizeof(*devices); + struct process *process = current->process; - for (i = 0; i < device_count; ++i) + if (!(tmp = realloc( process->rawinput_devices, size ))) { - update_rawinput_device(&devices[i]); + set_error( STATUS_NO_MEMORY ); + return; } + process->rawinput_devices = (struct rawinput_device *)tmp; + process->rawinput_device_count = device_count; + memcpy( process->rawinput_devices, devices, size ); - e = find_rawinput_device( current->process, 1, 2 ); - current->process->rawinput_mouse = e ? &e->device : NULL; - e = find_rawinput_device( current->process, 1, 6 ); - current->process->rawinput_kbd = e ? &e->device : NULL; + process->rawinput_mouse = find_rawinput_device( process, 1, 2 ); + process->rawinput_kbd = find_rawinput_device( process, 1, 6 ); }

1 0

Rémi Bernon : maintainers: Assume maintainership of input sections.
by Alexandre Julliard 28 Jul '22

28 Jul '22

Module: wine Branch: master Commit: 4304a677c1c35443318cb067b90a83b81afec6ba URL: https://gitlab.winehq.org/wine/wine/-/commit/4304a677c1c35443318cb067b90a83… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jul 27 08:57:41 2022 +0200 maintainers: Assume maintainership of input sections. --- MAINTAINERS | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index ec871697dbf..5e853e939a9 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -160,8 +160,8 @@ M: Zebediah Figura <z.figura12(a)gmail.com> F: dlls/winegstreamer/ HID support -M: Aric Stewart <aric(a)codeweavers.com> -P: Rémi Bernon <rbernon(a)codeweavers.com> +M: Rémi Bernon <rbernon(a)codeweavers.com> +P: Aric Stewart <aric(a)codeweavers.com> F: dlls/hid/ F: dlls/hidclass.sys/ F: dlls/hidparse.sys/ @@ -173,9 +173,10 @@ F: dlls/httpapi/ F: dlls/http.sys/ Input events -P: Rémi Bernon <rbernon(a)codeweavers.com> +M: Rémi Bernon <rbernon(a)codeweavers.com> F: dlls/user32/input.c -F: dlls/user32/rawinput.c +F: dlls/win32u/input.c +F: dlls/win32u/rawinput.c F: server/queue.c Input methods @@ -193,6 +194,7 @@ F: dlls/windows.gaming.input/ F: dlls/winebus.sys/ F: dlls/winexinput.sys/ F: dlls/xinput*/ +F: dlls/winmm/joystick.c Media format conversion P: Andrew Eikum <coldpie(a)fastmail.com>

1 0

Nikolay Sivov : win32u: Fix typo in font handle creation in NtUserDrawCaptionTemp().
by Alexandre Julliard 28 Jul '22

28 Jul '22

Module: wine Branch: master Commit: d909f2759066afd128aa1a299d3367c7ab76da8f URL: https://gitlab.winehq.org/wine/wine/-/commit/d909f2759066afd128aa1a299d3367… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jul 28 22:23:19 2022 +0300 win32u: Fix typo in font handle creation in NtUserDrawCaptionTemp(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/win32u/defwnd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/win32u/defwnd.c b/dlls/win32u/defwnd.c index d271b5b9670..a409ad4a1e0 100644 --- a/dlls/win32u/defwnd.c +++ b/dlls/win32u/defwnd.c @@ -1650,7 +1650,7 @@ BOOL WINAPI NtUserDrawCaptionTemp( HWND hwnd, HDC hdc, const RECT *rect, HFONT f nclm.cbSize = sizeof(NONCLIENTMETRICSW); NtUserSystemParametersInfo( SPI_GETNONCLIENTMETRICS, 0, &nclm, 0 ); lf = (flags & DC_SMALLCAP) ? &nclm.lfSmCaptionFont : &nclm.lfCaptionFont; - new_font = NtGdiHfontCreate( &lf, sizeof(lf), 0, 0, NULL ); + new_font = NtGdiHfontCreate( lf, sizeof(*lf), 0, 0, NULL ); prev_font = NtGdiSelectFont( hdc, new_font ); }

1 0