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

Francois Gouget : testbot/build: Don't duplicate the addon.c filename.
by Alexandre Julliard April 23, 2020

April 23, 2020

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: Add support for shared Gecko and Mono installs.
by Alexandre Julliard April 23, 2020

April 23, 2020

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

Francois Gouget : testbot/build: Rename _VerifyAddOn() to _IsAddOnBad().
by Alexandre Julliard April 23, 2020

April 23, 2020

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 April 23, 2020

April 23, 2020

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

Piotr Caban : vcruntime140_1: Fix rethrow handling in __CxxFrameHandler4.
by Alexandre Julliard April 22, 2020

April 22, 2020

Module: wine Branch: master Commit: f52b33c63064aa59f48a9c10d624e3508da55b88 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f52b33c63064aa59f48a9c10… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Apr 22 12:21:35 2020 +0200 vcruntime140_1: Fix rethrow handling in __CxxFrameHandler4. 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 | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/vcruntime140_1/except_x86_64.c b/dlls/vcruntime140_1/except_x86_64.c index 5d07a1ac2c..4cc6897223 100644 --- a/dlls/vcruntime140_1/except_x86_64.c +++ b/dlls/vcruntime140_1/except_x86_64.c @@ -452,12 +452,12 @@ static LONG CALLBACK cxx_rethrow_filter(PEXCEPTION_POINTERS eptrs, void *c) EXCEPTION_RECORD *rec = eptrs->ExceptionRecord; cxx_catch_ctx *ctx = c; - FlsSetValue(fls_index, (void*)(DWORD_PTR)ctx->search_state); + if (rec->ExceptionCode == CXX_EXCEPTION && !rec->ExceptionInformation[1] && !rec->ExceptionInformation[2]) + return EXCEPTION_EXECUTE_HANDLER; + FlsSetValue(fls_index, (void*)(DWORD_PTR)ctx->search_state); if (rec->ExceptionCode != CXX_EXCEPTION) return EXCEPTION_CONTINUE_SEARCH; - if (!rec->ExceptionInformation[1] && !rec->ExceptionInformation[2]) - return EXCEPTION_EXECUTE_HANDLER; if (rec->ExceptionInformation[1] == ((EXCEPTION_RECORD*)*__current_exception())->ExceptionInformation[1]) ctx->rethrow = TRUE; return EXCEPTION_CONTINUE_SEARCH; @@ -499,6 +499,7 @@ static void* WINAPI call_catch_block4(EXCEPTION_RECORD *rec) { TRACE("detect rethrow: exception code: %x\n", prev_rec->ExceptionCode); ctx.rethrow = TRUE; + FlsSetValue(fls_index, (void*)(DWORD_PTR)ctx.search_state); if (untrans_rec) {

1 0

Ziqing Hui : windowscodecs/tests: Add tests for DdsDecoder_GetFrameCount().
by Alexandre Julliard April 22, 2020

April 22, 2020

Module: wine Branch: master Commit: 3d247caab5d8e1854c5129f2410757fa02582e2f URL: https://source.winehq.org/git/wine.git/?a=commit;h=3d247caab5d8e1854c5129f2… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Wed Apr 22 16:37:51 2020 +0800 windowscodecs/tests: Add tests for DdsDecoder_GetFrameCount(). Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/tests/ddsformat.c | 48 ++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/dlls/windowscodecs/tests/ddsformat.c b/dlls/windowscodecs/tests/ddsformat.c index 342a120a88..99f19eb175 100644 --- a/dlls/windowscodecs/tests/ddsformat.c +++ b/dlls/windowscodecs/tests/ddsformat.c @@ -276,6 +276,53 @@ static void test_dds_decoder_global_properties(IWICBitmapDecoder *decoder) if (thumnail) IWICBitmapSource_Release(thumnail); } +static void test_dds_decoder_frame_count(void) +{ + static struct test_data { + void *data; + UINT size; + UINT expected; + } test_data[] = { + { test_dds_image, sizeof(test_dds_image), 1 }, + { test_dds_mipmaps, sizeof(test_dds_mipmaps), 3 }, + { test_dds_volume, sizeof(test_dds_volume), 7 }, + { test_dds_array, sizeof(test_dds_array), 9 }, + }; + + int i; + HRESULT hr; + + for (i = 0; i < ARRAY_SIZE(test_data); i++) + { + UINT frame_count; + IWICStream *stream = NULL; + IWICBitmapDecoder *decoder = NULL; + + stream = create_stream(test_data[i].data, test_data[i].size); + if (!stream) goto next; + + decoder = create_decoder(); + if (!decoder) goto next; + + hr = init_decoder(decoder, stream, S_OK, -1); + if (hr != S_OK) goto next; + + todo_wine { + hr = IWICBitmapDecoder_GetFrameCount(decoder, &frame_count); + ok (hr == S_OK, "GetFrameCount failed, hr=%x\n", hr); + if (hr == S_OK) { + ok (frame_count == test_data[i].expected, "%d: expected frame count %d, got %d\n", + i, test_data[i].expected, frame_count); + } + }; + + next: + if (decoder) IWICBitmapDecoder_Release(decoder); + if (stream) IWICStream_Release(stream); + + } +} + static void test_dds_decoder(void) { HRESULT hr; @@ -293,6 +340,7 @@ static void test_dds_decoder(void) test_dds_decoder_initialize(); test_dds_decoder_global_properties(decoder); + test_dds_decoder_frame_count(); end: if (decoder) IWICBitmapDecoder_Release(decoder);

1 0

Ziqing Hui : windowscodecs: Add TRACE in DdsDecoder_GetContainerFormat().
by Alexandre Julliard April 22, 2020

April 22, 2020

Module: wine Branch: master Commit: fc5ef918d5031a234922b0973bfdf7435718f703 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fc5ef918d5031a234922b097… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Wed Apr 22 16:37:12 2020 +0800 windowscodecs: Add TRACE in DdsDecoder_GetContainerFormat(). Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/ddsformat.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/windowscodecs/ddsformat.c b/dlls/windowscodecs/ddsformat.c index 049fb88839..06b40bcbc7 100644 --- a/dlls/windowscodecs/ddsformat.c +++ b/dlls/windowscodecs/ddsformat.c @@ -193,7 +193,10 @@ end: static HRESULT WINAPI DdsDecoder_GetContainerFormat(IWICBitmapDecoder *iface, GUID *pguidContainerFormat) { + TRACE("(%p,%p)\n", iface, pguidContainerFormat); + memcpy(pguidContainerFormat, &GUID_ContainerFormatDds, sizeof(GUID)); + return S_OK; }

1 0

Stefan Dösinger : iphlpapi: MacOS struct sockaddr is 4 byte aligned on 64 bit.
by Alexandre Julliard April 22, 2020

April 22, 2020

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: Use the dst sa_family for the netmask too.
by Alexandre Julliard April 22, 2020

April 22, 2020

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

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

April 22, 2020

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