Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-10-01 11:49:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4545

Browse Source 
93a88d73 Utils: add support for newer Windows versions detection (Gregory Lemercier)
This commit is contained in:
Riccardo Spagni 2018-10-26 22:30:40 +02:00
commit d7ff24c1e0
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
1 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/common/util.cpp
View File

@ -308,10 +308,19 @@ namespace tools
StringCchCopy(pszOS, BUFSIZE, TEXT("Microsoft ")); StringCchCopy(pszOS, BUFSIZE, TEXT("Microsoft "));
// Test for the specific product. // Test for the specific product.
if ( osvi.dwMajorVersion == 10 )
{
if ( osvi.dwMinorVersion == 0 )
{
if( osvi.wProductType == VER_NT_WORKSTATION )
StringCchCat(pszOS, BUFSIZE, TEXT("Windows 10 "));
else StringCchCat(pszOS, BUFSIZE, TEXT("Windows Server 2016 " ));
}
}
if ( osvi.dwMajorVersion == 6 ) if ( osvi.dwMajorVersion == 6 )
{ {
if( osvi.dwMinorVersion == 0 ) if ( osvi.dwMinorVersion == 0 )
{ {
if( osvi.wProductType == VER_NT_WORKSTATION ) if( osvi.wProductType == VER_NT_WORKSTATION )
StringCchCat(pszOS, BUFSIZE, TEXT("Windows Vista ")); StringCchCat(pszOS, BUFSIZE, TEXT("Windows Vista "));
@ -325,6 +334,20 @@ namespace tools
else StringCchCat(pszOS, BUFSIZE, TEXT("Windows Server 2008 R2 " )); else StringCchCat(pszOS, BUFSIZE, TEXT("Windows Server 2008 R2 " ));
} }
if ( osvi.dwMinorVersion == 2 )
{
if( osvi.wProductType == VER_NT_WORKSTATION )
StringCchCat(pszOS, BUFSIZE, TEXT("Windows 8 "));
else StringCchCat(pszOS, BUFSIZE, TEXT("Windows Server 2012 " ));
}
if ( osvi.dwMinorVersion == 3 )
{
if( osvi.wProductType == VER_NT_WORKSTATION )
StringCchCat(pszOS, BUFSIZE, TEXT("Windows 8.1 "));
else StringCchCat(pszOS, BUFSIZE, TEXT("Windows Server 2012 R2 " ));
}
pGPI = (PGPI) GetProcAddress( pGPI = (PGPI) GetProcAddress(
GetModuleHandle(TEXT("kernel32.dll")), GetModuleHandle(TEXT("kernel32.dll")),
"GetProductInfo"); "GetProductInfo");