Remove always defined FEATURE_CORECLR

4 files changed, 0 insertions, 212 deletions

diff --git a/src/dlls/mscordbi/mscordbi.src b/src/dlls/mscordbi/mscordbi.src
index 0baa49537e..3b1f37720d 100644
--- a/src/dlls/mscordbi/mscordbi.src
+++ b/src/dlls/mscordbi/mscordbi.src
@@ -18,9 +18,7 @@ EXPORTS
     OpenVirtualProcess private 
     OpenVirtualProcess2
 
-#ifdef FEATURE_CORECLR
     CoreCLRCreateCordbObject private
-#endif // FEATURE_CORECLR
 
 #if defined(FEATURE_DBGIPC_TRANSPORT_DI)
     DllGetClassObject private
diff --git a/src/dlls/mscoree/mscorwks_ntdef.src b/src/dlls/mscoree/mscorwks_ntdef.src
index 13656d7aca..8115475418 100644
--- a/src/dlls/mscoree/mscorwks_ntdef.src
+++ b/src/dlls/mscoree/mscorwks_ntdef.src
@@ -7,7 +7,6 @@ EXPORTS
 ;   Common exports
 ;
 
-#ifdef FEATURE_CORECLR
 
 
         GetCLRRuntimeHost
@@ -29,170 +28,3 @@ EXPORTS
         GetMetaDataInternalInterfaceFromPublic
         GetMetaDataPublicInterfaceFromInternal
 
