wine-commits January 2021

wine-commits@winehq.org

2 participants
472 discussions

Brendan Shanks : loader: On Mac, reserve an area starting at 4GB to force Rosetta's allocations higher.
by Alexandre Julliard 29 Jan '21

29 Jan '21

Module: wine Branch: master Commit: 307f5d00f17d71fe0030acb6ba9f28c3c9d76615 URL: https://source.winehq.org/git/wine.git/?a=commit;h=307f5d00f17d71fe0030acb6… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Thu Jan 28 14:52:46 2021 -0800 loader: On Mac, reserve an area starting at 4GB to force Rosetta's allocations higher. On Apple Silicon, Rosetta allocates memory starting at 0x100000000 (the 4GB line) before the preloader runs. The .NET 3.5 installer and DirectX Jun2010 redistributable both contain non-relocatable EXEs with that base address, which fail to run. The workaround is to create an empty linker section at that address, which is mapped by the kernel before Rosetta runs and forces Rosetta's allocations higher in memory. The linker section runs from 0x100000000-0x114000000. Rosetta's allocations are ~132MB, and should end below 0x120000000. This is not an exact science: a non-relocatable EXE with base address between 0x114000000-0x120000000 will fail to run. If one is discovered, the section size will need to be changed. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 +- configure.ac | 2 +- loader/preloader_mac.c | 16 ++++++++++++++++ 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 4cb23101f4c..42596bbb9c8 100755 --- a/configure +++ b/configure @@ -8727,7 +8727,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu WINELOADER_LDFLAGS="-Wl,-pie,-pagezero_size,0x1000,-sectcreate,__TEXT,__info_plist,loader/wine_info.plist" wine_can_build_preloader=yes - WINEPRELOADER_LDFLAGS="-nostartfiles -nodefaultlibs -e _start -ldylib1.o -Wl,-image_base,0x7d400000,-pagezero_size,0x1000,-sectcreate,__TEXT,__info_plist,loader/wine_info.plist" + WINEPRELOADER_LDFLAGS="-nostartfiles -nodefaultlibs -e _start -ldylib1.o -Wl,-image_base,0x7d400000,-pagezero_size,0x1000,-sectcreate,__TEXT,__info_plist,loader/wine_info.plist,-segaddr,WINE_4GB_RESERVE,0x100000000" { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wl,-no_new_main -e _main" >&5 $as_echo_n "checking whether the compiler supports -Wl,-no_new_main -e _main... " >&6; } if ${ac_cv_cflags__Wl__no_new_main__e__main+:} false; then : diff --git a/configure.ac b/configure.ac index 0f8b9f6c080..a9003523700 100644 --- a/configure.ac +++ b/configure.ac @@ -753,7 +753,7 @@ case $host_os in WINELOADER_LDFLAGS="-Wl,-pie,-pagezero_size,0x1000,-sectcreate,__TEXT,__info_plist,loader/wine_info.plist" wine_can_build_preloader=yes - WINEPRELOADER_LDFLAGS="-nostartfiles -nodefaultlibs -e _start -ldylib1.o -Wl,-image_base,0x7d400000,-pagezero_size,0x1000,-sectcreate,__TEXT,__info_plist,loader/wine_info.plist" + WINEPRELOADER_LDFLAGS="-nostartfiles -nodefaultlibs -e _start -ldylib1.o -Wl,-image_base,0x7d400000,-pagezero_size,0x1000,-sectcreate,__TEXT,__info_plist,loader/wine_info.plist,-segaddr,WINE_4GB_RESERVE,0x100000000" WINE_TRY_CFLAGS([-Wl,-no_new_main -e _main], [WINEPRELOADER_LDFLAGS="-Wl,-no_new_main $WINEPRELOADER_LDFLAGS" WINE_TRY_CFLAGS([-Wl,-no_new_main -e _main -nostartfiles -nodefaultlibs],, diff --git a/loader/preloader_mac.c b/loader/preloader_mac.c index d86675538bb..fc07b7da0ed 100644 --- a/loader/preloader_mac.c +++ b/loader/preloader_mac.c @@ -54,6 +54,17 @@ #include "wine/asm.h" #include "main.h" +/* Rosetta on Apple Silicon allocates memory starting at 0x100000000 (the 4GB line) + * before the preloader runs, which prevents any nonrelocatable EXEs with that + * base address from running. + * + * This empty linker section forces Rosetta's allocations (currently ~132 MB) + * to start at 0x114000000, and they should end below 0x120000000. + */ +#if defined(__x86_64__) +__asm__(".zerofill WINE_4GB_RESERVE,WINE_4GB_RESERVE,___wine_4gb_reserve,0x14000000"); +#endif + #ifndef LC_MAIN #define LC_MAIN 0x80000028 struct entry_point_command @@ -79,6 +90,7 @@ static struct wine_preload_info preload_info[] = { (void *)0x000000010000, 0x00100000 }, /* DOS area */ { (void *)0x000000110000, 0x67ef0000 }, /* low memory area */ { (void *)0x00007ff00000, 0x000f0000 }, /* shared user data */ + { (void *)0x000100000000, 0x14000000 }, /* WINE_4GB_RESERVE section */ { (void *)0x7ffd00000000, 0x01ff0000 }, /* top-down allocations + virtual heap */ #endif /* __i386__ */ { 0, 0 }, /* PE exe range set with WINEPRELOADRESERVE */ @@ -395,6 +407,10 @@ static int preloader_overlaps_range( const void *start, const void *end ) struct target_segment_command *seg = (struct target_segment_command*)cmd; const void *seg_start = (const void*)(seg->vmaddr + slide); const void *seg_end = (const char*)seg_start + seg->vmsize; + static const char reserved_segname[] = "WINE_4GB_RESERVE"; + + if (!wld_strncmp( seg->segname, reserved_segname, sizeof(reserved_segname)-1 )) + continue; if (end > seg_start && start <= seg_end) {

