Skip to content

CreateSymbolicLink PInvoke retval must be marshalled as U1 #69150

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

Merged
stephentoub merged 2 commits into from
May 10, 2022
Merged

CreateSymbolicLink PInvoke retval must be marshalled as U1 #69150

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c187779
CreateSymbolicLink PInvoke retval must be marshalled as U1
jozkee May 10, 2022
9f9b298
Fix redundant invocations of Environment.OSVersion.Version
jozkee May 10, 2022
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
1 change: 1 addition & 0 deletions src/installer/tests/TestUtils/SymbolicLinking.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ private enum SymbolicLinkFlag
}

[DllImport("kernel32.dll", SetLastError = true)]
[return: MarshalAs(UnmanagedType.U1)]
private static extern bool CreateSymbolicLink(
string symbolicLinkName,
string targetFileName,
Expand Down
14 changes: 3 additions & 11 deletions src/libraries/Common/src/Interop/Windows/Kernel32/Interop.CreateSymbolicLink.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ internal static partial class Kernel32
internal const int SYMBOLIC_LINK_FLAG_ALLOW_UNPRIVILEGED_CREATE = 0x2;

[LibraryImport(Libraries.Kernel32, EntryPoint = "CreateSymbolicLinkW", SetLastError = true, StringMarshalling = StringMarshalling.Utf16)]
[return: MarshalAs(UnmanagedType.Bool)]
[return: MarshalAs(UnmanagedType.U1)]
private static partial bool CreateSymbolicLinkPrivate(string lpSymlinkFileName, string lpTargetFileName, int dwFlags);

/// <summary>
Expand All @@ -39,9 +39,8 @@ internal static void CreateSymbolicLink(string symlinkFileName, string targetFil

int flags = 0;

bool isAtLeastWin10Build14972 =
Environment.OSVersion.Version.Major == 10 && Environment.OSVersion.Version.Build >= 14972 ||
Environment.OSVersion.Version.Major >= 11;
Version osVersion = Environment.OSVersion.Version;
bool isAtLeastWin10Build14972 = osVersion.Major >= 11 || osVersion.Major == 10 && osVersion.Build >= 14972;

if (isAtLeastWin10Build14972)
{
Expand All @@ -55,17 +54,10 @@ internal static void CreateSymbolicLink(string symlinkFileName, string targetFil

bool success = CreateSymbolicLinkPrivate(symlinkFileName, targetFileName, flags);

int error;
if (!success)
{
throw Win32Marshal.GetExceptionForLastWin32Error(originalPath);
}
// In older versions we need to check GetLastWin32Error regardless of the return value of CreateSymbolicLink,
// e.g: if the user doesn't have enough privileges to create a symlink the method returns success which we can consider as a silent failure.
else if (!isAtLeastWin10Build14972 && (error = Marshal.GetLastWin32Error()) != 0)
{
throw Win32Marshal.GetExceptionForWin32Error(error, originalPath);
}
}
}
}