aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCorinna Vinschen <corinna@vinschen.de>2022-03-19 12:54:07 +0100
committerCorinna Vinschen <corinna@vinschen.de>2022-05-12 22:00:25 +0200
commitebc3997e0c23239c5f5a9f96e22e51d14b08a3f6 (patch)
tree55908098de5c87e69467a3a441f07cf5ddc562c7
parent24e31ffc8c81aea67a05867f195461c12bd23b54 (diff)
downloadnewlib-topic/rip-off-32.zip
newlib-topic/rip-off-32.tar.gz
newlib-topic/rip-off-32.tar.bz2
Cygwin: utils: drop unnecessary wow64 checksgithub/topic/rip-off-32topic/rip-off-32
Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
-rw-r--r--winsup/utils/cygpath.cc13
-rw-r--r--winsup/utils/mingw/cygcheck.cc20
2 files changed, 0 insertions, 33 deletions
diff --git a/winsup/utils/cygpath.cc b/winsup/utils/cygpath.cc
index 701c349..9423a30 100644
--- a/winsup/utils/cygpath.cc
+++ b/winsup/utils/cygpath.cc
@@ -536,7 +536,6 @@ do_sysfolders (char option)
{
WCHAR wbuf[MAX_PATH];
char buf[PATH_MAX];
- BOOL iswow64 = FALSE;
wbuf[0] = L'\0';
switch (option)
@@ -579,18 +578,6 @@ 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':
diff --git a/winsup/utils/mingw/cygcheck.cc b/winsup/utils/mingw/cygcheck.cc
index 288a718..a9d2bc2 100644
--- a/winsup/utils/mingw/cygcheck.cc
+++ b/winsup/utils/mingw/cygcheck.cc
@@ -1605,26 +1605,6 @@ dump_sysinfo ()
|| osversion.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS)
exit (EXIT_FAILURE);
- BOOL is_wow64 = FALSE;
- if (IsWow64Process (GetCurrentProcess (), &is_wow64) && is_wow64)
- {
- SYSTEM_INFO natinfo;
- GetNativeSystemInfo (&natinfo);
- fputs ("\nRunning under WOW64 on ", stdout);
- switch (natinfo.wProcessorArchitecture)
- {
- case PROCESSOR_ARCHITECTURE_IA64:
- puts ("IA64");
- break;
- case PROCESSOR_ARCHITECTURE_AMD64:
- puts ("AMD64");
- break;
- default:
- puts("??");
- break;
- }
- }
-
if (GetSystemMetrics (SM_REMOTESESSION))
printf ("\nRunning in Terminal Service session\n");