From a3af720dee13cb83f50406c4cddda635aca03e31 Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Tue, 15 Nov 2022 21:50:13 +0100 Subject: [PATCH] Cygwin: fix a few comments mentioning Windows 7 or 8 Signed-off-by: Corinna Vinschen --- winsup/cygwin/fhandler/pipe.cc | 3 --- winsup/cygwin/fhandler/proc.cc | 1 - winsup/cygwin/local_includes/ntdll.h | 3 +-- winsup/cygwin/mount.cc | 6 +++--- winsup/cygwin/resource.cc | 3 +-- 5 files changed, 5 insertions(+), 11 deletions(-) diff --git a/winsup/cygwin/fhandler/pipe.cc b/winsup/cygwin/fhandler/pipe.cc index 608a78490..94b85c349 100644 --- a/winsup/cygwin/fhandler/pipe.cc +++ b/winsup/cygwin/fhandler/pipe.cc @@ -1179,9 +1179,6 @@ cache_err: return get_query_hdl_per_process (name, ntfn); /* Since Win8 */ } -/* This function is faster than get_query_hdl_per_system(), however, - only works since Windows 8 because ProcessHandleInformation is not - suppoted by NtQueryInformationProcess() before Windows 8. */ HANDLE fhandler_pipe::get_query_hdl_per_process (WCHAR *name, OBJECT_NAME_INFORMATION *ntfn) diff --git a/winsup/cygwin/fhandler/proc.cc b/winsup/cygwin/fhandler/proc.cc index 24067f687..332bf2a7e 100644 --- a/winsup/cygwin/fhandler/proc.cc +++ b/winsup/cygwin/fhandler/proc.cc @@ -650,7 +650,6 @@ format_proc_cpuinfo (void *, char *&destbuf) char *buf = tp.c_get (); char *bufptr = buf; - //WORD num_cpu_groups = 1; /* Pre Windows 7, only one group... */ WORD num_cpu_per_group = __get_cpus_per_group (); cpu_num_p = wcpcpy (cpu_key, L"\\Registry\\Machine\\HARDWARE\\DESCRIPTION" diff --git a/winsup/cygwin/local_includes/ntdll.h b/winsup/cygwin/local_includes/ntdll.h index 0f2310882..8c4d00883 100644 --- a/winsup/cygwin/local_includes/ntdll.h +++ b/winsup/cygwin/local_includes/ntdll.h @@ -961,8 +961,7 @@ typedef struct _LDR_DATA_TABLE_ENTRY ULONG Flags; USHORT LoadCount; /* More follows. Left out since it's just not used. The aforementioned - part of the structure is stable from at least NT4 up to Windows 8, - including WOW64. */ + part of the structure is stable from at least NT4 up to Windows 11. */ } LDR_DATA_TABLE_ENTRY, *PLDR_DATA_TABLE_ENTRY; typedef struct _PEB_LDR_DATA diff --git a/winsup/cygwin/mount.cc b/winsup/cygwin/mount.cc index 63c9d2874..9b40c4075 100644 --- a/winsup/cygwin/mount.cc +++ b/winsup/cygwin/mount.cc @@ -294,13 +294,13 @@ fs_info::update (PUNICODE_STRING upath, HANDLE in_vol) if (is_remote_drive ()) { /* Should be reevaluated for each new OS. Right now this mask is valid up - to Windows 8. The important point here is to test only flags indicating + to Windows 11. The important point here is to test only flags indicating capabilities and to ignore flags indicating a specific state of this volume. At present these flags to ignore are FILE_VOLUME_IS_COMPRESSED, FILE_READ_ONLY_VOLUME, and FILE_SEQUENTIAL_WRITE_ONCE. The additional filesystem flags supported since Windows 7 are also ignored for now. - They add information, but only on W7 and later, and only for filesystems - also supporting these flags, right now only NTFS. */ + They add information only for filesystems also supporting these flags, + right now only NTFS. */ #define GETVOLINFO_VALID_MASK (0x002701ffUL) #define TEST_GVI(f,m) (((f) & GETVOLINFO_VALID_MASK) == (m)) diff --git a/winsup/cygwin/resource.cc b/winsup/cygwin/resource.cc index aafc2b0b1..5ec436c2c 100644 --- a/winsup/cygwin/resource.cc +++ b/winsup/cygwin/resource.cc @@ -218,8 +218,7 @@ __set_rlimit_as (unsigned long new_as_limit) /* If we already have a limit, we must not change it because that would potentially influence already running child processes. - Just try to create another, nested job. On systems prior to - Windows 8 / Server 2012 this will fail, but that's ok. */ + Just try to create another, nested job. */ while (new_as_id == 0) new_as_id = InterlockedIncrement (&job_serial_number); RtlInitUnicodeString (&uname,