4 files changed, 130 insertions, 101 deletions

diff --git a/src/libs/dutil/test/DUtilUnitTest/DUtilUnitTest.vcxproj b/src/libs/dutil/test/DUtilUnitTest/DUtilUnitTest.vcxproj
index 94826b8f..fccb73c4 100644
--- a/src/libs/dutil/test/DUtilUnitTest/DUtilUnitTest.vcxproj
+++ b/src/libs/dutil/test/DUtilUnitTest/DUtilUnitTest.vcxproj
@@ -55,7 +55,8 @@
     <ClCompile Include="FileUtilTest.cpp" />
     <ClCompile Include="GuidUtilTest.cpp" />
     <ClCompile Include="IniUtilTest.cpp" />
-    <ClCompile Include="LocUtilTests.cpp" />
+    <ClCompile Include="LocControlsUtilTests.cpp" />
+    <ClCompile Include="LocStringsUtilTests.cpp" />
     <ClCompile Include="MemUtilTest.cpp" />
     <ClCompile Include="MonUtilTest.cpp" />
     <ClCompile Include="PathUtilTest.cpp" />
diff --git a/src/libs/dutil/test/DUtilUnitTest/LocControlsUtilTests.cpp b/src/libs/dutil/test/DUtilUnitTest/LocControlsUtilTests.cpp
new file mode 100644
index 00000000..fd8679cb
--- /dev/null
+++ b/src/libs/dutil/test/DUtilUnitTest/LocControlsUtilTests.cpp
@@ -0,0 +1,81 @@
+// 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.
+
+#include "precomp.h"
+
+using namespace System;
+using namespace Xunit;
+using namespace WixInternal::TestSupport;
+
+namespace DutilTests
+{
+    public ref class LocControlsUtil
+    {
+    public:
+        [Fact]
+        void CanLoadControlsWxl()
+        {
+            HRESULT hr = S_OK;
+            DWORD dwRetry = 0;
+            WIX_LOCALIZATION* pLoc = NULL;
+            LOC_CONTROL* pLocControl = NULL;
+
+            DutilInitialize(&DutilTestTraceError);
+
+            try
+            {
+                hr = XmlInitialize();
+                NativeAssert::Succeeded(hr, "Failed to initialize Xml.");
+
+                pin_ptr<const wchar_t> wxlFilePath = PtrToStringChars(TestData::Get("TestData", "LocUtilTests", "controls.wxl"));
+                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);
+
+                hr = LocGetControl(pLoc, L"Control1", &pLocControl);
+                NativeAssert::Succeeded(hr, "Failed to get loc control 'Control1' from: {0}", wxlFilePath);
+                NativeAssert::StringEqual(L"Control1", pLocControl->wzControl);
+                NativeAssert::Equal(1, pLocControl->nX);
+                NativeAssert::Equal(2, pLocControl->nY);
+                NativeAssert::Equal(LOC_CONTROL_NOT_SET, pLocControl->nWidth);
+                NativeAssert::Equal(LOC_CONTROL_NOT_SET, pLocControl->nHeight);
+                NativeAssert::StringEqual(L"This is control #1", pLocControl->wzText);
+
+                hr = LocGetControl(pLoc, L"Control2", &pLocControl);
+                NativeAssert::Succeeded(hr, "Failed to get loc control 'Control2' from: {0}", wxlFilePath);
+                NativeAssert::StringEqual(L"Control2", pLocControl->wzControl);
+                NativeAssert::Equal(LOC_CONTROL_NOT_SET, pLocControl->nX);
+                NativeAssert::Equal(LOC_CONTROL_NOT_SET, pLocControl->nY);
+                NativeAssert::Equal(50, pLocControl->nWidth);
+                NativeAssert::Equal(LOC_CONTROL_NOT_SET, pLocControl->nHeight);
+                NativeAssert::StringEqual(L"This is control #2", pLocControl->wzText);
+
+                hr = LocGetControl(pLoc, L"Control3", &pLocControl);
+                NativeAssert::Succeeded(hr, "Failed to get loc control 'Control3' from: {0}", wxlFilePath);
+                NativeAssert::StringEqual(L"Control3", pLocControl->wzControl);
+                NativeAssert::Equal(LOC_CONTROL_NOT_SET, pLocControl->nX);
+                NativeAssert::Equal(LOC_CONTROL_NOT_SET, pLocControl->nY);
+                NativeAssert::Equal(LOC_CONTROL_NOT_SET, pLocControl->nWidth);
+                NativeAssert::Equal(150, pLocControl->nHeight);
+                NativeAssert::StringEqual(L"", pLocControl->wzText);
+            }
+            finally
+            {
+                if (pLoc)
+                {
+                    LocFree(pLoc);
+                }
+
+                DutilUninitialize();
+            }
+        }
+    };
+}
diff --git a/src/libs/dutil/test/DUtilUnitTest/LocUtilTests.cpp b/src/libs/dutil/test/DUtilUnitTest/LocStringsUtilTests.cpp
index 0376a340..04130098 100644
--- a/src/libs/dutil/test/DUtilUnitTest/LocUtilTests.cpp
+++ b/src/libs/dutil/test/DUtilUnitTest/LocStringsUtilTests.cpp
@@ -8,13 +8,14 @@ using namespace WixInternal::TestSupport;
 
 namespace DutilTests
 {
-    public ref class LocUtil
+    public ref class LocStringsUtil
     {
     public:
         [Fact]
         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);
@@ -89,63 +98,5 @@ namespace DutilTests
                 DutilUninitialize();
             }
         }
