diff options
| author | Rob Mensching <rob@firegiant.com> | 2025-11-01 21:52:31 -0700 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2025-11-03 14:49:39 -0800 |
| commit | d2ba0da55725f2908b67e1470afc7cfd71cb3d1f (patch) | |
| tree | c2a1db61c5fac031c698976106bba2c453d85ded /src/burn/engine/exeengine.cpp | |
| parent | 4d626c294c4783d454e27ea4e5614037dac8576e (diff) | |
| download | wix-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/burn/engine/exeengine.cpp')
| -rw-r--r-- | src/burn/engine/exeengine.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/burn/engine/exeengine.cpp b/src/burn/engine/exeengine.cpp index 3a2816dd..4df762da 100644 --- a/src/burn/engine/exeengine.cpp +++ b/src/burn/engine/exeengine.cpp | |||
| @@ -25,15 +25,15 @@ extern "C" HRESULT ExeEngineParsePackageFromXml( | |||
| 25 | hr = XmlGetAttributeEx(pixnExePackage, L"DetectionType", &scz); | 25 | hr = XmlGetAttributeEx(pixnExePackage, L"DetectionType", &scz); |
| 26 | ExitOnRequiredXmlQueryFailure(hr, "Failed to get @DetectionType."); | 26 | ExitOnRequiredXmlQueryFailure(hr, "Failed to get @DetectionType."); |
| 27 | 27 | ||
| 28 | if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, scz, -1, L"condition", -1)) | 28 | if (CSTR_EQUAL == ::CompareStringOrdinal(scz, -1, L"condition", -1, FALSE)) |
| 29 | { | 29 | { |
| 30 | pPackage->Exe.detectionType = BURN_EXE_DETECTION_TYPE_CONDITION; | 30 | pPackage->Exe.detectionType = BURN_EXE_DETECTION_TYPE_CONDITION; |
| 31 | } | 31 | } |
| 32 | else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, scz, -1, L"arp", -1)) | 32 | else if (CSTR_EQUAL == ::CompareStringOrdinal(scz, -1, L"arp", -1, FALSE)) |
| 33 | { | 33 | { |
| 34 | pPackage->Exe.detectionType = BURN_EXE_DETECTION_TYPE_ARP; | 34 | pPackage->Exe.detectionType = BURN_EXE_DETECTION_TYPE_ARP; |
| 35 | } | 35 | } |
| 36 | else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, scz, -1, L"none", -1)) | 36 | else if (CSTR_EQUAL == ::CompareStringOrdinal(scz, -1, L"none", -1, FALSE)) |
| 37 | { | 37 | { |
| 38 | pPackage->Exe.detectionType = BURN_EXE_DETECTION_TYPE_NONE; | 38 | pPackage->Exe.detectionType = BURN_EXE_DETECTION_TYPE_NONE; |
| 39 | } | 39 | } |
| @@ -114,15 +114,15 @@ extern "C" HRESULT ExeEngineParsePackageFromXml( | |||
| 114 | 114 | ||
| 115 | if (fFoundXml) | 115 | if (fFoundXml) |
| 116 | { | 116 | { |
| 117 | if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, scz, -1, L"burn", -1)) | 117 | if (CSTR_EQUAL == ::CompareStringOrdinal(scz, -1, L"burn", -1, FALSE)) |
| 118 | { | 118 | { |
| 119 | pPackage->Exe.protocol = BURN_EXE_PROTOCOL_TYPE_BURN; | 119 | pPackage->Exe.protocol = BURN_EXE_PROTOCOL_TYPE_BURN; |
| 120 | } | 120 | } |
| 121 | else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, scz, -1, L"netfx4", -1)) | 121 | else if (CSTR_EQUAL == ::CompareStringOrdinal(scz, -1, L"netfx4", -1, FALSE)) |
| 122 | { | 122 | { |
| 123 | pPackage->Exe.protocol = BURN_EXE_PROTOCOL_TYPE_NETFX4; | 123 | pPackage->Exe.protocol = BURN_EXE_PROTOCOL_TYPE_NETFX4; |
| 124 | } | 124 | } |
| 125 | else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, scz, -1, L"none", -1)) | 125 | else if (CSTR_EQUAL == ::CompareStringOrdinal(scz, -1, L"none", -1, FALSE)) |
| 126 | { | 126 | { |
| 127 | pPackage->Exe.protocol = BURN_EXE_PROTOCOL_TYPE_NONE; | 127 | pPackage->Exe.protocol = BURN_EXE_PROTOCOL_TYPE_NONE; |
| 128 | } | 128 | } |
