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

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

Partially resolves 6947

3 files changed, 19 insertions, 19 deletions

diff --git a/src/ext/Iis/ca/scaapppool.cpp b/src/ext/Iis/ca/scaapppool.cpp
index 781c55ca..951f2d4b 100644
--- a/src/ext/Iis/ca/scaapppool.cpp
+++ b/src/ext/Iis/ca/scaapppool.cpp
@@ -80,7 +80,7 @@ HRESULT ScaAppPoolRead(
         WcaLog(LOGMSG_VERBOSE, "Skipping ScaAppPoolRead() - required table not present");
         ExitFunction1(hr = S_FALSE);
     }
-    
+
     hr = WcaBeginUnwrapQuery(&hComponentQuery, ppwzCustomActionData);
     ExitOnFailure(hr, "Failed to unwrap query for ScaAppPoolRead");
 
@@ -478,17 +478,17 @@ HRESULT ScaWriteAppPool(
     }
     else if (psap->iAttributes & APATTR_OTHERUSER)
     {
-        if (!*psap->suUser.wzDomain || CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, NORM_IGNORECASE, psap->suUser.wzDomain, -1, L".", -1))
+        if (!*psap->suUser.wzDomain || CSTR_EQUAL == ::CompareStringOrdinal(psap->suUser.wzDomain, -1, L".", -1, TRUE))
         {
-            if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, NORM_IGNORECASE, psap->suUser.wzName, -1, L"NetworkService", -1))
+            if (CSTR_EQUAL == ::CompareStringOrdinal(psap->suUser.wzName, -1, L"NetworkService", -1, TRUE))
             {
                 dwIdentity = MD_APPPOOL_IDENTITY_TYPE_NETWORKSERVICE;
             }
-            else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, NORM_IGNORECASE, psap->suUser.wzName, -1, L"LocalService", -1))
+            else if (CSTR_EQUAL == ::CompareStringOrdinal(psap->suUser.wzName, -1, L"LocalService", -1, TRUE))
             {
                 dwIdentity = MD_APPPOOL_IDENTITY_TYPE_LOCALSERVICE;
             }
-            else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, NORM_IGNORECASE, psap->suUser.wzName, -1, L"LocalSystem", -1))
+            else if (CSTR_EQUAL == ::CompareStringOrdinal(psap->suUser.wzName, -1, L"LocalSystem", -1, TRUE))
             {
                 dwIdentity = MD_APPPOOL_IDENTITY_TYPE_LOCALSYSTEM;
             }
@@ -497,17 +497,17 @@ HRESULT ScaWriteAppPool(
                 dwIdentity = MD_APPPOOL_IDENTITY_TYPE_SPECIFICUSER;
             }
         }
-        else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, NORM_IGNORECASE, psap->suUser.wzDomain, -1, L"NT AUTHORITY", -1))
+        else if (CSTR_EQUAL == ::CompareStringOrdinal(psap->suUser.wzDomain, -1, L"NT AUTHORITY", -1, TRUE))
         {
-            if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, NORM_IGNORECASE, psap->suUser.wzName, -1, L"NETWORK SERVICE", -1))
+            if (CSTR_EQUAL == ::CompareStringOrdinal(psap->suUser.wzName, -1, L"NETWORK SERVICE", -1, TRUE))
             {
                 dwIdentity = MD_APPPOOL_IDENTITY_TYPE_NETWORKSERVICE;
             }
-            else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, NORM_IGNORECASE, psap->suUser.wzName, -1, L"SERVICE", -1))
+            else if (CSTR_EQUAL == ::CompareStringOrdinal(psap->suUser.wzName, -1, L"SERVICE", -1, TRUE))
             {
                 dwIdentity = MD_APPPOOL_IDENTITY_TYPE_LOCALSERVICE;
             }
-            else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, NORM_IGNORECASE, psap->suUser.wzName, -1, L"SYSTEM", -1))
+            else if (CSTR_EQUAL == ::CompareStringOrdinal(psap->suUser.wzName, -1, L"SYSTEM", -1, TRUE))
             {
                 dwIdentity = MD_APPPOOL_IDENTITY_TYPE_LOCALSYSTEM;
             }