-#else //FEATURE_CORECLR 
-
-;   VM
-        DllGetClassObjectInternal                               private
-        DllGetActivationFactoryImpl                             private
-        GetClassActivatorForApplicationImpl                     private
-        MetaDataGetDispenser
-        GetMetaDataInternalInterface
-        GetMetaDataInternalInterfaceFromPublic
-        GetMetaDataPublicInterfaceFromInternal
-        _CorExeMain2
-        _CorDllMain                                                     
-        CoInitializeEE
-        CoUninitializeEE
-        CoInitializeCor                                                 
-        CoUninitializeCor                                               
-        PostErrorVA                                               
-
-        LoadStringRC                                            @22
-        ReOpenMetaDataWithMemory                                @23
-
-        LoadStringRCEx
-	ReOpenMetaDataWithMemoryEx				private
-        TranslateSecurityAttributes                             private
-        GetPermissionRequests
-        CorExitProcess
-#ifdef FEATURE_CLICKONCE
-        CorLaunchApplication
-#endif
-
-        CorMarkThreadInThreadPool
-
-        LogHelp_LogAssert                                       private
-        LogHelp_NoGuiOnAssert                                   private
-        LogHelp_TerminateOnAssert                               private
-
-        GetPrivateContextsPerfCounters                          private
-
-        GetAssemblyMDImport                                     private
-
-        IEE                                                     private
-        
-#ifdef FEATURE_FUSION        
-; Fusion
-        GetCachePath
-        CreateAssemblyNameObject
-        CreateApplicationContext
-        CreateAssemblyCache
-        CreateAssemblyEnum       
-        CreateHistoryReader
-        LookupHistoryAssembly
-        GetHistoryFileDirectory
-        PreBindAssembly
-        PreBindAssemblyEx
-        SetMSIHandleForLogging
-        NukeDownloadedCache      
-        ClearDownloadCache      
-        GetCLRIdentityManager
-        CreateAssemblyConfigCookie
-        DestroyAssemblyConfigCookie
-        CompareAssemblyIdentity
-        CompareAssemblyIdentityWithConfig
-        InitializeFusion                                        private
-        CopyPDBs                                                private
-        DeleteShadowCache                                       private
-#endif        
-; Strong Name
-        StrongNameErrorInfo
-        StrongNameFreeBuffer
-        StrongNameKeyGen
-        StrongNameKeyGenEx
-        StrongNameKeyInstall
-        StrongNameKeyDelete
-        StrongNameGetPublicKey
-        StrongNameSignatureGeneration
-        StrongNameSignatureGenerationEx
-        StrongNameTokenFromAssembly
-        StrongNameTokenFromAssemblyEx
-        StrongNameTokenFromPublicKey
-        StrongNameSignatureVerification
-        StrongNameCompareAssemblies
-        StrongNameHashSize
-        StrongNameSignatureSize
-        StrongNameSignatureVerificationEx
-        GetHashFromAssemblyFile
-        GetHashFromAssemblyFileW
-        GetHashFromBlob
-        GetHashFromFile
-        GetHashFromFileW
-        GetHashFromHandle
-        StrongNameSignatureVerificationFromImage
-        StrongNameGetBlob
-        StrongNameGetBlobFromImage
-        StrongNameSignatureVerificationEx2
-        StrongNameGetPublicKeyEx
-        StrongNameDigestGenerate
-        StrongNameDigestSign
-        StrongNameDigestEmbed
-
-;   VM
-#ifdef FEATURE_COMINTEROP
-        DllCanUnloadNowInternal                                 private
-#endif
-#ifdef FEATURE_COMINTEROP_REGISTRATION
-        ClrCreateManagedInstance
-        DllRegisterServerInternal                               private
-        DllUnregisterServerInternal                             private
-        EEDllRegisterServer                                     private
-        EEDllUnregisterServer                                   private
-#endif
-        SetRuntimeInfo
-        _CorExeMain                                                     
-#ifdef FEATURE_MIXEDMODE
-        CorDllMainForThunk                                      private
-#endif
-        CoEEShutDownCOM
-#ifdef FEATURE_PREJIT
-        NGenCreateNGenWorker
-        LegacyNGenCreateZapper
-        LegacyNGenFreeZapper
-        LegacyNGenTryEnumerateFusionCache
-        LegacyNGenCompile
-#endif
-        GetAddrOfContractShutoffFlag                            private
-        GetCLRFunction                                          private
-
-#ifdef PROFILING_SUPPORTED
-        AttachProfiler                                          private
-#endif // PROFILING_SUPPORTED
-        
-#ifdef FEATURE_FUSION
-;   Fusion
-        CreateInstallReferenceEnum
-        InstallCustomModule
-        GetAssemblyIdentityFromFile
-        GetIdentityAuthority                                    private
-        ParseManifest                                           private
-        CreateCMSFromXml                                        private
-        GetAppIdAuthority                                       private
-        GetUserStore                                            private
-        CreateActContext                                        private
-        GetUserStateManager                                     private
-;        CreateCMSFromXmlInternal                                private        
-;        GetUserStoreInternal                                    private
-;        ParseManifestInternal                                   private
-;        CreateActContextInternal                                private
-;        GetUserStateManagerInternal                             private
-	CertCreateAuthenticodeLicense				private
-	CertTimestampAuthenticodeLicense			private
-	CertVerifyAuthenticodeLicense				private
-	CertFreeAuthenticodeSignerInfo				private
-	CertFreeAuthenticodeTimestamperInfo			private
-	_AxlPublicKeyBlobToPublicKeyToken			private
-	_AxlRSAKeyValueToPublicKeyToken				private
-        _AxlGetIssuerPublicKeyHash                              private
-#endif // FEATURE_FUSION
-       
-;
-;   win64 common 
-; 
-#ifdef _WIN64
-        GetRuntimeStackWalkInfo
-#endif
-
-        Nirvana_Dummy                                           @24 NONAME PRIVATE
-
-#endif //FEATURE_CORECLR
diff --git a/src/dlls/mscorrc/mscorrc.rc b/src/dlls/mscorrc/mscorrc.rc
index 5385327a1f..3352256612 100644
--- a/src/dlls/mscorrc/mscorrc.rc
+++ b/src/dlls/mscorrc/mscorrc.rc
@@ -994,11 +994,7 @@ BEGIN
     IDS_EE_LOAD_BAD_MAIN_SIG                "Main method for type '%1' has invalid signature."
     IDS_EE_LOAD_CIRCULAR_DEPENDENCY         "A circular dependency was detected when loading file or assembly '%1'."
 
-#ifdef FEATURE_CORECLR
     IDS_EE_FILE_NOT_FOUND                   "File or assembly name '%1' was not found."
-#else
-    IDS_EE_FILE_NOT_FOUND                   "File or assembly name '%1', or one of its dependencies, was not found."
-#endif
 
     IDS_EE_TOO_MANY_OPEN_FILES              "The system cannot open file '%1'.  There may be too many open files."
     IDS_EE_SHARING_VIOLATION                "Cannot access file '%1' because it is being used by another process."
@@ -1376,11 +1372,7 @@ BEGIN
     IDS_EE_CANNOT_HAVE_ASSEMBLY_SPEC        "Unexpected assembly-qualifier in a typename."
     IDS_EE_NEEDS_ASSEMBLY_SPEC              "Typename needs an assembly qualifier."
 
-#ifdef FEATURE_CORECLR
     IDS_EE_FILELOAD_ERROR_GENERIC           "Could not load file or assembly '%1'. %2"
-#else
-    IDS_EE_FILELOAD_ERROR_GENERIC           "Could not load file or assembly '%1' or one of its dependencies. %2"
-#endif
 
     IDS_EE_CRYPTO_UNKNOWN_OPERATION         "Unknown import key operation specified."
 
@@ -1509,11 +1501,7 @@ BEGIN
 
     IDS_CLASSLOAD_OVERLAPPING_INTERFACES "The type '%1' in assembly '%2' has a contracting interface set for some instantiations"
     
