September 2020 - Wine-commits

Brendan Shanks : winemac.drv: Print error when no GPUs are detected.
by Alexandre Julliard 09 Sep '20

09 Sep '20

Module: wine Branch: master Commit: 7eddd79e4e9831e42bc30a8ace55d9e533510684 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7eddd79e4e9831e42bc30a8a… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Tue Sep 8 16:09:46 2020 -0700 winemac.drv: Print error when no GPUs are detected. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/display.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index a96a7b2c5f..078cb55ab8 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -1790,6 +1790,8 @@ void macdrv_init_display_devices(BOOL force) if (macdrv_get_gpus(&gpus, &gpu_count)) goto done; TRACE("GPU count: %d\n", gpu_count); + if (!gpu_count) + ERR("No GPUs detected\n"); for (gpu = 0; gpu < gpu_count; gpu++) {

1 0

Brendan Shanks : winemac.drv: Don't fail GPU detection if some IOKit properties are missing.
by Alexandre Julliard 09 Sep '20

09 Sep '20

Module: wine Branch: master Commit: 0ead40dc9b87ebbd74ad6ebda0182365ab2efde3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0ead40dc9b87ebbd74ad6ebd… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Tue Sep 8 16:10:32 2020 -0700 winemac.drv: Don't fail GPU detection if some IOKit properties are missing. Fixes GPU detection when running in VMware Fusion, where the GPU entry lacks a "model" property. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49774 Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_display.m | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/dlls/winemac.drv/cocoa_display.m b/dlls/winemac.drv/cocoa_display.m index 9d95eee99a..e769772fea 100644 --- a/dlls/winemac.drv/cocoa_display.m +++ b/dlls/winemac.drv/cocoa_display.m @@ -215,18 +215,15 @@ static int macdrv_get_gpu_info_from_entry(struct macdrv_gpu* gpu, io_registry_en if (IORegistryEntryGetRegistryEntryID(gpu_entry, &gpu->id) != kIOReturnSuccess) goto done; - if (get_entry_property_uint32(gpu_entry, CFSTR("vendor-id"), &gpu->vendor_id)) - goto done; - if (get_entry_property_uint32(gpu_entry, CFSTR("device-id"), &gpu->device_id)) - goto done; - if (get_entry_property_uint32(gpu_entry, CFSTR("subsystem-id"), &gpu->subsys_id)) - goto done; - if (get_entry_property_uint32(gpu_entry, CFSTR("revision-id"), &gpu->revision_id)) - goto done; - if (get_entry_property_string(gpu_entry, CFSTR("model"), gpu->name, sizeof(gpu->name))) - goto done; ret = 0; + + get_entry_property_uint32(gpu_entry, CFSTR("vendor-id"), &gpu->vendor_id); + get_entry_property_uint32(gpu_entry, CFSTR("device-id"), &gpu->device_id); + get_entry_property_uint32(gpu_entry, CFSTR("subsystem-id"), &gpu->subsys_id); + get_entry_property_uint32(gpu_entry, CFSTR("revision-id"), &gpu->revision_id); + get_entry_property_string(gpu_entry, CFSTR("model"), gpu->name, sizeof(gpu->name)); + done: if (gpu_entry != entry) IOObjectRelease(gpu_entry);

1 0

Zebediah Figura : include: Add catalog file version constants.
by Alexandre Julliard 09 Sep '20

09 Sep '20

Module: wine Branch: master Commit: 723896176b9489f4088732997f58ab8698136395 URL: https://source.winehq.org/git/wine.git/?a=commit;h=723896176b9489f408873299… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Sep 8 19:30:16 2020 -0500 include: Add catalog file version constants. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mscat.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/mscat.h b/include/mscat.h index 6a718ef3d0..4571a0b264 100644 --- a/include/mscat.h +++ b/include/mscat.h @@ -54,6 +54,9 @@ extern "C" { #define CRYPTCAT_E_CDF_ATTR_TOOFEWVALUES 0x00020002 #define CRYPTCAT_E_CDF_ATTR_TYPECOMBO 0x00020004 +#define CRYPTCAT_VERSION_1 0x100 +#define CRYPTCAT_VERSION_2 0x200 + #include <pshpack8.h> typedef struct CRYPTCATATTRIBUTE_

1 0

Alexandre Julliard : makefiles: Get rid of rpath support.
by Alexandre Julliard 09 Sep '20

09 Sep '20

Module: wine Branch: master Commit: b07cc3fe0c02ac9ea7be5263657f82a68c76e181 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b07cc3fe0c02ac9ea7be5263… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 9 11:31:13 2020 +0200 makefiles: Get rid of rpath support. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.in | 2 - configure | 174 -------------------------------------------------------- configure.ac | 22 ------- tools/makedep.c | 24 -------- 4 files changed, 222 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b07cc3fe0c02ac9ea7be…

1 0

Alexandre Julliard : makefiles: Add dependencies for the import lib symlinks.
by Alexandre Julliard 09 Sep '20

09 Sep '20

Module: wine Branch: master Commit: b211bd7b6449e3a67bb0ecf5c113981eefa0dbb4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b211bd7b6449e3a67bb0ecf5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 9 11:35:14 2020 +0200 makefiles: Add dependencies for the import lib symlinks. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 49 +++++++++++++++++++++++++++++++++---------------- 1 file changed, 33 insertions(+), 16 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 56166af910..e17bf24c41 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2151,6 +2151,24 @@ static int needs_delay_lib( const struct makefile *make ) } +/******************************************************************* + * needs_implib_symlink + */ +static int needs_implib_symlink( const struct makefile *make ) +{ + if (!make->module) return 0; + if (!make->importlib) return 0; + if (make->is_win16 && make->disabled) return 0; + if (strncmp( make->base_dir, "dlls/", 5 )) return 0; + if (!strcmp( make->module, make->importlib )) return 0; + if (!strchr( make->importlib, '.' ) && + !strncmp( make->module, make->importlib, strlen( make->importlib )) && + !strcmp( make->module + strlen( make->importlib ), ".dll" )) + return 0; + return 1; +} + + /******************************************************************* * add_default_libraries */ @@ -2227,8 +2245,12 @@ static struct strarray add_import_libs( const struct makefile *make, struct stra if (is_cross || !*dll_ext || submake->staticimplib) lib = base_dir_path( submake, strmake( "lib%s.a", name )); else + { strarray_add( deps, top_obj_dir_path( make, strmake( "%s/lib%s.def", submake->base_dir, name ))); + if (needs_implib_symlink( submake )) + strarray_add( deps, top_obj_dir_path( make, strmake( "dlls/lib%s.def", name ))); + } break; } @@ -2237,13 +2259,17 @@ static struct strarray add_import_libs( const struct makefile *make, struct stra if (lib) { - if (delay && !delay_load_flag && (is_cross || !*dll_ext)) - lib = replace_extension( lib, ".a", ".delay.a" ); - else if (is_cross) - lib = replace_extension( lib, ".a", ".cross.a" ); + const char *ext = NULL; + + if (delay && !delay_load_flag && (is_cross || !*dll_ext)) ext = ".delay.a"; + else if (is_cross) ext = ".cross.a"; + if (ext) lib = replace_extension( lib, ".a", ext ); lib = top_obj_dir_path( make, lib ); strarray_add( deps, lib ); strarray_add( &ret, lib ); + if (needs_implib_symlink( top_makefile->submakes[j] )) + strarray_add( deps, top_obj_dir_path( make, + strmake( "dlls/lib%s%s", name, ext ? ext : ".a" ))); } else strarray_add( &ret, strmake( "-l%s", name )); } @@ -2608,17 +2634,7 @@ static struct strarray output_importlib_symlinks( const struct makefile *parent, const char *lib, *dst, *ext[4]; int i, count = 0; - if (!make->module) return ret; - if (!make->importlib) return ret; - if (make->is_win16 && make->disabled) return ret; - if (strncmp( make->base_dir, "dlls/", 5 )) return ret; - if (!strcmp( make->module, make->importlib )) return ret; - if (!strchr( make->importlib, '.' ) && - !strncmp( make->module, make->importlib, strlen( make->importlib )) && - !strcmp( make->module + strlen( make->importlib ), ".dll" )) - return ret; - - ext[count++] = *dll_ext ? "def" : "a"; + ext[count++] = (*dll_ext && !make->implib_objs.count) ? "def" : "a"; if (needs_delay_lib( make )) ext[count++] = "delay.a"; if (needs_cross_lib( make )) ext[count++] = "cross.a"; @@ -3739,7 +3755,8 @@ static void output_subdirs( struct makefile *make ) output( "\n" ); } } - strarray_addall( &symlinks, output_importlib_symlinks( make, submake )); + if (needs_implib_symlink( submake )) + strarray_addall( &symlinks, output_importlib_symlinks( make, submake )); } if (submake->disabled) continue;

