=?UTF-8?Q?Andr=C3=A9=20Hentschel=20?=: winetest: Put Win8 results in their own group.

[Alexandre Julliard]

Module: tools
Branch: master
Commit: 2a079a56ea067a079ac1a5f8b1d31089081d4c35
URL:    http://source.winehq.org/git/tools.git/?a=commit;h=2a079a56ea067a079ac1a5f8b1d31089081d4c35

Author: André Hentschel <nerv at dawncrow.de>
Date:   Tue Mar  6 00:16:23 2012 +0100

winetest: Put Win8 results in their own group.

---

 winetest/build-index |    3 ++-
 winetest/dissect     |    2 ++
 winetest/gather      |    8 +++++---
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/winetest/build-index b/winetest/build-index
index 9a1c97c..d7f4e0b 100755
--- a/winetest/build-index
+++ b/winetest/build-index
@@ -28,6 +28,7 @@ my %w2k3    = (name => "2003");
 my %vista   = (name => "Vista");
 my %w2k8    = (name => "2008");
 my %win7    = (name => "Win7");
+my %win8    = (name => "Win8");
 my %unknown = (name => "Other");
 my %linux   = (name => "Linux");
 my %mac     = (name => "Mac");
@@ -36,7 +37,7 @@ my %solaris = (name => "Solaris");
 my %wine    = (name => "Wine");
 
 # Define the order of version groups in the summary
-my @groups = (\%w95, \%w98, \%me, \%nt3, \%nt4, \%w2k, \%xp, \%w2k3, \%vista, \%w2k8, \%win7,
+my @groups = (\%w95, \%w98, \%me, \%nt3, \%nt4, \%w2k, \%xp, \%w2k3, \%vista, \%w2k8, \%win7, \%win8,
               \%unknown, \%linux, \%mac, \%bsd, \%solaris, \%wine);
 
 my @months = ("Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec");
diff --git a/winetest/dissect b/winetest/dissect
index 62d0812..605292d 100755
--- a/winetest/dissect
+++ b/winetest/dissect
@@ -195,6 +195,8 @@ if ($plid==1 && $major==4) {
             } elsif ($product==3) {
                 $version = "2008";
             }
+        } elsif ($minor == 2) {
+            $version = "win8";
         }
     } 
 } elsif ($plid==3) {
diff --git a/winetest/gather b/winetest/gather
index 24fee0e..97a5a37 100755
--- a/winetest/gather
+++ b/winetest/gather
@@ -95,6 +95,7 @@ my %w2k3    = (name => "2003");
 my %vista   = (name => "Vista");
 my %w2k8    = (name => "2008");
 my %win7    = (name => "Win7");
+my %win8    = (name => "Win8");
 my %unknown = (name => "Other");
 my %linux   = (name => "Linux");
 my %mac     = (name => "Mac");
@@ -104,11 +105,12 @@ 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, 2008=>\%w2k8, win7=>\%win7, unknown=>\%unknown,
-             wine=>\%wine, linux=>\%linux, mac=>\%mac, bsd=>\%bsd, solaris=>\%solaris);
+             xp=>\%xp, 2003=>\%w2k3, vista=>\%vista, 2008=>\%w2k8, win7=>\%win7, win8=>\%win8,
+             unknown=>\%unknown, wine=>\%wine, linux=>\%linux, mac=>\%mac, bsd=>\%bsd,
+             solaris=>\%solaris);
 
 # Define the order of version groups in the summary
-my @groups = (\%w95, \%w98, \%me, \%nt3, \%nt4, \%w2k, \%xp, \%w2k3, \%vista, \%w2k8, \%win7,
+my @groups = (\%w95, \%w98, \%me, \%nt3, \%nt4, \%w2k, \%xp, \%w2k3, \%vista, \%w2k8, \%win7, \%win8,
               \%unknown, \%linux, \%mac, \%bsd, \%solaris, \%wine);
 
 my ($outdated,undef) = glob "$datadir/*/outdated";