28 files changed, 948 insertions, 714 deletions

diff --git a/src/libs/dutil/WixToolset.DUtil/acl2util.cpp b/src/libs/dutil/WixToolset.DUtil/acl2util.cpp
index 598f12e7..e62a03d4 100644
--- a/src/libs/dutil/WixToolset.DUtil/acl2util.cpp
+++ b/src/libs/dutil/WixToolset.DUtil/acl2util.cpp
@@ -106,7 +106,7 @@ extern "C" HRESULT DAPI AclGetAccountSidStringEx(
             HRESULT hrLength = ::StringCchLengthW(wzAccount, STRSAFE_MAX_CCH, reinterpret_cast<size_t*>(&cchAccount));
             AclExitOnFailure(hrLength, "Failed to get the length of the account name.");
 
-            if (11 < cchAccount && CSTR_EQUAL == CompareStringW(LOCALE_NEUTRAL, NORM_IGNORECASE, L"NT SERVICE\\", 11, wzAccount, 11))
+            if (11 < cchAccount && CSTR_EQUAL == CompareStringOrdinal(L"NT SERVICE\\", 11, wzAccount, 11, TRUE))
             {
                 // If the service is not installed then LookupAccountName doesn't resolve the SID, but we can calculate it.
                 LPCWSTR wzServiceName = &wzAccount[11];
diff --git a/src/libs/dutil/WixToolset.DUtil/apuputil.cpp b/src/libs/dutil/WixToolset.DUtil/apuputil.cpp
index eb96d515..848aac15 100644
--- a/src/libs/dutil/WixToolset.DUtil/apuputil.cpp
+++ b/src/libs/dutil/WixToolset.DUtil/apuputil.cpp
@@ -70,16 +70,16 @@ extern "C" HRESULT DAPI ApupAllocChainFromAtom(
     // First search the ATOM feed's custom elements to try and find the default application identity.
     for (ATOM_UNKNOWN_ELEMENT* pElement = pFeed->pUnknownElements; pElement; pElement = pElement->pNext)
     {
-        if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, pElement->wzNamespace, -1, APPLICATION_SYNDICATION_NAMESPACE, -1))
+        if (CSTR_EQUAL == ::CompareStringOrdinal(pElement->wzNamespace, -1, APPLICATION_SYNDICATION_NAMESPACE, -1, FALSE))
         {
-            if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, pElement->wzElement, -1, L"application", -1))
+            if (CSTR_EQUAL == ::CompareStringOrdinal(pElement->wzElement, -1, L"application", -1, FALSE))
             {
                 hr = StrAllocString(&pChain->wzDefaultApplicationId, pElement->wzValue, 0);
                 ApupExitOnFailure(hr, "Failed to allocate default application id.");
 
                 for (ATOM_UNKNOWN_ATTRIBUTE* pAttribute = pElement->pAttributes; pAttribute; pAttribute = pAttribute->pNext)
                 {
-                    if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, pAttribute->wzAttribute, -1, L"type", -1))
+                    if (CSTR_EQUAL == ::CompareStringOrdinal(pAttribute->wzAttribute, -1, L"type", -1, FALSE))
                     {
                         hr = StrAllocString(&pChain->wzDefaultApplicationType, pAttribute->wzValue, 0);
                         ApupExitOnFailure(hr, "Failed to allocate default application type.");
@@ -112,7 +112,7 @@ extern "C" HRESULT DAPI ApupAllocChainFromAtom(
     }
 
     // Trim the unused entries from the end, if any of the entries failed to parse or validate
-    if (pChain->cEntries != pFeed->cEntries) 
+    if (pChain->cEntries != pFeed->cEntries)
     {
         if (pChain->cEntries > 0)
         {
@@ -213,44 +213,44 @@ static HRESULT ProcessEntry(
     // First search the ATOM entry's custom elements to try and find the application update information.
     for (ATOM_UNKNOWN_ELEMENT* pElement = pAtomEntry->pUnknownElements; pElement; pElement = pElement->pNext)
     {
-        if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, pElement->wzNamespace, -1, APPLICATION_SYNDICATION_NAMESPACE, -1))
+        if (CSTR_EQUAL == ::CompareStringOrdinal(pElement->wzNamespace, -1, APPLICATION_SYNDICATION_NAMESPACE, -1, FALSE))
         {
-            if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, pElement->wzElement, -1, L"application", -1))
+            if (CSTR_EQUAL == ::CompareStringOrdinal(pElement->wzElement, -1, L"application", -1, FALSE))
             {
                 hr = StrAllocString(&pApupEntry->wzApplicationId, pElement->wzValue, 0);
                 ApupExitOnFailure(hr, "Failed to allocate application identity.");
 
                 for (ATOM_UNKNOWN_ATTRIBUTE* pAttribute = pElement->pAttributes; pAttribute; pAttribute = pAttribute->pNext)
                 {
-                    if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, pAttribute->wzAttribute, -1, L"type", -1))
+                    if (CSTR_EQUAL == ::CompareStringOrdinal(pAttribute->wzAttribute, -1, L"type", -1, FALSE))
                     {
                         hr = StrAllocString(&pApupEntry->wzApplicationType, pAttribute->wzValue, 0);
                         ApupExitOnFailure(hr, "Failed to allocate application type.");
                     }
                 }
             }
-            else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, pElement->wzElement, -1, L"upgrade", -1))
+            else if (CSTR_EQUAL == ::CompareStringOrdinal(pElement->wzElement, -1, L"upgrade", -1, FALSE))
             {
                 hr = StrAllocString(&pApupEntry->wzUpgradeId, pElement->wzValue, 0);
                 ApupExitOnFailure(hr, "Failed to allocate upgrade id.");
 
                 for (ATOM_UNKNOWN_ATTRIBUTE* pAttribute = pElement->pAttributes; pAttribute; pAttribute = pAttribute->pNext)
                 {
-                    if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, pAttribute->wzAttribute, -1, L"version", -1))
+                    if (CSTR_EQUAL == ::CompareStringOrdinal(pAttribute->wzAttribute, -1, L"version", -1, FALSE))
                     {
                         hr = VerParseVersion(pAttribute->wzValue, 0, FALSE, &pApupEntry->pUpgradeVersion);
                         ApupExitOnFailure(hr, "Failed to parse upgrade version string '%ls' from ATOM entry.", pAttribute->wzValue);
                     }
-                    else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, pAttribute->wzAttribute, -1, L"exclusive", -1))
+                    else if (CSTR_EQUAL == ::CompareStringOrdinal(pAttribute->wzAttribute, -1, L"exclusive", -1, FALSE))
                     {
-                        if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, pAttribute->wzValue, -1, L"true", -1))
+                        if (CSTR_EQUAL == ::CompareStringOrdinal(pAttribute->wzValue, -1, L"true", -1, FALSE))
                         {
                             pApupEntry->fUpgradeExclusive = TRUE;
                         }
                     }
                 }
             }
-            else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, pElement->wzElement, -1, L"version", -1))
+            else if (CSTR_EQUAL == ::CompareStringOrdinal(pElement->wzElement, -1, L"version", -1, FALSE))
             {
                 hr = VerParseVersion(pElement->wzValue, 0, FALSE, &pApupEntry->pVersion);
                 ApupExitOnFailure(hr, "Failed to parse version string '%ls' from ATOM entry.", pElement->wzValue);
@@ -309,7 +309,7 @@ static HRESULT ProcessEntry(
     for (DWORD i = 0; i < pAtomEntry->cLinks; ++i)
     {
         ATOM_LINK* pLink = pAtomEntry->rgLinks + i;
-        if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, pLink->wzRel, -1, L"enclosure", -1))
+        if (CSTR_EQUAL == ::CompareStringOrdinal(pLink->wzRel, -1, L"enclosure", -1, FALSE))
         {
             hr = ParseEnclosure(pLink, pApupEntry->rgEnclosures + pApupEntry->cEnclosures);
             ApupExitOnFailure(hr, "Failed to parse enclosure.");
@@ -344,32 +344,32 @@ static HRESULT ParseEnclosure(
     // First search the ATOM link's custom elements to try and find the application update enclosure information.
     for (ATOM_UNKNOWN_ELEMENT* pElement = pLink->pUnknownElements; pElement; pElement = pElement->pNext)
     {
-        if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, pElement->wzNamespace, -1, APPLICATION_SYNDICATION_NAMESPACE, -1))
+        if (CSTR_EQUAL == ::CompareStringOrdinal(pElement->wzNamespace, -1, APPLICATION_SYNDICATION_NAMESPACE, -1, FALSE))
         {
-            if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, L"digest", -1, pElement->wzElement, -1))
+            if (CSTR_EQUAL == ::CompareStringOrdinal(L"digest", -1, pElement->wzElement, -1, FALSE))
             {
                 // Find the digest[@algorithm] which is required. Everything else is ignored.
                 for (ATOM_UNKNOWN_ATTRIBUTE* pAttribute = pElement->pAttributes; pAttribute; pAttribute = pAttribute->pNext)
                 {
                     dwDigestLength = 0;
-                    if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, L"algorithm", -1, pAttribute->wzAttribute, -1))
+                    if (CSTR_EQUAL == ::CompareStringOrdinal(L"algorithm", -1, pAttribute->wzAttribute, -1, FALSE))
                     {
-                        if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, NORM_IGNORECASE, L"md5", -1, pAttribute->wzValue, -1))
+                        if (CSTR_EQUAL == ::CompareStringOrdinal(L"md5", -1, pAttribute->wzValue, -1, TRUE))
                         {
                             pEnclosure->digestAlgorithm = APUP_HASH_ALGORITHM_MD5;
                             dwDigestLength = MD5_HASH_LEN;
                         }
-                        else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, NORM_IGNORECASE, L"sha1", -1, pAttribute->wzValue, -1))
+                        else if (CSTR_EQUAL == ::CompareStringOrdinal(L"sha1", -1, pAttribute->wzValue, -1, TRUE))
                         {
                             pEnclosure->digestAlgorithm = APUP_HASH_ALGORITHM_SHA1;
                             dwDigestLength = SHA1_HASH_LEN;
                         }
-                        else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, NORM_IGNORECASE, L"sha256", -1, pAttribute->wzValue, -1))
+                        else if (CSTR_EQUAL == ::CompareStringOrdinal(L"sha256", -1, pAttribute->wzValue, -1, TRUE))
                         {
                             pEnclosure->digestAlgorithm = APUP_HASH_ALGORITHM_SHA256;
                             dwDigestLength = SHA256_HASH_LEN;
                         }
-                        else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, NORM_IGNORECASE, L"sha512", -1, pAttribute->wzValue, -1))
+                        else if (CSTR_EQUAL == ::CompareStringOrdinal(L"sha512", -1, pAttribute->wzValue, -1, TRUE))
                         {
                             pEnclosure->digestAlgorithm = APUP_HASH_ALGORITHM_SHA512;
                             dwDigestLength = SHA512_HASH_LEN;
@@ -406,7 +406,7 @@ static HRESULT ParseEnclosure(
 
                 break;
             }
-            else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, L"name", -1, pElement->wzElement, -1))
+            else if (CSTR_EQUAL == ::CompareStringOrdinal(L"name", -1, pElement->wzElement, -1, FALSE))
             {
                 hr = StrAllocString(&pEnclosure->wzLocalName, pElement->wzValue, 0);
                 ApupExitOnFailure(hr, "Failed to copy local name.");
diff --git a/src/libs/dutil/WixToolset.DUtil/atomutil.cpp b/src/libs/dutil/WixToolset.DUtil/atomutil.cpp
index d6fd3890..df5bb424 100644
--- a/src/libs/dutil/WixToolset.DUtil/atomutil.cpp
+++ b/src/libs/dutil/WixToolset.DUtil/atomutil.cpp
@@ -341,63 +341,63 @@ static HRESULT ParseAtomFeed(
 
     while (S_OK == (hr = XmlNextElement(pNodeList, &pNode, &bstrNodeName)))
     {
-        if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, bstrNodeName, -1, L"generator", -1))
+        if (CSTR_EQUAL == ::CompareStringOrdinal(bstrNodeName, -1, L"generator", -1, FALSE))
         {
             hr = AssignString(&pNewFeed->wzGenerator, pNode);
             AtomExitOnFailure(hr, "Failed to allocate ATOM feed generator.");
         }
-        else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, bstrNodeName, -1, L"icon", -1))
+        else if (CSTR_EQUAL == ::CompareStringOrdinal(bstrNodeName, -1, L"icon", -1, FALSE))
         {
             hr = AssignString(&pNewFeed->wzIcon, pNode);
             AtomExitOnFailure(hr, "Failed to allocate ATOM feed icon.");
         }
-        else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, bstrNodeName, -1, L"id", -1))
+        else if (CSTR_EQUAL == ::CompareStringOrdinal(bstrNodeName, -1, L"id", -1, FALSE))
         {
             hr = AssignString(&pNewFeed->wzId, pNode);
             AtomExitOnFailure(hr, "Failed to allocate ATOM feed id.");
         }
-        else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, bstrNodeName, -1, L"logo", -1))
+        else if (CSTR_EQUAL == ::CompareStringOrdinal(bstrNodeName, -1, L"logo", -1, FALSE))
         {
             hr = AssignString(&pNewFeed->wzLogo, pNode);
             AtomExitOnFailure(hr, "Failed to allocate ATOM feed logo.");
         }
-        else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, bstrNodeName, -1, L"subtitle", -1))
+        else if (CSTR_EQUAL == ::CompareStringOrdinal(bstrNodeName, -1, L"subtitle", -1, FALSE))
         {
             hr = AssignString(&pNewFeed->wzSubtitle, pNode);
             AtomExitOnFailure(hr, "Failed to allocate ATOM feed subtitle.");
         }
-        else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, bstrNodeName, -1, L"title", -1))
+        else if (CSTR_EQUAL == ::CompareStringOrdinal(bstrNodeName, -1, L"title", -1, FALSE))
         {
             hr = AssignString(&pNewFeed->wzTitle, pNode);
             AtomExitOnFailure(hr, "Failed to allocate ATOM feed title.");
         }
-        else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, bstrNodeName, -1, L"updated", -1))
+        else if (CSTR_EQUAL == ::CompareStringOrdinal(bstrNodeName, -1, L"updated", -1, FALSE))
         {
             hr = AssignDateTime(&pNewFeed->ftUpdated, pNode);
             AtomExitOnFailure(hr, "Failed to allocate ATOM feed updated.");
         }
-        else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, bstrNodeName, -1, L"author", -1))
+        else if (CSTR_EQUAL == ::CompareStringOrdinal(bstrNodeName, -1, L"author", -1, FALSE))
         {
             hr = ParseAtomAuthor(pNode, &pNewFeed->rgAuthors[cAuthors]);
             AtomExitOnFailure(hr, "Failed to parse ATOM author.");
 
             ++cAuthors;
         }
-        else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, bstrNodeName, -1, L"category", -1))
+        else if (CSTR_EQUAL == ::CompareStringOrdinal(bstrNodeName, -1, L"category", -1, FALSE))
         {
             hr = ParseAtomCategory(pNode, &pNewFeed->rgCategories[cCategories]);
             AtomExitOnFailure(hr, "Failed to parse ATOM category.");
 
             ++cCategories;
         }
-        else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, bstrNodeName, -1, L"entry", -1))
+        else if (CSTR_EQUAL == ::CompareStringOrdinal(bstrNodeName, -1, L"entry", -1, FALSE))
         {
             hr = ParseAtomEntry(pNode, &pNewFeed->rgEntries[cEntries]);
             AtomExitOnFailure(hr, "Failed to parse ATOM entry.");
 
             ++cEntries;
         }
-        else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, bstrNodeName, -1, L"link", -1))
+        else if (CSTR_EQUAL == ::CompareStringOrdinal(bstrNodeName, -1, L"link", -1, FALSE))
         {
             hr = ParseAtomLink(pNode, &pNewFeed->rgLinks[cLinks]);
             AtomExitOnFailure(hr, "Failed to parse ATOM link.");
@@ -516,17 +516,17 @@ static HRESULT ParseAtomAuthor(
 
     while (S_OK == (hr = XmlNextElement(pNodeList, &pNode, &bstrNodeName)))
     {
-        if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, bstrNodeName, -1, L"name", -1))
+        if (CSTR_EQUAL == ::CompareStringOrdinal(bstrNodeName, -1, L"name", -1, FALSE))
         {
             hr = AssignString(&pAuthor->wzName, pNode);
             AtomExitOnFailure(hr, "Failed to allocate ATOM author name.");
         }
-        else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, bstrNodeName, -1, L"email", -1))
+        else if (CSTR_EQUAL == ::CompareStringOrdinal(bstrNodeName, -1, L"email", -1, FALSE))
         {
             hr = AssignString(&pAuthor->wzEmail, pNode);
             AtomExitOnFailure(hr, "Failed to allocate ATOM author email.");
         }
-        else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, bstrNodeName, -1, L"uri", -1))
+        else if (CSTR_EQUAL == ::CompareStringOrdinal(bstrNodeName, -1, L"uri", -1, FALSE))
         {
             hr = AssignString(&pAuthor->wzUrl, pNode);
             AtomExitOnFailure(hr, "Failed to allocate ATOM author uri.");
@@ -570,17 +570,17 @@ static HRESULT ParseAtomCategory(
 
     while (S_OK == (hr = XmlNextAttribute(pixnnmAttributes, &pNode, &bstrNodeName)))
     {
-        if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, bstrNodeName, -1, L"label", -1))
+        if (CSTR_EQUAL == ::CompareStringOrdinal(bstrNodeName, -1, L"label", -1, FALSE))
         {
             hr = AssignString(&pCategory->wzLabel, pNode);
             AtomExitOnFailure(hr, "Failed to allocate ATOM category label.");
         }
-        else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, bstrNodeName, -1, L"scheme", -1))
+        else if (CSTR_EQUAL == ::CompareStringOrdinal(bstrNodeName, -1, L"scheme", -1, FALSE))
         {
             hr = AssignString(&pCategory->wzScheme, pNode);
             AtomExitOnFailure(hr, "Failed to allocate ATOM category scheme.");
         }
