October 2022 - Wine-Commits

Alexandre Julliard : makedep: Make the import library files architecture-generic.
by Alexandre Julliard Oct. 25, 2022

Oct. 25, 2022

Module: wine Branch: master Commit: 7bffe6d68ba7934d999f3b41d88de84f17123db3 URL: https://gitlab.winehq.org/wine/wine/-/commit/7bffe6d68ba7934d999f3b41d88de8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 25 11:07:45 2022 +0200 makedep: Make the import library files architecture-generic. --- tools/makedep.c | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 1968a4020e6..5dbbe2a0bb7 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -196,7 +196,6 @@ struct makefile const char *extlib; const char *sharedlib; const char *staticlib; - const char *staticimplib; const char *importlib; const char *unixlib; int native_unix_lib; @@ -221,12 +220,11 @@ struct makefile struct strarray font_files; struct strarray debug_files; struct strarray dlldata_files; - struct strarray implib_files; - struct strarray crossimplib_files; struct strarray all_targets; struct strarray phony_targets; struct strarray dependencies; struct strarray object_files[MAX_ARCHS]; + struct strarray implib_files[MAX_ARCHS]; struct strarray install_rules[NB_INSTALL_RULES]; }; @@ -1864,11 +1862,6 @@ static void add_generated_sources( struct makefile *make ) source->files_count = source->files_size = 0; source->files = NULL; } - if (source->file->flags & FLAG_C_IMPLIB) - { - if (!make->staticimplib && make->importlib && *dll_ext) - make->staticimplib = strmake( "lib%s.a", make->importlib ); - } if (strendswith( source->name, ".po" )) { if (!make->disabled) @@ -3051,7 +3044,7 @@ static void output_source_default( struct makefile *make, struct incl_file *sour if ((source->file->flags & FLAG_C_UNIX) && *dll_ext) strarray_add( &make->unixobj_files, strmake( "%s.o", obj )); else if (source->file->flags & FLAG_C_IMPLIB) - strarray_add( &make->implib_files, strmake( "%s.o", obj )); + strarray_add( &make->implib_files[0], strmake( "%s.o", obj )); else if (!is_dll_src) strarray_add( &make->object_files[0], strmake( "%s.o", obj )); else @@ -3079,7 +3072,7 @@ static void output_source_default( struct makefile *make, struct incl_file *sour if (need_cross) { if (source->file->flags & FLAG_C_IMPLIB) - strarray_add( &make->crossimplib_files, strmake( "%s.cross.o", obj )); + strarray_add( &make->implib_files[arch], strmake( "%s.cross.o", obj )); else if (!is_dll_src) strarray_add( &make->object_files[arch], strmake( "%s.cross.o", obj )); else @@ -3304,14 +3297,14 @@ static void output_import_lib( struct makefile *make, unsigned int arch ) output( " %s.delay.a", importlib_path ); } output( ": %s %s", tools_path( make, "winebuild" ), spec_file ); - output_filenames_obj_dir( make, arch ? make->crossimplib_files : make->implib_files ); + output_filenames_obj_dir( make, make->implib_files[arch] ); output( "\n" ); output( "\t%s%s -w --implib -o $@", cmd_prefix( "BUILD" ), tools_path( make, "winebuild" ) ); output_filenames( target_flags[arch] ); if (make->is_win16) output_filename( "-m16" ); output_filename( "--export" ); output_filename( spec_file ); - output_filenames_obj_dir( make, arch ? make->crossimplib_files : make->implib_files ); + output_filenames_obj_dir( make, make->implib_files[arch] ); output( "\n" ); add_install_rule( make, make->importlib, arch ? strmake( "lib%s.cross.a", make->importlib ) : strmake( "lib%s.a", make->importlib ), @@ -3763,11 +3756,10 @@ static void output_sources( struct makefile *make ) else if (!strcmp( make->obj_dir, "po" )) strarray_add( &make->distclean_files, "LINGUAS" ); - strarray_addall( &make->clean_files, make->implib_files ); - strarray_addall( &make->clean_files, make->crossimplib_files ); for (arch = 0; arch < archs.count; arch++) { strarray_addall_uniq( &make->clean_files, make->object_files[arch] ); + strarray_addall_uniq( &make->clean_files, make->implib_files[arch] ); } strarray_addall( &make->clean_files, make->unixobj_files ); strarray_addall( &make->clean_files, make->res_files );

