diff options
| author | Rob Mensching <rob@firegiant.com> | 2025-11-01 20:24:25 -0700 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2025-11-03 14:49:39 -0800 |
| commit | 4d626c294c4783d454e27ea4e5614037dac8576e (patch) | |
| tree | 51d822f48716e4c5ef2a51ca28925896f221b521 /src/ext/VisualStudio | |
| parent | 33c12fa386aa7ace7a6bd06a45bc3ecf17e9c8f5 (diff) | |
| download | wix-4d626c294c4783d454e27ea4e5614037dac8576e.tar.gz wix-4d626c294c4783d454e27ea4e5614037dac8576e.tar.bz2 wix-4d626c294c4783d454e27ea4e5614037dac8576e.zip | |
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
Diffstat (limited to 'src/ext/VisualStudio')
| -rw-r--r-- | src/ext/VisualStudio/ca/vsca.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/ext/VisualStudio/ca/vsca.cpp b/src/ext/VisualStudio/ca/vsca.cpp index 736add1f..681187d6 100644 --- a/src/ext/VisualStudio/ca/vsca.cpp +++ b/src/ext/VisualStudio/ca/vsca.cpp | |||
| @@ -219,7 +219,7 @@ static HRESULT InstanceInProducts( | |||
| 219 | { | 219 | { |
| 220 | const LPCWSTR wzProduct = rgwzProducts[i]; | 220 | const LPCWSTR wzProduct = rgwzProducts[i]; |
| 221 | 221 | ||
| 222 | if (CSTR_EQUAL == ::CompareStringW(LOCALE_NEUTRAL, NORM_IGNORECASE, bstrId, -1, wzProduct, -1)) | 222 | if (CSTR_EQUAL == ::CompareStringOrdinal(bstrId, -1, wzProduct, -1, TRUE)) |
| 223 | { | 223 | { |
| 224 | hr = S_OK; | 224 | hr = S_OK; |
| 225 | ExitFunction(); | 225 | ExitFunction(); |
| @@ -579,7 +579,7 @@ static HRESULT SetPropertyForComponent( | |||
| 579 | { | 579 | { |
| 580 | const VS_COMPONENT_PROPERTY* pComponent = &rgComponents[i]; | 580 | const VS_COMPONENT_PROPERTY* pComponent = &rgComponents[i]; |
| 581 | 581 | ||
| 582 | if (CSTR_EQUAL == ::CompareStringW(LOCALE_NEUTRAL, NORM_IGNORECASE, pComponent->pwzComponent, -1, wzComponent, -1)) | 582 | if (CSTR_EQUAL == ::CompareStringOrdinal(pComponent->pwzComponent, -1, wzComponent, -1, TRUE)) |
| 583 | { | 583 | { |
| 584 | hr = WcaSetIntProperty(pComponent->pwzProperty, 1); | 584 | hr = WcaSetIntProperty(pComponent->pwzProperty, 1); |
| 585 | ExitOnFailure(hr, "Failed to set property: %ls", pComponent->pwzProperty); | 585 | ExitOnFailure(hr, "Failed to set property: %ls", pComponent->pwzProperty); |
