April 2020 - Wine-commits - list.winehq.org

Francois Gouget : testbot/build: Don't duplicate the addon.c filename.
by Alexandre Julliard 23 Apr '20

23 Apr '20

Module: tools Branch: master Commit: 696f3d92dbfb29fd140413ae29145dc879c59b13 URL: https://source.winehq.org/git/tools.git/?a=commit;h=696f3d92dbfb29fd140413a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Apr 23 15:04:02 2020 +0200 testbot/build: Don't duplicate the addon.c filename. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/Build/Utils.pm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/testbot/lib/Build/Utils.pm b/testbot/lib/Build/Utils.pm index 8c26327..7d0739e 100644 --- a/testbot/lib/Build/Utils.pm +++ b/testbot/lib/Build/Utils.pm @@ -416,7 +416,8 @@ sub _UpdateAddOn($$$) sub UpdateAddOns() { my %AddOns; - if (open(my $fh, "<", "$DataDir/wine/dlls/appwiz.cpl/addons.c")) + my $AddonSrc = "wine/dlls/appwiz.cpl/addons.c"; + if (open(my $fh, "<", "$DataDir/$AddonSrc")) { my $Arch = ""; while (my $Line= <$fh>) @@ -448,7 +449,7 @@ sub UpdateAddOns() } else { - LogMsg "Could not open 'wine/dlls/appwiz.cpl/addons.c': $!\n"; + LogMsg "Could not open '$AddonSrc': $!\n"; return 0; }

1 0

Francois Gouget : testbot/build: Rename _VerifyAddOn() to _IsAddOnBad().
by Alexandre Julliard 23 Apr '20

23 Apr '20

Module: tools Branch: master Commit: 977f84ac127647ed91b02ad226b4ba7d115073a1 URL: https://source.winehq.org/git/tools.git/?a=commit;h=977f84ac127647ed91b02ad… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Apr 23 15:04:17 2020 +0200 testbot/build: Rename _VerifyAddOn() to _IsAddOnBad(). The new name makes it clearer that _IsAddOnBad() returns true (the error message) if the addon is bad and false otherwise. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/Build/Utils.pm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/testbot/lib/Build/Utils.pm b/testbot/lib/Build/Utils.pm index 7d0739e..17addee 100644 --- a/testbot/lib/Build/Utils.pm +++ b/testbot/lib/Build/Utils.pm @@ -360,7 +360,7 @@ sub BuildWine($$$$;$) # Wine addons updates # -sub _VerifyAddOn($$) +sub _IsAddOnBad($$) { my ($AddOn, $Arch) = @_; @@ -395,7 +395,7 @@ sub _UpdateAddOn($$$) $AddOn->{filename} = "wine-$Name-$AddOn->{version}". ($Arch eq "" ? "" : "-$Arch") .".msi"; - return 1 if (!_VerifyAddOn($AddOn, $Arch)); + return 1 if (!_IsAddOnBad($AddOn, $Arch)); InfoMsg "Downloading $AddOn->{filename}\n"; mkdir "$DataDir/$Name"; @@ -407,7 +407,7 @@ sub _UpdateAddOn($$$) "wget --no-verbose -O- '$Url' >'$AddOn->{filename}'"); last if ($? == 0); } - my $ErrMessage = _VerifyAddOn($AddOn, $Arch); + my $ErrMessage = _IsAddOnBad($AddOn, $Arch); return 1 if (!defined $ErrMessage); LogMsg "$ErrMessage\n"; return 0;

1 0

Francois Gouget : testbot/build: Prepare for having multiple way to update addons.
by Alexandre Julliard 23 Apr '20

23 Apr '20

