Mercurial > dwindows
changeset 2664:b0712a3debe2
Win: Add detecting Windows 11 in the environment query.
author | bsmith@81767d24-ef19-dc11-ae90-00e081727c95 |
---|---|
date | Tue, 05 Oct 2021 06:26:28 +0000 |
parents | 3b3be9f7f452 |
children | aca4b56f50dd |
files | win/dw.c |
diffstat | 1 files changed, 8 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/win/dw.c Mon Oct 04 19:26:08 2021 +0000 +++ b/win/dw.c Tue Oct 05 06:26:28 2021 +0000 @@ -12938,6 +12938,8 @@ if (_dwVersion < 0x80000000) { + env->MajorBuild = (DWORD)(HIWORD(_dwVersion)); + if(env->MajorVersion == 5 && env->MinorVersion == 0) strcpy(env->osName, "Windows 2000"); else if(env->MajorVersion == 5 && env->MinorVersion > 0) @@ -12949,11 +12951,14 @@ else if(env->MajorVersion == 6 && env->MinorVersion > 1) strcpy(env->osName, "Windows 8"); else if(env->MajorVersion == 10) - strcpy(env->osName, "Windows 10"); + { + if(env->MajorBuild < 20000) + strcpy(env->osName, "Windows 10"); + else + strcpy(env->osName, "Windows 11"); + } else strcpy(env->osName, "Windows NT"); - - env->MajorBuild = (DWORD)(HIWORD(_dwVersion)); } else {