Fix verutil string comparisons

Invariant string comparisons were finding strings like "abc" to be
less than "-abc". Switching to ordinal comparison correctly reports
the order.

2 files changed, 2 insertions, 2 deletions

diff --git a/src/libs/dutil/WixToolset.DUtil/verutil.cpp b/src/libs/dutil/WixToolset.DUtil/verutil.cpp
index 276441b5..e6ef5039 100644
--- a/src/libs/dutil/WixToolset.DUtil/verutil.cpp
+++ b/src/libs/dutil/WixToolset.DUtil/verutil.cpp
@@ -660,7 +660,7 @@ static HRESULT CompareVersionSubstring(
     HRESULT hr = S_OK;
     int nResult = 0;
 
-    nResult = ::CompareStringW(LOCALE_INVARIANT, NORM_IGNORECASE, wzString1, cchCount1, wzString2, cchCount2);
+    nResult = ::CompareStringOrdinal(wzString1, cchCount1, wzString2, cchCount2, TRUE);
     if (!nResult)
     {
         VerExitOnLastError(hr, "Failed to compare version substrings");
diff --git a/src/libs/dutil/test/DUtilUnitTest/VerUtilTests.cpp b/src/libs/dutil/test/DUtilUnitTest/VerUtilTests.cpp
index f4085c33..3e414006 100644
--- a/src/libs/dutil/test/DUtilUnitTest/VerUtilTests.cpp
+++ b/src/libs/dutil/test/DUtilUnitTest/VerUtilTests.cpp
@@ -606,7 +606,7 @@ namespace DutilTests
 
                 TestVerutilCompareParsedVersions(pVersion1, pVersion2, 1);
                 TestVerutilCompareParsedVersions(pVersion1, pVersion3, 1);
-                TestVerutilCompareParsedVersions(pVersion2, pVersion3, -1);
+                TestVerutilCompareParsedVersions(pVersion2, pVersion3, 1);
             }
             finally
             {