Module: tools Branch: master Commit: 99a550fb03cc67fd9985bbfb3d329f18755e6c7f URL: http://source.winehq.org/git/tools.git/?a=commit;h=99a550fb03cc67fd9985bbfb3...
Author: Francois Gouget fgouget@codeweavers.com Date: Sun Jun 4 00:40:05 2017 +0200
winetest/dissect: Require the platform fields to be present.
Without them we were getting a lot of undefined value perl errors.
Signed-off-by: Francois Gouget fgouget@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
winetest/dissect | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/winetest/dissect b/winetest/dissect index ccfb15f..36ab635 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -236,6 +236,10 @@ while (($_ = <IN>) =~ /^\s*([0-9a-zA-Z ]+)=(.*?)\r?$/) { } $box->{data} .= "</table>\n";
+if (!defined $plid or !defined $major or !defined $minor or !defined $product) { + mydie "missing a PlatformId, dwMajorVersion, dwMinorVersion or wProductType field"; +} + my @idmatch = ( # Describes how to match a platform's version information # with a dissect platform id: @@ -284,7 +288,7 @@ if ($wine) { "Darwin" => "mac", "FreeBSD" => "bsd", "SunOS" => "solaris" ); - $version = $host && defined($known_hosts{$host}) ? $known_hosts{$host} : "wine"; + $version = $known_hosts{$host || ""} || "wine"; } if ($wine_build) { my $wine_commit;