October 2021 - Wine-commits

Alexandre Julliard : makefiles: Add support for building libraries imported from external sources.
by Alexandre Julliard 18 Oct '21

18 Oct '21

Module: wine Branch: master Commit: a4b01382e18ba10fd12cab0bf3ba948d33f36d27 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a4b01382e18ba10fd12cab0b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 18 11:06:55 2021 +0200 makefiles: Add support for building libraries imported from external sources. Based on a patch by Rémi Bernon. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- aclocal.m4 | 16 ++++++++++++++++ tools/makedep.c | 39 ++++++++++++++++++++++++++------------- 2 files changed, 42 insertions(+), 13 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index 52b7efc5a03..2487df7a314 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -124,6 +124,22 @@ CPPFLAGS=$ac_save_CPPFLAGS AS_VAR_POPDEF([ac_libs])dnl AS_VAR_POPDEF([ac_cflags])])dnl +dnl **** Get flags for an external lib program **** +dnl +dnl Usage: WINE_EXTLIB_FLAGS(var,pkg-name,default-libs,default-cflags) +dnl +AC_DEFUN([WINE_EXTLIB_FLAGS], +[AS_VAR_PUSHDEF([ac_cflags],[[$1]_PE_CFLAGS])dnl +AS_VAR_PUSHDEF([ac_libs],[[$1]_PE_LIBS])dnl +AC_ARG_VAR(ac_cflags, [C compiler flags for the PE $2, overriding the bundled version])dnl +AC_ARG_VAR(ac_libs, [Linker flags for the PE $2, overriding the bundled version])dnl +AS_VAR_IF([ac_cflags],[],[ac_cflags=$4],[enable_$2=no]) +AS_VAR_IF([ac_libs],[],[ac_libs=$3],[enable_$2=no]) +AS_ECHO(["$as_me:${as_lineno-$LINENO}: $2 cflags: $ac_cflags"]) >&AS_MESSAGE_LOG_FD +AS_ECHO(["$as_me:${as_lineno-$LINENO}: $2 libs: $ac_libs"]) >&AS_MESSAGE_LOG_FD +AS_VAR_POPDEF([ac_libs])dnl +AS_VAR_POPDEF([ac_cflags])])dnl + dnl **** Link C code with an assembly file **** dnl dnl Usage: WINE_TRY_ASM_LINK(asm-code,includes,function,[action-if-found,[action-if-not-found]]) diff --git a/tools/makedep.c b/tools/makedep.c index c7d08dc21e6..88a43c39741 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -74,7 +74,8 @@ struct incl_file struct incl_file *included_by; /* file that included this one */ int included_line; /* line where this file was included */ enum incl_type type; /* type of include */ - int use_msvcrt; /* put msvcrt headers in the search path? */ + int use_msvcrt:1; /* put msvcrt headers in the search path? */ + int is_external:1; /* file from external library? */ struct incl_file *owner; unsigned int files_count; /* files in use */ unsigned int files_size; /* total allocated size */ @@ -185,6 +186,7 @@ struct makefile const char *parent_dir; const char *module; const char *testdll; + const char *extlib; const char *sharedlib; const char *staticlib; const char *staticimplib; @@ -1390,18 +1392,20 @@ static struct file *open_include_file( const struct makefile *make, struct incl_ { while (dir[len] == '/') len++; file = open_global_file( make, concat_paths( dir + len, pFile->name ), &pFile->filename ); - if (file) return file; } - continue; /* ignore paths that don't point to the top source dir */ } - if (*dir != '/') + else { - if ((file = open_include_path_file( make, dir, pFile->name, &pFile->filename ))) - return file; + if (*dir == '/') continue; + file = open_include_path_file( make, dir, pFile->name, &pFile->filename ); } + if (!file) continue; + pFile->is_external = 1; + return file; } - if (pFile->type == INCL_SYSTEM && pFile->use_msvcrt) + if (pFile->type == INCL_SYSTEM && pFile->use_msvcrt && + !make->extlib && !pFile->included_by->is_external) { if (!strcmp( pFile->name, "stdarg.h" )) return NULL; if (!strcmp( pFile->name, "x86intrin.h" )) return NULL; @@ -1413,7 +1417,13 @@ static struct file *open_include_file( const struct makefile *make, struct incl_ if (pFile->type == INCL_SYSTEM) return NULL; /* ignore system files we cannot find */ /* try in src file directory */ - if ((file = open_file_same_dir( pFile->included_by, pFile->name, &pFile->filename ))) return file; + if ((file = open_file_same_dir( pFile->included_by, pFile->name, &pFile->filename ))) + { + pFile->is_external = pFile->included_by->is_external; + return file; + } + + if (make->extlib) return NULL; /* ignore missing files in external libs */ fprintf( stderr, "%s:%d: error: ", pFile->included_by->file->name, pFile->included_line ); perror( pFile->name ); @@ -1533,6 +1543,7 @@ static struct incl_file *add_src_file( struct makefile *make, const char *name ) memset( file, 0, sizeof(*file) ); file->name = xstrdup(name); file->use_msvcrt = make->use_msvcrt; + file->is_external = !!make->extlib; list_add_tail( &make->sources, &file->entry ); parse_file( make, file, 1 ); return file; @@ -1900,8 +1911,8 @@ static void get_dependencies( struct incl_file *file, struct incl_file *source ) strarray_add( &source->dependencies, file->filename ); /* sanity checks */ - if ((!strcmp( file->filename, "include/config.h" ) && file != source->files[0]) || - (!strcmp( file->filename, "include/wine/port.h" ) && file != source->files[1])) + if (!strcmp( file->filename, "include/config.h" ) && + file != source->files[0] && !source->is_external) { input_file_name = source->filename; input_line = 0; @@ -2152,7 +2163,7 @@ static void add_crt_import( const struct makefile *make, struct strarray *import } else { - crt_dll = !make->testdll && !make->staticlib ? "ucrtbase" : "msvcrt"; + crt_dll = !make->testdll && (!make->staticlib || make->extlib) ? "ucrtbase" : "msvcrt"; strarray_add( imports, crt_dll ); } } @@ -3353,7 +3364,7 @@ static void output_static_lib( struct makefile *make ) output_filenames_obj_dir( make, make->unixobj_files ); output( " && %s $@\n", ranlib ); add_install_rule( make, make->staticlib, make->staticlib, strmake( "d%s/%s", so_dir, make->staticlib )); - if (crosstarget && make->module) + if (crosstarget) { char *name = replace_extension( make->staticlib, ".a", ".cross.a" ); @@ -4073,6 +4084,7 @@ static void load_sources( struct makefile *make ) make->sharedlib = get_expanded_make_variable( make, "SHAREDLIB" ); make->staticlib = get_expanded_make_variable( make, "STATICLIB" ); make->importlib = get_expanded_make_variable( make, "IMPORTLIB" ); + make->extlib = get_expanded_make_variable( make, "EXTLIB" ); if (*dll_ext) make->unixlib = get_expanded_make_variable( make, "UNIXLIB" ); make->programs = get_expanded_make_var_array( make, "PROGRAMS" ); @@ -4084,6 +4096,7 @@ static void load_sources( struct makefile *make ) make->install_dev = get_expanded_make_var_array( make, "INSTALL_DEV" ); make->extra_targets = get_expanded_make_var_array( make, "EXTRA_TARGETS" ); + if (make->extlib) make->staticlib = make->extlib; if (make->staticlib) make->module = make->staticlib; make->disabled = make->obj_dir && strarray_exists( &disabled_dirs, make->obj_dir ); @@ -4106,7 +4119,7 @@ static void load_sources( struct makefile *make ) make->include_paths = empty_strarray; make->include_args = empty_strarray; make->define_args = empty_strarray; - strarray_add( &make->define_args, "-D__WINESRC__" ); + if (!make->extlib) strarray_add( &make->define_args, "-D__WINESRC__" ); value = get_expanded_make_var_array( make, "EXTRAINCL" ); for (i = 0; i < value.count; i++)

1 0

Alexandre Julliard : makefiles: Don't pass warning flags to external libraries.
by Alexandre Julliard 18 Oct '21

18 Oct '21

Module: wine Branch: master Commit: a1be6b475d96763bfb6c99e0525d98b061213b02 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a1be6b475d96763bfb6c99e0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 18 11:07:02 2021 +0200 makefiles: Don't pass warning flags to external libraries. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 88a43c39741..a7a7924a20b 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -128,6 +128,8 @@ static struct strarray target_flags; static struct strarray msvcrt_flags; static struct strarray extra_cflags; static struct strarray extra_cross_cflags; +static struct strarray extra_cflags_extlib; +static struct strarray extra_cross_cflags_extlib; static struct strarray cpp_flags; static struct strarray lddll_flags; static struct strarray libs; @@ -2269,6 +2271,21 @@ static struct strarray get_source_defines( struct makefile *make, struct incl_fi } +/******************************************************************* + * remove_warning_flags + */ +static struct strarray remove_warning_flags( struct strarray flags ) +{ + unsigned int i; + struct strarray ret = empty_strarray; + + for (i = 0; i < flags.count; i++) + if (strncmp( flags.str[i], "-W", 2 ) || !strncmp( flags.str[i], "-Wno-", 5 )) + strarray_add( &ret, flags.str[i] ); + return ret; +} + + /******************************************************************* * get_debug_file */ @@ -3010,7 +3027,7 @@ static void output_source_default( struct makefile *make, struct incl_file *sour if (!*dll_ext && make->module && is_crt_module( make->module )) output_filename( "-fno-builtin" ); } - output_filenames( extra_cflags ); + output_filenames( make->extlib ? extra_cflags_extlib : extra_cflags ); output_filenames( cpp_flags ); output_filename( "$(CFLAGS)" ); output( "\n" ); @@ -3024,7 +3041,7 @@ static void output_source_default( struct makefile *make, struct incl_file *sour output( "%s.cross.o: %s\n", obj_dir_path( make, obj ), source->filename ); output( "\t%s$(CROSSCC) -c -o $@ %s", cmd_prefix( "CC" ), source->filename ); output_filenames( defines ); - output_filenames( extra_cross_cflags ); + output_filenames( make->extlib ? extra_cross_cflags_extlib : extra_cross_cflags ); if (make->module && is_crt_module( make->module )) output_filename( "-fno-builtin" ); output_filenames( cpp_flags ); @@ -4311,6 +4328,9 @@ int main( int argc, char *argv[] ) else so_dir = pe_dir = "$(dlldir)"; + extra_cflags_extlib = remove_warning_flags( extra_cflags ); + extra_cross_cflags_extlib = remove_warning_flags( extra_cross_cflags ); + top_makefile->src_dir = root_src_dir; subdirs = get_expanded_make_var_array( top_makefile, "SUBDIRS" ); disabled_dirs = get_expanded_make_var_array( top_makefile, "DISABLED_SUBDIRS" );

1 0

Alexandre Julliard : libs: Import upstream code from zlib 1.2.11.
by Alexandre Julliard 18 Oct '21

18 Oct '21

Module: wine Branch: master Commit: 2929aa3c749809f7b6d28e8cd3406179058703a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2929aa3c749809f7b6d28e8c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 18 11:07:38 2021 +0200 libs: Import upstream code from zlib 1.2.11. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 27 + configure.ac | 5 + libs/zlib/LICENSE | 29 + libs/zlib/Makefile.in | 12 + libs/zlib/adler32.c | 186 +++++ libs/zlib/crc32.c | 442 ++++++++++ libs/zlib/crc32.h | 441 ++++++++++ libs/zlib/deflate.c | 2163 +++++++++++++++++++++++++++++++++++++++++++++++++ libs/zlib/deflate.h | 349 ++++++++ libs/zlib/inffast.c | 323 ++++++++ libs/zlib/inffast.h | 11 + libs/zlib/inffixed.h | 94 +++ libs/zlib/inflate.c | 1561 +++++++++++++++++++++++++++++++++++ libs/zlib/inflate.h | 125 +++ libs/zlib/inftrees.c | 304 +++++++ libs/zlib/inftrees.h | 62 ++ libs/zlib/trees.c | 1203 +++++++++++++++++++++++++++ libs/zlib/trees.h | 128 +++ libs/zlib/zconf.h | 534 ++++++++++++ libs/zlib/zlib.h | 1912 +++++++++++++++++++++++++++++++++++++++++++ libs/zlib/zutil.c | 325 ++++++++ libs/zlib/zutil.h | 271 +++++++ 22 files changed, 10507 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2929aa3c749809f7b6d2…

1 0

Alexandre Julliard : cabinet: Use the bundled zlib.
by Alexandre Julliard 18 Oct '21

18 Oct '21

Module: wine Branch: master Commit: afa91c9b23b8488aec80ad48ee16bcab6937a1ae URL: https://source.winehq.org/git/wine.git/?a=commit;h=afa91c9b23b8488aec80ad48… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 18 11:07:51 2021 +0200 cabinet: Use the bundled zlib. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/cabinet/Makefile.in | 3 +- dlls/cabinet/deflate.c | 2974 ---------------------------------------------- dlls/cabinet/fci.c | 2 +- dlls/cabinet/zlib.h | 162 --- 4 files changed, 3 insertions(+), 3138 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=afa91c9b23b8488aec80…

1 0

Alexandre Julliard : dbghelp: Use the bundled zlib.
by Alexandre Julliard 18 Oct '21

18 Oct '21

Module: wine Branch: master Commit: 8b58eca07152176b9fe4d3523ff50ef76dd45fef URL: https://source.winehq.org/git/wine.git/?a=commit;h=8b58eca07152176b9fe4d352… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 18 11:08:00 2021 +0200 dbghelp: Use the bundled zlib. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/Makefile.in | 3 +- dlls/dbghelp/dwarf.c | 2 +- dlls/dbghelp/inflate.c | 1916 ---------------------------------------------- dlls/dbghelp/zlib.h | 162 ---- 4 files changed, 3 insertions(+), 2080 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8b58eca07152176b9fe4…

1 0

Alexandre Julliard : opcservices: Use the bundled zlib.
by Alexandre Julliard 18 Oct '21

18 Oct '21

Module: wine Branch: master Commit: d933672538c1dd86c26e98f87acb28bb529b24ce URL: https://source.winehq.org/git/wine.git/?a=commit;h=d933672538c1dd86c26e98f8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 18 11:08:07 2021 +0200 opcservices: Use the bundled zlib. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opcservices/Makefile.in | 6 +- dlls/opcservices/compress.c | 2 +- dlls/opcservices/deflate.c | 2974 ------------------------------------------ dlls/opcservices/zlib.h | 162 --- 4 files changed, 4 insertions(+), 3140 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d933672538c1dd86c26e…

1 0

Alexandre Julliard : wininet: Use the bundled zlib.
by Alexandre Julliard 18 Oct '21

18 Oct '21

Module: wine Branch: master Commit: 7f726ddd89bea1d35b07b0704f2d2ae2b315bf92 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f726ddd89bea1d35b07b070… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 18 11:08:15 2021 +0200 wininet: Use the bundled zlib. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/Makefile.in | 4 +- dlls/wininet/http.c | 8 +- dlls/wininet/inflate.c | 1916 ---------------------------------------------- dlls/wininet/zlib.h | 162 ---- 4 files changed, 5 insertions(+), 2085 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7f726ddd89bea1d35b07…

1 0

Alexandre Julliard : libs: Import upstream code from libpng 1.6.37.
by Alexandre Julliard 18 Oct '21

18 Oct '21

Module: wine Branch: master Commit: 885705c87939ae979008d528464779d0a6cd16f9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=885705c87939ae979008d528… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 18 14:32:42 2021 +0200 libs: Import upstream code from libpng 1.6.37. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 24 + configure.ac | 2 + libs/png/AUTHORS | 45 + libs/png/LICENSE | 134 ++ libs/png/Makefile.in | 19 + libs/png/png.c | 4607 ++++++++++++++++++++++++++++++++++++++++++++ libs/png/png.h | 3247 +++++++++++++++++++++++++++++++ libs/png/pngconf.h | 623 ++++++ libs/png/pngdebug.h | 153 ++ libs/png/pngerror.c | 963 ++++++++++ libs/png/pngget.c | 1249 ++++++++++++ libs/png/pnginfo.h | 267 +++ libs/png/pnglibconf.h | 219 +++ libs/png/pngmem.c | 284 +++ libs/png/pngpriv.h | 2152 +++++++++++++++++++++ libs/png/pngread.c | 4225 +++++++++++++++++++++++++++++++++++++++++ libs/png/pngrio.c | 120 ++ libs/png/pngrtran.c | 5044 +++++++++++++++++++++++++++++++++++++++++++++++++ libs/png/pngrutil.c | 4681 +++++++++++++++++++++++++++++++++++++++++++++ libs/png/pngset.c | 1802 ++++++++++++++++++ libs/png/pngstruct.h | 489 +++++ libs/png/pngtrans.c | 864 +++++++++ libs/png/pngwio.c | 168 ++ libs/png/pngwrite.c | 2395 +++++++++++++++++++++++ libs/png/pngwtran.c | 575 ++++++ libs/png/pngwutil.c | 2781 +++++++++++++++++++++++++++ 26 files changed, 37132 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=885705c87939ae979008…

1 0

Conor McCarthy : vkd3d: Do not emit a FIXME for UINT_MAX Texture3D.WSize in vkd3d_create_texture_uav().
by Alexandre Julliard 18 Oct '21

18 Oct '21

Module: vkd3d Branch: master Commit: c8d94c036dc8d89c21005cff655b9ad2edd7b393 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=c8d94c036dc8d89c21005cf… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Mon Oct 18 18:28:07 2021 +0200 vkd3d: Do not emit a FIXME for UINT_MAX Texture3D.WSize in vkd3d_create_texture_uav(). Specifying UINT_MAX here is equivalent to specifying the remaining layers for the mip-level. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/resource.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 705e720..1c667aa 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -2967,7 +2967,8 @@ static void vkd3d_create_texture_uav(struct d3d12_desc *descriptor, case D3D12_UAV_DIMENSION_TEXTURE3D: vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_3D; vkd3d_desc.miplevel_idx = desc->u.Texture3D.MipSlice; - if (desc->u.Texture3D.FirstWSlice || desc->u.Texture3D.WSize != resource->desc.DepthOrArraySize) + if (desc->u.Texture3D.FirstWSlice || (desc->u.Texture3D.WSize != resource->desc.DepthOrArraySize + && desc->u.Texture3D.WSize != UINT_MAX)) FIXME("Unhandled depth view %u-%u.\n", desc->u.Texture3D.FirstWSlice, desc->u.Texture3D.WSize); break;

1 0

Conor McCarthy : vkd3d: Take the mip-level into account for the 3D UAV slice check in vkd3d_create_texture_uav().
by Alexandre Julliard 18 Oct '21

18 Oct '21

Module: vkd3d Branch: master Commit: 566eeb046542636116e4367b830fd03b92f3fb74 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=566eeb046542636116e4367… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Mon Oct 18 18:28:08 2021 +0200 vkd3d: Take the mip-level into account for the 3D UAV slice check in vkd3d_create_texture_uav(). Based on a vkd3d-proton patch by Philip Rebohle. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/resource.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 1c667aa..2887779 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -2967,8 +2967,9 @@ static void vkd3d_create_texture_uav(struct d3d12_desc *descriptor, case D3D12_UAV_DIMENSION_TEXTURE3D: vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_3D; vkd3d_desc.miplevel_idx = desc->u.Texture3D.MipSlice; - if (desc->u.Texture3D.FirstWSlice || (desc->u.Texture3D.WSize != resource->desc.DepthOrArraySize - && desc->u.Texture3D.WSize != UINT_MAX)) + if (desc->u.Texture3D.FirstWSlice || (desc->u.Texture3D.WSize != UINT_MAX + && desc->u.Texture3D.WSize != max(1u, + resource->desc.DepthOrArraySize >> desc->u.Texture3D.MipSlice))) FIXME("Unhandled depth view %u-%u.\n", desc->u.Texture3D.FirstWSlice, desc->u.Texture3D.WSize); break;

1 0