Rooba
/
boinc
mirror of https://github.com/BOINC/boinc.git
1
0
Fork 0
Code Issues 1 Packages Projects Releases Wiki Activity

client: Fix formatting issues

This commit is contained in:
Rom Walton 2015-04-15 12:48:17 -04:00
parent b109e0a3a7
commit 7d7e62752e
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
client/hostinfo_win.cpp
View File

@ -554,15 +554,18 @@ int get_os_information(
case PRODUCT_PROFESSIONAL_WMC: case PRODUCT_PROFESSIONAL_WMC:
strcat(szSKU, "Professional with Media Center "); strcat(szSKU, "Professional with Media Center ");
break; break;
}
}
} else if( (osvi.dwMajorVersion == 5 && osvi.dwMinorVersion == 2) ) { } else if( (osvi.dwMajorVersion == 5 && osvi.dwMinorVersion == 2) ) {
if( osvi.wSuiteMask & VER_SUITE_PERSONAL ) { if( osvi.wSuiteMask & VER_SUITE_PERSONAL ) {
strcat(szSKU, "Home "); strcat(szSKU, "Home ");
} else { } else {
strcat(szSKU, "Professional "); strcat(szSKU, "Professional ");
} }
} else if( (osvi.dwMajorVersion == 5 && osvi.dwMinorVersion == 1) ) { } else if( (osvi.dwMajorVersion == 5 && osvi.dwMinorVersion == 1) ) {
if( osvi.wSuiteMask & VER_SUITE_PERSONAL ) { if( osvi.wSuiteMask & VER_SUITE_PERSONAL ) {
strcat(szSKU, "Home "); strcat(szSKU, "Home ");
} else if( GetSystemMetrics(SM_TABLETPC) ) { } else if( GetSystemMetrics(SM_TABLETPC) ) {
@ -574,18 +577,23 @@ int get_os_information(
} else { } else {
strcat(szSKU, "Professional "); strcat(szSKU, "Professional ");
} }
} else if( (osvi.dwMajorVersion == 5 && osvi.dwMinorVersion == 0) ) { } else if( (osvi.dwMajorVersion == 5 && osvi.dwMinorVersion == 0) ) {
strcat(szSKU, "Professional "); strcat(szSKU, "Professional ");
} else if( (osvi.dwMajorVersion == 4 && osvi.dwMinorVersion == 0) ) { } else if( (osvi.dwMajorVersion == 4 && osvi.dwMinorVersion == 0) ) {
strcat(szSKU, "Workstation "); strcat(szSKU, "Workstation ");
} }
} }
// Test for the server type. // Test for the server type.
else if ( (osvi.wProductType == VER_NT_SERVER) || (osvi.wProductType == VER_NT_DOMAIN_CONTROLLER) ) { else if ( (osvi.wProductType == VER_NT_SERVER) || (osvi.wProductType == VER_NT_DOMAIN_CONTROLLER) ) {
// all NT6 or higher (Server 2008,2008r2,2012,2012r2,2015...)
if( (osvi.dwMajorVersion >= 6) ) {
// all NT6 or higher (Server 2008,2008r2,2012,2012r2,2015...)
if( (osvi.dwMajorVersion >= 6) ) {
switch(dwType) { switch(dwType) {
case PRODUCT_CLUSTER_SERVER: case PRODUCT_CLUSTER_SERVER:
strcat( szSKU, "Cluster Server "); strcat( szSKU, "Cluster Server ");
@ -645,8 +653,8 @@ int get_os_information(
strcat( szSKU, "Server For Small Business "); strcat( szSKU, "Server For Small Business ");
break; break;
case PRODUCT_HYPERV: case PRODUCT_HYPERV:
strcat( szSKU, "Hyper-V "); strcat( szSKU, "Hyper-V ");
break; break;
} }
} else if( (osvi.dwMajorVersion == 5 && osvi.dwMinorVersion == 2) ) { } else if( (osvi.dwMajorVersion == 5 && osvi.dwMinorVersion == 2) ) {