diff options
author | danmosemsft <danmose@microsoft.com> | 2017-02-14 20:44:23 -0800 |
---|---|---|
committer | danmosemsft <danmose@microsoft.com> | 2017-02-14 21:24:04 -0800 |
commit | 2923f7cef8af80c26c4d43e42a465136d432ff9f (patch) | |
tree | 7e0680ff6b2bcbed7739e8c564881751e0f038f1 /src/md | |
parent | ed1f4b5ea3b3f3855c59df3d5cb76faf672c9148 (diff) | |
download | coreclr-2923f7cef8af80c26c4d43e42a465136d432ff9f.tar.gz coreclr-2923f7cef8af80c26c4d43e42a465136d432ff9f.tar.bz2 coreclr-2923f7cef8af80c26c4d43e42a465136d432ff9f.zip |
Remove never defined FEATURE_METADATA_STANDALONE_WINRT
Diffstat (limited to 'src/md')
-rw-r--r-- | src/md/compiler/disp.cpp | 10 | ||||
-rw-r--r-- | src/md/compiler/mdutil.cpp | 4 | ||||
-rw-r--r-- | src/md/compiler/mdutil.h | 4 | ||||
-rw-r--r-- | src/md/compiler/regmeta.cpp | 4 | ||||
-rw-r--r-- | src/md/compiler/regmeta.h | 4 | ||||
-rw-r--r-- | src/md/compiler/regmeta_vm.cpp | 24 | ||||
-rw-r--r-- | src/md/enc/stgtiggerstorage.cpp | 4 | ||||
-rw-r--r-- | src/md/runtime/mdfileformat.cpp | 2 | ||||
-rw-r--r-- | src/md/runtime/mdinternaldisp.cpp | 12 | ||||
-rw-r--r-- | src/md/runtime/metamodel.cpp | 2 |
10 files changed, 19 insertions, 51 deletions
diff --git a/src/md/compiler/disp.cpp b/src/md/compiler/disp.cpp index 5aeb7ce19f..85b71286d2 100644 --- a/src/md/compiler/disp.cpp +++ b/src/md/compiler/disp.cpp @@ -92,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) { @@ -197,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) { @@ -886,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) //--------------------------------------------------------------------------------------- // @@ -898,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. diff --git a/src/md/compiler/mdutil.cpp b/src/md/compiler/mdutil.cpp index 2e01258bea..0de5ad45ea 100644 --- a/src/md/compiler/mdutil.cpp +++ b/src/md/compiler/mdutil.cpp @@ -20,7 +20,7 @@ #include <rwutil.h> -#if defined(FEATURE_METADATA_IN_VM) || defined(FEATURE_METADATA_STANDALONE_WINRT) +#if defined(FEATURE_METADATA_IN_VM) LOADEDMODULES * LOADEDMODULES::s_pLoadedModules = NULL; UTSemReadWrite * LOADEDMODULES::m_pSemReadWrite = NULL; @@ -363,7 +363,7 @@ ErrExit: #endif //_DEBUG -#endif //FEATURE_METADATA_IN_VM || FEATURE_METADATA_STANDALONE_WINRT +#endif //FEATURE_METADATA_IN_VM #ifdef FEATURE_METADATA_IN_VM diff --git a/src/md/compiler/mdutil.h b/src/md/compiler/mdutil.h index 58cdbf108a..331817ec9a 100644 --- a/src/md/compiler/mdutil.h +++ b/src/md/compiler/mdutil.h @@ -61,7 +61,7 @@ public: }; // class CORPATHService -#if defined(FEATURE_METADATA_IN_VM) || defined(FEATURE_METADATA_STANDALONE_WINRT) +#if defined(FEATURE_METADATA_IN_VM) class RegMeta; @@ -114,6 +114,6 @@ public: #endif }; // class LOADEDMODULES -#endif //FEATURE_METADATA_IN_VM || FEATURE_METADATA_STANDALONE_WINRT +#endif //FEATURE_METADATA_IN_VM #endif // __MDUtil__h__ diff --git a/src/md/compiler/regmeta.cpp b/src/md/compiler/regmeta.cpp index 19c6410ef2..337c572e81 100644 --- a/src/md/compiler/regmeta.cpp +++ b/src/md/compiler/regmeta.cpp @@ -549,12 +549,10 @@ RegMeta::QueryInterface( *ppUnk = static_cast<IMetaDataTables2 *>(this); } -#ifndef FEATURE_METADATA_STANDALONE_WINRT else if (riid == IID_IMetaDataInfo) { *ppUnk = static_cast<IMetaDataInfo *>(this); } -#endif //!FEATURE_METADATA_STANDALONE_WINRT #ifdef FEATURE_METADATA_EMIT else if (riid == IID_IMetaDataEmit) @@ -685,7 +683,6 @@ ErrExit: return hr; } // RegMeta::QueryInterface -#ifndef FEATURE_METADATA_STANDALONE_WINRT //--------------------------------------------------------------------------------------- // @@ -781,7 +778,6 @@ ErrExit: return hr; } // RegMeta::GetFileMapping -#endif //!FEATURE_METADATA_STANDALONE_WINRT //------------------------------------------------------------------------------ // Metadata dump diff --git a/src/md/compiler/regmeta.h b/src/md/compiler/regmeta.h index 658f805790..0c4e076c27 100644 --- a/src/md/compiler/regmeta.h +++ b/src/md/compiler/regmeta.h @@ -152,9 +152,7 @@ class RegMeta : public IMetaDataAssemblyImport, public IMetaDataTables2 -#ifndef FEATURE_METADATA_STANDALONE_WINRT , public IMetaDataInfo -#endif #ifdef FEATURE_METADATA_EMIT , public IMetaDataEmit2 @@ -1489,7 +1487,6 @@ public: const void **ppv, // [OUT] put pointer to MD stream here. ULONG *pcb); // [OUT] put size of the stream here. -#ifndef FEATURE_METADATA_STANDALONE_WINRT //***************************************************************************** // IMetaDataInfo @@ -1508,7 +1505,6 @@ public: ULONGLONG * pcbData, // [out] Size of the mapped memory region.. DWORD * pdwMappingType); // [out] Type of file mapping (code:CorFileMapping). -#endif //!FEATURE_METADATA_STANDALONE_WINRT #if defined(FEATURE_METADATA_IN_VM) && defined(FEATURE_PREJIT) diff --git a/src/md/compiler/regmeta_vm.cpp b/src/md/compiler/regmeta_vm.cpp index 38ca308e01..a4d9397b0e 100644 --- a/src/md/compiler/regmeta_vm.cpp +++ b/src/md/compiler/regmeta_vm.cpp @@ -49,7 +49,7 @@ //***************************************************************************** HRESULT RegMeta::AddToCache() { -#if defined(FEATURE_METADATA_IN_VM) || defined(FEATURE_METADATA_STANDALONE_WINRT) +#if defined(FEATURE_METADATA_IN_VM) HRESULT hr = S_OK; // The ref count must be > 0 before the module is published, else another @@ -66,9 +66,9 @@ ErrExit: m_bCached = false; } return hr; -#else //!FEATURE_METADATA_IN_VM && !FEATURE_METADATA_STANDALONE_WINRT +#else // FEATURE_METADATA_IN_VM return S_OK; -#endif //!FEATURE_METADATA_IN_VM && !FEATURE_METADATA_STANDALONE_WINRT +#endif // FEATURE_METADATA_IN_VM } // RegMeta::AddToCache @@ -80,13 +80,13 @@ HRESULT RegMeta::FindCachedReadOnlyEntry( DWORD dwOpenFlags, // Flags the new file is opened with. RegMeta **ppMeta) // Put found RegMeta here. { -#if defined(FEATURE_METADATA_IN_VM) || defined(FEATURE_METADATA_STANDALONE_WINRT) +#if defined(FEATURE_METADATA_IN_VM) return LOADEDMODULES::FindCachedReadOnlyEntry(szName, dwOpenFlags, ppMeta); -#else //!FEATURE_METADATA_IN_VM && !FEATURE_METADATA_STANDALONE_WINRT +#else // FEATURE_METADATA_IN_VM // No cache support in standalone version. *ppMeta = NULL; return S_FALSE; -#endif //!FEATURE_METADATA_IN_VM && !FEATURE_METADATA_STANDALONE_WINRT +#endif // FEATURE_METADATA_IN_VM } // RegMeta::FindCachedReadOnlyEntry @@ -379,9 +379,9 @@ ErrExit: END_ENTRYPOINT_NOTHROW; return hr; -#else //!FEATURE_METADATA_IN_VM +#else // FEATURE_METADATA_IN_VM return E_NOTIMPL; -#endif //!FEATURE_METADATA_IN_VM +#endif // FEATURE_METADATA_IN_VM } // RegMeta::ResolveTypeRef @@ -396,11 +396,11 @@ ULONG RegMeta::Release() CONTRACT_VIOLATION (SOToleranceViolation); BEGIN_CLEANUP_ENTRYPOINT; -#if defined(FEATURE_METADATA_IN_VM) || defined(FEATURE_METADATA_STANDALONE_WINRT) +#if defined(FEATURE_METADATA_IN_VM) _ASSERTE(!m_bCached || LOADEDMODULES::IsEntryInList(this)); #else _ASSERTE(!m_bCached); -#endif //!FEATURE_METADATA_IN_VM && !FEATURE_METADATA_STANDALONE_WINRT +#endif // FEATURE_METADATA_IN_VM BOOL bCached = m_bCached; ULONG cRef = InterlockedDecrement(&m_cRef); // NOTE: 'this' may be unsafe after this point, if the module is cached, and @@ -415,7 +415,7 @@ ULONG RegMeta::Release() // discovered the module, so this thread can now safely delete it. delete this; } -#if defined(FEATURE_METADATA_IN_VM) || defined(FEATURE_METADATA_STANDALONE_WINRT) +#if defined(FEATURE_METADATA_IN_VM) else if (LOADEDMODULES::RemoveModuleFromLoadedList(this)) { // If the module was cached, RemoveModuleFromLoadedList() will try to // safely un-publish the module, and if it succeeds, no other thread @@ -423,7 +423,7 @@ ULONG RegMeta::Release() m_bCached = false; delete this; } -#endif //!FEATURE_METADATA_IN_VM && !FEATURE_METADATA_STANDALONE_WINRT +#endif // FEATURE_METADATA_IN_VM } END_CLEANUP_ENTRYPOINT diff --git a/src/md/enc/stgtiggerstorage.cpp b/src/md/enc/stgtiggerstorage.cpp index 436b3d72e3..2c8420d02d 100644 --- a/src/md/enc/stgtiggerstorage.cpp +++ b/src/md/enc/stgtiggerstorage.cpp @@ -138,9 +138,6 @@ TiggerStorage::GetDefaultVersion( if (g_pDefaultVersion == NULL) { -#ifdef FEATURE_METADATA_STANDALONE_WINRT - g_pDefaultVersion = ""; -#else //!FEATURE_METADATA_STANDALONE_WINRT #ifndef DACCESS_COMPILE HRESULT hr; @@ -170,7 +167,6 @@ TiggerStorage::GetDefaultVersion( #else DacNotImpl(); #endif //DACCESS_COMPILE -#endif //!FEATURE_METADATA_STANDALONE_WINRT } *ppVersion = g_pDefaultVersion; diff --git a/src/md/runtime/mdfileformat.cpp b/src/md/runtime/mdfileformat.cpp index 2edd2e0292..844dc3cfae 100644 --- a/src/md/runtime/mdfileformat.cpp +++ b/src/md/runtime/mdfileformat.cpp @@ -77,7 +77,6 @@ MDFormat::VerifySignature( } } -#if !defined(FEATURE_METADATA_STANDALONE_WINRT) // Only a specific version of the 0.x format is supported by this code // in order to support the NT 5 beta clients which used this format. if (pSig->GetMajorVer() == FILE_VER_MAJOR_v0) @@ -89,7 +88,6 @@ MDFormat::VerifySignature( } } else -#endif // !defined(FEATURE_METADATA_STANDALONE_WINRT) // There is currently no code to migrate an old format of the 1.x. This // would be added only under special circumstances. if ((pSig->GetMajorVer() != FILE_VER_MAJOR) || (pSig->GetMinorVer() != FILE_VER_MINOR)) diff --git a/src/md/runtime/mdinternaldisp.cpp b/src/md/runtime/mdinternaldisp.cpp index 34ea0205b3..e6e25a2110 100644 --- a/src/md/runtime/mdinternaldisp.cpp +++ b/src/md/runtime/mdinternaldisp.cpp @@ -112,11 +112,6 @@ CheckFileFormat( } else if (strcmp(pStream->GetName(), ENC_MODEL_STREAM_A) == 0) { -#ifdef FEATURE_METADATA_STANDALONE_WINRT - Debug_ReportError("ENC model stream #- is not supported."); - hr = CLDB_E_FILE_CORRUPT; - goto ErrExit; -#else //!FEATURE_METADATA_STANDALONE_WINRT // Validate that only one of compressed/uncompressed is present. if (*pFormat != MDFormat_Invalid) { // Already found a good stream. @@ -126,21 +121,14 @@ CheckFileFormat( } // Found the ENC meta data stream. *pFormat = MDFormat_ReadWrite; -#endif //!FEATURE_METADATA_STANDALONE_WINRT } else if (strcmp(pStream->GetName(), SCHEMA_STREAM_A) == 0) { -#ifdef FEATURE_METADATA_STANDALONE_WINRT - Debug_ReportError("Schema stream #Schema is not supported."); - hr = CLDB_E_FILE_CORRUPT; - goto ErrExit; -#else //!FEATURE_METADATA_STANDALONE_WINRT // Found the uncompressed format *pFormat = MDFormat_ICR; // keep going. We may find the compressed format later. // If so, we want to use the compressed format. -#endif //!FEATURE_METADATA_STANDALONE_WINRT } // Pick off the next stream if there is one. diff --git a/src/md/runtime/metamodel.cpp b/src/md/runtime/metamodel.cpp index 293e5b6b5e..83addc6d6c 100644 --- a/src/md/runtime/metamodel.cpp +++ b/src/md/runtime/metamodel.cpp @@ -519,7 +519,6 @@ CMiniMdBase::SchemaPopulate( { // No it's not. Is this an older version that we support? -#ifndef FEATURE_METADATA_STANDALONE_WINRT // Is this v1.0? if ((m_Schema.m_major == METAMODEL_MAJOR_VER_V1_0) && (m_Schema.m_minor == METAMODEL_MINOR_VER_V1_0)) @@ -535,7 +534,6 @@ CMiniMdBase::SchemaPopulate( m_TableDefs[TBL_GenericParam].m_pColDefs = BYTEARRAY_TO_COLDES(s_GenericParamCol); } else -#endif //!FEATURE_METADATA_STANDALONE_WINRT { // We don't support this version of the metadata Debug_ReportError("Unsupported version of MetaData."); return PostError(CLDB_E_FILE_OLDVER, m_Schema.m_major, m_Schema.m_minor); |