diff options
author | Luqun Lou <luqunl@users.noreply.github.com> | 2018-04-06 04:54:42 +0300 |
---|---|---|
committer | Anirudh Agnihotry <anirudhagnihotry098@gmail.com> | 2018-04-09 23:51:01 +0300 |
commit | 69d9ecc3dfcd2fcc93ff0cb2adb33b0f2a6fd5da (patch) | |
tree | 55c0c3b4d8cee377ff4aed7e807a379a984fc61c /src | |
parent | 36dab27fdae3404224b59d903ca18df294fceb74 (diff) |
revert "Work around MCG bug around `ref char` marshalling #5481" (#5656)
Signed-off-by: dotnet-bot <dotnet-bot@microsoft.com>
Signed-off-by: dotnet-bot-corefx-mirror <dotnet-bot@microsoft.com>
Diffstat (limited to 'src')
4 files changed, 0 insertions, 47 deletions
diff --git a/src/Common/src/CoreLib/Interop/Windows/Kernel32/Interop.GetFullPathNameW.cs b/src/Common/src/CoreLib/Interop/Windows/Kernel32/Interop.GetFullPathNameW.cs index 2f3aad85cc..197b0a9be5 100644 --- a/src/Common/src/CoreLib/Interop/Windows/Kernel32/Interop.GetFullPathNameW.cs +++ b/src/Common/src/CoreLib/Interop/Windows/Kernel32/Interop.GetFullPathNameW.cs @@ -13,18 +13,6 @@ internal partial class Interop /// WARNING: This method does not implicitly handle long paths. Use GetFullPathName or PathHelper. /// </summary> [DllImport(Libraries.Kernel32, SetLastError = true, CharSet = CharSet.Unicode, BestFitMapping = false, ExactSpelling = true)] -#if PROJECTN - internal static extern unsafe uint GetFullPathNameW(char* lpFileName, uint nBufferLength, char* lpBuffer, IntPtr lpFilePart); - - // Works around https://devdiv.visualstudio.com/web/wi.aspx?pcguid=011b8bdf-6d56-4f87-be0d-0092136884d9&id=575202 - internal static unsafe uint GetFullPathNameW(ref char lpFileName, uint nBufferLength, ref char lpBuffer, IntPtr lpFilePart) - { - fixed (char* pBuffer = &lpBuffer) - fixed (char* pFileName = &lpFileName) - return GetFullPathNameW(pFileName, nBufferLength, pBuffer, lpFilePart); - } -#else internal static extern uint GetFullPathNameW(ref char lpFileName, uint nBufferLength, ref char lpBuffer, IntPtr lpFilePart); -#endif } } diff --git a/src/Common/src/CoreLib/Interop/Windows/Kernel32/Interop.GetLongPathNameW.cs b/src/Common/src/CoreLib/Interop/Windows/Kernel32/Interop.GetLongPathNameW.cs index ef8fd36aa1..81b4d096f5 100644 --- a/src/Common/src/CoreLib/Interop/Windows/Kernel32/Interop.GetLongPathNameW.cs +++ b/src/Common/src/CoreLib/Interop/Windows/Kernel32/Interop.GetLongPathNameW.cs @@ -13,18 +13,6 @@ internal partial class Interop /// WARNING: This method does not implicitly handle long paths. Use GetFullPath/PathHelper. /// </summary> [DllImport(Libraries.Kernel32, SetLastError = true, CharSet = CharSet.Unicode, BestFitMapping = false, ExactSpelling = true)] -#if PROJECTN - internal static extern unsafe uint GetLongPathNameW(char* lpszShortPath, char* lpszLongPath, uint cchBuffer); - - // Works around https://devdiv.visualstudio.com/web/wi.aspx?pcguid=011b8bdf-6d56-4f87-be0d-0092136884d9&id=575202 - internal static unsafe uint GetLongPathNameW(ref char lpszShortPath, ref char lpszLongPath, uint cchBuffer) - { - fixed (char* plpszLongPath = &lpszLongPath) - fixed (char* plpszShortPath = &lpszShortPath) - return GetLongPathNameW(plpszShortPath, plpszLongPath, cchBuffer); - } -#else internal static extern uint GetLongPathNameW(ref char lpszShortPath, ref char lpszLongPath, uint cchBuffer); -#endif } } diff --git a/src/Common/src/CoreLib/Interop/Windows/Kernel32/Interop.GetTempFileNameW.cs b/src/Common/src/CoreLib/Interop/Windows/Kernel32/Interop.GetTempFileNameW.cs index 92da88c5df..97e1d82847 100644 --- a/src/Common/src/CoreLib/Interop/Windows/Kernel32/Interop.GetTempFileNameW.cs +++ b/src/Common/src/CoreLib/Interop/Windows/Kernel32/Interop.GetTempFileNameW.cs @@ -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 } } diff --git a/src/Common/src/CoreLib/Interop/Windows/Kernel32/Interop.GetTempPathW.cs b/src/Common/src/CoreLib/Interop/Windows/Kernel32/Interop.GetTempPathW.cs index 19dbae346b..7f7bb775c8 100644 --- a/src/Common/src/CoreLib/Interop/Windows/Kernel32/Interop.GetTempPathW.cs +++ b/src/Common/src/CoreLib/Interop/Windows/Kernel32/Interop.GetTempPathW.cs @@ -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 } } |