From 48953788b377c5e4e789f21106c47b645e1366de Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Tue, 15 Nov 2022 17:10:57 +0100 Subject: [PATCH] Cygwin: drop wincap::needs_query_information Only required for Windows 7 and 8. Signed-off-by: Corinna Vinschen --- winsup/cygwin/local_includes/wincap.h | 2 -- winsup/cygwin/sigproc.cc | 9 +-------- winsup/cygwin/wincap.cc | 12 ------------ 3 files changed, 1 insertion(+), 22 deletions(-) diff --git a/winsup/cygwin/local_includes/wincap.h b/winsup/cygwin/local_includes/wincap.h index 9fff12909..1075f3bea 100644 --- a/winsup/cygwin/local_includes/wincap.h +++ b/winsup/cygwin/local_includes/wincap.h @@ -17,7 +17,6 @@ struct wincaps ops generated by gcc are off by 4 bytes. */ struct __attribute__ ((aligned (8))) { unsigned is_server : 1; - unsigned needs_query_information : 1; unsigned has_precise_system_time : 1; unsigned has_microsoft_accounts : 1; unsigned has_new_pebteb_region : 1; @@ -76,7 +75,6 @@ public: } intptr_t IMPLEMENT (mmap_storage_high) bool IMPLEMENT (is_server) - bool IMPLEMENT (needs_query_information) bool IMPLEMENT (has_precise_system_time) bool IMPLEMENT (has_microsoft_accounts) bool IMPLEMENT (has_new_pebteb_region) diff --git a/winsup/cygwin/sigproc.cc b/winsup/cygwin/sigproc.cc index a99876dc9..ce36c8be3 100644 --- a/winsup/cygwin/sigproc.cc +++ b/winsup/cygwin/sigproc.cc @@ -846,14 +846,7 @@ child_info::child_info (unsigned in_cb, child_info_types chtype, DWORD perms = PROCESS_QUERY_LIMITED_INFORMATION | PROCESS_VM_READ | PROCESS_VM_OPERATION | SYNCHRONIZE; if (type == _CH_FORK) - { - perms |= PROCESS_DUP_HANDLE; - /* VirtualQueryEx is documented to require PROCESS_QUERY_INFORMATION. - That's true for Windows 7, but PROCESS_QUERY_LIMITED_INFORMATION - appears to be sufficient on Windows 8 and later. */ - if (wincap.needs_query_information ()) - perms |= PROCESS_QUERY_INFORMATION; - } + perms |= PROCESS_DUP_HANDLE; if (!DuplicateHandle (GetCurrentProcess (), GetCurrentProcess (), GetCurrentProcess (), &parent, perms, TRUE, 0)) diff --git a/winsup/cygwin/wincap.cc b/winsup/cygwin/wincap.cc index 7309516bf..15400d8d0 100644 --- a/winsup/cygwin/wincap.cc +++ b/winsup/cygwin/wincap.cc @@ -24,7 +24,6 @@ wincaps wincap_7 __attribute__((section (".cygwin_dll_common"), shared)) = { mmap_storage_high:__MMAP_STORAGE_HIGH_LEGACY, { is_server:false, - needs_query_information:true, has_precise_system_time:false, has_microsoft_accounts:false, has_new_pebteb_region:false, @@ -55,7 +54,6 @@ wincaps wincap_8 __attribute__((section (".cygwin_dll_common"), shared)) = { mmap_storage_high:__MMAP_STORAGE_HIGH_LEGACY, { is_server:false, - needs_query_information:true, has_precise_system_time:true, has_microsoft_accounts:true, has_new_pebteb_region:false, @@ -86,7 +84,6 @@ wincaps wincap_8_1 __attribute__((section (".cygwin_dll_common"), shared)) = { mmap_storage_high:__MMAP_STORAGE_HIGH, { is_server:false, - needs_query_information:false, has_precise_system_time:true, has_microsoft_accounts:true, has_new_pebteb_region:false, @@ -117,7 +114,6 @@ wincaps wincap_10_1507 __attribute__((section (".cygwin_dll_common"), shared)) mmap_storage_high:__MMAP_STORAGE_HIGH, { is_server:false, - needs_query_information:false, has_precise_system_time:true, has_microsoft_accounts:true, has_new_pebteb_region:false, @@ -148,7 +144,6 @@ wincaps wincap_10_1607 __attribute__((section (".cygwin_dll_common"), shared)) mmap_storage_high:__MMAP_STORAGE_HIGH, { is_server:false, - needs_query_information:false, has_precise_system_time:true, has_microsoft_accounts:true, has_new_pebteb_region:false, @@ -179,7 +174,6 @@ wincaps wincap_10_1703 __attribute__((section (".cygwin_dll_common"), shared)) = mmap_storage_high:__MMAP_STORAGE_HIGH, { is_server:false, - needs_query_information:false, has_precise_system_time:true, has_microsoft_accounts:true, has_new_pebteb_region:true, @@ -210,7 +204,6 @@ wincaps wincap_10_1709 __attribute__((section (".cygwin_dll_common"), shared)) = mmap_storage_high:__MMAP_STORAGE_HIGH, { is_server:false, - needs_query_information:false, has_precise_system_time:true, has_microsoft_accounts:true, has_new_pebteb_region:true, @@ -241,7 +234,6 @@ wincaps wincap_10_1803 __attribute__((section (".cygwin_dll_common"), shared)) = mmap_storage_high:__MMAP_STORAGE_HIGH, { is_server:false, - needs_query_information:false, has_precise_system_time:true, has_microsoft_accounts:true, has_new_pebteb_region:true, @@ -272,7 +264,6 @@ wincaps wincap_10_1809 __attribute__((section (".cygwin_dll_common"), shared)) = mmap_storage_high:__MMAP_STORAGE_HIGH, { is_server:false, - needs_query_information:false, has_precise_system_time:true, has_microsoft_accounts:true, has_new_pebteb_region:true, @@ -303,7 +294,6 @@ wincaps wincap_10_1903 __attribute__((section (".cygwin_dll_common"), shared)) = mmap_storage_high:__MMAP_STORAGE_HIGH, { is_server:false, - needs_query_information:false, has_precise_system_time:true, has_microsoft_accounts:true, has_new_pebteb_region:true, @@ -334,7 +324,6 @@ wincaps wincap_10_2004 __attribute__((section (".cygwin_dll_common"), shared)) = mmap_storage_high:__MMAP_STORAGE_HIGH, { is_server:false, - needs_query_information:false, has_precise_system_time:true, has_microsoft_accounts:true, has_new_pebteb_region:true, @@ -365,7 +354,6 @@ wincaps wincap_11 __attribute__((section (".cygwin_dll_common"), shared)) = { mmap_storage_high:__MMAP_STORAGE_HIGH, { is_server:false, - needs_query_information:false, has_precise_system_time:true, has_microsoft_accounts:true, has_new_pebteb_region:true, -- 2.43.5