1 0

Alexandre Julliard : makefiles: Expand makedep path at compile time.
by Alexandre Julliard 09 Sep '20

09 Sep '20

Module: wine Branch: master Commit: a204ad557dd504391e13e1382278472cd86517f4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a204ad557dd504391e13e138… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 9 11:36:45 2020 +0200 makefiles: Expand makedep path at compile time. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/Makefile.in | 2 +- dlls/ntdll/Makefile.in | 8 ++++---- libs/wine/Makefile.in | 8 ++++---- loader/Makefile.in | 2 +- tools/widl/Makefile.in | 2 +- tools/winegcc/Makefile.in | 4 ++-- tools/wmc/Makefile.in | 2 +- tools/wrc/Makefile.in | 4 ++-- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/gdi32/Makefile.in b/dlls/gdi32/Makefile.in index 32b2e6959c..a94abad599 100644 --- a/dlls/gdi32/Makefile.in +++ b/dlls/gdi32/Makefile.in @@ -52,4 +52,4 @@ C_SRCS = \ RC_SRCS = gdi32.rc -freetype_EXTRADEFS = -DWINE_FONT_DIR=\"`$(MAKEDEP) -R ${datadir}/wine ${fontdir}`\" +freetype_EXTRADEFS = -DWINE_FONT_DIR=\"`${MAKEDEP} -R ${datadir}/wine ${fontdir}`\" diff --git a/dlls/ntdll/Makefile.in b/dlls/ntdll/Makefile.in index 52f63892af..a553536d4c 100644 --- a/dlls/ntdll/Makefile.in +++ b/dlls/ntdll/Makefile.in @@ -72,13 +72,13 @@ EXTRA_OBJS = unix/version.o server_EXTRADEFS = \ -DBINDIR=\"${bindir}\" \ - -DBIN_TO_DLLDIR=\"`$(MAKEDEP) -R ${bindir} ${dlldir}`\" \ - -DDLL_TO_BINDIR=\"`$(MAKEDEP) -R ${dlldir} ${bindir}`\" + -DBIN_TO_DLLDIR=\"`${MAKEDEP} -R ${bindir} ${dlldir}`\" \ + -DDLL_TO_BINDIR=\"`${MAKEDEP} -R ${dlldir} ${bindir}`\" unix_loader_EXTRADEFS = \ -DBINDIR=\"${bindir}\" \ - -DDLL_TO_BINDIR=\"`$(MAKEDEP) -R ${dlldir} ${bindir}`\" \ - -DBIN_TO_DATADIR=\"`$(MAKEDEP) -R ${bindir} ${datadir}/wine`\" + -DDLL_TO_BINDIR=\"`${MAKEDEP} -R ${dlldir} ${bindir}`\" \ + -DBIN_TO_DATADIR=\"`${MAKEDEP} -R ${bindir} ${datadir}/wine`\" unix/version.c: dummy version=`(GIT_DIR=$(top_srcdir)/.git git describe HEAD 2>/dev/null || echo "wine-$(PACKAGE_VERSION)") | sed -n -e '$$s/$.*$/const char wine_build[] = "\1";/p'` && (echo $$version | cmp -s - $@) || echo $$version >$@ || (rm -f $@ && exit 1) diff --git a/libs/wine/Makefile.in b/libs/wine/Makefile.in index 6bb27e34dc..65a0789502 100644 --- a/libs/wine/Makefile.in +++ b/libs/wine/Makefile.in @@ -87,10 +87,10 @@ C_SRCS = \ config_EXTRADEFS = \ -DBINDIR='"${bindir}"' \ -DDLLDIR='"${dlldir}"' \ - -DLIB_TO_BINDIR=\"`$(MAKEDEP) -R ${libdir} ${bindir}`\" \ - -DLIB_TO_DLLDIR=\"`$(MAKEDEP) -R ${libdir} ${dlldir}`\" \ - -DBIN_TO_DLLDIR=\"`$(MAKEDEP) -R ${bindir} ${dlldir}`\" \ - -DBIN_TO_DATADIR=\"`$(MAKEDEP) -R ${bindir} ${datadir}/wine`\" + -DLIB_TO_BINDIR=\"`${MAKEDEP} -R ${libdir} ${bindir}`\" \ + -DLIB_TO_DLLDIR=\"`${MAKEDEP} -R ${libdir} ${dlldir}`\" \ + -DBIN_TO_DLLDIR=\"`${MAKEDEP} -R ${bindir} ${dlldir}`\" \ + -DBIN_TO_DATADIR=\"`${MAKEDEP} -R ${bindir} ${datadir}/wine`\" SHAREDLIB = $(LIBWINE_SHAREDLIB) diff --git a/loader/Makefile.in b/loader/Makefile.in index 1cb9ab6bf7..e8c271f15d 100644 --- a/loader/Makefile.in +++ b/loader/Makefile.in @@ -18,7 +18,7 @@ INSTALL_LIB = $(WINELOADER_PROGRAMS) preloader_EXTRADEFS = -fno-builtin -main_EXTRADEFS = -DDLLDIR=\"${dlldir}\" -DBIN_TO_DLLDIR=\"`$(MAKEDEP) -R ${bindir} ${dlldir}`\" +main_EXTRADEFS = -DDLLDIR=\"${dlldir}\" -DBIN_TO_DLLDIR=\"`${MAKEDEP} -R ${bindir} ${dlldir}`\" wine_OBJS = main.o wine_DEPS = $(WINELOADER_DEPENDS) diff --git a/tools/widl/Makefile.in b/tools/widl/Makefile.in index 6c74e88d25..a231087f37 100644 --- a/tools/widl/Makefile.in +++ b/tools/widl/Makefile.in @@ -21,7 +21,7 @@ BISON_SRCS = parser.y widl_EXTRADEFS = \ -DINCLUDEDIR="\"${includedir}\"" \ - -DBIN_TO_INCLUDEDIR=\"`$(MAKEDEP) -R ${bindir} ${includedir}`\" + -DBIN_TO_INCLUDEDIR=\"`${MAKEDEP} -R ${bindir} ${includedir}`\" EXTRALIBS = -lwpp diff --git a/tools/winegcc/Makefile.in b/tools/winegcc/Makefile.in index 0d94eed5ff..8328d6f34a 100644 --- a/tools/winegcc/Makefile.in +++ b/tools/winegcc/Makefile.in @@ -11,8 +11,8 @@ C_SRCS = \ winegcc_EXTRADEFS = \ -DINCLUDEDIR="\"${includedir}\"" \ -DLIBDIR="\"${libdir}\"" \ - -DBIN_TO_INCLUDEDIR=\"`$(MAKEDEP) -R ${bindir} ${includedir}`\" \ - -DBIN_TO_LIBDIR=\"`$(MAKEDEP) -R ${bindir} ${libdir}`\" \ + -DBIN_TO_INCLUDEDIR=\"`${MAKEDEP} -R ${bindir} ${includedir}`\" \ + -DBIN_TO_LIBDIR=\"`${MAKEDEP} -R ${bindir} ${libdir}`\" \ -DCC="\"$(CC)\"" \ -DCPP="\"$(CPPBIN)\"" \ -DCXX="\"$(CXX)\"" \ diff --git a/tools/wmc/Makefile.in b/tools/wmc/Makefile.in index 660bc940f4..9d7c87e8fd 100644 --- a/tools/wmc/Makefile.in +++ b/tools/wmc/Makefile.in @@ -13,7 +13,7 @@ BISON_SRCS = mcy.y wmc_EXTRADEFS = \ -DNLSDIR="\"${nlsdir}\"" \ - -DBIN_TO_NLSDIR=\"`$(MAKEDEP) -R ${bindir} ${nlsdir}`\" + -DBIN_TO_NLSDIR=\"`${MAKEDEP} -R ${bindir} ${nlsdir}`\" EXTRALIBS = $(GETTEXTPO_LIBS) diff --git a/tools/wrc/Makefile.in b/tools/wrc/Makefile.in index b7462e3b99..fb6eba20c2 100644 --- a/tools/wrc/Makefile.in +++ b/tools/wrc/Makefile.in @@ -17,8 +17,8 @@ BISON_SRCS = parser.y wrc_EXTRADEFS = \ -DNLSDIR="\"${nlsdir}\"" \ -DINCLUDEDIR="\"${includedir}\"" \ - -DBIN_TO_NLSDIR=\"`$(MAKEDEP) -R ${bindir} ${nlsdir}`\" \ - -DBIN_TO_INCLUDEDIR=\"`$(MAKEDEP) -R ${bindir} ${includedir}`\" + -DBIN_TO_NLSDIR=\"`${MAKEDEP} -R ${bindir} ${nlsdir}`\" \ + -DBIN_TO_INCLUDEDIR=\"`${MAKEDEP} -R ${bindir} ${includedir}`\" EXTRALIBS = $(GETTEXTPO_LIBS) -lwpp

