Mercurial > dwindows

comparison win/dw.c @ 2664:b0712a3debe2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 401a3b9f21ba
children 9be24001d288
comparison
equal deleted inserted replaced
2663:3b3be9f7f452 2664:b0712a3debe2
12936 12936
12937 env->MinorBuild = 0; 12937 env->MinorBuild = 0;
12938 12938
12939 if (_dwVersion < 0x80000000) 12939 if (_dwVersion < 0x80000000)
12940 { 12940 {
12941 env->MajorBuild = (DWORD)(HIWORD(_dwVersion));
12942
12941 if(env->MajorVersion == 5 && env->MinorVersion == 0) 12943 if(env->MajorVersion == 5 && env->MinorVersion == 0)
12942 strcpy(env->osName, "Windows 2000"); 12944 strcpy(env->osName, "Windows 2000");
12943 else if(env->MajorVersion == 5 && env->MinorVersion > 0) 12945 else if(env->MajorVersion == 5 && env->MinorVersion > 0)
12944 strcpy(env->osName, "Windows XP"); 12946 strcpy(env->osName, "Windows XP");
12945 else if(env->MajorVersion == 6 && env->MinorVersion == 0) 12947 else if(env->MajorVersion == 6 && env->MinorVersion == 0)
12947 else if(env->MajorVersion == 6 && env->MinorVersion == 1) 12949 else if(env->MajorVersion == 6 && env->MinorVersion == 1)
12948 strcpy(env->osName, "Windows 7"); 12950 strcpy(env->osName, "Windows 7");
12949 else if(env->MajorVersion == 6 && env->MinorVersion > 1) 12951 else if(env->MajorVersion == 6 && env->MinorVersion > 1)
12950 strcpy(env->osName, "Windows 8"); 12952 strcpy(env->osName, "Windows 8");
12951 else if(env->MajorVersion == 10) 12953 else if(env->MajorVersion == 10)
12952 strcpy(env->osName, "Windows 10"); 12954 {
12955 if(env->MajorBuild < 20000)
12956 strcpy(env->osName, "Windows 10");
12957 else
12958 strcpy(env->osName, "Windows 11");
12959 }
12953 else 12960 else
12954 strcpy(env->osName, "Windows NT"); 12961 strcpy(env->osName, "Windows NT");
12955
12956 env->MajorBuild = (DWORD)(HIWORD(_dwVersion));
12957 } 12962 }
12958 else 12963 else
12959 { 12964 {
12960 strcpy(env->osName, "Windows 95/98/ME"); 12965 strcpy(env->osName, "Windows 95/98/ME");
12961 env->MajorBuild = 0; 12966 env->MajorBuild = 0;