Module: tools Branch: master Commit: 66cca7b09689d2b05bf9a31c07444dccde64b330 URL: https://source.winehq.org/git/tools.git/?a=commit;h=66cca7b09689d2b05bf9a31… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Apr 23 15:04:23 2020 +0200 testbot/build: Prepare for having multiple way to update addons. Check whether the addon needs to be updated before any update method is called. Since _IsAddOnBad() needs all the information required to locate the addon it now stores it in the architecture-specific structure for reuse by the update methods such as _UpdateMSIAddOn(). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/Build/Utils.pm | 77 ++++++++++++++++++++++++++++------------------ 1 file changed, 47 insertions(+), 30 deletions(-) diff --git a/testbot/lib/Build/Utils.pm b/testbot/lib/Build/Utils.pm index 17addee..a6d38fc 100644 --- a/testbot/lib/Build/Utils.pm +++ b/testbot/lib/Build/Utils.pm @@ -1,5 +1,5 @@ # -*- Mode: Perl; perl-indent-level: 2; indent-tabs-mode: nil -*- -# Copyright 2018 Francois Gouget +# Copyright 2018-2020 Francois Gouget # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -360,23 +360,56 @@ sub BuildWine($$$$;$) # Wine addons updates # +my $ADDONS_URL = "http://dl.winehq.org/wine"; + sub _IsAddOnBad($$) { my ($AddOn, $Arch) = @_; + my $AddOnArch = $AddOn->{$Arch}; + if (!$AddOnArch->{msifile}) + { + $AddOn->{basedir} = "$DataDir/$AddOn->{name}"; + my $Basename = "wine-$AddOn->{name}-$AddOn->{version}"; + my $ArchSuffix = $Arch eq "" ? "" : "-$Arch"; + $AddOnArch->{msifile} = "$Basename$ArchSuffix.msi"; + mkdir "$AddOn->{basedir}"; + } + my $Sha256 = Digest::SHA->new(256); - eval { $Sha256->addfile("$DataDir/$AddOn->{name}/$AddOn->{filename}") }; + eval { $Sha256->addfile("$AddOn->{basedir}/$AddOnArch->{msifile}") }; return "$@" if ($@); my $Checksum = $Sha256->hexdigest(); - return undef if ($Checksum eq $AddOn->{$Arch}); - return "Bad checksum for '$AddOn->{filename}'"; + return undef if ($Checksum eq $AddOnArch->{checksum}); + return "Bad checksum for '$AddOnArch->{msifile}'"; +} + +sub _UpdateMSIAddOn($$) +{ + my ($AddOn, $Arch) = @_; + + my $AddOnArch = $AddOn->{$Arch}; + InfoMsg "Downloading $AddOnArch->{msifile}\n"; + my $Url="$ADDONS_URL/wine-$AddOn->{name}/$AddOn->{version}/$AddOnArch->{msifile}"; + my $ErrMessage; + for (1..3) + { + system("cd '$AddOn->{basedir}' && set -x && ". + "wget --no-verbose -O- '$Url' >'$AddOnArch->{msifile}'"); + $ErrMessage = _IsAddOnBad($AddOn, $Arch); + return 1 if (!defined $ErrMessage); + unlink "$AddOn->{basedir}/$AddOnArch->{msifile}"; + } + LogMsg "$ErrMessage\n"; + return 0; } sub _UpdateAddOn($$$) { - my ($AddOn, $Name, $Arch) = @_; + my ($AddOns, $Name, $Arch) = @_; + my $AddOn = $AddOns->{$Name}; if (!defined $AddOn) { LogMsg "Could not get information on the $Name addon\n"; @@ -389,33 +422,17 @@ sub _UpdateAddOn($$$) } if (!$AddOn->{$Arch}) { - LogMsg "Could not get the $Name $Arch checksum\n"; + LogMsg "Could not get the $Name $Arch MSI checksum\n"; return 0; } - $AddOn->{filename} = "wine-$Name-$AddOn->{version}". - ($Arch eq "" ? "" : "-$Arch") .".msi"; return 1 if (!_IsAddOnBad($AddOn, $Arch)); - - InfoMsg "Downloading $AddOn->{filename}\n"; - mkdir "$DataDir/$Name"; - - my $Url="http://dl.winehq.org/wine/wine-$Name/$AddOn->{version}/$AddOn->{filename}"; - for (1..3) - { - system("cd '$DataDir/$Name' && set -x && ". - "wget --no-verbose -O- '$Url' >'$AddOn->{filename}'"); - last if ($? == 0); - } - my $ErrMessage = _IsAddOnBad($AddOn, $Arch); - return 1 if (!defined $ErrMessage); - LogMsg "$ErrMessage\n"; - return 0; + return _UpdateMSIAddOn($AddOn, $Arch); } sub UpdateAddOns() { - my %AddOns; + my $AddOns; my $AddonSrc = "wine/dlls/appwiz.cpl/addons.c"; if (open(my $fh, "<", "$DataDir/$AddonSrc")) { @@ -434,14 +451,14 @@ sub UpdateAddOns() { my ($AddOn, $Version) = ($1, $2); $AddOn =~ tr/A-Z/a-z/; - $AddOns{$AddOn}->{name} = $AddOn; - $AddOns{$AddOn}->{version} = $Version; + $AddOns->{$AddOn}->{name} = $AddOn; + $AddOns->{$AddOn}->{version} = $Version; } elsif ($Line =~ /^\s*#\s*define\s*(GECKO|MONO)_SHA\s*"([^"]+)"/) { my ($AddOn, $Checksum) = ($1, $2); $AddOn =~ tr/A-Z/a-z/; - $AddOns{$AddOn}->{$Arch} = $Checksum; + $AddOns->{$AddOn}->{$Arch}->{checksum} = $Checksum; $Arch = ""; } } @@ -453,9 +470,9 @@ sub UpdateAddOns() return 0; } - return _UpdateAddOn($AddOns{gecko}, "gecko", "x86") && - _UpdateAddOn($AddOns{gecko}, "gecko", "x86_64") && - _UpdateAddOn($AddOns{mono}, "mono", "x86"); + return _UpdateAddOn($AddOns, "gecko", "x86") && + _UpdateAddOn($AddOns, "gecko", "x86_64") && + _UpdateAddOn($AddOns, "mono", "x86"); }