-        else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, bstrNodeName, -1, L"term", -1))
+        else if (CSTR_EQUAL == ::CompareStringOrdinal(bstrNodeName, -1, L"term", -1, FALSE))
         {
             hr = AssignString(&pCategory->wzTerm, pNode);
             AtomExitOnFailure(hr, "Failed to allocate ATOM category term.");
@@ -639,12 +639,12 @@ static HRESULT ParseAtomContent(
 
     while (S_OK == (hr = XmlNextAttribute(pixnnmAttributes, &pNode, &bstrNodeName)))
     {
-        if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, bstrNodeName, -1, L"type", -1))
+        if (CSTR_EQUAL == ::CompareStringOrdinal(bstrNodeName, -1, L"type", -1, FALSE))
         {
             hr = AssignString(&pContent->wzType, pNode);
             AtomExitOnFailure(hr, "Failed to allocate ATOM content type.");
         }
-        else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, bstrNodeName, -1, L"url", -1))
+        else if (CSTR_EQUAL == ::CompareStringOrdinal(bstrNodeName, -1, L"url", -1, FALSE))
         {
             hr = AssignString(&pContent->wzUrl, pNode);
             AtomExitOnFailure(hr, "Failed to allocate ATOM content scheme.");
@@ -721,46 +721,46 @@ static HRESULT ParseAtomEntry(
 
     while (S_OK == (hr = XmlNextElement(pNodeList, &pNode, &bstrNodeName)))
     {
-        if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, bstrNodeName, -1, L"id", -1))
+        if (CSTR_EQUAL == ::CompareStringOrdinal(bstrNodeName, -1, L"id", -1, FALSE))
         {
             hr = AssignString(&pEntry->wzId, pNode);
             AtomExitOnFailure(hr, "Failed to allocate ATOM entry id.");
         }
-        else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, bstrNodeName, -1, L"summary", -1))
+        else if (CSTR_EQUAL == ::CompareStringOrdinal(bstrNodeName, -1, L"summary", -1, FALSE))
         {
             hr = AssignString(&pEntry->wzSummary, pNode);
             AtomExitOnFailure(hr, "Failed to allocate ATOM entry summary.");
         }
-        else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, bstrNodeName, -1, L"title", -1))
+        else if (CSTR_EQUAL == ::CompareStringOrdinal(bstrNodeName, -1, L"title", -1, FALSE))
         {
             hr = AssignString(&pEntry->wzTitle, pNode);
             AtomExitOnFailure(hr, "Failed to allocate ATOM entry title.");
         }
-        else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, bstrNodeName, -1, L"published", -1))
+        else if (CSTR_EQUAL == ::CompareStringOrdinal(bstrNodeName, -1, L"published", -1, FALSE))
         {
             hr = AssignDateTime(&pEntry->ftPublished, pNode);
             AtomExitOnFailure(hr, "Failed to allocate ATOM entry published.");
         }
-        else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, bstrNodeName, -1, L"updated", -1))
+        else if (CSTR_EQUAL == ::CompareStringOrdinal(bstrNodeName, -1, L"updated", -1, FALSE))
         {
             hr = AssignDateTime(&pEntry->ftUpdated, pNode);
             AtomExitOnFailure(hr, "Failed to allocate ATOM entry updated.");
         }
-        else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, bstrNodeName, -1, L"author", -1))
+        else if (CSTR_EQUAL == ::CompareStringOrdinal(bstrNodeName, -1, L"author", -1, FALSE))
         {
             hr = ParseAtomAuthor(pNode, &pEntry->rgAuthors[cAuthors]);
             AtomExitOnFailure(hr, "Failed to parse ATOM entry author.");
 
             ++cAuthors;
         }
-        else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, bstrNodeName, -1, L"category", -1))
+        else if (CSTR_EQUAL == ::CompareStringOrdinal(bstrNodeName, -1, L"category", -1, FALSE))
         {
             hr = ParseAtomCategory(pNode, &pEntry->rgCategories[cCategories]);
             AtomExitOnFailure(hr, "Failed to parse ATOM entry category.");
 
             ++cCategories;
         }
-        else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, bstrNodeName, -1, L"content", -1))
+        else if (CSTR_EQUAL == ::CompareStringOrdinal(bstrNodeName, -1, L"content", -1, FALSE))
         {
             if (NULL != pEntry->pContent)
             {
@@ -774,7 +774,7 @@ static HRESULT ParseAtomEntry(
             hr = ParseAtomContent(pNode, pEntry->pContent);
             AtomExitOnFailure(hr, "Failed to parse ATOM entry content.");
         }
-        else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, bstrNodeName, -1, L"link", -1))
+        else if (CSTR_EQUAL == ::CompareStringOrdinal(bstrNodeName, -1, L"link", -1, FALSE))
         {
             hr = ParseAtomLink(pNode, &pEntry->rgLinks[cLinks]);
             AtomExitOnFailure(hr, "Failed to parse ATOM entry link.");
@@ -842,17 +842,17 @@ static HRESULT ParseAtomLink(
 
     while (S_OK == (hr = XmlNextAttribute(pixnnmAttributes, &pNode, &bstrNodeName)))
     {
-        if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, bstrNodeName, -1, L"rel", -1))
+        if (CSTR_EQUAL == ::CompareStringOrdinal(bstrNodeName, -1, L"rel", -1, FALSE))
         {
             hr = AssignString(&pLink->wzRel, pNode);
             AtomExitOnFailure(hr, "Failed to allocate ATOM link rel.");
         }
-        else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, bstrNodeName, -1, L"href", -1))
+        else if (CSTR_EQUAL == ::CompareStringOrdinal(bstrNodeName, -1, L"href", -1, FALSE))
         {
             hr = AssignString(&pLink->wzUrl, pNode);
             AtomExitOnFailure(hr, "Failed to allocate ATOM link href.");
         }
-        else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, bstrNodeName, -1, L"length", -1))
+        else if (CSTR_EQUAL == ::CompareStringOrdinal(bstrNodeName, -1, L"length", -1, FALSE))
         {
             hr = XmlGetAttributeUInt64(pixnLink, bstrNodeName, &pLink->dw64Length);
             if (E_INVALIDARG == hr)
@@ -861,12 +861,12 @@ static HRESULT ParseAtomLink(
             }
             AtomExitOnFailure(hr, "Failed to parse ATOM link length.");
         }
-        else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, bstrNodeName, -1, L"title", -1))
+        else if (CSTR_EQUAL == ::CompareStringOrdinal(bstrNodeName, -1, L"title", -1, FALSE))
         {
             hr = AssignString(&pLink->wzTitle, pNode);
             AtomExitOnFailure(hr, "Failed to allocate ATOM link title.");
         }
-        else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, bstrNodeName, -1, L"type", -1))
+        else if (CSTR_EQUAL == ::CompareStringOrdinal(bstrNodeName, -1, L"type", -1, FALSE))
         {
             hr = AssignString(&pLink->wzType, pNode);
             AtomExitOnFailure(hr, "Failed to allocate ATOM link type.");
diff --git a/src/libs/dutil/WixToolset.DUtil/build/WixToolset.DUtil.props b/src/libs/dutil/WixToolset.DUtil/build/WixToolset.DUtil.props
index 4e773137..66c19206 100644
--- a/src/libs/dutil/WixToolset.DUtil/build/WixToolset.DUtil.props
+++ b/src/libs/dutil/WixToolset.DUtil/build/WixToolset.DUtil.props
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
 
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemDefinitionGroup>
     <ClCompile>
       <AdditionalIncludeDirectories>$(MSBuildThisFileDirectory)native\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
diff --git a/src/libs/dutil/WixToolset.DUtil/dictutil.cpp b/src/libs/dutil/WixToolset.DUtil/dictutil.cpp
index 09b150df..247b7b43 100644
--- a/src/libs/dutil/WixToolset.DUtil/dictutil.cpp
+++ b/src/libs/dutil/WixToolset.DUtil/dictutil.cpp
@@ -499,14 +499,9 @@ static BOOL IsMatchExact(
     )
 {
     LPCWSTR wzMatchString = GetKey(psd, TranslateOffsetToValue(psd, psd->ppvBuckets[dwMatchIndex]));
-    DWORD dwFlags = 0;
+    BOOL fIgnoreCase = (DICT_FLAG_CASEINSENSITIVE & psd->dfFlags) ? TRUE : FALSE;
 
-    if (DICT_FLAG_CASEINSENSITIVE & psd->dfFlags)
-    {
-        dwFlags |= NORM_IGNORECASE;
-    }
-
-    if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, dwFlags, wzOriginalString, -1, wzMatchString, -1))
+    if (CSTR_EQUAL == ::CompareStringOrdinal(wzOriginalString, -1, wzMatchString, -1, fIgnoreCase))
     {
         return TRUE;
     }
@@ -605,7 +600,7 @@ static HRESULT GetInsertIndex(
         // If we wrapped all the way back around to our original index, the dict is full - throw an error
         if (dwIndexCandidate == dwOriginalIndexCandidate)
         {
-            // The dict table is full - this error seems to be a reasonably close match 
+            // The dict table is full - this error seems to be a reasonably close match
             hr = HRESULT_FROM_WIN32(ERROR_DATABASE_FULL);
             DictExitOnRootFailure(hr, "Failed to add item '%ls' to dict table because dict table is full of items", pszString);
         }
diff --git a/src/libs/dutil/WixToolset.DUtil/dutil.nuspec b/src/libs/dutil/WixToolset.DUtil/dutil.nuspec
index 5c4634e4..534ccd69 100644
--- a/src/libs/dutil/WixToolset.DUtil/dutil.nuspec
+++ b/src/libs/dutil/WixToolset.DUtil/dutil.nuspec
@@ -7,6 +7,7 @@
     <description>$description$</description>
     <authors>$authors$</authors>
     <icon>icon.png</icon>
+    <readme>README.md</readme>
     <license type="file">OSMFEULA.txt</license>
     <requireLicenseAcceptance>true</requireLicenseAcceptance>
     <tags>$packageTags$</tags>
@@ -18,6 +19,7 @@
   <files>
     <file src="$eulaTxt$" />
     <file src="$iconPng$" />
+    <file src="$projectFolder$\..\README.md" />
     <file src="$projectFolder$\build\$id$.props" target="build\" />
     <file src="$projectFolder$\inc\*" target="build\native\include" />
     <file src="..\..\v143\x64\dutil.lib" target="build\native\v14\x64" />
diff --git a/src/libs/dutil/WixToolset.DUtil/dutil.vcxproj b/src/libs/dutil/WixToolset.DUtil/dutil.vcxproj
index c973b141..f60ef19d 100644
--- a/src/libs/dutil/WixToolset.DUtil/dutil.vcxproj
+++ b/src/libs/dutil/WixToolset.DUtil/dutil.vcxproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
 
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|ARM64">
       <Configuration>Debug</Configuration>
diff --git a/src/libs/dutil/WixToolset.DUtil/dutil.vcxproj.filters b/src/libs/dutil/WixToolset.DUtil/dutil.vcxproj.filters
index 470fd3d0..d8877f25 100644
--- a/src/libs/dutil/WixToolset.DUtil/dutil.vcxproj.filters
+++ b/src/libs/dutil/WixToolset.DUtil/dutil.vcxproj.filters
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Source Files">
       <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
@@ -410,4 +410,4 @@
       <Filter>Header Files</Filter>
     </None>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libs/dutil/WixToolset.DUtil/iis7util.cpp b/src/libs/dutil/WixToolset.DUtil/iis7util.cpp
index d0a0b000..b0dc1444 100644
--- a/src/libs/dutil/WixToolset.DUtil/iis7util.cpp
+++ b/src/libs/dutil/WixToolset.DUtil/iis7util.cpp
@@ -222,7 +222,7 @@ BOOL DAPI CompareVariantPath(
         IisExitOnFailure(hr, "Failed to expand path %ls", pVariant2->bstrVal);
     }
 
-    fEqual = CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, NORM_IGNORECASE, wzValue1, -1, wzValue2, -1);
+    fEqual = CSTR_EQUAL == ::CompareStringOrdinal(wzValue1, -1, wzValue2, -1, TRUE);
 
 LExit:
     ReleaseNullStr(wzValue1);
@@ -258,7 +258,7 @@ extern "C" BOOL DAPI Iis7IsMatchingAppHostElement(
 
     hr = pElement->get_Name(&bstrElementName);
     IisExitOnFailure(hr, "Failed to get name of element");
-    if (CSTR_EQUAL != ::CompareStringW(LOCALE_INVARIANT, NORM_IGNORECASE, pComparison->sczElementName, -1, bstrElementName, -1))
+    if (CSTR_EQUAL != ::CompareStringOrdinal(pComparison->sczElementName, -1, bstrElementName, -1, TRUE))
     {
         ExitFunction();
     }
@@ -293,7 +293,7 @@ BOOL DAPI IsMatchingAppHostMethod(
 
     Assert(bstrName);
 
-    if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, NORM_IGNORECASE, wzMethodName, -1, bstrName, -1))
+    if (CSTR_EQUAL == ::CompareStringOrdinal(wzMethodName, -1, bstrName, -1, TRUE))
     {
         fResult = TRUE;
     }
diff --git a/src/libs/dutil/WixToolset.DUtil/inc/thmutil.h b/src/libs/dutil/WixToolset.DUtil/inc/thmutil.h
index 45e4fc51..14e20c0d 100644
--- a/src/libs/dutil/WixToolset.DUtil/inc/thmutil.h
+++ b/src/libs/dutil/WixToolset.DUtil/inc/thmutil.h
@@ -567,6 +567,19 @@ void DAPI ThemeInitializeWindowClass(
     );
 
 /********************************************************************
+ ThemeInitializeWindowClassEx - sets defaults for the window class
+                                from the given theme.
+
+*******************************************************************/
+void DAPI ThemeInitializeWindowClassEx(
+    __in THEME* pTheme,
+    __in WNDCLASSEXW* pWndClass,
+    __in WNDPROC pfnWndProc,
+    __in HINSTANCE hInstance,
+    __in LPCWSTR wzClassName
+    );
+
+/********************************************************************
  ThemeCreateParentWindow - creates a parent window for the theme.
 
 *******************************************************************/
