From c10f3105b354c523d4d4d36b09dd46f890e94a30 Mon Sep 17 00:00:00 2001 From: Dennis Joachimsthaler Date: Fri, 17 Jan 2014 18:15:40 +0100 Subject: [PATCH] Ensure tinc-gui running in 64 bits mode can find tinc's 32 bit registry key. --- gui/tinc-gui | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/gui/tinc-gui b/gui/tinc-gui index 64b738e..24ca96e 100755 --- a/gui/tinc-gui +++ b/gui/tinc-gui @@ -234,9 +234,15 @@ class VPN: def __init__(self, netname = None, pidfile = None): if platform.system() == 'Windows': + sam = _winreg.KEY_READ + if platform.machine().endswith('64'): + sam = sam | _winreg.KEY_WOW64_64KEY try: reg = _winreg.ConnectRegistry(None, _winreg.HKEY_LOCAL_MACHINE) - key = _winreg.OpenKey(reg, "SOFTWARE\\tinc") + 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 -- 2.25.1