[win32] remove XP version detection

diff --git a/xbmc/utils/SystemInfo.cpp b/xbmc/utils/SystemInfo.cpp
index 3c9cbe7..82c650e 100644 (file)
--- a/xbmc/utils/SystemInfo.cpp
+++ b/xbmc/utils/SystemInfo.cpp
@@ -431,9 +431,7 @@ CSysInfo::WindowsVersion CSysInfo::GetWindowsVersion()
     osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX);
     if (GetVersionEx((OSVERSIONINFO *)&osvi))
     {
-      if (osvi.dwMajorVersion == 5 && (osvi.dwMinorVersion == 1 || osvi.dwMinorVersion == 2 ))
-        m_WinVer = WindowsVersionWinXP;
-      else if (osvi.dwMajorVersion == 6 && osvi.dwMinorVersion == 0)
+      if (osvi.dwMajorVersion == 6 && osvi.dwMinorVersion == 0)
         m_WinVer = WindowsVersionVista;
       else if (osvi.dwMajorVersion == 6 && osvi.dwMinorVersion == 1)
         m_WinVer = WindowsVersionWin7;
@@ -517,22 +515,6 @@ CStdString CSysInfo::GetKernelVersion()
   {
     switch (GetWindowsVersion())
     {
-    case WindowsVersionWinXP:
-      if (GetSystemMetrics(SM_SERVERR2))
-        strKernel.append(" Server 2003 R2");
-      else if (osvi.wSuiteMask & VER_SUITE_STORAGE_SERVER)
-        strKernel.append(" Storage Server 2003");
-      else if (osvi.wSuiteMask & VER_SUITE_WH_SERVER)
-        strKernel.append(" Home Server");
-      else if (osvi.wProductType == VER_NT_WORKSTATION && GetKernelBitness() == 64)
-        strKernel.append(" XP Professional");
-      else if (osvi.wProductType != VER_NT_WORKSTATION)
-        strKernel.append(" Server 2003");
-      else if (osvi.wSuiteMask & VER_SUITE_PERSONAL)
-        strKernel.append("XP Home Edition" );
-      else
-        strKernel.append("XP Professional" );
-      break;
     case WindowsVersionVista:
       if (osvi.wProductType == VER_NT_WORKSTATION)
         strKernel.append(" Vista");

diff --git a/xbmc/utils/SystemInfo.h b/xbmc/utils/SystemInfo.h
index 6a65b6c..94c3a9a 100644 (file)
--- a/xbmc/utils/SystemInfo.h
+++ b/xbmc/utils/SystemInfo.h
@@ -83,7 +83,6 @@ public:
   enum WindowsVersion
   {
     WindowsVersionUnknown = -1, // Undetected, unsupported Windows version or OS in not Windows
-    WindowsVersionWinXP,        // Windows XP, Windows Server 2003 (R2), Windows Home Server
     WindowsVersionVista,        // Windows Vista, Windows Server 2008
     WindowsVersionWin7,         // Windows 7, Windows Server 2008 R2
     WindowsVersionWin8,         // Windows 8, Windows Server 2012