diff options
author | Jan Kotas <jkotas@microsoft.com> | 2018-11-22 14:22:40 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-11-22 14:22:40 -0800 |
commit | e54dffef08c22a94962aacd93d4793b377cac632 (patch) | |
tree | add9888e42a3c93be7ce63e6f2cbab48e80c4a2e /src/vm/corhost.cpp | |
parent | f80f9d5435155cc7a36fbaefa3c8d7da7cc309aa (diff) | |
download | coreclr-e54dffef08c22a94962aacd93d4793b377cac632.tar.gz coreclr-e54dffef08c22a94962aacd93d4793b377cac632.tar.bz2 coreclr-e54dffef08c22a94962aacd93d4793b377cac632.zip |
Delete System.AppDomainSetup (#21157)
* Delete System.AppDomainSetup
Contributes to #21028
* Add test hook for null entry assembly
* Validate that the binder paths are absolute
Diffstat (limited to 'src/vm/corhost.cpp')
-rw-r--r-- | src/vm/corhost.cpp | 26 |
1 files changed, 8 insertions, 18 deletions
diff --git a/src/vm/corhost.cpp b/src/vm/corhost.cpp index 17079082b7..7294f38a68 100644 --- a/src/vm/corhost.cpp +++ b/src/vm/corhost.cpp @@ -728,6 +728,8 @@ HRESULT CorHost2::_CreateAppDomain( if (dwFlags & APPDOMAIN_FORCE_TRIVIAL_WAIT_OPERATIONS) pDomain->SetForceTrivialWaitOperations(); + pDomain->CreateFusionContext(); + { GCX_COOP(); @@ -736,8 +738,6 @@ HRESULT CorHost2::_CreateAppDomain( STRINGREF friendlyName; PTRARRAYREF propertyNames; PTRARRAYREF propertyValues; - OBJECTREF setupInfo; - OBJECTREF adSetup; } _gc; ZeroMemory(&_gc,sizeof(_gc)); @@ -745,7 +745,7 @@ HRESULT CorHost2::_CreateAppDomain( GCPROTECT_BEGIN(_gc) _gc.friendlyName=StringObject::NewString(wszFriendlyName); - if(nProperties>0) + if (nProperties>0) { _gc.propertyNames = (PTRARRAYREF) AllocateObjectArray(nProperties, g_pStringClass); _gc.propertyValues= (PTRARRAYREF) AllocateObjectArray(nProperties, g_pStringClass); @@ -759,24 +759,14 @@ HRESULT CorHost2::_CreateAppDomain( } } - MethodDescCallSite prepareDataForSetup(METHOD__APP_DOMAIN__PREPARE_DATA_FOR_SETUP); + MethodDescCallSite setup(METHOD__APP_DOMAIN__SETUP); - ARG_SLOT args[4]; + ARG_SLOT args[3]; args[0]=ObjToArgSlot(_gc.friendlyName); - args[1]=ObjToArgSlot(NULL); - args[2]=ObjToArgSlot(_gc.propertyNames); - args[3]=ObjToArgSlot(_gc.propertyValues); - - _gc.setupInfo=prepareDataForSetup.Call_RetOBJECTREF(args); - - // - // Get the new flag values and set it to the domain - // - PTRARRAYREF handleArrayObj = (PTRARRAYREF) ObjectToOBJECTREF(_gc.setupInfo); - _gc.adSetup = ObjectToOBJECTREF(handleArrayObj->GetAt(1)); - + args[1]=ObjToArgSlot(_gc.propertyNames); + args[2]=ObjToArgSlot(_gc.propertyValues); - pDomain->DoSetup(&_gc.setupInfo); + setup.Call(args); GCPROTECT_END(); |