- Issue #1171: RegFileImporter does not support hex(b): REG_QWORD

  Partial fix as WiX still does not support REG_QWORD===integer64

Author: oleg-shilo

Source/src/WixSharp.Test/IssueFixesTest.cs

@@ -61,6 +61,28 @@ public void Fix_Issue_1114()
             project.BuildWxs();
         }
 
+        [Fact]
+        [Description("Issue #1171")]
+        public void Fix_Issue_1171()
+        {
+            var tempFile = System.IO.Path.GetTempFileName();
+            try
+            {
+                System.IO.File.WriteAllLines(tempFile, new[]
+                {
+                    "Windows Registry Editor Version 5.00",
+                    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Test]",
+                    "\"New Value #1\"=dword:00000001",
+                    "\"New Value #2\"=hex(b):02,00,00,00,00,00,00,00",
+                });
+                var values = WixSharp.RegFileImporter.ImportFrom(tempFile);
+            }
+            finally
+            {
+                tempFile.DeleteIfExists();
+            }
+        }
+
         [Fact]
         [Description("Issue #1132")]
         public void Fix_Issue_1132()

Source/src/WixSharp.Test/RegFileTest.cs

@@ -26,6 +26,10 @@ public void Should_Create_RegValue_From_String()
             Assert.IsType<string>(value);
             Assert.Equal(value, "%PATH%");
 
+            value = RegFileImporter.Deserialize("hex(b):02,00,00,00,00,00,00,00", Encoding.Unicode);
+            Assert.IsType<long>(value);
+            Assert.Equal(value, 2L);
+
             value = RegFileImporter.Deserialize(@"hex(7):6f,00,6e,00,65,00,00,00,74,00,77,00,6f,00,00,00,74,00,68,\
 00,72,00,65,00,65,00,00,00,00,00", Encoding.Unicode);
             Assert.IsType<string>(value);

Source/src/WixSharp/RegFileImporter.cs

@@ -23,12 +23,12 @@ THE SOFTWARE.
 
 #endregion Licence...
 
-using Microsoft.Win32;
 using System;
 using System.Collections.Generic;
-using System.Text;
 using System.Linq;
+using System.Text;
 using System.Text.RegularExpressions;
+using Microsoft.Win32;
 
 namespace WixSharp
 {
@@ -103,6 +103,13 @@ public static object Deserialize(string text, Encoding encoding)
             if (isPreffix("hex(4):") || isPreffix("dword:"))
                 return Convert.ToInt32(rawValue, 16);
 
+            //WiX '64 integer'
+            if (isPreffix("hex(b):"))
+            {
+                byte[] data = rawValue.Unescape().DecodeFromRegHex();
+                return BitConverter.ToInt64(data, 0);
+            }
+
             //WiX 'multiString'
             if (isPreffix("hex(7):"))
             {