diff options
| author | Swaroop Sridhar <Swaroop.Sridhar@microsoft.com> | 2018-11-21 11:42:01 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-21 11:42:01 -0800 |
| commit | 175ba1c0794958bb7d006544b87e00675de742fc (patch) | |
| tree | e5ef7a67f6c11a7407465661155036b958d6beb3 /src/dlls | |
| parent | 5ef00810b53dcb7cbc4f2cb152ca6af971284e82 (diff) | |
| download | coreclr-175ba1c0794958bb7d006544b87e00675de742fc.tar.gz coreclr-175ba1c0794958bb7d006544b87e00675de742fc.tar.bz2 coreclr-175ba1c0794958bb7d006544b87e00675de742fc.zip | |
Introduce Marshall.LoadLibrary API (#20871)
Implement Native LoadLibrary API
This change commits the following changes:
1) Refactoring DllImport code to reuse LodLibrary by search for
pInvoke and LoadLibrary cases
2) Implement the new Native Library API in System.Runtime.Interop.Marshall
3) Add tests for the new APIs
Diffstat (limited to 'src/dlls')
| -rw-r--r-- | src/dlls/mscorrc/mscorrc.rc | 2 | ||||
| -rw-r--r-- | src/dlls/mscorrc/resource.h | 5 |
2 files changed, 7 insertions, 0 deletions
diff --git a/src/dlls/mscorrc/mscorrc.rc b/src/dlls/mscorrc/mscorrc.rc index bb39c9ac6f..59aa7c338f 100644 --- a/src/dlls/mscorrc/mscorrc.rc +++ b/src/dlls/mscorrc/mscorrc.rc @@ -541,6 +541,8 @@ BEGIN IDS_EE_NDIRECT_LOADLIB_MAC "Unable to load shared library '%1' or one of its dependencies. In order to help diagnose loading problems, consider setting the DYLD_PRINT_LIBRARIES environment variable: %2" IDS_EE_NDIRECT_GETPROCADDRESS_WIN "Unable to find an entry point named '%2' in DLL '%1'." IDS_EE_NDIRECT_GETPROCADDRESS_UNIX "Unable to find an entry point named '%2' in shared library '%1'." + IDS_EE_NDIRECT_GETPROCADDR_WIN_DLL "Unable to find an entry point named '%1' in DLL." + IDS_EE_NDIRECT_GETPROCADDR_UNIX_SO "Unable to find an entry point named '%1' in shared library." IDS_EE_NDIRECT_GETPROCADDRESS_NONAME "A library name must be specified in a DllImport attribute applied to non-IJW methods." IDS_EE_CLASS_CONSTRAINTS_VIOLATION "GenericArguments[%1], '%2', on '%3' violates the constraint of type parameter '%4'." IDS_EE_METHOD_CONSTRAINTS_VIOLATION "Method %1.%2: type argument '%3' violates the constraint of type parameter '%4'." diff --git a/src/dlls/mscorrc/resource.h b/src/dlls/mscorrc/resource.h index 8c315e1abe..735f315c33 100644 --- a/src/dlls/mscorrc/resource.h +++ b/src/dlls/mscorrc/resource.h @@ -718,3 +718,8 @@ #define IDS_INVOKE_NULLREF_RETURNED 0x2642 #define IDS_EE_CANNOT_SET_INITONLY_STATIC_FIELD 0x2643 + +#define IDS_EE_NDIRECT_GETPROCADDR_WIN_DLL 0x2644 +#define IDS_EE_NDIRECT_GETPROCADDR_UNIX_SO 0x2645 + + |