diff options
author | danmosemsft <danmose@microsoft.com> | 2017-02-12 11:34:37 -0800 |
---|---|---|
committer | danmosemsft <danmose@microsoft.com> | 2017-02-12 16:58:48 -0800 |
commit | f2704e6d0b45d37a638ef320a908ff0e3b23f0b5 (patch) | |
tree | 5d365e5527326232867858dbfce1853d05765b05 /src/vm | |
parent | f7585ef29164a2f3f9d3913eb9f87943094d30b3 (diff) | |
download | coreclr-f2704e6d0b45d37a638ef320a908ff0e3b23f0b5.tar.gz coreclr-f2704e6d0b45d37a638ef320a908ff0e3b23f0b5.tar.bz2 coreclr-f2704e6d0b45d37a638ef320a908ff0e3b23f0b5.zip |
Remove never defined FEATURE_APPDOMAINMANAGER_INITOPTIONS
Diffstat (limited to 'src/vm')
-rw-r--r-- | src/vm/appdomainnative.cpp | 47 | ||||
-rw-r--r-- | src/vm/appdomainnative.hpp | 7 | ||||
-rw-r--r-- | src/vm/ecalllist.h | 4 |
3 files changed, 0 insertions, 58 deletions
diff --git a/src/vm/appdomainnative.cpp b/src/vm/appdomainnative.cpp index 0391dbac8f..5a1efc015f 100644 --- a/src/vm/appdomainnative.cpp +++ b/src/vm/appdomainnative.cpp @@ -775,53 +775,6 @@ void QCALLTYPE AppDomainNative::SetAppDomainManagerType(QCall::AppDomainHandle a END_QCALL; } -#ifdef FEATURE_APPDOMAINMANAGER_INITOPTIONS - -FCIMPL0(FC_BOOL_RET, AppDomainNative::HasHost) -{ - FCALL_CONTRACT; - FC_RETURN_BOOL(CorHost2::GetHostControl() != NULL); -} -FCIMPLEND - -// -// Callback to the CLR host to register an AppDomainManager->AppDomain ID pair with it. -// -// Arguments: -// punkAppDomainManager - COM reference to the AppDomainManager being registered with the host -// - -// static -void QCALLTYPE AppDomainNative::RegisterWithHost(IUnknown *punkAppDomainManager) -{ - CONTRACTL - { - QCALL_CHECK; - PRECONDITION(CheckPointer(punkAppDomainManager)); - PRECONDITION(CheckPointer(CorHost2::GetHostControl())); - } - CONTRACTL_END; - - BEGIN_QCALL; - - EnsureComStarted(); - - IHostControl *pHostControl = CorHost2::GetHostControl(); - ADID dwDomainId = SystemDomain::GetCurrentDomain()->GetId(); - HRESULT hr = S_OK; - - BEGIN_SO_TOLERANT_CODE_CALLING_HOST(GetThread()); - hr = pHostControl->SetAppDomainManager(dwDomainId.m_dwId, punkAppDomainManager); - END_SO_TOLERANT_CODE_CALLING_HOST; - - if (FAILED(hr)) - { - ThrowHR(hr); - } - - END_QCALL; -} -#endif // FEATURE_APPDOMAINMANAGER_INITOPTIONS FCIMPL1(void, AppDomainNative::SetHostSecurityManagerFlags, DWORD dwFlags); { diff --git a/src/vm/appdomainnative.hpp b/src/vm/appdomainnative.hpp index 16e6d82c63..a2faff068c 100644 --- a/src/vm/appdomainnative.hpp +++ b/src/vm/appdomainnative.hpp @@ -35,9 +35,6 @@ public: #endif // FEATURE_LOADER_OPTIMIZATION static FCDECL9(Object*, CreateDynamicAssembly, AppDomainBaseObject* refThisUNSAFE, AssemblyNameBaseObject* assemblyNameUNSAFE, Object* identityUNSAFE, StackCrawlMark* stackMark, U1Array* securityRulesBlobUNSAFE, U1Array* aptcaBlobUNSAFE, INT32 access, INT32 flags, SecurityContextSource securityContextSource); -#ifdef FEATURE_APPDOMAINMANAGER_INITOPTIONS - static FCDECL0(FC_BOOL_RET, HasHost); -#endif // FEATURE_APPDOMAINMANAGER_INITOPTIONS static FCDECL1(void, SetHostSecurityManagerFlags, DWORD dwFlags); static FCDECL1(Object*, GetFriendlyName, AppDomainBaseObject* refThisUNSAFE); static FCDECL1(FC_BOOL_RET, IsDefaultAppDomainForEvidence, AppDomainBaseObject* refThisUNSAFE); @@ -119,10 +116,6 @@ public: -#ifdef FEATURE_APPDOMAINMANAGER_INITOPTIONS - static - void QCALLTYPE RegisterWithHost(IUnknown *punkAppDomainManager); -#endif // FEATURE_APPDOMAINMANAGER_INITOPTIONS #if defined(FEATURE_APPX_BINDER) static diff --git a/src/vm/ecalllist.h b/src/vm/ecalllist.h index 6cfb8fd27b..1505a51aca 100644 --- a/src/vm/ecalllist.h +++ b/src/vm/ecalllist.h @@ -599,10 +599,6 @@ FCFuncEnd() FCFuncStart(gAppDomainManagerFuncs) QCFuncElement("GetEntryAssembly", AssemblyNative::GetEntryAssembly) -#ifdef FEATURE_APPDOMAINMANAGER_INITOPTIONS - FCFuncElement("HasHost", AppDomainNative::HasHost) - QCFuncElement("RegisterWithHost", AppDomainNative::RegisterWithHost) -#endif FCFuncEnd() #ifdef FEATURE_FUSION |