diff --git a/src/libs/dutil/WixToolset.DUtil/iniutil.cpp b/src/libs/dutil/WixToolset.DUtil/iniutil.cpp
index 46f6e380..12af6fb2 100644
--- a/src/libs/dutil/WixToolset.DUtil/iniutil.cpp
+++ b/src/libs/dutil/WixToolset.DUtil/iniutil.cpp
@@ -441,7 +441,7 @@ extern "C" HRESULT DAPI IniGetValue(
 
     for (DWORD i = 0; i < pi->cValues; ++i)
     {
-        if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, pi->rgivValues[i].wzName, -1, wzValueName, -1))
+        if (CSTR_EQUAL == ::CompareStringOrdinal(pi->rgivValues[i].wzName, -1, wzValueName, -1, FALSE))
         {
             pValue = pi->rgivValues + i;
             break;
@@ -483,7 +483,7 @@ extern "C" HRESULT DAPI IniSetValue(
 
     for (DWORD i = 0; i < pi->cValues; ++i)
     {
-        if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, pi->rgivValues[i].wzName, -1, wzValueName, -1))
+        if (CSTR_EQUAL == ::CompareStringOrdinal(pi->rgivValues[i].wzName, -1, wzValueName, -1, FALSE))
         {
             pValue = pi->rgivValues + i;
             break;
@@ -507,7 +507,7 @@ extern "C" HRESULT DAPI IniSetValue(
     {
         if (pValue)
         {
-            if (CSTR_EQUAL != ::CompareStringW(LOCALE_INVARIANT, 0, pValue->wzValue, -1, wzValue, -1))
+            if (CSTR_EQUAL != ::CompareStringOrdinal(pValue->wzValue, -1, wzValue, -1, FALSE))
             {
                 pi->fModified = TRUE;
                 hr = StrAllocString(const_cast<LPWSTR *>(&pValue->wzValue), wzValue, 0);
@@ -660,7 +660,7 @@ extern "C" HRESULT DAPI IniWriteFile(
         IniExitOnFailure(hr, "Failed to get section prefix from name: %ls", pi->rgivValues[i].wzName);
 
         // If the new section prefix is different, write a section out for it
-        if (fSections && sczNewSectionPrefix && (NULL == sczCurrentSectionPrefix || CSTR_EQUAL != ::CompareStringW(LOCALE_INVARIANT, 0, sczNewSectionPrefix, -1, sczCurrentSectionPrefix, -1)))
+        if (fSections && sczNewSectionPrefix && (NULL == sczCurrentSectionPrefix || CSTR_EQUAL != ::CompareStringOrdinal(sczNewSectionPrefix, -1, sczCurrentSectionPrefix, -1, FALSE)))
         {
             hr = StrAllocConcat(&sczContents, pi->sczOpenTagPrefix, 0);
             IniExitOnFailure(hr, "Failed to concat open tag prefix to string");
@@ -674,7 +674,7 @@ extern "C" HRESULT DAPI IniWriteFile(
 
             hr = StrAllocConcat(&sczContents, L"\r\n", 2);
             IniExitOnFailure(hr, "Failed to add endline to ini output buffer in-memory");
-            
+
             ReleaseNullStr(sczCurrentSectionPrefix);
             sczCurrentSectionPrefix = sczNewSectionPrefix;
             sczNewSectionPrefix = NULL;
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(
     {
         pLocControl = &pWixLoc->rgLocControls[i];
 
-        if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, pLocControl->wzControl, -1, wzId, -1))
+        if (CSTR_EQUAL == ::CompareStringOrdinal(pLocControl->wzControl, -1, wzId, -1, FALSE))
         {
             *ppLocControl = pLocControl;
             ExitFunction1(hr = S_OK);
@@ -341,7 +341,7 @@ extern "C" HRESULT DAPI LocGetString(
     {
         pLocString = pWixLoc->rgLocStrings + i;
 
-        if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, pLocString->wzId, -1, wzId, -1))
+        if (CSTR_EQUAL == ::CompareStringOrdinal(pLocString->wzId, -1, wzId, -1, FALSE))
         {
             *ppLocString = pLocString;
             hr = S_OK;
@@ -555,7 +555,7 @@ static HRESULT ParseWxlString(
 
     if (S_OK == hr)
     {
-        pLocString->bOverridable = CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, bstrText, -1, L"yes", -1);
+        pLocString->bOverridable = CSTR_EQUAL == ::CompareStringOrdinal(bstrText, -1, L"yes", -1, FALSE);
     }
 
     ReleaseNullBSTR(bstrText);
diff --git a/src/libs/dutil/WixToolset.DUtil/monutil.cpp b/src/libs/dutil/WixToolset.DUtil/monutil.cpp
index b42332ef..d6437b39 100644
--- a/src/libs/dutil/WixToolset.DUtil/monutil.cpp
+++ b/src/libs/dutil/WixToolset.DUtil/monutil.cpp
@@ -1598,14 +1598,14 @@ static HRESULT FindRequestIndex(
             switch (pWaiterContext->rgRequests[i].type)
             {
             case MON_DIRECTORY:
-                if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, pWaiterContext->rgRequests[i].rgsczPathHierarchy[pWaiterContext->rgRequests[i].cPathHierarchy - 1], -1, pMessage->directory.sczDirectory, -1) && pWaiterContext->rgRequests[i].fRecursive == pMessage->fRecursive)
+                if (CSTR_EQUAL == ::CompareStringOrdinal(pWaiterContext->rgRequests[i].rgsczPathHierarchy[pWaiterContext->rgRequests[i].cPathHierarchy - 1], -1, pMessage->directory.sczDirectory, -1, FALSE) && pWaiterContext->rgRequests[i].fRecursive == pMessage->fRecursive)
                 {
                     *pdwIndex = i;
                     ExitFunction1(hr = S_OK);
                 }
                 break;
             case MON_REGKEY:
-                if (reinterpret_cast<DWORD_PTR>(pMessage->regkey.hkRoot) == reinterpret_cast<DWORD_PTR>(pWaiterContext->rgRequests[i].regkey.hkRoot) && CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, pWaiterContext->rgRequests[i].rgsczPathHierarchy[pWaiterContext->rgRequests[i].cPathHierarchy - 1], -1, pMessage->regkey.sczSubKey, -1) && pWaiterContext->rgRequests[i].fRecursive == pMessage->fRecursive && pWaiterContext->rgRequests[i].regkey.kbKeyBitness == pMessage->regkey.kbKeyBitness)
+                if (reinterpret_cast<DWORD_PTR>(pMessage->regkey.hkRoot) == reinterpret_cast<DWORD_PTR>(pWaiterContext->rgRequests[i].regkey.hkRoot) && CSTR_EQUAL == ::CompareStringOrdinal(pWaiterContext->rgRequests[i].rgsczPathHierarchy[pWaiterContext->rgRequests[i].cPathHierarchy - 1], -1, pMessage->regkey.sczSubKey, -1, FALSE) && pWaiterContext->rgRequests[i].fRecursive == pMessage->fRecursive && pWaiterContext->rgRequests[i].regkey.kbKeyBitness == pMessage->regkey.kbKeyBitness)
                 {
                     *pdwIndex = i;
                     ExitFunction1(hr = S_OK);
diff --git a/src/libs/dutil/WixToolset.DUtil/path2utl.cpp b/src/libs/dutil/WixToolset.DUtil/path2utl.cpp
index d83a4578..06df8617 100644
--- a/src/libs/dutil/WixToolset.DUtil/path2utl.cpp
+++ b/src/libs/dutil/WixToolset.DUtil/path2utl.cpp
@@ -306,7 +306,7 @@ DAPI_(HRESULT) PathCompareCanonicalized(
     hr = PathCanonicalizeForComparison(wzPath2, dwDefaultFlags, &sczCanonicalized2);
     PathExitOnFailure(hr, "Failed to canonicalize wzPath2.");
 
-    nResult = ::CompareStringW(LOCALE_NEUTRAL, NORM_IGNORECASE, sczCanonicalized1, -1, sczCanonicalized2, -1);
+    nResult = ::CompareStringOrdinal(sczCanonicalized1, -1, sczCanonicalized2, -1, TRUE);
     PathExitOnNullWithLastError(nResult, hr, "Failed to compare canonicalized paths.");
 
     *pfEqual = CSTR_EQUAL == nResult;
@@ -364,7 +364,7 @@ DAPI_(HRESULT) PathDirectoryContainsPath(
         ExitFunction1(hr = S_FALSE);
     }
 
-    if (CSTR_EQUAL != ::CompareStringW(LOCALE_NEUTRAL, NORM_IGNORECASE, sczCanonicalizedDirectory, (DWORD)cchDirectory, sczCanonicalizedPath, (DWORD)cchDirectory))
+    if (CSTR_EQUAL != ::CompareStringOrdinal(sczCanonicalizedDirectory, (DWORD)cchDirectory, sczCanonicalizedPath, (DWORD)cchDirectory, TRUE))
     {
         ExitFunction1(hr = S_FALSE);
     }
diff --git a/src/libs/dutil/WixToolset.DUtil/sceutil.cpp b/src/libs/dutil/WixToolset.DUtil/sceutil.cpp
index 590c937a..98b5e2d8 100644
--- a/src/libs/dutil/WixToolset.DUtil/sceutil.cpp
+++ b/src/libs/dutil/WixToolset.DUtil/sceutil.cpp
@@ -224,7 +224,7 @@ extern "C" HRESULT DAPI SceCreateDatabase(
     LPWSTR sczDirectory = NULL;
     SCE_DATABASE *pNewSceDatabase = NULL;
     SCE_DATABASE_INTERNAL *pNewSceDatabaseInternal = NULL;
-    IDBDataSourceAdmin *pIDBDataSourceAdmin = NULL; 
+    IDBDataSourceAdmin *pIDBDataSourceAdmin = NULL;
     DBPROPSET rgdbpDataSourcePropSet[2] = { };
     DBPROP rgdbpDataSourceProp[2] = { };
     DBPROP rgdbpDataSourceSsceProp[1] = { };
@@ -239,7 +239,7 @@ extern "C" HRESULT DAPI SceCreateDatabase(
 
     hr = CreateSqlCe(wzSqlCeDllPath, &pNewSceDatabaseInternal->pIDBInitialize, &pNewSceDatabaseInternal->hSqlCeDll);
     ExitOnFailure(hr, "Failed to get IDBInitialize interface");
-    
+
     hr = pNewSceDatabaseInternal->pIDBInitialize->QueryInterface(IID_IDBDataSourceAdmin, reinterpret_cast<void **>(&pIDBDataSourceAdmin));
     ExitOnFailure(hr, "Failed to get IDBDataSourceAdmin interface");
 
@@ -259,7 +259,7 @@ extern "C" HRESULT DAPI SceCreateDatabase(
     rgdbpDataSourceProp[1].vValue.vt = VT_I4;
     rgdbpDataSourceProp[1].vValue.lVal = DB_MODE_SHARE_DENY_NONE;
 
-    // SQL CE doesn't seem to allow us to specify DBPROP_INIT_PROMPT if we include any properties from DBPROPSET_SSCE_DBINIT 
+    // SQL CE doesn't seem to allow us to specify DBPROP_INIT_PROMPT if we include any properties from DBPROPSET_SSCE_DBINIT
     rgdbpDataSourcePropSet[0].guidPropertySet = DBPROPSET_DBINIT;
     rgdbpDataSourcePropSet[0].rgProperties = rgdbpDataSourceProp;
     rgdbpDataSourcePropSet[0].cProperties = _countof(rgdbpDataSourceProp);
@@ -336,7 +336,7 @@ extern "C" HRESULT DAPI SceOpenDatabase(
 
     hr = CreateSqlCe(wzSqlCeDllPath, &pNewSceDatabaseInternal->pIDBInitialize, &pNewSceDatabaseInternal->hSqlCeDll);
     ExitOnFailure(hr, "Failed to get IDBInitialize interface");
-    
+
     hr = pNewSceDatabaseInternal->pIDBInitialize->QueryInterface(IID_IDBProperties, reinterpret_cast<void **>(&pNewSceDatabaseInternal->pIDBProperties));
     ExitOnFailure(hr, "Failed to get IDBProperties interface");
 
@@ -369,7 +369,7 @@ extern "C" HRESULT DAPI SceOpenDatabase(
     rgdbpDataSourceProp[1].vValue.vt = VT_I4;
     rgdbpDataSourceProp[1].vValue.lVal = DB_MODE_SHARE_DENY_NONE;
 
-    // SQL CE doesn't seem to allow us to specify DBPROP_INIT_PROMPT if we include any properties from DBPROPSET_SSCE_DBINIT 
+    // SQL CE doesn't seem to allow us to specify DBPROP_INIT_PROMPT if we include any properties from DBPROPSET_SSCE_DBINIT
     rgdbpDataSourcePropSet[0].guidPropertySet = DBPROPSET_DBINIT;
     rgdbpDataSourcePropSet[0].rgProperties = rgdbpDataSourceProp;
     rgdbpDataSourcePropSet[0].cProperties = _countof(rgdbpDataSourceProp);
@@ -407,7 +407,7 @@ extern "C" HRESULT DAPI SceOpenDatabase(
     hr = GetDatabaseSchemaInfo(pNewSceDatabase, &sczSchemaType, &dwVersionFound);
     ExitOnFailure(hr, "Failed to find schema version of database");
 
-    if (CSTR_EQUAL != ::CompareStringW(LOCALE_INVARIANT, 0, sczSchemaType, -1, wzExpectedSchemaType, -1))
+    if (CSTR_EQUAL != ::CompareStringOrdinal(sczSchemaType, -1, wzExpectedSchemaType, -1, FALSE))
     {
         hr = HRESULT_FROM_WIN32(ERROR_BAD_FILE_TYPE);
         ExitOnRootFailure(hr, "Tried to open wrong database type - expected type %ls, found type %ls", wzExpectedSchemaType, sczSchemaType);
@@ -2306,8 +2306,8 @@ static HRESULT SetSessionProperties(
     rgdbpDataSourceProp[0].dwPropertyID = DBPROP_SSCE_TRANSACTION_COMMIT_MODE;
     rgdbpDataSourceProp[0].dwOptions = DBPROPOPTIONS_REQUIRED;
     rgdbpDataSourceProp[0].vValue.vt = VT_I4;
-    rgdbpDataSourceProp[0].vValue.lVal = DBPROPVAL_SSCE_TCM_FLUSH; 
-        
+    rgdbpDataSourceProp[0].vValue.lVal = DBPROPVAL_SSCE_TCM_FLUSH;
+
     rgdbpDataSourcePropSet[0].guidPropertySet = DBPROPSET_SSCE_SESSION;
     rgdbpDataSourcePropSet[0].rgProperties = rgdbpDataSourceProp;
     rgdbpDataSourcePropSet[0].cProperties = 1;
diff --git a/src/libs/dutil/WixToolset.DUtil/strutil.cpp b/src/libs/dutil/WixToolset.DUtil/strutil.cpp
index 0a00c690..013c1b12 100644
--- a/src/libs/dutil/WixToolset.DUtil/strutil.cpp
+++ b/src/libs/dutil/WixToolset.DUtil/strutil.cpp
@@ -1872,9 +1872,14 @@ NOTE: returns 0 if the multisz in not properly terminated with two nulls
 extern "C" HRESULT DAPI MultiSzLen(
     __in_ecount(*pcch) __nullnullterminated LPCWSTR pwzMultiSz,
     __out SIZE_T* pcch
-)
+    )
 {
     Assert(pcch);
+    if (!pwzMultiSz)
+    {
+        *pcch = 0;
+        return S_OK;
+    }
 
     HRESULT hr = S_OK;
     LPCWSTR wz = pwzMultiSz;
@@ -1941,10 +1946,10 @@ extern "C" HRESULT DAPI MultiSzPrepend(
     hr = ::StringCchLengthW(pwzInsert, STRSAFE_MAX_CCH, reinterpret_cast<size_t*>(&cchInsert));
     StrExitOnRootFailure(hr, "failed to get length of insert string");
 
-    cchResult = cchInsert + cchMultiSz + 1;
+    cchResult = cchInsert + (cchMultiSz ? cchMultiSz : 1) + 1;
 
     // Allocate the result buffer
-    hr = StrAlloc(&pwzResult, cchResult + 1);
+    hr = StrAlloc(&pwzResult, cchResult);
     StrExitOnFailure(hr, "failed to allocate result string");
 
     // Prepend
@@ -1954,8 +1959,7 @@ extern "C" HRESULT DAPI MultiSzPrepend(
     // If there was no MULTISZ, double null terminate our result, otherwise, copy the MULTISZ in
     if (0 == cchMultiSz)
     {
-        pwzResult[cchResult] = L'\0';
-        ++cchResult;
+        pwzResult[cchResult - 2] = L'\0';
     }
     else
     {
@@ -1967,6 +1971,7 @@ extern "C" HRESULT DAPI MultiSzPrepend(
     }
 
     // Set the result
+    pwzResult[cchResult - 1] = L'\0';
     *ppwzMultiSz = pwzResult;
 
     if (pcchMultiSz)
@@ -2257,19 +2262,29 @@ extern "C" HRESULT DAPI MultiSzInsertString(
     //
     // Insert the string
     //
-    cchResult = cchMultiSz + cchString + 1;
+    cchResult = (cchMultiSz ? cchMultiSz : 1) + cchString + 1;
 
     hr = StrAlloc(&pwzResult, cchResult);
     StrExitOnFailure(hr, "failed to allocate result string for MULTISZ insert");
 
     // Copy the part before the insert
-    ::CopyMemory(pwzResult, *ppwzMultiSz, cchProgress * sizeof(WCHAR));
+    if (cchProgress)
+    {
+        ::CopyMemory(pwzResult, *ppwzMultiSz, cchProgress * sizeof(WCHAR));
+    }
 
     // Copy the insert part
     ::CopyMemory(pwzResult + cchProgress, pwzInsert, (cchString + 1) * sizeof(WCHAR));
 
     // Copy the part after the insert
-    ::CopyMemory(pwzResult + cchProgress + cchString + 1, wz, (cchMultiSz - cchProgress) * sizeof(WCHAR));
+    if (cchMultiSz > cchProgress)
+    {
+        ::CopyMemory(pwzResult + cchProgress + cchString + 1, wz, (cchMultiSz - cchProgress) * sizeof(WCHAR));
+    }
+
+    // Ensure double-null termination
+    pwzResult[cchResult - 1] = L'\0';
+    pwzResult[cchResult - 2] = L'\0';
 
     // Free the old buffer
     ReleaseNullStr(*ppwzMultiSz);
diff --git a/src/libs/dutil/WixToolset.DUtil/thmutil.cpp b/src/libs/dutil/WixToolset.DUtil/thmutil.cpp
index 36b187a7..4482c96e 100644
--- a/src/libs/dutil/WixToolset.DUtil/thmutil.cpp
+++ b/src/libs/dutil/WixToolset.DUtil/thmutil.cpp
@@ -856,6 +856,28 @@ DAPI_(void) ThemeInitializeWindowClass(
 }
 
 
+DAPI_(void) ThemeInitializeWindowClassEx(
+    __in THEME* pTheme,
+    __in WNDCLASSEXW* pWndClass,
+    __in WNDPROC pfnWndProc,
+    __in HINSTANCE hInstance,
+    __in LPCWSTR wzClassName
+    )
+{
+    pWndClass->cbSize = sizeof(WNDCLASSEXW);
+    pWndClass->style = CS_HREDRAW | CS_VREDRAW;
+    pWndClass->cbWndExtra = DLGWINDOWEXTRA;
+    pWndClass->hCursor = ::LoadCursorW(NULL, (LPCWSTR)IDC_ARROW);
+
+    pWndClass->lpfnWndProc = pfnWndProc;
+    pWndClass->hInstance = hInstance;
+    pWndClass->lpszClassName = wzClassName;
+
+    pWndClass->hIcon = reinterpret_cast<HICON>(pTheme->hIcon);
+    pWndClass->hbrBackground = pTheme->rgFonts[pTheme->dwFontId].hBackground;
+}
+
+
 DAPI_(HRESULT) ThemeCreateParentWindow(
     __in THEME* pTheme,
     __in DWORD dwExStyle,
@@ -1145,7 +1167,7 @@ DAPI_(void) ThemeGetPageIds(
         for (DWORD j = 0; j < pTheme->cPages; ++j)
         {
             LPCWSTR wzPageName = pTheme->rgPages[j].sczName;
-            if (wzPageName && CSTR_EQUAL == ::CompareStringW(LOCALE_NEUTRAL, 0, wzPageName, -1, wzFindName, -1))
+            if (wzPageName && CSTR_EQUAL == ::CompareStringOrdinal(wzPageName, -1, wzFindName, -1, FALSE))
             {
                 rgdwPageIds[i] = j + 1; // add one to make the page ids 1-based (so zero is invalid).
                 break;
@@ -2082,7 +2104,7 @@ static HRESULT ParseButtonImages(
             ThmExitOnFailure(hr, "Null element encountered!");
         }
 
-        if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, bstrType, -1, L"ButtonFocusImage", -1))
+        if (CSTR_EQUAL == ::CompareStringOrdinal(bstrType, -1, L"ButtonFocusImage", -1, FALSE))
         {
             if (pFocusImageRef)
             {
@@ -2091,7 +2113,7 @@ static HRESULT ParseButtonImages(
 
             pImageRef = pFocusImageRef = pControl->Button.rgImageRef + 3;
         }
-        else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, bstrType, -1, L"ButtonHoverImage", -1))
+        else if (CSTR_EQUAL == ::CompareStringOrdinal(bstrType, -1, L"ButtonHoverImage", -1, FALSE))
         {
             if (pHoverImageRef)
             {
@@ -2100,7 +2122,7 @@ static HRESULT ParseButtonImages(
 
             pImageRef = pHoverImageRef = pControl->Button.rgImageRef + 1;
         }
-        else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, bstrType, -1, L"ButtonSelectedImage", -1))
+        else if (CSTR_EQUAL == ::CompareStringOrdinal(bstrType, -1, L"ButtonSelectedImage", -1, FALSE))
         {
             if (pSelectedImageRef)
             {
@@ -2776,35 +2798,35 @@ static HRESULT GetFontColor(
 
     if (pdwSystemColor)
     {
-        if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, bstr, -1, L"btnface", -1))
+        if (CSTR_EQUAL == ::CompareStringOrdinal(bstr, -1, L"btnface", -1, FALSE))
         {
             *pdwSystemColor = COLOR_BTNFACE;
         }
-        else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, bstr, -1, L"btntext", -1))
+        else if (CSTR_EQUAL == ::CompareStringOrdinal(bstr, -1, L"btntext", -1, FALSE))
         {
             *pdwSystemColor = COLOR_BTNTEXT;
         }
-        else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, bstr, -1, L"graytext", -1))
+        else if (CSTR_EQUAL == ::CompareStringOrdinal(bstr, -1, L"graytext", -1, FALSE))
         {
             *pdwSystemColor = COLOR_GRAYTEXT;
         }
-        else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, bstr, -1, L"highlight", -1))
+        else if (CSTR_EQUAL == ::CompareStringOrdinal(bstr, -1, L"highlight", -1, FALSE))
         {
             *pdwSystemColor = COLOR_HIGHLIGHT;
         }
-        else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, bstr, -1, L"highlighttext", -1))
+        else if (CSTR_EQUAL == ::CompareStringOrdinal(bstr, -1, L"highlighttext", -1, FALSE))
         {
             *pdwSystemColor = COLOR_HIGHLIGHTTEXT;
         }
-        else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, bstr, -1, L"hotlight", -1))
+        else if (CSTR_EQUAL == ::CompareStringOrdinal(bstr, -1, L"hotlight", -1, FALSE))
         {
             *pdwSystemColor = COLOR_HOTLIGHT;
         }
-        else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, bstr, -1, L"window", -1))
+        else if (CSTR_EQUAL == ::CompareStringOrdinal(bstr, -1, L"window", -1, FALSE))
         {
             *pdwSystemColor = COLOR_WINDOW;
         }
-        else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, bstr, -1, L"windowtext", -1))
+        else if (CSTR_EQUAL == ::CompareStringOrdinal(bstr, -1, L"windowtext", -1, FALSE))
         {
             *pdwSystemColor = COLOR_WINDOWTEXT;
         }
@@ -3229,71 +3251,71 @@ static HRESULT ParseControls(
             ThmExitOnFailure(hr, "Null element encountered!");
         }
 
-        if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, bstrType, -1, L"Billboard", -1))
+        if (CSTR_EQUAL == ::CompareStringOrdinal(bstrType, -1, L"Billboard", -1, FALSE))
         {
             type = THEME_CONTROL_TYPE_BILLBOARD;
         }
-        else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, bstrType, -1, L"Button", -1))
+        else if (CSTR_EQUAL == ::CompareStringOrdinal(bstrType, -1, L"Button", -1, FALSE))
         {
             type = THEME_CONTROL_TYPE_BUTTON;
         }
-        else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, bstrType, -1, L"Checkbox", -1))
+        else if (CSTR_EQUAL == ::CompareStringOrdinal(bstrType, -1, L"Checkbox", -1, FALSE))
         {
             type = THEME_CONTROL_TYPE_CHECKBOX;
         }
-        else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, bstrType, -1, L"Combobox", -1))
+        else if (CSTR_EQUAL == ::CompareStringOrdinal(bstrType, -1, L"Combobox", -1, FALSE))
         {
             type = THEME_CONTROL_TYPE_COMBOBOX;
         }
-        else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, bstrType, -1, L"CommandLink", -1))
+        else if (CSTR_EQUAL == ::CompareStringOrdinal(bstrType, -1, L"CommandLink", -1, FALSE))
         {
             type = THEME_CONTROL_TYPE_COMMANDLINK;
         }
-        else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, bstrType, -1, L"Editbox", -1))
+        else if (CSTR_EQUAL == ::CompareStringOrdinal(bstrType, -1, L"Editbox", -1, FALSE))
         {
             type = THEME_CONTROL_TYPE_EDITBOX;
         }
-        else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, bstrType, -1, L"Hyperlink", -1))
+        else if (CSTR_EQUAL == ::CompareStringOrdinal(bstrType, -1, L"Hyperlink", -1, FALSE))
         {
             type = THEME_CONTROL_TYPE_HYPERLINK;
         }
