1 files changed, 8 insertions, 8 deletions

diff --git a/src/burn/engine/condition.cpp b/src/burn/engine/condition.cpp
index 8fa62f16..3719ce79 100644
--- a/src/burn/engine/condition.cpp
+++ b/src/burn/engine/condition.cpp
@@ -740,17 +740,17 @@ static HRESULT NextSymbol(
                     ::GetStringTypeW(CT_CTYPE1, &pContext->wzRead[n], 1, &charType);
                 } while (C1_ALPHA & charType || C1_DIGIT & charType || L'_' == pContext->wzRead[n]);
 
-                if (2 == n && CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, NORM_IGNORECASE, pContext->wzRead, 2, L"OR", 2))
+                if (2 == n && CSTR_EQUAL == ::CompareStringOrdinal(pContext->wzRead, 2, L"OR", 2, TRUE))
                 {
                     // OR
                     pContext->NextSymbol.Type = BURN_SYMBOL_TYPE_OR;
                 }
-                else if (3 == n && CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, NORM_IGNORECASE, pContext->wzRead, 3, L"AND", 3))
+                else if (3 == n && CSTR_EQUAL == ::CompareStringOrdinal(pContext->wzRead, 3, L"AND", 3, TRUE))
                 {
                     // AND
                     pContext->NextSymbol.Type = BURN_SYMBOL_TYPE_AND;
                 }
-                else if (3 == n && CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, NORM_IGNORECASE, pContext->wzRead, 3, L"NOT", 3))
+                else if (3 == n && CSTR_EQUAL == ::CompareStringOrdinal(pContext->wzRead, 3, L"NOT", 3, TRUE))
                 {
                     // NOT
                     pContext->NextSymbol.Type = BURN_SYMBOL_TYPE_NOT;
@@ -928,7 +928,7 @@ static HRESULT CompareStringValues(
     )
 {
     HRESULT hr = S_OK;
-    DWORD dwCompareString = (comparison & INSENSITIVE) ? NORM_IGNORECASE : 0;
+    BOOL fIgnoreCase = (comparison & INSENSITIVE) ? TRUE : FALSE;
     size_t cchLeftSize = 0;
     size_t cchRightSize = 0;
     int cchLeft = 0;
@@ -958,7 +958,7 @@ static HRESULT CompareStringValues(
     case BURN_SYMBOL_TYPE_EQ_I:
     case BURN_SYMBOL_TYPE_NE_I:
         {
-            int i = ::CompareStringW(LOCALE_INVARIANT, dwCompareString, wzLeftOperand, cchLeft, wzRightOperand, cchRight);
+            int i = ::CompareStringOrdinal(wzLeftOperand, cchLeft, wzRightOperand, cchRight, fIgnoreCase);
             hr = CompareIntegerValues(comparison, i, CSTR_EQUAL, pfResult);
         }
         break;
@@ -967,7 +967,7 @@ static HRESULT CompareStringValues(
         // test if left string contains right string
         for (int i = 0; (i + cchRight) <= cchLeft; ++i)
         {
-            if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, dwCompareString, wzLeftOperand + i, cchRight, wzRightOperand, cchRight))
+            if (CSTR_EQUAL == ::CompareStringOrdinal(wzLeftOperand + i, cchRight, wzRightOperand, cchRight, fIgnoreCase))
             {
                 *pfResult = TRUE;
                 ExitFunction();
@@ -978,12 +978,12 @@ static HRESULT CompareStringValues(
     case BURN_SYMBOL_TYPE_HIEQ:
     case BURN_SYMBOL_TYPE_HIEQ_I:
         // test if left string starts with right string
-        *pfResult = cchLeft >= cchRight && CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, dwCompareString, wzLeftOperand, cchRight, wzRightOperand, cchRight);
+        *pfResult = cchLeft >= cchRight && CSTR_EQUAL == ::CompareStringOrdinal(wzLeftOperand, cchRight, wzRightOperand, cchRight, fIgnoreCase);
         break;
     case BURN_SYMBOL_TYPE_LOEQ:
     case BURN_SYMBOL_TYPE_LOEQ_I:
         // test if left string ends with right string
-        *pfResult = cchLeft >= cchRight && CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, dwCompareString, wzLeftOperand + (cchLeft - cchRight), cchRight, wzRightOperand, cchRight);
+        *pfResult = cchLeft >= cchRight && CSTR_EQUAL == ::CompareStringOrdinal(wzLeftOperand + (cchLeft - cchRight), cchRight, wzRightOperand, cchRight, fIgnoreCase);
         break;
     default:
         ExitFunction1(hr = E_INVALIDARG);