diff options
| author | dnobori <da.git@softether.co.jp> | 2014-10-03 19:09:23 +0400 |
|---|---|---|
| committer | dnobori <da.git@softether.co.jp> | 2014-10-03 19:09:23 +0400 |
| commit | 10d4b2c43ddc9fcc2f318c76e3d66f11ef383fad (patch) | |
| tree | 0f6a9b771241360febb89ab977d2c45ff9654d90 /src/Mayaqua/Win32.c | |
| parent | 16b713b98da8dba29f0f845d5a8c36d6f7c34824 (diff) | |
v4.10-9505-beta
Diffstat (limited to 'src/Mayaqua/Win32.c')
| -rw-r--r-- | src/Mayaqua/Win32.c | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/src/Mayaqua/Win32.c b/src/Mayaqua/Win32.c index 588d13b8..eefcc772 100644 --- a/src/Mayaqua/Win32.c +++ b/src/Mayaqua/Win32.c @@ -1407,17 +1407,30 @@ UINT Win32GetOsType() return OSTYPE_WINDOWS_SERVER_81;
}
}
+ else if (os.dwMajorVersion == 6 && os.dwMinorVersion == 4)
+ {
+ if (os.wProductType == VER_NT_WORKSTATION)
+ {
+ // Windows 10
+ return OSTYPE_WINDOWS_10;
+ }
+ else
+ {
+ // Windows Server 10
+ return OSTYPE_WINDOWS_SERVER_10;
+ }
+ }
else
{
if (os.wProductType == VER_NT_WORKSTATION)
{
- // Windows 9?
- return OSTYPE_WINDOWS_9;
+ // Windows 11 or later
+ return OSTYPE_WINDOWS_11;
}
else
{
- // Windows Server 9?
- return OSTYPE_WINDOWS_SERVER_9;
+ // Windows Server 11 or later
+ return OSTYPE_WINDOWS_SERVER_11;
}
}
}
|