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.schinde...@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