1 0

Alexandre Julliard : makefiles: Store .pot files in a separate variable.
by Alexandre Julliard 09 Sep '20

09 Sep '20

Module: wine Branch: master Commit: 82acb284bda2fe655ce0ff51b18667f1c9311e30 URL: https://source.winehq.org/git/wine.git/?a=commit;h=82acb284bda2fe655ce0ff51… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 9 11:46:00 2020 +0200 makefiles: Store .pot files in a separate variable. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 34 ++++++++++++---------------------- 1 file changed, 12 insertions(+), 22 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index e17bf24c41..b4576d94f4 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -208,6 +208,7 @@ struct makefile /* values generated at output time */ struct strarray in_files; struct strarray ok_files; + struct strarray pot_files; struct strarray clean_files; struct strarray distclean_files; struct strarray uninstall_files; @@ -2657,32 +2658,18 @@ static void output_po_files( const struct makefile *make ) { const char *po_dir = src_dir_path( make, "po" ); struct strarray pot_files = empty_strarray; - struct incl_file *source; - unsigned int i; + unsigned int i, j; for (i = 0; i < make->subdirs.count; i++) { struct makefile *submake = make->submakes[i]; - LIST_FOR_EACH_ENTRY( source, &submake->sources, struct incl_file, entry ) + for (j = 0; j < submake->pot_files.count; j++) { - if (source->file->flags & FLAG_PARENTDIR) continue; - if (strendswith( source->name, ".rc" ) && (source->file->flags & FLAG_RC_PO)) - { - char *pot_file = replace_extension( source->name, ".rc", ".pot" ); - char *pot_path = base_dir_path( submake, pot_file ); - output( "%s: tools/wrc include dummy\n", pot_path ); - output( "\t(a)cd %s && $(MAKE) %s\n", base_dir_path( submake, "" ), pot_file ); - strarray_add( &pot_files, pot_path ); - } - else if (strendswith( source->name, ".mc" )) - { - char *pot_file = replace_extension( source->name, ".mc", ".pot" ); - char *pot_path = base_dir_path( submake, pot_file ); - output( "%s: tools/wmc include dummy\n", pot_path ); - output( "\t(a)cd %s && $(MAKE) %s\n", base_dir_path( submake, "" ), pot_file ); - strarray_add( &pot_files, pot_path ); - } + char *pot_path = base_dir_path( submake, submake->pot_files.str[j] ); + output( "%s: dummy\n", pot_path ); + output( "\t(a)cd %s && $(MAKE) %s\n", base_dir_path( submake, "" ), submake->pot_files.str[j] ); + strarray_add( &pot_files, pot_path ); } } if (linguas.count) @@ -2697,6 +2684,8 @@ static void output_po_files( const struct makefile *make ) output_filename( strmake( "%s/%s.po", po_dir, linguas.str[i] )); output( "\n" ); } + output_filenames( pot_files ); + output( ": tools/wrc tools/wmc include\n" ); output( "%s/wine.pot:", po_dir ); output_filenames( pot_files ); output( "\n" ); @@ -2766,7 +2755,7 @@ static void output_source_rc( struct makefile *make, struct incl_file *source, c strarray_add( &make->res_files, strmake( "%s.res", obj )); if (source->file->flags & FLAG_RC_PO && !(source->file->flags & FLAG_PARENTDIR)) { - strarray_add( &make->clean_files, strmake( "%s.pot", obj )); + 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 ); @@ -2800,7 +2789,7 @@ static void output_source_mc( struct makefile *make, struct incl_file *source, c char *obj_path = obj_dir_path( make, obj ); strarray_add( &make->res_files, strmake( "%s.res", obj )); - strarray_add( &make->clean_files, strmake( "%s.pot", obj )); + 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" )); output_filenames( source->dependencies ); @@ -3977,6 +3966,7 @@ static void output_sources( struct makefile *make ) strarray_addall( &make->clean_files, make->crossobj_files ); 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 ); strarray_addall( &make->clean_files, make->extra_targets );

