diff --git a/checkin_notes b/checkin_notes index c9cba96566..eef98f72b8 100644 --- a/checkin_notes +++ b/checkin_notes @@ -3880,18 +3880,18 @@ Rom 15 May 2012 all_projects_list.xml David 18 May 2012 - - client/API/vboxwrapper: add an optional element + - client/API/vboxwrapper: add an optional element to cc_config.xml. - If present, run VMs without the --headless option. + If present, run VMs without the --headless option. - client/ - app_start.cpp - lib/ - app_ipc.cpp,h - cc_config.cpp,h - samples/vboxwrapper/ - vbox.cpp,h - vboxwrapper.cpp + client/ + app_start.cpp + lib/ + app_ipc.cpp,h + cc_config.cpp,h + samples/vboxwrapper/ + vbox.cpp,h + vboxwrapper.cpp David 18 May 2012 - web: show "run beta apps?" project pref if the project @@ -4329,3 +4329,17 @@ David 14 June 2012 des.h stats.cpp,h vda_lib.cpp,h + +David 14 June 2012 + - client: + - added the definitions for the new Windows 7/2008r2 preSP1 + and Windows 8/2012 SKUs based on the winnt.h + from the Windows 8 RC SKD (also added as proof) + - added the detection for some more Windows SKU + - Updates provided by Teamwork of Planet3Dnow.de to coproc_detect.cpp + - added CAL_TARGET_ID 21 as : AMD Radeon HD 78x0 series (Pitcairn) + (from [P3D] Crashtest) + + client/ + coproc_detect.cpp + hostinfo_win.cpp diff --git a/client/coproc_detect.cpp b/client/coproc_detect.cpp index 6086e6564f..9508fd6029 100644 --- a/client/coproc_detect.cpp +++ b/client/coproc_detect.cpp @@ -1424,10 +1424,11 @@ void COPROC_ATI::get( gpu_name="AMD Radeon HD 6300 series (Caicos)"; break; case 20: - gpu_name = "AMD Radeon HD 79x0 series (Tahiti)"; + gpu_name="AMD Radeon HD 79x0 series (Tahiti)"; break; -// there arent any other target ids inside the Shadercompiler (YET !!! ) -// but because of ATI was bought by AMD and is not existing anymore the default should be changed too + case 21: + gpu_name="AMD Radeon HD 78x0 series (Pitcairn)"; + break; default: gpu_name="AMD Radeon HD (unknown)"; break; diff --git a/client/hostinfo_win.cpp b/client/hostinfo_win.cpp index 968695f0f3..57b0fea115 100644 --- a/client/hostinfo_win.cpp +++ b/client/hostinfo_win.cpp @@ -292,7 +292,51 @@ #ifndef PRODUCT_ENTERPRISE_N_EVALUATION #define PRODUCT_ENTERPRISE_N_EVALUATION 0x00000054 #endif - +#ifndef PRODUCT_EMBEDDED_AUTOMOTIVE +#define PRODUCT_EMBEDDED_AUTOMOTIVE 0x00000055 +#endif +#ifndef PRODUCT_EMBEDDED_INDUSTRY_A +#define PRODUCT_EMBEDDED_INDUSTRY_A 0x00000056 +#endif +#ifndef PRODUCT_THINPC +#define PRODUCT_THINPC 0x00000057 +#endif +#ifndef PRODUCT_EMBEDDED_A +#define PRODUCT_EMBEDDED_A 0x00000058 +#endif +#ifndef PRODUCT_EMBEDDED_INDUSTRY +#define PRODUCT_EMBEDDED_INDUSTRY 0x00000059 +#endif +#ifndef PRODUCT_EMBEDDED_E +#define PRODUCT_EMBEDDED_E 0x0000005A +#endif +#ifndef PRODUCT_EMBEDDED_INDUSTRY_E +#define PRODUCT_EMBEDDED_INDUSTRY_E 0x0000005B +#endif +#ifndef PRODUCT_EMBEDDED_INDUSTRY_A_E +#define PRODUCT_EMBEDDED_INDUSTRY_A_E 0x0000005C +#endif +#ifndef PRODUCT_STORAGE_WORKGROUP_EVALUATION_SERVER +#define PRODUCT_STORAGE_STANDARD_EVALUATION_SERVER 0x00000060 +#endif +#ifndef PRODUCT_CORE_ARM +#define PRODUCT_CORE_ARM 0x00000061 +#endif +#ifndef PRODUCT_CORE_N +#define PRODUCT_CORE_N 0x00000062 +#endif +#ifndef PRODUCT_CORE_COUNTRYSPECIFIC +#define PRODUCT_CORE_COUNTRYSPECIFIC 0x00000063 +#endif +#ifndef PRODUCT_CORE_SINGLELANGUAGE +#define PRODUCT_CORE_SINGLELANGUAGE 0x00000064 +#endif +#ifndef PRODUCT_CORE +#define PRODUCT_CORE 0x00000065 +#endif +#ifndef PRODUCT_PROFESSIONAL_WMC +#define PRODUCT_PROFESSIONAL_WMC 0x00000067 +#endif // Newer suite types than what is currently defined in // Visual Studio 2005 @@ -391,7 +435,7 @@ int get_os_information( if( osvi.wProductType == VER_NT_WORKSTATION ) { strcat(os_name, "Windows 8"); } else { - strcat(os_name, "Windows 8 Server "); + strcat(os_name, "Windows Server 2012"); } pGPI( 6, 2, 0, 0, &dwType); } @@ -541,6 +585,14 @@ int get_os_information( case PRODUCT_PRERELEASE_N: strcat(szSKU, "Developer Preview N "); break; + // added Embbedded SKUs: + case PRODUCT_EMBEDDED: + strcat(szSKU, "Embedded Standard "); + break; + case PRODUCT_THINPC: + strcat(szSKU, "ThinPC "); + break; + } } else if( (osvi.dwMajorVersion == 5 && osvi.dwMinorVersion == 2) ) { if( osvi.wSuiteMask & VER_SUITE_PERSONAL ) { @@ -567,7 +619,7 @@ int get_os_information( } } - // Test for the server type. + // Test for the server type. else if ( (osvi.wProductType == VER_NT_SERVER) || (osvi.wProductType == VER_NT_DOMAIN_CONTROLLER) ) { if( (osvi.dwMajorVersion == 6) ) {