1 0

Brendan Shanks : loader: On Mac, move the top-down allocations area down to avoid Rosetta regions.
by Alexandre Julliard 29 Jan '21

29 Jan '21

Module: wine Branch: master Commit: 720611e28e750b42c7b8d7a2b72047e3027c1ec5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=720611e28e750b42c7b8d7a2… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Thu Jan 28 14:52:45 2021 -0800 loader: On Mac, move the top-down allocations area down to avoid Rosetta regions. On Apple Silicon, Rosetta's shared cache starts at 0x7ffe00000000 and the runtime is mapped below that. Put the top-down allocation area below the runtime with plenty of room to spare. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/preloader_mac.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/loader/preloader_mac.c b/loader/preloader_mac.c index 43dc6b2b7e6..d86675538bb 100644 --- a/loader/preloader_mac.c +++ b/loader/preloader_mac.c @@ -79,7 +79,7 @@ static struct wine_preload_info preload_info[] = { (void *)0x000000010000, 0x00100000 }, /* DOS area */ { (void *)0x000000110000, 0x67ef0000 }, /* low memory area */ { (void *)0x00007ff00000, 0x000f0000 }, /* shared user data */ - { (void *)0x7ffef0000000, 0x01ff0000 }, /* top-down allocations + virtual heap */ + { (void *)0x7ffd00000000, 0x01ff0000 }, /* top-down allocations + virtual heap */ #endif /* __i386__ */ { 0, 0 }, /* PE exe range set with WINEPRELOADRESERVE */ { 0, 0 } /* end of list */

1 0

Rémi Bernon : include: Add IWMPMedia3 interface to wmp.idl.
by Alexandre Julliard 29 Jan '21

29 Jan '21

