Remove never defined FEATURE_METADATA_STANDALONE_WINRT_RO

5 files changed, 6 insertions, 68 deletions

diff --git a/src/inc/stgpool.h b/src/inc/stgpool.h
index 9eef70742e..4486695507 100644
--- a/src/inc/stgpool.h
+++ b/src/inc/stgpool.h
@@ -310,12 +310,11 @@ public:
     {
         LIMITED_METHOD_CONTRACT;
 
-// @todo: Triton workaround: FEATURE_METADATA_STANDALNE_WINRT_RO is supposed to disable FEATURE_PREJIT - remove this #ifdef once we figure out how to get that working in the CoreClr build. 
-#if !(defined(FEATURE_UTILCODE_NO_DEPENDENCIES) || defined(FEATURE_METADATA_STANDALNE_WINRT_RO))
+#if !defined(FEATURE_UTILCODE_NO_DEPENDENCIES)
         m_HotHeap = hotHeap;
 #else
         _ASSERTE(!"InitHotData(): Not supposed to exist in RoMetaData.dll");
-#endif //!(defined(FEATURE_UTILCODE_NO_DEPENDENCIES) || defined(FEATURE_METADATA_STANDALNE_WINRT_RO))
+#endif //!(defined(FEATURE_UTILCODE_NO_DEPENDENCIES))
     }
 #endif //FEATURE_PREJIT
 
@@ -345,8 +344,7 @@ protected:
             return CLDB_E_INDEX_NOTFOUND;
         }
 
-// @todo: Triton workaround: FEATURE_METADATA_STANDALNE_WINRT_RO is supposed to disable FEATURE_PREJIT - remove this #if once we figure out how to get that working in the CoreClr build. 
-#if !(defined(FEATURE_UTILCODE_NO_DEPENDENCIES) || defined(FEATURE_METADATA_STANDALNE_WINRT_RO))
+#if !defined(FEATURE_UTILCODE_NO_DEPENDENCIES)
 #ifdef FEATURE_PREJIT
         // try hot data first
         if (!m_HotHeap.IsEmpty())
@@ -359,7 +357,7 @@ protected:
             _ASSERTE(hr == S_FALSE);
         }
 #endif //FEATURE_PREJIT
-#endif //!(defined(FEATURE_UTILCODE_NO_DEPENDENCIES) || defined(FEATURE_METADATA_STANDALNE_WINRT_RO))
+#endif //!(defined(FEATURE_UTILCODE_NO_DEPENDENCIES))
 
         
         pData->Init(m_pSegData + nOffset, m_cbSegSize - nOffset);
@@ -381,11 +379,10 @@ protected:
     } // StgPoolReadOnly::GetData
     
 private:
-// @todo: Triton workaround: FEATURE_METADATA_STANDALNE_WINRT_RO is supposed to disable FEATURE_PREJIT - remove this #if once we figure out how to get that working in the CoreClr build. 
-#if !(defined(FEATURE_UTILCODE_NO_DEPENDENCIES) || defined(FEATURE_METADATA_STANDALNE_WINRT_RO))
+#if !defined(FEATURE_UTILCODE_NO_DEPENDENCIES)
     // hot pool data
     MetaData::HotHeap m_HotHeap;
-#endif //!(defined(FEATURE_UTILCODE_NO_DEPENDENCIES) || defined(FEATURE_METADATA_STANDALNE_WINRT_RO))
+#endif //!(defined(FEATURE_UTILCODE_NO_DEPENDENCIES))
     
 };  // class StgPoolReadOnly
 
