aboutsummaryrefslogtreecommitdiff
path: root/src/libs/dutil/WixToolset.DUtil/locutil.cpp
diff options
context:
space:
mode:
authorRob Mensching <rob@firegiant.com>2025-11-01 21:52:31 -0700
committerRob Mensching <rob@firegiant.com>2025-11-03 14:49:39 -0800
commitd2ba0da55725f2908b67e1470afc7cfd71cb3d1f (patch)
treec2a1db61c5fac031c698976106bba2c453d85ded /src/libs/dutil/WixToolset.DUtil/locutil.cpp
parent4d626c294c4783d454e27ea4e5614037dac8576e (diff)
downloadwix-d2ba0da55725f2908b67e1470afc7cfd71cb3d1f.tar.gz
wix-d2ba0da55725f2908b67e1470afc7cfd71cb3d1f.tar.bz2
wix-d2ba0da55725f2908b67e1470afc7cfd71cb3d1f.zip
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
Diffstat (limited to 'src/libs/dutil/WixToolset.DUtil/locutil.cpp')
-rw-r--r--src/libs/dutil/WixToolset.DUtil/locutil.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libs/dutil/WixToolset.DUtil/locutil.cpp b/src/libs/dutil/WixToolset.DUtil/locutil.cpp
index 008d0367..0e897186 100644
--- a/src/libs/dutil/WixToolset.DUtil/locutil.cpp
+++ b/src/libs/dutil/WixToolset.DUtil/locutil.cpp
@@ -315,7 +315,7 @@ extern "C" HRESULT DAPI LocGetControl(
315 { 315 {
316 pLocControl = &pWixLoc->rgLocControls[i]; 316 pLocControl = &pWixLoc->rgLocControls[i];
317 317
318 if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, pLocControl->wzControl, -1, wzId, -1)) 318 if (CSTR_EQUAL == ::CompareStringOrdinal(pLocControl->wzControl, -1, wzId, -1, FALSE))
319 { 319 {
320 *ppLocControl = pLocControl; 320 *ppLocControl = pLocControl;
321 ExitFunction1(hr = S_OK); 321 ExitFunction1(hr = S_OK);
@@ -341,7 +341,7 @@ extern "C" HRESULT DAPI LocGetString(
341 { 341 {
342 pLocString = pWixLoc->rgLocStrings + i; 342 pLocString = pWixLoc->rgLocStrings + i;
343 343
344 if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, pLocString->wzId, -1, wzId, -1)) 344 if (CSTR_EQUAL == ::CompareStringOrdinal(pLocString->wzId, -1, wzId, -1, FALSE))
345 { 345 {
346 *ppLocString = pLocString; 346 *ppLocString = pLocString;
347 hr = S_OK; 347 hr = S_OK;
@@ -555,7 +555,7 @@ static HRESULT ParseWxlString(
555 555
556 if (S_OK == hr) 556 if (S_OK == hr)
557 { 557 {
558 pLocString->bOverridable = CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, bstrText, -1, L"yes", -1); 558 pLocString->bOverridable = CSTR_EQUAL == ::CompareStringOrdinal(bstrText, -1, L"yes", -1, FALSE);
559 } 559 }
560 560
561 ReleaseNullBSTR(bstrText); 561 ReleaseNullBSTR(bstrText);