1 0

Michael Stefaniuc : wmc: Use ARRAY_SIZE instead of open coding it.
by Alexandre Julliard Oct. 25, 2022

Oct. 25, 2022

Module: wine Branch: master Commit: 534a3082ef139b58828d9e41946093469ed50d06 URL: https://gitlab.winehq.org/wine/wine/-/commit/534a3082ef139b58828d9e41946093… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Jul 1 20:03:51 2022 +0200 wmc: Use ARRAY_SIZE instead of open coding it. --- tools/wmc/wmc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/wmc/wmc.c b/tools/wmc/wmc.c index 7ca339fbeef..f5ff7abcdf9 100644 --- a/tools/wmc/wmc.c +++ b/tools/wmc/wmc.c @@ -158,7 +158,7 @@ static void init_argv0_dir( const char *argv0 ) static int pathname[] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1 }; size_t path_size = PATH_MAX; char *path = xmalloc( path_size ); - if (!sysctl( pathname, sizeof(pathname)/sizeof(pathname[0]), path, &path_size, NULL, 0 )) + if (!sysctl( pathname, ARRAY_SIZE(pathname), path, &path_size, NULL, 0 )) dir = realpath( path, NULL ); free( path ); #else

1 0

Michael Stefaniuc : widl: Use ARRAY_SIZE instead of open coding it.
by Alexandre Julliard Oct. 25, 2022

Oct. 25, 2022

Module: wine Branch: master Commit: 7029bba31a9df08a7e188bbbd5e820b115a0a2fa URL: https://gitlab.winehq.org/wine/wine/-/commit/7029bba31a9df08a7e188bbbd5e820… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Jul 1 20:01:30 2022 +0200 widl: Use ARRAY_SIZE instead of open coding it. --- tools/widl/widl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/widl/widl.c b/tools/widl/widl.c index 7b2276b0a41..1a0b57f8f88 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -490,7 +490,7 @@ static void init_argv0_dir( const char *argv0 ) static int pathname[] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1 }; size_t path_size = PATH_MAX; char *path = xmalloc( path_size ); - if (!sysctl( pathname, sizeof(pathname)/sizeof(pathname[0]), path, &path_size, NULL, 0 )) + if (!sysctl( pathname, ARRAY_SIZE(pathname), path, &path_size, NULL, 0 )) dir = realpath( path, NULL ); free( path ); #else

1 0

Michael Stefaniuc : makedep: Use ARRAY_SIZE instead of open coding it.
by Alexandre Julliard Oct. 25, 2022

Oct. 25, 2022