1 0

Alexandre Julliard : makefiles: Add some missing object dir references.
by Alexandre Julliard 09 Sep '20

09 Sep '20

Module: wine Branch: master Commit: 5adb93c654aab78f26f40b83ebca39af0326ba6d URL: https://source.winehq.org/git/wine.git/?a=commit;h=5adb93c654aab78f26f40b83… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 9 11:47:29 2020 +0200 makefiles: Add some missing object dir references. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index b4576d94f4..96f7100a0e 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2559,13 +2559,13 @@ static void output_install_rules( struct makefile *make, enum install_rules rule } } - output( "install %s::", target ); + output( "%s %s::", obj_dir_path( make, "install" ), obj_dir_path( make, target )); output_filenames( targets ); output( "\n" ); output_install_commands( make, NULL, files ); - strarray_add_uniq( &make->phony_targets, "install" ); - strarray_add_uniq( &make->phony_targets, target ); + strarray_add_uniq( &make->phony_targets, obj_dir_path( make, "install" )); + strarray_add_uniq( &make->phony_targets, obj_dir_path( make, target )); } @@ -2628,8 +2628,7 @@ static void output_uninstall_rules( struct makefile *make ) /******************************************************************* * output_importlib_symlinks */ -static struct strarray output_importlib_symlinks( const struct makefile *parent, - const struct makefile *make ) +static struct strarray output_importlib_symlinks( const struct makefile *make ) { struct strarray ret = empty_strarray; const char *lib, *dst, *ext[4]; @@ -2642,7 +2641,7 @@ static struct strarray output_importlib_symlinks( const struct makefile *parent, for (i = 0; i < count; i++) { lib = strmake( "lib%s.%s", make->importlib, ext[i] ); - dst = concat_paths( obj_dir_path( parent, "dlls" ), lib ); + dst = concat_paths( obj_dir_path( top_makefile, "dlls" ), lib ); output( "%s: %s\n", dst, base_dir_path( make, lib )); output_symlink_rule( concat_paths( make->base_dir + strlen("dlls/"), lib ), dst ); strarray_add( &ret, dst ); @@ -3357,7 +3356,7 @@ static void output_module( struct makefile *make ) strarray_add( &make->all_targets, unix_lib ); add_install_rule( make, make->module, unix_lib, strmake( "p$(dlldir)/%s", unix_lib )); - output( "%s:", unix_lib ); + output( "%s:", obj_dir_path( make, unix_lib )); if (spec_file) output_filename( spec_file ); output_filenames_obj_dir( make, make->unixobj_files ); output_filenames( unix_deps ); @@ -3576,18 +3575,18 @@ static void output_test_module( struct makefile *make ) testmodule, obj_dir_path( make, stripped ), ext, tools_path( make, "wrc" )); output_filenames_obj_dir( make, make->ok_files ); - output( ": %s%s ../%s%s\n", testmodule, ext, make->testdll, parent_ext ); - output( "check test:" ); + output( ": %s%s ../%s%s\n", obj_dir_path( make, testmodule ), ext, make->testdll, parent_ext ); + output( "%s %s:", obj_dir_path( make, "check" ), obj_dir_path( make, "test" )); if (!make->disabled && parent && !parent->disabled) output_filenames_obj_dir( make, make->ok_files ); output( "\n" ); - strarray_add( &make->phony_targets, "check" ); - strarray_add( &make->phony_targets, "test" ); - output( "testclean::\n" ); + strarray_add_uniq( &make->phony_targets, obj_dir_path( make, "check" )); + strarray_add_uniq( &make->phony_targets, obj_dir_path( make, "test" )); + output( "%s::\n", obj_dir_path( make, "testclean" )); output( "\trm -f" ); output_filenames_obj_dir( make, make->ok_files ); output( "\n" ); strarray_addall( &make->clean_files, make->ok_files ); - strarray_add( &make->phony_targets, "testclean" ); + strarray_add_uniq( &make->phony_targets, obj_dir_path( make, "testclean" )); } @@ -3745,7 +3744,7 @@ static void output_subdirs( struct makefile *make ) } } if (needs_implib_symlink( submake )) - strarray_addall( &symlinks, output_importlib_symlinks( make, submake )); + strarray_addall( &symlinks, output_importlib_symlinks( submake )); } if (submake->disabled) continue; @@ -3884,7 +3883,7 @@ static void output_sources( struct makefile *make ) struct incl_file *source; unsigned int i, j; - strarray_add( &make->phony_targets, "all" ); + strarray_add_uniq( &make->phony_targets, "all" ); LIST_FOR_EACH_ENTRY( source, &make->sources, struct incl_file, entry ) { @@ -3947,9 +3946,10 @@ static void output_sources( struct makefile *make ) { if (make->all_targets.count) { - output( "all:" ); + output( "%s:", obj_dir_path( make, "all" )); output_filenames_obj_dir( make, make->all_targets ); output( "\n" ); + strarray_add_uniq( &make->phony_targets, obj_dir_path( make, "all" )); } output_install_rules( make, INSTALL_LIB, "install-lib" ); output_install_rules( make, INSTALL_DEV, "install-dev" ); @@ -3977,8 +3977,7 @@ static void output_sources( struct makefile *make ) output( "\trm -f" ); output_filenames_obj_dir( make, make->clean_files ); output( "\n" ); - if (make->obj_dir) output( "__clean__: %s\n", obj_dir_path( make, "clean" )); - strarray_add( &make->phony_targets, obj_dir_path( make, "clean" )); + strarray_add_uniq( &make->phony_targets, obj_dir_path( make, "clean" )); } if (make->phony_targets.count)

