Module: tools Branch: master Commit: 6de6422966ed7e832bcbbab2699fcf6a0d25db5b URL: http://source.winehq.org/git/tools.git/?a=commit;h=6de6422966ed7e832bcbbab26... Author: Austin English <austinenglish(a)gmail.com> Date: Fri Jun 13 15:55:15 2008 -0500 winetest: Detect 2008 separately from Vista. --- winetest/build-index | 5 +++-- winetest/dissect | 12 +++++++++--- winetest/gather | 5 +++-- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/winetest/build-index b/winetest/build-index index 66b10a2..77fb157 100755 --- a/winetest/build-index +++ b/winetest/build-index @@ -26,15 +26,16 @@ my %w2k = (name => "2000"); my %xp = (name => "XP"); my %w2k3 = (name => "2003"); my %vista = (name => "Vista"); +my %w2k8 = (name => "2008"); my %unknown = (name => "Other"); my %wine = (name => "Wine"); # Map dissect's IDs to the above hashes my %idmap = (95=>\%w95, 98=>\%w98, me=>\%me, nt3=>\%nt3, nt4=>\%nt4, 2000=>\%w2k, - xp=>\%xp, 2003=>\%w2k3, vista=>\%vista, unknown=>\%unknown, wine=>\%wine); + xp=>\%xp, 2003=>\%w2k3, vista=>\%vista, 2008=>\%w2k8, unknown=>\%unknown, wine=>\%wine); # Define the order of version groups in the summary -my @groups = (\%w95, \%w98, \%me, \%nt3, \%nt4, \%w2k, \%xp, \%w2k3, \%vista, \%unknown, \%wine); +my @groups = (\%w95, \%w98, \%me, \%nt3, \%nt4, \%w2k, \%xp, \%w2k3, \%vista, \%w2k8, \%unknown, \%wine); my @months = ("Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"); diff --git a/winetest/dissect b/winetest/dissect index 66a3bd4..e3a702a 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -124,7 +124,7 @@ while (($_ = <IN>) =~ s/^ //) } $box->{data} .= "</div>"; -my ($wine, $version, $major, $minor, $plid); +my ($wine, $version, $major, $minor, $plid, $product); /^Operating system version:\r?$/ or mydie "no OS header: $_"; $box = create_box( "version", "version", "Operating system version" ); $box->{data} .= "<table class=\"output\">\n"; @@ -138,6 +138,8 @@ while (($_ = <IN>) =~ /^\s*([0-9a-zA-Z ]+)=(.*?)\r?$/) { $minor = $2; } elsif ($1 eq "PlatformId") { $plid = $2; + } elsif ($1 eq "wProductType") { + $product = $2; } } $box->{data} .= "</table>"; @@ -165,8 +167,12 @@ if ($plid==1 && $major==4) { $version = "2003"; } } elsif ($major==6) { - $version = "vista"; - } + if ($product==1) { + $version = "Vista"; + } elsif ($product==3) { + $version = "2008"; + } + } } elsif ($plid==3) { $version = "ce$major$minor"; } diff --git a/winetest/gather b/winetest/gather index 12deb4e..295fe9f 100755 --- a/winetest/gather +++ b/winetest/gather @@ -93,15 +93,16 @@ my %w2k = (name => "2000"); my %xp = (name => "XP"); my %w2k3 = (name => "2003"); my %vista = (name => "Vista"); +my %w2k8 = (name => "2008"); my %unknown = (name => "Other"); my %wine = (name => "Wine"); # Map dissect's IDs to the above hashes my %idmap = (95=>\%w95, 98=>\%w98, me=>\%me, nt3=>\%nt3, nt4=>\%nt4, 2000=>\%w2k, - xp=>\%xp, 2003=>\%w2k3, vista=>\%vista, unknown=>\%unknown, wine=>\%wine); + xp=>\%xp, 2003=>\%w2k3, vista=>\%vista, 2008=>\%w2k8, unknown=>\%unknown, wine=>\%wine); # Define the order of version groups in the summary -my @groups = (\%w95, \%w98, \%me, \%nt3, \%nt4, \%w2k, \%xp, \%w2k3, \%vista, \%unknown, \%wine); +my @groups = (\%w95, \%w98, \%me, \%nt3, \%nt4, \%w2k, \%xp, \%w2k3, \%vista, \%w2k8, \%unknown, \%wine); my ($outdated,undef) = glob "$datadir/*/outdated"; exit 2 unless defined $outdated;