André Hentschel : winetest: Put Win10 results in their own group.

[Alexandre Julliard]

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

Author: André Hentschel 
Date:   Wed Aug 19 21:53:45 2015 +0200

winetest: Put Win10 results in their own group.

---

winetest/build-index | 3 ++-
 winetest/dissect     | 6 ++++++
 winetest/gather      | 5 +++--
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/winetest/build-index b/winetest/build-index
index 900b144..cacd05f 100755
--- a/winetest/build-index
+++ b/winetest/build-index
@@ -44,6 +44,7 @@ my %vista   = (name => "Vista");
 my %w2k8    = (name => "2008");
 my %win7    = (name => "Win7");
 my %win8    = (name => "Win8");
+my %win10   = (name => "Win10");
 my %unknown = (name => "Other");
 my %linux   = (name => "Linux");
 my %mac     = (name => "Mac");
@@ -52,7 +53,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, %win8,
+my @groups = (%w95, %w98, %me, %nt3, %nt4, %w2k, %xp, %w2k3, %vista, %w2k8, %win7, %win8, %win10,
               %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 cd24fc3..7a40234 100755
--- a/winetest/dissect
+++ b/winetest/dissect
@@ -206,6 +206,12 @@ if ($plid==1 && $major==4) {
         } elsif ($minor == 2 || $minor == 3) {
             $version = "win8";
         }
+    } elsif ($major==10) {
+        if      ($minor == 0) {
+            if      ($product==1) {
+                $version = "win10";
+            }
+        }
     }
 } elsif ($plid==3) {
     #$version = "ce$major$minor";
diff --git a/winetest/gather b/winetest/gather
index 5b56b61..74c6734 100755
--- a/winetest/gather
+++ b/winetest/gather
@@ -101,6 +101,7 @@ my %vista   = (name => "Vista");
 my %w2k8    = (name => "2008");
 my %win7    = (name => "Win7");
 my %win8    = (name => "Win8");
+my %win10   = (name => "Win10");
 my %unknown = (name => "Other");
 my %linux   = (name => "Linux");
 my %mac     = (name => "Mac");
@@ -110,12 +111,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, win8=>%win8,
+             xp=>%xp, 2003=>%w2k3, vista=>%vista, 2008=>%w2k8, win7=>%win7, win8=>%win8, win10=>%win10,
              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, %win8,
+my @groups = (%w95, %w98, %me, %nt3, %nt4, %w2k, %xp, %w2k3, %vista, %w2k8, %win7, %win8, %win10,
               %unknown, %linux, %mac, %bsd, %solaris, %wine);

my ($outdated,undef) = glob "$datadir/*/outdated";