1 0

Alexandre Julliard : makefiles: Build extra targets explicitly if they are not a dependency.
by Alexandre Julliard 09 Sep '20

09 Sep '20

Module: wine Branch: master Commit: 96e5ac876fd48c3692a2b89780e7bb40fe526798 URL: https://source.winehq.org/git/wine.git/?a=commit;h=96e5ac876fd48c3692a2b897… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 9 11:47:42 2020 +0200 makefiles: Build extra targets explicitly if they are not a dependency. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/Makefile.in | 2 -- tools/makedep.c | 7 ++++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/wineandroid.drv/Makefile.in b/dlls/wineandroid.drv/Makefile.in index e35f85ac89..fcc988b211 100644 --- a/dlls/wineandroid.drv/Makefile.in +++ b/dlls/wineandroid.drv/Makefile.in @@ -18,8 +18,6 @@ SVG_SRCS = \ EXTRA_TARGETS = wine-debug.apk -all: wine-debug.apk - wine-debug.apk: build.gradle $(srcdir)/AndroidManifest.xml $(srcdir)/WineActivity.java $(srcdir)/wine.svg gradle -q assembleDebug mv build/outputs/apk/wine-debug.apk $@ diff --git a/tools/makedep.c b/tools/makedep.c index 96f7100a0e..4775a60334 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -3931,6 +3931,12 @@ static void output_sources( struct makefile *make ) add_install_rule( make, make->scripts.str[i], make->scripts.str[i], strmake( "S$(bindir)/%s", make->scripts.str[i] )); + for (i = 0; i < make->extra_targets.count; i++) + 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] ); + if (!make->src_dir) strarray_add( &make->distclean_files, ".gitignore" ); strarray_add( &make->distclean_files, "Makefile" ); if (make->testdll) strarray_add( &make->distclean_files, "testlist.c" ); @@ -3969,7 +3975,6 @@ static void output_sources( struct makefile *make ) strarray_addall( &make->clean_files, make->pot_files ); strarray_addall( &make->clean_files, make->debug_files ); strarray_addall( &make->clean_files, make->all_targets ); - strarray_addall( &make->clean_files, make->extra_targets ); if (make->clean_files.count) {

