diff options
| -rw-r--r-- | winsup/utils/cygpath.cc | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/winsup/utils/cygpath.cc b/winsup/utils/cygpath.cc index c0a527631..8df8eaaf3 100644 --- a/winsup/utils/cygpath.cc +++ b/winsup/utils/cygpath.cc @@ -539,6 +539,7 @@ do_sysfolders (char option) { WCHAR wbuf[MAX_PATH]; char buf[PATH_MAX]; + BOOL iswow64 = FALSE; wbuf[0] = L'\0'; switch (option) @@ -581,6 +582,18 @@ do_sysfolders (char option) case 'S': GetSystemDirectoryW (wbuf, MAX_PATH); + if (!windows_flag + && IsWow64Process (GetCurrentProcess (), &iswow64) && iswow64) + { + /* When calling NtQueryInformationFile(FileNameInformation) on WOW64, + the returned path will point to SysWOW64. This breaks path + redirection to the network related files under device/etc. This + here is a bad hack to make sure that the conversion will convert + the case *and* stick to System32. */ + PWCHAR last_bs = wcsrchr (wbuf, L'\\'); + if (last_bs) + wcpcpy (last_bs + 1, L"Sysnative"); + } break; case 'W': |