diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2022-03-07 13:11:34 +0100 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2022-05-12 22:00:25 +0200 |
| commit | 24e31ffc8c81aea67a05867f195461c12bd23b54 (patch) | |
| tree | 5848cdd143048dbef2211507cadcf78cb20a7413 | |
| parent | 611e2cc54bb3c4c0c5b85122a3d0473bcade1f25 (diff) | |
| download | newlib-24e31ffc8c81aea67a05867f195461c12bd23b54.zip newlib-24e31ffc8c81aea67a05867f195461c12bd23b54.tar.gz newlib-24e31ffc8c81aea67a05867f195461c12bd23b54.tar.bz2 | |
Cygwin: drop a few minor references to WOW64
Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
| -rw-r--r-- | winsup/cygwin/fhandler_registry.cc | 5 | ||||
| -rw-r--r-- | winsup/cygwin/ntdll.h | 2 | ||||
| -rw-r--r-- | winsup/cygwin/path.cc | 3 | ||||
| -rw-r--r-- | 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 747b76d..b6c8aee 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 59c3966..cd455eb 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 b00f4c4..0ccdf98 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 6aae33c..6173b03 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 ()) { |