>From b8ec6ca34b85f7ba1ae736ef35ee380b1b5721f0 Mon Sep 17 00:00:00 2001
From: Paul Vriens <Paul.Vriens.Wine@gmail.com>
Date: Sat, 10 Jan 2009 12:28:57 +0100
Subject: [PATCH] Add Windows 7

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

diff --git a/winetest/build-index b/winetest/build-index
index 2813ae8..0f257ad 100755
--- a/winetest/build-index
+++ b/winetest/build-index
@@ -27,11 +27,12 @@ my %xp      = (name => "XP");
 my %w2k3    = (name => "2003");
 my %vista   = (name => "Vista");
 my %w2k8    = (name => "2008");
+my %w7      = (name => "7");
 my %unknown = (name => "Other");
 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, \%unknown, \%wine);
+my @groups = (\%w95, \%w98, \%me, \%nt3, \%nt4, \%w2k, \%xp, \%w2k3, \%vista, \%w2k8, \%w7, \%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 2ecedef..3383ef2 100755
--- a/winetest/dissect
+++ b/winetest/dissect
@@ -168,13 +168,15 @@ if ($plid==1 && $major==4) {
         } elsif ($minor==2) {
             $version = "2003";
         }
-    } elsif ($major==6) {
+    } elsif ($major==6 && $minor == 0) {
         if      ($product==1) {
             $version = "vista";
         } elsif ($product==3) {
             $version = "2008";
         }
-	} 
+    } elsif ($major==6 && $minor == 1) {
+        $version ="7";
+    }
 } elsif ($plid==3) {
     $version = "ce$major$minor";
 }
diff --git a/winetest/gather b/winetest/gather
index fef9396..cb79959 100755
--- a/winetest/gather
+++ b/winetest/gather
@@ -94,15 +94,17 @@ my %xp      = (name => "XP");
 my %w2k3    = (name => "2003");
 my %vista   = (name => "Vista");
 my %w2k8    = (name => "2008");
+my %w7      = (name => "7");
 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, 2008=>\%w2k8, unknown=>\%unknown, wine=>\%wine);
+             xp=>\%xp, 2003=>\%w2k3, vista=>\%vista, 2008=>\%w2k8, 7=>\%w7,
+             unknown=>\%unknown, wine=>\%wine);
 
 # Define the order of version groups in the summary
-my @groups = (\%w95, \%w98, \%me, \%nt3, \%nt4, \%w2k, \%xp, \%w2k3, \%vista, \%w2k8, \%unknown, \%wine);
+my @groups = (\%w95, \%w98, \%me, \%nt3, \%nt4, \%w2k, \%xp, \%w2k3, \%vista, \%w2k8, \%w7, \%unknown, \%wine);
 
 my ($outdated,undef) = glob "$datadir/*/outdated";
 exit 2 unless defined $outdated;
-- 
1.6.0.6