wine-commits October 2022

wine-commits@winehq.org

1 participants
537 discussions

Gabriel Ivăncescu : mshtml: Get rid of the outer window in basedoc.
by Alexandre Julliard 25 Oct '22

25 Oct '22

Module: wine Branch: master Commit: 155969dcc9e225234b02e44440d8e23e38b6bf49 URL: https://gitlab.winehq.org/wine/wine/-/commit/155969dcc9e225234b02e44440d8e2… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Oct 25 16:54:02 2022 +0300 mshtml: Get rid of the outer window in basedoc. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/editor.c | 20 ++++++++++---------- dlls/mshtml/htmlanchor.c | 6 +++--- dlls/mshtml/htmldoc.c | 44 ++++++++++++++++++++++---------------------- dlls/mshtml/htmlframe.c | 6 +++--- dlls/mshtml/mshtml_private.h | 4 ++-- dlls/mshtml/mutation.c | 6 +++--- dlls/mshtml/nsembed.c | 2 +- dlls/mshtml/nsevents.c | 10 +++++----- dlls/mshtml/olecmd.c | 10 +++++----- dlls/mshtml/oleobj.c | 32 ++++++++++++++++---------------- dlls/mshtml/persist.c | 34 +++++++++++++++++----------------- dlls/mshtml/pluginhost.c | 4 ++-- dlls/mshtml/range.c | 2 +- dlls/mshtml/secmgr.c | 8 ++++---- 14 files changed, 94 insertions(+), 94 deletions(-)

1 0

Gabriel Ivăncescu : mshtml: Get rid of the outer_unk in basedoc.
by Alexandre Julliard 25 Oct '22

25 Oct '22

Module: wine Branch: master Commit: 46d4d263ba3de8d96285c4ab065eaccdef36af70 URL: https://gitlab.winehq.org/wine/wine/-/commit/46d4d263ba3de8d96285c4ab065eac… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Oct 25 16:54:02 2022 +0300 mshtml: Get rid of the outer_unk in basedoc. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmldoc.c | 91 ++++++++++++++++--------------- dlls/mshtml/htmlnode.c | 8 +-- dlls/mshtml/htmlwindow.c | 6 +-- dlls/mshtml/mshtml_private.h | 18 +------ dlls/mshtml/mutation.c | 10 ++-- dlls/mshtml/nsevents.c | 4 +- dlls/mshtml/olecmd.c | 12 ++--- dlls/mshtml/oleobj.c | 126 +++++++++++++++++++++---------------------- dlls/mshtml/persist.c | 72 ++++++++++++------------- dlls/mshtml/script.c | 2 +- dlls/mshtml/service.c | 12 ++--- dlls/mshtml/view.c | 16 +++--- 12 files changed, 180 insertions(+), 197 deletions(-)

1 0

Gabriel Ivăncescu : mshtml: Move the IDispatchEx interface out of basedoc.
by Alexandre Julliard 25 Oct '22

25 Oct '22

Module: wine Branch: master Commit: f852f1a6137d31e4537acc89ee4dd5a0bc79aa61 URL: https://gitlab.winehq.org/wine/wine/-/commit/f852f1a6137d31e4537acc89ee4dd5… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Oct 25 16:54:01 2022 +0300 mshtml: Move the IDispatchEx interface out of basedoc. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/dispex.c | 5 +- dlls/mshtml/htmldoc.c | 177 +++++++++++++++++++------------------------ dlls/mshtml/htmlwindow.c | 2 +- dlls/mshtml/mshtml_private.h | 10 +-- dlls/mshtml/oleobj.c | 153 +++++++++++++++++++++++++++++++++++-- 5 files changed, 229 insertions(+), 118 deletions(-)

1 0

Jinoh Kang : user32/tests: Test for window exposure behaviours.
by Alexandre Julliard 25 Oct '22

25 Oct '22

Module: wine Branch: master Commit: 5005bb970f14745ff0fe70d5d02d87013f543136 URL: https://gitlab.winehq.org/wine/wine/-/commit/5005bb970f14745ff0fe70d5d02d87… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Mon Jun 13 02:22:57 2022 +0900 user32/tests: Test for window exposure behaviours. --- dlls/user32/tests/msg.c | 382 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 382 insertions(+)