1 0

Francois Gouget : testbot/build: Add support for shared Gecko and Mono installs.
by Alexandre Julliard 23 Apr '20

23 Apr '20

Module: tools Branch: master Commit: 81386ee720fffa9c55e52e9ce405e0ae0395ba7d URL: https://source.winehq.org/git/tools.git/?a=commit;h=81386ee720fffa9c55e52e9… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Apr 23 15:04:27 2020 +0200 testbot/build: Add support for shared Gecko and Mono installs. This adds the _UpdateSharedAddOn() method and only calls _UpdateMSIAddOn() as a fallback. This also updates _IsAddOnBad() to check for the presence of the shared install so the addon is not updated if it is present in either the shared install or MSI form. _IsAddOnBad() also stores the information needed to locate and update the addon for use by the update methods. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/Build/Utils.pm | 53 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 52 insertions(+), 1 deletion(-) diff --git a/testbot/lib/Build/Utils.pm b/testbot/lib/Build/Utils.pm index a6d38fc..aa78618 100644 --- a/testbot/lib/Build/Utils.pm +++ b/testbot/lib/Build/Utils.pm @@ -373,9 +373,14 @@ sub _IsAddOnBad($$) my $Basename = "wine-$AddOn->{name}-$AddOn->{version}"; my $ArchSuffix = $Arch eq "" ? "" : "-$Arch"; $AddOnArch->{msifile} = "$Basename$ArchSuffix.msi"; + $AddOnArch->{shareddir} = $Basename; + $AddOnArch->{shareddir} .= $ArchSuffix if ($AddOn->{name} ne "mono"); + $AddOnArch->{basetar} = "$Basename$ArchSuffix"; mkdir "$AddOn->{basedir}"; } + return undef if (-d "$AddOn->{basedir}/$AddOnArch->{shareddir}"); + my $Sha256 = Digest::SHA->new(256); eval { $Sha256->addfile("$AddOn->{basedir}/$AddOnArch->{msifile}") }; return "$@" if ($@); @@ -405,6 +410,52 @@ sub _UpdateMSIAddOn($$) return 0; } +sub _UpdateSharedAddOn($$) +{ + my ($AddOn, $Arch) = @_; + + my $AddOnArch = $AddOn->{$Arch}; + InfoMsg "Downloading $AddOnArch->{basetar}\n"; + my $ErrMessage; + for (1..3) + { + foreach my $Suffix (".tar.xz", ".tar.bz2") + { + my $Tarfile = "$AddOnArch->{basetar}$Suffix"; + my $Url="$ADDONS_URL/wine-$AddOn->{name}/$AddOn->{version}/$Tarfile"; + system("cd '$AddOn->{basedir}' && set -x && ". + "wget --no-verbose -O- '$Url' >'$Tarfile'"); + if ($?) + { + unlink "$AddOn->{basedir}/$Tarfile"; + $ErrMessage ||= "Could not download the $AddOnArch->{basetar}* archive"; + } + else + { + my $Decompress = $Suffix eq ".tar.xz" ? "xz" : "bzip2"; + system("cd '$AddOn->{basedir}' && set -x && ". + "$Decompress -c -d '$Tarfile' | tar xf -"); + unlink "$AddOn->{basedir}/$Tarfile"; + if ($?) + { + $ErrMessage = "Could not decompress '$Tarfile'"; + } + elsif (!-d "$AddOn->{basedir}/$AddOnArch->{shareddir}") + { + $ErrMessage = "$Tarfile did not contain $AddOnArch->{shareddir}"; + } + else + { + return 1; # Success! + } + } + } + } + + LogMsg "$ErrMessage\n"; + return 0; +} + sub _UpdateAddOn($$$) { my ($AddOns, $Name, $Arch) = @_; @@ -427,7 +478,7 @@ sub _UpdateAddOn($$$) } return 1 if (!_IsAddOnBad($AddOn, $Arch)); - return _UpdateMSIAddOn($AddOn, $Arch); + return _UpdateSharedAddOn($AddOn, $Arch) || _UpdateMSIAddOn($AddOn, $Arch); } sub UpdateAddOns()

