diff --git a/src/coreclr/src/inc/clrconfig.h b/src/coreclr/src/inc/clrconfig.h index 7ffa854353510..bd5e41cdbc0ae 100644 --- a/src/coreclr/src/inc/clrconfig.h +++ b/src/coreclr/src/inc/clrconfig.h @@ -41,16 +41,6 @@ class CLRConfig IgnoreEnv = 0x1, // If set, do not prepend "COMPlus_" when doing environment variable lookup. DontPrependCOMPlus_ = 0x2, - // If set, don't look in HKLM in the registry. - IgnoreHKLM = 0x4, - // If set, don't look in HKCU in the registry. - IgnoreHKCU = 0x8, - // If set, look only in the system config file, ignoring other config files. - // (This option does not affect environment variable and registry lookups) - ConfigFile_SystemOnly = 0x40, - // If set, reverse the order of config file lookups (application config file first). - // (This option does not affect environment variable and registry lookups) - ConfigFile_ApplicationFirst = 0x80, // Remove any whitespace at beginning and end of value. (Only applicable for // *string* configuration values.) TrimWhiteSpaceFromStringValue = 0x100, diff --git a/src/coreclr/src/inc/clrconfigvalues.h b/src/coreclr/src/inc/clrconfigvalues.h index 44e08eef3ba41..3186372d8d43d 100644 --- a/src/coreclr/src/inc/clrconfigvalues.h +++ b/src/coreclr/src/inc/clrconfigvalues.h @@ -780,7 +780,6 @@ CONFIG_DWORD_INFO_DIRECT_ACCESS(INTERNAL_GenerateLongJumpDispatchStubRatio, W("G CONFIG_DWORD_INFO_EX(INTERNAL_HashStack, W("HashStack"), 0, "", CLRConfig::EEConfig_default) CONFIG_DWORD_INFO(INTERNAL_HostManagerConfig, W("HostManagerConfig"), (DWORD)-1, "") CONFIG_DWORD_INFO(INTERNAL_HostTestThreadAbort, W("HostTestThreadAbort"), 0, "") -RETAIL_CONFIG_DWORD_INFO_EX(UNSUPPORTED_IgnoreDllMainReturn, W("IgnoreDllMainReturn"), 0, "Don't check the return value of DllMain if this is set", CLRConfig::ConfigFile_ApplicationFirst) CONFIG_STRING_INFO(INTERNAL_InvokeHalt, W("InvokeHalt"), "Throws an assert when the given method is invoked through reflection.") CONFIG_DWORD_INFO_DIRECT_ACCESS(INTERNAL_MaxStackDepth, W("MaxStackDepth"), "") CONFIG_DWORD_INFO_DIRECT_ACCESS(INTERNAL_MaxStubUnwindInfoSegmentSize, W("MaxStubUnwindInfoSegmentSize"), "") diff --git a/src/coreclr/src/utilcode/clrconfig.cpp b/src/coreclr/src/utilcode/clrconfig.cpp index 12e7f9db5218a..5142e395ac0ec 100644 --- a/src/coreclr/src/utilcode/clrconfig.cpp +++ b/src/coreclr/src/utilcode/clrconfig.cpp @@ -82,43 +82,6 @@ #undef CONFIG_STRING_INFO_DIRECT_ACCESS - - -// Return if a quirk is a enabled. -// This will also return enabled as true when the quirk has a value set. -BOOL CLRConfig::IsConfigEnabled(const ConfigDWORDInfo & info) -{ - CONTRACTL - { - NOTHROW; - GC_NOTRIGGER; - FORBID_FAULT; - } - CONTRACTL_END; - - DWORD result = info.defaultValue; - - // - // Set up REGUTIL options. - // - REGUTIL::CORConfigLevel level = GetConfigLevel(info.options); - BOOL prependCOMPlus = !CheckLookupOption(info, DontPrependCOMPlus_); - - REGUTIL::GetConfigDWORD_DontUse_(info.name, info.defaultValue, &result, level, prependCOMPlus); - if(result>0) - return TRUE; - LPWSTR result2 = REGUTIL::GetConfigString_DontUse_(info.name, prependCOMPlus, level); - if(result2 != NULL && result2[0] != 0) - { - return TRUE; - } - - if(info.defaultValue>0) - return TRUE; - else - return FALSE; -} - // // Look up a DWORD config value. // @@ -418,11 +381,5 @@ REGUTIL::CORConfigLevel CLRConfig::GetConfigLevel(LookupOptions options) if(CheckLookupOption(options, IgnoreEnv) == FALSE) level = static_cast(level | REGUTIL::COR_CONFIG_ENV); - if(CheckLookupOption(options, IgnoreHKCU) == FALSE) - level = static_cast(level | REGUTIL::COR_CONFIG_USER); - - if(CheckLookupOption(options, IgnoreHKLM) == FALSE) - level = static_cast(level | REGUTIL::COR_CONFIG_MACHINE); - - return level; + return static_cast(level | REGUTIL::COR_CONFIG_USER | REGUTIL::COR_CONFIG_MACHINE); }