From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2155) id E4A4F395B05E; Fri, 13 May 2022 12:39:17 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E4A4F395B05E Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Corinna Vinschen To: cygwin-cvs@sourceware.org Subject: [newlib-cygwin] Cygwin: utils: drop unnecessary wow64 checks X-Act-Checkin: newlib-cygwin X-Git-Author: Corinna Vinschen X-Git-Refname: refs/heads/master X-Git-Oldrev: d4df9c6de1842397c70fc3e8378f06e799af9d6c X-Git-Newrev: 4f034daba70f359015f79cba3d5fb3d0d468924e Message-Id: <20220513123917.E4A4F395B05E@sourceware.org> Date: Fri, 13 May 2022 12:39:17 +0000 (GMT) X-BeenThere: cygwin-cvs@cygwin.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Cygwin core component git logs List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 May 2022 12:39:18 -0000 https://sourceware.org/git/gitweb.cgi?p=3Dnewlib-cygwin.git;h=3D4f034daba70= f359015f79cba3d5fb3d0d468924e commit 4f034daba70f359015f79cba3d5fb3d0d468924e Author: Corinna Vinschen Date: Sat Mar 19 12:54:07 2022 +0100 Cygwin: utils: drop unnecessary wow64 checks =20 Signed-off-by: Corinna Vinschen Diff: --- 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 701c34998..9423a3052 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 =3D FALSE; =20 wbuf[0] =3D L'\0'; switch (option) @@ -579,18 +578,6 @@ do_sysfolders (char option) =20 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 =3D wcsrchr (wbuf, L'\\'); - if (last_bs) - wcpcpy (last_bs + 1, L"Sysnative"); - } break; =20 case 'W': diff --git a/winsup/utils/mingw/cygcheck.cc b/winsup/utils/mingw/cygcheck.cc index 288a718bc..a9d2bc2b6 100644 --- a/winsup/utils/mingw/cygcheck.cc +++ b/winsup/utils/mingw/cygcheck.cc @@ -1605,26 +1605,6 @@ dump_sysinfo () || osversion.dwPlatformId =3D=3D VER_PLATFORM_WIN32_WINDOWS) exit (EXIT_FAILURE); =20 - BOOL is_wow64 =3D 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");