JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove pre-Vista considerations from utilities

Browse Source 
Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
This commit is contained in:
Corinna Vinschen 2016-06-27 17:50:25 +02:00
parent 673dd34823
commit b6693e7c17
4 changed files with 4 additions and 55 deletions

32
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 else
strcpy (osname, "NT"); strcpy (osname, "NT");
break; break;

19
winsup/utils/locale.cc

@ -322,15 +322,6 @@ print_all_locales (int verbose)
wcscpy (loc_list[lcnt].country, country); wcscpy (loc_list[lcnt].country, country);
} }
c = stpcpy (loc, name); 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 /* Now check certain conditions to figure out if that
locale requires a modifier. */ locale requires a modifier. */
if (lang == LANG_SERBIAN && !strncmp (loc, "sr_", 3) if (lang == LANG_SERBIAN && !strncmp (loc, "sr_", 3)
@ -377,12 +368,10 @@ print_all_locales (int verbose)
add_locale (loc, language, country); add_locale (loc, language, country);
} }
} }
/* Check Serbian language for the available territories. Up to /* Check Serbian language for the available territories. Vista only
Server 2003 we only had sr_SP (silently converted to sr_CS had sr_CS. Only starting with W7 we have the actual sr_RS and sr_ME.
above), in Vista we had only sr_CS. First starting with W7 we However, they are supported on Vista as well in Cygwin. So we fake
have the actual sr_RS and sr_ME. However, all of them are them here, if they are missing. */
supported on all systems in Cygwin. So we fake them here, if
they are missing. */
if (lang == LANG_SERBIAN) if (lang == LANG_SERBIAN)
{ {
int sr_CS_idx = -1; int sr_CS_idx = -1;

7
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); drive_map = (void *) cygwin_internal (CW_ALLOC_DRIVE_MAP);
/* Check old Cygwin version. */ /* Check old Cygwin version. */
if (drive_map == (void *) -1) if (drive_map == (void *) -1)

1
winsup/utils/strace.cc

@ -315,7 +315,6 @@ attach_process (pid_t pid)
if (h) if (h)
{ {
/* Try to turn off DEBUG_ONLY_THIS_PROCESS so we can follow forks */ /* 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; ULONG DebugFlags = DEBUG_PROCESS_DETACH_ON_EXIT;
NTSTATUS status = NtSetInformationProcess (h, ProcessDebugFlags, &DebugFlags, sizeof (DebugFlags)); NTSTATUS status = NtSetInformationProcess (h, ProcessDebugFlags, &DebugFlags, sizeof (DebugFlags));
if (!NT_SUCCESS (status)) if (!NT_SUCCESS (status))