From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2155) id DC79B395B072; Fri, 13 May 2022 12:39:12 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org DC79B395B072 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Corinna Vinschen To: cygwin-cvs@sourceware.org Subject: [newlib-cygwin] Cygwin: drop a few minor references to WOW64 X-Act-Checkin: newlib-cygwin X-Git-Author: Corinna Vinschen X-Git-Refname: refs/heads/master X-Git-Oldrev: 974163bc187ed7dfd0e6054491d967a5acb047db X-Git-Newrev: d4df9c6de1842397c70fc3e8378f06e799af9d6c Message-Id: <20220513123912.DC79B395B072@sourceware.org> Date: Fri, 13 May 2022 12:39:12 +0000 (GMT) X-BeenThere: cygwin-cvs@cygwin.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Cygwin core component git logs List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 May 2022 12:39:13 -0000 https://sourceware.org/git/gitweb.cgi?p=3Dnewlib-cygwin.git;h=3Dd4df9c6de18= 42397c70fc3e8378f06e799af9d6c commit d4df9c6de1842397c70fc3e8378f06e799af9d6c Author: Corinna Vinschen Date: Mon Mar 7 13:11:34 2022 +0100 Cygwin: drop a few minor references to WOW64 =20 Signed-off-by: Corinna Vinschen 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_re= gistry.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 +=3D 2; } else if (strncasematch (in_pc.get_posix (), "/proc/registry64", 16)) - { - wow64 =3D KEY_WOW64_64KEY; - prefix_len +=3D 2; - } + prefix_len +=3D 2; fhandler_base::set_name (in_pc); } =20 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 =3D 1; USHORT emulated, hosted; =20 - /* Check if we're running in WOW64 on ARM64. Check on 64 bit as wel= l, - 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. Fortunatel= y, 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 ()) {