5 files changed, 98 insertions, 0 deletions

diff --git a/src/libs/dutil/test/DUtilUnitTest/DUtilUnitTest.vcxproj b/src/libs/dutil/test/DUtilUnitTest/DUtilUnitTest.vcxproj
index 5b40eaf1..ee9f505e 100644
--- a/src/libs/dutil/test/DUtilUnitTest/DUtilUnitTest.vcxproj
+++ b/src/libs/dutil/test/DUtilUnitTest/DUtilUnitTest.vcxproj
@@ -49,6 +49,7 @@
     <ClCompile Include="DictUtilTest.cpp" />
     <ClCompile Include="DirUtilTests.cpp" />
     <ClCompile Include="DUtilTests.cpp" />
+    <ClCompile Include="EnvUtilTests.cpp" />
     <ClCompile Include="error.cpp" />
     <ClCompile Include="FileUtilTest.cpp" />
     <ClCompile Include="GuidUtilTest.cpp" />
diff --git a/src/libs/dutil/test/DUtilUnitTest/DUtilUnitTest.vcxproj.filters b/src/libs/dutil/test/DUtilUnitTest/DUtilUnitTest.vcxproj.filters
index fde49348..bcda6df0 100644
--- a/src/libs/dutil/test/DUtilUnitTest/DUtilUnitTest.vcxproj.filters
+++ b/src/libs/dutil/test/DUtilUnitTest/DUtilUnitTest.vcxproj.filters
@@ -30,6 +30,9 @@
     <ClCompile Include="DUtilTests.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="EnvUtilTests.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="error.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
diff --git a/src/libs/dutil/test/DUtilUnitTest/EnvUtilTests.cpp b/src/libs/dutil/test/DUtilUnitTest/EnvUtilTests.cpp
new file mode 100644
index 00000000..76dfa774
--- /dev/null
+++ b/src/libs/dutil/test/DUtilUnitTest/EnvUtilTests.cpp
@@ -0,0 +1,50 @@
+// 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 WixBuildTools::TestSupport;
+
+namespace DutilTests
+{
+    public ref class EnvUtil
+    {
+    public:
+        [Fact]
+        void EnvExpandEnvironmentStringsTest()
+        {
+            HRESULT hr = S_OK;
+            LPWSTR sczExpanded = NULL;
+            SIZE_T cchExpanded = 0;
+            LPCWSTR wzSimpleString = L"%USERPROFILE%";
+            LPCWSTR wzMultipleString = L"%TEMP%;%PATH%";
+            LPCWSTR wzLongMultipleString = L"%TEMP%;%PATH%;C:\\abcdefghijklomnopqrstuvwxyz0123456789\\abcdefghijklomnopqrstuvwxyz0123456789\\abcdefghijklomnopqrstuvwxyz0123456789\\abcdefghijklomnopqrstuvwxyz0123456789\\abcdefghijklomnopqrstuvwxyz0123456789";
+            String^ expandedSimpleString = Environment::ExpandEnvironmentVariables(gcnew String(wzSimpleString));
+            String^ expandedMultipleString = Environment::ExpandEnvironmentVariables(gcnew String(wzMultipleString));
+            String^ expandedLongMultipleString = Environment::ExpandEnvironmentVariables(gcnew String(wzLongMultipleString));
+
+            try
+            {
+                hr = EnvExpandEnvironmentStrings(wzSimpleString, &sczExpanded, &cchExpanded);
+                NativeAssert::Succeeded(hr, "Failed to expand simple string.");
+                WixAssert::StringEqual(expandedSimpleString, gcnew String(sczExpanded), false);
+                NativeAssert::Equal<SIZE_T>(expandedSimpleString->Length + 1, cchExpanded);
+
+                hr = EnvExpandEnvironmentStrings(wzMultipleString, &sczExpanded, &cchExpanded);
+                NativeAssert::Succeeded(hr, "Failed to expand multiple string.");
+                WixAssert::StringEqual(expandedMultipleString, gcnew String(sczExpanded), false);
+                NativeAssert::Equal<SIZE_T>(expandedMultipleString->Length + 1, cchExpanded);
+
+                hr = EnvExpandEnvironmentStrings(wzLongMultipleString, &sczExpanded, &cchExpanded);
+                NativeAssert::Succeeded(hr, "Failed to expand long multiple string.");
+                WixAssert::StringEqual(expandedLongMultipleString, gcnew String(sczExpanded), false);
+                NativeAssert::Equal<SIZE_T>(expandedLongMultipleString->Length + 1, cchExpanded);
+            }
+            finally
+            {
+                ReleaseStr(sczExpanded);
+            }
+        }
+    };
+}
diff --git a/src/libs/dutil/test/DUtilUnitTest/RegUtilTest.cpp b/src/libs/dutil/test/DUtilUnitTest/RegUtilTest.cpp
index 575e3238..9e97f5e0 100644
--- a/src/libs/dutil/test/DUtilUnitTest/RegUtilTest.cpp
+++ b/src/libs/dutil/test/DUtilUnitTest/RegUtilTest.cpp
@@ -208,6 +208,49 @@ namespace DutilTests
         }
 
         [Fact]
+        void RegUtilExpandLongStringValueTest()
+        {
+            this->ExpandLongStringValueTest();
+        }
+
+        [Fact]
+        void RegUtilExpandLongStringValueFallbackTest()
+        {
+            RegFunctionForceFallback();
+            this->ExpandLongStringValueTest();
+        }
+
+        void ExpandLongStringValueTest()
+        {
+            HRESULT hr = S_OK;
+            LPWSTR sczValue = NULL;
+            LPCWSTR wzValue = L"%TEMP%;%PATH%;C:\\abcdefghijklomnopqrstuvwxyz0123456789\\abcdefghijklomnopqrstuvwxyz0123456789\\abcdefghijklomnopqrstuvwxyz0123456789\\abcdefghijklomnopqrstuvwxyz0123456789\\abcdefghijklomnopqrstuvwxyz0123456789";
+            String^ expandedValue = Environment::ExpandEnvironmentVariables(gcnew String(wzValue));
+
+            try
+            {
+                this->CreateBaseKey();
+
+                hr = RegWriteExpandString(hkBase, L"ExpandString", wzValue);
+                NativeAssert::Succeeded(hr, "Failed to write expand string value.");
+
+                hr = RegReadString(hkBase, L"ExpandString", &sczValue);
+                NativeAssert::Succeeded(hr, "Failed to read expand string value.");
+                WixAssert::StringEqual(expandedValue, gcnew String(sczValue), false);
+
+                ReleaseNullStr(sczValue);
+
+                hr = RegReadString(hkBase, L"ExpandString", &sczValue);
+                NativeAssert::Succeeded(hr, "Failed to read expand string value.");
+                WixAssert::StringEqual(expandedValue, gcnew String(sczValue), false);
+            }
+            finally
+            {
+                ReleaseStr(sczValue);
+            }
+        }
+
+        [Fact]
         void RegUtilNotExpandStringValueTest()
         {
             this->NotExpandStringValueTest();
diff --git a/src/libs/dutil/test/DUtilUnitTest/precomp.h b/src/libs/dutil/test/DUtilUnitTest/precomp.h
index e9f8770b..bc628816 100644
--- a/src/libs/dutil/test/DUtilUnitTest/precomp.h
+++ b/src/libs/dutil/test/DUtilUnitTest/precomp.h
@@ -15,6 +15,7 @@
 #include <atomutil.h>
 #include <dictutil.h>
 #include <dirutil.h>
+#include <envutil.h>
 #include <fileutil.h>
 #include <guidutil.h>
 #include <iniutil.h>