diff options
| author | Elinor Fung <47805090+elinor-fung@users.noreply.github.com> | 2019-05-28 16:05:28 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-28 16:05:28 -0700 |
| commit | ff39e7f372515ecefac3f30640bffbeafc20adb6 (patch) | |
| tree | ede59cd5cfa8357dfc79ec1f59435a9e104b4806 | |
| parent | 4ca032d49b0718eb40f2105f94db2b243cf94957 (diff) | |
| download | coreclr-ff39e7f372515ecefac3f30640bffbeafc20adb6.tar.gz coreclr-ff39e7f372515ecefac3f30640bffbeafc20adb6.tar.bz2 coreclr-ff39e7f372515ecefac3f30640bffbeafc20adb6.zip | |
Rename CreateNativeDelegate -> LoadAssemblyAndGetFunctionPointer (#24804)
Change extensibility parameter to void *
| -rw-r--r-- | src/System.Private.CoreLib/src/Internal/Runtime/InteropServices/ComponentActivator.cs | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/System.Private.CoreLib/src/Internal/Runtime/InteropServices/ComponentActivator.cs b/src/System.Private.CoreLib/src/Internal/Runtime/InteropServices/ComponentActivator.cs index c6d1d53767..6e40103df1 100644 --- a/src/System.Private.CoreLib/src/Internal/Runtime/InteropServices/ComponentActivator.cs +++ b/src/System.Private.CoreLib/src/Internal/Runtime/InteropServices/ComponentActivator.cs @@ -53,14 +53,14 @@ namespace Internal.Runtime.InteropServices /// <param name="typeNameNative">Assembly qualified type name</param> /// <param name="methodNameNative">Public static method name compatible with delegateType</param> /// <param name="delegateTypeNative">Assembly qualified delegate type name</param> - /// <param name="flags">Extensibility flags (currently unused)</param> + /// <param name="reserved">Extensibility parameter (currently unused)</param> /// <param name="functionHandle">Pointer where to store the function pointer result</param> - public static int CreateNativeDelegate(IntPtr assemblyPathNative, - IntPtr typeNameNative, - IntPtr methodNameNative, - IntPtr delegateTypeNative, - int flags, - IntPtr functionHandle) + public static int LoadAssemblyAndGetFunctionPointer(IntPtr assemblyPathNative, + IntPtr typeNameNative, + IntPtr methodNameNative, + IntPtr delegateTypeNative, + IntPtr reserved, + IntPtr functionHandle) { try { @@ -78,9 +78,9 @@ namespace Internal.Runtime.InteropServices delegateType = MarshalToString(delegateTypeNative, nameof(delegateTypeNative)); } - if (flags != 0) + if (reserved != IntPtr.Zero) { - throw new ArgumentOutOfRangeException(nameof(flags)); + throw new ArgumentOutOfRangeException(nameof(reserved)); } if (functionHandle == IntPtr.Zero) |