generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-04-23 16:52:44 +02:00
Code Issues Projects Releases Wiki Activity

support for Win8/Win10

Browse Source
This commit is contained in:
Guenter Obiltschnig 2016-02-22 11:51:51 +01:00
parent 1cbaf38bbc
commit f2ed9cc606
2 changed files with 28 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
Foundation/src/Environment_WIN32.cpp
View File

@ -78,20 +78,28 @@ std::string EnvironmentImpl::osNameImpl()
std::string EnvironmentImpl::osDisplayNameImpl() std::string EnvironmentImpl::osDisplayNameImpl()
{ {
OSVERSIONINFO vi; OSVERSIONINFOEX vi; // OSVERSIONINFOEX is supported starting at Windows 2000
vi.dwOSVersionInfoSize = sizeof(vi); vi.dwOSVersionInfoSize = sizeof(vi);
if (GetVersionEx(&vi) == 0) throw SystemException("Cannot get OS version information"); if (GetVersionEx((OSVERSIONINFO*) &vi) == 0) throw SystemException("Cannot get OS version information");
switch(vi.dwMajorVersion) switch (vi.dwMajorVersion)
{ {
case 10:
switch (vi.dwMinorVersion)
{
case 0:
return vi.wProductType == VER_NT_WORKSTATION ? "Windows 10" : "Windows Server 2016";
}
case 6: case 6:
switch (vi.dwMinorVersion) switch (vi.dwMinorVersion)
{ {
case 0: case 0:
return "Windows Vista/Server 2008"; return vi.wProductType == VER_NT_WORKSTATION ? "Windows Vista" : "Windows Server 2008";
case 1: case 1:
return "Windows 7/Server 2008 R2"; return vi.wProductType == VER_NT_WORKSTATION ? "Windows 7" : "Windows Server 2008 R2";
case 2: case 2:
return "Windows 8/Server 2012"; return vi.wProductType == VER_NT_WORKSTATION ? "Windows 8" : "Windows Server 2012";
case 3:
return vi.wProductType == VER_NT_WORKSTATION ? "Windows 8.1" : "Windows Server 2012 R2";
default: default:
return "Unknown"; return "Unknown";
} }
@ -107,18 +115,6 @@ std::string EnvironmentImpl::osDisplayNameImpl()
default: default:
return "Unknown"; return "Unknown";
} }
case 4:
switch (vi.dwMinorVersion)
{
case 0:
return "Windows 95/Windows NT 4.0";
case 10:
return "Windows 98";
case 90:
return "Windows ME";
default:
return "Unknown";
}
default: default:
return "Unknown"; return "Unknown";
} }

32
Foundation/src/Environment_WIN32U.cpp
View File

@ -88,20 +88,28 @@ std::string EnvironmentImpl::osNameImpl()
std::string EnvironmentImpl::osDisplayNameImpl() std::string EnvironmentImpl::osDisplayNameImpl()
{ {
OSVERSIONINFO vi; OSVERSIONINFOEX vi; // OSVERSIONINFOEX is supported starting at Windows 2000
vi.dwOSVersionInfoSize = sizeof(vi); vi.dwOSVersionInfoSize = sizeof(vi);
if (GetVersionEx(&vi) == 0) throw SystemException("Cannot get OS version information"); if (GetVersionEx((OSVERSIONINFO*) &vi) == 0) throw SystemException("Cannot get OS version information");
switch(vi.dwMajorVersion) switch (vi.dwMajorVersion)
{ {
case 10:
switch (vi.dwMinorVersion)
{
case 0:
return vi.wProductType == VER_NT_WORKSTATION ? "Windows 10" : "Windows Server 2016";
}
case 6: case 6:
switch (vi.dwMinorVersion) switch (vi.dwMinorVersion)
{ {
case 0: case 0:
return "Windows Vista/Server 2008"; return vi.wProductType == VER_NT_WORKSTATION ? "Windows Vista" : "Windows Server 2008";
case 1: case 1:
return "Windows 7/Server 2008 R2"; return vi.wProductType == VER_NT_WORKSTATION ? "Windows 7" : "Windows Server 2008 R2";
case 2: case 2:
return "Windows 8/Server 2012"; return vi.wProductType == VER_NT_WORKSTATION ? "Windows 8" : "Windows Server 2012";
case 3:
return vi.wProductType == VER_NT_WORKSTATION ? "Windows 8.1" : "Windows Server 2012 R2";
default: default:
return "Unknown"; return "Unknown";
} }
@ -117,18 +125,6 @@ std::string EnvironmentImpl::osDisplayNameImpl()
default: default:
return "Unknown"; return "Unknown";
} }
case 4:
switch (vi.dwMinorVersion)
{
case 0:
return "Windows 95/Windows NT 4.0";
case 10:
return "Windows 98";
case 90:
return "Windows ME";
default:
return "Unknown";
}
default: default:
return "Unknown"; return "Unknown";
} }