1 0

Esme Povirk : mscoree: Update Wine Mono to 7.4.0.
by Alexandre Julliard 25 Oct '22

25 Oct '22

Module: wine Branch: master Commit: 4493b10d17ecff23f483ed486127a123e90b3cc2 URL: https://gitlab.winehq.org/wine/wine/-/commit/4493b10d17ecff23f483ed486127a1… Author: Esme Povirk <esme(a)codeweavers.com> Date: Sat Oct 22 16:02:38 2022 -0500 mscoree: Update Wine Mono to 7.4.0. --- dlls/appwiz.cpl/addons.c | 4 ++-- dlls/mscoree/mscoree_private.h | 2 +- tools/gitlab/test.yml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index 88a830de2eb..b815ffbb5cb 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -58,10 +58,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(appwizcpl); #define GECKO_SHA "???" #endif -#define MONO_VERSION "7.3.0" +#define MONO_VERSION "7.4.0" #if defined(__i386__) || defined(__x86_64__) #define MONO_ARCH "x86" -#define MONO_SHA "939e2f5669720d0d0fc7e305426622a11a33b7ae385c4d7e581e29ea264e22ff" +#define MONO_SHA "6413ff328ebbf7ec7689c648feb3546d8102ded865079d1fbf0331b14b3ab0ec" #else #define MONO_ARCH "" #define MONO_SHA "???" diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index 0e51e0b3d7f..71e943d34c3 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -45,7 +45,7 @@ extern HRESULT assembly_get_runtime_version(ASSEMBLY *assembly, LPSTR *version) extern HRESULT assembly_get_vtable_fixups(ASSEMBLY *assembly, VTableFixup **fixups, DWORD *count) DECLSPEC_HIDDEN; extern HRESULT assembly_get_native_entrypoint(ASSEMBLY *assembly, NativeEntryPointFunc *func) DECLSPEC_HIDDEN; -#define WINE_MONO_VERSION "7.3.0" +#define WINE_MONO_VERSION "7.4.0" /* Mono embedding */ typedef struct _MonoDomain MonoDomain; diff --git a/tools/gitlab/test.yml b/tools/gitlab/test.yml index 66079527be5..d2b1966ad6e 100644 --- a/tools/gitlab/test.yml +++ b/tools/gitlab/test.yml @@ -7,7 +7,7 @@ variables: GIT_STRATEGY: none GECKO_VER: 2.47.3 - MONO_VER: 7.3.0 + MONO_VER: 7.4.0 cache: - key: wine-gecko-$GECKO_VER paths:

1 0

Alexandre Julliard : makedep: Make the resource files architecture-generic.
by Alexandre Julliard 25 Oct '22

25 Oct '22

