Francois Gouget : winetest: Add support for Windows 11 21H2 and 22H2.

[Alexandre Julliard]

Module: tools
Branch: master
Commit: 46e44b57aa87df3affa0b0d1e481f4ddcbd3b7a0
URL:    https://gitlab.winehq.org/winehq/tools/-/commit/46e44b57aa87df3affa0b0d1e481...

Author: Francois Gouget 
Date:   Tue Sep 27 17:36:36 2022 +0200

winetest: Add support for Windows 11 21H2 and 22H2.

Use 'w11' as the prefix instead of 'win11' to keep the version name
short and distinguish them from the similar Windows 10 names.

---

winetest/build-patterns | 1 +
 winetest/dissect        | 2 ++
 winetest/winetest.conf  | 1 +
 3 files changed, 4 insertions(+)

diff --git a/winetest/build-patterns b/winetest/build-patterns
index 08121c1b..a975c35c 100755
--- a/winetest/build-patterns
+++ b/winetest/build-patterns
@@ -430,6 +430,7 @@ my %platform_order = (
     win2009 => 10.2009, win21H1 => 10.2101,
     win21H2 => 10.2107,
     win10 => 10.2100, # for backward compatibility
+    w1121H2 => 11.2110, w1122H2 => 11.2210,
     wine => 90.0, linux => 90.1, mac => 90.2,
     bsd => 90.3, solaris => 90.4
 );
diff --git a/winetest/dissect b/winetest/dissect
index 300079a9..ee676980 100755
--- a/winetest/dissect
+++ b/winetest/dissect
@@ -392,6 +392,8 @@ my @idmatch = (
     [ "win2009",     2,    10,     0, 19042,     1,  0 ],
     [ "win21H1",     2,    10,     0, 19043,     1,  0 ],
     [ "win21H2",     2,    10,     0, 19044,     1,  0 ],
+    [ "w1121H2",     2,    10,     0, 22000,     1,  0 ],
+    [ "w1122H2",     2,    10,     0, 22621,     1,  0 ],
 #   [ "ce",          3, undef, undef, undef, undef,  0 ],
     [ "unknown",     2, undef, undef, undef, undef,  0 ],
     [ "unknown", undef, undef, undef, undef, undef,  1 ],
diff --git a/winetest/winetest.conf b/winetest/winetest.conf
index 54ab7928..d9e6c359 100644
--- a/winetest/winetest.conf
+++ b/winetest/winetest.conf
@@ -50,6 +50,7 @@ $fixed_threshold = 0.99;
     { name => "Win1909+", ids => [ "win1909", "win2004" ] },
     { name => "Win10",    ids => [ "win2009", "win21H2", "win10" ] }, # win10 for backward compatibility
     { name => "Win10L",   ids => [ "win21H1" ] },
+    { name => "Win11",    ids => [ "w1121H2", "w1122H2" ] },
     { name => "Other",    ids => [ "unknown" ] },
     { name => "Linux",    ids => [ "linux" ] },
     { name => "Mac",      ids => [ "mac" ] },