-        else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, bstrType, -1, L"Hypertext", -1))
+        else if (CSTR_EQUAL == ::CompareStringOrdinal(bstrType, -1, L"Hypertext", -1, FALSE))
         {
             type = THEME_CONTROL_TYPE_HYPERTEXT;
         }
-        else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, bstrType, -1, L"ImageControl", -1))
+        else if (CSTR_EQUAL == ::CompareStringOrdinal(bstrType, -1, L"ImageControl", -1, FALSE))
         {
             type = THEME_CONTROL_TYPE_IMAGE;
         }
-        else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, bstrType, -1, L"Label", -1))
+        else if (CSTR_EQUAL == ::CompareStringOrdinal(bstrType, -1, L"Label", -1, FALSE))
         {
             type = THEME_CONTROL_TYPE_LABEL;
         }
-        else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, bstrType, -1, L"ListView", -1))
+        else if (CSTR_EQUAL == ::CompareStringOrdinal(bstrType, -1, L"ListView", -1, FALSE))
         {
             type = THEME_CONTROL_TYPE_LISTVIEW;
         }
-        else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, bstrType, -1, L"Panel", -1))
+        else if (CSTR_EQUAL == ::CompareStringOrdinal(bstrType, -1, L"Panel", -1, FALSE))
         {
             type = THEME_CONTROL_TYPE_PANEL;
         }
-        else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, bstrType, -1, L"Progressbar", -1))
+        else if (CSTR_EQUAL == ::CompareStringOrdinal(bstrType, -1, L"Progressbar", -1, FALSE))
         {
             type = THEME_CONTROL_TYPE_PROGRESSBAR;
         }
-        else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, bstrType, -1, L"Richedit", -1))
+        else if (CSTR_EQUAL == ::CompareStringOrdinal(bstrType, -1, L"Richedit", -1, FALSE))
         {
             type = THEME_CONTROL_TYPE_RICHEDIT;
         }
-        else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, bstrType, -1, L"Static", -1))
+        else if (CSTR_EQUAL == ::CompareStringOrdinal(bstrType, -1, L"Static", -1, FALSE))
         {
             type = THEME_CONTROL_TYPE_STATIC;
         }
-        else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, bstrType, -1, L"Tabs", -1))
+        else if (CSTR_EQUAL == ::CompareStringOrdinal(bstrType, -1, L"Tabs", -1, FALSE))
         {
             type = THEME_CONTROL_TYPE_TAB;
         }
-        else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, bstrType, -1, L"TreeView", -1))
+        else if (CSTR_EQUAL == ::CompareStringOrdinal(bstrType, -1, L"TreeView", -1, FALSE))
         {
             type = THEME_CONTROL_TYPE_TREEVIEW;
         }
@@ -3705,14 +3727,14 @@ static HRESULT ParseActions(
 
             THEME_ACTION* pAction = pControl->rgActions + i;
 
-            if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, bstrType, -1, L"BrowseDirectoryAction", -1))
+            if (CSTR_EQUAL == ::CompareStringOrdinal(bstrType, -1, L"BrowseDirectoryAction", -1, FALSE))
             {
                 pAction->type = THEME_ACTION_TYPE_BROWSE_DIRECTORY;
 
                 hr = XmlGetAttributeEx(pixnChild, L"VariableName", &pAction->BrowseDirectory.sczVariableName);
                 ThmExitOnFailure(hr, "Failed when querying BrowseDirectoryAction/@VariableName attribute.");
             }
-            else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, bstrType, -1, L"ChangePageAction", -1))
+            else if (CSTR_EQUAL == ::CompareStringOrdinal(bstrType, -1, L"ChangePageAction", -1, FALSE))
             {
                 pAction->type = THEME_ACTION_TYPE_CHANGE_PAGE;
 
@@ -3725,7 +3747,7 @@ static HRESULT ParseActions(
                     ThmExitOnFailure(hr, "Failed when querying ChangePageAction/@Cancel attribute.");
                 }
             }
-            else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, bstrType, -1, L"CloseWindowAction", -1))
+            else if (CSTR_EQUAL == ::CompareStringOrdinal(bstrType, -1, L"CloseWindowAction", -1, FALSE))
             {
                 pAction->type = THEME_ACTION_TYPE_CLOSE_WINDOW;
             }
