Merge branch 'rubberduck-vba/next' into next

Author: BZngr

Rubberduck.Deployment/BuildRegistryScript.ps1

@@ -95,9 +95,17 @@ try
 				if (Test-Path -Path $regFile -PathType Leaf)
 				{
 					$datetime = Get-Date;
-					& reg.exe import $regFile;
+					if ([Environment]::Is64BitOperatingSystem)
+					{
+						& reg.exe import $regFile /reg:32;
+						& reg.exe import $regFile /reg:64;
+					}
+					else 
+					{
+						& reg.exe import $regFile;
+					}
 					& reg.exe import ($dir + "\RubberduckAddinRegistry.reg");
-					Move-Item -Path $regFile -Destination ($regFile + ".imported_" + $datetime.ToUniversalTime().ToString("yyyyMMddhhmmss") + ".txt" )
+					Move-Item -Path $regFile -Destination ($regFile + ".imported_" + $datetime.ToUniversalTime().ToString("yyyyMMddHHmmss") + ".txt" )
 				}
 			}
 			else

Rubberduck.Deployment/Writers/LocalDebugRegistryWriter.cs

@@ -13,6 +13,7 @@ public class LocalDebugRegistryWriter : IRegistryWriter
     {
         public string Write(IOrderedEnumerable<RegistryEntry> entries)
         {
+            //System.Diagnostics.Debugger.Launch(); //uncomment if need to debug
             var sb = new StringBuilder("Windows Registry Editor Version 5.00" + Environment.NewLine + Environment.NewLine);
             var distinctKeys = new List<string>();
 
@@ -30,12 +31,14 @@ public string Write(IOrderedEnumerable<RegistryEntry> entries)
                     throw new InvalidOperationException("Unexpected registry entry: " + entry.Key);
                 }
 
-                var value = ReplacePlaceholder(entry.Value, entry.Bitness);
-
-                var key = Registry.CurrentUser.CreateSubKey(entry.Key);
-                if (!(string.IsNullOrWhiteSpace(entry.Name) && string.IsNullOrWhiteSpace(value)))
+                if (Environment.Is64BitOperatingSystem)
+                {
+                    MakeRegistryEntries(entry, RegistryKey.OpenBaseKey(RegistryHive.CurrentUser, RegistryView.Registry32));
+                    MakeRegistryEntries(entry, RegistryKey.OpenBaseKey(RegistryHive.CurrentUser, RegistryView.Registry64));
+                }
+                else 
                 {
-                    key.SetValue(entry.Name, value);
+                    MakeRegistryEntries(entry, Registry.CurrentUser);
                 }
 
                 if (!distinctKeys.Contains(entry.Key))
@@ -53,6 +56,18 @@ public string Write(IOrderedEnumerable<RegistryEntry> entries)
             return sb.ToString();
         }
 
+        private void MakeRegistryEntries(RegistryEntry entry, RegistryKey hKey) 
+        {
+            var key = hKey.CreateSubKey(entry.Key);
+
+            var value = ReplacePlaceholder(entry.Value, entry.Bitness);
+
+            if (!(string.IsNullOrWhiteSpace(entry.Name) && string.IsNullOrWhiteSpace(value)))
+            {
+                key.SetValue(entry.Name, value);
+            }
+        }
+
         //Cache the string so we call the AssemblyDirectory only once
         private string _currentPath;
         private string ReplacePlaceholder(string value, Bitness bitness)