diff options
| author | Gaurav Khanna <gkhanna@microsoft.com> | 2016-08-01 12:03:26 -0700 |
|---|---|---|
| committer | Gaurav Khanna <gkhanna@microsoft.com> | 2016-08-09 12:59:46 -0700 |
| commit | 4ed1a0cb90d85afb4a5c60be4e9f412048c5e187 (patch) | |
| tree | b4015ffa0889515097d33efeb46072c053e045b2 /src/vm/assemblynative.hpp | |
| parent | 17ced7fea35cb89ce6fe6c0a614c9fe15171bdea (diff) | |
| download | coreclr-4ed1a0cb90d85afb4a5c60be4e9f412048c5e187.tar.gz coreclr-4ed1a0cb90d85afb4a5c60be4e9f412048c5e187.tar.bz2 coreclr-4ed1a0cb90d85afb4a5c60be4e9f412048c5e187.zip | |
Fix LoadFromAssemblyName to invoke fallback context (analogous to static assembly loads within the context)
Diffstat (limited to 'src/vm/assemblynative.hpp')
| -rw-r--r-- | src/vm/assemblynative.hpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/vm/assemblynative.hpp b/src/vm/assemblynative.hpp index 6309ffcf36..ca03239d3e 100644 --- a/src/vm/assemblynative.hpp +++ b/src/vm/assemblynative.hpp @@ -50,7 +50,7 @@ public: Object* securityUNSAFE); static FCDECL6(Object*, LoadImage, U1Array* PEByteArrayUNSAFE, U1Array* SymByteArrayUNSAFE, Object* securityUNSAFE, StackCrawlMark* stackMark, CLR_BOOL fForIntrospection, SecurityContextSource securityContextSource); - static FCDECL9(Object*, Load, AssemblyNameBaseObject* assemblyNameUNSAFE, + static FCDECL10(Object*, Load, AssemblyNameBaseObject* assemblyNameUNSAFE, StringObject* codeBaseUNSAFE, Object* securityUNSAFE, AssemblyBaseObject* requestingAssemblyUNSAFE, @@ -58,7 +58,8 @@ public: ICLRPrivBinder * pPrivHostBinder, CLR_BOOL fThrowOnFileNotFound, CLR_BOOL fForIntrospection, - CLR_BOOL fSuppressSecurityChecks); + CLR_BOOL fSuppressSecurityChecks, + INT_PTR ptrLoadContextBinder); static FCDECL1(FC_BOOL_RET, IsFrameworkAssembly, AssemblyNameBaseObject* refAssemblyNameUNSAFE); static FCDECL1(FC_BOOL_RET, IsNewPortableAssembly, AssemblyNameBaseObject* refAssemblyNameUNSAFE); |