@@ -4367,7 +4389,7 @@ static HRESULT FindImageList(
 
     for (DWORD i = 0; i < pTheme->cImageLists; ++i)
     {
-        if (CSTR_EQUAL == ::CompareStringW(LOCALE_NEUTRAL, 0, pTheme->rgImageLists[i].sczName, -1, wzImageListName, -1))
+        if (CSTR_EQUAL == ::CompareStringOrdinal(pTheme->rgImageLists[i].sczName, -1, wzImageListName, -1, FALSE))
         {
             *phImageList = pTheme->rgImageLists[i].hImageList;
             ExitFunction1(hr = S_OK);
@@ -5027,7 +5049,7 @@ static void OnBrowseDirectory(
         THEME_CONTROL* pControl = pTheme->rgControls + i;
 
         if ((!pControl->wPageId || pControl->wPageId == pTheme->dwCurrentPageId) &&
-            CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, pControl->sczName, -1, pAction->BrowseDirectory.sczVariableName, -1))
+            CSTR_EQUAL == ::CompareStringOrdinal(pControl->sczName, -1, pAction->BrowseDirectory.sczVariableName, -1, FALSE))
         {
             pTargetControl = pControl;
             break;
@@ -5790,7 +5812,7 @@ static HRESULT ShowControl(
 
             hr = S_OK;
 
-            Button_SetCheck(hWnd, (!sczText && !pControl->sczValue) || (sczText && CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, sczText, -1, pControl->sczValue, -1)));
+            Button_SetCheck(hWnd, (!sczText && !pControl->sczValue) || (sczText && CSTR_EQUAL == ::CompareStringOrdinal(sczText, -1, pControl->sczValue, -1, FALSE)));
         }
     }
 
diff --git a/src/libs/dutil/WixToolset.DUtil/xmlutil.cpp b/src/libs/dutil/WixToolset.DUtil/xmlutil.cpp
index 2e1a2200..c4273c2e 100644
--- a/src/libs/dutil/WixToolset.DUtil/xmlutil.cpp
+++ b/src/libs/dutil/WixToolset.DUtil/xmlutil.cpp
@@ -98,7 +98,7 @@ extern "C" void DAPI XmlUninitialize(
         {
             ::CoUninitialize();
         }
-    } 
+    }
 }
 
 extern "C" HRESULT DAPI XmlCreateElement(
@@ -738,7 +738,7 @@ HRESULT DAPI XmlGetYesNoAttribute(
     {
         XmlExitOnFailure(hr, "Failed to get attribute.");
 
-        *pfYes = CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, sczValue, -1, L"yes", -1);
+        *pfYes = CSTR_EQUAL == ::CompareStringOrdinal(sczValue, -1, L"yes", -1, FALSE);
     }
 
 LExit:
diff --git a/src/libs/dutil/dutil.sln b/src/libs/dutil/dutil.sln
deleted file mode 100644
index 9dd7d62b..00000000
--- a/src/libs/dutil/dutil.sln
+++ /dev/null
@@ -1,49 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.30711.63
-MinimumVisualStudioVersion = 15.0.26124.0
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dutil", "WixToolset.DUtil\dutil.vcxproj", "{1244E671-F108-4334-BA52-8A7517F26ECD}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DUtilUnitTest", "test\DUtilUnitTest\DUtilUnitTest.vcxproj", "{AB7EE608-E5FB-42A5-831F-0DEEEA141223}"
-EndProject
-Global
-        GlobalSection(SolutionConfigurationPlatforms) = preSolution
-                Debug|ARM64 = Debug|ARM64
-                Debug|x64 = Debug|x64
-                Debug|x86 = Debug|x86
-                Release|ARM64 = Release|ARM64
-                Release|x64 = Release|x64
-                Release|x86 = Release|x86
-        EndGlobalSection
-        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-                {1244E671-F108-4334-BA52-8A7517F26ECD}.Debug|ARM64.ActiveCfg = Debug|ARM64
-                {1244E671-F108-4334-BA52-8A7517F26ECD}.Debug|ARM64.Build.0 = Debug|ARM64
-                {1244E671-F108-4334-BA52-8A7517F26ECD}.Debug|x64.ActiveCfg = Debug|x64
-                {1244E671-F108-4334-BA52-8A7517F26ECD}.Debug|x64.Build.0 = Debug|x64
-                {1244E671-F108-4334-BA52-8A7517F26ECD}.Debug|x86.ActiveCfg = Debug|Win32
-                {1244E671-F108-4334-BA52-8A7517F26ECD}.Debug|x86.Build.0 = Debug|Win32
-                {1244E671-F108-4334-BA52-8A7517F26ECD}.Release|ARM64.ActiveCfg = Release|ARM64
-                {1244E671-F108-4334-BA52-8A7517F26ECD}.Release|ARM64.Build.0 = Release|ARM64
-                {1244E671-F108-4334-BA52-8A7517F26ECD}.Release|x64.ActiveCfg = Release|x64
-                {1244E671-F108-4334-BA52-8A7517F26ECD}.Release|x64.Build.0 = Release|x64
-                {1244E671-F108-4334-BA52-8A7517F26ECD}.Release|x86.ActiveCfg = Release|Win32
-                {1244E671-F108-4334-BA52-8A7517F26ECD}.Release|x86.Build.0 = Release|Win32
-                {AB7EE608-E5FB-42A5-831F-0DEEEA141223}.Debug|ARM64.ActiveCfg = Debug|x64
-                {AB7EE608-E5FB-42A5-831F-0DEEEA141223}.Debug|x64.ActiveCfg = Debug|x64
-                {AB7EE608-E5FB-42A5-831F-0DEEEA141223}.Debug|x64.Build.0 = Debug|x64
-                {AB7EE608-E5FB-42A5-831F-0DEEEA141223}.Debug|x86.ActiveCfg = Debug|Win32
-                {AB7EE608-E5FB-42A5-831F-0DEEEA141223}.Debug|x86.Build.0 = Debug|Win32
-                {AB7EE608-E5FB-42A5-831F-0DEEEA141223}.Release|ARM64.ActiveCfg = Release|x64
-                {AB7EE608-E5FB-42A5-831F-0DEEEA141223}.Release|x64.ActiveCfg = Release|x64
-                {AB7EE608-E5FB-42A5-831F-0DEEEA141223}.Release|x64.Build.0 = Release|x64
-                {AB7EE608-E5FB-42A5-831F-0DEEEA141223}.Release|x86.ActiveCfg = Release|Win32
-                {AB7EE608-E5FB-42A5-831F-0DEEEA141223}.Release|x86.Build.0 = Release|Win32
-        EndGlobalSection
-        GlobalSection(SolutionProperties) = preSolution
-                HideSolutionNode = FALSE
-        EndGlobalSection
-        GlobalSection(ExtensibilityGlobals) = postSolution
-                SolutionGuid = {DD209744-C40E-4C34-8CB4-BC6B71F9A133}
-        EndGlobalSection
-EndGlobal
diff --git a/src/libs/dutil/dutil.slnx b/src/libs/dutil/dutil.slnx
new file mode 100644
index 00000000..e4a94156
--- /dev/null
+++ b/src/libs/dutil/dutil.slnx
@@ -0,0 +1,12 @@
+<Solution>
+  <Configurations>
+    <Platform Name="ARM64" />
+    <Platform Name="x64" />
+    <Platform Name="x86" />
+  </Configurations>
+  <Project Path="test/DUtilUnitTest/DUtilUnitTest.vcxproj" Id="ab7ee608-e5fb-42a5-831f-0deeea141223">
+    <Platform Solution="*|ARM64" Project="x64" />
+    <Build Solution="*|ARM64" Project="false" />
+  </Project>
+  <Project Path="WixToolset.DUtil/dutil.vcxproj" Id="1244e671-f108-4334-ba52-8a7517f26ecd" />
+</Solution>
diff --git a/src/libs/dutil/test/DUtilUnitTest/DUtilUnitTest.vcxproj b/src/libs/dutil/test/DUtilUnitTest/DUtilUnitTest.vcxproj
index fccb73c4..e12eac00 100644
--- a/src/libs/dutil/test/DUtilUnitTest/DUtilUnitTest.vcxproj
+++ b/src/libs/dutil/test/DUtilUnitTest/DUtilUnitTest.vcxproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
 
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\internal\WixInternal.TestSupport.Native\build\WixInternal.TestSupport.Native.props" />
 
   <ItemGroup Label="ProjectConfigurations">
diff --git a/src/libs/dutil/test/DUtilUnitTest/DUtilUnitTest.vcxproj.filters b/src/libs/dutil/test/DUtilUnitTest/DUtilUnitTest.vcxproj.filters
index e4972c1a..b236ed80 100644
--- a/src/libs/dutil/test/DUtilUnitTest/DUtilUnitTest.vcxproj.filters
+++ b/src/libs/dutil/test/DUtilUnitTest/DUtilUnitTest.vcxproj.filters
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Source Files">
       <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
@@ -102,4 +102,4 @@
     <None Include="TestData\LocUtilTests\strings.wxl" />
     <None Include="TestData\LocUtilTests\controls.wxl" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libs/dutil/test/DUtilUnitTest/FileUtilTest.cpp b/src/libs/dutil/test/DUtilUnitTest/FileUtilTest.cpp
index 8ea045f5..80fe2f1a 100644
--- a/src/libs/dutil/test/DUtilUnitTest/FileUtilTest.cpp
+++ b/src/libs/dutil/test/DUtilUnitTest/FileUtilTest.cpp
@@ -11,43 +11,43 @@ namespace DutilTests
     public ref class FileUtil
     {
     public:
-        [Fact(Skip="Skipped until we have a good way to reference ANSI.txt.")]
-        void FileUtilTest()
-        {
-            HRESULT hr = S_OK;
-            LPWSTR sczTempDir = NULL;
-            LPWSTR sczFileDir = NULL;
-
-            DutilInitialize(&DutilTestTraceError);
-
-            try
-            {
-                hr = PathExpand(&sczTempDir, L"%TEMP%\\FileUtilTest\\", PATH_EXPAND_ENVIRONMENT);
-                NativeAssert::Succeeded(hr, "Failed to get temp dir");
-
-                hr = PathExpand(&sczFileDir, L"%WIX_ROOT%\\examples\\data\\TextEncodings\\", PATH_EXPAND_ENVIRONMENT);
-                NativeAssert::Succeeded(hr, "Failed to get path to encodings file dir");
-
-                hr = DirEnsureExists(sczTempDir, NULL);
-                NativeAssert::Succeeded(hr, "Failed to ensure directory exists: {0}", sczTempDir);
-
-                TestFile(sczFileDir, sczTempDir, L"ANSI.txt", 32, FILE_ENCODING_UTF8);
-                // Big endian not supported today!
-                //TestFile(sczFileDir, L"UnicodeBENoBOM.txt", 34);
-                //TestFile(sczFileDir, L"UnicodeBEWithBOM.txt", 34);
-                TestFile(sczFileDir, sczTempDir, L"UnicodeLENoBOM.txt", 34, FILE_ENCODING_UTF16);
-                TestFile(sczFileDir, sczTempDir, L"UnicodeLEWithBOM.txt", 34, FILE_ENCODING_UTF16_WITH_BOM);
-                TestFile(sczFileDir, sczTempDir, L"UTF8WithSignature.txt", 34, FILE_ENCODING_UTF8_WITH_BOM);
-
-                hr = DirEnsureDelete(sczTempDir, TRUE, TRUE);
-            }
-            finally
-            {
-                ReleaseStr(sczTempDir);
-                ReleaseStr(sczFileDir);
-                DutilUninitialize();
-            }
-        }
+        // [Fact(Skip="Skipped until we have a good way to reference ANSI.txt.")]
+        // void FileUtilTest()
+        // {
+        //     HRESULT hr = S_OK;
+        //     LPWSTR sczTempDir = NULL;
+        //     LPWSTR sczFileDir = NULL;
+
+        //     DutilInitialize(&DutilTestTraceError);
+
+        //     try
+        //     {
+        //         hr = PathExpand(&sczTempDir, L"%TEMP%\\FileUtilTest\\", PATH_EXPAND_ENVIRONMENT);
+        //         NativeAssert::Succeeded(hr, "Failed to get temp dir");
+
+        //         hr = PathExpand(&sczFileDir, L"%WIX_ROOT%\\examples\\data\\TextEncodings\\", PATH_EXPAND_ENVIRONMENT);
+        //         NativeAssert::Succeeded(hr, "Failed to get path to encodings file dir");
+
+        //         hr = DirEnsureExists(sczTempDir, NULL);
+        //         NativeAssert::Succeeded(hr, "Failed to ensure directory exists: {0}", sczTempDir);
+
+        //         TestFile(sczFileDir, sczTempDir, L"ANSI.txt", 32, FILE_ENCODING_UTF8);
+        //         // Big endian not supported today!
+        //         //TestFile(sczFileDir, L"UnicodeBENoBOM.txt", 34);
+        //         //TestFile(sczFileDir, L"UnicodeBEWithBOM.txt", 34);
+        //         TestFile(sczFileDir, sczTempDir, L"UnicodeLENoBOM.txt", 34, FILE_ENCODING_UTF16);
+        //         TestFile(sczFileDir, sczTempDir, L"UnicodeLEWithBOM.txt", 34, FILE_ENCODING_UTF16_WITH_BOM);
+        //         TestFile(sczFileDir, sczTempDir, L"UTF8WithSignature.txt", 34, FILE_ENCODING_UTF8_WITH_BOM);
+
+        //         hr = DirEnsureDelete(sczTempDir, TRUE, TRUE);
+        //     }
+        //     finally
+        //     {
+        //         ReleaseStr(sczTempDir);
+        //         ReleaseStr(sczFileDir);
+        //         DutilUninitialize();
+        //     }
+        // }
 
     private:
         void TestFile(LPWSTR wzDir, LPCWSTR wzTempDir, LPWSTR wzFileName, size_t cbExpectedStringLength, FILE_ENCODING feExpectedEncoding)
diff --git a/src/libs/dutil/test/DUtilUnitTest/LocControlsUtilTests.cpp b/src/libs/dutil/test/DUtilUnitTest/LocControlsUtilTests.cpp
index a558c0c5..fd8679cb 100644
--- a/src/libs/dutil/test/DUtilUnitTest/LocControlsUtilTests.cpp
+++ b/src/libs/dutil/test/DUtilUnitTest/LocControlsUtilTests.cpp
@@ -15,6 +15,7 @@ namespace DutilTests
         void CanLoadControlsWxl()
         {
             HRESULT hr = S_OK;
+            DWORD dwRetry = 0;
             WIX_LOCALIZATION* pLoc = NULL;
             LOC_CONTROL* pLocControl = NULL;
 
@@ -26,7 +27,15 @@ namespace DutilTests
                 NativeAssert::Succeeded(hr, "Failed to initialize Xml.");
 
                 pin_ptr<const wchar_t> wxlFilePath = PtrToStringChars(TestData::Get("TestData", "LocUtilTests", "controls.wxl"));
-                hr = LocLoadFromFile(wxlFilePath, &pLoc);
+                do
+                {
+                    if (FAILED(hr))
+                    {
+                        ::Sleep(500);
+                    }
+
+                    hr = LocLoadFromFile(wxlFilePath, &pLoc);
+                } while (FAILED(hr) && ++dwRetry < 5);
                 NativeAssert::Succeeded(hr, "Failed to parse controls.wxl: {0}", wxlFilePath);
 
                 Assert::Equal(3ul, pLoc->cLocControls);
diff --git a/src/libs/dutil/test/DUtilUnitTest/LocStringsUtilTests.cpp b/src/libs/dutil/test/DUtilUnitTest/LocStringsUtilTests.cpp
index 1bfc4bb4..04130098 100644
--- a/src/libs/dutil/test/DUtilUnitTest/LocStringsUtilTests.cpp
+++ b/src/libs/dutil/test/DUtilUnitTest/LocStringsUtilTests.cpp
@@ -15,6 +15,7 @@ namespace DutilTests
         void CanLoadStringsWxl()
         {
             HRESULT hr = S_OK;
+            DWORD dwRetry = 0;
             WIX_LOCALIZATION* pLoc = NULL;
             LOC_STRING* pLocString = NULL;
             LPWSTR sczValue = NULL;
@@ -27,7 +28,15 @@ namespace DutilTests
                 NativeAssert::Succeeded(hr, "Failed to initialize Xml.");
 
                 pin_ptr<const wchar_t> wxlFilePath = PtrToStringChars(TestData::Get("TestData", "LocUtilTests", "strings.wxl"));
-                hr = LocLoadFromFile(wxlFilePath, &pLoc);
+                do
+                {
+                    if (FAILED(hr))
+                    {
+                        ::Sleep(500);
+                    }
+
+                    hr = LocLoadFromFile(wxlFilePath, &pLoc);
+                } while (FAILED(hr) && ++dwRetry < 5);
                 NativeAssert::Succeeded(hr, "Failed to parse strings.wxl: {0}", wxlFilePath);
 
                 Assert::Equal(4ul, pLoc->cLocStrings);
diff --git a/src/libs/dutil/test/DUtilUnitTest/MonUtilTest.cpp b/src/libs/dutil/test/DUtilUnitTest/MonUtilTest.cpp
index d9c75bf6..f10673fa 100644
--- a/src/libs/dutil/test/DUtilUnitTest/MonUtilTest.cpp
+++ b/src/libs/dutil/test/DUtilUnitTest/MonUtilTest.cpp
@@ -38,452 +38,452 @@ namespace DutilTests
         DWORD cDirectories;
     };
 
-    public delegate void MonGeneralDelegate(HRESULT, LPVOID);
-
-    public delegate void MonDriveStatusDelegate(WCHAR, BOOL, LPVOID);
-
-    public delegate void MonDirectoryDelegate(HRESULT, LPCWSTR, BOOL, LPVOID, LPVOID);
-
-    public delegate void MonRegKeyDelegate(HRESULT, HKEY, LPCWSTR, REG_KEY_BITNESS, BOOL, LPVOID, LPVOID);
-
-    static void MonGeneral(
-        __in HRESULT /*hrResult*/,
-        __in_opt LPVOID /*pvContext*/
-        )
-    {
-        Assert::True(false);
-    }
-
-    static void MonDriveStatus(
-        __in WCHAR /*chDrive*/,
-        __in BOOL /*fArriving*/,
-        __in_opt LPVOID /*pvContext*/
-        )
-    {
-    }
-
-    static void MonDirectory(
-        __in HRESULT hrResult,
-        __in_z LPCWSTR wzPath,
-        __in_z BOOL fRecursive,
-        __in_opt LPVOID pvContext,
-        __in_opt LPVOID pvDirectoryContext
-        )
-    {
-        Assert::Equal(S_OK, hrResult);
-        Assert::Equal<DWORD_PTR>(0, reinterpret_cast<DWORD_PTR>(pvDirectoryContext));
-
-        HRESULT hr = S_OK;
-        Results *pResults = reinterpret_cast<Results *>(pvContext);
-
-        hr = MemEnsureArraySize(reinterpret_cast<LPVOID*>(&pResults->rgDirectories), pResults->cDirectories + 1, sizeof(Directory), 5);
-        NativeAssert::ValidReturnCode(hr, S_OK);
-        ++pResults->cDirectories;
-
-        pResults->rgDirectories[pResults->cDirectories - 1].hr = hrResult;
-        pResults->rgDirectories[pResults->cDirectories - 1].wzPath = wzPath;
-        pResults->rgDirectories[pResults->cDirectories - 1].fRecursive = fRecursive;
-    }
-
-    static void MonRegKey(
-        __in HRESULT hrResult,
-        __in HKEY hkRoot,
-        __in_z LPCWSTR wzSubKey,
-        __in REG_KEY_BITNESS kbKeyBitness,
-        __in_z BOOL fRecursive,
-        __in_opt LPVOID pvContext,
-        __in_opt LPVOID pvRegKeyContext
-        )
-    {
-        Assert::Equal<HRESULT>(S_OK, hrResult);
-        Assert::Equal<DWORD_PTR>(0, reinterpret_cast<DWORD_PTR>(pvRegKeyContext));
-
-        HRESULT hr = S_OK;
-        Results *pResults = reinterpret_cast<Results *>(pvContext);
-
-        hr = MemEnsureArraySize(reinterpret_cast<LPVOID*>(&pResults->rgRegKeys), pResults->cRegKeys + 1, sizeof(RegKey), 5);
-        NativeAssert::ValidReturnCode(hr, S_OK);
-        ++pResults->cRegKeys;
-
-        pResults->rgRegKeys[pResults->cRegKeys - 1].hr = hrResult;
-        pResults->rgRegKeys[pResults->cRegKeys - 1].hkRoot = hkRoot;
-        pResults->rgRegKeys[pResults->cRegKeys - 1].wzSubKey = wzSubKey;
-        pResults->rgRegKeys[pResults->cRegKeys - 1].kbKeyBitness = kbKeyBitness;
-        pResults->rgRegKeys[pResults->cRegKeys - 1].fRecursive = fRecursive;
-    }
-
-    public ref class MonUtil
-    {
-    public:
-        void ClearResults(Results *pResults)
-        {
-            ReleaseNullMem(pResults->rgDirectories);
-            pResults->cDirectories = 0;
-            ReleaseNullMem(pResults->rgRegKeys);
-            pResults->cRegKeys = 0;
-        }
-
-        void RemoveDirectory(LPCWSTR wzPath)
-        {
-            DWORD dwRetryCount = 0;
-            const DWORD c_dwMaxRetryCount = 100;
-            const DWORD c_dwRetryInterval = 50;
-
-            HRESULT hr = DirEnsureDelete(wzPath, TRUE, TRUE);
-
-            // Monitoring a directory opens a handle to that directory, which means delete requests for that directory will succeed
-            // (and deletion will be "pending" until our monitor handle is closed)
-            // but deletion of the directory containing that directory cannot complete until the handle is closed. This means DirEnsureDelete()
-            // can sometimes encounter HRESULT_FROM_WIN32(ERROR_DIR_NOT_EMPTY) failures, which just means it needs to retry a bit later
-            // (after the waiter thread wakes up, it will release the handle)
-            while (HRESULT_FROM_WIN32(ERROR_DIR_NOT_EMPTY) == hr && c_dwMaxRetryCount > dwRetryCount)
-            {
-                ::Sleep(c_dwRetryInterval);
-                ++dwRetryCount;
-                hr = DirEnsureDelete(wzPath, TRUE, TRUE);
-            }
-
-            NativeAssert::ValidReturnCode(hr, S_OK, S_FALSE, E_PATHNOTFOUND);
-        }
-
-        void TestDirectory(MON_HANDLE handle, Results *pResults)
-        {
-            HRESULT hr  = S_OK;
-            LPWSTR sczShallowPath = NULL;
-            LPWSTR sczParentPath = NULL;
-            LPWSTR sczDeepPath = NULL;
-            LPWSTR sczChildPath = NULL;
-            LPWSTR sczChildFilePath = NULL;
-
-            try
-            {
-                hr = PathExpand(&sczShallowPath, L"%TEMP%\\MonUtilTest\\", PATH_EXPAND_ENVIRONMENT);
-                NativeAssert::ValidReturnCode(hr, S_OK);
-
-                hr = PathExpand(&sczParentPath, L"%TEMP%\\MonUtilTest\\sub\\folder\\that\\might\\not\\", PATH_EXPAND_ENVIRONMENT);
-                NativeAssert::ValidReturnCode(hr, S_OK);
-
-                hr = PathExpand(&sczDeepPath, L"%TEMP%\\MonUtilTest\\sub\\folder\\that\\might\\not\\exist\\", PATH_EXPAND_ENVIRONMENT);
-                NativeAssert::ValidReturnCode(hr, S_OK);
-
-                hr = PathExpand(&sczChildPath, L"%TEMP%\\MonUtilTest\\sub\\folder\\that\\might\\not\\exist\\some\\sub\\folder\\", PATH_EXPAND_ENVIRONMENT);
-                NativeAssert::ValidReturnCode(hr, S_OK);
-
-                hr = PathExpand(&sczChildFilePath, L"%TEMP%\\MonUtilTest\\sub\\folder\\that\\might\\not\\exist\\some\\sub\\folder\\file.txt", PATH_EXPAND_ENVIRONMENT);
-                NativeAssert::ValidReturnCode(hr, S_OK);
-
-                RemoveDirectory(sczShallowPath);
-
-                hr = MonAddDirectory(handle, sczDeepPath, TRUE, SILENCEPERIOD, NULL);
-                NativeAssert::ValidReturnCode(hr, S_OK);
-
-                hr = DirEnsureExists(sczParentPath, NULL);
-                NativeAssert::ValidReturnCode(hr, S_OK, S_FALSE);
-                // Make sure creating the parent directory does nothing, even after silence period
-                ::Sleep(FULLWAIT);
-                Assert::Equal<DWORD>(0, pResults->cDirectories);
-
-                // Now create the target path, no notification until after the silence period
-                hr = DirEnsureExists(sczDeepPath, NULL);
-                NativeAssert::ValidReturnCode(hr, S_OK, S_FALSE);
-                ::Sleep(PREWAIT);
-                Assert::Equal<DWORD>(0, pResults->cDirectories);
-
-                // Now after the full silence period, it should have triggered
-                ::Sleep(POSTWAIT);
-                Assert::Equal<DWORD>(1, pResults->cDirectories);
-                NativeAssert::ValidReturnCode(pResults->rgDirectories[0].hr, S_OK);
-
-                // Now delete the directory, along with a ton of parents. This verifies MonUtil will keep watching the closest parent that still exists.
-                RemoveDirectory(sczShallowPath);
-
-                ::Sleep(FULLWAIT);
-                Assert::Equal<DWORD>(2, pResults->cDirectories);
-                NativeAssert::ValidReturnCode(pResults->rgDirectories[1].hr, S_OK);
-
-                // Create the parent directory again, still should be nothing even after full silence period
-                hr = DirEnsureExists(sczParentPath, NULL);
-                NativeAssert::ValidReturnCode(hr, S_OK, S_FALSE);
-                ::Sleep(FULLWAIT);
-                Assert::Equal<DWORD>(2, pResults->cDirectories);
-
-                hr = DirEnsureExists(sczChildPath, NULL);
-                NativeAssert::ValidReturnCode(hr, S_OK, S_FALSE);
-                ::Sleep(PREWAIT);
-                Assert::Equal<DWORD>(2, pResults->cDirectories);
-
-                ::Sleep(POSTWAIT);
-                Assert::Equal<DWORD>(3, pResults->cDirectories);
-                NativeAssert::ValidReturnCode(pResults->rgDirectories[2].hr, S_OK);
-
-                // Write a file to a deep child subfolder, and make sure it's detected
-                hr = FileFromString(sczChildFilePath, 0, L"contents", FILE_ENCODING_UTF16_WITH_BOM);
-                NativeAssert::ValidReturnCode(hr, S_OK);
-                ::Sleep(PREWAIT);
-                Assert::Equal<DWORD>(3, pResults->cDirectories);
-
-                ::Sleep(POSTWAIT);
-                Assert::Equal<DWORD>(4, pResults->cDirectories);
-                NativeAssert::ValidReturnCode(pResults->rgDirectories[2].hr, S_OK);
-
-                RemoveDirectory(sczParentPath);
-
-                ::Sleep(FULLWAIT);
-                Assert::Equal<DWORD>(5, pResults->cDirectories);
-                NativeAssert::ValidReturnCode(pResults->rgDirectories[3].hr, S_OK);
-
-                // Now remove the directory from the list of things to monitor, and confirm changes are no longer tracked
-                hr = MonRemoveDirectory(handle, sczDeepPath, TRUE);
-                NativeAssert::ValidReturnCode(hr, S_OK);
-                ::Sleep(PREWAIT);
-
-                hr = DirEnsureExists(sczDeepPath, NULL);
-                NativeAssert::ValidReturnCode(hr, S_OK, S_FALSE);
-                ::Sleep(FULLWAIT);
-                Assert::Equal<DWORD>(5, pResults->cDirectories);
-                NativeAssert::ValidReturnCode(pResults->rgDirectories[3].hr, S_OK);
-
-                // Finally, add it back so we can test multiple things to monitor at once
-                hr = MonAddDirectory(handle, sczDeepPath, TRUE, SILENCEPERIOD, NULL);
-                NativeAssert::ValidReturnCode(hr, S_OK);
-            }
-            finally
-            {
-                ReleaseStr(sczShallowPath);
-                ReleaseStr(sczDeepPath);
-                ReleaseStr(sczParentPath);
-            }
-        }
-
-        void TestRegKey(MON_HANDLE handle, Results *pResults)
-        {
-            HRESULT hr = S_OK;
-            LPCWSTR wzShallowRegKey = L"Software\\MonUtilTest\\";
-            LPCWSTR wzParentRegKey = L"Software\\MonUtilTest\\sub\\folder\\that\\might\\not\\";
-            LPCWSTR wzDeepRegKey = L"Software\\MonUtilTest\\sub\\folder\\that\\might\\not\\exist\\";
-            LPCWSTR wzChildRegKey = L"Software\\MonUtilTest\\sub\\folder\\that\\might\\not\\exist\\some\\sub\\folder\\";
-            HKEY hk = NULL;
-
-            try
-            {
-                hr = RegDelete(HKEY_CURRENT_USER, wzShallowRegKey, REG_KEY_32BIT, TRUE);
-                NativeAssert::ValidReturnCode(hr, S_OK, S_FALSE, E_PATHNOTFOUND);
-
-                hr = MonAddRegKey(handle, HKEY_CURRENT_USER, wzDeepRegKey, REG_KEY_DEFAULT, TRUE, SILENCEPERIOD, NULL);
-                NativeAssert::ValidReturnCode(hr, S_OK);
-
-                hr = RegCreate(HKEY_CURRENT_USER, wzParentRegKey, KEY_SET_VALUE | KEY_QUERY_VALUE | KEY_WOW64_32KEY, &hk);
-                ReleaseRegKey(hk);
-                // Make sure creating the parent key does nothing, even after silence period
-                ::Sleep(FULLWAIT);
-                NativeAssert::ValidReturnCode(hr, S_OK, S_FALSE);
-                Assert::Equal<DWORD>(0, pResults->cRegKeys);
-
-                // Now create the target path, no notification until after the silence period
-                hr = RegCreate(HKEY_CURRENT_USER, wzDeepRegKey, KEY_SET_VALUE | KEY_QUERY_VALUE | KEY_WOW64_32KEY, &hk);
-                NativeAssert::ValidReturnCode(hr, S_OK, S_FALSE);
-                ReleaseRegKey(hk);
-                ::Sleep(PREWAIT);
-                Assert::Equal<DWORD>(0, pResults->cRegKeys);
-
-                // Now after the full silence period, it should have triggered
-                ::Sleep(POSTWAIT);
-                Assert::Equal<DWORD>(1, pResults->cRegKeys);
-                NativeAssert::ValidReturnCode(pResults->rgRegKeys[0].hr, S_OK);
-
-                // Now delete the directory, along with a ton of parents. This verifies MonUtil will keep watching the closest parent that still exists.
-                hr = RegDelete(HKEY_CURRENT_USER, wzShallowRegKey, REG_KEY_32BIT, TRUE);
-                NativeAssert::ValidReturnCode(hr, S_OK, S_FALSE, E_PATHNOTFOUND);
-                ::Sleep(PREWAIT);
-                Assert::Equal<DWORD>(1, pResults->cRegKeys);
-
-                ::Sleep(FULLWAIT);
-                Assert::Equal<DWORD>(2, pResults->cRegKeys);
-                NativeAssert::ValidReturnCode(pResults->rgRegKeys[1].hr, S_OK);
-
-                // Create the parent directory again, still should be nothing even after full silence period
-                hr = RegCreate(HKEY_CURRENT_USER, wzParentRegKey, KEY_SET_VALUE | KEY_QUERY_VALUE | KEY_WOW64_32KEY, &hk);
-                NativeAssert::ValidReturnCode(hr, S_OK, S_FALSE);
-                ReleaseRegKey(hk);
-                ::Sleep(FULLWAIT);
-                Assert::Equal<DWORD>(2, pResults->cRegKeys);
-
-                hr = RegCreate(HKEY_CURRENT_USER, wzChildRegKey, KEY_SET_VALUE | KEY_QUERY_VALUE | KEY_WOW64_32KEY, &hk);
-                NativeAssert::ValidReturnCode(hr, S_OK, S_FALSE);
-                ::Sleep(PREWAIT);
-                Assert::Equal<DWORD>(2, pResults->cRegKeys);
-
-                ::Sleep(FULLWAIT);
-                Assert::Equal<DWORD>(3, pResults->cRegKeys);
-                NativeAssert::ValidReturnCode(pResults->rgRegKeys[2].hr, S_OK);
-
-                // Write a registry value to some deep child subkey, and make sure it's detected
-                hr = RegWriteString(hk, L"valuename", L"testvalue");
-                NativeAssert::ValidReturnCode(hr, S_OK);
-                ReleaseRegKey(hk);
-                ::Sleep(PREWAIT);
-                Assert::Equal<DWORD>(3, pResults->cRegKeys);
-
-                ::Sleep(FULLWAIT);
-                Assert::Equal<DWORD>(4, pResults->cRegKeys);
-                NativeAssert::ValidReturnCode(pResults->rgRegKeys[2].hr, S_OK);
-
-                hr = RegDelete(HKEY_CURRENT_USER, wzDeepRegKey, REG_KEY_32BIT, TRUE);
-                NativeAssert::ValidReturnCode(hr, S_OK);
-
-                ::Sleep(FULLWAIT);
-                Assert::Equal<DWORD>(5, pResults->cRegKeys);
-
-                // Now remove the regkey from the list of things to monitor, and confirm changes are no longer tracked
-                hr = MonRemoveRegKey(handle, HKEY_CURRENT_USER, wzDeepRegKey, REG_KEY_DEFAULT, TRUE);
-                NativeAssert::ValidReturnCode(hr, S_OK);
-
-                hr = RegCreate(HKEY_CURRENT_USER, wzDeepRegKey, KEY_SET_VALUE | KEY_QUERY_VALUE | KEY_WOW64_32KEY, &hk);
-                NativeAssert::ValidReturnCode(hr, S_OK, S_FALSE);
-                ReleaseRegKey(hk);
-                ::Sleep(FULLWAIT);
-                Assert::Equal<DWORD>(5, pResults->cRegKeys);
-            }
-            finally
-            {
-                ReleaseRegKey(hk);
-            }
-        }
-
-        void TestMoreThan64(MON_HANDLE handle, Results *pResults)
-        {
-            HRESULT hr  = S_OK;
-            LPWSTR sczBaseDir = NULL;
-            LPWSTR sczDir = NULL;
-            LPWSTR sczFile = NULL;
-
-            try
-            {
-                hr = PathExpand(&sczBaseDir, L"%TEMP%\\ScalabilityTest\\", PATH_EXPAND_ENVIRONMENT);
-                NativeAssert::ValidReturnCode(hr, S_OK);
-
-                for (DWORD i = 0; i < 200; ++i)
-                {
-                    hr = StrAllocFormatted(&sczDir, L"%ls%u\\", sczBaseDir, i);
-                    NativeAssert::ValidReturnCode(hr, S_OK);
-
-                    hr = DirEnsureExists(sczDir, NULL);
-                    NativeAssert::ValidReturnCode(hr, S_OK, S_FALSE);
-
-                    hr = MonAddDirectory(handle, sczDir, FALSE, SILENCEPERIOD, NULL);
-                    NativeAssert::ValidReturnCode(hr, S_OK);
-                }
-
-                hr = PathConcat(sczDir, L"file.txt", &sczFile);
-                NativeAssert::ValidReturnCode(hr, S_OK);
-
-                hr = FileFromString(sczFile, 0, L"contents", FILE_ENCODING_UTF16_WITH_BOM);
-                NativeAssert::ValidReturnCode(hr, S_OK);
-
-                ::Sleep(FULLWAIT);
-                Assert::Equal<DWORD>(1, pResults->cDirectories);
-
-                for (DWORD i = 0; i < 199; ++i)
-                {
-                    hr = StrAllocFormatted(&sczDir, L"%ls%u\\", sczBaseDir, i);
-                    NativeAssert::ValidReturnCode(hr, S_OK);
-
-                    hr = MonRemoveDirectory(handle, sczDir, FALSE);
-                    NativeAssert::ValidReturnCode(hr, S_OK);
-                }
-                ::Sleep(FULLWAIT);
-
-                hr = FileFromString(sczFile, 0, L"contents2", FILE_ENCODING_UTF16_WITH_BOM);
-                NativeAssert::ValidReturnCode(hr, S_OK);
-
-                ::Sleep(FULLWAIT);
-                Assert::Equal<DWORD>(2, pResults->cDirectories);
-
-                for (DWORD i = 0; i < 199; ++i)
-                {
-                    hr = StrAllocFormatted(&sczDir, L"%ls%u\\", sczBaseDir, i);
-                    NativeAssert::ValidReturnCode(hr, S_OK);
-
-                    hr = MonAddDirectory(handle, sczDir, FALSE, SILENCEPERIOD, NULL);
-                    NativeAssert::ValidReturnCode(hr, S_OK);
-                }
-                ::Sleep(FULLWAIT);
-
-                hr = FileFromString(sczFile, 0, L"contents3", FILE_ENCODING_UTF16_WITH_BOM);
-                NativeAssert::ValidReturnCode(hr, S_OK);
-
-                ::Sleep(FULLWAIT);
-                Assert::Equal<DWORD>(3, pResults->cDirectories);
-            }
-            finally
-            {
-                ReleaseStr(sczBaseDir);
-                ReleaseStr(sczDir);
-                ReleaseStr(sczFile);
-            }
-        }
-
-        [Fact(Skip = "Test demonstrates failure")]
-        void MonUtilTest()
-        {
-            HRESULT hr = S_OK;
-            MON_HANDLE handle = NULL;
-            List<GCHandle>^ gcHandles = gcnew List<GCHandle>();
-            Results *pResults = (Results *)MemAlloc(sizeof(Results), TRUE);
-            Assert::True(NULL != pResults);
-
-            try
-            {
-                // These ensure the function pointers we send point to this thread's appdomain, which helps with assembly binding when running tests within msbuild
-                MonGeneralDelegate^ fpMonGeneral = gcnew MonGeneralDelegate(MonGeneral);
-                GCHandle gchMonGeneral = GCHandle::Alloc(fpMonGeneral);
-                gcHandles->Add(gchMonGeneral);
-                IntPtr ipMonGeneral = Marshal::GetFunctionPointerForDelegate(fpMonGeneral);
-
-                MonDriveStatusDelegate^ fpMonDriveStatus = gcnew MonDriveStatusDelegate(MonDriveStatus);
-                GCHandle gchMonDriveStatus = GCHandle::Alloc(fpMonDriveStatus);
-                gcHandles->Add(gchMonDriveStatus);
-                IntPtr ipMonDriveStatus = Marshal::GetFunctionPointerForDelegate(fpMonDriveStatus);
-
-                MonDirectoryDelegate^ fpMonDirectory = gcnew MonDirectoryDelegate(MonDirectory);
-                GCHandle gchMonDirectory = GCHandle::Alloc(fpMonDirectory);
-                gcHandles->Add(gchMonDirectory);
-                IntPtr ipMonDirectory = Marshal::GetFunctionPointerForDelegate(fpMonDirectory);
-
-                MonRegKeyDelegate^ fpMonRegKey = gcnew MonRegKeyDelegate(MonRegKey);
-                GCHandle gchMonRegKey = GCHandle::Alloc(fpMonRegKey);
-                gcHandles->Add(gchMonRegKey);
-                IntPtr ipMonRegKey = Marshal::GetFunctionPointerForDelegate(fpMonRegKey);
-
-                // "Silence period" is 100 ms
-                hr = MonCreate(&handle, static_cast<PFN_MONGENERAL>(ipMonGeneral.ToPointer()), static_cast<PFN_MONDRIVESTATUS>(ipMonDriveStatus.ToPointer()), static_cast<PFN_MONDIRECTORY>(ipMonDirectory.ToPointer()), static_cast<PFN_MONREGKEY>(ipMonRegKey.ToPointer()), pResults);
-                NativeAssert::ValidReturnCode(hr, S_OK);
-
-                hr = RegInitialize();
-                NativeAssert::ValidReturnCode(hr, S_OK);
-
-                TestDirectory(handle, pResults);
-                ClearResults(pResults);
-                TestRegKey(handle, pResults);
-                ClearResults(pResults);
-                TestMoreThan64(handle, pResults);
-                ClearResults(pResults);
-            }
-            finally
-            {
-                ReleaseMon(handle);
-
-                for each (GCHandle gcHandle in gcHandles)
-                {
-                    gcHandle.Free();
-                }
-
-                ReleaseMem(pResults->rgDirectories);
-                ReleaseMem(pResults->rgRegKeys);
-                ReleaseMem(pResults);
-
-                RegUninitialize();
-            }
-        }
-    };
+    // public delegate void MonGeneralDelegate(HRESULT, LPVOID);
+
+    // public delegate void MonDriveStatusDelegate(WCHAR, BOOL, LPVOID);
+
+    // public delegate void MonDirectoryDelegate(HRESULT, LPCWSTR, BOOL, LPVOID, LPVOID);
+
+    // public delegate void MonRegKeyDelegate(HRESULT, HKEY, LPCWSTR, REG_KEY_BITNESS, BOOL, LPVOID, LPVOID);
+
+    // static void MonGeneral(
+    //     __in HRESULT /*hrResult*/,
+    //     __in_opt LPVOID /*pvContext*/
+    //     )
+    // {
+    //     Assert::True(false);
+    // }
+
+    // static void MonDriveStatus(
+    //     __in WCHAR /*chDrive*/,
+    //     __in BOOL /*fArriving*/,
+    //     __in_opt LPVOID /*pvContext*/
+    //     )
+    // {
+    // }
+
+    // static void MonDirectory(
+    //     __in HRESULT hrResult,
+    //     __in_z LPCWSTR wzPath,
+    //     __in_z BOOL fRecursive,
+    //     __in_opt LPVOID pvContext,
+    //     __in_opt LPVOID pvDirectoryContext
+    //     )
+    // {
+    //     Assert::Equal(S_OK, hrResult);
+    //     Assert::Equal<DWORD_PTR>(0, reinterpret_cast<DWORD_PTR>(pvDirectoryContext));
+
+    //     HRESULT hr = S_OK;
+    //     Results *pResults = reinterpret_cast<Results *>(pvContext);
+
+    //     hr = MemEnsureArraySize(reinterpret_cast<LPVOID*>(&pResults->rgDirectories), pResults->cDirectories + 1, sizeof(Directory), 5);
+    //     NativeAssert::ValidReturnCode(hr, S_OK);
+    //     ++pResults->cDirectories;
+
+    //     pResults->rgDirectories[pResults->cDirectories - 1].hr = hrResult;
+    //     pResults->rgDirectories[pResults->cDirectories - 1].wzPath = wzPath;
+    //     pResults->rgDirectories[pResults->cDirectories - 1].fRecursive = fRecursive;
+    // }
+
+    // static void MonRegKey(
+    //     __in HRESULT hrResult,
+    //     __in HKEY hkRoot,
+    //     __in_z LPCWSTR wzSubKey,
+    //     __in REG_KEY_BITNESS kbKeyBitness,
+    //     __in_z BOOL fRecursive,
+    //     __in_opt LPVOID pvContext,
+    //     __in_opt LPVOID pvRegKeyContext
+    //     )
+    // {
+    //     Assert::Equal<HRESULT>(S_OK, hrResult);
+    //     Assert::Equal<DWORD_PTR>(0, reinterpret_cast<DWORD_PTR>(pvRegKeyContext));
+
+    //     HRESULT hr = S_OK;
+    //     Results *pResults = reinterpret_cast<Results *>(pvContext);
+
+    //     hr = MemEnsureArraySize(reinterpret_cast<LPVOID*>(&pResults->rgRegKeys), pResults->cRegKeys + 1, sizeof(RegKey), 5);
+    //     NativeAssert::ValidReturnCode(hr, S_OK);
+    //     ++pResults->cRegKeys;
+
+    //     pResults->rgRegKeys[pResults->cRegKeys - 1].hr = hrResult;
+    //     pResults->rgRegKeys[pResults->cRegKeys - 1].hkRoot = hkRoot;
+    //     pResults->rgRegKeys[pResults->cRegKeys - 1].wzSubKey = wzSubKey;
+    //     pResults->rgRegKeys[pResults->cRegKeys - 1].kbKeyBitness = kbKeyBitness;
+    //     pResults->rgRegKeys[pResults->cRegKeys - 1].fRecursive = fRecursive;
+    // }
+
+    // public ref class MonUtil
+    // {
+    // public:
+    //     void ClearResults(Results *pResults)
+    //     {
+    //         ReleaseNullMem(pResults->rgDirectories);
+    //         pResults->cDirectories = 0;
+    //         ReleaseNullMem(pResults->rgRegKeys);
+    //         pResults->cRegKeys = 0;
+    //     }
+
+    //     void RemoveDirectory(LPCWSTR wzPath)
+    //     {
+    //         DWORD dwRetryCount = 0;
+    //         const DWORD c_dwMaxRetryCount = 100;
+    //         const DWORD c_dwRetryInterval = 50;
+
+    //         HRESULT hr = DirEnsureDelete(wzPath, TRUE, TRUE);
+
+    //         // Monitoring a directory opens a handle to that directory, which means delete requests for that directory will succeed
+    //         // (and deletion will be "pending" until our monitor handle is closed)
+    //         // but deletion of the directory containing that directory cannot complete until the handle is closed. This means DirEnsureDelete()
+    //         // can sometimes encounter HRESULT_FROM_WIN32(ERROR_DIR_NOT_EMPTY) failures, which just means it needs to retry a bit later
+    //         // (after the waiter thread wakes up, it will release the handle)
+    //         while (HRESULT_FROM_WIN32(ERROR_DIR_NOT_EMPTY) == hr && c_dwMaxRetryCount > dwRetryCount)
+    //         {
+    //             ::Sleep(c_dwRetryInterval);
+    //             ++dwRetryCount;
+    //             hr = DirEnsureDelete(wzPath, TRUE, TRUE);
+    //         }
+
+    //         NativeAssert::ValidReturnCode(hr, S_OK, S_FALSE, E_PATHNOTFOUND);
+    //     }
+
+    //     void TestDirectory(MON_HANDLE handle, Results *pResults)
+    //     {
+    //         HRESULT hr  = S_OK;
+    //         LPWSTR sczShallowPath = NULL;
+    //         LPWSTR sczParentPath = NULL;
+    //         LPWSTR sczDeepPath = NULL;
+    //         LPWSTR sczChildPath = NULL;
+    //         LPWSTR sczChildFilePath = NULL;
+
+    //         try
+    //         {
+    //             hr = PathExpand(&sczShallowPath, L"%TEMP%\\MonUtilTest\\", PATH_EXPAND_ENVIRONMENT);
+    //             NativeAssert::ValidReturnCode(hr, S_OK);
+
+    //             hr = PathExpand(&sczParentPath, L"%TEMP%\\MonUtilTest\\sub\\folder\\that\\might\\not\\", PATH_EXPAND_ENVIRONMENT);
+    //             NativeAssert::ValidReturnCode(hr, S_OK);
+
+    //             hr = PathExpand(&sczDeepPath, L"%TEMP%\\MonUtilTest\\sub\\folder\\that\\might\\not\\exist\\", PATH_EXPAND_ENVIRONMENT);
+    //             NativeAssert::ValidReturnCode(hr, S_OK);
+
+    //             hr = PathExpand(&sczChildPath, L"%TEMP%\\MonUtilTest\\sub\\folder\\that\\might\\not\\exist\\some\\sub\\folder\\", PATH_EXPAND_ENVIRONMENT);
+    //             NativeAssert::ValidReturnCode(hr, S_OK);
+
+    //             hr = PathExpand(&sczChildFilePath, L"%TEMP%\\MonUtilTest\\sub\\folder\\that\\might\\not\\exist\\some\\sub\\folder\\file.txt", PATH_EXPAND_ENVIRONMENT);
+    //             NativeAssert::ValidReturnCode(hr, S_OK);
+
+    //             RemoveDirectory(sczShallowPath);
+
+    //             hr = MonAddDirectory(handle, sczDeepPath, TRUE, SILENCEPERIOD, NULL);
+    //             NativeAssert::ValidReturnCode(hr, S_OK);
+
+    //             hr = DirEnsureExists(sczParentPath, NULL);
+    //             NativeAssert::ValidReturnCode(hr, S_OK, S_FALSE);
+    //             // Make sure creating the parent directory does nothing, even after silence period
+    //             ::Sleep(FULLWAIT);
+    //             Assert::Equal<DWORD>(0, pResults->cDirectories);
+
+    //             // Now create the target path, no notification until after the silence period
+    //             hr = DirEnsureExists(sczDeepPath, NULL);
+    //             NativeAssert::ValidReturnCode(hr, S_OK, S_FALSE);
+    //             ::Sleep(PREWAIT);
+    //             Assert::Equal<DWORD>(0, pResults->cDirectories);
+
+    //             // Now after the full silence period, it should have triggered
+    //             ::Sleep(POSTWAIT);
+    //             Assert::Equal<DWORD>(1, pResults->cDirectories);
+    //             NativeAssert::ValidReturnCode(pResults->rgDirectories[0].hr, S_OK);
+
+    //             // Now delete the directory, along with a ton of parents. This verifies MonUtil will keep watching the closest parent that still exists.
+    //             RemoveDirectory(sczShallowPath);
+
+    //             ::Sleep(FULLWAIT);
+    //             Assert::Equal<DWORD>(2, pResults->cDirectories);
+    //             NativeAssert::ValidReturnCode(pResults->rgDirectories[1].hr, S_OK);
+
+    //             // Create the parent directory again, still should be nothing even after full silence period
+    //             hr = DirEnsureExists(sczParentPath, NULL);
+    //             NativeAssert::ValidReturnCode(hr, S_OK, S_FALSE);
+    //             ::Sleep(FULLWAIT);
+    //             Assert::Equal<DWORD>(2, pResults->cDirectories);
+
+    //             hr = DirEnsureExists(sczChildPath, NULL);
+    //             NativeAssert::ValidReturnCode(hr, S_OK, S_FALSE);
+    //             ::Sleep(PREWAIT);
+    //             Assert::Equal<DWORD>(2, pResults->cDirectories);
+
+    //             ::Sleep(POSTWAIT);
+    //             Assert::Equal<DWORD>(3, pResults->cDirectories);
+    //             NativeAssert::ValidReturnCode(pResults->rgDirectories[2].hr, S_OK);
+
+    //             // Write a file to a deep child subfolder, and make sure it's detected
+    //             hr = FileFromString(sczChildFilePath, 0, L"contents", FILE_ENCODING_UTF16_WITH_BOM);
+    //             NativeAssert::ValidReturnCode(hr, S_OK);
+    //             ::Sleep(PREWAIT);
+    //             Assert::Equal<DWORD>(3, pResults->cDirectories);
+
+    //             ::Sleep(POSTWAIT);
+    //             Assert::Equal<DWORD>(4, pResults->cDirectories);
+    //             NativeAssert::ValidReturnCode(pResults->rgDirectories[2].hr, S_OK);
+
+    //             RemoveDirectory(sczParentPath);
+
+    //             ::Sleep(FULLWAIT);
+    //             Assert::Equal<DWORD>(5, pResults->cDirectories);
+    //             NativeAssert::ValidReturnCode(pResults->rgDirectories[3].hr, S_OK);
+
+    //             // Now remove the directory from the list of things to monitor, and confirm changes are no longer tracked
+    //             hr = MonRemoveDirectory(handle, sczDeepPath, TRUE);
+    //             NativeAssert::ValidReturnCode(hr, S_OK);
+    //             ::Sleep(PREWAIT);
+
+    //             hr = DirEnsureExists(sczDeepPath, NULL);
+    //             NativeAssert::ValidReturnCode(hr, S_OK, S_FALSE);
+    //             ::Sleep(FULLWAIT);
+    //             Assert::Equal<DWORD>(5, pResults->cDirectories);
+    //             NativeAssert::ValidReturnCode(pResults->rgDirectories[3].hr, S_OK);
+
+    //             // Finally, add it back so we can test multiple things to monitor at once
+    //             hr = MonAddDirectory(handle, sczDeepPath, TRUE, SILENCEPERIOD, NULL);
+    //             NativeAssert::ValidReturnCode(hr, S_OK);
+    //         }
+    //         finally
+    //         {
+    //             ReleaseStr(sczShallowPath);
+    //             ReleaseStr(sczDeepPath);
+    //             ReleaseStr(sczParentPath);
+    //         }
+    //     }
+
+    //     void TestRegKey(MON_HANDLE handle, Results *pResults)
+    //     {
+    //         HRESULT hr = S_OK;
+    //         LPCWSTR wzShallowRegKey = L"Software\\MonUtilTest\\";
+    //         LPCWSTR wzParentRegKey = L"Software\\MonUtilTest\\sub\\folder\\that\\might\\not\\";
+    //         LPCWSTR wzDeepRegKey = L"Software\\MonUtilTest\\sub\\folder\\that\\might\\not\\exist\\";
+    //         LPCWSTR wzChildRegKey = L"Software\\MonUtilTest\\sub\\folder\\that\\might\\not\\exist\\some\\sub\\folder\\";
+    //         HKEY hk = NULL;
+
+    //         try
+    //         {
+    //             hr = RegDelete(HKEY_CURRENT_USER, wzShallowRegKey, REG_KEY_32BIT, TRUE);
+    //             NativeAssert::ValidReturnCode(hr, S_OK, S_FALSE, E_PATHNOTFOUND);
+
+    //             hr = MonAddRegKey(handle, HKEY_CURRENT_USER, wzDeepRegKey, REG_KEY_DEFAULT, TRUE, SILENCEPERIOD, NULL);
+    //             NativeAssert::ValidReturnCode(hr, S_OK);
+
+    //             hr = RegCreate(HKEY_CURRENT_USER, wzParentRegKey, KEY_SET_VALUE | KEY_QUERY_VALUE | KEY_WOW64_32KEY, &hk);
+    //             ReleaseRegKey(hk);
+    //             // Make sure creating the parent key does nothing, even after silence period
+    //             ::Sleep(FULLWAIT);
+    //             NativeAssert::ValidReturnCode(hr, S_OK, S_FALSE);
+    //             Assert::Equal<DWORD>(0, pResults->cRegKeys);
+
+    //             // Now create the target path, no notification until after the silence period
+    //             hr = RegCreate(HKEY_CURRENT_USER, wzDeepRegKey, KEY_SET_VALUE | KEY_QUERY_VALUE | KEY_WOW64_32KEY, &hk);
+    //             NativeAssert::ValidReturnCode(hr, S_OK, S_FALSE);
+    //             ReleaseRegKey(hk);
+    //             ::Sleep(PREWAIT);
+    //             Assert::Equal<DWORD>(0, pResults->cRegKeys);
+
+    //             // Now after the full silence period, it should have triggered
+    //             ::Sleep(POSTWAIT);
+    //             Assert::Equal<DWORD>(1, pResults->cRegKeys);
+    //             NativeAssert::ValidReturnCode(pResults->rgRegKeys[0].hr, S_OK);
+
+    //             // Now delete the directory, along with a ton of parents. This verifies MonUtil will keep watching the closest parent that still exists.
+    //             hr = RegDelete(HKEY_CURRENT_USER, wzShallowRegKey, REG_KEY_32BIT, TRUE);
+    //             NativeAssert::ValidReturnCode(hr, S_OK, S_FALSE, E_PATHNOTFOUND);
+    //             ::Sleep(PREWAIT);
+    //             Assert::Equal<DWORD>(1, pResults->cRegKeys);
+
+    //             ::Sleep(FULLWAIT);
+    //             Assert::Equal<DWORD>(2, pResults->cRegKeys);
+    //             NativeAssert::ValidReturnCode(pResults->rgRegKeys[1].hr, S_OK);
+
+    //             // Create the parent directory again, still should be nothing even after full silence period
+    //             hr = RegCreate(HKEY_CURRENT_USER, wzParentRegKey, KEY_SET_VALUE | KEY_QUERY_VALUE | KEY_WOW64_32KEY, &hk);
+    //             NativeAssert::ValidReturnCode(hr, S_OK, S_FALSE);
+    //             ReleaseRegKey(hk);
+    //             ::Sleep(FULLWAIT);
+    //             Assert::Equal<DWORD>(2, pResults->cRegKeys);
+
+    //             hr = RegCreate(HKEY_CURRENT_USER, wzChildRegKey, KEY_SET_VALUE | KEY_QUERY_VALUE | KEY_WOW64_32KEY, &hk);
+    //             NativeAssert::ValidReturnCode(hr, S_OK, S_FALSE);
+    //             ::Sleep(PREWAIT);
+    //             Assert::Equal<DWORD>(2, pResults->cRegKeys);
+
+    //             ::Sleep(FULLWAIT);
+    //             Assert::Equal<DWORD>(3, pResults->cRegKeys);
+    //             NativeAssert::ValidReturnCode(pResults->rgRegKeys[2].hr, S_OK);
+
+    //             // Write a registry value to some deep child subkey, and make sure it's detected
+    //             hr = RegWriteString(hk, L"valuename", L"testvalue");
+    //             NativeAssert::ValidReturnCode(hr, S_OK);
+    //             ReleaseRegKey(hk);
+    //             ::Sleep(PREWAIT);
+    //             Assert::Equal<DWORD>(3, pResults->cRegKeys);
+
+    //             ::Sleep(FULLWAIT);
+    //             Assert::Equal<DWORD>(4, pResults->cRegKeys);
+    //             NativeAssert::ValidReturnCode(pResults->rgRegKeys[2].hr, S_OK);
+
+    //             hr = RegDelete(HKEY_CURRENT_USER, wzDeepRegKey, REG_KEY_32BIT, TRUE);
+    //             NativeAssert::ValidReturnCode(hr, S_OK);
+
+    //             ::Sleep(FULLWAIT);
+    //             Assert::Equal<DWORD>(5, pResults->cRegKeys);
+
+    //             // Now remove the regkey from the list of things to monitor, and confirm changes are no longer tracked
+    //             hr = MonRemoveRegKey(handle, HKEY_CURRENT_USER, wzDeepRegKey, REG_KEY_DEFAULT, TRUE);
+    //             NativeAssert::ValidReturnCode(hr, S_OK);
+
+    //             hr = RegCreate(HKEY_CURRENT_USER, wzDeepRegKey, KEY_SET_VALUE | KEY_QUERY_VALUE | KEY_WOW64_32KEY, &hk);
+    //             NativeAssert::ValidReturnCode(hr, S_OK, S_FALSE);
+    //             ReleaseRegKey(hk);
+    //             ::Sleep(FULLWAIT);
+    //             Assert::Equal<DWORD>(5, pResults->cRegKeys);
+    //         }
+    //         finally
+    //         {
+    //             ReleaseRegKey(hk);
+    //         }
+    //     }
+
+    //     void TestMoreThan64(MON_HANDLE handle, Results *pResults)
+    //     {
+    //         HRESULT hr  = S_OK;
+    //         LPWSTR sczBaseDir = NULL;
+    //         LPWSTR sczDir = NULL;
+    //         LPWSTR sczFile = NULL;
+
+    //         try
+    //         {
+    //             hr = PathExpand(&sczBaseDir, L"%TEMP%\\ScalabilityTest\\", PATH_EXPAND_ENVIRONMENT);
+    //             NativeAssert::ValidReturnCode(hr, S_OK);
+
+    //             for (DWORD i = 0; i < 200; ++i)
+    //             {
+    //                 hr = StrAllocFormatted(&sczDir, L"%ls%u\\", sczBaseDir, i);
+    //                 NativeAssert::ValidReturnCode(hr, S_OK);
+
+    //                 hr = DirEnsureExists(sczDir, NULL);
+    //                 NativeAssert::ValidReturnCode(hr, S_OK, S_FALSE);
+
+    //                 hr = MonAddDirectory(handle, sczDir, FALSE, SILENCEPERIOD, NULL);
+    //                 NativeAssert::ValidReturnCode(hr, S_OK);
+    //             }
+
+    //             hr = PathConcat(sczDir, L"file.txt", &sczFile);
+    //             NativeAssert::ValidReturnCode(hr, S_OK);
+
+    //             hr = FileFromString(sczFile, 0, L"contents", FILE_ENCODING_UTF16_WITH_BOM);
+    //             NativeAssert::ValidReturnCode(hr, S_OK);
+
+    //             ::Sleep(FULLWAIT);
+    //             Assert::Equal<DWORD>(1, pResults->cDirectories);
+
+    //             for (DWORD i = 0; i < 199; ++i)
+    //             {
+    //                 hr = StrAllocFormatted(&sczDir, L"%ls%u\\", sczBaseDir, i);
+    //                 NativeAssert::ValidReturnCode(hr, S_OK);
+
+    //                 hr = MonRemoveDirectory(handle, sczDir, FALSE);
+    //                 NativeAssert::ValidReturnCode(hr, S_OK);
+    //             }
+    //             ::Sleep(FULLWAIT);
+
+    //             hr = FileFromString(sczFile, 0, L"contents2", FILE_ENCODING_UTF16_WITH_BOM);
+    //             NativeAssert::ValidReturnCode(hr, S_OK);
+
+    //             ::Sleep(FULLWAIT);
+    //             Assert::Equal<DWORD>(2, pResults->cDirectories);
+
+    //             for (DWORD i = 0; i < 199; ++i)
+    //             {
+    //                 hr = StrAllocFormatted(&sczDir, L"%ls%u\\", sczBaseDir, i);
+    //                 NativeAssert::ValidReturnCode(hr, S_OK);
+
+    //                 hr = MonAddDirectory(handle, sczDir, FALSE, SILENCEPERIOD, NULL);
+    //                 NativeAssert::ValidReturnCode(hr, S_OK);
+    //             }
+    //             ::Sleep(FULLWAIT);
+
+    //             hr = FileFromString(sczFile, 0, L"contents3", FILE_ENCODING_UTF16_WITH_BOM);
+    //             NativeAssert::ValidReturnCode(hr, S_OK);
+
+    //             ::Sleep(FULLWAIT);
+    //             Assert::Equal<DWORD>(3, pResults->cDirectories);
+    //         }
+    //         finally
+    //         {
+    //             ReleaseStr(sczBaseDir);
+    //             ReleaseStr(sczDir);
+    //             ReleaseStr(sczFile);
+    //         }
+    //     }
+
+    //     [Fact(Skip = "Test demonstrates failure")]
+    //     void MonUtilTest()
+    //     {
+    //         HRESULT hr = S_OK;
+    //         MON_HANDLE handle = NULL;
+    //         List<GCHandle>^ gcHandles = gcnew List<GCHandle>();
+    //         Results *pResults = (Results *)MemAlloc(sizeof(Results), TRUE);
+    //         Assert::True(NULL != pResults);
+
+    //         try
+    //         {
+    //             // These ensure the function pointers we send point to this thread's appdomain, which helps with assembly binding when running tests within msbuild
+    //             MonGeneralDelegate^ fpMonGeneral = gcnew MonGeneralDelegate(MonGeneral);
+    //             GCHandle gchMonGeneral = GCHandle::Alloc(fpMonGeneral);
+    //             gcHandles->Add(gchMonGeneral);
+    //             IntPtr ipMonGeneral = Marshal::GetFunctionPointerForDelegate(fpMonGeneral);
+
+    //             MonDriveStatusDelegate^ fpMonDriveStatus = gcnew MonDriveStatusDelegate(MonDriveStatus);
+    //             GCHandle gchMonDriveStatus = GCHandle::Alloc(fpMonDriveStatus);
+    //             gcHandles->Add(gchMonDriveStatus);
+    //             IntPtr ipMonDriveStatus = Marshal::GetFunctionPointerForDelegate(fpMonDriveStatus);
+
+    //             MonDirectoryDelegate^ fpMonDirectory = gcnew MonDirectoryDelegate(MonDirectory);
+    //             GCHandle gchMonDirectory = GCHandle::Alloc(fpMonDirectory);
+    //             gcHandles->Add(gchMonDirectory);
+    //             IntPtr ipMonDirectory = Marshal::GetFunctionPointerForDelegate(fpMonDirectory);
+
+    //             MonRegKeyDelegate^ fpMonRegKey = gcnew MonRegKeyDelegate(MonRegKey);
+    //             GCHandle gchMonRegKey = GCHandle::Alloc(fpMonRegKey);
+    //             gcHandles->Add(gchMonRegKey);
+    //             IntPtr ipMonRegKey = Marshal::GetFunctionPointerForDelegate(fpMonRegKey);
+
+    //             // "Silence period" is 100 ms
+    //             hr = MonCreate(&handle, static_cast<PFN_MONGENERAL>(ipMonGeneral.ToPointer()), static_cast<PFN_MONDRIVESTATUS>(ipMonDriveStatus.ToPointer()), static_cast<PFN_MONDIRECTORY>(ipMonDirectory.ToPointer()), static_cast<PFN_MONREGKEY>(ipMonRegKey.ToPointer()), pResults);
+    //             NativeAssert::ValidReturnCode(hr, S_OK);
+
+    //             hr = RegInitialize();
+    //             NativeAssert::ValidReturnCode(hr, S_OK);
+
+    //             TestDirectory(handle, pResults);
+    //             ClearResults(pResults);
+    //             TestRegKey(handle, pResults);
+    //             ClearResults(pResults);
+    //             TestMoreThan64(handle, pResults);
+    //             ClearResults(pResults);
+    //         }
+    //         finally
+    //         {
+    //             ReleaseMon(handle);
+
+    //             for each (GCHandle gcHandle in gcHandles)
+    //             {
+    //                 gcHandle.Free();
+    //             }
+
+    //             ReleaseMem(pResults->rgDirectories);
+    //             ReleaseMem(pResults->rgRegKeys);
+    //             ReleaseMem(pResults);
+
+    //             RegUninitialize();
+    //         }
+    //     }
+    // };
 }
diff --git a/src/libs/dutil/test/DUtilUnitTest/PathUtilTest.cpp b/src/libs/dutil/test/DUtilUnitTest/PathUtilTest.cpp
index 381ea39a..12a2aaf1 100644
--- a/src/libs/dutil/test/DUtilUnitTest/PathUtilTest.cpp
+++ b/src/libs/dutil/test/DUtilUnitTest/PathUtilTest.cpp
@@ -142,7 +142,15 @@ namespace DutilTests
                 else
                 {
                     NativeAssert::Succeeded(hr, "Failed to canonicalize path");
-                    NativeAssert::StringEqual(L"\\\\?\\C:\\abcdefghijklomnopqrstuvwxyz0123456789\\abcdefghijklomnopqrstuvwxyz0123456789\\abcdefghijklomnopqrstuvwxyz0123456789\\abcdefghijklomnopqrstuvwxyz0123456789\\abcdefghijklomnopqrstuvwxyz0123456789\\abcdefghijklomnopqrstuvwxyz0123456789\\abcdefghijklomnopqrstuvwxyz0123456789\\abcdefghijklomnopqrstuvwxyz0123456789", sczCanonicalized);
+
+                    if ('\\' == *sczCanonicalized)
+                    {
+                        NativeAssert::StringEqual(L"\\\\?\\C:\\abcdefghijklomnopqrstuvwxyz0123456789\\abcdefghijklomnopqrstuvwxyz0123456789\\abcdefghijklomnopqrstuvwxyz0123456789\\abcdefghijklomnopqrstuvwxyz0123456789\\abcdefghijklomnopqrstuvwxyz0123456789\\abcdefghijklomnopqrstuvwxyz0123456789\\abcdefghijklomnopqrstuvwxyz0123456789\\abcdefghijklomnopqrstuvwxyz0123456789", sczCanonicalized);
+                    }
+                    else
+                    {
+                        NativeAssert::StringEqual(L"C:\\abcdefghijklomnopqrstuvwxyz0123456789\\abcdefghijklomnopqrstuvwxyz0123456789\\abcdefghijklomnopqrstuvwxyz0123456789\\abcdefghijklomnopqrstuvwxyz0123456789\\abcdefghijklomnopqrstuvwxyz0123456789\\abcdefghijklomnopqrstuvwxyz0123456789\\abcdefghijklomnopqrstuvwxyz0123456789\\abcdefghijklomnopqrstuvwxyz0123456789", sczCanonicalized);
+                    }
                 }
 
                 hr = PathCanonicalizeForComparison(L"\\\\?\\C:\\abcdefghijklomnopqrstuvwxyz0123456789\\abcdefghijklomnopqrstuvwxyz0123456789\\abcdefghijklomnopqrstuvwxyz0123456789\\abcdefghijklomnopqrstuvwxyz0123456789\\abcdefghijklomnopqrstuvwxyz0123456789\\abcdefghijklomnopqrstuvwxyz0123456789\\abcdefghijklomnopqrstuvwxyz0123456789\\abcdefghijklomnopqrstuvwxyz0123456789", 0, &sczCanonicalized);
@@ -153,7 +161,15 @@ namespace DutilTests
                 else
                 {
                     NativeAssert::Succeeded(hr, "Failed to canonicalize path");
-                    NativeAssert::StringEqual(L"\\\\?\\C:\\abcdefghijklomnopqrstuvwxyz0123456789\\abcdefghijklomnopqrstuvwxyz0123456789\\abcdefghijklomnopqrstuvwxyz0123456789\\abcdefghijklomnopqrstuvwxyz0123456789\\abcdefghijklomnopqrstuvwxyz0123456789\\abcdefghijklomnopqrstuvwxyz0123456789\\abcdefghijklomnopqrstuvwxyz0123456789\\abcdefghijklomnopqrstuvwxyz0123456789", sczCanonicalized);
+
+                    if ('\\' == *sczCanonicalized)
+                    {
+                        NativeAssert::StringEqual(L"\\\\?\\C:\\abcdefghijklomnopqrstuvwxyz0123456789\\abcdefghijklomnopqrstuvwxyz0123456789\\abcdefghijklomnopqrstuvwxyz0123456789\\abcdefghijklomnopqrstuvwxyz0123456789\\abcdefghijklomnopqrstuvwxyz0123456789\\abcdefghijklomnopqrstuvwxyz0123456789\\abcdefghijklomnopqrstuvwxyz0123456789\\abcdefghijklomnopqrstuvwxyz0123456789", sczCanonicalized);
+                    }
+                    else
+                    {
+                        NativeAssert::StringEqual(L"C:\\abcdefghijklomnopqrstuvwxyz0123456789\\abcdefghijklomnopqrstuvwxyz0123456789\\abcdefghijklomnopqrstuvwxyz0123456789\\abcdefghijklomnopqrstuvwxyz0123456789\\abcdefghijklomnopqrstuvwxyz0123456789\\abcdefghijklomnopqrstuvwxyz0123456789\\abcdefghijklomnopqrstuvwxyz0123456789\\abcdefghijklomnopqrstuvwxyz0123456789", sczCanonicalized);
+                    }
                 }
 
                 hr = PathCanonicalizeForComparison(L"\\\\server", PATH_CANONICALIZE_KEEP_UNC_ROOT, &sczCanonicalized);
@@ -288,7 +304,15 @@ namespace DutilTests
             {
                 hr = PathAllocCanonicalizePath(L"C:\\abcdefghijklomnopqrstuvwxyz0123456789\\abcdefghijklomnopqrstuvwxyz0123456789\\abcdefghijklomnopqrstuvwxyz0123456789\\abcdefghijklomnopqrstuvwxyz0123456789\\abcdefghijklomnopqrstuvwxyz0123456789\\abcdefghijklomnopqrstuvwxyz0123456789\\abcdefghijklomnopqrstuvwxyz0123456789\\abcdefghijklomnopqrstuvwxyz0123456789", PATHCCH_ALLOW_LONG_PATHS, &sczCanonicalized);
                 NativeAssert::Succeeded(hr, "Failed to canonicalize path");
-                NativeAssert::StringEqual(L"\\\\?\\C:\\abcdefghijklomnopqrstuvwxyz0123456789\\abcdefghijklomnopqrstuvwxyz0123456789\\abcdefghijklomnopqrstuvwxyz0123456789\\abcdefghijklomnopqrstuvwxyz0123456789\\abcdefghijklomnopqrstuvwxyz0123456789\\abcdefghijklomnopqrstuvwxyz0123456789\\abcdefghijklomnopqrstuvwxyz0123456789\\abcdefghijklomnopqrstuvwxyz0123456789", sczCanonicalized);
+
+                if ('\\' == *sczCanonicalized)
+                {
+                    NativeAssert::StringEqual(L"\\\\?\\C:\\abcdefghijklomnopqrstuvwxyz0123456789\\abcdefghijklomnopqrstuvwxyz0123456789\\abcdefghijklomnopqrstuvwxyz0123456789\\abcdefghijklomnopqrstuvwxyz0123456789\\abcdefghijklomnopqrstuvwxyz0123456789\\abcdefghijklomnopqrstuvwxyz0123456789\\abcdefghijklomnopqrstuvwxyz0123456789\\abcdefghijklomnopqrstuvwxyz0123456789", sczCanonicalized);
+                }
+                else
+                {
+                    NativeAssert::StringEqual(L"C:\\abcdefghijklomnopqrstuvwxyz0123456789\\abcdefghijklomnopqrstuvwxyz0123456789\\abcdefghijklomnopqrstuvwxyz0123456789\\abcdefghijklomnopqrstuvwxyz0123456789\\abcdefghijklomnopqrstuvwxyz0123456789\\abcdefghijklomnopqrstuvwxyz0123456789\\abcdefghijklomnopqrstuvwxyz0123456789\\abcdefghijklomnopqrstuvwxyz0123456789", sczCanonicalized);
+                }
 
                 hr = PathAllocCanonicalizePath(L"abcdefghijklomnopqrstuvwxyz0123456789\\abcdefghijklomnopqrstuvwxyz0123456789\\abcdefghijklomnopqrstuvwxyz0123456789\\abcdefghijklomnopqrstuvwxyz0123456789\\abcdefghijklomnopqrstuvwxyz0123456789\\abcdefghijklomnopqrstuvwxyz0123456789\\abcdefghijklomnopqrstuvwxyz0123456789\\abcdefghijklomnopqrstuvwxyz0123456789", PATHCCH_ALLOW_LONG_PATHS, &sczCanonicalized);
                 NativeAssert::Succeeded(hr, "Failed to canonicalize path");
@@ -937,50 +961,22 @@ namespace DutilTests
         void PathGetTempPathTest()
         {
             HRESULT hr = S_OK;
-            LPCWSTR wzEnvName = L"TMP";
-            LPCWSTR wzEnvName2 = L"TEMP";
-            LPCWSTR wzLongTempPath = L"C:\\aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\\bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb\\cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc\\";
             LPWSTR sczTempPath = NULL;
-            WCHAR wzOriginalTemp[MAX_PATH + 1] = { };
-            WCHAR wzOriginalTemp2[MAX_PATH + 1] = { };
             DWORD cch = 0;
-            DWORD cch2 = 0;
             SIZE_T cchTemp = 0;
-            size_t cchTemp2 = 0;
-
-            try
-            {
-                cch = ::GetEnvironmentVariableW(wzEnvName, wzOriginalTemp, countof(wzOriginalTemp));
-                Assert::NotEqual<DWORD>(0, cch);
-
-                if (!::SetEnvironmentVariableW(wzEnvName, wzLongTempPath))
-                {
-                    Assert::Equal<DWORD>(0xFFFFFFFF, ::GetLastError());
-                }
+            WCHAR wzPath[MAX_PATH + 1];
 
-                cch2 = ::GetEnvironmentVariableW(wzEnvName2, wzOriginalTemp2, countof(wzOriginalTemp2));
-                Assert::NotEqual<DWORD>(0, cch2);
+            hr = PathGetTempPath(&sczTempPath, &cchTemp);
+            NativeAssert::Succeeded(hr, "Failed to get temp path.");
 
-                hr = PathGetTempPath(&sczTempPath, &cchTemp);
-                NativeAssert::Succeeded(hr, "Failed to get temp path.");
+            cch = countof(wzPath);
+            cch = ::GetTempPathW(cch, wzPath);
+            Assert::NotEqual((DWORD)0, cch);
 
-                PathFixedBackslashTerminate(wzOriginalTemp2, countof(wzOriginalTemp2));
+            // normalize trailing backslash
+            PathFixedBackslashTerminate(wzPath, cch);
 
-                hr = ::StringCchLengthW(wzOriginalTemp2, countof(wzOriginalTemp2), &cchTemp2);
-                NativeAssert::Succeeded(hr, "Failed to get temp path length.");
-
-                NativeAssert::StringEqual(wzOriginalTemp2, sczTempPath);
-                Assert::Equal<SIZE_T>(cchTemp2, cchTemp);
-            }
-            finally
-            {
-                if (cch)
-                {
-                    ::SetEnvironmentVariableW(wzEnvName, wzOriginalTemp);
-                }
-
-                ReleaseStr(sczTempPath);
-            }
+            NativeAssert::StringEqual(wzPath, sczTempPath);
         }
 
         [Fact]
diff --git a/src/libs/dutil/test/DUtilUnitTest/StrUtilTest.cpp b/src/libs/dutil/test/DUtilUnitTest/StrUtilTest.cpp
index 89ed3dbb..7ad1ebdf 100644
--- a/src/libs/dutil/test/DUtilUnitTest/StrUtilTest.cpp
+++ b/src/libs/dutil/test/DUtilUnitTest/StrUtilTest.cpp
@@ -80,7 +80,217 @@ namespace DutilTests
             TestStrAnsiAllocString(b, 0, "abCd");
         }
 
+        [Fact]
+        void StrUtilMultiSzLenNullTest()
+        {
+            HRESULT hr = S_OK;
+            SIZE_T cchMultiSz = 7;
+
+            DutilInitialize(&DutilTestTraceError);
+
+            try
+            {
+                hr = MultiSzLen(NULL, &cchMultiSz);
+                NativeAssert::Succeeded(hr, "Failed to get MULTISZ length for null.");
+                NativeAssert::Equal<SIZE_T>(0, cchMultiSz);
+            }
+            finally
+            {
+                DutilUninitialize();
+            }
+        }
+
+        [Fact]
+        void StrUtilMultiSzPrependEmptyTest()
+        {
+            HRESULT hr = S_OK;
+            LPWSTR sczMultiSz = NULL;
+            SIZE_T cchMultiSz = 0;
+            const WCHAR expected[] = { L'f', L'i', L'r', L's', L't', L'\0', L'\0' };
+
+            DutilInitialize(&DutilTestTraceError);
+
+            try
+            {
+                hr = MultiSzPrepend(&sczMultiSz, &cchMultiSz, L"first");
+                NativeAssert::Succeeded(hr, "Failed to prepend into empty MULTISZ.");
+                VerifyMultiSz(sczMultiSz, expected, sizeof(expected) / sizeof(expected[0]));
+                NativeAssert::Equal<SIZE_T>(sizeof(expected) / sizeof(expected[0]), cchMultiSz);
+            }
+            finally
+            {
+                ReleaseNullStr(sczMultiSz);
+                DutilUninitialize();
+            }
+        }
+
+        [Fact]
+        void StrUtilMultiSzInsertEmptyTest()
+        {
+            HRESULT hr = S_OK;
+            LPWSTR sczMultiSz = NULL;
+            SIZE_T cchMultiSz = 0;
+            const WCHAR expected[] = { L'i', L'n', L's', L'e', L'r', L't', L'\0', L'\0' };
+
+            DutilInitialize(&DutilTestTraceError);
+
+            try
+            {
+                hr = MultiSzInsertString(&sczMultiSz, &cchMultiSz, 0, L"insert");
+                NativeAssert::Succeeded(hr, "Failed to insert into empty MULTISZ.");
+                VerifyMultiSz(sczMultiSz, expected, sizeof(expected) / sizeof(expected[0]));
+                NativeAssert::Equal<SIZE_T>(sizeof(expected) / sizeof(expected[0]), cchMultiSz);
+            }
+            finally
+            {
+                ReleaseNullStr(sczMultiSz);
+                DutilUninitialize();
+            }
+        }
+
+        [Fact]
+        void StrUtilMultiSzFindTest()
+        {
+            HRESULT hr = S_OK;
+            LPWSTR sczMultiSz = NULL;
+            DWORD_PTR dwIndex = 0;
+            LPCWSTR wzFound = NULL;
+            const WCHAR source[] = { L'o', L'n', L'e', L'\0', L't', L'w', L'o', L'\0', L't', L'h', L'r', L'e', L'e', L'\0', L'\0' };
+
+            DutilInitialize(&DutilTestTraceError);
+
+            try
+            {
+                CreateMultiSz(&sczMultiSz, source, sizeof(source) / sizeof(source[0]));
+
+                hr = MultiSzFindString(sczMultiSz, L"two", &dwIndex, &wzFound);
+                NativeAssert::Succeeded(hr, "Failed to find string in MULTISZ.");
+                NativeAssert::Equal<DWORD_PTR>(1, dwIndex);
+                NativeAssert::StringEqual(L"two", wzFound);
+
+                hr = MultiSzFindSubstring(sczMultiSz, L"re", &dwIndex, &wzFound);
+                NativeAssert::Succeeded(hr, "Failed to find substring in MULTISZ.");
+                NativeAssert::Equal<DWORD_PTR>(2, dwIndex);
+                NativeAssert::StringEqual(L"three", wzFound);
+
+                hr = MultiSzFindString(sczMultiSz, L"missing", &dwIndex, &wzFound);
+                NativeAssert::SpecificReturnCode(S_FALSE, hr, "Expected not found for missing string.");
+
+                hr = MultiSzFindSubstring(sczMultiSz, L"zzz", &dwIndex, &wzFound);
+                NativeAssert::SpecificReturnCode(S_FALSE, hr, "Expected not found for missing substring.");
+            }
+            finally
+            {
+                ReleaseNullStr(sczMultiSz);
+                DutilUninitialize();
+            }
+        }
+
+        [Fact]
+        void StrUtilMultiSzRemoveTest()
+        {
+            HRESULT hr = S_OK;
+            LPWSTR sczMultiSz = NULL;
+            const WCHAR source[] = { L'o', L'n', L'e', L'\0', L't', L'w', L'o', L'\0', L't', L'h', L'r', L'e', L'e', L'\0', L'\0' };
+            const WCHAR expected[] = { L'o', L'n', L'e', L'\0', L't', L'h', L'r', L'e', L'e', L'\0', L'\0' };
+
+            DutilInitialize(&DutilTestTraceError);
+
+            try
+            {
+                CreateMultiSz(&sczMultiSz, source, sizeof(source) / sizeof(source[0]));
+
+                hr = MultiSzRemoveString(&sczMultiSz, 1);
+                NativeAssert::Succeeded(hr, "Failed to remove string from MULTISZ.");
+                VerifyMultiSz(sczMultiSz, expected, sizeof(expected) / sizeof(expected[0]));
+
+                hr = MultiSzRemoveString(&sczMultiSz, 10);
+                NativeAssert::SpecificReturnCode(S_FALSE, hr, "Expected S_FALSE when removing out of range.");
+            }
+            finally
+            {
+                ReleaseNullStr(sczMultiSz);
+                DutilUninitialize();
+            }
+        }
+
+        [Fact]
+        void StrUtilMultiSzInsertTest()
+        {
+            HRESULT hr = S_OK;
+            LPWSTR sczMultiSz = NULL;
+            SIZE_T cchMultiSz = 0;
+            const WCHAR source[] = { L'o', L'n', L'e', L'\0', L't', L'w', L'o', L'\0', L'\0' };
+            const WCHAR expected[] = { L'o', L'n', L'e', L'\0', L't', L'h', L'r', L'e', L'e', L'\0', L't', L'w', L'o', L'\0', L'\0' };
+
+            DutilInitialize(&DutilTestTraceError);
+
+            try
+            {
+                CreateMultiSz(&sczMultiSz, source, sizeof(source) / sizeof(source[0]));
+                cchMultiSz = sizeof(source) / sizeof(source[0]);
+
+                hr = MultiSzInsertString(&sczMultiSz, &cchMultiSz, 1, L"three");
+                NativeAssert::Succeeded(hr, "Failed to insert string into MULTISZ.");
+                VerifyMultiSz(sczMultiSz, expected, sizeof(expected) / sizeof(expected[0]));
+                NativeAssert::Equal<SIZE_T>(sizeof(expected) / sizeof(expected[0]), cchMultiSz);
+
+                hr = MultiSzInsertString(&sczMultiSz, &cchMultiSz, 10, L"bad");
+                NativeAssert::SpecificReturnCode(HRESULT_FROM_WIN32(ERROR_OBJECT_NOT_FOUND), hr, "Expected insert to fail for invalid index.");
+            }
+            finally
+            {
+                ReleaseNullStr(sczMultiSz);
+                DutilUninitialize();
+            }
+        }
+
+        [Fact]
+        void StrUtilMultiSzReplaceTest()
+        {
+            HRESULT hr = S_OK;
+            LPWSTR sczMultiSz = NULL;
+            const WCHAR source[] = { L'o', L'n', L'e', L'\0', L't', L'w', L'o', L'\0', L't', L'h', L'r', L'e', L'e', L'\0', L'\0' };
+            const WCHAR expected[] = { L'o', L'n', L'e', L'\0', L't', L'w', L'o', L'\0', L'f', L'o', L'u', L'r', L'\0', L'\0' };
+
+            DutilInitialize(&DutilTestTraceError);
+
+            try
+            {
+                CreateMultiSz(&sczMultiSz, source, sizeof(source) / sizeof(source[0]));
+
+                hr = MultiSzReplaceString(&sczMultiSz, 2, L"four");
+                NativeAssert::Succeeded(hr, "Failed to replace string in MULTISZ.");
+                VerifyMultiSz(sczMultiSz, expected, sizeof(expected) / sizeof(expected[0]));
+            }
+            finally
+            {
+                ReleaseNullStr(sczMultiSz);
+                DutilUninitialize();
+            }
+        }
+
     private:
+        void CreateMultiSz(LPWSTR* ppwzMultiSz, const WCHAR* pwzSource, SIZE_T cchSource)
+        {
+            HRESULT hr = S_OK;
+
+            hr = StrAlloc(ppwzMultiSz, cchSource);
+            NativeAssert::Succeeded(hr, "Failed to allocate MULTISZ.");
+            ::CopyMemory(*ppwzMultiSz, pwzSource, cchSource * sizeof(WCHAR));
+        }
+
+        void VerifyMultiSz(LPCWSTR wzMultiSz, const WCHAR* pwzExpected, SIZE_T cchExpected)
+        {
+            HRESULT hr = S_OK;
+            SIZE_T cchMultiSz = 0;
+
+            hr = MultiSzLen(wzMultiSz, &cchMultiSz);
+            NativeAssert::Succeeded(hr, "Failed to get MULTISZ length.");
+            NativeAssert::Equal<SIZE_T>(cchExpected, cchMultiSz);
+            NativeAssert::True(0 == ::memcmp(wzMultiSz, pwzExpected, cchExpected * sizeof(WCHAR)));
+        }
+
         void TestTrim(LPCWSTR wzInput, LPCWSTR wzExpectedResult)
         {
             HRESULT hr = S_OK;