Module: wine Branch: master Commit: 43eccadceb6dbdd2a7c31734e963effa3c678646 URL: https://gitlab.winehq.org/wine/wine/-/commit/43eccadceb6dbdd2a7c31734e963ef… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Oct 16 21:51:57 2022 +0200 makedep: Use ARRAY_SIZE instead of open coding it. --- tools/makedep.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 7100cacaf86..2395835ff72 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -402,7 +402,7 @@ static const char *normalize_arch( const char *arch ) { "arm" }, }; - for (i = 0; i < sizeof(map) / sizeof(map[0]); i++) + for (i = 0; i < ARRAY_SIZE(map); i++) for (j = 0; map[i][j]; j++) if (!strncmp( arch, map[i][j], strlen(map[i][j]) )) return map[i][0]; @@ -1201,7 +1201,7 @@ static struct file *load_file( const char *name ) input_file_name = file->name; input_line = 0; - for (i = 0; i < sizeof(parse_functions) / sizeof(parse_functions[0]); i++) + for (i = 0; i < ARRAY_SIZE(parse_functions); i++) { if (!strendswith( name, parse_functions[i].ext )) continue; parse_functions[i].parse( file, f ); @@ -2585,7 +2585,7 @@ static void output_uninstall_rules( struct makefile *make ) } strarray_qsort( &uninstall_dirs, cmp_string_length ); output( "\t-rmdir" ); - for (i = 0; i < sizeof(dirs_order)/sizeof(dirs_order[0]); i++) + for (i = 0; i < ARRAY_SIZE(dirs_order); i++) { for (j = 0; j < uninstall_dirs.count; j++) { @@ -2767,7 +2767,7 @@ static void output_source_idl( struct makefile *make, struct incl_file *source, if (find_include_file( make, strmake( "%s.h", obj ))) source->file->flags |= FLAG_IDL_HEADER; if (!source->file->flags) return; - for (i = 0; i < sizeof(idl_outputs) / sizeof(idl_outputs[0]); i++) + for (i = 0; i < ARRAY_SIZE(idl_outputs); i++) { if (!(source->file->flags & idl_outputs[i].flag)) continue; dest = strmake( "%s%s", obj, idl_outputs[i].ext ); @@ -4026,7 +4026,7 @@ static void output_silent_rules(void) unsigned int i; output( "V = 0\n" ); - for (i = 0; i < sizeof(cmds) / sizeof(cmds[0]); i++) + for (i = 0; i < ARRAY_SIZE(cmds); i++) { output( "quiet_%s = $(quiet_%s_$(V))\n", cmds[i], cmds[i] ); output( "quiet_%s_0 = @echo \" %-5s \" $@;\n", cmds[i], cmds[i] );

1 0

Michael Stefaniuc : winegcc: Use ARRAY_SIZE instead of open coding it.
by Alexandre Julliard Oct. 25, 2022

Oct. 25, 2022

Module: wine Branch: master Commit: b46eef7e2a12da77854700fb4e494b170fe10dae URL: https://gitlab.winehq.org/wine/wine/-/commit/b46eef7e2a12da77854700fb4e494b… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Jul 1 20:03:05 2022 +0200 winegcc: Use ARRAY_SIZE instead of open coding it. --- tools/winegcc/winegcc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index ab26adb07e8..e40aa9270ec 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -660,7 +660,7 @@ static void init_argv0_dir( const char *argv0 ) static int pathname[] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1 }; size_t path_size = PATH_MAX; char *path = xmalloc( path_size ); - if (!sysctl( pathname, sizeof(pathname)/sizeof(pathname[0]), path, &path_size, NULL, 0 )) + if (!sysctl( pathname, ARRAY_SIZE(pathname), path, &path_size, NULL, 0 )) dir = realpath( path, NULL ); free( path ); #else

1 0

Michael Stefaniuc : wrc: Use ARRAY_SIZE instead of open coding it.
by Alexandre Julliard Oct. 25, 2022

Oct. 25, 2022

Module: wine Branch: master Commit: 191bc277a1584c283a9e4a3c9059e6c4ce26482e URL: https://gitlab.winehq.org/wine/wine/-/commit/191bc277a1584c283a9e4a3c9059e6… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Jul 1 20:04:19 2022 +0200 wrc: Use ARRAY_SIZE instead of open coding it. --- tools/wrc/wrc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/wrc/wrc.c b/tools/wrc/wrc.c index c3dfa418571..2448fff11eb 100644 --- a/tools/wrc/wrc.c +++ b/tools/wrc/wrc.c @@ -302,7 +302,7 @@ static void init_argv0_dir( const char *argv0 ) static int pathname[] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1 }; size_t path_size = PATH_MAX; char *path = xmalloc( path_size ); - if (!sysctl( pathname, sizeof(pathname)/sizeof(pathname[0]), path, &path_size, NULL, 0 )) + if (!sysctl( pathname, ARRAY_SIZE(pathname), path, &path_size, NULL, 0 )) dir = realpath( path, NULL ); free( path ); #else

1 0

Michael Stefaniuc : loader: Use ARRAY_SIZE instead of open coding it.
by Alexandre Julliard Oct. 25, 2022

Oct. 25, 2022

