From 710739e104f902ea69c63a1f7b513c50900663de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thorsten=20Sch=C3=B6ning?= Date: Mon, 26 Oct 2020 11:47:56 +0100 Subject: [PATCH 1/2] "noexec" is an unsupported option and prevents opening files by double-click in Windows Explorer. --- packaging/fwbuilder.nsi.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packaging/fwbuilder.nsi.in b/packaging/fwbuilder.nsi.in index 7971979d9..472920c97 100755 --- a/packaging/fwbuilder.nsi.in +++ b/packaging/fwbuilder.nsi.in @@ -192,11 +192,11 @@ Section "FWBuilder (required)" ; Write file associations and icons WriteRegStr HKLM "Software\Classes\.fwb" "" "fwbfile" - WriteRegStr HKLM "Software\Classes\fwbfile\shell\open\command" "" "$INSTDIR\fwbuilder.exe -noexec %1" + WriteRegStr HKLM "Software\Classes\fwbfile\shell\open\command" "" "$INSTDIR\fwbuilder.exe %1" WriteRegStr HKLM "Software\Classes\fwbfile\DefaultIcon" "" "$INSTDIR\fwbuilder.exe,0" WriteRegStr HKLM "Software\Classes\.fwl" "" "fwlfile" - WriteRegStr HKLM "Software\Classes\fwlfile\shell\open\command" "" "$INSTDIR\fwbuilder.exe -noexec %1" + WriteRegStr HKLM "Software\Classes\fwlfile\shell\open\command" "" "$INSTDIR\fwbuilder.exe %1" WriteRegStr HKLM "Software\Classes\fwlfile\DefaultIcon" "" "$INSTDIR\fwbuilder.exe,0" @@ -207,7 +207,7 @@ Section "FWBuilder (required)" ; ======================================================================== ; Configure installer to use our prepackaged plink.exe and pscp.exe but only if it was not configured before ; -; ******** THESE KEYS MUST MATCH THOSE USED BY the class FWBSettings +; ******** THESE KEYS MUST MATCH THOSE USED BY the class FWBSettings ; ReadRegStr $0 HKCU "Software\firewallbuilder.org\${APPNAME}\${GENERATION}\SSH" "SSHPath" StrCmp $0 "" 0 +3 From 6d0824eddadf17361d455def99a84d22f1cae413 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thorsten=20Sch=C3=B6ning?= Date: Mon, 26 Oct 2020 11:51:48 +0100 Subject: [PATCH 2/2] Quote paths, like is done for "UninstallString" already. --- packaging/fwbuilder.nsi.in | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packaging/fwbuilder.nsi.in b/packaging/fwbuilder.nsi.in index 472920c97..f9d9d7756 100755 --- a/packaging/fwbuilder.nsi.in +++ b/packaging/fwbuilder.nsi.in @@ -192,12 +192,12 @@ Section "FWBuilder (required)" ; Write file associations and icons WriteRegStr HKLM "Software\Classes\.fwb" "" "fwbfile" - WriteRegStr HKLM "Software\Classes\fwbfile\shell\open\command" "" "$INSTDIR\fwbuilder.exe %1" - WriteRegStr HKLM "Software\Classes\fwbfile\DefaultIcon" "" "$INSTDIR\fwbuilder.exe,0" + WriteRegStr HKLM "Software\Classes\fwbfile\shell\open\command" "" '"$INSTDIR\fwbuilder.exe" "%1"' + WriteRegStr HKLM "Software\Classes\fwbfile\DefaultIcon" "" '"$INSTDIR\fwbuilder.exe,0"' WriteRegStr HKLM "Software\Classes\.fwl" "" "fwlfile" - WriteRegStr HKLM "Software\Classes\fwlfile\shell\open\command" "" "$INSTDIR\fwbuilder.exe %1" - WriteRegStr HKLM "Software\Classes\fwlfile\DefaultIcon" "" "$INSTDIR\fwbuilder.exe,0" + WriteRegStr HKLM "Software\Classes\fwlfile\shell\open\command" "" '"$INSTDIR\fwbuilder.exe" "%1"' + WriteRegStr HKLM "Software\Classes\fwlfile\DefaultIcon" "" '"$INSTDIR\fwbuilder.exe,0"' ; Create registry entry for putty session with ssh keepalive