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/ext/Bal/stdbas/WixStandardBootstrapperApplication.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/ext/Bal/stdbas/WixStandardBootstrapperApplication.cpp')
| -rw-r--r-- | src/ext/Bal/stdbas/WixStandardBootstrapperApplication.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/ext/Bal/stdbas/WixStandardBootstrapperApplication.cpp b/src/ext/Bal/stdbas/WixStandardBootstrapperApplication.cpp index 9ddab7c0..6cfe0b4c 100644 --- a/src/ext/Bal/stdbas/WixStandardBootstrapperApplication.cpp +++ b/src/ext/Bal/stdbas/WixStandardBootstrapperApplication.cpp | |||
| @@ -614,7 +614,7 @@ public: // IBootstrapperApplication | |||
| 614 | { | 614 | { |
| 615 | // After restart we need to finish the dependency registration for our package so allow the package | 615 | // After restart we need to finish the dependency registration for our package so allow the package |
| 616 | // to go present. | 616 | // to go present. |
| 617 | if (CSTR_EQUAL == ::CompareStringW(LOCALE_NEUTRAL, 0, wzPackageId, -1, m_sczAfterForcedRestartPackage, -1)) | 617 | if (CSTR_EQUAL == ::CompareStringOrdinal(wzPackageId, -1, m_sczAfterForcedRestartPackage, -1, FALSE)) |
| 618 | { | 618 | { |
| 619 | // Do not allow a repair because that could put us in a perpetual restart loop. | 619 | // Do not allow a repair because that could put us in a perpetual restart loop. |
| 620 | if (BOOTSTRAPPER_REQUEST_STATE_REPAIR == *pRequestState) | 620 | if (BOOTSTRAPPER_REQUEST_STATE_REPAIR == *pRequestState) |
| @@ -3570,7 +3570,7 @@ private: | |||
| 3570 | for (DWORD iAssignControl = 0; iAssignControl < countof(m_rgInitControls); ++iAssignControl) | 3570 | for (DWORD iAssignControl = 0; iAssignControl < countof(m_rgInitControls); ++iAssignControl) |
| 3571 | { | 3571 | { |
| 3572 | THEME_ASSIGN_CONTROL_ID* pAssignControl = m_rgInitControls + iAssignControl; | 3572 | THEME_ASSIGN_CONTROL_ID* pAssignControl = m_rgInitControls + iAssignControl; |
| 3573 | if (CSTR_EQUAL == ::CompareStringW(LOCALE_NEUTRAL, 0, pArgs->pThemeControl->sczName, -1, pAssignControl->wzName, -1)) | 3573 | if (CSTR_EQUAL == ::CompareStringOrdinal(pArgs->pThemeControl->sczName, -1, pAssignControl->wzName, -1, FALSE)) |
| 3574 | { | 3574 | { |
| 3575 | if (!pAssignControl->ppControl) | 3575 | if (!pAssignControl->ppControl) |
| 3576 | { | 3576 | { |