Module: wine Branch: master Commit: 6c65fb9cb3975d35d2d8d3f3f9d0590043a618ec URL: https://gitlab.winehq.org/wine/wine/-/commit/6c65fb9cb3975d35d2d8d3f3f9d059… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 25 11:09:57 2022 +0200 makedep: Make the resource files architecture-generic. --- tools/makedep.c | 39 ++++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index a6e053646db..68bba96d5df 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -216,7 +216,6 @@ struct makefile struct strarray maintainerclean_files; struct strarray uninstall_files; struct strarray unixobj_files; - struct strarray res_files; struct strarray font_files; struct strarray debug_files; struct strarray dlldata_files; @@ -224,6 +223,7 @@ struct makefile struct strarray dependencies; struct strarray object_files[MAX_ARCHS]; struct strarray implib_files[MAX_ARCHS]; + struct strarray res_files[MAX_ARCHS]; struct strarray all_targets[MAX_ARCHS]; struct strarray install_rules[NB_INSTALL_RULES]; }; @@ -2693,19 +2693,19 @@ static void output_source_h( struct makefile *make, struct incl_file *source, co static void output_source_rc( struct makefile *make, struct incl_file *source, const char *obj ) { struct strarray defines = get_source_defines( make, source, obj ); - const char *po_dir = NULL; - unsigned int i; + const char *po_dir = NULL, *res_file = strmake( "%s.res", obj ); + unsigned int i, arch; if (source->file->flags & FLAG_RC_HEADER) return; if (source->file->flags & FLAG_GENERATED) strarray_add( &make->clean_files, source->name ); if (linguas.count && (source->file->flags & FLAG_RC_PO)) po_dir = "po"; - strarray_add( &make->res_files, strmake( "%s.res", obj )); + for (arch = 0; arch < archs.count; arch++) strarray_add( &make->res_files[arch], res_file ); if (source->file->flags & FLAG_RC_PO) { strarray_add( &make->pot_files, strmake( "%s.pot", obj )); output( "%s.pot ", obj_dir_path( make, obj ) ); } - output( "%s.res: %s", obj_dir_path( make, obj ), source->filename ); + output( "%s: %s", obj_dir_path( make, res_file ), source->filename ); output_filename( tools_path( make, "wrc" )); if (make->src_dir) output_filename( "nls/locale.nls" ); output_filenames( source->dependencies ); @@ -2719,7 +2719,7 @@ static void output_source_rc( struct makefile *make, struct incl_file *source, c output( "\n" ); if (po_dir) { - output( "%s.res:", obj_dir_path( make, obj )); + output( "%s:", obj_dir_path( make, res_file )); for (i = 0; i < linguas.count; i++) output_filename( strmake( "%s/%s.mo", po_dir, linguas.str[i] )); output( "\n" ); @@ -2732,10 +2732,11 @@ static void output_source_rc( struct makefile *make, struct incl_file *source, c */ static void output_source_mc( struct makefile *make, struct incl_file *source, const char *obj ) { - unsigned int i; + unsigned int i, arch; char *obj_path = obj_dir_path( make, obj ); + char *res_file = strmake( "%s.res", obj ); - strarray_add( &make->res_files, strmake( "%s.res", obj )); + for (arch = 0; arch < archs.count; arch++) strarray_add( &make->res_files[arch], res_file ); strarray_add( &make->pot_files, strmake( "%s.pot", obj )); output( "%s.pot %s.res: %s", obj_path, obj_path, source->filename ); output_filename( tools_path( make, "wmc" )); @@ -2759,7 +2760,7 @@ static void output_source_mc( struct makefile *make, struct incl_file *source, c */ static void output_source_res( struct makefile *make, struct incl_file *source, const char *obj ) { - strarray_add( &make->res_files, source->name ); + strarray_add( &make->res_files[source->arch], source->name ); } @@ -3033,7 +3034,7 @@ static void output_source_spec( struct makefile *make, struct incl_file *source, output_file = obj_dir_path( make, dll_name ); strarray_add( &make->clean_files, dll_name ); - strarray_add( &make->res_files, strmake( "%s.res", obj )); + strarray_add( &make->res_files[arch], strmake( "%s.res", obj )); output( "%s.res:", obj_dir_path( make, obj )); output_filename( obj_dir_path( make, dll_name )); output_filename( tools_path( make, "wrc" )); @@ -3258,7 +3259,7 @@ static void output_module( struct makefile *make, unsigned int arch ) output( "%s:", obj_dir_path( make, module_name )); if (spec_file) output_filename( spec_file ); output_filenames_obj_dir( make, make->object_files[arch] ); - output_filenames_obj_dir( make, make->res_files ); + output_filenames_obj_dir( make, make->res_files[arch] ); output_filenames( dep_libs ); output_filename( tools_path( make, "winebuild" )); output_filename( tools_path( make, "winegcc" )); @@ -3272,7 +3273,7 @@ static void output_module( struct makefile *make, unsigned int arch ) } output_filenames( make->extradllflags ); output_filenames_obj_dir( make, make->object_files[arch] ); - output_filenames_obj_dir( make, make->res_files ); + output_filenames_obj_dir( make, make->res_files[arch] ); debug_file = get_debug_file( make, make->module, arch ); if (debug_file) output_filename( strmake( "-Wl,--debug-file,%s", obj_dir_path( make, debug_file ))); output_filenames( all_libs ); @@ -3302,7 +3303,7 @@ static void output_fake_module( struct makefile *make, unsigned int arch ) output( "%s:", obj_dir_path( make, make->module )); if (spec_file) output_filename( spec_file ); - output_filenames_obj_dir( make, make->res_files ); + output_filenames_obj_dir( make, make->res_files[arch] ); output_filename( tools_path( make, "winebuild" )); output_filename( tools_path( make, "winegcc" )); output( "\n" ); @@ -3314,7 +3315,7 @@ static void output_fake_module( struct makefile *make, unsigned int arch ) output_filename( spec_file ); } output_filenames( make->extradllflags ); - output_filenames_obj_dir( make, make->res_files ); + output_filenames_obj_dir( make, make->res_files[arch] ); output( "\n" ); } @@ -3503,7 +3504,7 @@ static void output_test_module( struct makefile *make, unsigned int arch ) output_winegcc_command( make, arch ); output_filenames( make->extradllflags ); output_filenames_obj_dir( make, make->object_files[arch] ); - output_filenames_obj_dir( make, make->res_files ); + output_filenames_obj_dir( make, make->res_files[arch] ); if ((debug_file = get_debug_file( make, testmodule, arch ))) output_filename( strmake( "-Wl,--debug-file,%s", obj_dir_path( make, debug_file ))); output_filenames( all_libs ); @@ -3515,13 +3516,13 @@ static void output_test_module( struct makefile *make, unsigned int arch ) output_filename( strmake( "-Wb,-F,%s", testmodule )); output_filenames( make->extradllflags ); output_filenames_obj_dir( make, make->object_files[arch] ); - output_filenames_obj_dir( make, make->res_files ); + output_filenames_obj_dir( make, make->res_files[arch] ); output_filenames( all_libs ); output_filename( arch ? "$(CROSSLDFLAGS)" : "$(LDFLAGS)" ); output( "\n" ); output( "%s%s %s%s:", obj_dir_path( make, testmodule ), ext, obj_dir_path( make, stripped ), ext ); output_filenames_obj_dir( make, make->object_files[arch] ); - output_filenames_obj_dir( make, make->res_files ); + output_filenames_obj_dir( make, make->res_files[arch] ); output_filenames( dep_libs ); output_filename( tools_path( make, "winebuild" )); output_filename( tools_path( make, "winegcc" )); @@ -3752,7 +3753,7 @@ static void output_sources( struct makefile *make ) if (submakes[i]->testdll && !submakes[i]->disabled) strarray_add( &tests, submakes[i]->testdll ); for (i = 0; i < tests.count; i++) - strarray_add( &make->res_files, replace_extension( tests.str[i], ".dll", "_test.res" )); + strarray_add( &make->res_files[arch], replace_extension( tests.str[i], ".dll", "_test.res" )); } if (make->dlldata_files.count) @@ -3807,10 +3808,10 @@ static void output_sources( struct makefile *make ) { strarray_addall_uniq( &make->clean_files, make->object_files[arch] ); strarray_addall_uniq( &make->clean_files, make->implib_files[arch] ); + strarray_addall_uniq( &make->clean_files, make->res_files[arch] ); strarray_addall_uniq( &make->clean_files, make->all_targets[arch] ); } strarray_addall( &make->clean_files, make->unixobj_files ); - strarray_addall( &make->clean_files, make->res_files ); strarray_addall( &make->clean_files, make->pot_files ); strarray_addall( &make->clean_files, make->debug_files );

