diff --git a/client/hostinfo_win.cpp b/client/hostinfo_win.cpp index 32d63446f2..a9e8f5ab33 100644 --- a/client/hostinfo_win.cpp +++ b/client/hostinfo_win.cpp @@ -40,231 +40,8 @@ #include "idlemon.h" -// Newer system metrics values than what is currently defined in -// Visual Studio 2005 -#ifndef SM_TABLETPC -#define SM_TABLETPC 86 -#endif -#ifndef SM_MEDIACENTER -#define SM_MEDIACENTER 87 -#endif -#ifndef SM_STARTER -#define SM_STARTER 88 -#endif -#ifndef SM_SERVERR2 -#define SM_SERVERR2 89 -#endif - - // Newer product types than what is currently defined in -// Visual Studio 2005 -#ifndef PRODUCT_ULTIMATE -#define PRODUCT_ULTIMATE 0x00000001 -#endif -#ifndef PRODUCT_HOME_BASIC -#define PRODUCT_HOME_BASIC 0x00000002 -#endif -#ifndef PRODUCT_HOME_PREMIUM -#define PRODUCT_HOME_PREMIUM 0x00000003 -#endif -#ifndef PRODUCT_ENTERPRISE -#define PRODUCT_ENTERPRISE 0x00000004 -#endif -#ifndef PRODUCT_HOME_BASIC_N -#define PRODUCT_HOME_BASIC_N 0x00000005 -#endif -#ifndef PRODUCT_BUSINESS -#define PRODUCT_BUSINESS 0x00000006 -#endif -#ifndef PRODUCT_STANDARD_SERVER -#define PRODUCT_STANDARD_SERVER 0x00000007 -#endif -#ifndef PRODUCT_DATACENTER_SERVER -#define PRODUCT_DATACENTER_SERVER 0x00000008 -#endif -#ifndef PRODUCT_SMALLBUSINESS_SERVER -#define PRODUCT_SMALLBUSINESS_SERVER 0x00000009 -#endif -#ifndef PRODUCT_ENTERPRISE_SERVER -#define PRODUCT_ENTERPRISE_SERVER 0x0000000A -#endif -#ifndef PRODUCT_STARTER -#define PRODUCT_STARTER 0x0000000B -#endif -#ifndef PRODUCT_DATACENTER_SERVER_CORE -#define PRODUCT_DATACENTER_SERVER_CORE 0x0000000C -#endif -#ifndef PRODUCT_STANDARD_SERVER_CORE -#define PRODUCT_STANDARD_SERVER_CORE 0x0000000D -#endif -#ifndef PRODUCT_ENTERPRISE_SERVER_CORE -#define PRODUCT_ENTERPRISE_SERVER_CORE 0x0000000E -#endif -#ifndef PRODUCT_ENTERPRISE_SERVER_IA64 -#define PRODUCT_ENTERPRISE_SERVER_IA64 0x0000000F -#endif -#ifndef PRODUCT_BUSINESS_N -#define PRODUCT_BUSINESS_N 0x00000010 -#endif -#ifndef PRODUCT_WEB_SERVER -#define PRODUCT_WEB_SERVER 0x00000011 -#endif -#ifndef PRODUCT_CLUSTER_SERVER -#define PRODUCT_CLUSTER_SERVER 0x00000012 -#endif -#ifndef PRODUCT_HOME_SERVER -#define PRODUCT_HOME_SERVER 0x00000013 -#endif -#ifndef PRODUCT_STORAGE_EXPRESS_SERVER -#define PRODUCT_STORAGE_EXPRESS_SERVER 0x00000014 -#endif -#ifndef PRODUCT_STORAGE_STANDARD_SERVER -#define PRODUCT_STORAGE_STANDARD_SERVER 0x00000015 -#endif -#ifndef PRODUCT_STORAGE_WORKGROUP_SERVER -#define PRODUCT_STORAGE_WORKGROUP_SERVER 0x00000016 -#endif -#ifndef PRODUCT_STORAGE_ENTERPRISE_SERVER -#define PRODUCT_STORAGE_ENTERPRISE_SERVER 0x00000017 -#endif -#ifndef PRODUCT_SERVER_FOR_SMALLBUSINESS -#define PRODUCT_SERVER_FOR_SMALLBUSINESS 0x00000018 -#endif -#ifndef PRODUCT_SMALLBUSINESS_SERVER_PREMIUM -#define PRODUCT_SMALLBUSINESS_SERVER_PREMIUM 0x00000019 -#endif -#ifndef PRODUCT_HOME_PREMIUM_N -#define PRODUCT_HOME_PREMIUM_N 0x0000001A -#endif -#ifndef PRODUCT_ENTERPRISE_N -#define PRODUCT_ENTERPRISE_N 0x0000001B -#endif -#ifndef PRODUCT_ULTIMATE_N -#define PRODUCT_ULTIMATE_N 0x0000001C -#endif -#ifndef PRODUCT_WEB_SERVER_CORE -#define PRODUCT_WEB_SERVER_CORE 0x0000001D -#endif -#ifndef PRODUCT_MEDIUMBUSINESS_SERVER_MANAGEMENT -#define PRODUCT_MEDIUMBUSINESS_SERVER_MANAGEMENT 0x0000001E -#endif -#ifndef PRODUCT_MEDIUMBUSINESS_SERVER_SECURITY -#define PRODUCT_MEDIUMBUSINESS_SERVER_SECURITY 0x0000001F -#endif -#ifndef PRODUCT_MEDIUMBUSINESS_SERVER_MESSAGING -#define PRODUCT_MEDIUMBUSINESS_SERVER_MESSAGING 0x00000020 -#endif -#ifndef PRODUCT_SMALLBUSINESS_SERVER_PRIME -#define PRODUCT_SMALLBUSINESS_SERVER_PRIME 0x00000021 -#endif -#ifndef PRODUCT_HOME_PREMIUM_SERVER -#define PRODUCT_HOME_PREMIUM_SERVER 0x00000022 -#endif -#ifndef PRODUCT_SERVER_FOR_SMALLBUSINESS_V -#define PRODUCT_SERVER_FOR_SMALLBUSINESS_V 0x00000023 -#endif -#ifndef PRODUCT_STANDARD_SERVER_V -#define PRODUCT_STANDARD_SERVER_V 0x00000024 -#endif -#ifndef PRODUCT_DATACENTER_SERVER_V -#define PRODUCT_DATACENTER_SERVER_V 0x00000025 -#endif -#ifndef PRODUCT_ENTERPRISE_SERVER_V -#define PRODUCT_ENTERPRISE_SERVER_V 0x00000026 -#endif -#ifndef PRODUCT_DATACENTER_SERVER_CORE_V -#define PRODUCT_DATACENTER_SERVER_CORE_V 0x00000027 -#endif -#ifndef PRODUCT_STANDARD_SERVER_CORE_V -#define PRODUCT_STANDARD_SERVER_CORE_V 0x00000028 -#endif -#ifndef PRODUCT_ENTERPRISE_SERVER_CORE_V -#define PRODUCT_ENTERPRISE_SERVER_CORE_V 0x00000029 -#endif -#ifndef PRODUCT_HYPERV -#define PRODUCT_HYPERV 0x0000002A -#endif -#ifndef PRODUCT_STORAGE_EXPRESS_SERVER_CORE -#define PRODUCT_STORAGE_EXPRESS_SERVER_CORE 0x0000002B -#endif -#ifndef PRODUCT_STORAGE_STANDARD_SERVER_CORE -#define PRODUCT_STORAGE_STANDARD_SERVER_CORE 0x0000002C -#endif -#ifndef PRODUCT_STORAGE_WORKGROUP_SERVER_CORE -#define PRODUCT_STORAGE_WORKGROUP_SERVER_CORE 0x0000002D -#endif -#ifndef PRODUCT_STORAGE_ENTERPRISE_SERVER_CORE -#define PRODUCT_STORAGE_ENTERPRISE_SERVER_CORE 0x0000002E -#endif -#ifndef PRODUCT_PROFESSIONAL -#define PRODUCT_PROFESSIONAL 0x00000030 -#endif -#ifndef PRODUCT_PROFESSIONAL_N -#define PRODUCT_PROFESSIONAL_N 0x00000031 -#endif -#ifndef PRODUCT_SB_SOLUTION_SERVER -#define PRODUCT_SB_SOLUTION_SERVER 0x00000032 -#endif -#ifndef PRODUCT_SERVER_FOR_SB_SOLUTIONS -#define PRODUCT_SERVER_FOR_SB_SOLUTIONS 0x00000033 -#endif -#ifndef PRODUCT_STANDARD_SERVER_SOLUTIONS -#define PRODUCT_STANDARD_SERVER_SOLUTIONS 0x00000034 -#endif -#ifndef PRODUCT_STANDARD_SERVER_SOLUTIONS_CORE -#define PRODUCT_STANDARD_SERVER_SOLUTIONS_CORE 0x00000035 -#endif -#ifndef PRODUCT_SB_SOLUTION_SERVER_EM -#define PRODUCT_SB_SOLUTION_SERVER_EM 0x00000036 -#endif -#ifndef PRODUCT_SERVER_FOR_SB_SOLUTIONS_EM -#define PRODUCT_SERVER_FOR_SB_SOLUTIONS_EM 0x00000037 -#endif -#ifndef PRODUCT_SOLUTION_EMBEDDEDSERVER -#define PRODUCT_SOLUTION_EMBEDDEDSERVER 0x00000038 -#endif -#ifndef PRODUCT_SOLUTION_EMBEDDEDSERVER_CORE -#define PRODUCT_SOLUTION_EMBEDDEDSERVER_CORE 0x00000039 -#endif -#ifndef PRODUCT_SMALLBUSINESS_SERVER_PREMIUM_CORE -#define PRODUCT_SMALLBUSINESS_SERVER_PREMIUM_CORE 0x0000003F -#endif -#ifndef PRODUCT_ESSENTIALBUSINESS_SERVER_MGMT -#define PRODUCT_ESSENTIALBUSINESS_SERVER_MGMT 0x0000003B -#endif -#ifndef PRODUCT_ESSENTIALBUSINESS_SERVER_ADDL -#define PRODUCT_ESSENTIALBUSINESS_SERVER_ADDL 0x0000003C -#endif -#ifndef PRODUCT_ESSENTIALBUSINESS_SERVER_MGMTSVC -#define PRODUCT_ESSENTIALBUSINESS_SERVER_MGMTSVC 0x0000003D -#endif -#ifndef PRODUCT_ESSENTIALBUSINESS_SERVER_ADDLSVC -#define PRODUCT_ESSENTIALBUSINESS_SERVER_ADDLSVC 0x0000003E -#endif -#ifndef PRODUCT_CLUSTER_SERVER_V -#define PRODUCT_CLUSTER_SERVER_V 0x00000040 -#endif -#ifndef PRODUCT_EMBEDDED -#define PRODUCT_EMBEDDED 0x00000041 -#endif -#ifndef PRODUCT_STARTER_E -#define PRODUCT_STARTER_E 0x00000042 -#endif -#ifndef PRODUCT_HOME_BASIC_E -#define PRODUCT_HOME_BASIC_E 0x00000043 -#endif -#ifndef PRODUCT_HOME_PREMIUM_E -#define PRODUCT_HOME_PREMIUM_E 0x00000044 -#endif -#ifndef PRODUCT_PROFESSIONAL_E -#define PRODUCT_PROFESSIONAL_E 0x00000045 -#endif -#ifndef PRODUCT_ENTERPRISE_E -#define PRODUCT_ENTERPRISE_E 0x00000046 -#endif -#ifndef PRODUCT_ULTIMATE_E -#define PRODUCT_ULTIMATE_E 0x00000047 -#endif +// Visual Studio 2010 #ifndef PRODUCT_ENTERPRISE_EVALUATION #define PRODUCT_ENTERPRISE_EVALUATION 0x00000048 #endif @@ -364,16 +141,6 @@ #endif - -// Newer suite types than what is currently defined in -// Visual Studio 2005 -#ifndef VER_SUITE_WH_SERVER -#define VER_SUITE_WH_SERVER 0x00008000 -#endif - - - - // Returns the number of seconds difference from UTC // int get_timezone(int& timezone) {