Skip to content

Use CompareStringOrdinal() instead of CompareString() #660

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
robmen merged 2 commits into from
Nov 3, 2025
Merged

Use CompareStringOrdinal() instead of CompareString() #660

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
af533a3
Use CompareStringOrdinal() instead of CompareString() case-insensitive
robmen Nov 2, 2025
9764857
Use CompareStringOrdinal() instead of CompareString() case-sensitive
robmen Nov 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 19 additions & 19 deletions src/api/burn/balutil/balinfo.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,14 +43,14 @@ DAPI_(HRESULT) BalInfoParseCommandLine(

if (argv[i][0] == L'-' || argv[i][0] == L'/')
{
if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, NORM_IGNORECASE, &argv[i][1], -1, L"norestart", -1))
if (CSTR_EQUAL == ::CompareStringOrdinal(&argv[i][1], -1, L"norestart", -1, TRUE))
{
if (BAL_INFO_RESTART_UNKNOWN == pCommand->restart)
{
pCommand->restart = BAL_INFO_RESTART_NEVER;
}
}
else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, NORM_IGNORECASE, &argv[i][1], -1, L"forcerestart", -1))
else if (CSTR_EQUAL == ::CompareStringOrdinal(&argv[i][1], -1, L"forcerestart", -1, TRUE))
{
if (BAL_INFO_RESTART_UNKNOWN == pCommand->restart)
{
Expand Down Expand Up @@ -190,7 +190,7 @@ DAPI_(HRESULT) BalInfoAddRelatedBundleAsPackage(
// Check to see if the bundle is already in the list of packages.
for (DWORD i = 0; i < pPackages->cPackages; ++i)
{
if (CSTR_EQUAL == ::CompareStringW(LOCALE_NEUTRAL, 0, wzId, -1, pPackages->rgPackages[i].sczId, -1))
if (CSTR_EQUAL == ::CompareStringOrdinal(wzId, -1, pPackages->rgPackages[i].sczId, -1, FALSE))
{
ExitFunction1(hr = HRESULT_FROM_WIN32(ERROR_ALREADY_EXISTS));
}
Expand Down Expand Up @@ -232,7 +232,7 @@ DAPI_(HRESULT) BalInfoAddUpdateBundleAsPackage(
// Check to see if the bundle is already in the list of packages.
for (DWORD i = 0; i < pPackages->cPackages; ++i)
{
if (CSTR_EQUAL == ::CompareStringW(LOCALE_NEUTRAL, 0, wzId, -1, pPackages->rgPackages[i].sczId, -1))
if (CSTR_EQUAL == ::CompareStringOrdinal(wzId, -1, pPackages->rgPackages[i].sczId, -1, FALSE))
{
ExitFunction1(hr = HRESULT_FROM_WIN32(ERROR_ALREADY_EXISTS));
}
Expand Down Expand Up @@ -270,7 +270,7 @@ DAPI_(HRESULT) BalInfoFindPackageById(

for (DWORD i = 0; i < pPackages->cPackages; ++i)
{
if (CSTR_EQUAL == ::CompareStringW(LOCALE_NEUTRAL, 0, wzId, -1, pPackages->rgPackages[i].sczId, -1))
if (CSTR_EQUAL == ::CompareStringOrdinal(wzId, -1, pPackages->rgPackages[i].sczId, -1, FALSE))
{
*ppPackage = pPackages->rgPackages + i;
break;
Expand Down Expand Up @@ -409,23 +409,23 @@ static HRESULT ParsePackagesFromXml(
hr = XmlGetAttributeEx(pNode, L"PackageType", &scz);
ExitOnRequiredXmlQueryFailure(hr, "Failed to get package type for package.");

if (CSTR_EQUAL == ::CompareStringW(LOCALE_NEUTRAL, 0, L"Bundle", -1, scz, -1))
if (CSTR_EQUAL == ::CompareStringOrdinal(L"Bundle", -1, scz, -1, FALSE))
{
prgPackages[iPackage].type = BAL_INFO_PACKAGE_TYPE_BUNDLE_CHAIN;
}
else if (CSTR_EQUAL == ::CompareStringW(LOCALE_NEUTRAL, 0, L"Exe", -1, scz, -1))
else if (CSTR_EQUAL == ::CompareStringOrdinal(L"Exe", -1, scz, -1, FALSE))
{
prgPackages[iPackage].type = BAL_INFO_PACKAGE_TYPE_EXE;
}
else if (CSTR_EQUAL == ::CompareStringW(LOCALE_NEUTRAL, 0, L"Msi", -1, scz, -1))
else if (CSTR_EQUAL == ::CompareStringOrdinal(L"Msi", -1, scz, -1, FALSE))
{
prgPackages[iPackage].type = BAL_INFO_PACKAGE_TYPE_MSI;
}
else if (CSTR_EQUAL == ::CompareStringW(LOCALE_NEUTRAL, 0, L"Msp", -1, scz, -1))
else if (CSTR_EQUAL == ::CompareStringOrdinal(L"Msp", -1, scz, -1, FALSE))
{
prgPackages[iPackage].type = BAL_INFO_PACKAGE_TYPE_MSP;
}
else if (CSTR_EQUAL == ::CompareStringW(LOCALE_NEUTRAL, 0, L"Msu", -1, scz, -1))
else if (CSTR_EQUAL == ::CompareStringOrdinal(L"Msu", -1, scz, -1, FALSE))
{
prgPackages[iPackage].type = BAL_INFO_PACKAGE_TYPE_MSU;
}
Expand Down Expand Up @@ -454,15 +454,15 @@ static HRESULT ParsePackagesFromXml(
hr = XmlGetAttributeEx(pNode, L"Cache", &scz);
ExitOnRequiredXmlQueryFailure(hr, "Failed to get cache type for package.");

if (CSTR_EQUAL == ::CompareStringW(LOCALE_NEUTRAL, 0, scz, -1, L"remove", -1))
if (CSTR_EQUAL == ::CompareStringOrdinal(scz, -1, L"remove", -1, FALSE))
{
prgPackages[iPackage].cacheType = BOOTSTRAPPER_CACHE_TYPE_REMOVE;
}
else if (CSTR_EQUAL == ::CompareStringW(LOCALE_NEUTRAL, 0, scz, -1, L"keep", -1))
else if (CSTR_EQUAL == ::CompareStringOrdinal(scz, -1, L"keep", -1, FALSE))
{
prgPackages[iPackage].cacheType = BOOTSTRAPPER_CACHE_TYPE_KEEP;
}
else if (CSTR_EQUAL == ::CompareStringW(LOCALE_NEUTRAL, 0, scz, -1, L"force", -1))
else if (CSTR_EQUAL == ::CompareStringOrdinal(scz, -1, L"force", -1, FALSE))
{
prgPackages[iPackage].cacheType = BOOTSTRAPPER_CACHE_TYPE_FORCE;
}
Expand Down Expand Up @@ -522,19 +522,19 @@ static HRESULT ParseBalPackageInfoFromXml(

if (fXmlFound)
{
if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, scz, -1, L"default", -1))
if (CSTR_EQUAL == ::CompareStringOrdinal(scz, -1, L"default", -1, FALSE))
{
pPackage->primaryPackageType = BAL_INFO_PRIMARY_PACKAGE_TYPE_DEFAULT;
}
else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, scz, -1, L"x86", -1))
else if (CSTR_EQUAL == ::CompareStringOrdinal(scz, -1, L"x86", -1, FALSE))
{
pPackage->primaryPackageType = BAL_INFO_PRIMARY_PACKAGE_TYPE_X86;
}
else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, scz, -1, L"x64", -1))
else if (CSTR_EQUAL == ::CompareStringOrdinal(scz, -1, L"x64", -1, FALSE))
{
pPackage->primaryPackageType = BAL_INFO_PRIMARY_PACKAGE_TYPE_X64;
}
else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, scz, -1, L"arm64", -1))
else if (CSTR_EQUAL == ::CompareStringOrdinal(scz, -1, L"arm64", -1, FALSE))
{
pPackage->primaryPackageType = BAL_INFO_PRIMARY_PACKAGE_TYPE_ARM64;
}
Expand Down Expand Up @@ -611,11 +611,11 @@ static HRESULT ParseOverridableVariablesFromXml(
hr = XmlGetAttributeEx(pCommandLineNode, L"VariableType", &scz);
ExitOnRequiredXmlQueryFailure(hr, "Failed to get command line variable type.");

if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, scz, -1, L"caseInsensitive", -1))
if (CSTR_EQUAL == ::CompareStringOrdinal(scz, -1, L"caseInsensitive", -1, FALSE))
{
pOverridableVariables->commandLineType = BAL_INFO_VARIABLE_COMMAND_LINE_TYPE_CASE_INSENSITIVE;
}
else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, scz, -1, L"caseSensitive", -1))
else if (CSTR_EQUAL == ::CompareStringOrdinal(scz, -1, L"caseSensitive", -1, FALSE))
{
pOverridableVariables->commandLineType = BAL_INFO_VARIABLE_COMMAND_LINE_TYPE_CASE_SENSITIVE;
}
Expand Down
2 changes: 1 addition & 1 deletion src/api/burn/balutil/balretry.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ static BOOL IsActiveRetryEntry(
{
BOOL fActive = FALSE;

fActive = vrgRetryInfo[type].sczId && CSTR_EQUAL == ::CompareStringW(LOCALE_NEUTRAL, 0, sczId, -1, vrgRetryInfo[type].sczId, -1);
fActive = vrgRetryInfo[type].sczId && CSTR_EQUAL == ::CompareStringOrdinal(sczId, -1, vrgRetryInfo[type].sczId, -1, FALSE);

return fActive;
}
Expand Down
2 changes: 1 addition & 1 deletion src/api/burn/bextutil/bextutil.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ DAPI_(HRESULT) BextGetBootstrapperExtensionDataNode(
hr = XmlGetAttributeEx(pixnNode, L"Id", &sczId);
ExitOnRequiredXmlQueryFailure(hr, "Failed to get @Id.");

if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, sczId, -1, wzExtensionId, -1))
if (CSTR_EQUAL == ::CompareStringOrdinal(sczId, -1, wzExtensionId, -1, FALSE))
{
*ppixnBootstrapperExtension = pixnNode;
pixnNode = NULL;
Expand Down
2 changes: 1 addition & 1 deletion src/burn/engine/approvedexe.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ extern "C" HRESULT ApprovedExesFindById(
{
pApprovedExe = &pApprovedExes->rgApprovedExes[i];

if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, pApprovedExe->sczId, -1, wzId, -1))
if (CSTR_EQUAL == ::CompareStringOrdinal(pApprovedExe->sczId, -1, wzId, -1, FALSE))
{
*ppApprovedExe = pApprovedExe;
ExitFunction1(hr = S_OK);
Expand Down
10 changes: 5 additions & 5 deletions src/burn/engine/bundlepackageengine.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ extern "C" HRESULT BundlePackageEngineParseRelatedCodes(
hr = XmlGetAttributeEx(pixnElement, L"Code", &sczCode);
ExitOnFailure(hr, "Failed to get @Code.");

if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, sczAction, -1, L"Detect", -1))
if (CSTR_EQUAL == ::CompareStringOrdinal(sczAction, -1, L"Detect", -1, FALSE))
{
hr = MemEnsureArraySizeForNewItems(reinterpret_cast<LPVOID*>(prgsczDetectCodes), *pcDetectCodes, 1, sizeof(LPWSTR), 5);
ExitOnFailure(hr, "Failed to resize Detect code array");
Expand All @@ -155,7 +155,7 @@ extern "C" HRESULT BundlePackageEngineParseRelatedCodes(
sczCode = NULL;
*pcDetectCodes += 1;
}
else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, sczAction, -1, L"Upgrade", -1))
else if (CSTR_EQUAL == ::CompareStringOrdinal(sczAction, -1, L"Upgrade", -1, FALSE))
{
hr = MemEnsureArraySizeForNewItems(reinterpret_cast<LPVOID*>(prgsczUpgradeCodes), *pcUpgradeCodes, 1, sizeof(LPWSTR), 5);
ExitOnFailure(hr, "Failed to resize Upgrade code array");
Expand All @@ -164,7 +164,7 @@ extern "C" HRESULT BundlePackageEngineParseRelatedCodes(
sczCode = NULL;
*pcUpgradeCodes += 1;
}
else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, sczAction, -1, L"Addon", -1))
else if (CSTR_EQUAL == ::CompareStringOrdinal(sczAction, -1, L"Addon", -1, FALSE))
{
hr = MemEnsureArraySizeForNewItems(reinterpret_cast<LPVOID*>(prgsczAddonCodes), *pcAddonCodes, 1, sizeof(LPWSTR), 5);
ExitOnFailure(hr, "Failed to resize Addon code array");
Expand All @@ -173,7 +173,7 @@ extern "C" HRESULT BundlePackageEngineParseRelatedCodes(
sczCode = NULL;
*pcAddonCodes += 1;
}
else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, sczAction, -1, L"Patch", -1))
else if (CSTR_EQUAL == ::CompareStringOrdinal(sczAction, -1, L"Patch", -1, FALSE))
{
hr = MemEnsureArraySizeForNewItems(reinterpret_cast<LPVOID*>(prgsczPatchCodes), *pcPatchCodes, 1, sizeof(LPWSTR), 5);
ExitOnFailure(hr, "Failed to resize Patch code array");
Expand Down Expand Up @@ -686,7 +686,7 @@ static BUNDLE_QUERY_CALLBACK_RESULT CALLBACK QueryRelatedBundlesCallback(
BOOTSTRAPPER_RELATION_TYPE relationType = RelatedBundleConvertRelationType(pBundle->relationType);
BOOL fPerMachine = BUNDLE_INSTALL_CONTEXT_MACHINE == pBundle->installContext;

if (CSTR_EQUAL == ::CompareStringW(LOCALE_NEUTRAL, NORM_IGNORECASE, pBundle->wzBundleCode, -1, pPackage->Bundle.sczBundleCode, -1) &&
if (CSTR_EQUAL == ::CompareStringOrdinal(pBundle->wzBundleCode, -1, pPackage->Bundle.sczBundleCode, -1, TRUE) &&
pPackage->Bundle.fWin64 == (REG_KEY_64BIT == pBundle->regBitness))
{
Assert(BOOTSTRAPPER_RELATION_UPGRADE == relationType);
Expand Down
2 changes: 1 addition & 1 deletion src/burn/engine/burnextension.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ EXTERN_C HRESULT BurnExtensionFindById(
{
pExtension = &pBurnExtensions->rgExtensions[i];

if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, pExtension->sczId, -1, wzId, -1))
if (CSTR_EQUAL == ::CompareStringOrdinal(pExtension->sczId, -1, wzId, -1, FALSE))
{
*ppExtension = pExtension;
ExitFunction1(hr = S_OK);
Expand Down
2 changes: 1 addition & 1 deletion src/burn/engine/burnpipe.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -515,7 +515,7 @@ static HRESULT ChildPipeConnected(
ExitOnFailure(hr, "Failed to read verification secret from parent pipe.");

// Verify the secrets match.
if (CSTR_EQUAL != ::CompareStringW(LOCALE_NEUTRAL, 0, sczVerificationSecret, -1, wzSecret, -1))
if (CSTR_EQUAL != ::CompareStringOrdinal(sczVerificationSecret, -1, wzSecret, -1, FALSE))
{
hr = HRESULT_FROM_WIN32(ERROR_INVALID_DATA);
ExitOnRootFailure(hr, "Verification secret from parent does not match.");
Expand Down
10 changes: 5 additions & 5 deletions src/burn/engine/cache.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -619,8 +619,8 @@ extern "C" HRESULT CacheGetLocalSourcePaths(

hr = GetLastUsedSourceFolder(pVariables, &sczLastSourceFolder);
fPreferSourcePathLocation = !pCache->fRunningFromCache || FAILED(hr);
fTryLastFolder = SUCCEEDED(hr) && sczLastSourceFolder && *sczLastSourceFolder && CSTR_EQUAL != ::CompareStringW(LOCALE_NEUTRAL, NORM_IGNORECASE, pCache->sczSourceProcessFolder, -1, sczLastSourceFolder, -1);
fTryRelativePath = CSTR_EQUAL != ::CompareStringW(LOCALE_NEUTRAL, NORM_IGNORECASE, wzSourcePath, -1, wzRelativePath, -1);
fTryLastFolder = SUCCEEDED(hr) && sczLastSourceFolder && *sczLastSourceFolder && CSTR_EQUAL != ::CompareStringOrdinal(pCache->sczSourceProcessFolder, -1, sczLastSourceFolder, -1, TRUE);
fTryRelativePath = CSTR_EQUAL != ::CompareStringOrdinal(wzSourcePath, -1, wzRelativePath, -1, TRUE);
fSourceIsAbsolute = PathIsRooted(wzSourcePath);

// If the source path provided is a full path, try that first.
Expand Down Expand Up @@ -797,15 +797,15 @@ extern "C" HRESULT CacheSetLastUsedSource(

// If the source path ends with the relative path then this source could be a new path.
iSourceRelativePath = cchSourcePath - cchRelativePath;
if (CSTR_EQUAL == ::CompareStringW(LOCALE_NEUTRAL, NORM_IGNORECASE, wzSourcePath + iSourceRelativePath, -1, wzRelativePath, -1))
if (CSTR_EQUAL == ::CompareStringOrdinal(wzSourcePath + iSourceRelativePath, -1, wzRelativePath, -1, TRUE))
{
hr = StrAllocString(&sczSourceFolder, wzSourcePath, iSourceRelativePath);
ExitOnFailure(hr, "Failed to trim source folder.");

hr = VariableGetString(pVariables, BURN_BUNDLE_LAST_USED_SOURCE, &sczLastSourceFolder);
if (SUCCEEDED(hr))
{
nCompare = ::CompareStringW(LOCALE_NEUTRAL, NORM_IGNORECASE, sczSourceFolder, -1, sczLastSourceFolder, -1);
nCompare = ::CompareStringOrdinal(sczSourceFolder, -1, sczLastSourceFolder, -1, TRUE);
}
else if (E_NOTFOUND == hr)
{
Expand Down Expand Up @@ -1031,7 +1031,7 @@ extern "C" HRESULT CacheCompleteBundle(
ExitOnFailure(hr, "Failed to combine completed path with engine file name.");

// We can't just use wzExecutablePath because we needed to call CreateCompletedPath to ensure that the destination was secured.
Assert(CSTR_EQUAL == ::CompareStringW(LOCALE_NEUTRAL, NORM_IGNORECASE, wzExecutablePath, -1, sczTargetPath, -1));
Assert(CSTR_EQUAL == ::CompareStringOrdinal(wzExecutablePath, -1, sczTargetPath, -1, TRUE));

// If the bundle is running out of the package cache then we don't need to copy it there
// (and don't want to since it'll be in use) so bail.
Expand Down
16 changes: 8 additions & 8 deletions src/burn/engine/condition.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand All @@ -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();
Expand All @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion src/burn/engine/container.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -400,7 +400,7 @@ extern "C" HRESULT ContainerFindById(
{
pContainer = &pContainers->rgContainers[i];

if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, pContainer->sczId, -1, wzId, -1))
if (CSTR_EQUAL == ::CompareStringOrdinal(pContainer->sczId, -1, wzId, -1, FALSE))
{
*ppContainer = pContainer;
ExitFunction1(hr = S_OK);
Expand Down
Loading