From b6693e7c17456ac6b87827905213146214dc172e Mon Sep 17 00:00:00 2001
From: Corinna Vinschen <corinna@vinschen.de>
Date: Mon, 27 Jun 2016 17:50:25 +0200
Subject: [PATCH] Remove pre-Vista considerations from utilities

Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
---
 winsup/utils/cygcheck.cc | 32 --------------------------------
 winsup/utils/locale.cc   | 19 ++++---------------
 winsup/utils/ps.cc       |  7 -------
 winsup/utils/strace.cc   |  1 -
 4 files changed, 4 insertions(+), 55 deletions(-)

diff --git a/winsup/utils/cygcheck.cc b/winsup/utils/cygcheck.cc
index 4f311f2b6..4a6792910 100644
--- a/winsup/utils/cygcheck.cc
+++ b/winsup/utils/cygcheck.cc
@@ -1564,38 +1564,6 @@ dump_sysinfo ()
 	    {
 	    }
 	}
-      else if (osversion.dwMajorVersion == 5)
-	{
-	  /* cygcheck won't run on Windows 200 or earlier. */
-	  if (osversion.dwMinorVersion == 1)
-	    {
-	      strcpy (osname, "XP");
-	      if (GetSystemMetrics (SM_MEDIACENTER))
-		strcat (osname, " Media Center Edition");
-	      else if (GetSystemMetrics (SM_TABLETPC))
-		strcat (osname, " Tablet PC Edition");
-	      else if (GetSystemMetrics (SM_STARTER))
-		strcat (osname, " Starter Edition");
-	      else if (osversion.wSuiteMask & VER_SUITE_PERSONAL)
-		strcat (osname, " Home Edition");
-	      else
-		strcat (osname, " Professional");
-	    }
-	  else if (osversion.dwMinorVersion == 2)
-	    {
-	      strcpy (osname, "2003 Server");
-	      if (GetSystemMetrics (SM_SERVERR2))
-		strcat (osname, " R2");
-	      if (osversion.wSuiteMask & VER_SUITE_BLADE)
-		strcat (osname, " Web Edition");
-	      else if (osversion.wSuiteMask & VER_SUITE_DATACENTER)
-		strcat (osname, " Datacenter Edition");
-	      else if (osversion.wSuiteMask & VER_SUITE_ENTERPRISE)
-		strcat (osname, " Enterprise Edition");
-	      else if (osversion.wSuiteMask & VER_SUITE_COMPUTE_SERVER)
-		strcat (osname, " Compute Cluster Edition");
-	    }
-	}
       else
 	strcpy (osname, "NT");
       break;
diff --git a/winsup/utils/locale.cc b/winsup/utils/locale.cc
index 1a5b50958..1d55d346e 100644
--- a/winsup/utils/locale.cc
+++ b/winsup/utils/locale.cc
@@ -322,15 +322,6 @@ print_all_locales (int verbose)
 		  wcscpy (loc_list[lcnt].country, country);
 		}
 	      c = stpcpy (loc, name);
-	      /* Convert old sr_SP silently to sr_CS on old systems.
-		 Make sure sr_CS country is in recent shape. */
-	      if (lang == LANG_SERBIAN
-		  && (sublang == SUBLANG_SERBIAN_LATIN
-		      || sublang == SUBLANG_SERBIAN_CYRILLIC))
-		{
-		  c = stpcpy (loc, "sr_CS");
-		  wcscpy (country, L"Serbia and Montenegro (Former)");
-		}
 	      /* Now check certain conditions to figure out if that
 		 locale requires a modifier. */
 	      if (lang == LANG_SERBIAN && !strncmp (loc, "sr_", 3)
@@ -377,12 +368,10 @@ print_all_locales (int verbose)
 	      add_locale (loc, language, country);
 	    }
 	}
-      /* Check Serbian language for the available territories.  Up to
-	 Server 2003 we only had sr_SP (silently converted to sr_CS
-	 above), in Vista we had only sr_CS.  First starting with W7 we
-	 have the actual sr_RS and sr_ME.  However, all of them are
-	 supported on all systems in Cygwin.  So we fake them here, if
-	 they are missing. */
+      /* Check Serbian language for the available territories.  Vista only
+	 had sr_CS.  Only starting with W7 we have the actual sr_RS and sr_ME.
+	 However, they are supported on Vista as well in Cygwin.  So we fake
+	 them here, if they are missing. */
       if (lang == LANG_SERBIAN)
 	{
 	  int sr_CS_idx = -1;
diff --git a/winsup/utils/ps.cc b/winsup/utils/ps.cc
index ce5a4dc6e..be2ae60fa 100644
--- a/winsup/utils/ps.cc
+++ b/winsup/utils/ps.cc
@@ -251,13 +251,6 @@ main (int argc, char *argv[])
 	    }
 	}
 
-      /* Check process query capabilities. */
-      OSVERSIONINFO version;
-      version.dwOSVersionInfoSize = sizeof version;
-      GetVersionEx (&version);
-      if (version.dwMajorVersion <= 5)	/* pre-Vista */
-	proc_access = PROCESS_QUERY_INFORMATION;
-
       drive_map = (void *) cygwin_internal (CW_ALLOC_DRIVE_MAP);
       /* Check old Cygwin version. */
       if (drive_map == (void *) -1)
diff --git a/winsup/utils/strace.cc b/winsup/utils/strace.cc
index 3042d1b66..b193cfe2b 100644
--- a/winsup/utils/strace.cc
+++ b/winsup/utils/strace.cc
@@ -315,7 +315,6 @@ attach_process (pid_t pid)
       if (h)
 	{
 	  /* Try to turn off DEBUG_ONLY_THIS_PROCESS so we can follow forks */
-	  /* This is only supported on XP and later */
 	  ULONG DebugFlags = DEBUG_PROCESS_DETACH_ON_EXIT;
 	  NTSTATUS status = NtSetInformationProcess (h, ProcessDebugFlags, &DebugFlags, sizeof (DebugFlags));
 	  if (!NT_SUCCESS (status))