October 2022 - Wine-Commits

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

Oct. 25, 2022

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 Oct. 25, 2022

Oct. 25, 2022

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 Oct. 25, 2022

Oct. 25, 2022

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 Oct. 25, 2022

Oct. 25, 2022

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 Oct. 25, 2022

Oct. 25, 2022

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 Oct. 25, 2022

Oct. 25, 2022

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 object files architecture-generic.
by Alexandre Julliard Oct. 25, 2022

Oct. 25, 2022

Module: wine Branch: master Commit: cb5268c729204c62c0c48c06047e7673cd9cdf15 URL: https://gitlab.winehq.org/wine/wine/-/commit/cb5268c729204c62c0c48c06047e76… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 25 11:04:30 2022 +0200 makedep: Make the object files architecture-generic. --- tools/makedep.c | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 83edd3f926e..1968a4020e6 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -216,8 +216,6 @@ struct makefile struct strarray distclean_files; struct strarray maintainerclean_files; struct strarray uninstall_files; - struct strarray object_files; - struct strarray crossobj_files; struct strarray unixobj_files; struct strarray res_files; struct strarray font_files; @@ -228,6 +226,7 @@ struct makefile struct strarray all_targets; struct strarray phony_targets; struct strarray dependencies; + struct strarray object_files[MAX_ARCHS]; struct strarray install_rules[NB_INSTALL_RULES]; }; @@ -3054,7 +3053,7 @@ static void output_source_default( struct makefile *make, struct incl_file *sour else if (source->file->flags & FLAG_C_IMPLIB) strarray_add( &make->implib_files, strmake( "%s.o", obj )); else if (!is_dll_src) - strarray_add( &make->object_files, strmake( "%s.o", obj )); + strarray_add( &make->object_files[0], strmake( "%s.o", obj )); else strarray_add( &make->clean_files, strmake( "%s.o", obj )); output( "%s.o: %s\n", obj_dir_path( make, obj ), source->filename ); @@ -3082,7 +3081,7 @@ static void output_source_default( struct makefile *make, struct incl_file *sour if (source->file->flags & FLAG_C_IMPLIB) strarray_add( &make->crossimplib_files, strmake( "%s.cross.o", obj )); else if (!is_dll_src) - strarray_add( &make->crossobj_files, strmake( "%s.cross.o", obj )); + strarray_add( &make->object_files[arch], strmake( "%s.cross.o", obj )); else strarray_add( &make->clean_files, strmake( "%s.cross.o", obj )); output( "%s.cross.o: %s\n", obj_dir_path( make, obj ), source->filename ); @@ -3219,7 +3218,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, arch ? make->crossobj_files : make->object_files ); + output_filenames_obj_dir( make, make->object_files[arch] ); output_filenames_obj_dir( make, make->res_files ); output_filenames( dep_libs ); output_filename( tools_path( make, "winebuild" )); @@ -3233,7 +3232,7 @@ static void output_module( struct makefile *make, unsigned int arch ) output_filename( spec_file ); } output_filenames( make->extradllflags ); - output_filenames_obj_dir( make, arch ? make->crossobj_files : make->object_files ); + output_filenames_obj_dir( make, make->object_files[arch] ); output_filenames_obj_dir( make, make->res_files ); 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 ))); @@ -3384,12 +3383,12 @@ static void output_static_lib( struct makefile *make, unsigned int arch ) strarray_add( &make->clean_files, name ); output( "%s: %s", obj_dir_path( make, name ), tools_path( make, "winebuild" )); - output_filenames_obj_dir( make, arch ? make->crossobj_files : make->object_files ); + output_filenames_obj_dir( make, make->object_files[arch] ); if (!arch) output_filenames_obj_dir( make, make->unixobj_files ); output( "\n" ); output( "\t%s%s -w --staticlib -o $@", cmd_prefix( "BUILD" ), tools_path( make, "winebuild" )); output_filenames( target_flags[arch] ); - output_filenames_obj_dir( make, arch ? make->crossobj_files : make->object_files ); + output_filenames_obj_dir( make, make->object_files[arch] ); if (!arch) output_filenames_obj_dir( make, make->unixobj_files ); output( "\n" ); if (!make->extlib) @@ -3419,11 +3418,11 @@ static void output_shared_lib( struct makefile *make ) strarray_addall( &all_libs, libs ); output( "%s:", obj_dir_path( make, make->sharedlib )); - output_filenames_obj_dir( make, make->object_files ); + output_filenames_obj_dir( make, make->object_files[arch] ); output_filenames( dep_libs ); output( "\n" ); output( "\t%s$(CC) -o $@", cmd_prefix( "CCLD" )); - output_filenames_obj_dir( make, make->object_files ); + output_filenames_obj_dir( make, make->object_files[arch] ); output_filenames( all_libs ); output_filename( "$(LDFLAGS)" ); output( "\n" ); @@ -3464,7 +3463,7 @@ static void output_test_module( struct makefile *make, unsigned int arch ) output( "%s:\n", output_file ); output_winegcc_command( make, arch ); output_filenames( make->extradllflags ); - output_filenames_obj_dir( make, arch ? make->crossobj_files : make->object_files ); + output_filenames_obj_dir( make, make->object_files[arch] ); output_filenames_obj_dir( make, make->res_files ); if ((debug_file = get_debug_file( make, testmodule, arch ))) output_filename( strmake( "-Wl,--debug-file,%s", obj_dir_path( make, debug_file ))); @@ -3476,13 +3475,13 @@ static void output_test_module( struct makefile *make, unsigned int arch ) output_filename( "-s" ); output_filename( strmake( "-Wb,-F,%s", testmodule )); output_filenames( make->extradllflags ); - output_filenames_obj_dir( make, arch ? make->crossobj_files : make->object_files ); + output_filenames_obj_dir( make, make->object_files[arch] ); output_filenames_obj_dir( make, make->res_files ); 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, arch ? make->crossobj_files : make->object_files ); + output_filenames_obj_dir( make, make->object_files[arch] ); output_filenames_obj_dir( make, make->res_files ); output_filenames( dep_libs ); output_filename( tools_path( make, "winebuild" )); @@ -3522,6 +3521,7 @@ static void output_test_module( struct makefile *make, unsigned int arch ) static void output_programs( struct makefile *make ) { unsigned int i, j; + unsigned int arch = 0; /* programs are always native */ for (i = 0; i < make->programs.count; i++) { @@ -3532,7 +3532,7 @@ static void output_programs( struct makefile *make ) struct strarray objs = get_expanded_file_local_var( make, make->programs.str[i], "OBJS" ); struct strarray symlinks = get_expanded_file_local_var( make, make->programs.str[i], "SYMLINKS" ); - if (!objs.count) objs = make->object_files; + if (!objs.count) objs = make->object_files[arch]; if (!strarray_exists( &all_libs, "-nodefaultlibs" )) { strarray_addall( &all_libs, get_expanded_make_var_array( make, "UNIX_LIBS" )); @@ -3763,10 +3763,12 @@ 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->object_files ); - strarray_addall( &make->clean_files, make->crossobj_files ); 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( &make->clean_files, make->unixobj_files ); strarray_addall( &make->clean_files, make->res_files ); strarray_addall( &make->clean_files, make->pot_files );

