From 4d626c294c4783d454e27ea4e5614037dac8576e Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Sat, 1 Nov 2025 20:24:25 -0700 Subject: 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 --- src/burn/engine/relatedbundle.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/burn/engine/relatedbundle.cpp') diff --git a/src/burn/engine/relatedbundle.cpp b/src/burn/engine/relatedbundle.cpp index 938b24d7..d426dc53 100644 --- a/src/burn/engine/relatedbundle.cpp +++ b/src/burn/engine/relatedbundle.cpp @@ -206,7 +206,7 @@ static __callback int __cdecl CompareRelatedBundlesDetect( VerCompareParsedVersions(pBundleLeft->pVersion, pBundleRight->pVersion, &ret); if (0 == ret) { - ret = ::CompareStringW(LOCALE_INVARIANT, NORM_IGNORECASE, pBundleLeft->package.sczId, -1, pBundleRight->package.sczId, -1) - 2; + ret = ::CompareStringOrdinal(pBundleLeft->package.sczId, -1, pBundleRight->package.sczId, -1, TRUE) - 2; } } @@ -249,7 +249,7 @@ static __callback int __cdecl CompareRelatedBundlesPlan( VerCompareParsedVersions(pBundleLeft->pVersion, pBundleRight->pVersion, &ret); if (0 == ret) { - ret = ::CompareStringW(LOCALE_INVARIANT, NORM_IGNORECASE, pBundleLeft->package.sczId, -1, pBundleRight->package.sczId, -1) - 2; + ret = ::CompareStringOrdinal(pBundleLeft->package.sczId, -1, pBundleRight->package.sczId, -1, TRUE) - 2; } } @@ -284,7 +284,7 @@ static HRESULT LoadIfRelatedBundle( BURN_RELATED_BUNDLE* pRelatedBundle = NULL; // If we found our bundle code, it's not a related bundle. - if (CSTR_EQUAL == ::CompareStringW(LOCALE_NEUTRAL, NORM_IGNORECASE, pBundle->wzBundleCode, -1, pRegistration->sczCode, -1)) + if (CSTR_EQUAL == ::CompareStringOrdinal(pBundle->wzBundleCode, -1, pRegistration->sczCode, -1, TRUE)) { ExitFunction1(hr = S_FALSE); } -- cgit v1.2.3-55-g6feb