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 system_wow64_directory and related code
Date: Fri, 13 May 2022 12:38:57 +0000 (GMT)	[thread overview]
Message-ID: <20220513123857.C523C395B062@sourceware.org> (raw)

https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=24363cffefd2aa21050497398f4b8c874286bcba

commit 24363cffefd2aa21050497398f4b8c874286bcba
Author: Corinna Vinschen <corinna@vinschen.de>
Date:   Mon Mar 7 12:20:00 2022 +0100

    Cygwin: drop system_wow64_directory and related code
    
    Signed-off-by: Corinna Vinschen <corinna@vinschen.de>

Diff:
---
 winsup/cygwin/dcrt0.cc      | 9 ---------
 winsup/cygwin/exceptions.cc | 6 ------
 winsup/cygwin/globals.cc    | 2 --
 3 files changed, 17 deletions(-)

diff --git a/winsup/cygwin/dcrt0.cc b/winsup/cygwin/dcrt0.cc
index 030d99b51..17d3b6653 100644
--- a/winsup/cygwin/dcrt0.cc
+++ b/winsup/cygwin/dcrt0.cc
@@ -732,15 +732,6 @@ init_windows_system_directory ()
       RtlInitCountedUnicodeString (&windows_directory_path,
 	    windows_directory_buf,
 	    (windows_directory_length + 4) * sizeof (WCHAR));
-#ifdef __i386__
-      system_wow64_directory_length =
-	    GetSystemWow64DirectoryW (system_wow64_directory, MAX_PATH);
-      if (system_wow64_directory_length)
-	{
-	  system_wow64_directory[system_wow64_directory_length++] = L'\\';
-	  system_wow64_directory[system_wow64_directory_length] = L'\0';
-	}
-#endif /* __i386__ */
     }
 }
 
diff --git a/winsup/cygwin/exceptions.cc b/winsup/cygwin/exceptions.cc
index f946bed77..f6c390241 100644
--- a/winsup/cygwin/exceptions.cc
+++ b/winsup/cygwin/exceptions.cc
@@ -438,12 +438,6 @@ _cygtls::inside_kernel (CONTEXT *cx)
 	checkdir += 4;
       res = wcsncasecmp (windows_system_directory, checkdir,
 			 windows_system_directory_length) == 0;
-#ifdef __i386__
-      if (!res && system_wow64_directory_length)
-	res = wcsncasecmp (system_wow64_directory, checkdir,
-			   system_wow64_directory_length) == 0;
-
-#endif
     }
   sigproc_printf ("pc %p, h %p, inside_kernel %d", cx->_GR(ip), h, res);
 # undef h
diff --git a/winsup/cygwin/globals.cc b/winsup/cygwin/globals.cc
index d3a2e11a4..aad5d4259 100644
--- a/winsup/cygwin/globals.cc
+++ b/winsup/cygwin/globals.cc
@@ -23,8 +23,6 @@ HMODULE NO_COPY hntdll;
 LONG NO_COPY sigExeced;
 WCHAR windows_system_directory[MAX_PATH];
 UINT windows_system_directory_length;
-WCHAR system_wow64_directory[MAX_PATH];
-UINT system_wow64_directory_length;
 WCHAR windows_directory_buf[MAX_PATH];
 PWCHAR windows_directory = windows_directory_buf + 4;
 UINT windows_directory_length;


                 reply	other threads:[~2022-05-13 12:38 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=20220513123857.C523C395B062@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).