1 0

Alexandre Julliard : makedep: Add support for architecture-specific IDL objects.
by Alexandre Julliard 25 Oct '22

25 Oct '22

Module: wine Branch: master Commit: 6fb5e4d99acfe6fb6c660484e2c008f823409409 URL: https://gitlab.winehq.org/wine/wine/-/commit/6fb5e4d99acfe6fb6c660484e2c008… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 25 11:08:56 2022 +0200 makedep: Add support for architecture-specific IDL objects. --- tools/makedep.c | 88 +++++++++++++++++++++++++++++++++++++++------------------ 1 file changed, 60 insertions(+), 28 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index c7a9199fcf6..a6e053646db 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -115,7 +115,6 @@ static const struct { FLAG_IDL_PROXY, "_p.c" }, { FLAG_IDL_SERVER, "_s.c" }, { FLAG_IDL_REGISTER, "_r.res" }, - { FLAG_IDL_HEADER, ".h" } }; #define HASH_SIZE 197 @@ -2770,20 +2769,15 @@ static void output_source_res( struct makefile *make, struct incl_file *source, static void output_source_idl( struct makefile *make, struct incl_file *source, const char *obj ) { struct strarray defines = get_source_defines( make, source, obj ); - struct strarray targets = empty_strarray; - char *dest; - unsigned int i; + struct strarray headers = empty_strarray; + struct strarray multiarch_targets[MAX_ARCHS] = { empty_strarray }; + const char *dest; + unsigned int i, arch; + int multiarch; if (find_include_file( make, strmake( "%s.h", obj ))) source->file->flags |= FLAG_IDL_HEADER; if (!source->file->flags) return; - 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 ); - if (!find_src_file( make, dest )) strarray_add( &make->clean_files, dest ); - strarray_add( &targets, dest ); - } if (source->file->flags & FLAG_IDL_PROXY) strarray_add( &make->dlldata_files, source->name ); if (source->file->flags & FLAG_INSTALL) { @@ -2793,28 +2787,66 @@ static void output_source_idl( struct makefile *make, struct incl_file *source, add_install_rule( make, source->name, strmake( "%s.h", obj ), strmake( "d$(includedir)/wine/%s.h", get_include_install_path( obj ) )); } - if (!targets.count) return; + if (source->file->flags & FLAG_IDL_HEADER) + { + dest = strmake( "%s.h", obj ); + strarray_add( &headers, dest ); + if (!find_src_file( make, dest )) strarray_add( &make->clean_files, dest ); + } - output_filenames_obj_dir( make, targets ); - output( ": %s\n", tools_path( make, "widl" )); - output( "\t%s%s -o $@", cmd_prefix( "WIDL" ), tools_path( make, "widl" ) ); - output_filenames( target_flags[0] ); - output_filename( "--nostdinc" ); - output_filename( "-Ldlls/\\*" ); - output_filenames( defines ); - output_filenames( get_expanded_make_var_array( make, "EXTRAIDLFLAGS" )); - output_filenames( get_expanded_file_local_var( make, obj, "EXTRAIDLFLAGS" )); + for (i = 0; i < ARRAY_SIZE(idl_outputs); i++) + { + if (!(source->file->flags & idl_outputs[i].flag)) continue; + multiarch = (make->use_msvcrt && archs.count > 1); + for (arch = 0; arch < archs.count; arch++) + { + if (!arch != !multiarch) continue; + dest = strmake( "%s%s", obj, idl_outputs[i].ext ); + if (!find_src_file( make, dest )) strarray_add( &make->clean_files, dest ); + strarray_add( &multiarch_targets[arch], dest ); + } + } + + for (arch = 0; arch < archs.count; arch++) + { + if (multiarch_targets[arch].count + (arch ? 0 : headers.count) == 0) continue; + if (!arch) output_filenames_obj_dir( make, headers ); + output_filenames_obj_dir( make, multiarch_targets[arch] ); + output( ":\n" ); + output( "\t%s%s -o $@", cmd_prefix( "WIDL" ), tools_path( make, "widl" ) ); + output_filenames( target_flags[arch] ); + output_filename( "--nostdinc" ); + output_filename( "-Ldlls/\\*" ); + output_filenames( defines ); + output_filenames( get_expanded_make_var_array( make, "EXTRAIDLFLAGS" )); + output_filenames( get_expanded_file_local_var( make, obj, "EXTRAIDLFLAGS" )); + output_filename( source->filename ); + output( "\n" ); + } + + output_filenames_obj_dir( make, headers ); + for (arch = 0; arch < archs.count; arch++) output_filenames_obj_dir( make, multiarch_targets[arch] ); + output( ":" ); + output_filename( tools_path( make, "widl" )); output_filename( source->filename ); - output( "\n" ); - output_filenames_obj_dir( make, targets ); - output( ": %s", source->filename ); output_filenames( source->dependencies ); - for (i = 0; i < source->importlibdeps.count; i++) + output( "\n" ); + + if (source->importlibdeps.count) { - struct makefile *submake = find_importlib_module( source->importlibdeps.str[i] ); - output_filename( obj_dir_path( submake, submake->module )); + for (arch = 0; arch < archs.count; arch++) + { + if (!multiarch_targets[arch].count) continue; + output_filenames_obj_dir( make, multiarch_targets[arch] ); + output( ":" ); + for (i = 0; i < source->importlibdeps.count; i++) + { + struct makefile *submake = find_importlib_module( source->importlibdeps.str[i] ); + output_filename( obj_dir_path( submake, submake->module )); + } + output( "\n" ); + } } - output( "\n" ); }

