[newlib-cygwin] Cygwin: drop a few minor references to WOW64
Corinna Vinschen
corinna@sourceware.org
Fri May 13 12:39:12 GMT 2022
https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=d4df9c6de1842397c70fc3e8378f06e799af9d6c
commit d4df9c6de1842397c70fc3e8378f06e799af9d6c
Author: Corinna Vinschen <corinna@vinschen.de>
Date: Mon Mar 7 13:11:34 2022 +0100
Cygwin: drop a few minor references to WOW64
Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
Diff:
---
winsup/cygwin/fhandler_registry.cc | 5 +----
winsup/cygwin/ntdll.h | 2 +-
winsup/cygwin/path.cc | 3 +--
winsup/cygwin/uinfo.cc | 2 +-
4 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/winsup/cygwin/fhandler_registry.cc b/winsup/cygwin/fhandler_registry.cc
index 747b76de3..b6c8aee5f 100644
--- a/winsup/cygwin/fhandler_registry.cc
+++ b/winsup/cygwin/fhandler_registry.cc
@@ -448,10 +448,7 @@ fhandler_registry::set_name (path_conv &in_pc)
prefix_len += 2;
}
else if (strncasematch (in_pc.get_posix (), "/proc/registry64", 16))
- {
- wow64 = KEY_WOW64_64KEY;
- prefix_len += 2;
- }
+ prefix_len += 2;
fhandler_base::set_name (in_pc);
}
diff --git a/winsup/cygwin/ntdll.h b/winsup/cygwin/ntdll.h
index 59c396676..cd455ebfc 100644
--- a/winsup/cygwin/ntdll.h
+++ b/winsup/cygwin/ntdll.h
@@ -1109,7 +1109,7 @@ typedef struct _PROCESS_BASIC_INFORMATION
NTSTATUS ExitStatus;
PPEB PebBaseAddress;
KAFFINITY AffinityMask;
- KPRIORITY BasePriority; /* !!!Broken on WOW64!!! */
+ KPRIORITY BasePriority;
ULONG_PTR UniqueProcessId;
ULONG_PTR InheritedFromUniqueProcessId;
} PROCESS_BASIC_INFORMATION, *PPROCESS_BASIC_INFORMATION;
diff --git a/winsup/cygwin/path.cc b/winsup/cygwin/path.cc
index b00f4c4f8..0ccdf9832 100644
--- a/winsup/cygwin/path.cc
+++ b/winsup/cygwin/path.cc
@@ -4765,8 +4765,7 @@ find_fast_cwd ()
bool warn = 1;
USHORT emulated, hosted;
- /* Check if we're running in WOW64 on ARM64. Check on 64 bit as well,
- given that ARM64 Windows 10 provides a x86_64 emulation soon. Skip
+ /* Check if we're running in WOW64 on ARM64 emulating AMD64. Skip
warning as long as there's no solution for finding the FAST_CWD
pointer on that system. */
if (IsWow64Process2 (GetCurrentProcess (), &emulated, &hosted)
diff --git a/winsup/cygwin/uinfo.cc b/winsup/cygwin/uinfo.cc
index 6aae33c92..6173b0324 100644
--- a/winsup/cygwin/uinfo.cc
+++ b/winsup/cygwin/uinfo.cc
@@ -1423,7 +1423,7 @@ cygheap_domain_info::init ()
even if no NFS name mapping is configured on the machine. Fortunately,
the posixAccount and posixGroup schemas are already available in the
Active Directory default setup. */
- reg_key reg (HKEY_LOCAL_MACHINE, KEY_READ | KEY_WOW64_64KEY,
+ reg_key reg (HKEY_LOCAL_MACHINE, KEY_READ,
L"SOFTWARE", L"Microsoft", L"ServicesForNFS", NULL);
if (!reg.error ())
{
More information about the Cygwin-cvs
mailing list