diff options
Diffstat (limited to 'src/md/compiler/disp.cpp')
| -rw-r--r-- | src/md/compiler/disp.cpp | 36 |
1 files changed, 3 insertions, 33 deletions
diff --git a/src/md/compiler/disp.cpp b/src/md/compiler/disp.cpp index b091729744..85b71286d2 100644 --- a/src/md/compiler/disp.cpp +++ b/src/md/compiler/disp.cpp @@ -16,9 +16,6 @@ #include <corerror.h> #include <mdlog.h> #include <mdcommon.h> -#ifdef FEATURE_COMINTEROP_TLB_SUPPORT -#include <imptlb.h> -#endif #ifdef EnC_SUPPORTED #define ENC_DELTA_HACK @@ -95,11 +92,7 @@ Disp::DefineScope( // Figure out what version of the metadata to emit if (rclsid == CLSID_CLR_v1_MetaData) { -#ifdef FEATURE_METADATA_STANDALONE_WINRT - IfFailGo(E_NOTIMPL); -#else optionForNewScope.m_MetadataVersion = MDVersion1; -#endif //!FEATURE_METADATA_STANDALONE_WINRT } else if (rclsid == CLSID_CLR_v2_MetaData) { @@ -200,7 +193,7 @@ static HRESULT DeliverScope(IMDCommon *pMDCommon, REFIID riid, DWORD dwOpenFlags HRESULT hr; BEGIN_ENTRYPOINT_NOTHROW; -#if !defined(FEATURE_METADATA_STANDALONE_WINRT) && defined(FEATURE_COMINTEROP) +#if defined(FEATURE_COMINTEROP) IfFailGo((dwOpenFlags & ofNoTransform) ? S_FALSE : CheckIfWinMDAdapterNeeded(pMDCommon)); if (hr == S_OK) { @@ -439,13 +432,6 @@ ErrExit: return hr; } // Disp::OpenScopeOnMemory -#if defined(FEATURE_METADATA_IN_VM) && !defined(FEATURE_CORECLR) && !defined(CROSSGEN_COMPILE) - -#include <metahost.h> -// Pointer to the activated CLR interface provided by the shim. -extern ICLRRuntimeInfo * g_pCLRRuntime; - -#endif //***************************************************************************** // Get the directory where the CLR system resides. @@ -458,27 +444,11 @@ Disp::GetCORSystemDirectory( DWORD cchBuffer, // [in] Size of the buffer DWORD *pcchBuffer) // [out] Number of characters returned { -#if defined(FEATURE_METADATA_IN_VM) && !defined(FEATURE_CORECLR) && !defined(CROSSGEN_COMPILE) - HRESULT hr = S_OK; - BEGIN_ENTRYPOINT_NOTHROW; - - // This implies a machine-wide CLR install root, which may not exist for some CLR - // skus using standalone metadata. - *pcchBuffer = cchBuffer; - hr = g_pCLRRuntime->GetRuntimeDirectory(szBuffer, pcchBuffer); - - END_ENTRYPOINT_NOTHROW; - - return hr; -#else //!FEATURE_METADATA_IN_VM || FEATURE_CORECLR -#ifdef FEATURE_CORECLR UNREACHABLE_MSG("Calling IMetaDataDispenser::GetCORSystemDirectory! This code should not be " "reachable or needs to be reimplemented for CoreCLR!"); -#endif //FEATURE_CORECLR return E_NOTIMPL; -#endif //!FEATURE_METADATA_IN_VM || FEATURE_CORECLR } // Disp::GetCORSystemDirectory HRESULT Disp::FindAssembly( // S_OK or error @@ -912,7 +882,7 @@ ErrExit: return hr; } // Disp::GetOption -#if defined(FEATURE_METADATA_IN_VM) || defined(FEATURE_METADATA_STANDALONE_WINRT) +#if defined(FEATURE_METADATA_IN_VM) //--------------------------------------------------------------------------------------- // @@ -924,7 +894,7 @@ void DeleteMetaData() LOADEDMODULES::DeleteStatics(); } -#endif //FEATURE_METADATA_IN_VM || FEATURE_METADATA_STANDALONE_WINRT +#endif //FEATURE_METADATA_IN_VM // // This is the entrypoint for usages of MetaData that need to start with the dispenser (e.g. |