From 548f124698774222b011aac2796c766efed83091 Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Thu, 21 Oct 2021 18:33:35 +0200 Subject: [PATCH] Cygwin: update cygcheck OS information Signed-off-by: Corinna Vinschen --- winsup/utils/mingw/cygcheck.cc | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/winsup/utils/mingw/cygcheck.cc b/winsup/utils/mingw/cygcheck.cc index d818a1907..288a718bc 100644 --- a/winsup/utils/mingw/cygcheck.cc +++ b/winsup/utils/mingw/cygcheck.cc @@ -1418,8 +1418,19 @@ dump_sysinfo () } else if (osversion.dwMajorVersion == 10) { - strcpy (osname, osversion.wProductType == VER_NT_WORKSTATION - ? "10" : "2016"); + if (osversion.wProductType == VER_NT_WORKSTATION) + strcpy (osname, osversion.dwBuildNumber >= 22000 ? "11" : "10"); + else + { + if (osversion.dwBuildNumber <= 14393) + strcpy (osname, "2016"); + else if (osversion.dwBuildNumber <= 17763) + strcpy (osname, "2019"); + else if (osversion.dwBuildNumber <= 20348) + strcpy (osname, "2022"); + else + strcpy (osname, "20??"); + } } DWORD prod; if (GetProductInfo (osversion.dwMajorVersion,