1 0

Paul Gofman : vcruntime140_1: Handle rethrowing from nested try blocks on x64.
by Alexandre Julliard 09 Sep '20

09 Sep '20

Module: wine Branch: master Commit: c25a611d95a449946273415f0fb3733edd485699 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c25a611d95a449946273415f… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Sep 8 23:36:41 2020 +0300 vcruntime140_1: Handle rethrowing from nested try blocks on x64. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vcruntime140_1/except_x86_64.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/vcruntime140_1/except_x86_64.c b/dlls/vcruntime140_1/except_x86_64.c index 0e27b02db1..f66ae43721 100644 --- a/dlls/vcruntime140_1/except_x86_64.c +++ b/dlls/vcruntime140_1/except_x86_64.c @@ -103,6 +103,7 @@ typedef struct BOOL rethrow; INT search_state; INT unwind_state; + EXCEPTION_RECORD *prev_rec; } cxx_catch_ctx; typedef struct @@ -473,7 +474,7 @@ static LONG CALLBACK cxx_rethrow_filter(PEXCEPTION_POINTERS eptrs, void *c) FlsSetValue(fls_index, (void*)(DWORD_PTR)ctx->search_state); if (rec->ExceptionCode != CXX_EXCEPTION) return EXCEPTION_CONTINUE_SEARCH; - if (rec->ExceptionInformation[1] == ((EXCEPTION_RECORD*)*__current_exception())->ExceptionInformation[1]) + if (rec->ExceptionInformation[1] == ctx->prev_rec->ExceptionInformation[1]) ctx->rethrow = TRUE; return EXCEPTION_CONTINUE_SEARCH; } @@ -503,6 +504,7 @@ static void* WINAPI call_catch_block4(EXCEPTION_RECORD *rec) __CxxRegisterExceptionObject(&ep, &ctx.frame_info); ctx.search_state = rec->ExceptionInformation[2]; ctx.unwind_state = rec->ExceptionInformation[3]; + ctx.prev_rec = prev_rec; (*__processing_throw())--; __TRY { @@ -685,6 +687,12 @@ static DWORD cxx_frame_handler4(EXCEPTION_RECORD *rec, ULONG64 frame, if (rec->ExceptionCode == CXX_EXCEPTION) { + if (!rec->ExceptionInformation[1] && !rec->ExceptionInformation[2]) + { + TRACE("rethrow detected.\n"); + *rec = *(EXCEPTION_RECORD*)*__current_exception(); + } + exc_type = (cxx_exception_type *)rec->ExceptionInformation[2]; if (TRACE_ON(seh))

1 0