-#ifdef FEATURE_CORECLR
     IDS_CLASSLOAD_32BITCLRLOADING64BITASSEMBLY "Attempted to load a 64-bit assembly on a 32-bit platform."
-#else // !FEATURE_CORECLR
-    IDS_CLASSLOAD_32BITCLRLOADING64BITASSEMBLY "Attempted to load a 64-bit assembly on a 32-bit platform. Use ReflectionOnlyLoad() instead if trying to load for reflection purposes."
-#endif // FEATURE_CORECLR    
 
     IDS_CLASSLOAD_CONSTRAINT_MISMATCH_ON_IMPLICIT_OVERRIDE  "Method '%3' on type '%1' from assembly '%2' tried to implicitly override a method with weaker type parameter constraints."
     IDS_CLASSLOAD_CONSTRAINT_MISMATCH_ON_IMPLICIT_IMPLEMENTATION "Method '%3' on type '%1' from assembly '%2' tried to implicitly implement an interface method with weaker type parameter constraints."
@@ -1545,11 +1533,7 @@ BEGIN
     IDS_UNMARSHALABLE_DEMAND_OBJECT         "The security object (Permission or PermissionSet) used for performing a Demand caused an error relating to serialization/deserialization."
     IDS_EE_OBJECT_TO_VARIANT_NOT_SUPPORTED  "Invalid managed/unmanaged type combination (Marshaling to and from COM VARIANTs isn't supported)."
     IDS_EE_OBJECT_TO_ITF_NOT_SUPPORTED      "Invalid managed/unmanaged type combination (Marshaling to and from COM interface pointers isn't supported)."
-#ifdef FEATURE_CORECLR
     IDS_TYPE_INHERITANCE_RULES_VIOLATED     "Inheritance security rules violated by type: '%1'. Derived types must either match the security accessibility of the base type or be less accessible.  If the base class has a non-transparent default constructor, the derived class must also have a default constructor, and the method inheritance rules apply across those two methods."
-#else // !FEATURE_CORECLR
-    IDS_TYPE_INHERITANCE_RULES_VIOLATED     "Inheritance security rules violated by type: '%1'. Derived types must either match the security accessibility of the base type or be less accessible."
-#endif // FEATURE_CORECLR
     IDS_METHOD_INHERITANCE_RULES_VIOLATED   "Inheritance security rules violated while overriding member: '%1'. Security accessibility of the overriding method must match the security accessibility of the method being overriden."
     IDS_CRITICAL_METHOD_ACCESS_DENIED       "Attempt to access method %1 in violation of security transparency rules failed."
 #ifdef FEATURE_CAS_POLICY
@@ -1574,11 +1558,9 @@ BEGIN
     IDS_E_CRITICAL_FIELD_ACCESS_DENIED      "Attempt by security transparent method '%1' to access security critical field '%2' failed.%3"
     IDS_E_CRITICAL_METHOD_ACCESS_DENIED     "Attempt by security transparent method '%1' to access security critical method '%2' failed.%3"
     IDS_E_CRITICAL_TYPE_ACCESS_DENIED       "Attempt by security transparent method '%1' to access security critical type '%2' failed.%3"
-#ifdef FEATURE_CORECLR
     IDS_E_DELEGATE_BINDING_TRANSPARENCY     "A delegate of type '%1' cannot be bound to the method '%2' due to security transparency rules. Ensure the delegate type and the method being bound have compatible security transparency."
     IDS_E_DELEGATE_FULLTRUST_ARPIC_1        "Delegate '%1' must be bound to a method in a fully-trusted assembly and the method must have the AllowReversePinvokeCallsAttribute."
     IDS_E_DELEGATE_FULLTRUST_ARPIC_2        "Cannot create a Delegate for marshalling out unless it is bound to a method in a fully-trusted assembly and the method has the AllowReversePinvokeCallsAttribute."
-#endif
     IDS_E_ACCESSING_PRIVATE_FRAMEWORK_CODE  "Reflection invocation to internal or private types or members in the framework is not allowed."
 
     IDS_EE_TORNSTATE                        "Unexpected change made to file '%1'."
@@ -1608,11 +1590,7 @@ STRINGTABLE DISCARDABLE
 BEGIN
     IDS_ER_APPLICATION                       "Application: "
     IDS_ER_UNKNOWN                           "unknown"
-#ifndef FEATURE_CORECLR
-    IDS_ER_FRAMEWORK_VERSION                 "Framework Version: "
-#else // FEATURE_CORECLR
     IDS_ER_FRAMEWORK_VERSION                 "CoreCLR Version: "