Module: wine Branch: master Commit: af996344a815baa1278d32181ddfda5e889a16d9 URL: https://gitlab.winehq.org/wine/wine/-/commit/af996344a815baa1278d32181ddfda… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Oct 18 19:02:59 2022 +0200 loader: Use ARRAY_SIZE instead of open coding it. --- loader/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/loader/main.c b/loader/main.c index 242ff15accd..36e1f5f0967 100644 --- a/loader/main.c +++ b/loader/main.c @@ -90,7 +90,7 @@ static const char *get_self_exe( char *argv0 ) static int pathname[] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1 }; size_t path_size = PATH_MAX; char *path = malloc( path_size ); - if (path && !sysctl( pathname, sizeof(pathname)/sizeof(pathname[0]), path, &path_size, NULL, 0 )) + if (path && !sysctl( pathname, ARRAY_SIZE( pathname ), path, &path_size, NULL, 0 )) return path; free( path ); #endif

1 0

Michael Stefaniuc : server: Use ARRAY_SIZE instead of open coding it.
by Alexandre Julliard Oct. 25, 2022

Oct. 25, 2022

Module: wine Branch: master Commit: c2d800f1dbf83c8f0599db6d831e3246eb89fee3 URL: https://gitlab.winehq.org/wine/wine/-/commit/c2d800f1dbf83c8f0599db6d831e32… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Oct 18 19:01:11 2022 +0200 server: Use ARRAY_SIZE instead of open coding it. --- server/unicode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/unicode.c b/server/unicode.c index 86a1217b01f..edb296be0c8 100644 --- a/server/unicode.c +++ b/server/unicode.c @@ -249,7 +249,7 @@ static char *get_nls_dir(void) dir = malloc( dir_size ); if (dir) { - if (sysctl( pathname, sizeof(pathname)/sizeof(pathname[0]), dir, &dir_size, NULL, 0 )) + if (sysctl( pathname, ARRAY_SIZE( pathname ), dir, &dir_size, NULL, 0 )) { free( dir ); dir = NULL;

1 0

Michael Stefaniuc : libs/wine: Use ARRAY_SIZE instead of open coding it.
by Alexandre Julliard Oct. 25, 2022

Oct. 25, 2022

Module: wine Branch: master Commit: 24a7497bab1a8c0ab3b0575f21e42726603e1b17 URL: https://gitlab.winehq.org/wine/wine/-/commit/24a7497bab1a8c0ab3b0575f21e427… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Oct 18 19:04:49 2022 +0200 libs/wine: Use ARRAY_SIZE instead of open coding it. --- libs/wine/config.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/wine/config.c b/libs/wine/config.c index 23c76fda128..4eb446258cc 100644 --- a/libs/wine/config.c +++ b/libs/wine/config.c @@ -147,7 +147,7 @@ static char *get_runtime_exedir(void) static int pathname[] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1 }; size_t dir_size = PATH_MAX; char *dir = malloc( dir_size ); - if (dir && !sysctl( pathname, sizeof(pathname)/sizeof(pathname[0]), dir, &dir_size, NULL, 0 )) + if (dir && !sysctl( pathname, ARRAY_SIZE( pathname ), dir, &dir_size, NULL, 0 )) return dir; free( dir ); return NULL;

1 0

Michael Stefaniuc : ntdll: Use ARRAY_SIZE instead of open coding it.
by Alexandre Julliard Oct. 25, 2022

Oct. 25, 2022

Module: wine Branch: master Commit: f5c573b199f3a6dfa57c59393fd7bf940774cf15 URL: https://gitlab.winehq.org/wine/wine/-/commit/f5c573b199f3a6dfa57c59393fd7bf… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Jul 1 19:56:55 2022 +0200 ntdll: Use ARRAY_SIZE instead of open coding it. --- dlls/ntdll/unix/loader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index c21d32ea811..0ed7a524db6 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -635,7 +635,7 @@ static void init_paths( char *argv[] ) static int pathname[] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1 }; size_t path_size = PATH_MAX; char *path = malloc( path_size ); - if (path && !sysctl( pathname, sizeof(pathname)/sizeof(pathname[0]), path, &path_size, NULL, 0 )) + if (path && !sysctl( pathname, ARRAY_SIZE(pathname), path, &path_size, NULL, 0 )) bin_dir = realpath_dirname( path ); free( path ); }

1 0