From: Johannes Schindelin <johannes.schindelin@gmx.de>
To: cygwin-patches@cygwin.com
Subject: [PATCH] Adjust CWD magic to accommodate for the latest Windows previews
Date: Mon, 22 May 2023 13:36:27 +0200 (CEST) [thread overview]
Message-ID: <60e1e112b1c293a69bfa4df3fe5094e562898bbb.1684755365.git.johannes.schindelin@gmx.de> (raw)
Reportedly Windows 11 build 25*** from Insider changed the current
working directory logic a bit, and Cygwin's "magic" (or:
"technologically sufficiently advanced") code needs to be adjusted
accordingly.
This fixes https://github.com/git-for-windows/git/issues/4429
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
Published-As: https://github.com/dscho/msys2-runtime/releases/tag/adjust-cygwin-cwd-magic-to-newest-windows-v1
Fetch-It-Via: git fetch https://github.com/dscho/msys2-runtime adjust-cygwin-cwd-magic-to-newest-windows-v1
winsup/cygwin/path.cc | 18 ++++++++++++++++--
1 file changed, 16 insertions(+), 2 deletions(-)
diff --git a/winsup/cygwin/path.cc b/winsup/cygwin/path.cc
index 582238d150..fd09e5dc78 100644
--- a/winsup/cygwin/path.cc
+++ b/winsup/cygwin/path.cc
@@ -4514,10 +4514,24 @@ find_fast_cwd_pointer ()
or, then `mov %r12,%rcx', then `callq RtlEnterCriticalSection'. */
lock = (const uint8_t *) memmem ((const char *) use_cwd, 80,
"\x4c\x8d\x25", 3);
- if (!lock)
- return NULL;
call_rtl_offset = 14;
}
+
+ if (!lock)
+ {
+ /* A recent Windows Preview calls `lea rel(rip),%r13' then
+ some unrelated instructions, then `callq RtlEnterCriticalSection'.
+ */
+ lock = (const uint8_t *) memmem ((const char *) use_cwd, 80,
+ "\x4c\x8d\x2d", 3);
+ call_rtl_offset = 24;
+ }
+
+ if (!lock)
+ {
+ return NULL;
+ }
+
PRTL_CRITICAL_SECTION lockaddr =
(PRTL_CRITICAL_SECTION) (lock + 7 + peek32 (lock + 3));
/* Test if lock address is FastPebLock. */
base-commit: e7858c0a585e29c48a4109933423a0de362fc62d
--
2.41.0.rc0.windows.1
next reply other threads:[~2023-05-22 11:36 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-22 11:36 Johannes Schindelin [this message]
2023-05-24 19:51 ` Jon Turney
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=60e1e112b1c293a69bfa4df3fe5094e562898bbb.1684755365.git.johannes.schindelin@gmx.de \
--to=johannes.schindelin@gmx.de \
--cc=cygwin-patches@cygwin.com \
/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).