1 0

Alexandre Julliard : makedep: Make the installation directories architecture-generic.
by Alexandre Julliard Oct. 25, 2022

Oct. 25, 2022

Module: wine Branch: master Commit: 9795a01918185435f7d9a34806327ef9bf109e6a URL: https://gitlab.winehq.org/wine/wine/-/commit/9795a01918185435f7d9a34806327e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 25 11:03:54 2022 +0200 makedep: Make the installation directories architecture-generic. --- tools/makedep.c | 62 +++++++++++++++++++++++++++++++-------------------------- 1 file changed, 34 insertions(+), 28 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 2395835ff72..83edd3f926e 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -149,8 +149,6 @@ static const char *tools_ext; static const char *exe_ext; static const char *dll_ext; static const char *host_cpu; -static const char *pe_dir; -static const char *so_dir; static const char *fontforge; static const char *convert; static const char *flex; @@ -164,6 +162,7 @@ static const char *msgfmt; static const char *ln_s; static const char *sed_cmd; /* per-architecture global variables */ +static const char *arch_install_dirs[MAX_ARCHS]; static const char *strip_progs[MAX_ARCHS]; static const char *debug_flags[MAX_ARCHS]; static const char *delay_load_flags[MAX_ARCHS]; @@ -2456,19 +2455,22 @@ static void output_srcdir_symlink( struct makefile *make, const char *obj ) */ static void output_install_commands( struct makefile *make, struct strarray files ) { - unsigned int i; + unsigned int i, arch; char *install_sh = root_src_dir_path( "tools/install-sh" ); for (i = 0; i < files.count; i += 2) { const char *file = files.str[i]; const char *dest = strmake( "$(DESTDIR)%s", files.str[i + 1] + 1 ); + char type = *files.str[i + 1]; - switch (*files.str[i + 1]) + switch (type) { - case 'c': /* cross-compiled program */ + case '1': case '2': case '3': case '4': case '5': + case '6': case '7': case '8': case '9': /* arch-dependent program */ + arch = type - '0'; output( "\tSTRIPPROG=%s %s -m 644 $(INSTALL_PROGRAM_FLAGS) %s %s\n", - strip_progs[1], install_sh, obj_dir_path( make, file ), dest ); + strip_progs[arch], install_sh, obj_dir_path( make, file ), dest ); output( "\t%s --builtin %s\n", tools_path( make, "winebuild" ), dest ); break; case 'd': /* data file */ @@ -2479,6 +2481,7 @@ static void output_install_commands( struct makefile *make, struct strarray file output( "\t%s -m 644 $(INSTALL_DATA_FLAGS) %s %s\n", install_sh, src_dir_path( make, file ), dest ); break; + case '0': /* native arch program file */ case 'p': /* program file */ output( "\tSTRIPPROG=\"$(STRIP)\" %s $(INSTALL_PROGRAM_FLAGS) %s %s\n", install_sh, obj_dir_path( make, file ), dest ); @@ -2525,7 +2528,8 @@ static void output_install_rules( struct makefile *make, enum install_rules rule const char *file = files.str[i]; switch (*files.str[i + 1]) { - case 'c': /* cross-compiled program */ + case '0': case '1': case '2': case '3': case '4': + case '5': case '6': case '7': case '8': case '9': /* arch-dependent program */ case 'd': /* data file */ case 'p': /* program file */ case 's': /* script */ @@ -3205,11 +3209,10 @@ static void output_module( struct makefile *make, unsigned int arch ) if (make->data_only) add_install_rule( make, make->module, module_name, - strmake( "d%s/%s", *dll_ext ? pe_dir : "$(dlldir)", module_name )); - else if (arch) - add_install_rule( make, make->module, module_name, strmake( "c%s/%s", pe_dir, module_name )); - else if (*dll_ext) - add_install_rule( make, make->module, module_name, strmake( "p%s/%s", so_dir, module_name )); + strmake( "d%s%s", arch_install_dirs[arch], make->module )); + else if (arch || *dll_ext) + add_install_rule( make, make->module, module_name, + strmake( "%c%s%s", '0' + arch, arch_install_dirs[arch], module_name )); else add_install_rule( make, make->module, module_name, strmake( "p$(%s)/%s", spec_file ? "dlldir" : "bindir", module_name )); @@ -3256,7 +3259,8 @@ 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 ); - add_install_rule( make, make->module, make->module, strmake( "d%s/%s", pe_dir, make->module )); + add_install_rule( make, make->module, make->module, + strmake( "d%s%s", arch_install_dirs[arch], make->module )); output( "%s:", obj_dir_path( make, make->module )); if (spec_file) output_filename( spec_file ); @@ -3312,7 +3316,7 @@ static void output_import_lib( struct makefile *make, unsigned int arch ) output( "\n" ); add_install_rule( make, make->importlib, arch ? strmake( "lib%s.cross.a", make->importlib ) : strmake( "lib%s.a", make->importlib ), - strmake( "d%s/lib%s.a", arch ? pe_dir : so_dir, make->importlib )); + strmake( "d%slib%s.a", arch_install_dirs[arch], make->importlib )); } @@ -3324,6 +3328,7 @@ static void output_unix_lib( struct makefile *make ) struct strarray unix_libs = empty_strarray; struct strarray unix_deps = empty_strarray; char *spec_file = src_dir_path( make, replace_extension( make->module, ".dll", ".spec" )); + unsigned int arch = 0; /* unix libs are always native */ if (!make->native_unix_lib) { @@ -3341,7 +3346,8 @@ static void output_unix_lib( struct makefile *make ) else unix_libs = add_unix_libraries( make, &unix_deps ); strarray_add( &make->all_targets, make->unixlib ); - add_install_rule( make, make->module, make->unixlib, strmake( "p%s/%s", so_dir, 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 )); output_filenames_obj_dir( make, make->unixobj_files ); output_filenames( unix_deps ); @@ -3388,7 +3394,7 @@ static void output_static_lib( struct makefile *make, unsigned int arch ) output( "\n" ); if (!make->extlib) add_install_rule( make, make->staticlib, name, - strmake( "d%s/%s", arch ? pe_dir : so_dir, make->staticlib )); + strmake( "d%s%s", arch_install_dirs[arch], make->staticlib )); } @@ -3402,6 +3408,7 @@ static void output_shared_lib( struct makefile *make ) struct strarray names = get_shared_lib_names( make->sharedlib ); struct strarray all_libs = empty_strarray; struct strarray dep_libs = empty_strarray; + unsigned int arch = 0; /* shared libs are always native */ basename = xstrdup( make->sharedlib ); if ((p = strchr( basename, '.' ))) *p = 0; @@ -3420,12 +3427,14 @@ static void output_shared_lib( struct makefile *make ) output_filenames( all_libs ); output_filename( "$(LDFLAGS)" ); output( "\n" ); - add_install_rule( make, make->sharedlib, make->sharedlib, strmake( "p%s/%s", so_dir, make->sharedlib )); + add_install_rule( make, make->sharedlib, make->sharedlib, + strmake( "p%s%s", arch_install_dirs[arch], make->sharedlib )); for (i = 1; i < names.count; i++) { output( "%s: %s\n", obj_dir_path( make, names.str[i] ), obj_dir_path( make, names.str[i-1] )); output_symlink_rule( names.str[i-1], obj_dir_path( make, names.str[i] ), 0 ); - add_install_rule( make, names.str[i], names.str[i-1], strmake( "y%s/%s", so_dir, names.str[i] )); + 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 ); } @@ -4377,18 +4386,10 @@ int main( int argc, char *argv[] ) if (tools_dir && !strcmp( tools_dir, "." )) tools_dir = NULL; if (!exe_ext) exe_ext = ""; if (!tools_ext) tools_ext = ""; - if (host_cpu && (host_cpu = normalize_arch( host_cpu ))) - { - so_dir = strmake( "$(dlldir)/%s-unix", host_cpu ); - pe_dir = strmake( "$(dlldir)/%s-windows", host_cpu ); - } - else - { - host_cpu = "unknown"; - so_dir = pe_dir = "$(dlldir)"; - } + if (!host_cpu || !(host_cpu = normalize_arch( host_cpu ))) host_cpu = "unknown"; strarray_add( &archs, host_cpu ); + arch_install_dirs[0] = *dll_ext ? strmake( "$(dlldir)/%s-unix/", archs.str[0] ) : "$(dlldir)/"; strip_progs[0] = "\"$(STRIP)\""; if (crosstarget) @@ -4400,6 +4401,11 @@ int main( int argc, char *argv[] ) debug_flags[1] = debug_flag; } + for (arch = 1; arch < archs.count; arch++) + { + arch_install_dirs[arch] = strmake( "$(dlldir)/%s-windows/", archs.str[arch] ); + } + for (arch = 0; arch < archs.count; arch++) { extra_cflags_extlib[arch] = remove_warning_flags( extra_cflags[arch] );

