REG_EXPAND_SZ values are not necessarily a path.

1 files changed, 43 insertions, 0 deletions

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();