Module: wine Branch: master Commit: 4b74eb09a6ebca81c79cce84a67a28ef995df7e0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4b74eb09a6ebca81c79cce84… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jan 28 19:14:53 2021 +0100 include: Add IWMPMedia3 interface to wmp.idl. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wmp.idl | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/include/wmp.idl b/include/wmp.idl index 2a438b00ce7..ac2fa27effc 100644 --- a/include/wmp.idl +++ b/include/wmp.idl @@ -855,6 +855,21 @@ library WMPLib { HRESULT error([out, retval] IWMPErrorItem **out); } + [ + odl, + uuid(f118efc7-f03a-4fb4-99c9-1c02a5c1065b), + dual, + oleautomation + ] + interface IWMPMedia3 : IWMPMedia2 + { + [id(0x0301)] + HRESULT getAttributeCountByType([in] BSTR type, [in] BSTR language, [out, retval] long *out); + + [id(0x0302)] + HRESULT getItemInfoByType([in] BSTR type, [in] BSTR language, [in] long index, [out, retval] VARIANT *out); + } + [ odl, uuid(a12dcf7d-14ab-4c1b-a8cd-63909f06025b), @@ -1486,7 +1501,7 @@ library WMPLib { interface IWMPDVD; interface IWMPControls2; interface IWMPMedia2; - /* interface IWMPMedia3; */ + interface IWMPMedia3; /* interface IWMPMetadataPicture; */ /* interface IWMPMetadataText; */ /* interface IWMPSettings2; */

1 0

Rémi Bernon : include: Add IWMPMedia2 interface to wmp.idl.
by Alexandre Julliard 29 Jan '21

29 Jan '21

Module: wine Branch: master Commit: 90f0542f4341a38b82061f2ffde6e910fcdab514 URL: https://source.winehq.org/git/wine.git/?a=commit;h=90f0542f4341a38b82061f2f… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jan 28 19:14:52 2021 +0100 include: Add IWMPMedia2 interface to wmp.idl. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wmp.idl | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/include/wmp.idl b/include/wmp.idl index b845865103d..2a438b00ce7 100644 --- a/include/wmp.idl +++ b/include/wmp.idl @@ -843,6 +843,18 @@ library WMPLib { HRESULT customUrl([out, retval] BSTR *pbstrCustomUrl); } + [ + odl, + uuid(ab7c88bb-143e-4ea4-acc3-e4350b2106c3), + dual, + oleautomation + ] + interface IWMPMedia2 : IWMPMedia + { + [id(0x0300), propget] + HRESULT error([out, retval] IWMPErrorItem **out); + } + [ odl, uuid(a12dcf7d-14ab-4c1b-a8cd-63909f06025b), @@ -1473,7 +1485,7 @@ library WMPLib { interface IWMPClosedCaption; interface IWMPDVD; interface IWMPControls2; - /* interface IWMPMedia2; */ + interface IWMPMedia2; /* interface IWMPMedia3; */ /* interface IWMPMetadataPicture; */ /* interface IWMPMetadataText; */

1 0

Rémi Bernon : include: Add IWmpControls2 interface to wmp.idl.
by Alexandre Julliard 29 Jan '21

29 Jan '21

Module: wine Branch: master Commit: 6eb546c12ca8fe576d764caa3b3bfdc04bb154f7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6eb546c12ca8fe576d764caa… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jan 28 19:14:51 2021 +0100 include: Add IWmpControls2 interface to wmp.idl. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wmp.idl | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/include/wmp.idl b/include/wmp.idl index 8a146bdbea9..b845865103d 100644 --- a/include/wmp.idl +++ b/include/wmp.idl @@ -360,6 +360,18 @@ library WMPLib { HRESULT playItem([in] IWMPMedia *pIWMPMedia); } + [ + odl, + uuid(6f030d25-0890-480f-9775-1f7e40ab5b8e), + dual, + oleautomation + ] + interface IWMPControls2 : IWMPControls + { + [id(0x0040)] + HRESULT step([in] long lStep); + } + [ odl, uuid(cbb92747-741f-44fe-ab5b-f1a48f3b2a59), @@ -1460,7 +1472,7 @@ library WMPLib { /* interface IWMPErrorItem2; */ interface IWMPClosedCaption; interface IWMPDVD; - /* interface IWMPControls2; */ + interface IWMPControls2; /* interface IWMPMedia2; */ /* interface IWMPMedia3; */ /* interface IWMPMetadataPicture; */

1 0

Rémi Bernon : include: Add IWMPRemoteMediaServices interface to wmp.idl.
by Alexandre Julliard 29 Jan '21

29 Jan '21

Module: wine Branch: master Commit: af1181bbde5d6ef67f39d1a3ce58f400af0fb91c URL: https://source.winehq.org/git/wine.git/?a=commit;h=af1181bbde5d6ef67f39d1a3… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jan 28 19:14:50 2021 +0100 include: Add IWMPRemoteMediaServices interface to wmp.idl. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wmp.idl | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/include/wmp.idl b/include/wmp.idl index 442b7021383..8a146bdbea9 100644 --- a/include/wmp.idl +++ b/include/wmp.idl @@ -360,6 +360,22 @@ library WMPLib { HRESULT playItem([in] IWMPMedia *pIWMPMedia); } + [ + odl, + uuid(cbb92747-741f-44fe-ab5b-f1a48f3b2a59), + oleautomation + ] + interface IWMPRemoteMediaServices : IUnknown + { + HRESULT GetServiceType([out, retval] BSTR *type); + + HRESULT GetApplicationName([out, retval] BSTR *name); + + HRESULT GetScriptableObject([out, retval] BSTR *name, [out, retval] IDispatch **out); + + HRESULT GetCustomUIMode([out, retval] BSTR *file); + } + [ odl, uuid(9104d1ab-80c9-4fed-abf0-2e6417a6df14),

1 0

Matteo Bruni : vkd3d-compiler: Update usage message for the -x option.
by Alexandre Julliard 29 Jan '21

29 Jan '21

Module: vkd3d Branch: master Commit: abe7051e99e79d18c10351aa4917cce317825031 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=abe7051e99e79d18c10351a… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Jan 28 18:43:44 2021 +0100 vkd3d-compiler: Update usage message for the -x option. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/vkd3d-compiler/main.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index e98e713..fb19a70 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -178,8 +178,10 @@ static void print_usage(const char *program_name) " -p, --profile=<name> Specify the target shader profile for HLSL shaders.\n" " --strip-debug Strip debug information from the output.\n" " -V, --version Display version information and exit.\n" - " -x <type> Specify the type of the source. Valid values are\n" - " 'dxbc-tpf' and 'none'.\n" + " -x <type> Specify the type of the source. Use --print-source-types\n" + " to list valid source types. The default source type is\n" + " 'dxbc-tpf' for compile operations, and 'hlsl' for\n" + " preprocess operations.\n" " -- Stop option processing. Any subsequent argument is\n" " interpreted as a filename.\n" "\n"

1 0

Matteo Bruni : vkd3d-compiler: Set default source type before handling --print-target-types.
by Alexandre Julliard 29 Jan '21

29 Jan '21

Module: vkd3d Branch: master Commit: 5399f6fcc6cbf77a25b860eee9e500539df4fab6 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=5399f6fcc6cbf77a25b860e… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Jan 28 18:43:43 2021 +0100 vkd3d-compiler: Set default source type before handling --print-target-types. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/vkd3d-compiler/main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index 94cce20..e98e713 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -480,14 +480,14 @@ static bool parse_command_line(int argc, char **argv, struct options *options) } } - if (options->print_target_types) - return true; - if (options->source_type == VKD3D_SHADER_SOURCE_NONE) options->source_type = options->preprocess_only ? VKD3D_SHADER_SOURCE_HLSL : VKD3D_SHADER_SOURCE_DXBC_TPF; if (options->target_type == VKD3D_SHADER_TARGET_NONE && !options->preprocess_only) options->target_type = VKD3D_SHADER_TARGET_SPIRV_BINARY; + if (options->print_target_types) + return true; + if (!options->preprocess_only && !validate_target_type(options->source_type, options->target_type)) { fprintf(stderr, "Target type '%s' is invalid for source type '%s'.\n",

1 0

Zebediah Figura : vkd3d-shader: Import the HLSL compiler from Wine.
by Alexandre Julliard 29 Jan '21

29 Jan '21

Module: vkd3d Branch: master Commit: b523122ef3698c620a705d99aab2e6ba66877e87 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=b523122ef3698c620a705d9… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jan 27 10:29:44 2021 -0600 vkd3d-shader: Import the HLSL compiler from Wine. This corresponds to Wine commit 9f9fec18799bf59df6211b7294f8d338caa7f4db. Note that for the moment, compilation messages have not been ported. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 16 +- libs/vkd3d-shader/hlsl.c | 1672 +++++++++++++++++ libs/vkd3d-shader/hlsl.h | 644 +++++++ libs/vkd3d-shader/hlsl.l | 288 +++ libs/vkd3d-shader/hlsl.y | 2961 ++++++++++++++++++++++++++++++ libs/vkd3d-shader/trace.c | 9 + libs/vkd3d-shader/vkd3d_shader_main.c | 13 +- libs/vkd3d-shader/vkd3d_shader_private.h | 9 + 8 files changed, 5609 insertions(+), 3 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=b523122ef3698c620a7…

1 0

Francois Gouget : winetest/dissect: Improve the documentation of the missing start line handling.
by Alexandre Julliard 29 Jan '21

29 Jan '21

Module: tools Branch: master Commit: 7846c95f79bdbde997f62a6ae5a5facdbeb50186 URL: https://source.winehq.org/git/tools.git/?a=commit;h=7846c95f79bdbde997f62a6… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jan 29 06:20:10 2021 +0100 winetest/dissect: Improve the documentation of the missing start line handling. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/dissect | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/winetest/dissect b/winetest/dissect index e9729db..27bcf17 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -717,23 +717,28 @@ while ($line = <IN>) { if ($l_dll ne $dll or $l_unit ne $unit) { - # First close the current test unit taking into account - # it may have been polluted by the new one. + # Warn about the missing start line in the current test unit box. add_test_line("end", "The $l_dll:$l_unit start line is missing (or it is garbled)"); $extra_failures++; + + # And close the current test unit taking into account + # it may have been polluted by the new one. $broken = 1; close_test_unit(0); - # Then switch to the new one, warning it's missing a start line, - # and that its results may be inconsistent. + # Then switch to the new test unit, not for the past lines, but for + # those before the next 'start' line. This 'new' test unit may have + # inconsistent results too. ($dll, $unit, $source, $rev) = ($l_dll, $l_unit, "-", "-"); %units = ($unit => 1); $units_re = $unit; + $broken = 1; $testbox = create_test_unit_box(); + # Finally, warn about the missing start line in the new test unit + # box. add_test_line("end", "The $l_dll:$l_unit start line is missing (or it is garbled)"); $extra_failures++; - $broken = 1; } my $class = $l_rc ? "failed" : "";

1 0

← Newer
1
2
3
4
5
6
7
...
48
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2021