diff options
| author | Jan Kotas <jkotas@microsoft.com> | 2019-05-21 07:48:53 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-21 07:48:53 -0700 |
| commit | 221dc73878027e95b515d0c46cad0266331e538d (patch) | |
| tree | 7c6561aaea354019a00573a2337085293699f93b /src/vm/appdomain.cpp | |
| parent | 458d030119725292bcc00b07dd401dc01d3ce119 (diff) | |
| download | coreclr-221dc73878027e95b515d0c46cad0266331e538d.tar.gz coreclr-221dc73878027e95b515d0c46cad0266331e538d.tar.bz2 coreclr-221dc73878027e95b515d0c46cad0266331e538d.zip | |
Avoid PAL LoadLibrary simulator for regular PInvoke (#24669)
Fixes #21009
Diffstat (limited to 'src/vm/appdomain.cpp')
| -rw-r--r-- | src/vm/appdomain.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/vm/appdomain.cpp b/src/vm/appdomain.cpp index 2d92d3f952..cfd1d750c2 100644 --- a/src/vm/appdomain.cpp +++ b/src/vm/appdomain.cpp @@ -2880,7 +2880,6 @@ AppDomain::AppDomain() m_pRefClassFactHash = NULL; - m_ReversePInvokeCanEnter=TRUE; m_ForceTrivialWaitOperations = false; m_Stage=STAGE_CREATING; @@ -4702,7 +4701,7 @@ BOOL AppDomain::AddExceptionToCache(AssemblySpec* pSpec, Exception *ex) return m_AssemblyCache.StoreException(pSpec, ex); } -void AppDomain::AddUnmanagedImageToCache(LPCWSTR libraryName, HMODULE hMod) +void AppDomain::AddUnmanagedImageToCache(LPCWSTR libraryName, NATIVE_LIBRARY_HANDLE hMod) { CONTRACTL { @@ -4723,9 +4722,9 @@ void AppDomain::AddUnmanagedImageToCache(LPCWSTR libraryName, HMODULE hMod) } -HMODULE AppDomain::FindUnmanagedImageInCache(LPCWSTR libraryName) +NATIVE_LIBRARY_HANDLE AppDomain::FindUnmanagedImageInCache(LPCWSTR libraryName) { - CONTRACT(HMODULE) + CONTRACT(NATIVE_LIBRARY_HANDLE) { THROWS; GC_TRIGGERS; @@ -4739,7 +4738,7 @@ HMODULE AppDomain::FindUnmanagedImageInCache(LPCWSTR libraryName) AssemblySpec spec; spec.SetCodeBase(libraryName); - RETURN (HMODULE) m_UnmanagedCache.LookupEntry(&spec, 0); + RETURN (NATIVE_LIBRARY_HANDLE) m_UnmanagedCache.LookupEntry(&spec, 0); } BOOL AppDomain::RemoveFileFromCache(PEAssembly *pFile) |