Skip to content

Rid of ResolveLinkTarget from IsWindowsApplication #16295

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
iSazonov wants to merge 7 commits into from
Closed

Rid of ResolveLinkTarget from IsWindowsApplication #16295

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
03aed2e
Use System.Reflection.PortableExecutable
iSazonov Oct 16, 2021
479c6ca
Remove IO prefix
iSazonov Oct 22, 2021
10d0315
Add test
iSazonov Oct 25, 2021
5a0d261
Fix test
iSazonov Oct 25, 2021
6899d20
Fix test 2
iSazonov Oct 25, 2021
e25eaac
Partial fix for Appx
iSazonov Oct 26, 2021
5ff8f36
Merge branch 'master' into iswindowsapplication
iSazonov Nov 3, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
73 changes: 7 additions & 66 deletions src/System.Management.Automation/engine/NativeCommandProcessor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@
using System.Globalization;
using System.IO;
using System.Management.Automation.Internal;
using System.Management.Automation.Runspaces;
using System.Runtime.InteropServices;
using System.Runtime.Serialization;
using System.Text;
using System.Threading;
using System.Xml;
using Dbg = System.Management.Automation.Diagnostics;
using PortableExecutable = System.Reflection.PortableExecutable;

namespace System.Management.Automation
{
Expand Down Expand Up @@ -1106,44 +1106,17 @@ private static bool IsWindowsApplication(string fileName)
return false;
}

// The function 'SHGetFileInfo()' does not understand reparse points and returns 0 ("non exe or error")
// for a symbolic link file, so we try to get the immediate link target in that case.
// Why not get the final target (use 'returnFinalTarget: true')? Because:
// 1. When starting a process on Windows, if the 'FileName' is a symbolic link, the immediate link target will automatically be used,
// but the OS does not do recursive resolution when the immediate link target is also a symbolic link.
// 2. Keep the same behavior as before adopting the 'LinkTarget' and 'ResolveLinkTarget' APIs in .NET 6.
try
{
string linkTarget = File.ResolveLinkTarget(fileName, returnFinalTarget: false)?.FullName;
if (linkTarget is not null)
{
fileName = linkTarget;
}
using var stream = new FileStream(fileName, FileMode.Open, FileAccess.Read, FileShare.Read);
var peheaders = new PortableExecutable.PEHeaders(stream);
var peheader = peheaders.PEHeader;
return peheader is not null && peheader.Subsystem == PortableExecutable.Subsystem.WindowsGui;
}
catch
{
// An exception may be thrown from 'File.ResolveLinkTarget' when it fails to resolve a link path,
// for example, when the underlying file system doesn't support reparse points.
// Just use the original file name in this case.
}

SHFILEINFO shinfo = new SHFILEINFO();
IntPtr type = SHGetFileInfo(fileName, 0, ref shinfo, (uint)Marshal.SizeOf(shinfo), SHGFI_EXETYPE);

switch ((int)type)
{
case 0x0:
// 0x0 = not an exe
return false;
case 0x5a4d:
// 0x5a4d - DOS .exe or .com file
return false;
case 0x4550:
// 0x4550 - windows console app or bat file
return false;
default:
// anything else - is a windows program...
return true;
// It is not exe file.
return false;
}
#endif
}
Expand Down Expand Up @@ -1656,38 +1629,6 @@ private static string FindExecutable(string filename)

#endregion

#region Interop for SHGetFileInfo

private const int SCS_32BIT_BINARY = 0; // A 32-bit Windows-based application
private const int SCS_DOS_BINARY = 1; // An MS-DOS - based application
private const int SCS_WOW_BINARY = 2; // A 16-bit Windows-based application
private const int SCS_PIF_BINARY = 3; // A PIF file that executes an MS-DOS - based application
private const int SCS_POSIX_BINARY = 4; // A POSIX - based application
private const int SCS_OS216_BINARY = 5; // A 16-bit OS/2-based application
private const int SCS_64BIT_BINARY = 6; // A 64-bit Windows-based application.

[StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)]
private struct SHFILEINFO
{
public IntPtr hIcon;
public int iIcon;
public uint dwAttributes;

[MarshalAs(UnmanagedType.ByValTStr, SizeConst = 260)]
public string szDisplayName;

[MarshalAs(UnmanagedType.ByValTStr, SizeConst = 80)]
public string szTypeName;
}

private const uint SHGFI_EXETYPE = 0x000002000; // flag used to ask to return exe type

[DllImport("shell32.dll", CharSet = CharSet.Unicode)]
private static extern IntPtr SHGetFileInfo(string pszPath, uint dwFileAttributes,
ref SHFILEINFO psfi, uint cbSizeFileInfo, uint uFlags);

#endregion

#region Minishell Interop

private bool _isMiniShell = false;
Expand Down