public inbox for cygwin-cvs@sourceware.org
help / color / mirror / Atom feed
From: Corinna Vinschen <corinna@sourceware.org>
To: cygwin-cvs@sourceware.org
Subject: [newlib-cygwin] Cygwin: drop a few minor references to WOW64
Date: Fri, 13 May 2022 12:39:12 +0000 (GMT)	[thread overview]
Message-ID: <20220513123912.DC79B395B072@sourceware.org> (raw)

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 ())
     {


                 reply	other threads:[~2022-05-13 12:39 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220513123912.DC79B395B072@sourceware.org \
    --to=corinna@sourceware.org \
    --cc=cygwin-cvs@sourceware.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).