Francois Gouget : winetest: Distinguish Windows 8 from Windows 8.1.

[Alexandre Julliard]

Module: tools
Branch: master
Commit: eff17bb56292a0c37da69fd314ab799d4c94a287
URL:    https://source.winehq.org/git/tools.git/?a=commit;h=eff17bb56292a0c37da69fd3...

Author: Francois Gouget 
Date:   Fri Apr  9 11:43:50 2021 +0200

winetest: Distinguish Windows 8 from Windows 8.1.

But keep both in the same Windows 8 group.
Reformat %idmap so there is roughly one group per line.

Signed-off-by: Francois Gouget 
Signed-off-by: Alexandre Julliard

---

winetest/dissect |  2 +-
 winetest/gather  | 19 ++++++++++++++-----
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/winetest/dissect b/winetest/dissect
index 12df56a..613c151 100755
--- a/winetest/dissect
+++ b/winetest/dissect
@@ -354,7 +354,7 @@ my @idmatch = (
     [ "win7",        2,     6,     1,      1,  0 ],
     [ "2008",        2,     6,     1,      3,  0 ],
     [ "win8",        2,     6,     2,  undef,  0 ],
-    [ "win8",        2,     6,     3,  undef,  0 ],
+    [ "win81",       2,     6,     3,  undef,  0 ],
     [ "win10",       2,    10,     0,      1,  0 ],
 #   [ "ce",          3, undef, undef,  undef,  0 ],
     [ "unknown",     2, undef, undef,  undef,  0 ],
diff --git a/winetest/gather b/winetest/gather
index ae754d9..bb83c5e 100755
--- a/winetest/gather
+++ b/winetest/gather
@@ -165,14 +165,23 @@ 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, %win10,
+my @groups = (%w95, %w98, %me,
+              %nt3, %nt4, %w2k, %xp, %w2k3,
+              %vista, %w2k8, %win7, %win8,
+              %win10,
               %unknown, %linux, %mac, %bsd, %solaris, %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, win10=>%win10,
-             unknown=>%unknown, wine=>%wine, linux=>%linux, mac=>%mac, bsd=>%bsd,
-             solaris=>%solaris);
+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, win81 => %win8,
+             win10 => %win10,
+             unknown => %unknown,
+             wine => %wine, linux => %linux, mac => %mac,
+             bsd => %bsd, solaris => %solaris);

#