Use CompareStringOrdinal() instead of CompareString() case-sensitive

This commit moves to the modern CompareStringOrdinal() for all case-sensitve
uses of CompareString() with the invariant locale.

Resolves 6947

4 files changed, 11 insertions, 11 deletions

diff --git a/src/ext/Bal/stdbas/WixStandardBootstrapperApplication.cpp b/src/ext/Bal/stdbas/WixStandardBootstrapperApplication.cpp
index 9ddab7c0..6cfe0b4c 100644
--- a/src/ext/Bal/stdbas/WixStandardBootstrapperApplication.cpp
+++ b/src/ext/Bal/stdbas/WixStandardBootstrapperApplication.cpp
@@ -614,7 +614,7 @@ public: // IBootstrapperApplication
         {
             // After restart we need to finish the dependency registration for our package so allow the package
             // to go present.
-            if (CSTR_EQUAL == ::CompareStringW(LOCALE_NEUTRAL, 0, wzPackageId, -1, m_sczAfterForcedRestartPackage, -1))
+            if (CSTR_EQUAL == ::CompareStringOrdinal(wzPackageId, -1, m_sczAfterForcedRestartPackage, -1, FALSE))
             {
                 // Do not allow a repair because that could put us in a perpetual restart loop.
                 if (BOOTSTRAPPER_REQUEST_STATE_REPAIR == *pRequestState)
@@ -3570,7 +3570,7 @@ private:
         for (DWORD iAssignControl = 0; iAssignControl < countof(m_rgInitControls); ++iAssignControl)
         {
             THEME_ASSIGN_CONTROL_ID* pAssignControl = m_rgInitControls + iAssignControl;
-            if (CSTR_EQUAL == ::CompareStringW(LOCALE_NEUTRAL, 0, pArgs->pThemeControl->sczName, -1, pAssignControl->wzName, -1))
+            if (CSTR_EQUAL == ::CompareStringOrdinal(pArgs->pThemeControl->sczName, -1, pAssignControl->wzName, -1, FALSE))
             {
                 if (!pAssignControl->ppControl)
                 {
diff --git a/src/ext/Iis/ca/scafilter.cpp b/src/ext/Iis/ca/scafilter.cpp
index 9d9014fd..294e002e 100644
--- a/src/ext/Iis/ca/scafilter.cpp
+++ b/src/ext/Iis/ca/scafilter.cpp
@@ -158,7 +158,7 @@ HRESULT ScaFiltersInstall(
     {
         if (WcaIsInstalling(psf->isInstalled, psf->isAction))
         {
-            if (!wzPreviousFilterRoot || CSTR_EQUAL != ::CompareStringW(LOCALE_INVARIANT, 0, wzPreviousFilterRoot, -1, psf->wzFilterRoot, -1))
+            if (!wzPreviousFilterRoot || CSTR_EQUAL != ::CompareStringOrdinal(wzPreviousFilterRoot, -1, psf->wzFilterRoot, -1, FALSE))
             {
                 if (pwzLoadOrder)
                 {
@@ -234,7 +234,7 @@ HRESULT ScaFiltersUninstall(
     {
         if (WcaIsUninstalling(psf->isInstalled, psf->isAction))
         {
-            if (!wzPreviousFilterRoot || CSTR_EQUAL != ::CompareStringW(LOCALE_INVARIANT, 0, wzPreviousFilterRoot, -1, psf->wzFilterRoot, -1))
+            if (!wzPreviousFilterRoot || CSTR_EQUAL != ::CompareStringOrdinal(wzPreviousFilterRoot, -1, psf->wzFilterRoot, -1, FALSE))
             {
                 if (pwzLoadOrder)
                 {
diff --git a/src/ext/NetFx/be/netfxsearch.cpp b/src/ext/NetFx/be/netfxsearch.cpp
index 38c34e3c..6f3373d9 100644
--- a/src/ext/NetFx/be/netfxsearch.cpp
+++ b/src/ext/NetFx/be/netfxsearch.cpp
@@ -46,7 +46,7 @@ STDMETHODIMP NetfxSearchParseFromXml(
         BextExitOnFailure(hr, "Failed to get @Id.");
 
         // Read type specific attributes.
-        if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, bstrNodeName, -1, L"NetFxNetCoreSearch", -1))
+        if (CSTR_EQUAL == ::CompareStringOrdinal(bstrNodeName, -1, L"NetFxNetCoreSearch", -1, FALSE))
         {
             pSearch->Type = NETFX_SEARCH_TYPE_NET_CORE_SEARCH;
 
@@ -63,7 +63,7 @@ STDMETHODIMP NetfxSearchParseFromXml(
             hr = XmlGetAttributeEx(pixnNode, L"MajorVersion", &netCoreSearch.sczMajorVersion);
             BextExitOnFailure(hr, "Failed to get @MajorVersion.");
         }
-        else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, bstrNodeName, -1, L"NetFxNetCoreSdkSearch", -1))
+        else if (CSTR_EQUAL == ::CompareStringOrdinal(bstrNodeName, -1, L"NetFxNetCoreSdkSearch", -1, FALSE))
         {
             pSearch->Type = NETFX_SEARCH_TYPE_NET_CORE_SDK_SEARCH;
 
@@ -76,7 +76,7 @@ STDMETHODIMP NetfxSearchParseFromXml(
             hr = XmlGetAttributeEx(pixnNode, L"MajorVersion", &netCoreSdkSearch.sczMajorVersion);
             BextExitOnFailure(hr, "Failed to get @MajorVersion.");
         }
-        else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, bstrNodeName, -1, L"NetFxNetCoreSdkFeatureBandSearch", -1))
+        else if (CSTR_EQUAL == ::CompareStringOrdinal(bstrNodeName, -1, L"NetFxNetCoreSdkFeatureBandSearch", -1, FALSE))
         {
             pSearch->Type = NETFX_SEARCH_TYPE_NET_CORE_SDK_FEATURE_BAND_SEARCH;
 
@@ -176,7 +176,7 @@ STDMETHODIMP NetfxSearchFindById(
     {
         NETFX_SEARCH* pSearch = &pSearches->rgSearches[i];
 
-        if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, pSearch->sczId, -1, wzId, -1))
+        if (CSTR_EQUAL == ::CompareStringOrdinal(pSearch->sczId, -1, wzId, -1, FALSE))
         {
             *ppSearch = pSearch;
             ExitFunction1(hr = S_OK);
diff --git a/src/ext/Util/be/utilsearch.cpp b/src/ext/Util/be/utilsearch.cpp
index 59c497e3..a0818963 100644
--- a/src/ext/Util/be/utilsearch.cpp
+++ b/src/ext/Util/be/utilsearch.cpp
@@ -47,7 +47,7 @@ STDMETHODIMP UtilSearchParseFromXml(
         BextExitOnFailure(hr, "Failed to get @Id.");
 
         // Read type specific attributes.
-        if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, bstrNodeName, -1, L"WixWindowsFeatureSearch", -1))
+        if (CSTR_EQUAL == ::CompareStringOrdinal(bstrNodeName, -1, L"WixWindowsFeatureSearch", -1, FALSE))
         {
             pSearch->Type = UTIL_SEARCH_TYPE_WINDOWS_FEATURE_SEARCH;
 
@@ -55,7 +55,7 @@ STDMETHODIMP UtilSearchParseFromXml(
             hr = XmlGetAttributeEx(pixnNode, L"Type", &scz);
             BextExitOnFailure(hr, "Failed to get @Type.");
 
-            if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, scz, -1, L"sha2CodeSigning", -1))
+            if (CSTR_EQUAL == ::CompareStringOrdinal(scz, -1, L"sha2CodeSigning", -1, FALSE))
             {
                 pSearch->WindowsFeatureSearch.type = UTIL_WINDOWS_FEATURE_SEARCH_TYPE_SHA2_CODE_SIGNING;
             }
@@ -144,7 +144,7 @@ STDMETHODIMP UtilSearchFindById(
     {
         UTIL_SEARCH* pSearch = &pSearches->rgSearches[i];
 
-        if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, pSearch->sczId, -1, wzId, -1))
+        if (CSTR_EQUAL == ::CompareStringOrdinal(pSearch->sczId, -1, wzId, -1, FALSE))
         {
             *ppSearch = pSearch;
             ExitFunction1(hr = S_OK);