Skip to content

Commit

Permalink
revert "Work around MCG bug around ref char marshalling dotnet#5481"
Browse files Browse the repository at this point in the history
  • Loading branch information
luqunl authored and luqunl committed Apr 5, 2018
1 parent c861076 commit 515c362
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 23 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,6 @@ internal partial class Interop
internal partial class Kernel32
{
[DllImport(Libraries.Kernel32, CharSet = CharSet.Unicode, SetLastError = true, BestFitMapping = false)]
#if PROJECTN
internal static extern unsafe uint GetTempFileNameW(char* lpPathName, string lpPrefixString, uint uUnique, char* lpTempFileName);

// Works around https://devdiv.visualstudio.com/web/wi.aspx?pcguid=011b8bdf-6d56-4f87-be0d-0092136884d9&id=575202
internal static unsafe uint GetTempFileNameW(ref char lpPathName, string lpPrefixString, uint uUnique, ref char lpTempFileName)
{
fixed (char* plpPathName = &lpPathName)
fixed (char* plpTempFileName = &lpTempFileName)
return GetTempFileNameW(plpPathName, lpPrefixString, uUnique, plpTempFileName);
}
#else
internal static extern uint GetTempFileNameW(ref char lpPathName, string lpPrefixString, uint uUnique, ref char lpTempFileName);
#endif
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,6 @@ internal partial class Interop
internal partial class Kernel32
{
[DllImport(Libraries.Kernel32, CharSet = CharSet.Unicode, BestFitMapping = false)]
#if PROJECTN
internal static extern unsafe uint GetTempPathW(int bufferLen, char* buffer);

// Works around https://devdiv.visualstudio.com/web/wi.aspx?pcguid=011b8bdf-6d56-4f87-be0d-0092136884d9&id=575202
internal static unsafe uint GetTempPathW(int bufferLen, ref char buffer)
{
fixed (char* pbuffer = &buffer)
return GetTempPathW(bufferLen, pbuffer);
}
#else
internal static extern uint GetTempPathW(int bufferLen, ref char buffer);
#endif
}
}

0 comments on commit 515c362

Please sign in to comment.