diff options
| author | Kai Sommerfeld <kai.sommerfeld@gmx.com> | 2020-07-26 13:39:55 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-26 13:39:55 +0200 |
| commit | 988b7f070329dcfa435b4fc5b72038c42f8541b2 (patch) | |
| tree | b54f1f4648a36a9d5b379ae38dd0e4b1468ba945 | |
| parent | 25af32080990fda575d9d2ef7c7d8042b5730e25 (diff) | |
| parent | 5f62d3a7a2e019c7f608916e5af5e9319f400a43 (diff) | |
Merge pull request #18214 from thexai/windows-version
| -rw-r--r-- | xbmc/utils/SystemInfo.cpp | 38 | ||||
| -rw-r--r-- | xbmc/utils/SystemInfo.h | 7 | ||||
| -rw-r--r-- | xbmc/windowing/windows/WinSystemWin32DX.cpp | 2 |
3 files changed, 38 insertions, 9 deletions
diff --git a/xbmc/utils/SystemInfo.cpp b/xbmc/utils/SystemInfo.cpp index 5b1d89ed20..bf1c227b3e 100644 --- a/xbmc/utils/SystemInfo.cpp +++ b/xbmc/utils/SystemInfo.cpp @@ -652,11 +652,25 @@ std::string CSysInfo::GetOsPrettyNameWithVersion(void) osNameVer.append("Server 2012 R2"); break; case WindowsVersionWin10: - case WindowsVersionWin10_FCU: - if (osvi.wProductType == VER_NT_WORKSTATION) - osNameVer.append("10"); - else - osNameVer.append("Unknown future server version"); + osNameVer.append("10"); + break; + case WindowsVersionWin10_1709: + osNameVer.append("10 1709"); + break; + case WindowsVersionWin10_1803: + osNameVer.append("10 1803"); + break; + case WindowsVersionWin10_1809: + osNameVer.append("10 1809"); + break; + case WindowsVersionWin10_1903: + osNameVer.append("10 1903"); + break; + case WindowsVersionWin10_1909: + osNameVer.append("10 1909"); + break; + case WindowsVersionWin10_2004: + osNameVer.append("10 2004"); break; case WindowsVersionFuture: osNameVer.append("Unknown future version"); @@ -818,8 +832,18 @@ CSysInfo::WindowsVersion CSysInfo::GetWindowsVersion() m_WinVer = WindowsVersionWin8_1; else if (osvi.dwMajorVersion == 10 && osvi.dwMinorVersion == 0 && osvi.dwBuildNumber < 16299) m_WinVer = WindowsVersionWin10; - else if (osvi.dwMajorVersion == 10 && osvi.dwMinorVersion == 0 && osvi.dwBuildNumber >= 16299) - m_WinVer = WindowsVersionWin10_FCU; + else if (osvi.dwMajorVersion == 10 && osvi.dwMinorVersion == 0 && osvi.dwBuildNumber == 16299) + m_WinVer = WindowsVersionWin10_1709; + else if (osvi.dwMajorVersion == 10 && osvi.dwMinorVersion == 0 && osvi.dwBuildNumber == 17134) + m_WinVer = WindowsVersionWin10_1803; + else if (osvi.dwMajorVersion == 10 && osvi.dwMinorVersion == 0 && osvi.dwBuildNumber == 17763) + m_WinVer = WindowsVersionWin10_1809; + else if (osvi.dwMajorVersion == 10 && osvi.dwMinorVersion == 0 && osvi.dwBuildNumber == 18362) + m_WinVer = WindowsVersionWin10_1903; + else if (osvi.dwMajorVersion == 10 && osvi.dwMinorVersion == 0 && osvi.dwBuildNumber == 18363) + m_WinVer = WindowsVersionWin10_1909; + else if (osvi.dwMajorVersion == 10 && osvi.dwMinorVersion == 0 && osvi.dwBuildNumber >= 19041) + m_WinVer = WindowsVersionWin10_2004; /* Insert checks for new Windows versions here */ else if ( (osvi.dwMajorVersion == 6 && osvi.dwMinorVersion > 3) || osvi.dwMajorVersion > 10) m_WinVer = WindowsVersionFuture; diff --git a/xbmc/utils/SystemInfo.h b/xbmc/utils/SystemInfo.h index c8531929ff..30bd717234 100644 --- a/xbmc/utils/SystemInfo.h +++ b/xbmc/utils/SystemInfo.h @@ -74,7 +74,12 @@ public: WindowsVersionWin8, // Windows 8, Windows Server 2012 WindowsVersionWin8_1, // Windows 8.1 WindowsVersionWin10, // Windows 10 - WindowsVersionWin10_FCU, // Windows 10 Fall Creators Update + WindowsVersionWin10_1709, // Windows 10 1709 (FCU) + WindowsVersionWin10_1803, // Windows 10 1803 + WindowsVersionWin10_1809, // Windows 10 1809 + WindowsVersionWin10_1903, // Windows 10 1903 + WindowsVersionWin10_1909, // Windows 10 1909 + WindowsVersionWin10_2004, // Windows 10 2004 /* Insert new Windows versions here, when they'll be known */ WindowsVersionFuture = 100 // Future Windows version, not known to code }; diff --git a/xbmc/windowing/windows/WinSystemWin32DX.cpp b/xbmc/windowing/windows/WinSystemWin32DX.cpp index 083afb6e85..85c8e23669 100644 --- a/xbmc/windowing/windows/WinSystemWin32DX.cpp +++ b/xbmc/windowing/windows/WinSystemWin32DX.cpp @@ -144,7 +144,7 @@ void CWinSystemWin32DX::OnMove(int x, int y) bool CWinSystemWin32DX::DPIChanged(WORD dpi, RECT windowRect) const { // on Win10 FCU the OS keeps window size exactly the same size as it was - if (CSysInfo::IsWindowsVersionAtLeast(CSysInfo::WindowsVersionWin10_FCU)) + if (CSysInfo::IsWindowsVersionAtLeast(CSysInfo::WindowsVersionWin10_1709)) return true; m_deviceResources->SetDpi(dpi); |