Ensure tinc-gui running in 64 bits mode can find tinc's 32 bit registry key.

[tinc] / gui / tinc-gui

diff --git a/gui/tinc-gui b/gui/tinc-gui
index 2b4f903..24ca96e 100755 (executable)
--- a/gui/tinc-gui
+++ b/gui/tinc-gui
@@ -27,7 +27,7 @@ import time
 from wx.lib.mixins.listctrl import ColumnSorterMixin
 from wx.lib.mixins.listctrl import ListCtrlAutoWidthMixin
 
-if platform.system == 'Windows':
+if platform.system() == 'Windows':
        import _winreg
 
 # Classes to interface with a running tinc daemon
@@ -233,10 +233,16 @@ class VPN:
                return int(resp[2])
 
        def __init__(self, netname = None, pidfile = None):
-               if platform.system == 'Windows':
+               if platform.system() == 'Windows':
+                       sam = _winreg.KEY_READ
+                       if platform.machine().endswith('64'):
+                               sam = sam | _winreg.KEY_WOW64_64KEY
                        try:
-                               reg = _winreg.ConnectRegistry(None, HKEY_LOCAL_MACHINE)
-                               key = _winreg.OpenKey(reg, "SOFTWARE\\tinc")
+                               reg = _winreg.ConnectRegistry(None, _winreg.HKEY_LOCAL_MACHINE)
+                               try:
+                                       key = _winreg.OpenKey(reg, "SOFTWARE\\tinc", 0, sam)
+                               except WindowsError:
+                                       key = _winreg.OpenKey(reg, "SOFTWARE\\Wow6432Node\\tinc", 0, sam)
                                VPN.confdir = _winreg.QueryValue(key, None)
                        except WindowsError:
                                pass
@@ -252,7 +258,7 @@ class VPN:
                if pidfile != None:
                        self.pidfile = pidfile
                else:
-                       if platform.system == 'Windows':
+                       if platform.system() == 'Windows':
                                self.pidfile = os.path.join(self.confbase, 'pid')
                        else:
                                if netname: