Changeset 58949 in vbox
- Timestamp:
- Dec 2, 2015 1:36:52 PM (9 years ago)
- Location:
- trunk/src/VBox/Runtime/r3/win
- Files:
-
- 3 edited
-
RTSystemQueryOSInfo-win.cpp (modified) (1 diff)
-
init-win.cpp (modified) (1 diff)
-
internal-r3-win.h (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Runtime/r3/win/RTSystemQueryOSInfo-win.cpp
r57358 r58949 216 216 case kRTWinOSType_2008: strcpy(szTmp, "Windows 2008"); break; 217 217 case kRTWinOSType_7: strcpy(szTmp, "Windows 7"); break; 218 case kRTWinOSType_2008R2: strcpy(szTmp, "Windows 2008 R2"); break; 218 219 case kRTWinOSType_8: strcpy(szTmp, "Windows 8"); break; 220 case kRTWinOSType_2012: strcpy(szTmp, "Windows 2012"); break; 219 221 case kRTWinOSType_81: strcpy(szTmp, "Windows 8.1"); break; 222 case kRTWinOSType_2012R2: strcpy(szTmp, "Windows 2012 R2"); break; 220 223 case kRTWinOSType_10: strcpy(szTmp, "Windows 10"); break; 224 case kRTWinOSType_2016: strcpy(szTmp, "Windows 2016"); break; 221 225 222 226 case kRTWinOSType_NT_UNKNOWN: -
trunk/src/VBox/Runtime/r3/win/init-win.cpp
r57974 r58949 156 156 else if ( dwMajorVersion == 6 157 157 && dwMinorVersion == 1) 158 enmVer = kRTWinOSType_7; 158 { 159 if (bProductType != VER_NT_WORKSTATION) 160 enmVer = kRTWinOSType_2008R2; 161 else 162 enmVer = kRTWinOSType_7; 163 } 159 164 else if ( dwMajorVersion == 6 160 165 && dwMinorVersion == 2) 161 enmVer = kRTWinOSType_8; 166 { 167 if (bProductType != VER_NT_WORKSTATION) 168 enmVer = kRTWinOSType_2012; 169 else 170 enmVer = kRTWinOSType_8; 171 } 162 172 else if ( dwMajorVersion == 6 163 173 && dwMinorVersion == 3) 164 enmVer = kRTWinOSType_81; 174 { 175 if (bProductType != VER_NT_WORKSTATION) 176 enmVer = kRTWinOSType_2012R2; 177 else 178 enmVer = kRTWinOSType_81; 179 } 165 180 else if ( ( dwMajorVersion == 6 166 181 && dwMinorVersion == 4) 167 182 || ( dwMajorVersion == 10 168 183 && dwMinorVersion == 0)) 169 enmVer = kRTWinOSType_10; 184 { 185 (bProductType != VER_NT_WORKSTATION) 186 enmVer = kRTWinOSType_2016; 187 else 188 enmVer = kRTWinOSType_10; 189 } 170 190 else 171 191 enmVer = kRTWinOSType_NT_UNKNOWN; -
trunk/src/VBox/Runtime/r3/win/internal-r3-win.h
r57865 r58949 59 59 kRTWinOSType_NT351, 60 60 kRTWinOSType_NT4, 61 kRTWinOSType_2K, 62 kRTWinOSType_XP, 63 kRTWinOSType_2003, 64 kRTWinOSType_VISTA, 65 kRTWinOSType_2008, 66 kRTWinOSType_7, 67 kRTWinOSType_8, 68 kRTWinOSType_81, 69 kRTWinOSType_10, 61 kRTWinOSType_2K, /* 5.0 */ 62 kRTWinOSType_XP, /* 5.1 */ 63 kRTWinOSType_XP64, /* 5.2, workstation */ 64 kRTWinOSType_2003, /* 5.2 */ 65 kRTWinOSType_VISTA, /* 6.0, workstation */ 66 kRTWinOSType_2008, /* 6.0, server */ 67 kRTWinOSType_7, /* 6.1, workstation */ 68 kRTWinOSType_2008R2, /* 6.1, server */ 69 kRTWinOSType_8, /* 6.2, workstation */ 70 kRTWinOSType_2012, /* 6.2, server */ 71 kRTWinOSType_81, /* 6.3, workstation */ 72 kRTWinOSType_2012R2, /* 6.3, server */ 73 kRTWinOSType_10, /* 10.0, workstation */ 74 kRTWinOSType_2016, /* 10.0, server */ 70 75 kRTWinOSType_NT_UNKNOWN = 199, 71 76 kRTWinOSType_NT_LAST = kRTWinOSType_UNKNOWN
Note:
See TracChangeset
for help on using the changeset viewer.