diff --git a/src/md/enc/liteweightstgdbrw.cpp b/src/md/enc/liteweightstgdbrw.cpp
index de81a017b4..9bd923c931 100644
--- a/src/md/enc/liteweightstgdbrw.cpp
+++ b/src/md/enc/liteweightstgdbrw.cpp
@@ -339,12 +339,7 @@ HRESULT CLiteWeightStgdbRW::OpenForRead(
         // If we're taking ownership of this memory.....
         if (IsOfTakeOwnership(dwFlags))
         {
-#ifdef FEATURE_METADATA_STANDALONE_WINRT_RO
-            // Shared memory uses ole32.dll - we cannot depend on it in the standalone WinRT Read-Only DLL
-            IfFailGo(E_INVALIDARG);
-#else
             dmOpenFlags = (DBPROPMODE)(dmOpenFlags | DBPROP_TMODEF_SHAREDMEM);
-#endif //!FEATURE_METADATA_STANDALONE_WINRT_RO
         }
 #ifdef FEATURE_METADATA_LOAD_TRUSTED_IMAGES
         if (IsOfTrustedImage(dwFlags))
diff --git a/src/md/enc/metamodelrw.cpp b/src/md/enc/metamodelrw.cpp
index e6877bc84b..6a3bc327ef 100644
--- a/src/md/enc/metamodelrw.cpp
+++ b/src/md/enc/metamodelrw.cpp
@@ -4317,11 +4317,6 @@ CMiniMdRW::SaveHotPoolsToStream(
     UINT32                   *pnPoolDirSize, 
     UINT32                   *pnHeapsSavedSize)
 {
-// @todo: Triton workaround: FEATURE_METADATA_STANDALNE_WINRT_RO is supposed to disable FEATURE_PREJIT - remove this #if once we figure out how to get that working in the CoreClr build. 
-#ifdef FEATURE_METADATA_STANDALONE_WINRT_RO
-    _ASSERTE(!"SaveHotPoolsToStream: This method not supported in RoMetadata.dll");
-    return E_NOTIMPL;
-#else // FEATURE_METADATA_STANDALONE_WINRT_RO
     HRESULT hr = S_OK;
     UINT32  rgHeapSavedSize[MDPoolCount] = { 0, 0, 0, 0 };
     
@@ -4393,7 +4388,6 @@ CMiniMdRW::SaveHotPoolsToStream(
     }
     
     return S_OK;
-#endif //FEATURE_METADATA_STANDALONE_WINRT_RO
 } // CMiniMdRW::SaveHotPoolsToStream
 
 // write hot data of specific blob
@@ -4406,11 +4400,6 @@ CMiniMdRW::SaveHotPoolToStream(
     MetaData::HotHeapWriter *pHotHeapWriter, 
     UINT32                  *pnSavedSize)
 {
-// @todo: Triton workaround: FEATURE_METADATA_STANDALNE_WINRT_RO is supposed to disable FEATURE_PREJIT - remove this #if once we figure out how to get that working in the CoreClr build. 
-#ifdef FEATURE_METADATA_STANDALONE_WINRT_RO
-    _ASSERTE(!"SaveHotPoolToStream: This method not supported in RoMetadata.dll");
-    return E_NOTIMPL;
-#else //FEATURE_METADATA_STANDALONE_WINRT_RO
 
     _ASSERTE(pProfileData != NULL);
 
@@ -4435,7 +4424,6 @@ CMiniMdRW::SaveHotPoolToStream(
     }
     
     return S_OK;
-#endif // FEATURE_METADATA_STANDALONE_WINRT_RO
 } // CMiniMdRW::SaveHotPoolToStream
 
 #endif //FEATURE_PREJIT
diff --git a/src/md/enc/stgio.cpp b/src/md/enc/stgio.cpp
index 27d5ff2c5d..9dea3cb689 100644
--- a/src/md/enc/stgio.cpp
+++ b/src/md/enc/stgio.cpp
@@ -42,17 +42,10 @@
 #include "pedecoder.inl"
 
 //********** Types. ***********************************************************
-#if !defined(FEATURE_METADATA_STANDALONE_WINRT_RO)
 #define SMALL_ALLOC_MAP_SIZE (64 * 1024) // 64 kb is the minimum size of virtual
                                         // memory you can allocate, so anything
                                         // less is a waste of VM resources.
 
-#else //FEATURE_METADATA_STANDALONE_WINRT_RO
-// RoMetadata.dll is required to call CreateFileMapping on all WinMD files (even small ones) to use 
-// Code Intergrity checks on Win8 - see code:#EnableCodeIntegrity
-#define SMALL_ALLOC_MAP_SIZE 0
-
-#endif //FEATURE_METADATA_STANDALONE_WINRT_RO
 
 #define MIN_WRITE_CACHE_BYTES (16 * 1024) // 16 kb for a write back cache
 
@@ -154,7 +147,6 @@ HRESULT StgIO::Open(                    // Return code.
         m_pData = (void *) pbBuff;
         m_cbData = cbBuff;
 
-#ifndef FEATURE_METADATA_STANDALONE_WINRT_RO
         // All access to data will be by memory provided.
         if ((fFlags & DBPROP_TMODEF_SHAREDMEM) == DBPROP_TMODEF_SHAREDMEM)
         {
@@ -163,7 +155,6 @@ HRESULT StgIO::Open(                    // Return code.
             m_iType = STGIO_SHAREDMEM;
         }
         else
-#endif //!FEATURE_METADATA_STANDALONE_WINRT_RO
         {
             m_iType = STGIO_MEM;
         }
@@ -359,7 +350,6 @@ void StgIO::Close()
 {
     switch (m_iType)
     {
-#ifndef FEATURE_METADATA_STANDALONE_WINRT_RO
         // Free any allocated memory.
         case STGIO_SHAREDMEM:
         if (m_pBaseData != NULL)
@@ -368,7 +358,6 @@ void StgIO::Close()
             m_pBaseData = NULL;
             break;
         }
-#endif //!FEATURE_METADATA_STANDALONE_WINRT_RO
 
         case STGIO_MEM:
         case STGIO_HFILEMEM:
@@ -538,9 +527,7 @@ HRESULT StgIO::Read(                    // Return code.
 
         // Simply copy the data from our data.
         case STGIO_MEM:
-#ifndef FEATURE_METADATA_STANDALONE_WINRT_RO
         case STGIO_SHAREDMEM:
-#endif
         case STGIO_HFILEMEM:
         {
             _ASSERTE(m_pData && m_cbData);
@@ -686,9 +673,7 @@ HRESULT StgIO::Seek(                    // New offset.
         break;
 
         case STGIO_MEM:
-#ifndef FEATURE_METADATA_STANDALONE_WINRT_RO
         case STGIO_SHAREDMEM:
-#endif
         case STGIO_HFILEMEM:
         case STGIO_HMODULE:
         {
@@ -770,9 +755,7 @@ HRESULT StgIO::MapFileToMem(            // Return code.
     if (IsBackingStore() || 
         IsMemoryMapped() || 
         (m_iType == STGIO_MEM) || 
-#ifndef FEATURE_METADATA_STANDALONE_WINRT_RO
         (m_iType == STGIO_SHAREDMEM) ||
-#endif
         (m_iType == STGIO_HFILEMEM))
     {
         ptr = m_pData;
@@ -854,24 +837,13 @@ HRESULT StgIO::MapFileToMem(            // Return code.
             _ASSERTE(m_hMapping == 0);
 
             DWORD dwProtectionFlags = PAGE_READONLY;
-#ifdef FEATURE_METADATA_STANDALONE_WINRT_RO
-            //#EnableCodeIntegrity
-            // RoMetadata.dll is required to always map (WinMD) files with SEC_IMAGE to enable Code Integrity checkes on Win8
-            // Note: MidlRtMd.dll cannot do the same, because it runs on pre-Win8 OS versions where SEC_IMAGE-mapping will likely 
-            // refuse WinMD files (they are Win8+ only in PE headers)
-            dwProtectionFlags |= SEC_IMAGE;
-#endif
             
             if ((m_hMapping = WszCreateFileMapping(m_hFile, pAttributes, dwProtectionFlags,
                 0, 0, nullptr)) == 0)
             {
                 return (MapFileError(GetLastError()));
             }
-#ifdef FEATURE_METADATA_STANDALONE_WINRT_RO
-            m_mtMappedType = MTYPE_IMAGE;
-#else // FEATURE_METADATA_STANDALONE_WINRT_RO
             m_mtMappedType = MTYPE_FLAT;
-#endif // FEATURE_METADATA_STANDALONE_WINRT_RO
             // Check to see if the memory already exists, in which case we have
             // no guarantees it is the right piece of data.
             if (GetLastError() == ERROR_ALREADY_EXISTS)
@@ -958,7 +930,6 @@ ErrExit:
 HRESULT StgIO::ReleaseMappingObject()   // Return code.
 {
     // Check type first.
-#ifndef FEATURE_METADATA_STANDALONE_WINRT_RO
     if (m_iType != STGIO_SHAREDMEM)
     {
         _ASSERTE(FALSE);
@@ -982,7 +953,6 @@ HRESULT StgIO::ReleaseMappingObject()   // Return code.
         VERIFY(CloseHandle(m_hMapping));
         m_hMapping = 0;
     }
-#endif //!FEATURE_METADATA_STANDALONE_WINRT_RO
     return S_OK;
 }
 
@@ -998,7 +968,6 @@ HRESULT StgIO::SetBaseRange(            // Return code.
     void        *pbStart,               // Start of file data.
     ULONG       cbSize)                 // How big is the range.
 {
-#ifndef FEATURE_METADATA_STANDALONE_WINRT_RO
     if (m_iType == STGIO_SHAREDMEM)
     {
         // The base range must be inside of the current range.
@@ -1006,7 +975,6 @@ HRESULT StgIO::SetBaseRange(            // Return code.
         _ASSERTE(((LONG_PTR) pbStart >= (LONG_PTR) m_pBaseData));
         _ASSERTE(((LONG_PTR) pbStart + cbSize <= (LONG_PTR) m_pBaseData + m_cbData));
     }
-#endif //!FEATURE_METADATA_STANDALONE_WINRT_RO
     
     // Save the base range per user request.
     m_pData = pbStart;
@@ -1117,9 +1085,7 @@ HRESULT StgIO::GetPtrForMem(            // Return code.
     // Memory version or memory mapped file work the same way.
     else if (IsMemoryMapped() || 
              (m_iType == STGIO_MEM) || 
-#ifndef FEATURE_METADATA_STANDALONE_WINRT_RO
              (m_iType == STGIO_SHAREDMEM) || 
-#endif
              (m_iType == STGIO_HFILEMEM))
     {   
         if (!(cbStart <= m_cbData))
@@ -1245,9 +1211,7 @@ HRESULT StgIO::WriteToDisk(             // Return code.
         // We cannot write to fixed read/only memory or LoadLibrary module.
         case STGIO_HMODULE:
         case STGIO_MEM:
-#ifndef FEATURE_METADATA_STANDALONE_WINRT_RO
         case STGIO_SHAREDMEM:
-#endif
         _ASSERTE(0);
         hr = BadError(E_UNEXPECTED);
         break;
@@ -1384,9 +1348,7 @@ int StgIO::IsAlignedPtr(ULONG_PTR Value, int iAlignment)
     void        *ptrStart = NULL;
 
     if ((m_iType == STGIO_STREAM) || 
-#ifndef FEATURE_METADATA_STANDALONE_WINRT_RO
         (m_iType == STGIO_SHAREDMEM) || 
-#endif
         (m_iType == STGIO_MEM))
     {
         return ((Value - (ULONG_PTR) m_pData) % iAlignment == 0);
diff --git a/src/md/inc/stgio.h b/src/md/inc/stgio.h
index 96a2f1dddb..2ec873d4c8 100644
--- a/src/md/inc/stgio.h
+++ b/src/md/inc/stgio.h
@@ -46,10 +46,8 @@ enum DBPROPMODE
     {   DBPROP_TMODEF_READ  = 0x1,
     DBPROP_TMODEF_WRITE = 0x2,
     DBPROP_TMODEF_EXCLUSIVE = 0x4,
-#ifndef FEATURE_METADATA_STANDALONE_WINRT_RO
     // Shared memory uses ole32.dll - we cannot depend on it in the standalone WinRT Read-Only DLL
     DBPROP_TMODEF_SHAREDMEM = 0x8,
-#endif
     DBPROP_TMODEF_CREATE    = 0x10,
     DBPROP_TMODEF_FAILIFTHERE = 0x20,
     DBPROP_TMODEF_SLOWSAVE  = 0x100,
@@ -77,10 +75,8 @@ enum STGIOTYPE
     STGIO_HMODULE   = 2,                    // The file was loaded via LoadLibrary as module.
     STGIO_STREAM    = 3,                    // Stream pointer has data.
     STGIO_MEM       = 4,                    // In memory pointer has data.
-#ifndef FEATURE_METADATA_STANDALONE_WINRT_RO
     // Shared memory uses ole32.dll - we cannot depend on it in the standalone WinRT Read-Only DLL
     STGIO_SHAREDMEM = 5,                    // Shared memory handle.
-#endif
     STGIO_HFILEMEM  = 6                     // Handle open, but memory allocated.
 };