ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #795 from micove/Recognize_Win8-10 

Recognize Win 8, 8.1 and 10.
This commit is contained in:
micove 2015-08-27 08:36:10 -04:00
parent 9e7a2bf1b9 f29dd8b927
commit 287672d3c1
4 changed files with 128 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
common/src/Utilities/Windows/WinMisc.cpp
View File

@ -55,6 +55,29 @@ u64 GetPhysicalMemory()
typedef void (WINAPI *PGNSI)(LPSYSTEM_INFO);
typedef BOOL (WINAPI *PGPI)(DWORD, DWORD, DWORD, DWORD, PDWORD);
// Win 10 SDK
#ifndef PRODUCT_CORE_N
# define PRODUCT_CORE_N 0x00000062
#endif
#ifndef PRODUCT_CORE
# define PRODUCT_CORE 0x00000065
#endif
#ifndef PRODUCT_PROFESSIONAL_WMC
# define PRODUCT_PROFESSIONAL_WMC 0x00000067
#endif
#ifndef PRODUCT_EDUCATION
# define PRODUCT_EDUCATION 0x00000079
#endif
#ifndef PRODUCT_EDUCATION_N
# define PRODUCT_EDUCATION_N 0x0000007A
#endif
#ifndef PRODUCT_ENTERPRISE_S
# define PRODUCT_ENTERPRISE_S 0x0000007D
#endif
#ifndef PRODUCT_ENTERPRISE_S_N
# define PRODUCT_ENTERPRISE_S_N 0x0000007E
#endif
// Calculates the Windows OS Version and install information, and returns it as a
// human-readable string. :)
// (Handy function borrowed from Microsoft's MSDN Online, and reformatted to use wxString.)
@ -92,7 +115,58 @@ wxString GetOSVersionString()
// Test for the specific product.
if ( osvi.dwMajorVersion == 6 )
if ( osvi.dwMajorVersion == 10 )
{
if( osvi.dwMinorVersion == 0 )
retval += ( osvi.wProductType == VER_NT_WORKSTATION ) ? L"Windows 10 " : L"Windows Server 2016 ";
pGPI = (PGPI) GetProcAddress( GetModuleHandle(TEXT("kernel32.dll")), "GetProductInfo");
pGPI( osvi.dwMajorVersion, osvi.dwMinorVersion, 0, 0, &dwType);
switch( dwType )
{
case PRODUCT_CORE: retval += L"Home"; break;
case PRODUCT_CORE_N: retval += L"Home N"; break;
case PRODUCT_PROFESSIONAL: retval += L"Pro"; break;
case PRODUCT_PROFESSIONAL_N: retval += L"Pro N"; break;
case PRODUCT_ENTERPRISE: retval += L"Enterprise"; break;
case PRODUCT_ENTERPRISE_N: retval += L"Enterprise N"; break;
case PRODUCT_ENTERPRISE_S: retval += L"Enterprise 2015 LTSB"; break;
case PRODUCT_ENTERPRISE_S_N: retval += L"Enterprise 2015 LTSB N"; break;
case PRODUCT_EDUCATION: retval += L"Education"; break;
case PRODUCT_EDUCATION_N: retval += L"Education N"; break;
}
}
if ( osvi.dwMajorVersion == 6 && osvi.dwMinorVersion > 1 )
{
if ( osvi.dwMinorVersion == 2 )
retval += ( osvi.wProductType == VER_NT_WORKSTATION ) ? L"Windows 8 " : L"Windows Server 2012 ";
if ( osvi.dwMinorVersion == 3 )
retval += ( osvi.wProductType == VER_NT_WORKSTATION ) ? L"Windows 8.1 " : L"Windows Server 2012 R2 ";
pGPI = (PGPI) GetProcAddress( GetModuleHandle(TEXT("kernel32.dll")), "GetProductInfo");
pGPI( osvi.dwMajorVersion, osvi.dwMinorVersion, 0, 0, &dwType);
switch( dwType )
{
case PRODUCT_PROFESSIONAL: retval += L"Pro"; break;
case PRODUCT_PROFESSIONAL_N: retval += L"Pro N"; break;
case PRODUCT_PROFESSIONAL_WMC: retval += L"Pro with Media Center"; break;
case PRODUCT_ENTERPRISE: retval += L"Enterprise"; break;
case PRODUCT_ENTERPRISE_N: retval += L"Enterprise N"; break;
case PRODUCT_SERVER_FOUNDATION: retval += L"Foundation"; break;
case PRODUCT_STANDARD_SERVER: retval += L"Standard"; break;
case PRODUCT_STANDARD_SERVER_CORE: retval += L"Standard (core)"; break;
case PRODUCT_DATACENTER_SERVER: retval += L"Datacenter"; break;
case PRODUCT_DATACENTER_SERVER_CORE: retval += L"Datacenter (core)"; break;
}
}
if ( osvi.dwMajorVersion == 6 && osvi.dwMinorVersion <= 1 )
{
if( osvi.dwMinorVersion == 0 )
retval += ( osvi.wProductType == VER_NT_WORKSTATION ) ? L"Windows Vista " : L"Windows Server 2008 ";
@ -170,7 +244,7 @@ wxString GetOSVersionString()
if ( osvi.dwMajorVersion == 5 && osvi.dwMinorVersion == 1 )
{
retval += L"Windows XP ";
retval += ( osvi.wSuiteMask & VER_SUITE_PERSONAL ) ? L"Professional" : L"Home Edition";
retval += ( osvi.wSuiteMask & VER_SUITE_PERSONAL ) ? L"Home Edition" : L"Professional";
}
if ( osvi.dwMajorVersion == 5 && osvi.dwMinorVersion == 0 )

44
pcsx2/windows/PCSX2.manifest Normal file
View File

@ -0,0 +1,44 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
<assemblyIdentity
type="win32"
name="PCSX2"
version="1.0.0.0"
/>
<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
<security>
<requestedPrivileges>
<requestedExecutionLevel
level="asInvoker"
uiAccess="false"
/>
</requestedPrivileges>
</security>
</trustInfo>
<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
<application>
<!-- Windows 10 -->
<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
<!-- Windows 8.1 -->
<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
<!-- Windows Vista -->
<supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>
<!-- Windows 7 -->
<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
<!-- Windows 8 -->
<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
</application>
</compatibility>
<dependency>
<dependentAssembly>
<assemblyIdentity
type="win32"
name="Microsoft.Windows.Common-Controls"
version="6.0.0.0"
processorArchitecture="*"
publicKeyToken="6595b64144ccf1df"
language="*"
/>
</dependentAssembly>
</dependency>
</assembly>

3
pcsx2/windows/VCprojects/pcsx2.vcxproj
View File

@ -942,6 +942,9 @@
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RootDir)%(Directory)\%(Filename).h</Outputs>
</CustomBuild>
</ItemGroup>
<ItemGroup>
<Manifest Include="..\PCSX2.manifest" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
<Import Project="$(VCTargetsPath)\BuildCustomizations\masm.targets" />

5
pcsx2/windows/VCprojects/pcsx2.vcxproj.filters
View File

@ -1390,4 +1390,9 @@
<Filter>AppHost\Resources</Filter>
</CustomBuild>
</ItemGroup>
<ItemGroup>
<Manifest Include="..\PCSX2.manifest">
<Filter>AppHost\Resources</Filter>
</Manifest>
</ItemGroup>
</Project>