From 4ed1a0cb90d85afb4a5c60be4e9f412048c5e187 Mon Sep 17 00:00:00 2001 From: Gaurav Khanna Date: Mon, 1 Aug 2016 12:03:26 -0700 Subject: Fix LoadFromAssemblyName to invoke fallback context (analogous to static assembly loads within the context) --- src/vm/assemblynative.hpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/vm/assemblynative.hpp') 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); -- cgit v1.2.3