-
-        [Fact]
-        void CanLoadControlsWxl()
-        {
-            HRESULT hr = S_OK;
-            WIX_LOCALIZATION* pLoc = NULL;
-            LOC_CONTROL* pLocControl = NULL;
-
-            DutilInitialize(&DutilTestTraceError);
-
-            try
-            {
-                hr = XmlInitialize();
-                NativeAssert::Succeeded(hr, "Failed to initialize Xml.");
-
-                pin_ptr<const wchar_t> wxlFilePath = PtrToStringChars(TestData::Get("TestData", "LocUtilTests", "controls.wxl"));
-                hr = LocLoadFromFile(wxlFilePath, &pLoc);
-                NativeAssert::Succeeded(hr, "Failed to parse controls.wxl: {0}", wxlFilePath);
-
-                Assert::Equal(3ul, pLoc->cLocControls);
-
-                hr = LocGetControl(pLoc, L"Control1", &pLocControl);
-                NativeAssert::Succeeded(hr, "Failed to get loc control 'Control1' from: {0}", wxlFilePath);
-                NativeAssert::StringEqual(L"Control1", pLocControl->wzControl);
-                NativeAssert::Equal(1, pLocControl->nX);
-                NativeAssert::Equal(2, pLocControl->nY);
-                NativeAssert::Equal(LOC_CONTROL_NOT_SET, pLocControl->nWidth);
-                NativeAssert::Equal(LOC_CONTROL_NOT_SET, pLocControl->nHeight);
-                NativeAssert::StringEqual(L"This is control #1", pLocControl->wzText);
-
-                hr = LocGetControl(pLoc, L"Control2", &pLocControl);
-                NativeAssert::Succeeded(hr, "Failed to get loc control 'Control2' from: {0}", wxlFilePath);
-                NativeAssert::StringEqual(L"Control2", pLocControl->wzControl);
-                NativeAssert::Equal(LOC_CONTROL_NOT_SET, pLocControl->nX);
-                NativeAssert::Equal(LOC_CONTROL_NOT_SET, pLocControl->nY);
-                NativeAssert::Equal(50, pLocControl->nWidth);
-                NativeAssert::Equal(LOC_CONTROL_NOT_SET, pLocControl->nHeight);
-                NativeAssert::StringEqual(L"This is control #2", pLocControl->wzText);
-
-                hr = LocGetControl(pLoc, L"Control3", &pLocControl);
-                NativeAssert::Succeeded(hr, "Failed to get loc control 'Control3' from: {0}", wxlFilePath);
-                NativeAssert::StringEqual(L"Control3", pLocControl->wzControl);
-                NativeAssert::Equal(LOC_CONTROL_NOT_SET, pLocControl->nX);
-                NativeAssert::Equal(LOC_CONTROL_NOT_SET, pLocControl->nY);
-                NativeAssert::Equal(LOC_CONTROL_NOT_SET, pLocControl->nWidth);
-                NativeAssert::Equal(150, pLocControl->nHeight);
-                NativeAssert::StringEqual(L"", pLocControl->wzText);
-            }
-            finally
-            {
-                if (pLoc)
-                {
-                    LocFree(pLoc);
-                }
-
-                DutilUninitialize();
-            }
-        }
     };
 }
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]