diff --git a/src/ext/Iis/ca/scaexecIIS7.cpp b/src/ext/Iis/ca/scaexecIIS7.cpp
index 108007a1..52378d34 100644
--- a/src/ext/Iis/ca/scaexecIIS7.cpp
+++ b/src/ext/Iis/ca/scaexecIIS7.cpp
@@ -566,7 +566,7 @@ HRESULT IIS7AspProperty(
     //
     //Do not append trailing '/' for default vDir
     //
-    if (CSTR_EQUAL != ::CompareStringW(LOCALE_INVARIANT, NORM_IGNORECASE, pwzPathName, -1, L"/", -1))
+    if (CSTR_EQUAL != ::CompareStringOrdinal(pwzPathName, -1, L"/", -1, TRUE))
     {
         hr = StrAllocConcat(&pwzLocationPath, L"/", 0);
         ExitOnFailure(hr, "failed to copy location WebDir '/'");
@@ -742,7 +742,7 @@ HRESULT IIS7WebDir(
             //
             //Do not append trailing '/' for default vDir
             //
-            if (CSTR_EQUAL != ::CompareStringW(LOCALE_INVARIANT, NORM_IGNORECASE, pwzPathName, -1, L"/", -1))
+            if (CSTR_EQUAL != ::CompareStringOrdinal(pwzPathName, -1, L"/", -1, TRUE))
             {
                 hr = StrAllocConcat(&pwzLocationPath, L"/", 0);
                 ExitOnFailure(hr, "failed to copy location WebDir '/'");
@@ -998,7 +998,7 @@ HRESULT IIS7WebError(
     hr = StrAllocFormatted(&pwzConfigPath, L"%s/%s", IIS_CONFIG_APPHOST_ROOT, pwzSiteName);
     ExitOnFailure(hr, "failed to format web error config path");
 
-    if (CSTR_EQUAL != ::CompareStringW(LOCALE_INVARIANT, NORM_IGNORECASE, pwzAppName, -1, L"/", -1))
+    if (CSTR_EQUAL != ::CompareStringOrdinal(pwzAppName, -1, L"/", -1, TRUE))
     {
         hr = StrAllocConcat(&pwzConfigPath, L"/", 0);
         ExitOnFailure(hr, "failed to copy web error config path delim");
@@ -1325,7 +1325,7 @@ HRESULT IIS7HttpHeader(
     hr = StrAllocFormatted(&pwzConfigPath, L"%s/%s", IIS_CONFIG_APPHOST_ROOT, pwzSiteName);
     ExitOnFailure(hr, "failed to format web error config path");
 
-    if (CSTR_EQUAL != ::CompareStringW(LOCALE_INVARIANT, NORM_IGNORECASE, pwzAppName, -1, L"/", -1))
+    if (CSTR_EQUAL != ::CompareStringOrdinal(pwzAppName, -1, L"/", -1, TRUE))
     {
         hr = StrAllocConcat(&pwzConfigPath, L"/", 0);
         ExitOnFailure(hr, "failed to copy web error config path delim");
@@ -2340,7 +2340,7 @@ HRESULT IIS7AppExtension(
     //
     //Do not append trailing '/' for default vDir
     //
-    if (CSTR_EQUAL != ::CompareStringW(LOCALE_INVARIANT, NORM_IGNORECASE, pwzWebRoot, -1, L"/", -1))
+    if (CSTR_EQUAL != ::CompareStringOrdinal(pwzWebRoot, -1, L"/", -1, TRUE))
     {
         hr = StrAllocConcat(&pwzConfigPath, L"/", 0);
         ExitOnFailure(hr, "failed to copy appext config path delim");
@@ -2495,7 +2495,7 @@ LExit:
     //
     //Do not append trailing '/' for default vDir
     //
-    if (CSTR_EQUAL != ::CompareStringW(LOCALE_INVARIANT, NORM_IGNORECASE, pwzWebRoot, -1, L"/", -1))
+    if (CSTR_EQUAL != ::CompareStringOrdinal(pwzWebRoot, -1, L"/", -1, TRUE))
     {
         hr = StrAllocConcat(&pwzConfigPath, L"/", 0);
         ExitOnFailure(hr, "failed to copy appext config path delim");
@@ -2627,7 +2627,7 @@ HRESULT IIS7DirProperties(
     //
     //Do not append trailing '/' for default vDir
     //
-    if (CSTR_EQUAL != ::CompareStringW(LOCALE_INVARIANT, NORM_IGNORECASE, pwzWebRoot, -1, L"/", -1))
+    if (CSTR_EQUAL != ::CompareStringOrdinal(pwzWebRoot, -1, L"/", -1, TRUE))
     {
         hr = StrAllocConcat(&pwzConfigPath, L"/", 0);
         ExitOnFailure(hr, "failed to copy appext config path delim");
@@ -3337,7 +3337,7 @@ static HRESULT CreateWebLog(
     ExitOnFailure(hr, "Failed get logfile element");
     ReleaseVariant(vtProp);
 
-    if (CSTR_EQUAL != ::CompareStringW(LOCALE_INVARIANT, NORM_IGNORECASE, pwzFormat, -1, L"none", -1))
+    if (CSTR_EQUAL != ::CompareStringOrdinal(pwzFormat, -1, L"none", -1, TRUE))
     {
         hr = Iis7PutPropertyString(pLogFile, IIS_CONFIG_LOGFORMAT, pwzFormat);
         ExitOnFailure(hr, "Failed set logfile format property");
@@ -4118,7 +4118,7 @@ static HRESULT ClearLocationTag(
         ExitOnFailure(hr, "Failed to get IIS location collection count");
 
         hr = pLocation->get_Path(&bstrLocationPath);
-        if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, NORM_IGNORECASE, swLocationPath, -1, bstrLocationPath, -1))
+        if (CSTR_EQUAL == ::CompareStringOrdinal(swLocationPath, -1, bstrLocationPath, -1, TRUE))
         {
             hr = pLocationCollection->DeleteLocation(vtIndex);
             ExitOnFailure(hr, "Failed to delete IIS location tag %ls",swLocationPath);
diff --git a/src/ext/Iis/ca/scawebappext.cpp b/src/ext/Iis/ca/scawebappext.cpp
index cf3b9dd3..2f74871c 100644
--- a/src/ext/Iis/ca/scawebappext.cpp
+++ b/src/ext/Iis/ca/scawebappext.cpp
@@ -124,7 +124,7 @@ HRESULT ScaWebAppExtensionsWrite(
         }
 
         // if verbs were specified and not the keyword "all"
-        if (pswappext->wzVerbs[0] && CSTR_EQUAL != CompareStringW(LOCALE_INVARIANT, NORM_IGNORECASE, pswappext->wzVerbs, -1, L"all", -1))
+        if (pswappext->wzVerbs[0] && CSTR_EQUAL != CompareStringOrdinal(pswappext->wzVerbs, -1, L"all", -1, TRUE))
         {
             hr = ::StringCchCatW(wzAppExtension, countof(wzAppExtension), L",");
             ExitOnFailure(hr, "Failed to concatenate comma to app extension string");