1 0

Alexandre Julliard : makedep: Add support for architecture-specific sources.
by Alexandre Julliard 25 Oct '22

25 Oct '22

Module: wine Branch: master Commit: 2094dd96e6bd41a141ea7ff0e08371b824a0e3ee URL: https://gitlab.winehq.org/wine/wine/-/commit/2094dd96e6bd41a141ea7ff0e08371… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 25 11:08:26 2022 +0200 makedep: Add support for architecture-specific sources. --- tools/makedep.c | 128 +++++++++++++++++++++++++++++++------------------------- 1 file changed, 71 insertions(+), 57 deletions(-)

1 0

Alexandre Julliard : makedep: Make the makefile targets architecture-generic.
by Alexandre Julliard 25 Oct '22

25 Oct '22

Module: wine Branch: master Commit: 718c57cab437c9928ea70d2aa28c09b8fc04453b URL: https://gitlab.winehq.org/wine/wine/-/commit/718c57cab437c9928ea70d2aa28c09… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 25 11:08:06 2022 +0200 makedep: Make the makefile targets architecture-generic. --- tools/makedep.c | 45 ++++++++++++++++++++++++--------------------- 1 file changed, 24 insertions(+), 21 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 5dbbe2a0bb7..9d843b01357 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -220,11 +220,11 @@ struct makefile struct strarray font_files; struct strarray debug_files; struct strarray dlldata_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 all_targets[MAX_ARCHS]; struct strarray install_rules[NB_INSTALL_RULES]; }; @@ -2438,7 +2438,7 @@ static void output_srcdir_symlink( struct makefile *make, const char *obj ) src_name = concat_paths( get_relative_path( make->obj_dir, "" ), src_name ); output_symlink_rule( src_name, dst_file, 0 ); - strarray_add( &make->all_targets, obj ); + strarray_add( &make->all_targets[0], obj ); } @@ -2667,7 +2667,7 @@ static void output_source_l( struct makefile *make, struct incl_file *source, co static void output_source_h( struct makefile *make, struct incl_file *source, const char *obj ) { if (source->file->flags & FLAG_GENERATED) - strarray_add( &make->all_targets, source->name ); + strarray_add( &make->all_targets[0], source->name ); else if ((source->file->flags & FLAG_INSTALL) || strncmp( source->name, "wine/", 5 )) add_install_rule( make, source->name, source->name, strmake( "D$(includedir)/wine/%s", get_include_install_path( source->name ) )); @@ -2855,7 +2855,7 @@ static void output_source_sfd( struct makefile *make, struct incl_file *source, char *font = strtok( xstrdup(array->str[i]), " \t" ); char *args = strtok( NULL, "" ); - strarray_add( &make->all_targets, xstrdup( font )); + strarray_add( &make->all_targets[0], xstrdup( font )); output( "%s: %s %s\n", obj_dir_path( make, font ), tools_path( make, "sfnt2fon" ), ttf_file ); output( "\t%s%s -q -o $@ %s %s\n", cmd_prefix( "GEN" ), @@ -2919,7 +2919,7 @@ static void output_source_po( struct makefile *make, struct incl_file *source, c { output( "%s.mo: %s\n", obj_dir_path( make, obj ), source->filename ); output( "\t%s%s -o $@ %s\n", cmd_prefix( "MSG" ), msgfmt, source->filename ); - strarray_add( &make->all_targets, strmake( "%s.mo", obj )); + strarray_add( &make->all_targets[0], strmake( "%s.mo", obj )); } @@ -2952,7 +2952,7 @@ static void output_source_in( struct makefile *make, struct incl_file *source, c free( dir ); } strarray_add( &make->in_files, xstrdup(obj) ); - strarray_add( &make->all_targets, xstrdup(obj) ); + strarray_add( &make->all_targets[0], xstrdup(obj) ); output( "%s: %s\n", obj_dir_path( make, obj ), source->filename ); output( "\t%s%s %s >$@ || (rm -f $@ && false)\n", cmd_prefix( "SED" ), sed_cmd, source->filename ); output( "%s:", obj_dir_path( make, obj )); @@ -3197,7 +3197,7 @@ static void output_module( struct makefile *make, unsigned int arch ) strchr( make->delayimports.str[i], '.' ) ? "" : ".dll" )); } } - strarray_add( &make->all_targets, module_name ); + strarray_add( &make->all_targets[arch], module_name ); if (make->data_only) add_install_rule( make, make->module, module_name, @@ -3250,7 +3250,7 @@ static void output_fake_module( struct makefile *make, unsigned int arch ) if (!make->is_exe) spec_file = src_dir_path( make, replace_extension( make->module, ".dll", ".spec" )); - strarray_add( &make->all_targets, make->module ); + strarray_add( &make->all_targets[arch], make->module ); add_install_rule( make, make->module, make->module, strmake( "d%s%s", arch_install_dirs[arch], make->module )); @@ -3337,7 +3337,7 @@ static void output_unix_lib( struct makefile *make ) } else unix_libs = add_unix_libraries( make, &unix_deps ); - strarray_add( &make->all_targets, make->unixlib ); + strarray_add( &make->all_targets[arch], make->unixlib ); add_install_rule( make, make->module, make->unixlib, strmake( "p%s%s", arch_install_dirs[arch], make->unixlib )); output( "%s:", obj_dir_path( make, make->unixlib )); @@ -3428,7 +3428,7 @@ static void output_shared_lib( struct makefile *make ) add_install_rule( make, names.str[i], names.str[i-1], strmake( "y%s%s", arch_install_dirs[arch], names.str[i] )); } - strarray_addall( &make->all_targets, names ); + strarray_addall( &make->all_targets[arch], names ); } @@ -3450,7 +3450,7 @@ static void output_test_module( struct makefile *make, unsigned int arch ) strarray_addall( &all_libs, add_import_libs( make, &dep_libs, make->imports, IMPORT_TYPE_DIRECT, arch ) ); strarray_addall( &all_libs, add_import_libs( make, &dep_libs, default_imports, IMPORT_TYPE_DEFAULT, arch ) ); - strarray_add( &make->all_targets, strmake( "%s%s", testmodule, ext )); + strarray_add( &make->all_targets[arch], strmake( "%s%s", testmodule, ext )); strarray_add( &make->clean_files, strmake( "%s%s", stripped, ext )); output_file = strmake( "%s%s", obj_dir_path( make, testmodule ), ext ); output( "%s:\n", output_file ); @@ -3541,14 +3541,14 @@ static void output_programs( struct makefile *make ) output_filenames( all_libs ); output_filename( "$(LDFLAGS)" ); output( "\n" ); - strarray_add( &make->all_targets, program ); + strarray_add( &make->all_targets[arch], program ); for (j = 0; j < symlinks.count; j++) { output( "%s: %s\n", obj_dir_path( make, symlinks.str[j] ), obj_dir_path( make, program )); output_symlink_rule( program, obj_dir_path( make, symlinks.str[j] ), 0 ); } - strarray_addall( &make->all_targets, symlinks ); + strarray_addall( &make->all_targets[arch], symlinks ); add_install_rule( make, program, program_installed ? program_installed : program, strmake( "p$(bindir)/%s", program )); @@ -3573,11 +3573,11 @@ static void output_subdirs( struct makefile *make ) struct strarray install_deps[NB_INSTALL_RULES] = { empty_strarray }; struct strarray tooldeps_deps = empty_strarray; struct strarray buildtest_deps = empty_strarray; - unsigned int i, j; + unsigned int i, j, arch; strarray_addall( &clean_files, make->clean_files ); strarray_addall( &distclean_files, make->distclean_files ); - strarray_addall( &all_targets, make->all_targets ); + for (arch = 0; arch < archs.count; arch++) strarray_addall( &all_targets, make->all_targets[arch] ); for (i = 0; i < subdirs.count; i++) { strarray_add( &makefile_deps, src_dir_path( submakes[i], "Makefile.in" )); @@ -3592,7 +3592,8 @@ static void output_subdirs( struct makefile *make ) if (submakes[i]->disabled) continue; - strarray_addall_path( &all_targets, submakes[i]->obj_dir, submakes[i]->all_targets ); + for (arch = 0; arch < archs.count; arch++) + strarray_addall_path( &all_targets, submakes[i]->obj_dir, submakes[i]->all_targets[arch] ); strarray_addall_path( &all_targets, submakes[i]->obj_dir, submakes[i]->font_files ); if (!strcmp( submakes[i]->obj_dir, "tools" ) || !strncmp( submakes[i]->obj_dir, "tools/", 6 )) strarray_add( &tooldeps_deps, obj_dir_path( submakes[i], "all" )); @@ -3745,7 +3746,7 @@ static void output_sources( struct makefile *make ) if (strarray_exists( &make->dependencies, obj_dir_path( make, make->extra_targets.str[i] ))) strarray_add( &make->clean_files, make->extra_targets.str[i] ); else - strarray_add( &make->all_targets, make->extra_targets.str[i] ); + strarray_add( &make->all_targets[0], make->extra_targets.str[i] ); if (!make->src_dir) strarray_add( &make->distclean_files, ".gitignore" ); strarray_add( &make->distclean_files, "Makefile" ); @@ -3760,12 +3761,12 @@ static void output_sources( struct makefile *make ) { strarray_addall_uniq( &make->clean_files, make->object_files[arch] ); strarray_addall_uniq( &make->clean_files, make->implib_files[arch] ); + strarray_addall_uniq( &make->clean_files, make->all_targets[arch] ); } strarray_addall( &make->clean_files, make->unixobj_files ); strarray_addall( &make->clean_files, make->res_files ); strarray_addall( &make->clean_files, make->pot_files ); strarray_addall( &make->clean_files, make->debug_files ); - strarray_addall( &make->clean_files, make->all_targets ); if (make == top_makefile) { @@ -3773,7 +3774,7 @@ static void output_sources( struct makefile *make ) return; } - strarray_addall( &all_targets, make->all_targets ); + for (arch = 0; arch < archs.count; arch++) strarray_addall( &all_targets, make->all_targets[arch] ); strarray_addall( &all_targets, make->font_files ); if (all_targets.count) { @@ -3964,7 +3965,7 @@ static void output_stub_makefile( struct makefile *make ) { struct strarray targets = empty_strarray; const char *make_var = strarray_get_value( &top_makefile->vars, "MAKE" ); - unsigned int i; + unsigned int i, arch; if (make->obj_dir) create_dir( make->obj_dir ); @@ -3976,7 +3977,9 @@ static void output_stub_makefile( struct makefile *make ) if (make_var) output( "MAKE = %s\n\n", make_var ); output( "all:\n" ); - if (make->all_targets.count) strarray_add( &targets, "all" ); + for (arch = 0; arch < archs.count; arch++) + if (make->all_targets[arch].count) strarray_add_uniq( &targets, "all" ); + for (i = 0; i < NB_INSTALL_RULES; i++) { if (!make->install_rules[i].count) continue;

1 0

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

25 Oct '22

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

← Newer
1
...
9
10
11
12
13
14
15
...
54
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2022