1 0

Nikolay Sivov : kernelbase: Forward some of the security descriptor functions to ntdll.
by Alexandre Julliard Oct. 25, 2022

Oct. 25, 2022

Module: wine Branch: master Commit: 3b8508a539db9b42ca3fa5b2404ec3f3e9cf97fe URL: https://gitlab.winehq.org/wine/wine/-/commit/3b8508a539db9b42ca3fa5b2404ec3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 24 19:06:44 2022 +0300 kernelbase: Forward some of the security descriptor functions to ntdll. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/kernelbase/security.c | 72 ++++------------------------------------------ 1 file changed, 5 insertions(+), 67 deletions(-) diff --git a/dlls/kernelbase/security.c b/dlls/kernelbase/security.c index 26878982b6f..04898f81b06 100644 --- a/dlls/kernelbase/security.c +++ b/dlls/kernelbase/security.c @@ -139,26 +139,6 @@ static const WELLKNOWNRID WellKnownRids[] = { WinAccountRasAndIasServersSid, DOMAIN_ALIAS_RID_RAS_SERVERS }, }; -static const SID world_sid = { SID_REVISION, 1, { SECURITY_WORLD_SID_AUTHORITY} , { SECURITY_WORLD_RID } }; -static const DWORD world_access_acl_size = sizeof(ACL) + sizeof(ACCESS_ALLOWED_ACE) + sizeof(world_sid) - sizeof(DWORD); - -static void get_world_access_acl( PACL acl ) -{ - PACCESS_ALLOWED_ACE ace = (PACCESS_ALLOWED_ACE)(acl + 1); - - acl->AclRevision = ACL_REVISION; - acl->Sbz1 = 0; - acl->AclSize = world_access_acl_size; - acl->AceCount = 1; - acl->Sbz2 = 0; - ace->Header.AceType = ACCESS_ALLOWED_ACE_TYPE; - ace->Header.AceFlags = CONTAINER_INHERIT_ACE; - ace->Header.AceSize = sizeof(ACCESS_ALLOWED_ACE) + sizeof(world_sid) - sizeof(DWORD); - ace->Mask = 0xf3ffffff; /* Everything except reserved bits */ - memcpy( &ace->SidStart, &world_sid, sizeof(world_sid) ); -} - - static NTSTATUS open_file( LPCWSTR name, DWORD access, HANDLE *file ) { UNICODE_STRING file_nameW; @@ -938,7 +918,7 @@ BOOL WINAPI CreatePrivateObjectSecurity( PSECURITY_DESCRIPTOR parent, PSECURITY_ PSECURITY_DESCRIPTOR *descr, BOOL is_container, HANDLE token, PGENERIC_MAPPING mapping ) { - return CreatePrivateObjectSecurityEx( parent, creator, descr, NULL, is_container, 0, token, mapping ); + return set_ntstatus( RtlNewSecurityObject( parent, creator, descr, is_container, token, mapping )); } /****************************************************************************** @@ -948,46 +928,7 @@ BOOL WINAPI CreatePrivateObjectSecurityEx( PSECURITY_DESCRIPTOR parent, PSECURIT PSECURITY_DESCRIPTOR *descr, GUID *type, BOOL is_container, ULONG flags, HANDLE token, PGENERIC_MAPPING mapping ) { - SECURITY_DESCRIPTOR_RELATIVE *relative; - DWORD needed, offset; - BYTE *buffer; - - FIXME( "%p %p %p %p %d %lu %p %p - returns fake SECURITY_DESCRIPTOR\n", - parent, creator, descr, type, is_container, flags, token, mapping ); - - needed = sizeof(SECURITY_DESCRIPTOR_RELATIVE); - needed += sizeof(world_sid); - needed += sizeof(world_sid); - needed += world_access_acl_size; - needed += world_access_acl_size; - - if (!(buffer = heap_alloc( needed ))) return FALSE; - relative = (SECURITY_DESCRIPTOR_RELATIVE *)buffer; - if (!InitializeSecurityDescriptor( relative, SECURITY_DESCRIPTOR_REVISION )) - { - heap_free( buffer ); - return FALSE; - } - relative->Control |= SE_SELF_RELATIVE; - offset = sizeof(SECURITY_DESCRIPTOR_RELATIVE); - - memcpy( buffer + offset, &world_sid, sizeof(world_sid) ); - relative->Owner = offset; - offset += sizeof(world_sid); - - memcpy( buffer + offset, &world_sid, sizeof(world_sid) ); - relative->Group = offset; - offset += sizeof(world_sid); - - get_world_access_acl( (ACL *)(buffer + offset) ); - relative->Dacl = offset; - offset += world_access_acl_size; - - get_world_access_acl( (ACL *)(buffer + offset) ); - relative->Sacl = offset; - - *descr = relative; - return TRUE; + return set_ntstatus( RtlNewSecurityObjectEx( parent, creator, descr, type, is_container, flags, token, mapping )); } /****************************************************************************** @@ -1000,9 +941,8 @@ BOOL WINAPI CreatePrivateObjectSecurityWithMultipleInheritance( PSECURITY_DESCRI BOOL is_container, ULONG flags, HANDLE token, PGENERIC_MAPPING mapping ) { - FIXME(": semi-stub\n"); - return CreatePrivateObjectSecurityEx( parent, creator, descr, NULL, is_container, - flags, token, mapping ); + return set_ntstatus( RtlNewSecurityObjectWithMultipleInheritance( parent, creator, descr, types, count, + is_container, flags, token, mapping )); } /****************************************************************************** @@ -1010,9 +950,7 @@ BOOL WINAPI CreatePrivateObjectSecurityWithMultipleInheritance( PSECURITY_DESCRI */ BOOL WINAPI DestroyPrivateObjectSecurity( PSECURITY_DESCRIPTOR *descr ) { - FIXME("%p - stub\n", descr); - heap_free( *descr ); - return TRUE; + return set_ntstatus( RtlDeleteSecurityObject( descr )); } /******************************************************************************

