From a0ff59ae983277abc8b2c8d641a09d4aa2815bb1 Mon Sep 17 00:00:00 2001
From: lsv <ls7777@yandex.ru>
Date: Mon, 13 Apr 2026 14:55:17 +0500
Subject: [PATCH] Add support putty for Windows
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Добавлена поддержка туннелей организованных в putty.exe.
Для работы с putty нужно добавить в plugins.ini строки:
; SSH (Windows): tunnel putty forward
;
Title=[Putty tunnel forward]
Command="C:\Program Files\PuTTY\putty.exe" -load "$$TITLE"
appliesto=puttyforward
Description=Putty forward tunnel from local port.
KeyFile=
Platform=windows
ServerType=postgresql
Database=No
SetPassword=No

Так же устранено падение pgadmin3.exe при закрытии соединения по нажатию Ctrl+W
---
 frm/plugins.cpp     | 89 +++++++++++++++++++++++++++++++++------------
 schema/pgServer.cpp |  3 +-
 2 files changed, 67 insertions(+), 25 deletions(-)

diff --git a/frm/plugins.cpp b/frm/plugins.cpp
index 3c45579..aa24a38 100644
--- a/frm/plugins.cpp
+++ b/frm/plugins.cpp
@@ -26,6 +26,7 @@
 #include "schema/pgSchema.h"
 #include "schema/pgTable.h"
 #include "utils/sysSettings.h"
+#include "utils/registry.h"
 
 void frmMain::LoadPluginUtilities()
 {
@@ -418,7 +419,7 @@ bool pluginUtilityFactory::CheckEnable(pgObject *obj)
 					m=winMain->GetPluginsMenu();
 					m->SetLabel(id,"[Putty tunnel forward]");
 				}
-				if (obj->GetMetaType()==PGM_SERVER) {
+				if (obj->GetMetaType()==PGM_SERVER && !obj->IsCollection()) {
 					pgServer* srv = (pgServer*) obj;
 					srv->SetPuttyTunnel(NULL);
 					wxString host=obj->GetName();
@@ -426,43 +427,83 @@ bool pluginUtilityFactory::CheckEnable(pgObject *obj)
 					wxString f ;
 					bool isfound=false;
 					title="[puttyforward]";
-					if (host.CmpNoCase("localhost")==0 ||host=="127.0.0.1") {
-						wxString path=wxFileName::GetHomeDir()+sepPath+".putty"+sepPath+"sessions";
-						if (wxDirExists(path)) {
-							f = wxFindFirstFile(path+sepPath+"*");
-							while ( !f.empty() )
-							{
-								wxString filename=f.AfterLast(sepPath);
-								{
-									wxString fcont=FileRead(f);
-									wxStringTokenizer tkz(fcont, wxT("\n"));
+					if (host.CmpNoCase("localhost") == 0 || host == "127.0.0.1") {
+#ifdef __WXMSW__
+						wxString path = "SOFTWARE\\SimonTatham\\PuTTY\\Sessions";
+						pgRegKey* pgKey = pgRegKey::OpenRegKey(HKEY_CURRENT_USER, path);
+						if (pgKey != NULL) {
+							pgRegKey* dirKey = NULL;
+							wxString dirName;
+							wxString token;
+							long cookie = 0;
+							bool flag = false;
 
-									// Loop round the lines in the file. Everytime we find a new 'Title' value
-									// we create the current plugin and start a new one
-									while(tkz.HasMoreTokens())
+							flag = pgKey->GetFirstKey(dirKey, cookie);
+
+							while (flag != false)
+							{
+								dirName = dirKey->GetKeyName();
+								token = wxEmptyString;
+								dirKey->QueryValue("PortForwardings", token);
+								wxString forward = token;
+								wxString port = forward.BeforeFirst('=').Trim();
+								if (port.Len() > 0 && port[0] == 'L' && sport == port.substr(1)) {
+									// found putty config
+									title = dirName;
+									if (winMain) m->SetLabel(id, title);
+									isfound = true;
+									srv->SetPuttyTunnel(this);
+									delete dirKey;
+									delete pgKey;
+									if (!winMain) return false;
+									return true;
+								}
+
+								delete dirKey;
+								// Get the next one...
+								flag = pgKey->GetNextKey(dirKey, cookie);
+							}
+							delete pgKey;
+						}
+#else
+							wxString path = wxFileName::GetHomeDir() + sepPath + ".putty" + sepPath + "sessions";
+							if (wxDirExists(path)) {
+								f = wxFindFirstFile(path + sepPath + "*");
+								while (!f.empty())
+								{
+
+									wxString filename = f.AfterLast(sepPath);
 									{
-										wxString token = tkz.GetNextToken();
-										if (token.Lower().StartsWith(wxT("portforwardings=")))
+										wxString fcont = FileRead(f);
+										wxStringTokenizer tkz(fcont, wxT("\n"));
+
+										// Loop round the lines in the file. Everytime we find a new 'Title' value
+										// we create the current plugin and start a new one
+										while (tkz.HasMoreTokens())
+										{
+											wxString token = tkz.GetNextToken();
+											if (token.Lower().StartsWith(wxT("portforwardings=")))
 											{
 												wxString forward = token.AfterFirst('=').Trim();
-												wxString port=forward.BeforeFirst('=').Trim();
-												if (port.Len()>0 && port[0]=='L' && sport==port.substr(1)) {
+												wxString port = forward.BeforeFirst('=').Trim();
+												if (port.Len() > 0 && port[0] == 'L' && sport == port.substr(1)) {
 													// found putty config
-													title=filename;
-													if (winMain) m->SetLabel(id,title);
-													isfound=true;
+													title = filename;
+													if (winMain) m->SetLabel(id, title);
+													isfound = true;
 													srv->SetPuttyTunnel(this);
 													if (!winMain) return false;
 													return true;
 												}
 											}
 
+										}
+
 									}
-									
+									f = wxFindNextFile();
 								}
-							f = wxFindNextFile();
 							}
-						}
+#endif
 					}
 				}
 				return false;
diff --git a/schema/pgServer.cpp b/schema/pgServer.cpp
index a3953ac..02e86d8 100644
--- a/schema/pgServer.cpp
+++ b/schema/pgServer.cpp
@@ -2151,6 +2151,7 @@ wxWindow *disconnectServerFactory::StartDialog(frmMain *form, pgObject *obj)
 				if (server) {
 					idserver=server->GetId();
 					form->execSelChange(idserver, false);
+					form->GetBrowser()->SelectItem(idserver);
 				} else return 0;
 			} else {
 					idserver=obj->GetId();
@@ -2160,7 +2161,7 @@ wxWindow *disconnectServerFactory::StartDialog(frmMain *form, pgObject *obj)
 			{
 				wxString msg = _("There are properties dialogues open for one or more objects belonging to a database which will be disconnected. Please close the properties dialogues and try again.");
 				wxMessageBox(msg, _("Cannot disconnect database"), wxICON_WARNING | wxOK);
-			} else 
+			} else
 				{
 				server->Disconnect(form);
 				server->UpdateIcon(form->GetBrowser());