Update code to use COMPlus_ instead of COMPLUS_ when referencing knobs

4 files changed, 22 insertions, 22 deletions

diff --git a/src/utilcode/clrconfig.cpp b/src/utilcode/clrconfig.cpp
index ba0a9715d4..c8a82060e9 100644
--- a/src/utilcode/clrconfig.cpp
+++ b/src/utilcode/clrconfig.cpp
@@ -210,17 +210,17 @@ BOOL CLRConfig::IsConfigEnabled(const ConfigDWORDInfo & info)
     // Set up REGUTIL options.
     // 
     REGUTIL::CORConfigLevel level = GetConfigLevel(info.options);
-    BOOL prependCOMPLUS = !CheckLookupOption(info, DontPrependCOMPLUS_);
+    BOOL prependCOMPlus = !CheckLookupOption(info, DontPrependCOMPlus_);
     
     // 
     // If we aren't favoring config files, we check REGUTIL here.
     // 
     if(CheckLookupOption(info, FavorConfigFile) == FALSE)
     {
-        REGUTIL::GetConfigDWORD_DontUse_(info.name, info.defaultValue, &result, level, prependCOMPLUS);
+        REGUTIL::GetConfigDWORD_DontUse_(info.name, info.defaultValue, &result, level, prependCOMPlus);
         if(result>0)
             return TRUE;
-        LPWSTR result = REGUTIL::GetConfigString_DontUse_(info.name, prependCOMPLUS, level);
+        LPWSTR result = REGUTIL::GetConfigString_DontUse_(info.name, prependCOMPlus, level);
         if(result != NULL && result[0] != 0)
         {
             return TRUE;
@@ -265,10 +265,10 @@ BOOL CLRConfig::IsConfigEnabled(const ConfigDWORDInfo & info)
     // 
     if(CheckLookupOption(info, FavorConfigFile) == TRUE)
     {
-        REGUTIL::GetConfigDWORD_DontUse_(info.name, info.defaultValue, &result, level, prependCOMPLUS);
+        REGUTIL::GetConfigDWORD_DontUse_(info.name, info.defaultValue, &result, level, prependCOMPlus);
         if(result>0)
             return TRUE;
-        LPWSTR result = REGUTIL::GetConfigString_DontUse_(info.name, prependCOMPLUS, level);
+        LPWSTR result = REGUTIL::GetConfigString_DontUse_(info.name, prependCOMPlus, level);
         if(result != NULL && result[0] != 0)
         {
             return TRUE;
@@ -284,7 +284,7 @@ BOOL CLRConfig::IsConfigEnabled(const ConfigDWORDInfo & info)
         s_GetPerformanceDefaultValueCallback != NULL &&
         s_GetPerformanceDefaultValueCallback(info.name, &performanceDefaultValue))
     {
-        if (!SUCCEEDED(REGUTIL::GetConfigDWORD_DontUse_(info.name, info.defaultValue, &result, level, prependCOMPLUS)))
+        if (!SUCCEEDED(REGUTIL::GetConfigDWORD_DontUse_(info.name, info.defaultValue, &result, level, prependCOMPlus)))
         {
             if(performanceDefaultValue>0)
                 return TRUE;
@@ -357,14 +357,14 @@ DWORD CLRConfig::GetConfigValue(const ConfigDWORDInfo & info)
     // Set up REGUTIL options.
     // 
     REGUTIL::CORConfigLevel level = GetConfigLevel(info.options);
-    BOOL prependCOMPLUS = !CheckLookupOption(info, DontPrependCOMPLUS_);
+    BOOL prependCOMPlus = !CheckLookupOption(info, DontPrependCOMPlus_);
     
     // 
     // If we aren't favoring config files, we check REGUTIL here.
     // 
     if(CheckLookupOption(info, FavorConfigFile) == FALSE)
     {
-        REGUTIL::GetConfigDWORD_DontUse_(info.name, info.defaultValue, &result, level, prependCOMPLUS);
+        REGUTIL::GetConfigDWORD_DontUse_(info.name, info.defaultValue, &result, level, prependCOMPlus);
         // TODO: We are ignoring explicitly defined default values to avoid change in behavior. 
         // TODO: Ideally, the following should check the hresult for success.
         if(result != info.defaultValue)
@@ -411,7 +411,7 @@ DWORD CLRConfig::GetConfigValue(const ConfigDWORDInfo & info)
     // 
     if(CheckLookupOption(info, FavorConfigFile) == TRUE)
     {
-        REGUTIL::GetConfigDWORD_DontUse_(info.name, info.defaultValue, &result, level, prependCOMPLUS);
+        REGUTIL::GetConfigDWORD_DontUse_(info.name, info.defaultValue, &result, level, prependCOMPlus);
         // TODO: We are ignoring explicitly defined default values to avoid change in behavior. 
         // TODO: Ideally, the following should check the hresult for success.
         if(result != info.defaultValue)
@@ -431,7 +431,7 @@ DWORD CLRConfig::GetConfigValue(const ConfigDWORDInfo & info)
     {
         // TODO: We ignore explicitly defined default values above, but we do not want to let performance defaults override these.
         // TODO: Ideally, the above would use hresult for success and this check would be removed.
-        if (!SUCCEEDED(REGUTIL::GetConfigDWORD_DontUse_(info.name, info.defaultValue, &result, level, prependCOMPLUS)))
+        if (!SUCCEEDED(REGUTIL::GetConfigDWORD_DontUse_(info.name, info.defaultValue, &result, level, prependCOMPlus)))
             return performanceDefaultValue;
     }
 
@@ -522,14 +522,14 @@ HRESULT CLRConfig::GetConfigValue(const ConfigStringInfo & info, __deref_out_z L
     // Set up REGUTIL options.
     // 
     REGUTIL::CORConfigLevel level = GetConfigLevel(info.options);
-    BOOL prependCOMPLUS = !CheckLookupOption(info, DontPrependCOMPLUS_);
+    BOOL prependCOMPlus = !CheckLookupOption(info, DontPrependCOMPlus_);
 
     // 
     // If we aren't favoring config files, we check REGUTIL here.
     // 
     if(result == NULL && CheckLookupOption(info, FavorConfigFile) == FALSE)
     {        
-        result = REGUTIL::GetConfigString_DontUse_(info.name, prependCOMPLUS, level);
+        result = REGUTIL::GetConfigString_DontUse_(info.name, prependCOMPlus, level);
     }
 
     // 
@@ -563,7 +563,7 @@ HRESULT CLRConfig::GetConfigValue(const ConfigStringInfo & info, __deref_out_z L
     if(result==NULL && 
         CheckLookupOption(info, FavorConfigFile) == TRUE)
     {
-        result = REGUTIL::GetConfigString_DontUse_(info.name, prependCOMPLUS, level);
+        result = REGUTIL::GetConfigString_DontUse_(info.name, prependCOMPlus, level);
     }
 
     if ((result != NULL) && CheckLookupOption(info, TrimWhiteSpaceFromStringValue))
@@ -617,7 +617,7 @@ BOOL CLRConfig::IsConfigOptionSpecified(LPCWSTR name)
         }
     }
 
-    // Check REGUTIL, both with and without the COMPLUS_ prefix
+    // Check REGUTIL, both with and without the COMPlus_ prefix
     {
         LPWSTR result = NULL;
     
diff --git a/src/utilcode/regutil.cpp b/src/utilcode/regutil.cpp
index 1cb8990f0c..fbc55708c7 100644
--- a/src/utilcode/regutil.cpp
+++ b/src/utilcode/regutil.cpp
@@ -1355,7 +1355,7 @@ void REGUTIL::InitOptionalConfigCache()
     LONG l = ERROR_SUCCESS; // general Win32 API error return code
     HKEY hkey = NULL;
 
-    // No caching if the environment variable COMPLUS_DisableConfigCache is set
+    // No caching if the environment variable COMPlus_DisableConfigCache is set
     //
     if (CLRConfig::GetConfigValue(CLRConfig::EXTERNAL_DisableConfigCache) != 0)
         goto failure;
diff --git a/src/utilcode/sortversioning.cpp b/src/utilcode/sortversioning.cpp
index c401086faf..5420947842 100644
--- a/src/utilcode/sortversioning.cpp
+++ b/src/utilcode/sortversioning.cpp
@@ -655,7 +655,7 @@ namespace SortVersioning
     //         </runtime>
     //        </configuration>
     // 2) Environment variable
-    //        set COMPLUS_CompatSortNLSVersion=4096
+    //        set COMPlus_CompatSortNLSVersion=4096
     // 3) RegistryKey
     //        [HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\.NETFramework]
     //        "CompatSortNLSVersion"=dword:00001000
diff --git a/src/utilcode/util.cpp b/src/utilcode/util.cpp
index dcc6b83e21..f801f94b60 100644
--- a/src/utilcode/util.cpp
+++ b/src/utilcode/util.cpp
@@ -2892,7 +2892,7 @@ void SOTolerantViolation(const char *szFunction, const char *szFile, int lineNum
 
 //
 // SONotMainlineViolation is used to report any code with SO_NOT_MAINLINE being run in a test environment
-// with COMPLUS_NO_SO_NOT_MAINLINE enabled
+// with COMPlus_NO_SO_NOT_MAINLINE enabled
 //
 void SONotMainlineViolation(const char *szFunction, const char *szFile, int lineNum) 
 {
@@ -2901,7 +2901,7 @@ void SONotMainlineViolation(const char *szFunction, const char *szFile, int line
 
 //
 // SONotMainlineViolation is used to report any code with SO_NOT_MAINLINE being run in a test environment
-// with COMPLUS_NO_SO_NOT_MAINLINE enabled
+// with COMPlus_NO_SO_NOT_MAINLINE enabled
 //
 void SOBackoutViolation(const char *szFunction, const char *szFile, int lineNum) 
 {
@@ -2968,8 +2968,8 @@ void SOViolation(const char *szFunction, const char *szFile, int lineNum, SOViol
                         "CONTRACT VIOLATION by %s at \"%s\" @ %d\n\n" 
                         "SO-not-mainline function being called with not-mainline checking enabled.\n"
                         "\nPlease open a bug against the feature owner.\n"
-                        "\nNOTE: You can disable this ASSERT by setting COMPLUS_SOEnableDefaultRWValidation=0.\n"
-                        "      or by turning of not-mainline checking by by setting COMPLUS_NO_SO_NOT_MAINLINE=0.\n"
+                        "\nNOTE: You can disable this ASSERT by setting COMPlus_SOEnableDefaultRWValidation=0.\n"
+                        "      or by turning of not-mainline checking by by setting COMPlus_NO_SO_NOT_MAINLINE=0.\n"
                         "\nFor details about this feature, see, in a CLR enlistment,\n"
                         "src\\ndp\\clr\\doc\\OtherDevDocs\\untriaged\\clrdev_web\\SO Guide for CLR Developers.doc\n",
                             szFunction, szFile, lineNum);
@@ -2981,7 +2981,7 @@ void SOViolation(const char *szFunction, const char *szFile, int lineNum, SOViol
                         "SO Backout Marker overrun.\n\n" 
                         "A dtor or handler path exceeded the backout code stack consumption limit.\n"
                         "\nPlease open a bug against the feature owner.\n"
-                        "\nNOTE: You can disable this ASSERT by setting COMPLUS_SOEnableBackoutStackValidation=0.\n"
+                        "\nNOTE: You can disable this ASSERT by setting COMPlus_SOEnableBackoutStackValidation=0.\n"
                         "\nFor details about this feature, see, in a CLR enlistment,\n"
                         "src\\ndp\\clr\\doc\\OtherDevDocs\\untriaged\\clrdev_web\\SO Guide for CLR Developers.doc\n");
     }
@@ -2992,7 +2992,7 @@ void SOViolation(const char *szFunction, const char *szFile, int lineNum, SOViol
                         "CONTRACT VIOLATION by %s at \"%s\" @ %d\n\n" 
                         "SO-intolerant function called outside an SO probe.\n"
                         "\nPlease open a bug against the feature owner.\n"
-                        "\nNOTE: You can disable this ASSERT by setting COMPLUS_SOEnableDefaultRWValidation=0.\n"
+                        "\nNOTE: You can disable this ASSERT by setting COMPlus_SOEnableDefaultRWValidation=0.\n"
                         "\nFor details about this feature, see, in a CLR enlistment,\n"
                         "src\\ndp\\clr\\doc\\OtherDevDocs\\untriaged\\clrdev_web\\SO Guide for CLR Developers.doc\n",
                             szFunction, szFile, lineNum);