From ebc3997e0c23239c5f5a9f96e22e51d14b08a3f6 Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Sat, 19 Mar 2022 12:54:07 +0100 Subject: Cygwin: utils: drop unnecessary wow64 checks Signed-off-by: Corinna Vinschen --- winsup/utils/cygpath.cc | 13 ------------- winsup/utils/mingw/cygcheck.cc | 20 -------------------- 2 files changed, 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"); -- cgit v1.1