-#endif // !FEATURE_CORECLR
     IDS_ER_UNHANDLEDEXCEPTION                "Description: The process was terminated due to an unhandled exception."
     IDS_ER_UNHANDLEDEXCEPTIONMSG             "Exception Info: "
     IDS_ER_MANAGEDFAILFAST                   "Description: The application requested process termination through System.Environment.FailFast(string message)."
@@ -2117,15 +2095,7 @@ BEGIN
     IDS_DIALOG_BOX_IGNORE_BUTTON        "&Ignore"
 END
 
-#ifndef FEATURE_CORECLR
-// OOB servicing
-STRINGTABLE DISCARDABLE 
-BEGIN
-    IDS_EE_ASSEMBLY_ON_DENY_LIST        "The assembly %1 that the application tried to load has a known vulnerability. Please go to %2 to find a fix for this issue."
-END
-#endif
 
-#ifdef FEATURE_CORECLR
 STRINGTABLE DISCARDABLE 
 BEGIN
     IDS_EE_BADMARSHAL_TYPE_ANSIBSTR                   "Marshalling as AnsiBStr is not supported"
@@ -2136,7 +2106,6 @@ BEGIN
     IDS_EE_BADMARSHAL_TYPE_IDISPATCH                  "Marshalling as IDispatch is not supported"
     IDS_EE_ERROR_IDISPATCH                            "IDispatch and IDispatchEx are not supported"
 END
-#endif // FEATURE_CORECLR
 
 #ifdef FEATURE_HOST_ASSEMBLY_RESOLVER
 STRINGTABLE DISCARDABLE 
diff --git a/src/dlls/mscorrc/resource.h b/src/dlls/mscorrc/resource.h
index 77e937a81e..3b87d1e9cb 100644
--- a/src/dlls/mscorrc/resource.h
+++ b/src/dlls/mscorrc/resource.h
@@ -812,16 +812,12 @@
 #define IDS_E_TRANSPARENT_CALL_NATIVE           0x2120
 #define IDS_E_TRANSPARENT_REFLECTION            0x2121
 
-#ifdef FEATURE_CORECLR
 #define IDS_E_DELEGATE_BINDING_TRANSPARENCY     0x2122
-#endif
 
 #define IDS_E_ACCESSING_PRIVATE_FRAMEWORK_CODE  0x2123
 
-#ifdef FEATURE_CORECLR
 #define IDS_E_DELEGATE_FULLTRUST_ARPIC_1          0x2124
 #define IDS_E_DELEGATE_FULLTRUST_ARPIC_2          0x2125
-#endif
 
 #define IDS_ACCESS_EXCEPTION_CONTEXT_LEVEL2_APTCA       0x2200
 #define IDS_ACCESS_EXCEPTION_CONTEXT_APTCA_KILLBIT      0x2201
@@ -870,10 +866,8 @@
 #define IDS_E_PROF_TIMEOUT_WAITING_FOR_CONCURRENT_GC    0x251D
 
 
-#ifdef FEATURE_CORECLR
 #define IDS_EE_LINK_FOR_ERROR_MESSAGES          0x2600
 #define IDS_EE_LINK_FOR_DEBUGGING_MESSAGES      0x2601          
-#endif
 
 #define IDS_DIALOG_BOX_ABORT_BUTTON             0x2602
 #define IDS_DIALOG_BOX_DEBUG_BUTTON             0x2603
@@ -920,15 +914,11 @@
 #define IDS_EE_INTEROP_DLL_IMPORT_ON_USER_METHOD 0x262b
 #endif
 
-#ifndef FEATURE_CORECLR
-#define IDS_EE_ASSEMBLY_ON_DENY_LIST            0x262c
-#endif
 
 #ifdef FEATURE_COMINTEROP
 #define IDS_EE_WINRT_WEAKREF_BAD_TYPE           0x262e
 #endif // FEATURE_COMINTEROP
 
-#ifdef FEATURE_CORECLR
 #define IDS_EE_BADMARSHAL_TYPE_ANSIBSTR         0x262f
 #define IDS_EE_BADMARSHAL_TYPE_VBBYVALSTR       0x2630
 #define IDS_EE_BADMARSHAL_TYPE_REFERENCECUSTOMMARSHALER  0x2631
@@ -936,7 +926,6 @@
 #define IDS_EE_BADMARSHAL_TYPE_ASANYA           0x2633
 #define IDS_EE_BADMARSHAL_TYPE_IDISPATCH        0x2634
 #define IDS_EE_ERROR_IDISPATCH                  0x2635
-#endif // FEATURE_CORECLR
 
 #ifdef FEATURE_HOST_ASSEMBLY_RESOLVER
 #define IDS_HOST_ASSEMBLY_RESOLVER_ASSEMBLY_ALREADY_LOADED_IN_CONTEXT                  0x2636