1 0

Nikolay Sivov : ntdll: Add some already implemented security descriptor exports.
by Alexandre Julliard Oct. 25, 2022

Oct. 25, 2022

Module: wine Branch: master Commit: 853d9024b71b91208d69bedbeecbc474dc881bf2 URL: https://gitlab.winehq.org/wine/wine/-/commit/853d9024b71b91208d69bedbeecbc4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 24 19:01:24 2022 +0300 ntdll: Add some already implemented security descriptor exports. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/ntdll/ntdll.spec | 4 +-- dlls/ntdll/rtl.c | 26 -------------- dlls/ntdll/sec.c | 96 +++++++++++++++++++++++++++++++++++++++++++++++++++ include/winternl.h | 3 ++ 4 files changed, 101 insertions(+), 28 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 2432307e686..d9071bb826e 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -878,8 +878,8 @@ @ stub RtlNewInstanceSecurityObject @ stub RtlNewSecurityGrantedAccess @ stdcall RtlNewSecurityObject(ptr ptr ptr long ptr ptr) -# @ stub RtlNewSecurityObjectEx -# @ stub RtlNewSecurityObjectWithMultipleInheritance +@ stdcall RtlNewSecurityObjectEx(ptr ptr ptr ptr long long long ptr) +@ stdcall RtlNewSecurityObjectWithMultipleInheritance(ptr ptr ptr ptr long long long long ptr) @ stdcall RtlNormalizeProcessParams(ptr) @ stdcall RtlNormalizeString(long wstr long ptr ptr) # @ stub RtlNtPathNameToDosPathName diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index 11067f44941..58fe5242aa4 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -396,32 +396,6 @@ VOID WINAPI RtlReleasePebLock(void) RtlLeaveCriticalSection( NtCurrentTeb()->Peb->FastPebLock ); } -/****************************************************************************** - * RtlNewSecurityObject [NTDLL.@] - */ -NTSTATUS WINAPI -RtlNewSecurityObject( PSECURITY_DESCRIPTOR ParentDescriptor, - PSECURITY_DESCRIPTOR CreatorDescriptor, - PSECURITY_DESCRIPTOR *NewDescriptor, - BOOLEAN IsDirectoryObject, - HANDLE Token, - PGENERIC_MAPPING GenericMapping ) -{ - FIXME("(%p %p %p %d %p %p) stub!\n", ParentDescriptor, CreatorDescriptor, - NewDescriptor, IsDirectoryObject, Token, GenericMapping); - return STATUS_NOT_IMPLEMENTED; -} - -/****************************************************************************** - * RtlDeleteSecurityObject [NTDLL.@] - */ -NTSTATUS WINAPI -RtlDeleteSecurityObject( PSECURITY_DESCRIPTOR *ObjectDescriptor ) -{ - FIXME("(%p) stub!\n", ObjectDescriptor); - return STATUS_NOT_IMPLEMENTED; -} - /****************************************************************************** * RtlInitializeGenericTable [NTDLL.@] */ diff --git a/dlls/ntdll/sec.c b/dlls/ntdll/sec.c index 20adc044158..ecc3ed8ba95 100644 --- a/dlls/ntdll/sec.c +++ b/dlls/ntdll/sec.c @@ -37,6 +37,25 @@ WINE_DEFAULT_DEBUG_CHANNEL(ntdll); #define SELF_RELATIVE_FIELD(sd,field) ((BYTE *)(sd) + ((SECURITY_DESCRIPTOR_RELATIVE *)(sd))->field) +static const SID world_sid = { SID_REVISION, 1, { SECURITY_WORLD_SID_AUTHORITY} , { SECURITY_WORLD_RID } }; +static const DWORD world_access_acl_size = sizeof(ACL) + sizeof(ACCESS_ALLOWED_ACE) + sizeof(world_sid) - sizeof(DWORD); + +static void get_world_access_acl( PACL acl ) +{ + PACCESS_ALLOWED_ACE ace = (PACCESS_ALLOWED_ACE)(acl + 1); + + acl->AclRevision = ACL_REVISION; + acl->Sbz1 = 0; + acl->AclSize = world_access_acl_size; + acl->AceCount = 1; + acl->Sbz2 = 0; + ace->Header.AceType = ACCESS_ALLOWED_ACE_TYPE; + ace->Header.AceFlags = CONTAINER_INHERIT_ACE; + ace->Header.AceSize = sizeof(ACCESS_ALLOWED_ACE) + sizeof(world_sid) - sizeof(DWORD); + ace->Mask = 0xf3ffffff; /* Everything except reserved bits */ + memcpy( &ace->SidStart, &world_sid, sizeof(world_sid) ); +} + /* helper function to retrieve active length of an ACL */ static size_t acl_bytesInUse(PACL pAcl) { @@ -1101,6 +1120,83 @@ NTSTATUS WINAPI RtlAbsoluteToSelfRelativeSD( SelfRelativeSecurityDescriptor, BufferLength); } +/****************************************************************************** + * RtlNewSecurityObject [NTDLL.@] + */ +NTSTATUS WINAPI RtlNewSecurityObject(PSECURITY_DESCRIPTOR parent, PSECURITY_DESCRIPTOR creator, + PSECURITY_DESCRIPTOR *descr, BOOLEAN is_container, HANDLE token, PGENERIC_MAPPING mapping) +{ + return RtlNewSecurityObjectEx(parent, creator, descr, NULL, is_container, 0, token, mapping); +} + +/****************************************************************************** + * RtlNewSecurityObjectEx [NTDLL.@] + */ +NTSTATUS WINAPI RtlNewSecurityObjectEx(PSECURITY_DESCRIPTOR parent, PSECURITY_DESCRIPTOR creator, + PSECURITY_DESCRIPTOR *descr, GUID *type, BOOLEAN is_container, ULONG flags, HANDLE token, PGENERIC_MAPPING mapping ) +{ + SECURITY_DESCRIPTOR_RELATIVE *relative; + DWORD needed, offset; + NTSTATUS status; + BYTE *buffer; + + FIXME("%p, %p, %p, %p, %d, %#x, %p %p - semi-stub\n", parent, creator, descr, type, is_container, flags, token, mapping); + + needed = sizeof(SECURITY_DESCRIPTOR_RELATIVE); + needed += sizeof(world_sid); + needed += sizeof(world_sid); + needed += world_access_acl_size; + needed += world_access_acl_size; + + if (!(buffer = RtlAllocateHeap( GetProcessHeap(), 0, needed ))) return STATUS_NO_MEMORY; + relative = (SECURITY_DESCRIPTOR_RELATIVE *)buffer; + if ((status = RtlCreateSecurityDescriptor( relative, SECURITY_DESCRIPTOR_REVISION ))) + { + RtlFreeHeap( GetProcessHeap(), 0, buffer ); + return status; + } + relative->Control |= SE_SELF_RELATIVE; + offset = sizeof(SECURITY_DESCRIPTOR_RELATIVE); + + memcpy( buffer + offset, &world_sid, sizeof(world_sid) ); + relative->Owner = offset; + offset += sizeof(world_sid); + + memcpy( buffer + offset, &world_sid, sizeof(world_sid) ); + relative->Group = offset; + offset += sizeof(world_sid); + + get_world_access_acl( (ACL *)(buffer + offset) ); + relative->Dacl = offset; + offset += world_access_acl_size; + + get_world_access_acl( (ACL *)(buffer + offset) ); + relative->Sacl = offset; + + *descr = relative; + return STATUS_SUCCESS; +} + +/****************************************************************************** + * RtlNewSecurityObjectWithMultipleInheritance [NTDLL.@] + */ +NTSTATUS WINAPI RtlNewSecurityObjectWithMultipleInheritance(PSECURITY_DESCRIPTOR parent, PSECURITY_DESCRIPTOR creator, + PSECURITY_DESCRIPTOR *descr, GUID **types, ULONG count, BOOLEAN is_container, ULONG flags, + HANDLE token, PGENERIC_MAPPING mapping ) +{ + FIXME("semi-stub\n"); + return RtlNewSecurityObjectEx(parent, creator, descr, NULL, is_container, flags, token, mapping); +} + +/****************************************************************************** + * RtlDeleteSecurityObject [NTDLL.@] + */ +NTSTATUS WINAPI RtlDeleteSecurityObject( PSECURITY_DESCRIPTOR *descr ) +{ + FIXME("%p stub.\n", descr); + RtlFreeHeap( GetProcessHeap(), 0, *descr ); + return STATUS_SUCCESS; +} /* * access control list's diff --git a/include/winternl.h b/include/winternl.h index fea26bf26c6..5c564373fed 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -4447,6 +4447,9 @@ NTSYSAPI void WINAPI RtlMapGenericMask(PACCESS_MASK,const GENERIC_MAPPING*) NTSYSAPI NTSTATUS WINAPI RtlMultiByteToUnicodeN(LPWSTR,DWORD,LPDWORD,LPCSTR,DWORD); NTSYSAPI NTSTATUS WINAPI RtlMultiByteToUnicodeSize(DWORD*,LPCSTR,ULONG); NTSYSAPI NTSTATUS WINAPI RtlNewSecurityObject(PSECURITY_DESCRIPTOR,PSECURITY_DESCRIPTOR,PSECURITY_DESCRIPTOR*,BOOLEAN,HANDLE,PGENERIC_MAPPING); +NTSYSAPI NTSTATUS WINAPI RtlNewSecurityObjectEx(PSECURITY_DESCRIPTOR,PSECURITY_DESCRIPTOR,PSECURITY_DESCRIPTOR*,GUID*,BOOLEAN,ULONG,HANDLE,PGENERIC_MAPPING); +NTSYSAPI NTSTATUS WINAPI RtlNewSecurityObjectWithMultipleInheritance(PSECURITY_DESCRIPTOR,PSECURITY_DESCRIPTOR,PSECURITY_DESCRIPTOR*, + GUID **,ULONG,BOOLEAN,ULONG,HANDLE,PGENERIC_MAPPING); NTSYSAPI PRTL_USER_PROCESS_PARAMETERS WINAPI RtlNormalizeProcessParams(RTL_USER_PROCESS_PARAMETERS*); NTSYSAPI NTSTATUS WINAPI RtlNormalizeString(ULONG,const WCHAR*,INT,WCHAR*,INT*); NTSYSAPI ULONG WINAPI RtlNtStatusToDosError(NTSTATUS);

1 0