Find PuTTY in the registry even if we are running in 64bit mode!

ssh-handler/ssh-handler.cs

@@ -20,6 +20,7 @@
  */
 
 using System;
+using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
 using System.Text;
@@ -112,19 +113,28 @@ public class SshHandler
         if (puttyPath != null)
             return true;
 
-        foreach (string key in new string[] { "HKEY_CURRENT_USER", "HKEY_LOCAL_MACHINE" })
+        foreach (RegistryHive hive in new RegistryHive[] { RegistryHive.CurrentUser, RegistryHive.LocalMachine })
         {
-            string path = (string)Registry.GetValue(key + @"\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\PuTTY_is1", "InstallLocation", null);
+            IList<RegistryView> views = new List<RegistryView>(new RegistryView[] { RegistryView.Registry32 });
-            if (path == null)
+            if (Environment.Is64BitOperatingSystem)
-                continue;
+                views.Insert(0, RegistryView.Registry64);
-            puttyPath = Path.Combine(path, "putty.exe");
+
-            if (File.Exists(puttyPath))
+            foreach (RegistryView view in views)
-            {
+                using (RegistryKey baseKey = RegistryKey.OpenBaseKey(hive, view), key = baseKey.OpenSubKey(@"SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\PuTTY_is1"))
-                Debug.WriteLine("Found PuTTY in registry: {0}", puttyPath, null);
+                    if (key != null)
-                return true;
+                    {
-            }
+                        string path = (string)key.GetValue("InstallLocation");
-            else
+                        if (path == null)
-                puttyPath = null;
+                            continue;
+                        puttyPath = Path.Combine(path, "putty.exe");
+                        if (File.Exists(puttyPath))
+                        {
+                            Debug.WriteLine("Found PuTTY in registry: {0}", puttyPath, null);
+                            return true;
+                        }
+                        else
+                            puttyPath = null;
+                    }
         }
 
         foreach (string path in Environment.GetEnvironmentVariable("PATH").Split(Path.PathSeparator))