1 0

Stefan Dösinger : iphlpapi: MacOS struct sockaddr is 4 byte aligned on 64 bit.
by Alexandre Julliard 22 Apr '20

22 Apr '20

Module: wine Branch: master Commit: 594dfe68755c44db3a2d83e3ea50513b8c5c1ad9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=594dfe68755c44db3a2d83e3… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Apr 12 14:24:54 2020 +0200 iphlpapi: MacOS struct sockaddr is 4 byte aligned on 64 bit. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/ipstats.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index efb4d64c90..6986a4b315 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -145,7 +145,7 @@ #ifndef ROUNDUP #define ROUNDUP(a) \ - ((a) > 0 ? (1 + (((a) - 1) | (sizeof(long) - 1))) : sizeof(long)) + ((a) > 0 ? (1 + (((a) - 1) | (sizeof(int) - 1))) : sizeof(int)) #endif #ifndef ADVANCE #define ADVANCE(x, n) (x += ROUNDUP(((struct sockaddr *)n)->sa_len))

1 0

Stefan Dösinger : iphlpapi: Write an ERR if the sockaddr parsing went wrong.
by Alexandre Julliard 22 Apr '20

22 Apr '20

Module: wine Branch: master Commit: 7f4beb0883172a1629926e070fc6d5b6fab05922 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f4beb0883172a1629926e07… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Apr 12 14:24:55 2020 +0200 iphlpapi: Write an ERR if the sockaddr parsing went wrong. It should not happen any more after the previous patch but it is subtle enough that I think being verbose about it makes sense. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/ipstats.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index 6986a4b315..9d6a84dd33 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -1539,6 +1539,12 @@ DWORD WINAPI AllocateAndGetIpForwardTableFromStack(PMIB_IPFORWARDTABLE *ppIpForw continue; sa = (struct sockaddr *)addrPtr; + if (addrPtr + sa->sa_len > next + rtm->rtm_msglen) + { + ERR ("struct sockaddr extends beyond the route message, %p > %p\n", + addrPtr + sa->sa_len, next + rtm->rtm_msglen ); + } + ADVANCE (addrPtr, sa); /* default routes are encoded by length-zero sockaddr */

1 0

Stefan Dösinger : iphlpapi: Use the dst sa_family for the netmask too.
by Alexandre Julliard 22 Apr '20

22 Apr '20

Module: wine Branch: master Commit: 4932eec31368dcceed9bb816fbd2da3a7fb13a65 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4932eec31368dcceed9bb816… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Apr 12 14:24:56 2020 +0200 iphlpapi: Use the dst sa_family for the netmask too. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/ipstats.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index 9d6a84dd33..61f3a97ec4 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -1508,6 +1508,7 @@ DWORD WINAPI AllocateAndGetIpForwardTableFromStack(PMIB_IPFORWARDTABLE *ppIpForw for (next = buf; next < lim; next += rtm->rtm_msglen) { int i; + sa_family_t dst_family = AF_UNSPEC; rtm = (struct rt_msghdr *)next; @@ -1551,7 +1552,10 @@ DWORD WINAPI AllocateAndGetIpForwardTableFromStack(PMIB_IPFORWARDTABLE *ppIpForw if (sa->sa_len == 0) { addr = 0; }else { - switch(sa->sa_family) { + /* Apple's netstat prints the netmask together with the destination + * and only looks at the destination's address family. The netmask's + * sa_family sometimes contains the non-existent value 0xff. */ + switch(i == RTA_NETMASK ? dst_family : sa->sa_family) { case AF_INET: { struct sockaddr_in *sin = (struct sockaddr_in *)sa; addr = sin->sin_addr.s_addr; @@ -1575,7 +1579,10 @@ DWORD WINAPI AllocateAndGetIpForwardTableFromStack(PMIB_IPFORWARDTABLE *ppIpForw switch (i) { - case RTA_DST: row.dwForwardDest = addr; break; + case RTA_DST: + row.dwForwardDest = addr; + dst_family = sa->sa_family; + break; case RTA_GATEWAY: row.dwForwardNextHop = addr; break; case RTA_NETMASK: row.dwForwardMask = addr; break; default:

1 0

Stefan Dösinger : iphlpapi: Honor sa_len when reading AF_INET addresses.
by Alexandre Julliard 22 Apr '20

22 Apr '20

Module: wine Branch: master Commit: f3b64f950f2cbed96ded71a6b0526c4621434d39 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f3b64f950f2cbed96ded71a6… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Apr 12 14:24:57 2020 +0200 iphlpapi: Honor sa_len when reading AF_INET addresses. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/ipstats.c | 52 +++++++++++++++++++++++++------------------------ 1 file changed, 27 insertions(+), 25 deletions(-) diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index 61f3a97ec4..11d52d4d65 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -1548,33 +1548,35 @@ DWORD WINAPI AllocateAndGetIpForwardTableFromStack(PMIB_IPFORWARDTABLE *ppIpForw ADVANCE (addrPtr, sa); - /* default routes are encoded by length-zero sockaddr */ - if (sa->sa_len == 0) { - addr = 0; - }else { - /* Apple's netstat prints the netmask together with the destination - * and only looks at the destination's address family. The netmask's - * sa_family sometimes contains the non-existent value 0xff. */ - switch(i == RTA_NETMASK ? dst_family : sa->sa_family) { - case AF_INET: { - struct sockaddr_in *sin = (struct sockaddr_in *)sa; - addr = sin->sin_addr.s_addr; - break; - } + /* Apple's netstat prints the netmask together with the destination + * and only looks at the destination's address family. The netmask's + * sa_family sometimes contains the non-existent value 0xff. */ + switch(i == RTA_NETMASK ? dst_family : sa->sa_family) { + case AF_INET: { + /* Netmasks (and possibly other addresses) have only enough size + * to represent the non-zero bits, e.g. a netmask of 255.0.0.0 has + * 5 bytes (1 sa_len, 1 sa_family, 2 sa_port and 1 for the first + * byte of sin_addr). Due to the alignment constraint we can de + * facto read the full 4 bytes of sin_addr (except for the case of + * netmask 0). Don't assume though that the extra bytes are zeroed. */ + struct sockaddr_in sin = {0}; + memcpy(&sin, sa, sa->sa_len); + addr = sin.sin_addr.s_addr; + break; + } #ifdef AF_LINK - case AF_LINK: - if(i == RTA_GATEWAY && row.u1.ForwardType == MIB_IPROUTE_TYPE_DIRECT) { - /* For direct route we may simply use dest addr as next hop */ - C_ASSERT(RTA_DST < RTA_GATEWAY); - addr = row.dwForwardDest; - break; - } - /* fallthrough */ -#endif - default: - WARN ("Received unsupported sockaddr family 0x%x\n", sa->sa_family); - addr = 0; + case AF_LINK: + if(i == RTA_GATEWAY && row.u1.ForwardType == MIB_IPROUTE_TYPE_DIRECT) { + /* For direct route we may simply use dest addr as next hop */ + C_ASSERT(RTA_DST < RTA_GATEWAY); + addr = row.dwForwardDest; + break; } + /* fallthrough */ +#endif + default: + WARN ("Received unsupported sockaddr family 0x%x\n", sa->sa_family); + addr = 0; } switch (i)

1 0

Martin Storsjo : ntdll: Properly return errors when failing to unwind.
by Alexandre Julliard 22 Apr '20

22 Apr '20

Module: wine Branch: master Commit: ea9f47a767c20cdda3d912708b789314f09f8e28 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea9f47a767c20cdda3d91270… Author: Martin Storsjo <martin(a)martin.st> Date: Fri Apr 10 00:42:21 2020 +0300 ntdll: Properly return errors when failing to unwind. If libunwind is unavailable, make libunwind_virtual_unwind return an error. Likewise if there was no PE exception info and we didn't try unwinding using libunwind, we need to return an error when realizing we were unable to unwind, instead of just warning and returning success. This fixes hangs/infinite loops on crashes when unwinding fails. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_arm64.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 5fffd45f7b..031c271846 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -597,8 +597,10 @@ static NTSTATUS libunwind_virtual_unwind( ULONG_PTR ip, ULONG_PTR *frame, CONTEX context->u.s.X24, context->u.s.X25, context->u.s.X26, context->u.s.X27 ); TRACE(" x28=%016lx fp=%016lx lr=%016lx sp=%016lx\n", context->u.s.X28, context->u.s.Fp, context->u.s.Lr, context->Sp ); -#endif return STATUS_SUCCESS; +#else + return STATUS_INVALID_DISPOSITION; +#endif } @@ -645,7 +647,11 @@ static NTSTATUS virtual_unwind( ULONG type, DISPATCHER_CONTEXT *dispatch, CONTEX return STATUS_SUCCESS; } } - else WARN( "exception data not found in %s\n", debugstr_w(module->BaseDllName.Buffer) ); + else + { + WARN( "exception data not found in %s\n", debugstr_w(module->BaseDllName.Buffer) ); + return STATUS_INVALID_DISPOSITION; + } dispatch->EstablisherFrame = context->u.s.Fp; dispatch->LanguageHandler = NULL;

1 0

Jacek Caban : makedep: Don't try to use .delay.a extension for non-PE delay imports.
by Alexandre Julliard 22 Apr '20

22 Apr '20

Module: wine Branch: master Commit: c18443aadbca55b03bd3fcf1414ee2b452143b69 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c18443aadbca55b03bd3fcf1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 21 19:02:42 2020 +0200 makedep: Don't try to use .delay.a extension for non-PE delay imports. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index c3169204f1..fb2e145ced 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2219,8 +2219,10 @@ static struct strarray add_import_libs( const struct makefile *make, struct stra if (lib) { - if (delay && !delay_load_flag) lib = replace_extension( lib, ".a", ".delay.a" ); - else if (make->is_cross) lib = replace_extension( lib, ".a", ".cross.a" ); + if (delay && !delay_load_flag && (make->is_cross || !*dll_ext)) + lib = replace_extension( lib, ".a", ".delay.a" ); + else if (make->is_cross) + lib = replace_extension( lib, ".a", ".cross.a" ); lib = top_obj_dir_path( make, lib ); strarray_add( deps, lib ); strarray_add( &ret, lib );

1 0