From 89fff90de738025d338fa5d06b6ff3b589c33c9c Mon Sep 17 00:00:00 2001
From: klemens <ka7@github.com>
Date: Sat, 15 Apr 2017 10:06:22 +0200
Subject: [PATCH 001/166] Spelling fixes (just in comments).

As found by a bot ( http://www.misfix.org,
https://github.com/ka7/misspell_fixer ).
---
 doc/config.but   | 2 +-
 minibidi.c       | 4 ++--
 mkfiles.pl       | 2 +-
 pageant.c        | 2 +-
 settings.c       | 2 +-
 terminal.c       | 2 +-
 windows/window.c | 4 ++--
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/doc/config.but b/doc/config.but
index eb96fc17e..269dbdc1b 100644
--- a/doc/config.but
+++ b/doc/config.but
@@ -2507,7 +2507,7 @@ used:
 
 Disabling data-based rekeys entirely is a bad idea.  The \i{integrity},
 and to a lesser extent, \i{confidentiality} of the SSH-2 protocol depend
-in part on rekeys occuring before a 32-bit packet sequence number
+in part on rekeys occurring before a 32-bit packet sequence number
 wraps around.  Unlike time-based rekeys, data-based rekeys won't occur
 when the SSH connection is idle, so they shouldn't cause the same
 problems.  The SSH-1 protocol, incidentally, has even weaker integrity
diff --git a/minibidi.c b/minibidi.c
index 6c0621162..8d78594d2 100644
--- a/minibidi.c
+++ b/minibidi.c
@@ -3,7 +3,7 @@
  * ------------
  * Description:
  * ------------
- * This is an implemention of Unicode's Bidirectional Algorithm
+ * This is an implementation of Unicode's Bidirectional Algorithm
  * (known as UAX #9).
  *
  *   http://www.unicode.org/reports/tr9/
@@ -89,7 +89,7 @@ enum {
 
 /* Shaping Types */
 enum {
-    SL, /* Left-Joining, doesnt exist in U+0600 - U+06FF */
+    SL, /* Left-Joining, doesn't exist in U+0600 - U+06FF */
     SR, /* Right-Joining, ie has Isolated, Final */
     SD, /* Dual-Joining, ie has Isolated, Final, Initial, Medial */
     SU, /* Non-Joining */
diff --git a/mkfiles.pl b/mkfiles.pl
index ae15ac488..a19cec5d0 100755
--- a/mkfiles.pl
+++ b/mkfiles.pl
@@ -1966,7 +1966,7 @@ sub manpages {
       "# ** DO NOT EDIT **\r\n".
       "\r\n".
       # No difference between DEBUG and RELEASE here as in 'vcproj', because
-      # Dev-C++ does not support mutiple compilation profiles in one single project.
+      # Dev-C++ does not support multiple compilation profiles in one single project.
       # (At least I can say this for Dev-C++ 5 Beta)
       "[Project]\r\n".
       "FileName=$windows_project.dev\r\n".
diff --git a/pageant.c b/pageant.c
index 2d9a74023..366717251 100644
--- a/pageant.c
+++ b/pageant.c
@@ -1469,7 +1469,7 @@ int pageant_add_keyfile(Filename *filename, const char *passphrase,
     }
 
     /*
-     * If we get here, we've succesfully loaded the key into
+     * If we get here, we've successfully loaded the key into
      * rkey/skey, but not yet added it to the agent.
      */
 
diff --git a/settings.c b/settings.c
index f810d3f97..00c01c546 100644
--- a/settings.c
+++ b/settings.c
@@ -892,7 +892,7 @@ void load_open_settings(void *sesskey, Conf *conf)
     {
 	/* SSH-2 only by default */
 	int sshprot = gppi_raw(sesskey, "SshProt", 3);
-	/* Old sessions may contain the values correponding to the fallbacks
+	/* Old sessions may contain the values corresponding to the fallbacks
 	 * we used to allow; migrate them */
 	if (sshprot == 1)      sshprot = 0; /* => "SSH-1 only" */
 	else if (sshprot == 2) sshprot = 3; /* => "SSH-2 only" */
diff --git a/terminal.c b/terminal.c
index c79944cda..f47fe1bdb 100644
--- a/terminal.c
+++ b/terminal.c
@@ -2437,7 +2437,7 @@ static void erase_lots(Terminal *term,
 
     /* After an erase of lines from the top of the screen, we shouldn't
      * bring the lines back again if the terminal enlarges (since the user or
-     * application has explictly thrown them away). */
+     * application has explicitly thrown them away). */
     if (erasing_lines_from_top && !(term->alt_which))
 	term->tempsblines = 0;
 }
diff --git a/windows/window.c b/windows/window.c
index 004eb4f82..38c0e3cd7 100644
--- a/windows/window.c
+++ b/windows/window.c
@@ -1700,7 +1700,7 @@ void request_resize(void *frontend, int w, int h)
 {
     int width, height;
 
-    /* If the window is maximized supress resizing attempts */
+    /* If the window is maximized suppress resizing attempts */
     if (IsZoomed(hwnd)) {
 	if (conf_get_int(conf, CONF_resize_action) == RESIZE_TERM)
 	    return;
@@ -4777,7 +4777,7 @@ static int TranslateKey(UINT message, WPARAM wParam, LPARAM lParam,
 
 	    return p - output;
 	}
-	/* If we're definitly not building up an ALT-54321 then clear it */
+	/* If we're definitely not building up an ALT-54321 then clear it */
 	if (!left_alt)
 	    keys_unicode[0] = 0;
 	/* If we will be using alt_sum fix the 256s */

From b189df947d2625499cf508fd1fae7e18b03b9247 Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Sat, 15 Apr 2017 18:13:47 +0100
Subject: [PATCH 002/166] Condition out some API type-checks in the MinGW
 build.

A couple of the functions for which I was already turning off the type
check for old Visual Studio turn out to also need it turning off for
MinGW.
---
 windows/winhsock.c | 7 ++++---
 windows/winnet.c   | 6 +++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/windows/winhsock.c b/windows/winhsock.c
index e5f0fa4fd..c8cb46f68 100644
--- a/windows/winhsock.c
+++ b/windows/winhsock.c
@@ -282,9 +282,10 @@ static char *sk_handle_peer_info(Socket s)
 
     if (!kernel32_module) {
         kernel32_module = load_system32_dll("kernel32.dll");
-#if defined _MSC_VER && _MSC_VER < 1900
-        /* For older Visual Studio, this function isn't available in
-         * the header files to type-check */
+#if (defined _MSC_VER && _MSC_VER < 1900) || defined __MINGW32__
+        /* For older Visual Studio, and MinGW too (at least as of
+         * Ubuntu 16.04), this function isn't available in the header
+         * files to type-check */
         GET_WINDOWS_FUNCTION_NO_TYPECHECK(
             kernel32_module, GetNamedPipeClientProcessId);
 #else
diff --git a/windows/winnet.c b/windows/winnet.c
index 7ceca4863..fc26c3e55 100644
--- a/windows/winnet.c
+++ b/windows/winnet.c
@@ -314,9 +314,9 @@ void sk_init(void)
     GET_WINDOWS_FUNCTION(winsock_module, getservbyname);
     GET_WINDOWS_FUNCTION(winsock_module, inet_addr);
     GET_WINDOWS_FUNCTION(winsock_module, inet_ntoa);
-#if defined _MSC_VER && _MSC_VER < 1900
-    /* Older Visual Studio doesn't know about this function at all, so
-     * can't type-check it */
+#if (defined _MSC_VER && _MSC_VER < 1900) || defined __MINGW32__
+    /* Older Visual Studio, and MinGW as of Ubuntu 16.04, don't know
+     * about this function at all, so can't type-check it */
     GET_WINDOWS_FUNCTION_NO_TYPECHECK(winsock_module, inet_ntop);
 #else
     GET_WINDOWS_FUNCTION(winsock_module, inet_ntop);

From 73039b7831aa863fabba1e6ff06471643303ae09 Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Mon, 13 Mar 2017 21:24:06 +0000
Subject: [PATCH 003/166] Load winmm.dll (for PlaySound()) at run time.

It's not on the default list of important system 'known DLLs' stored
at HKLM\SYSTEM\CurrentControlSet\Control\Session Manager\KnownDLLs (see
https://isc.sans.edu/forums/diary/DLL+hijacking+vulnerabilities/9445/ )
which apparently makes it exempt from Windows's standard DLL hijacking
defence, i.e. if an executable links against it in the normal way then
that executable will be vulnerable to DLL hijacking from a file called
winmm.dll in the same directory as it.

The solution is to load it dynamically _after_ we've locked down our
DLL search path, which fortunately PuTTY's code base is well used to
doing already for other DLLs.
---
 Recipe           | 2 +-
 windows/window.c | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Recipe b/Recipe
index 54e006366..e2cce9ae8 100644
--- a/Recipe
+++ b/Recipe
@@ -274,7 +274,7 @@ CHARSET  = sbcsdat slookup sbcs utf8 toucs fromucs xenc mimeenc macenc localenc
 
 # Standard libraries.
 LIBS     = advapi32.lib user32.lib gdi32.lib comctl32.lib comdlg32.lib
-         + shell32.lib winmm.lib imm32.lib winspool.lib ole32.lib
+         + shell32.lib imm32.lib winspool.lib ole32.lib
 
 # Network backend sets. This also brings in the relevant attachment
 # to proxy.c depending on whether we're crypto-avoidant or not.
diff --git a/windows/window.c b/windows/window.c
index 38c0e3cd7..cb42addf7 100644
--- a/windows/window.c
+++ b/windows/window.c
@@ -3949,12 +3949,14 @@ int char_width(Context ctx, int uc) {
 DECL_WINDOWS_FUNCTION(static, BOOL, FlashWindowEx, (PFLASHWINFO));
 DECL_WINDOWS_FUNCTION(static, BOOL, ToUnicodeEx,
                       (UINT, UINT, const BYTE *, LPWSTR, int, UINT, HKL));
+DECL_WINDOWS_FUNCTION(static, BOOL, PlaySound, (LPCTSTR, HMODULE, DWORD));
 
 static void init_winfuncs(void)
 {
     HMODULE user32_module = load_system32_dll("user32.dll");
+    HMODULE winmm_module = load_system32_dll("winmm.dll");
     GET_WINDOWS_FUNCTION(user32_module, FlashWindowEx);
-    GET_WINDOWS_FUNCTION(user32_module, ToUnicodeEx);
+    GET_WINDOWS_FUNCTION_PP(winmm_module, PlaySound);
 }
 
 /*
@@ -5540,8 +5542,8 @@ void do_beep(void *frontend, int mode)
 	lastbeep = GetTickCount();
     } else if (mode == BELL_WAVEFILE) {
 	Filename *bell_wavefile = conf_get_filename(conf, CONF_bell_wavefile);
-	if (!PlaySound(bell_wavefile->path, NULL,
-		       SND_ASYNC | SND_FILENAME)) {
+	if (!p_PlaySound || !p_PlaySound(bell_wavefile->path, NULL,
+                         SND_ASYNC | SND_FILENAME)) {
 	    char buf[sizeof(bell_wavefile->path) + 80];
 	    char otherbuf[100];
 	    sprintf(buf, "Unable to play sound file\n%s\n"

From 793ac872757667a87df4636b5b3eed61302dd837 Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Mon, 13 Mar 2017 21:28:36 +0000
Subject: [PATCH 004/166] Load the Windows printing subsystem at run time.

The printing functions are split between winspool.drv and spoolss.dll
in a really weird way (who would have guessed that OpenPrinter and
ClosePrinter don't live in the same dynamic library?!), but _neither_
of those counts as a system 'known DLL', so linking against either one
of these at load time is again a potential DLL hijacking vector.
---
 Recipe             |  2 +-
 windows/winprint.c | 65 ++++++++++++++++++++++++++++++++++++----------
 2 files changed, 52 insertions(+), 15 deletions(-)

diff --git a/Recipe b/Recipe
index e2cce9ae8..0fb7bbb76 100644
--- a/Recipe
+++ b/Recipe
@@ -274,7 +274,7 @@ CHARSET  = sbcsdat slookup sbcs utf8 toucs fromucs xenc mimeenc macenc localenc
 
 # Standard libraries.
 LIBS     = advapi32.lib user32.lib gdi32.lib comctl32.lib comdlg32.lib
-         + shell32.lib imm32.lib winspool.lib ole32.lib
+         + shell32.lib imm32.lib ole32.lib
 
 # Network backend sets. This also brings in the relevant attachment
 # to proxy.c depending on whether we're crypto-avoidant or not.
diff --git a/windows/winprint.c b/windows/winprint.c
index c190e5fb0..115872739 100644
--- a/windows/winprint.c
+++ b/windows/winprint.c
@@ -18,11 +18,46 @@ struct printer_job_tag {
     HANDLE hprinter;
 };
 
+DECL_WINDOWS_FUNCTION(static, BOOL, EnumPrinters,
+                      (DWORD, LPTSTR, DWORD, LPBYTE, DWORD, LPDWORD, LPDWORD));
+DECL_WINDOWS_FUNCTION(static, BOOL, OpenPrinter,
+                      (LPTSTR, LPHANDLE, LPPRINTER_DEFAULTS));
+DECL_WINDOWS_FUNCTION(static, BOOL, ClosePrinter, (HANDLE));
+DECL_WINDOWS_FUNCTION(static, BOOL, StartDocPrinter, (HANDLE, DWORD, LPBYTE));
+DECL_WINDOWS_FUNCTION(static, BOOL, EndDocPrinter, (HANDLE));
+DECL_WINDOWS_FUNCTION(static, BOOL, StartPagePrinter, (HANDLE));
+DECL_WINDOWS_FUNCTION(static, BOOL, EndPagePrinter, (HANDLE));
+DECL_WINDOWS_FUNCTION(static, BOOL, WritePrinter,
+                      (HANDLE, LPVOID, DWORD, LPDWORD));
+
+static void init_winfuncs(void)
+{
+    static int initialised = FALSE;
+    char buf[4096];
+    if (initialised)
+        return;
+    {
+        HMODULE winspool_module = load_system32_dll("winspool.drv");
+        HMODULE spoolss_module = load_system32_dll("spoolss.dll");
+        GET_WINDOWS_FUNCTION_PP(winspool_module, EnumPrinters);
+        GET_WINDOWS_FUNCTION_PP(winspool_module, OpenPrinter);
+        GET_WINDOWS_FUNCTION_PP(spoolss_module, ClosePrinter);
+        GET_WINDOWS_FUNCTION_PP(winspool_module, StartDocPrinter);
+        GET_WINDOWS_FUNCTION_PP(spoolss_module, EndDocPrinter);
+        GET_WINDOWS_FUNCTION_PP(spoolss_module, StartPagePrinter);
+        GET_WINDOWS_FUNCTION_PP(spoolss_module, EndPagePrinter);
+        GET_WINDOWS_FUNCTION_PP(spoolss_module, WritePrinter);
+    }
+    initialised = TRUE;
+}
+
 static int printer_add_enum(int param, DWORD level, char **buffer,
                             int offset, int *nprinters_ptr)
 {
     DWORD needed = 0, nprinters = 0;
 
+    init_winfuncs();
+
     *buffer = sresize(*buffer, offset+512, char);
 
     /*
@@ -30,16 +65,16 @@ static int printer_add_enum(int param, DWORD level, char **buffer,
      * we'll need for the output. Discard the return value since it
      * will almost certainly be a failure due to lack of space.
      */
-    EnumPrinters(param, NULL, level, (LPBYTE)((*buffer)+offset), 512,
-		 &needed, &nprinters);
+    p_EnumPrinters(param, NULL, level, (LPBYTE)((*buffer)+offset), 512,
+                   &needed, &nprinters);
 
     if (needed < 512)
         needed = 512;
 
     *buffer = sresize(*buffer, offset+needed, char);
 
-    if (EnumPrinters(param, NULL, level, (LPBYTE)((*buffer)+offset),
-                     needed, &needed, &nprinters) == 0)
+    if (p_EnumPrinters(param, NULL, level, (LPBYTE)((*buffer)+offset),
+                       needed, &needed, &nprinters) == 0)
         return FALSE;
 
     *nprinters_ptr += nprinters;
@@ -131,19 +166,21 @@ printer_job *printer_start_job(char *printer)
     DOC_INFO_1 docinfo;
     int jobstarted = 0, pagestarted = 0;
 
+    init_winfuncs();
+
     ret->hprinter = NULL;
-    if (!OpenPrinter(printer, &ret->hprinter, NULL))
+    if (!p_OpenPrinter(printer, &ret->hprinter, NULL))
 	goto error;
 
     docinfo.pDocName = "PuTTY remote printer output";
     docinfo.pOutputFile = NULL;
     docinfo.pDatatype = "RAW";
 
-    if (!StartDocPrinter(ret->hprinter, 1, (LPBYTE)&docinfo))
+    if (!p_StartDocPrinter(ret->hprinter, 1, (LPBYTE)&docinfo))
 	goto error;
     jobstarted = 1;
 
-    if (!StartPagePrinter(ret->hprinter))
+    if (!p_StartPagePrinter(ret->hprinter))
 	goto error;
     pagestarted = 1;
 
@@ -151,11 +188,11 @@ printer_job *printer_start_job(char *printer)
 
     error:
     if (pagestarted)
-	EndPagePrinter(ret->hprinter);
+	p_EndPagePrinter(ret->hprinter);
     if (jobstarted)
-	EndDocPrinter(ret->hprinter);
+	p_EndDocPrinter(ret->hprinter);
     if (ret->hprinter)
-	ClosePrinter(ret->hprinter);
+	p_ClosePrinter(ret->hprinter);
     sfree(ret);
     return NULL;
 }
@@ -167,7 +204,7 @@ void printer_job_data(printer_job *pj, void *data, int len)
     if (!pj)
 	return;
 
-    WritePrinter(pj->hprinter, data, len, &written);
+    p_WritePrinter(pj->hprinter, data, len, &written);
 }
 
 void printer_finish_job(printer_job *pj)
@@ -175,8 +212,8 @@ void printer_finish_job(printer_job *pj)
     if (!pj)
 	return;
 
-    EndPagePrinter(pj->hprinter);
-    EndDocPrinter(pj->hprinter);
-    ClosePrinter(pj->hprinter);
+    p_EndPagePrinter(pj->hprinter);
+    p_EndDocPrinter(pj->hprinter);
+    p_ClosePrinter(pj->hprinter);
     sfree(pj);
 }

From f77ee39e8cae2eaaea3a8fdd1eaffaf484cada08 Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Mon, 13 Mar 2017 21:42:44 +0000
Subject: [PATCH 005/166] Load comctl32.dll (for drag lists) at run time.

This too is not in the list of known DLLs on Windows 10. I don't know
of any actual viable hijacking attack based on it, which according to
my reading of MSDN (specifically, a rather vague hint in
https://msdn.microsoft.com/library/ff919712) _may_ be because we
mention the common controls assembly in our application manifest; but
better safe than sorry.

Now the entire list of remaining DLLs that PuTTY links against at load
time is a subset of the Win10 known DLLs list, so that _should_ mean
that everything we load before we've deployed our own defence
(SetDefaultDllDirectories) is defended against for us by Windows
itself.
---
 Recipe             |  2 +-
 windows/winctrls.c | 33 ++++++++++++++++++++++++---------
 windows/window.c   |  2 +-
 windows/winpgen.c  |  2 +-
 windows/winstuff.h |  1 +
 5 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/Recipe b/Recipe
index 0fb7bbb76..f54581223 100644
--- a/Recipe
+++ b/Recipe
@@ -273,7 +273,7 @@ IMPORT   = import sshbcrypt sshblowf
 CHARSET  = sbcsdat slookup sbcs utf8 toucs fromucs xenc mimeenc macenc localenc
 
 # Standard libraries.
-LIBS     = advapi32.lib user32.lib gdi32.lib comctl32.lib comdlg32.lib
+LIBS     = advapi32.lib user32.lib gdi32.lib comdlg32.lib
          + shell32.lib imm32.lib ole32.lib
 
 # Network backend sets. This also brings in the relevant attachment
diff --git a/windows/winctrls.c b/windows/winctrls.c
index a03967e6f..737018e45 100644
--- a/windows/winctrls.c
+++ b/windows/winctrls.c
@@ -38,6 +38,21 @@
 #define PUSHBTNHEIGHT 14
 #define PROGBARHEIGHT 14
 
+DECL_WINDOWS_FUNCTION(static, void, InitCommonControls, (void));
+DECL_WINDOWS_FUNCTION(static, BOOL, MakeDragList, (HWND));
+DECL_WINDOWS_FUNCTION(static, int, LBItemFromPt, (HWND, POINT, BOOL));
+DECL_WINDOWS_FUNCTION(static, int, DrawInsert, (HWND, HWND, int));
+
+void init_common_controls(void)
+{
+    HMODULE comctl32_module = load_system32_dll("comctl32.dll");
+    GET_WINDOWS_FUNCTION(comctl32_module, InitCommonControls);
+    GET_WINDOWS_FUNCTION(comctl32_module, MakeDragList);
+    GET_WINDOWS_FUNCTION(comctl32_module, LBItemFromPt);
+    GET_WINDOWS_FUNCTION(comctl32_module, DrawInsert);
+    p_InitCommonControls();
+}
+
 void ctlposinit(struct ctlpos *cp, HWND hwnd,
 		int leftborder, int rightborder, int topborder)
 {
@@ -921,7 +936,7 @@ void prefslist(struct prefslist *hdl, struct ctlpos *cp, int lines,
 			    WS_VSCROLL | LBS_HASSTRINGS | LBS_USETABSTOPS,
                             WS_EX_CLIENTEDGE,
                             "", listid);
-		MakeDragList(ctl);
+		p_MakeDragList(ctl);
             }
             break;
 
@@ -996,17 +1011,17 @@ int pl_itemfrompt(HWND hwnd, POINT cursor, BOOL scroll)
      * current item if the upper edge is closer than
      * the lower edge, or _below_ it if vice versa.
      */
-    ret = LBItemFromPt(hwnd, cursor, scroll);
+    ret = p_LBItemFromPt(hwnd, cursor, scroll);
     if (ret == -1)
 	return ret;
-    ret = LBItemFromPt(hwnd, cursor, FALSE);
+    ret = p_LBItemFromPt(hwnd, cursor, FALSE);
     updist = downdist = 0;
     for (i = 1; i < 4096 && (!updist || !downdist); i++) {
 	uppoint = downpoint = cursor;
 	uppoint.y -= i;
 	downpoint.y += i;
-	upitem = LBItemFromPt(hwnd, uppoint, FALSE);
-	downitem = LBItemFromPt(hwnd, downpoint, FALSE);
+	upitem = p_LBItemFromPt(hwnd, uppoint, FALSE);
+	downitem = p_LBItemFromPt(hwnd, downpoint, FALSE);
 	if (!updist && upitem != ret)
 	    updist = i;
 	if (!downdist && downitem != ret)
@@ -1047,13 +1062,13 @@ int handle_prefslist(struct prefslist *hdl,
 		    SendDlgItemMessage(hwnd, hdl->listid,
 				       LB_ADDSTRING, 0, (LPARAM) "");
 
-                hdl->srcitem = LBItemFromPt(dlm->hWnd, dlm->ptCursor, TRUE);
+                hdl->srcitem = p_LBItemFromPt(dlm->hWnd, dlm->ptCursor, TRUE);
 		hdl->dragging = 0;
 		/* XXX hack Q183115 */
 		SetWindowLongPtr(hwnd, DWLP_MSGRESULT, TRUE);
                 ret |= 1; break;
               case DL_CANCELDRAG:
-		DrawInsert(hwnd, dlm->hWnd, -1);     /* Clear arrow */
+		p_DrawInsert(hwnd, dlm->hWnd, -1);     /* Clear arrow */
 		SendDlgItemMessage(hwnd, hdl->listid,
 				   LB_DELETESTRING, hdl->dummyitem, 0);
 		hdl->dragging = 0;
@@ -1062,7 +1077,7 @@ int handle_prefslist(struct prefslist *hdl,
 		hdl->dragging = 1;
 		dest = pl_itemfrompt(dlm->hWnd, dlm->ptCursor, TRUE);
 		if (dest > hdl->dummyitem) dest = hdl->dummyitem;
-		DrawInsert (hwnd, dlm->hWnd, dest);
+		p_DrawInsert (hwnd, dlm->hWnd, dest);
 		if (dest >= 0)
 		    SetWindowLongPtr(hwnd, DWLP_MSGRESULT, DL_MOVECURSOR);
 		else
@@ -1072,7 +1087,7 @@ int handle_prefslist(struct prefslist *hdl,
 		if (hdl->dragging) {
 		    dest = pl_itemfrompt(dlm->hWnd, dlm->ptCursor, TRUE);
 		    if (dest > hdl->dummyitem) dest = hdl->dummyitem;
-		    DrawInsert (hwnd, dlm->hWnd, -1);
+		    p_DrawInsert (hwnd, dlm->hWnd, -1);
 		}
 		SendDlgItemMessage(hwnd, hdl->listid,
 				   LB_DELETESTRING, hdl->dummyitem, 0);
diff --git a/windows/window.c b/windows/window.c
index cb42addf7..e01a3c32d 100644
--- a/windows/window.c
+++ b/windows/window.c
@@ -359,7 +359,7 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
 
     sk_init();
 
-    InitCommonControls();
+    init_common_controls();
 
     /* Set Explicit App User Model Id so that jump lists don't cause
        PuTTY to hang on to removable media. */
diff --git a/windows/winpgen.c b/windows/winpgen.c
index c4f4de45b..2507d37ea 100644
--- a/windows/winpgen.c
+++ b/windows/winpgen.c
@@ -1529,7 +1529,7 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
 
     dll_hijacking_protection();
 
-    InitCommonControls();
+    init_common_controls();
     hinst = inst;
     hwnd = NULL;
 
diff --git a/windows/winstuff.h b/windows/winstuff.h
index 007889e4a..f8c4243f9 100644
--- a/windows/winstuff.h
+++ b/windows/winstuff.h
@@ -329,6 +329,7 @@ struct ctlpos {
     int boxystart, boxid;
     char *boxtext;
 };
+void init_common_controls(void);       /* also does some DLL-loading */
 
 /*
  * Exports from winutils.c.

From b1829b81b5c0d12dcc91f6b50b0b4d83c3df6a8e Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Mon, 24 Apr 2017 14:45:52 +0100
Subject: [PATCH 006/166] Update version number for 0.69 release.

---
 Buildscr          | 2 +-
 LATEST.VER        | 2 +-
 doc/plink.but     | 2 +-
 doc/pscp.but      | 2 +-
 windows/putty.iss | 8 ++++----
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Buildscr b/Buildscr
index 7ca4eb7f5..086800ac6 100644
--- a/Buildscr
+++ b/Buildscr
@@ -35,7 +35,7 @@ module putty
 ifeq "$(RELEASE)" "" set Ndate $(!builddate)
 ifneq "$(Ndate)" "" in . do echo $(Ndate) | perl -pe 's/(....)(..)(..)/$$1-$$2-$$3/' > date
 ifneq "$(Ndate)" "" read Date date
-set Epoch 16214 # update this at every release
+set Epoch 16280 # update this at every release
 ifneq "$(Ndate)" "" in . do echo $(Ndate) | perl -ne 'use Time::Local; /(....)(..)(..)/ and print timegm(0,0,0,$$3,$$2-1,$$1) / 86400 - $(Epoch)' > days
 ifneq "$(Ndate)" "" read Days days
 
diff --git a/LATEST.VER b/LATEST.VER
index db1ed30c7..b04c64745 100644
--- a/LATEST.VER
+++ b/LATEST.VER
@@ -1 +1 @@
-0.68
+0.69
diff --git a/doc/plink.but b/doc/plink.but
index 351e13ea7..153982e07 100644
--- a/doc/plink.but
+++ b/doc/plink.but
@@ -41,7 +41,7 @@ use Plink:
 
 \c Z:\sysosd>plink
 \c Plink: command-line connection utility
-\c Release 0.68
+\c Release 0.69
 \c Usage: plink [options] [user@]host [command]
 \c        ("host" can also be a PuTTY saved session name)
 \c Options:
diff --git a/doc/pscp.but b/doc/pscp.but
index 27643a468..30a47f83b 100644
--- a/doc/pscp.but
+++ b/doc/pscp.but
@@ -39,7 +39,7 @@ use PSCP:
 
 \c Z:\owendadmin>pscp
 \c PuTTY Secure Copy client
-\c Release 0.68
+\c Release 0.69
 \c Usage: pscp [options] [user@]host:source target
 \c        pscp [options] source [source...] [user@]host:target
 \c        pscp [options] -ls [user@]host:filespec
diff --git a/windows/putty.iss b/windows/putty.iss
index dda68f63b..b3deb76c2 100644
--- a/windows/putty.iss
+++ b/windows/putty.iss
@@ -14,10 +14,10 @@
 
 [Setup]
 AppName=PuTTY
-AppVerName=PuTTY version 0.68
-VersionInfoTextVersion=Release 0.68
-AppVersion=0.68
-VersionInfoVersion=0.68.0.0
+AppVerName=PuTTY version 0.69
+VersionInfoTextVersion=Release 0.69
+AppVersion=0.69
+VersionInfoVersion=0.69.0.0
 AppPublisher=Simon Tatham
 AppPublisherURL=http://www.chiark.greenend.org.uk/~sgtatham/putty/
 AppReadmeFile={app}\README.txt

From d6d10932ac1f9333b06ee8027dcfad231f17ed04 Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Sat, 29 Apr 2017 10:23:31 +0100
Subject: [PATCH 007/166] Release checklist update: no @releases array!

The rewritten bugs2html.py in the wishlist repository no longer needs
me to manually maintain a mapping between releases and version control
- and the one thing I forgot was to remove the reminder in the release
checklist telling me to keep that mapping up to date :-)
---
 CHECKLST.txt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/CHECKLST.txt b/CHECKLST.txt
index 0499d7802..8d55ac412 100644
--- a/CHECKLST.txt
+++ b/CHECKLST.txt
@@ -96,7 +96,6 @@ for it:
       branch (so that the wishlist mechanism can't automatically mark
       them as fixed in the new release), add appropriate Fixed-in
       headers for those.
-    * Add an entry to the @releases array in control/bugs2html.
 
  - Make a release-candidate build from the release tag, and put the
    build.out and build.log dfiles somewhere safe. Normally I store

From 5a576e0c891ddc745ea1f67bcca10f1386ff1849 Mon Sep 17 00:00:00 2001
From: Jacob Nevins <jacobn@chiark.greenend.org.uk>
Date: Sat, 29 Apr 2017 12:07:37 +0100
Subject: [PATCH 008/166] Reinstate use of ToUnicodeEx().

This was accidentally disabled by 73039b783, causing a regression in
ability to type characters outside of the current Windows code page.
---
 windows/window.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/windows/window.c b/windows/window.c
index e01a3c32d..89ddb8636 100644
--- a/windows/window.c
+++ b/windows/window.c
@@ -3956,6 +3956,7 @@ static void init_winfuncs(void)
     HMODULE user32_module = load_system32_dll("user32.dll");
     HMODULE winmm_module = load_system32_dll("winmm.dll");
     GET_WINDOWS_FUNCTION(user32_module, FlashWindowEx);
+    GET_WINDOWS_FUNCTION(user32_module, ToUnicodeEx);
     GET_WINDOWS_FUNCTION_PP(winmm_module, PlaySound);
 }
 

From ed600ab23f87fd1785d100937e992e244ba82ed5 Mon Sep 17 00:00:00 2001
From: Jacob Nevins <jacobn@chiark.greenend.org.uk>
Date: Sat, 29 Apr 2017 14:24:17 +0100
Subject: [PATCH 009/166] Fix double negative in TTY mode docs.

---
 doc/config.but | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/config.but b/doc/config.but
index 269dbdc1b..a7d45689f 100644
--- a/doc/config.but
+++ b/doc/config.but
@@ -2959,7 +2959,7 @@ modes from the local terminal, if any.
 
 }
 
-\b If \q{Nothing} is selected, no value for the mode will not be
+\b If \q{Nothing} is selected, no value for the mode will be
 specified to the server under any circumstances.
 
 \b If a value is specified, it will be sent to the server under all

From fb023da0fdcbfca104b39c2315a79186d7254c99 Mon Sep 17 00:00:00 2001
From: Jacob Nevins <jacobn@chiark.greenend.org.uk>
Date: Sun, 30 Apr 2017 10:42:02 +0100
Subject: [PATCH 010/166] Be less vague in the description of IUTF8.

---
 doc/config.but | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/doc/config.but b/doc/config.but
index a7d45689f..bb18b794b 100644
--- a/doc/config.but
+++ b/doc/config.but
@@ -3006,18 +3006,19 @@ PuTTY in a variety of ways, such as \cw{true}/\cw{false},
 \cw{no} is different from not sending the mode at all.)
 
 \b The boolean mode \I{IUTF8 terminal mode}\cw{IUTF8} signals to the
-server whether the terminal character set is \i{UTF-8} or not.
-If this is set incorrectly, keys like backspace may do the wrong thing
-in some circumstances. However, setting this is not usually
-sufficient to cause servers to expect the terminal to be in UTF-8 mode;
-POSIX servers will generally require the locale to be set (by some
-server-dependent means), although many default to UTF-8. Also,
-since this mode was added to the SSH protocol much later than the
-others, \#{circa 2016} many servers (particularly older servers) do
-not honour this mode sent over SSH; indeed, a few poorly-written
-servers object to its mere presence, so you may find you need to set
-it to not be sent at all. When set to \q{Auto}, this follows the local
-configured character set (see \k{config-charset}).
+server whether the terminal character set is \i{UTF-8} or not, for
+purposes such as basic line editing; if this is set incorrectly,
+the backspace key may erase the wrong amount of text, for instance.
+However, simply setting this is not usually sufficient for the server
+to use UTF-8; POSIX servers will generally also require the locale to
+be set (by some server-dependent means), although many newer
+installations default to UTF-8. Also, since this mode was added to the
+SSH protocol much later than the others, \#{circa 2016} many servers
+(particularly older servers) do not honour this mode sent over SSH;
+indeed, a few poorly-written servers object to its mere presence, so
+you may find you need to set it to not be sent at all. When set to
+\q{Auto}, this follows the local configured character set (see
+\k{config-charset}).
 
 \b Terminal speeds are configured elsewhere; see \k{config-termspeed}.
 

From 230f7d56284a703c65c4fecf7e6f23b791043f81 Mon Sep 17 00:00:00 2001
From: Zero King <l2dy@macports.org>
Date: Sun, 30 Apr 2017 11:01:13 +0100
Subject: [PATCH 011/166] Fix thinko introduced in 8833634f4.

This prevented compilation with Gtk 2.
---
 unix/gtkwin.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/unix/gtkwin.c b/unix/gtkwin.c
index 69e335094..bca6daa43 100644
--- a/unix/gtkwin.c
+++ b/unix/gtkwin.c
@@ -2188,11 +2188,11 @@ void set_gtk_widget_background(GtkWidget *widget, const GdkColor *col)
     free(data);
     free(col_css);
 #else
-    if (gtk_widget_get_window(win)) {
+    if (gtk_widget_get_window(widget)) {
         /* For GTK1, which doesn't have a 'const' on
          * gdk_window_set_background's second parameter type. */
         GdkColor col_mutable = *col;
-        gdk_window_set_background(gtk_widget_get_window(win), &col_mutable);
+        gdk_window_set_background(gtk_widget_get_window(widget), &col_mutable);
     }
 #endif
 }

From b566c5f125efb9933303a61303ab17e2af0a859b Mon Sep 17 00:00:00 2001
From: Jacob Nevins <jacobn@chiark.greenend.org.uk>
Date: Sun, 30 Apr 2017 11:39:07 +0100
Subject: [PATCH 012/166] Add a cast to fix a warning.

This fixes compilation with Gtk 2 with -Werror. Problem introduced by
64221972c.
---
 unix/gtkwin.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/unix/gtkwin.c b/unix/gtkwin.c
index bca6daa43..67cfcac38 100644
--- a/unix/gtkwin.c
+++ b/unix/gtkwin.c
@@ -1935,7 +1935,7 @@ gboolean scroll_event(GtkWidget *widget, GdkEventScroll *event, gpointer data)
     event_button->x_root = event->x_root;
     event_button->y_root = event->y_root;
     ret = button_internal(inst, event_button);
-    gdk_event_free(event_button);
+    gdk_event_free((GdkEvent *)event_button);
     return ret;
 #endif
 }

From ad694a494158d44ff3dce86d20f4f2afb1dc142e Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Mon, 1 May 2017 06:53:06 +0100
Subject: [PATCH 013/166] mkfiles.pl: fix regex syntax error.

Thanks to Brian K. White for spotting this straight-up syntax error of
a missing ), in the regex handling the special case of &splitlines
when it findss a word in its input string too long to fit in the
specified output line width. Apparently in all my own uses of
&splitline I'd never exercised that special-case code path before.
---
 mkfiles.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mkfiles.pl b/mkfiles.pl
index a19cec5d0..8a63c65dc 100755
--- a/mkfiles.pl
+++ b/mkfiles.pl
@@ -364,7 +364,7 @@ sub splitline {
   $len = (defined $width ? $width : 76);
   $splitchar = (defined $splitchar ? $splitchar : '\\');
   while (length $line > $len) {
-    $line =~ /^(.{0,$len})\s(.*)$/ or $line =~ /^(.{$len,}?\s(.*)$/;
+    $line =~ /^(.{0,$len})\s(.*)$/ or $line =~ /^(.{$len,})?\s(.*)$/;
     $result .= $1;
     $result .= " ${splitchar}\n\t\t" if $2 ne '';
     $line = $2;

From 6ea9d36ae94736493216591fb18d20efe79b5216 Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Sun, 7 May 2017 16:29:01 +0100
Subject: [PATCH 014/166] Switch chiark URLs to https.

---
 Buildscr                |   4 ++--
 README                  |   4 ++--
 contrib/cygtermd/README |   2 +-
 doc/blurb.but           |   2 +-
 doc/faq.but             |  18 +++++++++---------
 doc/feedback.but        |  18 +++++++++---------
 doc/man-pl.but          |   2 +-
 doc/man-pscp.but        |   2 +-
 doc/man-psft.but        |   2 +-
 doc/man-ptel.but        |   2 +-
 doc/man-putt.but        |   2 +-
 doc/pgpkeys.but         |  20 ++++++++++----------
 doc/udp.but             |   2 +-
 ssh.c                   |   2 +-
 windows/README-msi.txt  |   2 +-
 windows/README.txt      |   2 +-
 windows/putty.iss       |   2 +-
 windows/website.url     | Bin 103 -> 104 bytes
 windows/windlg.c        |   2 +-
 windows/winpgen.c       |   2 +-
 windows/winpgnt.c       |   2 +-
 21 files changed, 47 insertions(+), 47 deletions(-)

diff --git a/Buildscr b/Buildscr
index 086800ac6..afcc2766e 100644
--- a/Buildscr
+++ b/Buildscr
@@ -172,7 +172,7 @@ delegate windows
   # provide a 'more info' URL, and an optional -n option to provide a
   # program name, and that it can take multiple .exe filename
   # arguments and sign them all in place.
-  ifneq "$(winsigncode)" "" in putty/windows do $(winsigncode) -i http://www.chiark.greenend.org.uk/~sgtatham/putty/ build*/*.exe
+  ifneq "$(winsigncode)" "" in putty/windows do $(winsigncode) -i https://www.chiark.greenend.org.uk/~sgtatham/putty/ build*/*.exe
 
   # Ignore exit code from hhc, in favour of seeing whether the .chm
   # file was created. (Yuck; but hhc appears to return non-zero
@@ -187,7 +187,7 @@ delegate windows
   in putty/windows with innosetup do/win iscc putty.iss
 
   # Sign the installers.
-  ifneq "$(winsigncode)" "" in putty/windows do $(winsigncode) -i http://www.chiark.greenend.org.uk/~sgtatham/putty/ -n "PuTTY Installer" installer32.msi installer64.msi Output/installer.exe
+  ifneq "$(winsigncode)" "" in putty/windows do $(winsigncode) -i https://www.chiark.greenend.org.uk/~sgtatham/putty/ -n "PuTTY Installer" installer32.msi installer64.msi Output/installer.exe
 
   # Finished Windows builds.
   return putty/windows/buildold/*.exe
diff --git a/README b/README
index ef931dd14..4d73a995d 100644
--- a/README
+++ b/README
@@ -127,11 +127,11 @@ Documentation (in various formats including Windows Help and Unix
 `man' pages) is built from the Halibut (`.but') files in the `doc'
 subdirectory using `doc/Makefile'. If you aren't using one of our
 source snapshots, you'll need to do this yourself. Halibut can be
-found at <http://www.chiark.greenend.org.uk/~sgtatham/halibut/>.
+found at <https://www.chiark.greenend.org.uk/~sgtatham/halibut/>.
 
 The PuTTY home web site is
 
-    http://www.chiark.greenend.org.uk/~sgtatham/putty/
+    https://www.chiark.greenend.org.uk/~sgtatham/putty/
 
 If you want to send bug reports or feature requests, please read the
 Feedback section of the web site before doing so. Sending one-line
diff --git a/contrib/cygtermd/README b/contrib/cygtermd/README
index ebfdfdd77..a722fe10a 100644
--- a/contrib/cygtermd/README
+++ b/contrib/cygtermd/README
@@ -8,4 +8,4 @@ install it in Cygwin's /bin, and configure PuTTY to use it as a local
 proxy process. For detailed instructions, see the PuTTY Wishlist page
 at
 
-http://www.chiark.greenend.org.uk/~sgtatham/putty/wishlist/cygwin-terminal-window.html
+https://www.chiark.greenend.org.uk/~sgtatham/putty/wishlist/cygwin-terminal-window.html
diff --git a/doc/blurb.but b/doc/blurb.but
index 227300f46..64e8ab74c 100644
--- a/doc/blurb.but
+++ b/doc/blurb.but
@@ -7,7 +7,7 @@
 \cfg{xhtml-leaf-contains-contents}{true}
 \cfg{xhtml-body-end}{<p>If you want to provide feedback on this manual
 or on the PuTTY tools themselves, see the
-<a href="http://www.chiark.greenend.org.uk/~sgtatham/putty/feedback.html">Feedback
+<a href="https://www.chiark.greenend.org.uk/~sgtatham/putty/feedback.html">Feedback
 page</a>.</p>}
 
 \cfg{html-template-fragment}{%k}{%b}
diff --git a/doc/faq.but b/doc/faq.but
index 42f965b27..80cf9d639 100644
--- a/doc/faq.but
+++ b/doc/faq.but
@@ -27,18 +27,18 @@ else.
 
 \I{supported features}In general, if you want to know if PuTTY supports
 a particular feature, you should look for it on the
-\W{http://www.chiark.greenend.org.uk/~sgtatham/putty/}{PuTTY web site}.
+\W{https://www.chiark.greenend.org.uk/~sgtatham/putty/}{PuTTY web site}.
 In particular:
 
 \b try the
-\W{http://www.chiark.greenend.org.uk/~sgtatham/putty/changes.html}{changes
+\W{https://www.chiark.greenend.org.uk/~sgtatham/putty/changes.html}{changes
 page}, and see if you can find the feature on there. If a feature is
 listed there, it's been implemented. If it's listed as a change made
 \e{since} the latest version, it should be available in the
 development snapshots, in which case testing will be very welcome.
 
 \b try the
-\W{http://www.chiark.greenend.org.uk/~sgtatham/putty/wishlist/}{Wishlist
+\W{https://www.chiark.greenend.org.uk/~sgtatham/putty/wishlist/}{Wishlist
 page}, and see if you can find the feature there. If it's on there,
 and not in the \q{Recently fixed} section, it probably \e{hasn't} been
 implemented.
@@ -54,7 +54,7 @@ version 0.52.
 \cw{ssh.com} SSH-2 private key files?
 
 PuTTY doesn't support this natively (see
-\W{http://www.chiark.greenend.org.uk/~sgtatham/putty/wishlist/key-formats-natively.html}{the wishlist entry}
+\W{https://www.chiark.greenend.org.uk/~sgtatham/putty/wishlist/key-formats-natively.html}{the wishlist entry}
 for reasons why not), but as of 0.53
 PuTTYgen can convert both OpenSSH and \cw{ssh.com} private key
 files into PuTTY's format.
@@ -236,7 +236,7 @@ port, or any other port of PuTTY, they were mistaken. We don't.
 
 There are some third-party ports to various platforms, mentioned
 on the 
-\W{http://www.chiark.greenend.org.uk/~sgtatham/putty/links.html}{Links page of our website}.
+\W{https://www.chiark.greenend.org.uk/~sgtatham/putty/links.html}{Links page of our website}.
 
 \S{faq-unix}{Question} \I{Unix version}Is there a port to Unix?
 
@@ -323,7 +323,7 @@ for, it might be a long time before any of us get round to learning
 a new system and doing the port for that.
 
 However, some of the work has been done by other people; see the
-\W{http://www.chiark.greenend.org.uk/~sgtatham/putty/links.html}{Links page of our website}
+\W{https://www.chiark.greenend.org.uk/~sgtatham/putty/links.html}{Links page of our website}
 for various third-party ports.
 
 \S{faq-iphone}{Question} Will there be a port to the iPhone?
@@ -351,7 +351,7 @@ Most of the code cleanup work would be a good thing to happen in
 general, so if anyone feels like helping, we wouldn't say no.
 
 See also
-\W{http://www.chiark.greenend.org.uk/~sgtatham/putty/wishlist/dll-frontend.html}{the wishlist entry}.
+\W{https://www.chiark.greenend.org.uk/~sgtatham/putty/wishlist/dll-frontend.html}{the wishlist entry}.
 
 \S{faq-vb}{Question} Is the SSH or Telnet code available as a Visual
 Basic component?
@@ -891,7 +891,7 @@ us \q{I wanted the F1 key to send \c{^[[11~}, but instead it's
 sending \c{^[OP}, can this be done?}, or something similar.
 
 You should still read the
-\W{http://www.chiark.greenend.org.uk/~sgtatham/putty/feedback.html}{Feedback
+\W{https://www.chiark.greenend.org.uk/~sgtatham/putty/feedback.html}{Feedback
 page} on the PuTTY website (also provided as \k{feedback} in the
 manual), and follow the guidelines contained in that.
 
@@ -1060,7 +1060,7 @@ still. We do not recommend it.)
 
 This is caused by a bug in certain versions of \i{Windows XP} which
 is triggered by PuTTY 0.58. This was fixed in 0.59. The
-\W{http://www.chiark.greenend.org.uk/~sgtatham/putty/wishlist/xp-wont-run}{\q{xp-wont-run}}
+\W{https://www.chiark.greenend.org.uk/~sgtatham/putty/wishlist/xp-wont-run}{\q{xp-wont-run}}
 entry in PuTTY's wishlist has more details.
 
 \S{faq-system32}{Question} When I put 32-bit PuTTY in
diff --git a/doc/feedback.but b/doc/feedback.but
index e0854fc54..b8428e415 100644
--- a/doc/feedback.but
+++ b/doc/feedback.but
@@ -112,7 +112,7 @@ If you think you have found a bug in PuTTY, your first steps should
 be:
 
 \b Check the
-\W{http://www.chiark.greenend.org.uk/~sgtatham/putty/wishlist/}{Wishlist
+\W{https://www.chiark.greenend.org.uk/~sgtatham/putty/wishlist/}{Wishlist
 page} on the PuTTY website, and see if we already know about the
 problem. If we do, it is almost certainly not necessary to mail us
 about it, unless you think you have extra information that might be
@@ -121,12 +121,12 @@ specific extra information about a particular bug, the Wishlist page
 will say so.)
 
 \b Check the
-\W{http://www.chiark.greenend.org.uk/~sgtatham/putty/changes.html}{Change
+\W{https://www.chiark.greenend.org.uk/~sgtatham/putty/changes.html}{Change
 Log} on the PuTTY website, and see if we have already fixed the bug
 in the \i{development snapshots}.
 
 \b Check the
-\W{http://www.chiark.greenend.org.uk/~sgtatham/putty/faq.html}{FAQ}
+\W{https://www.chiark.greenend.org.uk/~sgtatham/putty/faq.html}{FAQ}
 on the PuTTY website (also provided as \k{faq} in the manual), and
 see if it answers your question. The FAQ lists the most common
 things which people think are bugs, but which aren't bugs.
@@ -188,7 +188,7 @@ you haven't supplied us with full information about the actual bug,
 then we won't be able to find a better solution.
 
 \b
-\W{http://www.chiark.greenend.org.uk/~sgtatham/bugs.html}\cw{http://www.chiark.greenend.org.uk/~sgtatham/bugs.html}
+\W{https://www.chiark.greenend.org.uk/~sgtatham/bugs.html}\cw{https://www.chiark.greenend.org.uk/~sgtatham/bugs.html}
 is an article on how to report bugs effectively in general. If your
 bug report is \e{particularly} unclear, we may ask you to go away,
 read this article, and then report the bug again.
@@ -224,14 +224,14 @@ If you want to request a new feature in PuTTY, the very first things
 you should do are:
 
 \b Check the
-\W{http://www.chiark.greenend.org.uk/~sgtatham/putty/wishlist/}{Wishlist
+\W{https://www.chiark.greenend.org.uk/~sgtatham/putty/wishlist/}{Wishlist
 page} on the PuTTY website, and see if your feature is already on
 the list. If it is, it probably won't achieve very much to repeat
 the request. (But see \k{feedback-feature-priority} if you want to
 persuade us to give your particular feature higher priority.)
 
 \b Check the Wishlist and
-\W{http://www.chiark.greenend.org.uk/~sgtatham/putty/changes.html}{Change
+\W{https://www.chiark.greenend.org.uk/~sgtatham/putty/changes.html}{Change
 Log} on the PuTTY website, and see if we have already added your
 feature in the development snapshots. If it isn't clear, download
 the latest development snapshot and see if the feature is present.
@@ -350,7 +350,7 @@ Of course, if the web site has some other error (Connection Refused,
 If you want to report a problem with our web site, check that you're
 looking at our \e{real} web site and not a mirror. The real web site
 is at
-\W{http://www.chiark.greenend.org.uk/~sgtatham/putty/}\c{http://www.chiark.greenend.org.uk/~sgtatham/putty/};
+\W{https://www.chiark.greenend.org.uk/~sgtatham/putty/}\c{https://www.chiark.greenend.org.uk/~sgtatham/putty/};
 if that's not where you're reading this, then don't report the
 problem to us until you've checked that it's really a problem with
 the main site. If it's only a problem with the mirror, you should
@@ -399,7 +399,7 @@ setting up a mirror. You already have permission.
 
 If the mirror is in a country where we don't already have plenty of
 mirrors, we may be willing to add it to the list on our
-\W{http://www.chiark.greenend.org.uk/~sgtatham/putty/mirrors.html}{mirrors
+\W{https://www.chiark.greenend.org.uk/~sgtatham/putty/mirrors.html}{mirrors
 page}. Read the guidelines on that page, make sure your mirror
 works, and email us the information listed at the bottom of the
 page.
@@ -414,7 +414,7 @@ to be a cheap way to gain search rankings.
 
 If you have technical questions about the process of mirroring, then
 you might want to mail us before setting up the mirror (see also the
-\W{http://www.chiark.greenend.org.uk/~sgtatham/putty/mirrors.html#guidelines}{guidelines on the Mirrors page});
+\W{https://www.chiark.greenend.org.uk/~sgtatham/putty/mirrors.html#guidelines}{guidelines on the Mirrors page});
 but if you just want to ask for permission, you don't need to. You
 already have permission.
 
diff --git a/doc/man-pl.but b/doc/man-pl.but
index a46e6a196..9f4118719 100644
--- a/doc/man-pl.but
+++ b/doc/man-pl.but
@@ -260,7 +260,7 @@ exists, nonzero otherwise.
 For more information on plink, it's probably best to go and look at
 the manual on the PuTTY web page:
 
-\W{http://www.chiark.greenend.org.uk/~sgtatham/putty/}\cw{http://www.chiark.greenend.org.uk/~sgtatham/putty/}
+\W{https://www.chiark.greenend.org.uk/~sgtatham/putty/}\cw{https://www.chiark.greenend.org.uk/~sgtatham/putty/}
 
 \S{plink-manpage-bugs} BUGS
 
diff --git a/doc/man-pscp.but b/doc/man-pscp.but
index 05e5a23cb..6c703e138 100644
--- a/doc/man-pscp.but
+++ b/doc/man-pscp.but
@@ -174,7 +174,7 @@ encrypted packet data.
 For more information on \cw{pscp} it's probably best to go and look at
 the manual on the PuTTY web page:
 
-\W{http://www.chiark.greenend.org.uk/~sgtatham/putty/}\cw{http://www.chiark.greenend.org.uk/~sgtatham/putty/}
+\W{https://www.chiark.greenend.org.uk/~sgtatham/putty/}\cw{https://www.chiark.greenend.org.uk/~sgtatham/putty/}
 
 \S{pscp-manpage-bugs} BUGS
 
diff --git a/doc/man-psft.but b/doc/man-psft.but
index 80d86ecf6..51f30d3a0 100644
--- a/doc/man-psft.but
+++ b/doc/man-psft.but
@@ -159,7 +159,7 @@ at the \cw{psftp>} prompt.
 For more information on \cw{psftp} it's probably best to go and look at
 the manual on the PuTTY web page:
 
-\cw{http://www.chiark.greenend.org.uk/~sgtatham/putty/}
+\cw{https://www.chiark.greenend.org.uk/~sgtatham/putty/}
 
 \S{psftp-manpage-bugs} BUGS
 
diff --git a/doc/man-ptel.but b/doc/man-ptel.but
index a3b794059..73b85ecce 100644
--- a/doc/man-ptel.but
+++ b/doc/man-ptel.but
@@ -208,7 +208,7 @@ your home directory.
 For more information on PuTTY and PuTTYtel, it's probably best to go
 and look at the manual on the web page:
 
-\W{http://www.chiark.greenend.org.uk/~sgtatham/putty/}\cw{http://www.chiark.greenend.org.uk/~sgtatham/putty/}
+\W{https://www.chiark.greenend.org.uk/~sgtatham/putty/}\cw{https://www.chiark.greenend.org.uk/~sgtatham/putty/}
 
 \S{puttytel-manpage-bugs} BUGS
 
diff --git a/doc/man-putt.but b/doc/man-putt.but
index df7b9e1fe..cb7cca470 100644
--- a/doc/man-putt.but
+++ b/doc/man-putt.but
@@ -321,7 +321,7 @@ your home directory.
 For more information on PuTTY, it's probably best to go and look at
 the manual on the web page:
 
-\W{http://www.chiark.greenend.org.uk/~sgtatham/putty/}\cw{http://www.chiark.greenend.org.uk/~sgtatham/putty/}
+\W{https://www.chiark.greenend.org.uk/~sgtatham/putty/}\cw{https://www.chiark.greenend.org.uk/~sgtatham/putty/}
 
 \S{putty-manpage-bugs} BUGS
 
diff --git a/doc/pgpkeys.but b/doc/pgpkeys.but
index 9ec900665..71143af22 100644
--- a/doc/pgpkeys.but
+++ b/doc/pgpkeys.but
@@ -53,19 +53,19 @@ The current issue of those keys are available for download from the
 PuTTY website, and are also available on PGP keyservers using the key
 IDs listed below.
 
-\dt \W{http://www.chiark.greenend.org.uk/~sgtatham/putty/keys/master-2015.asc}{\s{Master Key}}
+\dt \W{https://www.chiark.greenend.org.uk/~sgtatham/putty/keys/master-2015.asc}{\s{Master Key}}
 
 \dd RSA, 4096-bit. Key ID: \cw{4096R/04676F7C} (long version:
 \cw{4096R/AB585DC604676F7C}). Fingerprint:
 \cw{440D\_E3B5\_B7A1\_CA85\_B3CC\_\_1718\_AB58\_5DC6\_0467\_6F7C}
 
-\dt \W{http://www.chiark.greenend.org.uk/~sgtatham/putty/keys/release-2015.asc}{\s{Release Key}}
+\dt \W{https://www.chiark.greenend.org.uk/~sgtatham/putty/keys/release-2015.asc}{\s{Release Key}}
 
 \dd RSA, 2048-bit. Key ID: \cw{2048R/B43434E4} (long version:
 \cw{2048R/9DFE2648B43434E4}). Fingerprint:
 \cw{0054\_DDAA\_8ADA\_15D2\_768A\_\_6DE7\_9DFE\_2648\_B434\_34E4}
 
-\dt \W{http://www.chiark.greenend.org.uk/~sgtatham/putty/keys/contact-2016.asc}{\s{Secure Contact Key}}
+\dt \W{https://www.chiark.greenend.org.uk/~sgtatham/putty/keys/contact-2016.asc}{\s{Secure Contact Key}}
 
 \dd RSA, 2048-bit. Main key ID: \cw{2048R/8A0AF00B} (long version:
 \cw{2048R/C4FCAAD08A0AF00B}). Encryption subkey ID:
@@ -73,7 +73,7 @@ IDs listed below.
 Fingerprint:
 \cw{8A26\_250E\_763F\_E359\_75F3\_\_118F\_C4FC\_AAD0\_8A0A\_F00B}
 
-\dt \W{http://www.chiark.greenend.org.uk/~sgtatham/putty/keys/snapshot-2015.asc}{\s{Snapshot Key}}
+\dt \W{https://www.chiark.greenend.org.uk/~sgtatham/putty/keys/snapshot-2015.asc}{\s{Snapshot Key}}
 
 \dd RSA, 2048-bit. Key ID: \cw{2048R/D15F7E8A} (long version:
 \cw{2048R/EEF20295D15F7E8A}). Fingerprint:
@@ -179,37 +179,37 @@ Releases prior to the rollover are signed with the old Release Keys.
 
 For completeness, those old keys are given here:
 
-\dt \W{http://www.chiark.greenend.org.uk/~sgtatham/putty/keys/master-rsa.asc}{\s{Master Key} (original RSA)}
+\dt \W{https://www.chiark.greenend.org.uk/~sgtatham/putty/keys/master-rsa.asc}{\s{Master Key} (original RSA)}
 
 \dd RSA, 1024-bit. Key ID: \cw{1024R/1E34AC41} (long version:
 \cw{1024R/9D5877BF1E34AC41}). Fingerprint:
 \cw{8F\_15\_97\_DA\_25\_30\_AB\_0D\_\_88\_D1\_92\_54\_11\_CF\_0C\_4C}
 
-\dt \W{http://www.chiark.greenend.org.uk/~sgtatham/putty/keys/master-dsa.asc}{\s{Master Key} (original DSA)}
+\dt \W{https://www.chiark.greenend.org.uk/~sgtatham/putty/keys/master-dsa.asc}{\s{Master Key} (original DSA)}
 
 \dd DSA, 1024-bit. Key ID: \cw{1024D/6A93B34E} (long version:
 \cw{1024D/4F5E6DF56A93B34E}). Fingerprint:
 \cw{313C\_3E76\_4B74\_C2C5\_F2AE\_\_83A8\_4F5E\_6DF5\_6A93\_B34E}
 
-\dt \W{http://www.chiark.greenend.org.uk/~sgtatham/putty/keys/release-rsa.asc}{\s{Release Key} (original RSA)}
+\dt \W{https://www.chiark.greenend.org.uk/~sgtatham/putty/keys/release-rsa.asc}{\s{Release Key} (original RSA)}
 
 \dd RSA, 1024-bit. Key ID: \cw{1024R/B41CAE29} (long version:
 \cw{1024R/EF39CCC0B41CAE29}). Fingerprint:
 \cw{AE\_65\_D3\_F7\_85\_D3\_18\_E0\_\_3B\_0C\_9B\_02\_FF\_3A\_81\_FE}
 
-\dt \W{http://www.chiark.greenend.org.uk/~sgtatham/putty/keys/release-dsa.asc}{\s{Release Key} (original DSA)}
+\dt \W{https://www.chiark.greenend.org.uk/~sgtatham/putty/keys/release-dsa.asc}{\s{Release Key} (original DSA)}
 
 \dd DSA, 1024-bit. Key ID: \cw{1024D/08B0A90B} (long version:
 \cw{1024D/FECD6F3F08B0A90B}). Fingerprint:
 \cw{00B1\_1009\_38E6\_9800\_6518\_\_F0AB\_FECD\_6F3F\_08B0\_A90B}
 
-\dt \W{http://www.chiark.greenend.org.uk/~sgtatham/putty/keys/snapshot-rsa.asc}{\s{Snapshot Key} (original RSA)}
+\dt \W{https://www.chiark.greenend.org.uk/~sgtatham/putty/keys/snapshot-rsa.asc}{\s{Snapshot Key} (original RSA)}
 
 \dd RSA, 1024-bit. Key ID: \cw{1024R/32B903A9} (long version:
 \cw{1024R/FAAED21532B903A9}). Fingerprint:
 \cw{86\_8B\_1F\_79\_9C\_F4\_7F\_BD\_\_8B\_1B\_D7\_8E\_C6\_4E\_4C\_03}
 
-\dt \W{http://www.chiark.greenend.org.uk/~sgtatham/putty/keys/snapshot-dsa.asc}{\s{Snapshot Key} (original DSA)}
+\dt \W{https://www.chiark.greenend.org.uk/~sgtatham/putty/keys/snapshot-dsa.asc}{\s{Snapshot Key} (original DSA)}
 
 \dd DSA, 1024-bit. Key ID: \cw{1024D/7D3E4A00} (long version:
 \cw{1024D/165E56F77D3E4A00}). Fingerprint:
diff --git a/doc/udp.but b/doc/udp.but
index c50464ee1..9ca8ed3f8 100644
--- a/doc/udp.but
+++ b/doc/udp.but
@@ -331,7 +331,7 @@ local state structures \c{s} or \c{st} in each function, or the
 backend-wide structure \c{ssh}.
 
 See
-\W{http://www.chiark.greenend.org.uk/~sgtatham/coroutines.html}\c{http://www.chiark.greenend.org.uk/~sgtatham/coroutines.html}
+\W{https://www.chiark.greenend.org.uk/~sgtatham/coroutines.html}\c{https://www.chiark.greenend.org.uk/~sgtatham/coroutines.html}
 for a more in-depth discussion of what these macros are for and how
 they work.
 
diff --git a/ssh.c b/ssh.c
index 693f52d8d..994e93aeb 100644
--- a/ssh.c
+++ b/ssh.c
@@ -303,7 +303,7 @@ enum {
  * macros look impenetrable to you, you might find it helpful to
  * read
  * 
- *   http://www.chiark.greenend.org.uk/~sgtatham/coroutines.html
+ *   https://www.chiark.greenend.org.uk/~sgtatham/coroutines.html
  * 
  * which explains the theory behind these macros.
  * 
diff --git a/windows/README-msi.txt b/windows/README-msi.txt
index a6c2707d5..14aac092d 100644
--- a/windows/README-msi.txt
+++ b/windows/README-msi.txt
@@ -35,7 +35,7 @@ What do I do if it doesn't work?
 
 The PuTTY home web site is
 
-    http://www.chiark.greenend.org.uk/~sgtatham/putty/
+    https://www.chiark.greenend.org.uk/~sgtatham/putty/
 
 Here you will find our list of known bugs and pending feature
 requests. If your problem is not listed in there, or in the FAQ, or
diff --git a/windows/README.txt b/windows/README.txt
index fa153c624..d929df903 100644
--- a/windows/README.txt
+++ b/windows/README.txt
@@ -29,7 +29,7 @@ What do I do if it doesn't work?
 
 The PuTTY home web site is
 
-    http://www.chiark.greenend.org.uk/~sgtatham/putty/
+    https://www.chiark.greenend.org.uk/~sgtatham/putty/
 
 Here you will find our list of known bugs and pending feature
 requests. If your problem is not listed in there, or in the FAQ, or
diff --git a/windows/putty.iss b/windows/putty.iss
index b3deb76c2..3fadcb922 100644
--- a/windows/putty.iss
+++ b/windows/putty.iss
@@ -19,7 +19,7 @@ VersionInfoTextVersion=Release 0.69
 AppVersion=0.69
 VersionInfoVersion=0.69.0.0
 AppPublisher=Simon Tatham
-AppPublisherURL=http://www.chiark.greenend.org.uk/~sgtatham/putty/
+AppPublisherURL=https://www.chiark.greenend.org.uk/~sgtatham/putty/
 AppReadmeFile={app}\README.txt
 DefaultDirName={pf}\PuTTY
 DefaultGroupName=PuTTY
diff --git a/windows/website.url b/windows/website.url
index 4b50369cec07713e189e28b5e0724a8dee278eba..4f6d47d1f7136fed66f8bd3d36f26e7315f5496a 100644
GIT binary patch
delta 9
QcmYe#m>|tqJW<*Q01toy=Kufz

delta 7
Ocmc~upCCO^#s>fjyaIFp

diff --git a/windows/windlg.c b/windows/windlg.c
index e29f12914..8bd02d855 100644
--- a/windows/windlg.c
+++ b/windows/windlg.c
@@ -227,7 +227,7 @@ static INT_PTR CALLBACK AboutProc(HWND hwnd, UINT msg,
 	  case IDA_WEB:
 	    /* Load web browser */
 	    ShellExecute(hwnd, "open",
-			 "http://www.chiark.greenend.org.uk/~sgtatham/putty/",
+			 "https://www.chiark.greenend.org.uk/~sgtatham/putty/",
 			 0, 0, SW_SHOWDEFAULT);
 	    return 0;
 	}
diff --git a/windows/winpgen.c b/windows/winpgen.c
index 2507d37ea..7903c1cf2 100644
--- a/windows/winpgen.c
+++ b/windows/winpgen.c
@@ -322,7 +322,7 @@ static INT_PTR CALLBACK AboutProc(HWND hwnd, UINT msg,
 	  case 102:
 	    /* Load web browser */
 	    ShellExecute(hwnd, "open",
-			 "http://www.chiark.greenend.org.uk/~sgtatham/putty/",
+			 "https://www.chiark.greenend.org.uk/~sgtatham/putty/",
 			 0, 0, SW_SHOWDEFAULT);
 	    return 0;
 	}
diff --git a/windows/winpgnt.c b/windows/winpgnt.c
index 70f3d2ca5..ebb6c6ace 100644
--- a/windows/winpgnt.c
+++ b/windows/winpgnt.c
@@ -178,7 +178,7 @@ static INT_PTR CALLBACK AboutProc(HWND hwnd, UINT msg,
 	  case 102:
 	    /* Load web browser */
 	    ShellExecute(hwnd, "open",
-			 "http://www.chiark.greenend.org.uk/~sgtatham/putty/",
+			 "https://www.chiark.greenend.org.uk/~sgtatham/putty/",
 			 0, 0, SW_SHOWDEFAULT);
 	    return 0;
 	}

From ce050c5b72d17559ef79f07b2013b35e2dd22467 Mon Sep 17 00:00:00 2001
From: Ben Harris <bjh21@bjh21.me.uk>
Date: Mon, 8 May 2017 21:33:03 +0100
Subject: [PATCH 015/166] Fix a luking mention of Win32 in README.

---
 README | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README b/README
index 4d73a995d..50314ca63 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-This is the README for the source archive of PuTTY, a free Win32
+This is the README for the source archive of PuTTY, a free Windows
 and Unix Telnet and SSH client.
 
 If you want to rebuild PuTTY from source, we provide a variety of

From 93931b0a568c8f39801ffcb0c67cc001dac4f9b3 Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Sat, 13 May 2017 17:10:36 +0100
Subject: [PATCH 016/166] Switch to using Halibut's new direct .CHM generation.

This allows me to remove HTML Help Workshop completely from my build
dependencies, and good riddance!
---
 Buildscr      |  9 +--------
 doc/Makefile  | 10 ++++------
 doc/blurb.but |  6 ++++++
 doc/chm.but   | 22 ----------------------
 4 files changed, 11 insertions(+), 36 deletions(-)
 delete mode 100644 doc/chm.but

diff --git a/Buildscr b/Buildscr
index afcc2766e..de7f41b57 100644
--- a/Buildscr
+++ b/Buildscr
@@ -139,8 +139,7 @@ ifneq "$(MAKEARGS)" "" set Makeargs $(Makeargs) $(MAKEARGS)
 in putty do ./mksrcarc.sh
 in putty do ./mkunxarc.sh '$(Autoconfver)' '$(Uxarcsuffix)' $(Docmakever)
 in putty do perl mkfiles.pl
-in putty/doc do make $(Docmakever) putty.hlp
-in putty/doc do make $(Docmakever) chm
+in putty/doc do make $(Docmakever) putty.hlp putty.chm
 
 # Munge the installer script locally so that it reports the version
 # we're really building.
@@ -174,11 +173,6 @@ delegate windows
   # arguments and sign them all in place.
   ifneq "$(winsigncode)" "" in putty/windows do $(winsigncode) -i https://www.chiark.greenend.org.uk/~sgtatham/putty/ build*/*.exe
 
-  # Ignore exit code from hhc, in favour of seeing whether the .chm
-  # file was created. (Yuck; but hhc appears to return non-zero
-  # exit codes on whim.)
-  in putty/doc with htmlhelp do/win hhc putty.hhp & type putty.chm >nul
-
   # Build a WiX MSI installer, for each of build32 and build64.
   in putty/windows with wix do/win candle -arch x86 -dWin64=no -dBuilddir=build32\ -dWinver="$(Winver)" -dPuttytextver="$(Puttytextver)" installer.wxs && light -ext WixUIExtension -ext WixUtilExtension -sval installer.wixobj -o installer32.msi
   in putty/windows with wix do/win candle -arch x64 -dWin64=yes -dBuilddir=build64\ -dWinver="$(Winver)" -dPuttytextver="$(Puttytextver)" installer.wxs && light -ext WixUIExtension -ext WixUtilExtension -sval installer.wixobj -o installer64.msi
@@ -196,7 +190,6 @@ delegate windows
   return putty/windows/build32/*.map
   return putty/windows/build64/*.exe
   return putty/windows/build64/*.map
-  return putty/doc/putty.chm
   return putty/windows/installer32.msi
   return putty/windows/installer64.msi
   return putty/windows/Output/installer.exe
diff --git a/doc/Makefile b/doc/Makefile
index e7bf287e0..cb079fb5d 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -44,19 +44,17 @@ INPUTS = $(patsubst %,%.but,$(CHAPTERS))
 HALIBUT = halibut
 
 index.html: $(INPUTS)
-	$(HALIBUT) --text --html --winhelp $(INPUTS)
+	$(HALIBUT) --text --html --winhelp --chm $(INPUTS)
 
-# During formal builds it's useful to be able to build this one alone.
+# During formal builds it's useful to be able to build these ones alone.
 putty.hlp: $(INPUTS)
 	$(HALIBUT) --winhelp $(INPUTS)
+putty.chm: $(INPUTS)
+	$(HALIBUT) --chm $(INPUTS)
 
 putty.info: $(INPUTS)
 	$(HALIBUT) --info $(INPUTS)
 
-chm: putty.hhp
-putty.hhp: $(INPUTS) chm.but
-	$(HALIBUT) --html $(INPUTS) chm.but
-
 MKMAN = $(HALIBUT) --man=$@ mancfg.but $<
 MANPAGES = putty.1 puttygen.1 plink.1 pscp.1 psftp.1 puttytel.1 pterm.1 \
            pageant.1
diff --git a/doc/blurb.but b/doc/blurb.but
index 64e8ab74c..e5e03a600 100644
--- a/doc/blurb.but
+++ b/doc/blurb.but
@@ -14,10 +14,16 @@ page</a>.</p>}
 
 \cfg{info-max-file-size}{0}
 
+\cfg{chm-contents-filename}{index.html}
+\cfg{chm-template-filename}{%k.html}
+\cfg{chm-head-end}{<link rel="stylesheet" type="text/css" href="chm.css">}
+\cfg{chm-extra-file}{chm.css}
+
 \cfg{xhtml-contents-filename}{index.html}
 \cfg{text-filename}{puttydoc.txt}
 \cfg{winhelp-filename}{putty.hlp}
 \cfg{info-filename}{putty.info}
+\cfg{chm-filename}{putty.chm}
 
 PuTTY is a free (MIT-licensed) Windows Telnet and SSH client. This
 manual documents PuTTY, and its companion utilities PSCP, PSFTP,
diff --git a/doc/chm.but b/doc/chm.but
deleted file mode 100644
index 44d1dca3f..000000000
--- a/doc/chm.but
+++ /dev/null
@@ -1,22 +0,0 @@
-\# File containing the magic HTML configuration directives to create
-\# an MS HTML Help project. We put this on the end of the PuTTY
-\# docs build command line to build the HHP and friends.
-
-\cfg{html-leaf-level}{infinite}
-\cfg{html-leaf-contains-contents}{false}
-\cfg{html-suppress-navlinks}{true}
-\cfg{html-suppress-address}{true}
-
-\cfg{html-contents-filename}{index.html}
-\cfg{html-template-filename}{%k.html}
-\cfg{html-template-fragment}{%k}
-
-\cfg{html-mshtmlhelp-chm}{putty.chm}
-\cfg{html-mshtmlhelp-project}{putty.hhp}
-\cfg{html-mshtmlhelp-contents}{putty.hhc}
-\cfg{html-mshtmlhelp-index}{putty.hhk}
-
-\cfg{html-body-end}{}
-
-\cfg{html-head-end}{<link rel="stylesheet" type="text/css" href="chm.css">}
-

From 95f81227a29a79eeafb6395db159c376cafd6bc2 Mon Sep 17 00:00:00 2001
From: Ben Harris <bjh21@bjh21.me.uk>
Date: Mon, 30 May 2016 20:40:29 +0100
Subject: [PATCH 017/166] uxplink: remove the "connopen" variable.

It had the constant value 1 everywhere that it was read.
---
 unix/uxplink.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/unix/uxplink.c b/unix/uxplink.c
index 2d4259b91..e891d66a8 100644
--- a/unix/uxplink.c
+++ b/unix/uxplink.c
@@ -616,7 +616,6 @@ int main(int argc, char **argv)
     int *fdlist;
     int fd;
     int i, fdcount, fdsize, fdstate;
-    int connopen;
     int exitcode;
     int errors;
     int use_subsystem = 0;
@@ -1027,7 +1026,6 @@ int main(int argc, char **argv)
 	ldisc_create(conf, NULL, back, backhandle, NULL);
 	sfree(realhost);
     }
-    connopen = 1;
 
     /*
      * Set up the initial console mode. We don't care if this call
@@ -1054,7 +1052,7 @@ int main(int argc, char **argv)
 
 	FD_SET_MAX(signalpipe[0], maxfd, rset);
 
-	if (connopen && !sending &&
+	if (!sending &&
 	    back->connected(backhandle) &&
 	    back->sendok(backhandle) &&
 	    back->sendbuffer(backhandle) < MAX_STDIN_BACKLOG) {
@@ -1165,7 +1163,7 @@ int main(int argc, char **argv)
 	    char buf[4096];
 	    int ret;
 
-	    if (connopen && back->connected(backhandle)) {
+	    if (back->connected(backhandle)) {
 		ret = read(STDIN_FILENO, buf, sizeof(buf));
 		if (ret < 0) {
 		    perror("stdin: read");
@@ -1192,7 +1190,7 @@ int main(int argc, char **argv)
 
         run_toplevel_callbacks();
 
-	if ((!connopen || !back->connected(backhandle)) &&
+	if (!back->connected(backhandle) &&
 	    bufchain_size(&stdout_data) == 0 &&
 	    bufchain_size(&stderr_data) == 0)
 	    break;		       /* we closed the connection */

From 30cdaa7ca8bfa03d90e170c2260d71a5819996b2 Mon Sep 17 00:00:00 2001
From: Ben Harris <bjh21@bjh21.me.uk>
Date: Mon, 30 May 2016 22:37:32 +0100
Subject: [PATCH 018/166] unix: make select_result() return void.

Nothing was using its return value anyway.
---
 unix/unix.h  | 2 +-
 unix/uxsel.c | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/unix/unix.h b/unix/unix.h
index 7ab2ca24f..68f749acc 100644
--- a/unix/unix.h
+++ b/unix/unix.h
@@ -183,7 +183,7 @@ void uxsel_init(void);
 typedef int (*uxsel_callback_fn)(int fd, int event);
 void uxsel_set(int fd, int rwx, uxsel_callback_fn callback);
 void uxsel_del(int fd);
-int select_result(int fd, int event);
+void select_result(int fd, int event);
 int first_fd(int *state, int *rwx);
 int next_fd(int *state, int *rwx);
 /* The following are expected to be provided _to_ uxsel.c by the frontend */
diff --git a/unix/uxsel.c b/unix/uxsel.c
index ef25cdb57..52f346a48 100644
--- a/unix/uxsel.c
+++ b/unix/uxsel.c
@@ -111,7 +111,7 @@ int first_fd(int *state, int *rwx)
     return next_fd(state, rwx);
 }
 
-int select_result(int fd, int event)
+void select_result(int fd, int event)
 {
     struct fd *fdstruct = find234(fds, &fd, uxsel_fd_findcmp);
     /*
@@ -120,7 +120,5 @@ int select_result(int fd, int event)
      * fd I've stopped being interested in. Sigh.
      */
     if (fdstruct)
-        return fdstruct->callback(fd, event);
-    else
-        return 1;
+        fdstruct->callback(fd, event);
 }

From d56496c31c85767b805f261f01fc87cc8a468dec Mon Sep 17 00:00:00 2001
From: Ben Harris <bjh21@bjh21.me.uk>
Date: Mon, 30 May 2016 22:52:30 +0100
Subject: [PATCH 019/166] unix: make uxsel callback functions return void.

Nothing used their return values anyway.  At least, not after the
previous commit.
---
 unix/unix.h     |  2 +-
 unix/uxagentc.c |  7 +++----
 unix/uxnet.c    | 24 +++++++++++-------------
 unix/uxproxy.c  | 15 ++++++---------
 unix/uxpty.c    | 13 ++++---------
 unix/uxser.c    | 12 +++++-------
 6 files changed, 30 insertions(+), 43 deletions(-)

diff --git a/unix/unix.h b/unix/unix.h
index 68f749acc..f21d23ffa 100644
--- a/unix/unix.h
+++ b/unix/unix.h
@@ -180,7 +180,7 @@ void postmsg(struct termios *);
 /* The interface used by uxsel.c */
 typedef struct uxsel_id uxsel_id;
 void uxsel_init(void);
-typedef int (*uxsel_callback_fn)(int fd, int event);
+typedef void (*uxsel_callback_fn)(int fd, int event);
 void uxsel_set(int fd, int rwx, uxsel_callback_fn callback);
 void uxsel_del(int fd);
 void select_result(int fd, int event);
diff --git a/unix/uxagentc.c b/unix/uxagentc.c
index ffc5879cf..51f9a1ebe 100644
--- a/unix/uxagentc.c
+++ b/unix/uxagentc.c
@@ -98,7 +98,7 @@ void agent_cancel_query(agent_pending_query *conn)
     sfree(conn);
 }
 
-static int agent_select_result(int fd, int event)
+static void agent_select_result(int fd, int event)
 {
     agent_pending_query *conn;
 
@@ -107,11 +107,11 @@ static int agent_select_result(int fd, int event)
     conn = find234(agent_pending_queries, &fd, agent_connfind);
     if (!conn) {
 	uxsel_del(fd);
-	return 1;
+	return;
     }
 
     if (!agent_try_read(conn))
-	return 0;		       /* more data to come */
+	return;		       /* more data to come */
 
     /*
      * We have now completed the agent query. Do the callback, and
@@ -120,7 +120,6 @@ static int agent_select_result(int fd, int event)
      */
     conn->callback(conn->callback_ctx, conn->retbuf, conn->retlen);
     agent_cancel_query(conn);
-    return 0;
 }
 
 agent_pending_query *agent_query(
diff --git a/unix/uxnet.c b/unix/uxnet.c
index 79f4fbcee..ddcd92280 100644
--- a/unix/uxnet.c
+++ b/unix/uxnet.c
@@ -1266,7 +1266,7 @@ static void sk_tcp_write_eof(Socket sock)
     uxsel_tell(s);
 }
 
-static int net_select_result(int fd, int event)
+static void net_select_result(int fd, int event)
 {
     int ret;
     char buf[20480];		       /* nice big buffer for plenty of speed */
@@ -1276,7 +1276,7 @@ static int net_select_result(int fd, int event)
     /* Find the Socket structure */
     s = find234(sktree, &fd, cmpforsearch);
     if (!s)
-	return 1;		       /* boggle */
+	return;		       /* boggle */
 
     noise_ultralight(event);
 
@@ -1292,9 +1292,9 @@ static int net_select_result(int fd, int event)
 	    ret = recv(s->s, buf, sizeof(buf), MSG_OOB);
 	    noise_ultralight(ret);
 	    if (ret <= 0) {
-                return plug_closing(s->plug,
-				    ret == 0 ? "Internal networking trouble" :
-				    strerror(errno), errno, 0);
+                plug_closing(s->plug,
+			     ret == 0 ? "Internal networking trouble" :
+			     strerror(errno), errno, 0);
 	    } else {
                 /*
                  * Receiving actual data on a socket means we can
@@ -1305,7 +1305,7 @@ static int net_select_result(int fd, int event)
                     sk_addr_free(s->addr);
                     s->addr = NULL;
                 }
-		return plug_receive(s->plug, 2, buf, ret);
+		plug_receive(s->plug, 2, buf, ret);
 	    }
 	    break;
 	}
@@ -1377,11 +1377,11 @@ static int net_select_result(int fd, int event)
 	    }
 	}
 	if (ret < 0) {
-            return plug_closing(s->plug, strerror(errno), errno, 0);
+            plug_closing(s->plug, strerror(errno), errno, 0);
 	} else if (0 == ret) {
             s->incomingeof = TRUE;     /* stop trying to read now */
             uxsel_tell(s);
-	    return plug_closing(s->plug, NULL, 0, 0);
+	    plug_closing(s->plug, NULL, 0, 0);
 	} else {
             /*
              * Receiving actual data on a socket means we can
@@ -1392,7 +1392,7 @@ static int net_select_result(int fd, int event)
                 sk_addr_free(s->addr);
                 s->addr = NULL;
             }
-	    return plug_receive(s->plug, atmark ? 0 : 1, buf, ret);
+	    plug_receive(s->plug, atmark ? 0 : 1, buf, ret);
 	}
 	break;
       case 2:			       /* writable */
@@ -1430,9 +1430,9 @@ static int net_select_result(int fd, int event)
                         err = try_connect(s);
                     }
                     if (err)
-                        return plug_closing(s->plug, strerror(err), err, 0);
+                        plug_closing(s->plug, strerror(err), err, 0);
                     if (!s->connected)
-                        return 0;      /* another async attempt in progress */
+                        return;      /* another async attempt in progress */
                 }
             }
 
@@ -1456,8 +1456,6 @@ static int net_select_result(int fd, int event)
 	}
 	break;
     }
-
-    return 1;
 }
 
 /*
diff --git a/unix/uxproxy.c b/unix/uxproxy.c
index 3df4cebe4..d3a82fa4e 100644
--- a/unix/uxproxy.c
+++ b/unix/uxproxy.c
@@ -33,7 +33,7 @@ struct Socket_localproxy_tag {
     enum { EOF_NO, EOF_PENDING, EOF_SENT } outgoingeof;
 };
 
-static int localproxy_select_result(int fd, int event);
+static void localproxy_select_result(int fd, int event);
 
 /*
  * Trees to look up the pipe fds in.
@@ -229,7 +229,7 @@ static const char * sk_localproxy_socket_error (Socket s)
     return ps->error;
 }
 
-static int localproxy_select_result(int fd, int event)
+static void localproxy_select_result(int fd, int event)
 {
     Local_Proxy_Socket s;
     char buf[20480];
@@ -238,7 +238,7 @@ static int localproxy_select_result(int fd, int event)
     if (!(s = find234(localproxy_by_fromfd, &fd, localproxy_fromfd_find)) &&
 	!(s = find234(localproxy_by_fromfd, &fd, localproxy_errfd_find)) &&
 	!(s = find234(localproxy_by_tofd, &fd, localproxy_tofd_find)) )
-	return 1;		       /* boggle */
+	return;		       /* boggle */
 
     if (event == 1) {
         if (fd == s->cmd_err) {
@@ -249,21 +249,18 @@ static int localproxy_select_result(int fd, int event)
             assert(fd == s->from_cmd);
             ret = read(fd, buf, sizeof(buf));
             if (ret < 0) {
-                return plug_closing(s->plug, strerror(errno), errno, 0);
+                plug_closing(s->plug, strerror(errno), errno, 0);
             } else if (ret == 0) {
-                return plug_closing(s->plug, NULL, 0, 0);
+                plug_closing(s->plug, NULL, 0, 0);
             } else {
-                return plug_receive(s->plug, 0, buf, ret);
+                plug_receive(s->plug, 0, buf, ret);
             }
         }
     } else if (event == 2) {
 	assert(fd == s->to_cmd);
 	if (localproxy_try_send(s))
 	    plug_sent(s->plug, bufchain_size(&s->pending_output_data));
-	return 1;
     }
-
-    return 1;
 }
 
 Socket platform_new_connection(SockAddr addr, const char *hostname,
diff --git a/unix/uxpty.c b/unix/uxpty.c
index 39f96f126..618fe9bd7 100644
--- a/unix/uxpty.c
+++ b/unix/uxpty.c
@@ -572,7 +572,7 @@ void pty_pre_init(void)
 
 }
 
-int pty_real_select_result(Pty pty, int event, int status)
+void pty_real_select_result(Pty pty, int event, int status)
 {
     char buf[4096];
     int ret;
@@ -672,13 +672,10 @@ int pty_real_select_result(Pty pty, int event, int status)
 
 	notify_remote_exit(pty->frontend);
     }
-
-    return !finished;
 }
 
-int pty_select_result(int fd, int event)
+void pty_select_result(int fd, int event)
 {
-    int ret = TRUE;
     Pty pty;
 
     if (fd == pty_signal_pipe[0]) {
@@ -696,16 +693,14 @@ int pty_select_result(int fd, int event)
 	    pty = find234(ptys_by_pid, &pid, pty_find_by_pid);
 
 	    if (pty)
-		ret = ret && pty_real_select_result(pty, -1, status);
+		pty_real_select_result(pty, -1, status);
 	} while (pid > 0);
     } else {
 	pty = find234(ptys_by_fd, &fd, pty_find_by_fd);
 
 	if (pty)
-	    ret = ret && pty_real_select_result(pty, event, 0);
+	    pty_real_select_result(pty, event, 0);
     }
-
-    return ret;
 }
 
 static void pty_uxsel_setup(Pty pty)
diff --git a/unix/uxser.c b/unix/uxser.c
index 41beaf0e7..e77f797a3 100644
--- a/unix/uxser.c
+++ b/unix/uxser.c
@@ -56,7 +56,7 @@ static int serial_find_by_fd(void *av, void *bv)
 
 static tree234 *serial_by_fd = NULL;
 
-static int serial_select_result(int fd, int event);
+static void serial_select_result(int fd, int event);
 static void serial_uxsel_setup(Serial serial);
 static void serial_try_write(Serial serial);
 
@@ -366,7 +366,7 @@ static void serial_reconfig(void *handle, Conf *conf)
     serial_configure(serial, conf);
 }
 
-static int serial_select_result(int fd, int event)
+static void serial_select_result(int fd, int event)
 {
     Serial serial;
     char buf[4096];
@@ -376,7 +376,7 @@ static int serial_select_result(int fd, int event)
     serial = find234(serial_by_fd, &fd, serial_find_by_fd);
 
     if (!serial)
-	return 1;		       /* spurious event; keep going */
+	return;		       /* spurious event; keep going */
 
     if (event == 1) {
 	ret = read(serial->fd, buf, sizeof(buf));
@@ -391,11 +391,11 @@ static int serial_select_result(int fd, int event)
 	} else if (ret < 0) {
 #ifdef EAGAIN
 	    if (errno == EAGAIN)
-		return 1;	       /* spurious */
+		return;	       /* spurious */
 #endif
 #ifdef EWOULDBLOCK
 	    if (errno == EWOULDBLOCK)
-		return 1;	       /* spurious */
+		return;	       /* spurious */
 #endif
 	    perror("read serial port");
 	    exit(1);
@@ -417,8 +417,6 @@ static int serial_select_result(int fd, int event)
 
 	notify_remote_exit(serial->frontend);
     }
-
-    return !finished;
 }
 
 static void serial_uxsel_setup(Serial serial)

From f65c31667e0dee8d416df41dac66198a80c3314b Mon Sep 17 00:00:00 2001
From: Ben Harris <bjh21@bjh21.me.uk>
Date: Mon, 30 May 2016 20:47:04 +0100
Subject: [PATCH 020/166] winplink: remove "connopen" variable.

It's redundant with back->connected(): only the SSH backend has a
receive function that can ever return 0, and whenever ssh_receive
returns 0 it has called ssh_do_close, which will cause future calls
to ssh_connected also to return 0.  Similarly, all backend closing
functions ensure that future calls to their connected function will
return 0.
---
 windows/winplink.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/windows/winplink.c b/windows/winplink.c
index 474707777..a1a8dda0d 100644
--- a/windows/winplink.c
+++ b/windows/winplink.c
@@ -87,7 +87,6 @@ void cmdline_error(const char *p, ...)
 HANDLE inhandle, outhandle, errhandle;
 struct handle *stdin_handle, *stdout_handle, *stderr_handle;
 DWORD orig_console_mode;
-int connopen;
 
 WSAEVENT netevent;
 
@@ -267,7 +266,7 @@ int stdin_gotdata(struct handle *h, void *data, int len)
 	cleanup_exit(0);
     }
     noise_ultralight(len);
-    if (connopen && back->connected(backhandle)) {
+    if (back->connected(backhandle)) {
 	if (len > 0) {
 	    return back->send(backhandle, data, len);
 	} else {
@@ -294,7 +293,7 @@ void stdouterr_sent(struct handle *h, int new_backlog)
 		(h == stdout_handle ? "output" : "error"), buf);
 	cleanup_exit(0);
     }
-    if (connopen && back->connected(backhandle)) {
+    if (back->connected(backhandle)) {
 	back->unthrottle(backhandle, (handle_backlog(stdout_handle) +
 				      handle_backlog(stderr_handle)));
     }
@@ -662,7 +661,6 @@ int main(int argc, char **argv)
 	back->provide_logctx(backhandle, logctx);
 	sfree(realhost);
     }
-    connopen = 1;
 
     inhandle = GetStdHandle(STD_INPUT_HANDLE);
     outhandle = GetStdHandle(STD_OUTPUT_HANDLE);
@@ -782,7 +780,7 @@ int main(int argc, char **argv)
                             LPARAM lp;
                             int err = things.iErrorCode[eventtypes[e].bit];
                             lp = WSAMAKESELECTREPLY(eventtypes[e].mask, err);
-                            connopen &= select_result(wp, lp);
+                            select_result(wp, lp);
                         }
 		}
 	    }
@@ -810,7 +808,7 @@ int main(int argc, char **argv)
 	if (sending)
 	    handle_unthrottle(stdin_handle, back->sendbuffer(backhandle));
 
-	if ((!connopen || !back->connected(backhandle)) &&
+	if (!back->connected(backhandle) &&
 	    handle_backlog(stdout_handle) + handle_backlog(stderr_handle) == 0)
 	    break;		       /* we closed the connection */
     }

From 70e2e140f054f5cd894d0fd7f2c31a23cd7f7377 Mon Sep 17 00:00:00 2001
From: Ben Harris <bjh21@bjh21.me.uk>
Date: Thu, 2 Jun 2016 22:37:36 +0100
Subject: [PATCH 021/166] windows: Remove spurious redeclarations of
 select_result().

---
 windows/winplink.c | 1 -
 windows/winsftp.c  | 2 --
 2 files changed, 3 deletions(-)

diff --git a/windows/winplink.c b/windows/winplink.c
index a1a8dda0d..ea4175012 100644
--- a/windows/winplink.c
+++ b/windows/winplink.c
@@ -727,7 +727,6 @@ int main(int argc, char **argv)
 	    WSANETWORKEVENTS things;
 	    SOCKET socket;
 	    extern SOCKET first_socket(int *), next_socket(int *);
-	    extern int select_result(WPARAM, LPARAM);
 	    int i, socketstate;
 
 	    /*
diff --git a/windows/winsftp.c b/windows/winsftp.c
index e25d7e064..4558e5a9b 100644
--- a/windows/winsftp.c
+++ b/windows/winsftp.c
@@ -498,7 +498,6 @@ char *do_select(SOCKET skt, int startup)
     }
     return NULL;
 }
-extern int select_result(WPARAM, LPARAM);
 
 int do_eventsel_loop(HANDLE other_event)
 {
@@ -547,7 +546,6 @@ int do_eventsel_loop(HANDLE other_event)
 	WSANETWORKEVENTS things;
 	SOCKET socket;
 	extern SOCKET first_socket(int *), next_socket(int *);
-	extern int select_result(WPARAM, LPARAM);
 	int i, socketstate;
 
 	/*

From a2fb1d96ef4660f94c2bed6cad1749c10013d351 Mon Sep 17 00:00:00 2001
From: Ben Harris <bjh21@bjh21.me.uk>
Date: Thu, 2 Jun 2016 22:38:36 +0100
Subject: [PATCH 022/166] windows: Make select_result() return void.

Nothing now uses its return value anyway.
---
 windows/winnet.c   | 33 +++++++++++++--------------------
 windows/winstuff.h |  2 +-
 2 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/windows/winnet.c b/windows/winnet.c
index fc26c3e55..0ec64a55e 100644
--- a/windows/winnet.c
+++ b/windows/winnet.c
@@ -1625,9 +1625,9 @@ static void sk_tcp_write_eof(Socket sock)
 	try_send(s);
 }
 
-int select_result(WPARAM wParam, LPARAM lParam)
+void select_result(WPARAM wParam, LPARAM lParam)
 {
-    int ret, open;
+    int ret;
     DWORD err;
     char buf[20480];		       /* nice big buffer for plenty of speed */
     Actual_Socket s;
@@ -1636,11 +1636,11 @@ int select_result(WPARAM wParam, LPARAM lParam)
     /* wParam is the socket itself */
 
     if (wParam == 0)
-	return 1;		       /* boggle */
+	return;		       /* boggle */
 
     s = find234(sktree, (void *) wParam, cmpforsearch);
     if (!s)
-	return 1;		       /* boggle */
+	return;		       /* boggle */
 
     if ((err = WSAGETSELECTERROR(lParam)) != 0) {
 	/*
@@ -1657,9 +1657,8 @@ int select_result(WPARAM wParam, LPARAM lParam)
 	    }
 	}
 	if (err != 0)
-	    return plug_closing(s->plug, winsock_error_string(err), err, 0);
-	else
-	    return 1;
+	    plug_closing(s->plug, winsock_error_string(err), err, 0);
+	return;
     }
 
     noise_ultralight(lParam);
@@ -1712,12 +1711,11 @@ int select_result(WPARAM wParam, LPARAM lParam)
 	    }
 	}
 	if (ret < 0) {
-	    return plug_closing(s->plug, winsock_error_string(err), err,
-				0);
+	    plug_closing(s->plug, winsock_error_string(err), err, 0);
 	} else if (0 == ret) {
-	    return plug_closing(s->plug, NULL, 0, 0);
+	    plug_closing(s->plug, NULL, 0, 0);
 	} else {
-	    return plug_receive(s->plug, atmark ? 0 : 1, buf, ret);
+	    plug_receive(s->plug, atmark ? 0 : 1, buf, ret);
 	}
 	break;
       case FD_OOB:
@@ -1737,7 +1735,7 @@ int select_result(WPARAM wParam, LPARAM lParam)
 	    logevent(NULL, str);
 	    fatalbox("%s", str);
 	} else {
-	    return plug_receive(s->plug, 2, buf, ret);
+	    plug_receive(s->plug, 2, buf, ret);
 	}
 	break;
       case FD_WRITE:
@@ -1753,23 +1751,20 @@ int select_result(WPARAM wParam, LPARAM lParam)
 	break;
       case FD_CLOSE:
 	/* Signal a close on the socket. First read any outstanding data. */
-	open = 1;
 	do {
 	    ret = p_recv(s->s, buf, sizeof(buf), 0);
 	    if (ret < 0) {
 		err = p_WSAGetLastError();
 		if (err == WSAEWOULDBLOCK)
 		    break;
-		return plug_closing(s->plug, winsock_error_string(err),
-				    err, 0);
+		plug_closing(s->plug, winsock_error_string(err), err, 0);
 	    } else {
 		if (ret)
-		    open &= plug_receive(s->plug, 0, buf, ret);
+		    plug_receive(s->plug, 0, buf, ret);
 		else
-		    open &= plug_closing(s->plug, NULL, 0, 0);
+		    plug_closing(s->plug, NULL, 0, 0);
 	    }
 	} while (ret > 0);
-	return open;
        case FD_ACCEPT:
 	{
 #ifdef NO_IPV6
@@ -1807,8 +1802,6 @@ int select_result(WPARAM wParam, LPARAM lParam)
 	    }
 	}
     }
-
-    return 1;
 }
 
 /*
diff --git a/windows/winstuff.h b/windows/winstuff.h
index f8c4243f9..dfa032f48 100644
--- a/windows/winstuff.h
+++ b/windows/winstuff.h
@@ -284,7 +284,7 @@ GLOBAL void *logctx;
 /*
  * Exports from winnet.c.
  */
-extern int select_result(WPARAM, LPARAM);
+extern void select_result(WPARAM, LPARAM);
 
 /*
  * winnet.c dynamically loads WinSock 2 or WinSock 1 depending on

From 0d9c7d82e8506d9b6da557cfaf8a08bc3bfeb299 Mon Sep 17 00:00:00 2001
From: Ben Harris <bjh21@bjh21.me.uk>
Date: Sat, 4 Jun 2016 15:42:06 +0100
Subject: [PATCH 023/166] Don't treat plug_closing() and plug_receive() as
 returning backlog.

plug_receive() and plug_closing() return 0 or 1 depending on whether
they think the main connection has closed.  It is not appropriate, as
handle_gotdata and handle_socket_unfreeze did, to treat them as
returning a backlog.  In fact, plugs are unusual in PuTTY in not
reporting a backlog, but just calling into the socket to freeze and
unfreeze it as required.
---
 windows/winhsock.c | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/windows/winhsock.c b/windows/winhsock.c
index c8cb46f68..799fd28d5 100644
--- a/windows/winhsock.c
+++ b/windows/winhsock.c
@@ -54,10 +54,11 @@ static int handle_gotdata(struct handle *h, void *data, int len)
     Handle_Socket ps = (Handle_Socket) handle_get_privdata(h);
 
     if (len < 0) {
-	return plug_closing(ps->plug, "Read error from handle",
-			    0, 0);
+	plug_closing(ps->plug, "Read error from handle", 0, 0);
+	return 0;
     } else if (len == 0) {
-	return plug_closing(ps->plug, NULL, 0, 0);
+	plug_closing(ps->plug, NULL, 0, 0);
+	return 0;
     } else {
         assert(ps->frozen != FROZEN && ps->frozen != THAWING);
         if (ps->frozen == FREEZING) {
@@ -76,7 +77,8 @@ static int handle_gotdata(struct handle *h, void *data, int len)
              */
             return INT_MAX;
         } else {
-            return plug_receive(ps->plug, 0, data, len);
+            plug_receive(ps->plug, 0, data, len);
+	    return 0;
         }
     }
 }
@@ -168,7 +170,7 @@ static void handle_socket_unfreeze(void *psv)
 {
     Handle_Socket ps = (Handle_Socket) psv;
     void *data;
-    int len, new_backlog;
+    int len;
 
     /*
      * If we've been put into a state other than THAWING since the
@@ -188,7 +190,7 @@ static void handle_socket_unfreeze(void *psv)
      * have the effect of trying to close this socket.
      */
     ps->defer_close = TRUE;
-    new_backlog = plug_receive(ps->plug, 0, data, len);
+    plug_receive(ps->plug, 0, data, len);
     bufchain_consume(&ps->inputdata, len);
     ps->defer_close = FALSE;
     if (ps->deferred_close) {
@@ -207,7 +209,7 @@ static void handle_socket_unfreeze(void *psv)
          * Otherwise, we've successfully thawed!
          */
         ps->frozen = UNFROZEN;
-        handle_unthrottle(ps->recv_h, new_backlog);
+        handle_unthrottle(ps->recv_h, 0);
     }
 }
 

From 0d57b8a4d9c8f487c6a8806384cb2c485161d19c Mon Sep 17 00:00:00 2001
From: Ben Harris <bjh21@bjh21.me.uk>
Date: Thu, 2 Jun 2016 23:03:24 +0100
Subject: [PATCH 024/166] Make plug receive and closing functions return void
 instead of int.

Nothing was paying attention to their return values any more anyway.
---
 network.h     |  4 ++--
 pageant.c     | 18 ++++++++----------
 portfwd.c     | 25 ++++++++++---------------
 proxy.c       | 41 +++++++++++++++++++++--------------------
 raw.c         |  8 +++-----
 rlogin.c      |  8 +++-----
 ssh.c         |  9 +++------
 sshshare.c    | 25 +++++++++++--------------
 telnet.c      |  8 +++-----
 unix/uxpgnt.c |  7 +++----
 x11fwd.c      | 18 ++++++------------
 11 files changed, 73 insertions(+), 98 deletions(-)

diff --git a/network.h b/network.h
index d58635b62..0941f721f 100644
--- a/network.h
+++ b/network.h
@@ -64,12 +64,12 @@ struct plug_function_table {
      *    proxy command, so the receiver should probably prefix it to
      *    indicate this.
      */
-    int (*closing)
+    void (*closing)
      (Plug p, const char *error_msg, int error_code, int calling_back);
     /* error_msg is NULL iff it is not an error (ie it closed normally) */
     /* calling_back != 0 iff there is a Plug function */
     /* currently running (would cure the fixme in try_send()) */
-    int (*receive) (Plug p, int urgent, char *data, int len);
+    void (*receive) (Plug p, int urgent, char *data, int len);
     /*
      *  - urgent==0. `data' points to `len' bytes of perfectly
      *    ordinary data.
diff --git a/pageant.c b/pageant.c
index 366717251..a168e522e 100644
--- a/pageant.c
+++ b/pageant.c
@@ -964,11 +964,11 @@ int pageant_delete_ssh2_key(struct ssh2_userkey *skey)
  * Coroutine macros similar to, but simplified from, those in ssh.c.
  */
 #define crBegin(v)	{ int *crLine = &v; switch(v) { case 0:;
-#define crFinish(z)	} *crLine = 0; return (z); }
+#define crFinishV	} *crLine = 0; return; }
 #define crGetChar(c) do                                         \
     {                                                           \
         while (len == 0) {                                      \
-            *crLine =__LINE__; return 1; case __LINE__:;        \
+            *crLine =__LINE__; return; case __LINE__:;          \
         }                                                       \
         len--;                                                  \
         (c) = (unsigned char)*data++;                           \
@@ -987,8 +987,8 @@ struct pageant_conn_state {
     int crLine;            /* for coroutine in pageant_conn_receive */
 };
 
-static int pageant_conn_closing(Plug plug, const char *error_msg,
-                                int error_code, int calling_back)
+static void pageant_conn_closing(Plug plug, const char *error_msg,
+				 int error_code, int calling_back)
 {
     struct pageant_conn_state *pc = (struct pageant_conn_state *)plug;
     if (error_msg)
@@ -997,7 +997,6 @@ static int pageant_conn_closing(Plug plug, const char *error_msg,
         plog(pc->logctx, pc->logfn, "%p: connection closed", pc);
     sk_close(pc->connsock);
     sfree(pc);
-    return 1;
 }
 
 static void pageant_conn_sent(Plug plug, int bufsize)
@@ -1021,7 +1020,7 @@ static void pageant_conn_log(void *logctx, const char *fmt, va_list ap)
     sfree(formatted);
 }
 
-static int pageant_conn_receive(Plug plug, int urgent, char *data, int len)
+static void pageant_conn_receive(Plug plug, int urgent, char *data, int len)
 {
     struct pageant_conn_state *pc = (struct pageant_conn_state *)plug;
     char c;
@@ -1065,7 +1064,7 @@ static int pageant_conn_receive(Plug plug, int urgent, char *data, int len)
         }
     }
 
-    crFinish(1);
+    crFinishV;
 }
 
 struct pageant_listen_state {
@@ -1077,15 +1076,14 @@ struct pageant_listen_state {
     pageant_logfn_t logfn;
 };
 
-static int pageant_listen_closing(Plug plug, const char *error_msg,
-                                  int error_code, int calling_back)
+static void pageant_listen_closing(Plug plug, const char *error_msg,
+				   int error_code, int calling_back)
 {
     struct pageant_listen_state *pl = (struct pageant_listen_state *)plug;
     if (error_msg)
         plog(pl->logctx, pl->logfn, "listening socket: error: %s", error_msg);
     sk_close(pl->listensock);
     pl->listensock = NULL;
-    return 1;
 }
 
 static int pageant_listen_accepting(Plug plug,
diff --git a/portfwd.c b/portfwd.c
index 8a73a182d..febd8af9b 100644
--- a/portfwd.c
+++ b/portfwd.c
@@ -117,8 +117,8 @@ static void pfl_log(Plug plug, int type, SockAddr addr, int port,
     /* we have to dump these since we have no interface to logging.c */
 }
 
-static int pfd_closing(Plug plug, const char *error_msg, int error_code,
-		       int calling_back)
+static void pfd_closing(Plug plug, const char *error_msg, int error_code,
+			int calling_back)
 {
     struct PortForwarding *pf = (struct PortForwarding *) plug;
 
@@ -145,16 +145,13 @@ static int pfd_closing(Plug plug, const char *error_msg, int error_code,
         if (pf->c)
             sshfwd_write_eof(pf->c);
     }
-
-    return 1;
 }
 
-static int pfl_closing(Plug plug, const char *error_msg, int error_code,
-		       int calling_back)
+static void pfl_closing(Plug plug, const char *error_msg, int error_code,
+			int calling_back)
 {
     struct PortListener *pl = (struct PortListener *) plug;
     pfl_terminate(pl);
-    return 1;
 }
 
 static void wrap_send_port_open(void *channel, const char *hostname, int port,
@@ -172,7 +169,7 @@ static void wrap_send_port_open(void *channel, const char *hostname, int port,
     sfree(description);
 }
 
-static int pfd_receive(Plug plug, int urgent, char *data, int len)
+static void pfd_receive(Plug plug, int urgent, char *data, int len)
 {
     struct PortForwarding *pf = (struct PortForwarding *) plug;
     if (pf->dynamic) {
@@ -204,7 +201,7 @@ static int pfd_receive(Plug plug, int urgent, char *data, int len)
 		    data[1] = 91;      /* generic `request rejected' */
 		    sk_write(pf->s, data, 8);
 		    pfd_close(pf);
-		    return 1;
+		    return;
 		}
 		if (pf->sockslen <= 8)
                     continue;      /* haven't started user/hostname */
@@ -320,7 +317,7 @@ static int pfd_receive(Plug plug, int urgent, char *data, int len)
 			reply[1] = 1;	/* generic failure */
 			sk_write(pf->s, (char *) reply, lenof(reply));
 			pfd_close(pf);
-			return 1;
+			return;
 		    }
 		    /*
 		     * Now we have a viable connect request. Switch
@@ -350,7 +347,7 @@ static int pfd_receive(Plug plug, int urgent, char *data, int len)
 			reply[1] = 8;	/* atype not supported */
 			sk_write(pf->s, (char *) reply, lenof(reply));
 			pfd_close(pf);
-			return 1;
+			return;
 		    }
 		}
 	    }
@@ -362,9 +359,8 @@ static int pfd_receive(Plug plug, int urgent, char *data, int len)
 	     * close the connection rudely.
 	     */
 	    pfd_close(pf);
-	    return 1;
 	}
-	return 1;
+	return;
 
 	/*
 	 * We come here when we're ready to make an actual
@@ -383,7 +379,7 @@ static int pfd_receive(Plug plug, int urgent, char *data, int len)
 	pf->c = new_sock_channel(pf->backhandle, pf);
 	if (pf->c == NULL) {
 	    pfd_close(pf);
-	    return 1;
+	    return;
 	} else {
 	    /* asks to forward to the specified host/port for this */
 	    wrap_send_port_open(pf->c, pf->hostname, pf->port, pf->s);
@@ -406,7 +402,6 @@ static int pfd_receive(Plug plug, int urgent, char *data, int len)
 	    sk_set_frozen(pf->s, 1);
 	}
     }
-    return 1;
 }
 
 static void pfd_sent(Plug plug, int bufsize)
diff --git a/proxy.c b/proxy.c
index 52006794c..68b7e9a06 100644
--- a/proxy.c
+++ b/proxy.c
@@ -201,8 +201,8 @@ static void plug_proxy_log(Plug plug, int type, SockAddr addr, int port,
     plug_log(ps->plug, type, addr, port, error_msg, error_code);
 }
 
-static int plug_proxy_closing (Plug p, const char *error_msg,
-			       int error_code, int calling_back)
+static void plug_proxy_closing (Plug p, const char *error_msg,
+				int error_code, int calling_back)
 {
     Proxy_Plug pp = (Proxy_Plug) p;
     Proxy_Socket ps = pp->proxy_socket;
@@ -211,13 +211,13 @@ static int plug_proxy_closing (Plug p, const char *error_msg,
 	ps->closing_error_msg = error_msg;
 	ps->closing_error_code = error_code;
 	ps->closing_calling_back = calling_back;
-	return ps->negotiate(ps, PROXY_CHANGE_CLOSING);
+	ps->negotiate(ps, PROXY_CHANGE_CLOSING);
+    } else {
+        plug_closing(ps->plug, error_msg, error_code, calling_back);
     }
-    return plug_closing(ps->plug, error_msg,
-			error_code, calling_back);
 }
 
-static int plug_proxy_receive (Plug p, int urgent, char *data, int len)
+static void plug_proxy_receive (Plug p, int urgent, char *data, int len)
 {
     Proxy_Plug pp = (Proxy_Plug) p;
     Proxy_Socket ps = pp->proxy_socket;
@@ -231,9 +231,10 @@ static int plug_proxy_receive (Plug p, int urgent, char *data, int len)
 	ps->receive_urgent = urgent;
 	ps->receive_data = data;
 	ps->receive_len = len;
-	return ps->negotiate(ps, PROXY_CHANGE_RECEIVE);
+	ps->negotiate(ps, PROXY_CHANGE_RECEIVE);
+    } else {
+        plug_receive(ps->plug, urgent, data, len);
     }
-    return plug_receive(ps->plug, urgent, data, len);
 }
 
 static void plug_proxy_sent (Plug p, int bufsize)
@@ -644,9 +645,9 @@ int proxy_http_negotiate (Proxy_Socket p, int change)
 	 * a socket close, then some error must have occurred. we'll
 	 * just pass those errors up to the backend.
 	 */
-	return plug_closing(p->plug, p->closing_error_msg,
-			    p->closing_error_code,
-			    p->closing_calling_back);
+	plug_closing(p->plug, p->closing_error_msg, p->closing_error_code,
+		     p->closing_calling_back);
+	return 0; /* ignored */
     }
 
     if (change == PROXY_CHANGE_SENT) {
@@ -847,9 +848,9 @@ int proxy_socks4_negotiate (Proxy_Socket p, int change)
 	 * a socket close, then some error must have occurred. we'll
 	 * just pass those errors up to the backend.
 	 */
-	return plug_closing(p->plug, p->closing_error_msg,
-			    p->closing_error_code,
-			    p->closing_calling_back);
+	plug_closing(p->plug, p->closing_error_msg, p->closing_error_code,
+		     p->closing_calling_back);
+	return 0; /* ignored */
     }
 
     if (change == PROXY_CHANGE_SENT) {
@@ -987,9 +988,9 @@ int proxy_socks5_negotiate (Proxy_Socket p, int change)
 	 * a socket close, then some error must have occurred. we'll
 	 * just pass those errors up to the backend.
 	 */
-	return plug_closing(p->plug, p->closing_error_msg,
-			    p->closing_error_code,
-			    p->closing_calling_back);
+        plug_closing(p->plug, p->closing_error_msg, p->closing_error_code,
+		     p->closing_calling_back);
+	return 0; /* ignored */
     }
 
     if (change == PROXY_CHANGE_SENT) {
@@ -1561,9 +1562,9 @@ int proxy_telnet_negotiate (Proxy_Socket p, int change)
 	 * a socket close, then some error must have occurred. we'll
 	 * just pass those errors up to the backend.
 	 */
-	return plug_closing(p->plug, p->closing_error_msg,
-			    p->closing_error_code,
-			    p->closing_calling_back);
+	plug_closing(p->plug, p->closing_error_msg, p->closing_error_code,
+		     p->closing_calling_back);
+	return 0; /* ignored */
     }
 
     if (change == PROXY_CHANGE_SENT) {
diff --git a/raw.c b/raw.c
index 0c5445ad4..fbc9018d8 100644
--- a/raw.c
+++ b/raw.c
@@ -61,8 +61,8 @@ static void raw_check_close(Raw raw)
     }
 }
 
-static int raw_closing(Plug plug, const char *error_msg, int error_code,
-		       int calling_back)
+static void raw_closing(Plug plug, const char *error_msg, int error_code,
+			int calling_back)
 {
     Raw raw = (Raw) plug;
 
@@ -92,17 +92,15 @@ static int raw_closing(Plug plug, const char *error_msg, int error_code,
         raw->sent_console_eof = TRUE;
         raw_check_close(raw);
     }
-    return 0;
 }
 
-static int raw_receive(Plug plug, int urgent, char *data, int len)
+static void raw_receive(Plug plug, int urgent, char *data, int len)
 {
     Raw raw = (Raw) plug;
     c_write(raw, data, len);
     /* We count 'session start', for proxy logging purposes, as being
      * when data is received from the network and printed. */
     raw->session_started = TRUE;
-    return 1;
 }
 
 static void raw_sent(Plug plug, int bufsize)
diff --git a/rlogin.c b/rlogin.c
index eba468da2..ff2c0a8f4 100644
--- a/rlogin.c
+++ b/rlogin.c
@@ -53,8 +53,8 @@ static void rlogin_log(Plug plug, int type, SockAddr addr, int port,
                        rlogin->conf, !rlogin->firstbyte);
 }
 
-static int rlogin_closing(Plug plug, const char *error_msg, int error_code,
-			  int calling_back)
+static void rlogin_closing(Plug plug, const char *error_msg, int error_code,
+			   int calling_back)
 {
     Rlogin rlogin = (Rlogin) plug;
 
@@ -76,10 +76,9 @@ static int rlogin_closing(Plug plug, const char *error_msg, int error_code,
 	logevent(rlogin->frontend, error_msg);
 	connection_fatal(rlogin->frontend, "%s", error_msg);
     }				       /* Otherwise, the remote side closed the connection normally. */
-    return 0;
 }
 
-static int rlogin_receive(Plug plug, int urgent, char *data, int len)
+static void rlogin_receive(Plug plug, int urgent, char *data, int len)
 {
     Rlogin rlogin = (Rlogin) plug;
     if (urgent == 2) {
@@ -113,7 +112,6 @@ static int rlogin_receive(Plug plug, int urgent, char *data, int len)
 	if (len > 0)
             c_write(rlogin, data, len);
     }
-    return 1;
 }
 
 static void rlogin_sent(Plug plug, int bufsize)
diff --git a/ssh.c b/ssh.c
index 994e93aeb..b6298b039 100644
--- a/ssh.c
+++ b/ssh.c
@@ -3560,8 +3560,8 @@ void ssh_connshare_log(Ssh ssh, int event, const char *logtext,
     }
 }
 
-static int ssh_closing(Plug plug, const char *error_msg, int error_code,
-		       int calling_back)
+static void ssh_closing(Plug plug, const char *error_msg, int error_code,
+			int calling_back)
 {
     Ssh ssh = (Ssh) plug;
     int need_notify = ssh_do_close(ssh, FALSE);
@@ -3583,18 +3583,15 @@ static int ssh_closing(Plug plug, const char *error_msg, int error_code,
 	logevent(error_msg);
     if (!ssh->close_expected || !ssh->clean_exit)
 	connection_fatal(ssh->frontend, "%s", error_msg);
-    return 0;
 }
 
-static int ssh_receive(Plug plug, int urgent, char *data, int len)
+static void ssh_receive(Plug plug, int urgent, char *data, int len)
 {
     Ssh ssh = (Ssh) plug;
     ssh_gotdata(ssh, (unsigned char *)data, len);
     if (ssh->state == SSH_STATE_CLOSED) {
 	ssh_do_close(ssh, TRUE);
-	return 0;
     }
-    return 1;
 }
 
 static void ssh_sent(Plug plug, int bufsize)
diff --git a/sshshare.c b/sshshare.c
index 82c4bd31e..59cdad45b 100644
--- a/sshshare.c
+++ b/sshshare.c
@@ -911,8 +911,8 @@ static void share_disconnect(struct ssh_sharing_connstate *cs,
     share_begin_cleanup(cs);
 }
 
-static int share_closing(Plug plug, const char *error_msg, int error_code,
-                         int calling_back)
+static void share_closing(Plug plug, const char *error_msg, int error_code,
+			  int calling_back)
 {
     struct ssh_sharing_connstate *cs = (struct ssh_sharing_connstate *)plug;
 
@@ -935,7 +935,6 @@ static int share_closing(Plug plug, const char *error_msg, int error_code,
                              "Socket error: %s", error_msg);
     }
     share_begin_cleanup(cs);
-    return 1;
 }
 
 static int getstring_inner(const void *vdata, int datalen,
@@ -1775,17 +1774,17 @@ static void share_got_pkt_from_downstream(struct ssh_sharing_connstate *cs,
  * Coroutine macros similar to, but simplified from, those in ssh.c.
  */
 #define crBegin(v)	{ int *crLine = &v; switch(v) { case 0:;
-#define crFinish(z)	} *crLine = 0; return (z); }
+#define crFinishV	} *crLine = 0; return; }
 #define crGetChar(c) do                                         \
     {                                                           \
         while (len == 0) {                                      \
-            *crLine =__LINE__; return 1; case __LINE__:;        \
+            *crLine =__LINE__; return; case __LINE__:;          \
         }                                                       \
         len--;                                                  \
         (c) = (unsigned char)*data++;                           \
     } while (0)
 
-static int share_receive(Plug plug, int urgent, char *data, int len)
+static void share_receive(Plug plug, int urgent, char *data, int len)
 {
     struct ssh_sharing_connstate *cs = (struct ssh_sharing_connstate *)plug;
     static const char expected_verstring_prefix[] =
@@ -1858,7 +1857,7 @@ static int share_receive(Plug plug, int urgent, char *data, int len)
     }
 
   dead:;
-    crFinish(1);
+    crFinishV;
 }
 
 static void share_sent(Plug plug, int bufsize)
@@ -1875,8 +1874,8 @@ static void share_sent(Plug plug, int bufsize)
      */
 }
 
-static int share_listen_closing(Plug plug, const char *error_msg,
-                                int error_code, int calling_back)
+static void share_listen_closing(Plug plug, const char *error_msg,
+				 int error_code, int calling_back)
 {
     struct ssh_sharing_state *sharestate = (struct ssh_sharing_state *)plug;
     if (error_msg)
@@ -1884,7 +1883,6 @@ static int share_listen_closing(Plug plug, const char *error_msg,
                          "listening socket: %s", error_msg);
     sk_close(sharestate->listensock);
     sharestate->listensock = NULL;
-    return 1;
 }
 
 static void share_send_verstring(struct ssh_sharing_connstate *cs)
@@ -2047,10 +2045,9 @@ char *ssh_share_sockname(const char *host, int port, Conf *conf)
 
 static void nullplug_socket_log(Plug plug, int type, SockAddr addr, int port,
                                 const char *error_msg, int error_code) {}
-static int nullplug_closing(Plug plug, const char *error_msg, int error_code,
-                            int calling_back) { return 0; }
-static int nullplug_receive(Plug plug, int urgent, char *data,
-                            int len) { return 0; }
+static void nullplug_closing(Plug plug, const char *error_msg, int error_code,
+			     int calling_back) {}
+static void nullplug_receive(Plug plug, int urgent, char *data, int len) {}
 static void nullplug_sent(Plug plug, int bufsize) {}
 
 int ssh_share_test_for_upstream(const char *host, int port, Conf *conf)
diff --git a/telnet.c b/telnet.c
index c4b041327..8d03cb7b9 100644
--- a/telnet.c
+++ b/telnet.c
@@ -658,8 +658,8 @@ static void telnet_log(Plug plug, int type, SockAddr addr, int port,
                        telnet->session_started);
 }
 
-static int telnet_closing(Plug plug, const char *error_msg, int error_code,
-			  int calling_back)
+static void telnet_closing(Plug plug, const char *error_msg, int error_code,
+			   int calling_back)
 {
     Telnet telnet = (Telnet) plug;
 
@@ -681,17 +681,15 @@ static int telnet_closing(Plug plug, const char *error_msg, int error_code,
 	connection_fatal(telnet->frontend, "%s", error_msg);
     }
     /* Otherwise, the remote side closed the connection normally. */
-    return 0;
 }
 
-static int telnet_receive(Plug plug, int urgent, char *data, int len)
+static void telnet_receive(Plug plug, int urgent, char *data, int len)
 {
     Telnet telnet = (Telnet) plug;
     if (urgent)
 	telnet->in_synch = TRUE;
     telnet->session_started = TRUE;
     do_telnet_read(telnet, data, len);
-    return 1;
 }
 
 static void telnet_sent(Plug plug, int bufsize)
diff --git a/unix/uxpgnt.c b/unix/uxpgnt.c
index 41efcbc2d..cb85b1606 100644
--- a/unix/uxpgnt.c
+++ b/unix/uxpgnt.c
@@ -183,13 +183,12 @@ void sshfwd_x11_is_local(struct ssh_channel *c) {}
  */
 static void x11_log(Plug p, int type, SockAddr addr, int port,
 		    const char *error_msg, int error_code) {}
-static int x11_receive(Plug plug, int urgent, char *data, int len) {return 0;}
+static void x11_receive(Plug plug, int urgent, char *data, int len) {}
 static void x11_sent(Plug plug, int bufsize) {}
-static int x11_closing(Plug plug, const char *error_msg, int error_code,
-		       int calling_back)
+static void x11_closing(Plug plug, const char *error_msg, int error_code,
+			int calling_back)
 {
     time_to_die = TRUE;
-    return 1;
 }
 struct X11Connection {
     const struct plug_function_table *fn;
diff --git a/x11fwd.c b/x11fwd.c
index 584116aa6..9d0a58de6 100644
--- a/x11fwd.c
+++ b/x11fwd.c
@@ -58,11 +58,9 @@ static int xdmseen_cmp(void *a, void *b)
  *      independent network.c or something */
 static void dummy_plug_log(Plug p, int type, SockAddr addr, int port,
 			   const char *error_msg, int error_code) { }
-static int dummy_plug_closing
-     (Plug p, const char *error_msg, int error_code, int calling_back)
-{ return 1; }
-static int dummy_plug_receive(Plug p, int urgent, char *data, int len)
-{ return 1; }
+static void dummy_plug_closing
+     (Plug p, const char *error_msg, int error_code, int calling_back) { }
+static void dummy_plug_receive(Plug p, int urgent, char *data, int len) { }
 static void dummy_plug_sent(Plug p, int bufsize) { }
 static int dummy_plug_accepting(Plug p, accept_fn_t constructor, accept_ctx_t ctx) { return 1; }
 static const struct plug_function_table dummy_plug = {
@@ -616,8 +614,8 @@ static void x11_log(Plug p, int type, SockAddr addr, int port,
 static void x11_send_init_error(struct X11Connection *conn,
                                 const char *err_message);
 
-static int x11_closing(Plug plug, const char *error_msg, int error_code,
-		       int calling_back)
+static void x11_closing(Plug plug, const char *error_msg, int error_code,
+			int calling_back)
 {
     struct X11Connection *xconn = (struct X11Connection *) plug;
 
@@ -646,11 +644,9 @@ static int x11_closing(Plug plug, const char *error_msg, int error_code,
         if (xconn->c)
             sshfwd_write_eof(xconn->c);
     }
-
-    return 1;
 }
 
-static int x11_receive(Plug plug, int urgent, char *data, int len)
+static void x11_receive(Plug plug, int urgent, char *data, int len)
 {
     struct X11Connection *xconn = (struct X11Connection *) plug;
 
@@ -659,8 +655,6 @@ static int x11_receive(Plug plug, int urgent, char *data, int len)
         xconn->no_data_sent_to_x_client = FALSE;
 	sk_set_frozen(xconn->s, 1);
     }
-
-    return 1;
 }
 
 static void x11_sent(Plug plug, int bufsize)

From c7b9f846d9d4062dea9eeaca7b15c0a8caf0c73d Mon Sep 17 00:00:00 2001
From: Ben Harris <bjh21@bjh21.me.uk>
Date: Wed, 17 May 2017 23:02:14 +0100
Subject: [PATCH 025/166] windows: Fix control-flow error in select_result().

When making select_result() return void (a2fb1d9), I removed a "return"
at the end of the FD_CLOSE case, causing a fallthrough into FD_ACCEPT
with hilarious (segfaulting) consequences.  Re-instate the "return".
---
 windows/winnet.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/windows/winnet.c b/windows/winnet.c
index 0ec64a55e..ea950bba2 100644
--- a/windows/winnet.c
+++ b/windows/winnet.c
@@ -1765,6 +1765,7 @@ void select_result(WPARAM wParam, LPARAM lParam)
 		    plug_closing(s->plug, NULL, 0, 0);
 	    }
 	} while (ret > 0);
+	return;
        case FD_ACCEPT:
 	{
 #ifdef NO_IPV6

From 12bd5a6c722152aa27f24598785593e72b3284ea Mon Sep 17 00:00:00 2001
From: Jacob Nevins <jacobn@chiark.greenend.org.uk>
Date: Sat, 20 May 2017 12:44:56 +0100
Subject: [PATCH 026/166] Stop Gtk2 builds exploding on scroll wheel events.

More fallout from 64221972c.
---
 unix/gtkwin.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/unix/gtkwin.c b/unix/gtkwin.c
index 67cfcac38..f54289a36 100644
--- a/unix/gtkwin.c
+++ b/unix/gtkwin.c
@@ -1923,7 +1923,7 @@ gboolean scroll_event(GtkWidget *widget, GdkEventScroll *event, gpointer data)
 	return FALSE;
 
     event_button = (GdkEventButton *)gdk_event_new(GDK_BUTTON_PRESS);
-    event_button->window = event->window;
+    event_button->window = g_object_ref(event->window);
     event_button->send_event = event->send_event;
     event_button->time = event->time;
     event_button->x = event->x;
@@ -1931,7 +1931,7 @@ gboolean scroll_event(GtkWidget *widget, GdkEventScroll *event, gpointer data)
     event_button->axes = NULL;
     event_button->state = event->state;
     event_button->button = button;
-    event_button->device = event->device;
+    event_button->device = g_object_ref(event->device);
     event_button->x_root = event->x_root;
     event_button->y_root = event->y_root;
     ret = button_internal(inst, event_button);

From 22cf2823d1c5615c259eadf8a3ebb199aba6f2d6 Mon Sep 17 00:00:00 2001
From: Jacob Nevins <jacobn@chiark.greenend.org.uk>
Date: Tue, 23 May 2017 23:13:17 +0100
Subject: [PATCH 027/166] Remove some ancient cruft from the FAQ.

 - I haven't heard of OpenSSH/OpenSSL mismatches being a common problem
   for a long time. Specific advice about OpenSSH 3.1/3.4 seems unlikely
   to be useful these days.
 - "Incorrect MAC received on packet" doesn't seem to be a common
   problem these days, and if anyone encounters it, the words in the
   "Errors" bit of the docs seem adequate without a FAQ entry as well.
---
 doc/errors.but | 18 +++++++--------
 doc/faq.but    | 63 --------------------------------------------------
 2 files changed, 9 insertions(+), 72 deletions(-)

diff --git a/doc/errors.but b/doc/errors.but
index fdbdd861a..8e353fb9b 100644
--- a/doc/errors.but
+++ b/doc/errors.but
@@ -122,9 +122,7 @@ ridiculous amount of memory, and will terminate with an \q{Out of
 memory} error.
 
 This can happen in SSH-2, if PuTTY and the server have not enabled
-encryption in the same way (see \k{faq-outofmem} in the FAQ). Some
-versions of \i{OpenSSH} have a known problem with this: see
-\k{faq-openssh-bad-openssl}.
+encryption in the same way (see \k{faq-outofmem} in the FAQ).
 
 This can also happen in PSCP or PSFTP, if your \i{login scripts} on the
 server generate output: the client program will be expecting an SFTP
@@ -233,8 +231,13 @@ protection (such as HTTP) will manifest in more subtle failures (such
 as misdisplayed text or images in a web browser) which may not be
 noticed.
 
-A known server problem which can cause this error is described in
-\k{faq-openssh-bad-openssl} in the FAQ.
+Occasionally this has been caused by server bugs. An example is the
+bug described at \k{config-ssh-bug-hmac2}, although you're very
+unlikely to encounter that one these days. 
+
+In this context MAC stands for \ii{Message Authentication Code}. It's a
+cryptographic term, and it has nothing at all to do with Ethernet
+MAC (Media Access Control) addresses, or with the Apple computer.
 
 \H{errors-garbled} \q{Incoming packet was garbled on decryption}
 
@@ -247,10 +250,7 @@ in the server, or in between.
 If you get this error, one thing you could try would be to fiddle with
 the setting of \q{Miscomputes SSH-2 encryption keys} (see
 \k{config-ssh-bug-derivekey2}) or \q{Ignores SSH-2 maximum packet
-size} (see \k{config-ssh-bug-maxpkt2}) on the Bugs panel .
-
-Another known server problem which can cause this error is described
-in \k{faq-openssh-bad-openssl} in the FAQ.
+size} (see \k{config-ssh-bug-maxpkt2}) on the Bugs panel.
 
 \H{errors-x11-proxy} \q{PuTTY X11 proxy: \e{various errors}}
 
diff --git a/doc/faq.but b/doc/faq.but
index 80cf9d639..dbc3fcc96 100644
--- a/doc/faq.but
+++ b/doc/faq.but
@@ -601,34 +601,6 @@ documentation.)
 
 \H{faq-trouble} Troubleshooting
 
-\S{faq-incorrect-mac}{Question} Why do I see \q{Incorrect MAC
-received on packet}?
-
-One possible cause of this that used to be common is a bug in old
-SSH-2 servers distributed by \cw{ssh.com}. (This is not the only
-possible cause; see \k{errors-crc} in the documentation.)
-Version 2.3.0 and below of their SSH-2 server
-constructs Message Authentication Codes in the wrong way, and
-expects the client to construct them in the same wrong way. PuTTY
-constructs the MACs correctly by default, and hence these old
-servers will fail to work with it.
-
-If you are using PuTTY version 0.52 or better, this should work
-automatically: PuTTY should detect the buggy servers from their
-version number announcement, and automatically start to construct
-its MACs in the same incorrect manner as they do, so it will be able
-to work with them.
-
-If you are using PuTTY version 0.51 or below, you can enable the
-workaround by going to the SSH panel and ticking the box labelled
-\q{Imitate SSH2 MAC bug}. It's possible that you might have to do
-this with 0.52 as well, if a buggy server exists that PuTTY doesn't
-know about.
-
-In this context MAC stands for \ii{Message Authentication Code}. It's a
-cryptographic term, and it has nothing at all to do with Ethernet
-MAC (Media Access Control) addresses.
-
 \S{faq-pscp-protocol}{Question} Why do I see \q{Fatal: Protocol
 error: Expected control record} in PSCP?
 
@@ -895,41 +867,6 @@ You should still read the
 page} on the PuTTY website (also provided as \k{feedback} in the
 manual), and follow the guidelines contained in that.
 
-\S{faq-openssh-bad-openssl}{Question} Since my SSH server was upgraded
-to \i{OpenSSH} 3.1p1/3.4p1, I can no longer connect with PuTTY.
-
-There is a known problem when OpenSSH has been built against an
-incorrect version of OpenSSL; the quick workaround is to configure
-PuTTY to use SSH protocol 2 and the Blowfish cipher.
-
-For more details and OpenSSH patches, see
-\W{http://bugzilla.mindrot.org/show_bug.cgi?id=138}{bug 138} in the
-OpenSSH BTS.
-
-This is not a PuTTY-specific problem; if you try to connect with
-another client you'll likely have similar problems. (Although PuTTY's
-default cipher differs from many other clients.)
-
-\e{OpenSSH 3.1p1:} configurations known to be broken (and symptoms):
-
-\b SSH-2 with AES cipher (PuTTY says \q{Assertion failed! Expression:
-(len & 15) == 0} in \cw{sshaes.c}, or \q{Out of memory}, or crashes)
-
-\b SSH-2 with 3DES (PuTTY says \q{Incorrect MAC received on packet})
-
-\b SSH-1 with Blowfish (PuTTY says \q{Incorrect CRC received on
-packet})
-
-\b SSH-1 with 3DES
-
-\e{OpenSSH 3.4p1:} as of 3.4p1, only the problem with SSH-1 and
-Blowfish remains. Rebuild your server, apply the patch linked to from
-bug 138 above, or use another cipher (e.g., 3DES) instead.
-
-\e{Other versions:} we occasionally get reports of the same symptom
-and workarounds with older versions of OpenSSH, although it's not
-clear the underlying cause is the same.
-
 \S{faq-ssh2key-ssh1conn}{Question} Why do I see \q{Couldn't load
 private key from ...}? Why can PuTTYgen load my key but not PuTTY?
 

From e5dd1435e2f9446d7f131b4b0dd849dcec880aed Mon Sep 17 00:00:00 2001
From: Jacob Nevins <jacobn@chiark.greenend.org.uk>
Date: Tue, 23 May 2017 23:16:36 +0100
Subject: [PATCH 028/166] Remove FAQ about Plink on Win95.

While it's still true, the link to Winsock 2 is dead, our standard
release builds don't run on Win95 any more, and it's certainly not
frequently asked.
---
 doc/faq.but   | 15 ---------------
 doc/index.but |  3 ---
 2 files changed, 18 deletions(-)

diff --git a/doc/faq.but b/doc/faq.but
index dbc3fcc96..cd3254a8b 100644
--- a/doc/faq.but
+++ b/doc/faq.but
@@ -636,21 +636,6 @@ Clicking on \q{ANSI Green} won't turn your session green; it will
 only allow you to adjust the \e{shade} of green used when PuTTY is
 instructed by the server to display green text.
 
-\S{faq-winsock2}{Question} Plink on \i{Windows 95} says it can't find
-\i\cw{WS2_32.DLL}.
-
-Plink requires the extended Windows network library, WinSock version
-2. This is installed as standard on Windows 98 and above, and on
-Windows NT, and even on later versions of Windows 95; but early
-Win95 installations don't have it.
-
-In order to use Plink on these systems, you will need to download
-the
-\W{http://www.microsoft.com/windows95/downloads/contents/wuadmintools/s_wunetworkingtools/w95sockets2/}{WinSock 2 upgrade}:
-
-\c http://www.microsoft.com/windows95/downloads/contents/
-\c   wuadmintools/s_wunetworkingtools/w95sockets2/
-
 \S{faq-outofmem}{Question} After trying to establish an SSH-2
 connection, PuTTY says \q{\ii{Out of memory}} and dies.
 
diff --git a/doc/index.but b/doc/index.but
index 1e71234f7..30ebd7845 100644
--- a/doc/index.but
+++ b/doc/index.but
@@ -829,9 +829,6 @@ saved sessions from
 \IM{login scripts}{startup scripts} login scripts
 \IM{login scripts}{startup scripts} startup scripts
 
-\IM{WS2_32.DLL} \cw{WS2_32.DLL}
-\IM{WS2_32.DLL} WinSock version 2
-
 \IM{Red Hat Linux} Red Hat Linux
 \IM{Red Hat Linux} Linux, Red Hat
 

From 2e66a0d2601cd4275f039a7cc82c41e4add19f7f Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Wed, 24 May 2017 20:34:38 +0100
Subject: [PATCH 029/166] Fix a build failure under Visual Studio 2010.

Patch due to Brian K. White; we now condition our own declaration of
DLL_DIRECTORY_COOKIE on whether the toolchain's headers had #defined
it already, rather than trying to guess the answer to that from
version-number macros.

(Apparently everything that defines DLL_DIRECTORY_COOKIE does it by
does seem to work in all my tests.)
---
 windows/winstuff.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/windows/winstuff.h b/windows/winstuff.h
index dfa032f48..10fcdabaf 100644
--- a/windows/winstuff.h
+++ b/windows/winstuff.h
@@ -533,8 +533,9 @@ GLOBAL int restricted_acl;
 #ifndef LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR
 #define LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR 0x00000100
 #endif
-#if _MSC_VER < 1400
+#ifndef DLL_DIRECTORY_COOKIE
 typedef PVOID DLL_DIRECTORY_COOKIE;
+DECLSPEC_IMPORT DLL_DIRECTORY_COOKIE WINAPI AddDllDirectory (PCWSTR NewDirectory);
 #endif
 
 /*

From 8d2755c55f9d8b854ef9051937ececb23c5a4b23 Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Thu, 25 May 2017 08:17:42 +0100
Subject: [PATCH 030/166] Under clang-cl, include stdint.h regardless of
 _MSC_VER.

stdint.h is one of the set of standard C headers that has more to do
with the compiler than the library, and hence, clang provides its own
version of it, even when you're using it in clang-cl mode with Visual
Studio headers, and even when those headers are old enough not to have
a stdint.h of their own. So in clang builds, including stdint.h is
always the right way to get uintptr_t defined.
---
 windows/winstuff.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/windows/winstuff.h b/windows/winstuff.h
index 10fcdabaf..546c273b7 100644
--- a/windows/winstuff.h
+++ b/windows/winstuff.h
@@ -19,7 +19,7 @@
  * stddef.h. So here we try to make sure _some_ standard header is
  * included which defines uintptr_t. */
 #include <stddef.h>
-#if !defined _MSC_VER || _MSC_VER >= 1600
+#if !defined _MSC_VER || _MSC_VER >= 1600 || defined __clang__
 #include <stdint.h>
 #endif
 

From f02587f7ac4f47982bf97674f5499dd3b6dede4b Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Thu, 25 May 2017 08:21:19 +0100
Subject: [PATCH 031/166] Makefile.clangcl: provide a way to tell lld-link
 about crt0.obj.

I've been experimenting with using clang-cl with older versions of the
Visual Studio libraries and headers, and found that the older VS
libraries have a quirk which can cause link failure in a way that
doesn't happen with the newer one. I assume the corresponding old VS
linker must be doing some kind of special-case handling that lld isn't
mimicking.

The quirk arises because lld tries to pull in more than one of the
*crt0.obj startup objects which set things up before calling main or
WinMain (or whatever), and those objects define some of the same
symbols as each other. The fix is to explicitly ask for the right one
of those objects on the link command line, so that it's already been
loaded _before_ the linker starts searching libraries for unresolved
symbols; then the disputed symbols are never unresolved in the first
place during the library search phase.

But this means you have to pick your crt0 object differently depending
on which subsystem you're compiling for. Accordingly, here's an extra
feature in Makefile.clangcl to make that possible by means of the
right definitions on the make command line.
---
 mkfiles.pl | 28 +++++++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/mkfiles.pl b/mkfiles.pl
index 8a63c65dc..1d83912bd 100755
--- a/mkfiles.pl
+++ b/mkfiles.pl
@@ -492,6 +492,31 @@ sub manpages {
     #       paths in $LIB) it's reasonable to have the choice of
     #       compilation target driven by another environment variable
     #       set in parallel with that one.
+    #  - for older versions of the VS libraries you may also have to
+    #    set EXTRA_console and/or EXTRA_windows to the name of an
+    #    object file manually extracted from one of those libraries.
+    #     * This is because old VS seems to manage its startup code by
+    #       having libcmt.lib contain lots of *crt0.obj objects, one
+    #       for each possible user entry point (main, WinMain and the
+    #       wide-char versions of both), of which the linker arranges
+    #       to include the right one by special-case code. But lld
+    #       only seems to mimic half of that code - it does include
+    #       the right crt0 object, but it doesn't also deliberately
+    #       _avoid_ including the _wrong_ ones, and since all those
+    #       objects define a common set of global symbols for other
+    #       parts of the library to use, lld may well select an
+    #       arbitrary one of them the first time it sees a reference
+    #       to one of those global symbols, and then later also select
+    #       the _right_ one for the application's entry point, causing
+    #       a multiple-definitions crash.
+    #     * So the workaround is to explicitly include the right
+    #       *crt0.obj file on the linker command line before lld even
+    #       begins searching libraries. Hence, for a console
+    #       application, you might extract crt0.obj from the library
+    #       in question and set EXTRA_console=crt0.obj, and for a GUI
+    #       application, do the same with wincrt0.obj. Then this
+    #       makefile will include the right one of those objects
+    #       alongside the matching /subsystem linker option.
 
     open OUT, ">$makefiles{'clangcl'}"; select OUT;
     print
@@ -539,7 +564,8 @@ sub manpages {
 	print &splitline("\t\$(LD) \$(LFLAGS) \$(XLFLAGS) ".
                          "/out:\$(BUILDDIR)$prog.exe ".
                          "/lldmap:\$(BUILDDIR)$prog.map ".
-                         "/subsystem:$subsys\$(SUBSYSVER) $objstr")."\n\n";
+                         "/subsystem:$subsys\$(SUBSYSVER) ".
+                         "\$(EXTRA_$subsys) $objstr")."\n\n";
     }
     foreach $d (&deps("\$(BUILDDIR)X.obj", "\$(BUILDDIR)X.res.o", $dirpfx, "/", "vc")) {
         $extradeps = $forceobj{$d->{obj_orig}} ? ["*.c","*.h","*.rc"] : [];

From eda5364eb476d4771e1f5a35ff81f50b4e309135 Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Thu, 25 May 2017 08:22:22 +0100
Subject: [PATCH 032/166] Use / in pathnames in the Wix installer source.

I've also been experimenting recently with running Wix on Linux under
Mono, rather than running it on Windows in the obvious way. Wix under
Mono insists on forward slashes in pathnames, and it turns out that
Wix on Windows doesn't object to them either, so I can safely change
them over unconditionally and then my installer source will work in
both modes.
---
 windows/installer.wxs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/windows/installer.wxs b/windows/installer.wxs
index 4a720e404..e3ed8c711 100644
--- a/windows/installer.wxs
+++ b/windows/installer.wxs
@@ -191,7 +191,7 @@ https://msdn.microsoft.com/en-us/library/windows/desktop/dd391569(v=vs.85).aspx
           <Component Id="HelpFile_Component"
                      Guid="$(var.HelpFile_Component_GUID)">
             <File Id="HelpFile_File"
-                  Source="..\doc\putty.chm" KeyPath="yes">
+                  Source="../doc/putty.chm" KeyPath="yes">
               <Shortcut Id="startmenuManual" Directory="ProgramMenuDir"
                         Name="PuTTY Manual"
                         Advertise="no" />
@@ -209,7 +209,7 @@ https://msdn.microsoft.com/en-us/library/windows/desktop/dd391569(v=vs.85).aspx
           <Component Id="LICENCE_Component"
                      Guid="$(var.LICENCE_Component_GUID)">
             <File Id="LICENCE_File"
-                  Source="..\LICENCE" KeyPath="yes" />
+                  Source="../LICENCE" KeyPath="yes" />
           </Component>
           <Component Id="README_Component"
                      Guid="$(var.README_Component_GUID)">

From bbdb527d4dc0eeabd083242d10faa1a2aad28e5d Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Sat, 27 May 2017 20:05:07 +0100
Subject: [PATCH 033/166] Turn off the Inno Setup installer build.

We've been planning to do that for a while, and this installer-builder
isn't going to work anyway in the build environment I'm about to move
everything to, so this seems like the moment.
---
 Buildscr | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/Buildscr b/Buildscr
index de7f41b57..8bd680dfe 100644
--- a/Buildscr
+++ b/Buildscr
@@ -177,11 +177,8 @@ delegate windows
   in putty/windows with wix do/win candle -arch x86 -dWin64=no -dBuilddir=build32\ -dWinver="$(Winver)" -dPuttytextver="$(Puttytextver)" installer.wxs && light -ext WixUIExtension -ext WixUtilExtension -sval installer.wixobj -o installer32.msi
   in putty/windows with wix do/win candle -arch x64 -dWin64=yes -dBuilddir=build64\ -dWinver="$(Winver)" -dPuttytextver="$(Puttytextver)" installer.wxs && light -ext WixUIExtension -ext WixUtilExtension -sval installer.wixobj -o installer64.msi
 
-  # Build the old Inno Setup installer, for 32-bit only.
-  in putty/windows with innosetup do/win iscc putty.iss
-
   # Sign the installers.
-  ifneq "$(winsigncode)" "" in putty/windows do $(winsigncode) -i https://www.chiark.greenend.org.uk/~sgtatham/putty/ -n "PuTTY Installer" installer32.msi installer64.msi Output/installer.exe
+  ifneq "$(winsigncode)" "" in putty/windows do $(winsigncode) -i https://www.chiark.greenend.org.uk/~sgtatham/putty/ -n "PuTTY Installer" installer32.msi installer64.msi
 
   # Finished Windows builds.
   return putty/windows/buildold/*.exe
@@ -192,7 +189,6 @@ delegate windows
   return putty/windows/build64/*.map
   return putty/windows/installer32.msi
   return putty/windows/installer64.msi
-  return putty/windows/Output/installer.exe
 enddelegate
 in putty/doc do make mostlyclean
 in putty/doc do make $(Docmakever)
@@ -210,7 +206,6 @@ deliver putty/windows/build64/*.exe putty/w64/$@
 deliver putty/windows/build64/putty.zip putty/w64/$@
 deliver putty/windows/installer32.msi putty/w32/$(Ifilename32).msi
 deliver putty/windows/installer64.msi putty/w64/$(Ifilename64).msi
-deliver putty/windows/Output/installer.exe putty/w32/$(Ifilename32).exe
 deliver putty/doc/puttydoc.zip putty/$@
 deliver putty/doc/putty.chm putty/$@
 deliver putty/doc/putty.hlp putty/$@

From 599ca6d726fa9c251fda6b45fd5161878a208c53 Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Sat, 27 May 2017 20:06:11 +0100
Subject: [PATCH 034/166] Build using clang-cl instead of Visual Studio.

This permits me to do the binary builds via cross-compilation on
Linux, which is nice from a perspective of not having my build
environment subject to the same potential pool of Windows malware that
might be interested in infecting the resulting binaries. Also, it's
quicker to build and the code generation is noticeably better.
---
 Buildscr | 51 ++++++++++++++++++++++++++++-----------------------
 1 file changed, 28 insertions(+), 23 deletions(-)

diff --git a/Buildscr b/Buildscr
index 8bd680dfe..4cbf6c417 100644
--- a/Buildscr
+++ b/Buildscr
@@ -156,37 +156,42 @@ in putty/icons do make
 in putty do convert -size 164x312 'gradient:blue-white' -distort SRT -90 -swirl 180 \( -size 329x312 canvas:white \) +append \( icons/putty-48.png -geometry +28+24 \) -composite \( icons/pscp-48.png -geometry +88+96 \) -composite \( icons/puttygen-48.png -geometry +28+168 \) -composite \( icons/pageant-48.png -geometry +88+240 \) -composite windows/msidialog.bmp
 in putty do convert -size 493x58 canvas:white \( icons/putty-48.png -geometry +440+5 \) -composite windows/msibanner.bmp
 
-delegate windows
-  # Build the original binaries.
-  in putty/windows with visualstudio do/win mkdir buildold && nmake -f Makefile.vc BUILDDIR=buildold\ $(Makeargs) all cleantestprogs
-
-  # Build the VS2015 binaries. For the 32-bit ones, we set a subsystem
-  # version of 5.01, which allows the resulting files to still run on
-  # Windows XP.
-  in putty/windows with visualstudio2015_32bit do/win mkdir build32 && nmake -f Makefile.vc BUILDDIR=build32\ SUBSYSVER=,5.01 $(Makeargs) all cleantestprogs
-  in putty/windows with visualstudio2015_64bit do/win mkdir build64 && nmake -f Makefile.vc BUILDDIR=build64\ $(Makeargs) all cleantestprogs
-
-  # Code-sign the binaries, if the local bob config provides a script
-  # to do so. We assume here that the script accepts an -i option to
-  # provide a 'more info' URL, and an optional -n option to provide a
-  # program name, and that it can take multiple .exe filename
-  # arguments and sign them all in place.
-  ifneq "$(winsigncode)" "" in putty/windows do $(winsigncode) -i https://www.chiark.greenend.org.uk/~sgtatham/putty/ build*/*.exe
+# Build the standard binaries, in both 32- and 64-bit flavours.
+#
+# For the 32-bit ones, we set a subsystem version of 5.01, which
+# allows the resulting files to still run on Windows XP.
+in putty/windows with clangcl32 do mkdir build32 && Platform=x86 make -f Makefile.clangcl BUILDDIR=build32/ SUBSYSVER=,5.01 $(Makeargs) all cleantestprogs
+in putty/windows with clangcl64 do mkdir build64 && Platform=x64 make -f Makefile.clangcl BUILDDIR=build64/ $(Makeargs) all cleantestprogs
+
+# Build the 'old' binaries, which should still run on all 32-bit
+# versions of Windows back to Win95 (but not Win32s). These link
+# against Visual Studio 2003 libraries (the more modern versions
+# assume excessively modern Win32 API calls to be available), specify
+# a subsystem version of 4.0, and compile with /arch:IA32 to prevent
+# the use of modern CPU features like MMX which older machines also
+# might not have.
+in putty/windows with clangcl32_2003 do mkdir buildold && Platform=x86 make -f Makefile.clangcl BUILDDIR=buildold/ $(Makeargs) CCTARGET=i386-pc-windows-msvc13.0.0 SUBSYSVER=,4.0 EXTRA_windows=wincrt0.obj EXTRA_console=crt0.obj XFLAGS=/arch:IA32 all cleantestprogs
+
+# Code-sign the Windows binaries, if the local bob config provides a
+# script to do so in a cross-compiling way. We assume here that the
+# script accepts an -i option to provide a 'more info' URL, an
+# optional -n option to provide a program name, and an -N option to
+# take the program name from an .exe's version resource, and that it
+# can accept multiple .exe or .msi filename arguments and sign them
+# all in place.
+ifneq "$(cross_winsigncode)" "" in putty/windows do $(cross_winsigncode) -N -i https://www.chiark.greenend.org.uk/~sgtatham/putty/ build*/*.exe
 
+delegate windows
   # Build a WiX MSI installer, for each of build32 and build64.
   in putty/windows with wix do/win candle -arch x86 -dWin64=no -dBuilddir=build32\ -dWinver="$(Winver)" -dPuttytextver="$(Puttytextver)" installer.wxs && light -ext WixUIExtension -ext WixUtilExtension -sval installer.wixobj -o installer32.msi
   in putty/windows with wix do/win candle -arch x64 -dWin64=yes -dBuilddir=build64\ -dWinver="$(Winver)" -dPuttytextver="$(Puttytextver)" installer.wxs && light -ext WixUIExtension -ext WixUtilExtension -sval installer.wixobj -o installer64.msi
 
-  # Sign the installers.
+  # Sign the installers, if the local bob config provides
+  # $(winsigncode) that can run in a Windows delegation and behaves
+  # the same as $(cross_winsigncode) used above.
   ifneq "$(winsigncode)" "" in putty/windows do $(winsigncode) -i https://www.chiark.greenend.org.uk/~sgtatham/putty/ -n "PuTTY Installer" installer32.msi installer64.msi
 
   # Finished Windows builds.
-  return putty/windows/buildold/*.exe
-  return putty/windows/buildold/*.map
-  return putty/windows/build32/*.exe
-  return putty/windows/build32/*.map
-  return putty/windows/build64/*.exe
-  return putty/windows/build64/*.map
   return putty/windows/installer32.msi
   return putty/windows/installer64.msi
 enddelegate

From fd6898b5865b3f7fcccfe57c6ee272984f52a34f Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Sat, 27 May 2017 20:07:00 +0100
Subject: [PATCH 035/166] Build the MSI using Wix run on Linux via Mono.

I have a grubby method of getting this to work without Wine, which I
intend to get round to publishing just as soon as I finish deciding
what its best shape is. But I don't want to wait for that before
starting to actually use it, because this eliminates the last trace of
Windows in the PuTTY Windows builds.
---
 Buildscr | 21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/Buildscr b/Buildscr
index 4cbf6c417..ab94ea92f 100644
--- a/Buildscr
+++ b/Buildscr
@@ -181,20 +181,13 @@ in putty/windows with clangcl32_2003 do mkdir buildold && Platform=x86 make -f M
 # all in place.
 ifneq "$(cross_winsigncode)" "" in putty/windows do $(cross_winsigncode) -N -i https://www.chiark.greenend.org.uk/~sgtatham/putty/ build*/*.exe
 
-delegate windows
-  # Build a WiX MSI installer, for each of build32 and build64.
-  in putty/windows with wix do/win candle -arch x86 -dWin64=no -dBuilddir=build32\ -dWinver="$(Winver)" -dPuttytextver="$(Puttytextver)" installer.wxs && light -ext WixUIExtension -ext WixUtilExtension -sval installer.wixobj -o installer32.msi
-  in putty/windows with wix do/win candle -arch x64 -dWin64=yes -dBuilddir=build64\ -dWinver="$(Winver)" -dPuttytextver="$(Puttytextver)" installer.wxs && light -ext WixUIExtension -ext WixUtilExtension -sval installer.wixobj -o installer64.msi
-
-  # Sign the installers, if the local bob config provides
-  # $(winsigncode) that can run in a Windows delegation and behaves
-  # the same as $(cross_winsigncode) used above.
-  ifneq "$(winsigncode)" "" in putty/windows do $(winsigncode) -i https://www.chiark.greenend.org.uk/~sgtatham/putty/ -n "PuTTY Installer" installer32.msi installer64.msi
-
-  # Finished Windows builds.
-  return putty/windows/installer32.msi
-  return putty/windows/installer64.msi
-enddelegate
+# Build a WiX MSI installer, for each of build32 and build64.
+in putty/windows with wixonlinux do candle -arch x86 -dWin64=no -dBuilddir=build32/ -dWinver="$(Winver)" -dPuttytextver="$(Puttytextver)" installer.wxs && light -ext WixUIExtension -ext WixUtilExtension -sval installer.wixobj -o installer32.msi -spdb
+in putty/windows with wixonlinux do candle -arch x64 -dWin64=yes -dBuilddir=build64/ -dWinver="$(Winver)" -dPuttytextver="$(Puttytextver)" installer.wxs && light -ext WixUIExtension -ext WixUtilExtension -sval installer.wixobj -o installer64.msi -spdb
+
+# Sign the Windows installers.
+ifneq "$(cross_winsigncode)" "" in putty/windows do $(cross_winsigncode) -i https://www.chiark.greenend.org.uk/~sgtatham/putty/ -n "PuTTY Installer" installer32.msi installer64.msi
+
 in putty/doc do make mostlyclean
 in putty/doc do make $(Docmakever)
 in putty/windows/buildold do zip -k -j putty.zip `ls *.exe | grep -v puttytel` ../../doc/putty.chm ../../doc/putty.hlp ../../doc/putty.cnt

From 1da3c71474aab3296a99ae0ed40e4fa1aa425185 Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Tue, 30 May 2017 22:49:25 +0100
Subject: [PATCH 036/166] Have clang-cl builds announce their _MSC_VER.

In particular, this means the w32 and w32old builds have
distinguishable buildinfo text, which should protect us against at
least one source of confusion when receiving bug reports.
---
 misc.c | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/misc.c b/misc.c
index 9aff234b9..734ea8b19 100644
--- a/misc.c
+++ b/misc.c
@@ -1165,11 +1165,21 @@ char *buildinfo(const char *newline)
                 BUILDINFO_PLATFORM);
 
 #ifdef __clang_version__
+#define FOUND_COMPILER
     strbuf_catf(buf, "%sCompiler: clang %s", newline, __clang_version__);
 #elif defined __GNUC__ && defined __VERSION__
+#define FOUND_COMPILER
     strbuf_catf(buf, "%sCompiler: gcc %s", newline, __VERSION__);
-#elif defined _MSC_VER
-    strbuf_catf(buf, "%sCompiler: Visual Studio", newline);
+#endif
+
+#if defined _MSC_VER
+#ifndef FOUND_COMPILER
+#define FOUND_COMPILER
+    strbuf_catf(buf, "%sCompiler: ", newline);
+#else
+    strbuf_catf(buf, ", emulating ");
+#endif
+    strbuf_catf(buf, "Visual Studio", newline);
 #if _MSC_VER == 1900
     strbuf_catf(buf, " 2015 / MSVC++ 14.0");
 #elif _MSC_VER == 1800
@@ -1178,12 +1188,14 @@ char *buildinfo(const char *newline)
     strbuf_catf(buf, " 2012 / MSVC++ 11.0");
 #elif _MSC_VER == 1600
     strbuf_catf(buf, " 2010 / MSVC++ 10.0");
-#elif  _MSC_VER == 1500
+#elif _MSC_VER == 1500
     strbuf_catf(buf, " 2008 / MSVC++ 9.0");
-#elif  _MSC_VER == 1400
+#elif _MSC_VER == 1400
     strbuf_catf(buf, " 2005 / MSVC++ 8.0");
-#elif  _MSC_VER == 1310
+#elif _MSC_VER == 1310
     strbuf_catf(buf, " 2003 / MSVC++ 7.1");
+#elif _MSC_VER == 1300
+    strbuf_catf(buf, " 2003 / MSVC++ 7.0");
 #else
     strbuf_catf(buf, ", unrecognised version");
 #endif

From 05f499e55f19b82c773559ee4465ba11c898c9eb Mon Sep 17 00:00:00 2001
From: Jacob Nevins <jacobn@chiark.greenend.org.uk>
Date: Tue, 6 Jun 2017 09:34:21 +0100
Subject: [PATCH 037/166] Add 'passthrough printing' as an index term.

---
 doc/config.but | 4 ++--
 doc/index.but  | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/doc/config.but b/doc/config.but
index bb18b794b..bd12efb28 100644
--- a/doc/config.but
+++ b/doc/config.but
@@ -499,8 +499,8 @@ instead of relying on the automatic detection.
 \cfg{winhelp-topic}{terminal.printing}
 
 A lot of VT100-compatible terminals support printing under control
-of the remote server. PuTTY supports this feature as well, but it is
-turned off by default.
+of the remote server (sometimes called \q{passthrough printing}).
+PuTTY supports this feature as well, but it is turned off by default.
 
 To enable remote-controlled printing, choose a printer from the
 \q{Printer to send ANSI printer output to} drop-down list box. This
diff --git a/doc/index.but b/doc/index.but
index 30ebd7845..0877ee90d 100644
--- a/doc/index.but
+++ b/doc/index.but
@@ -340,6 +340,7 @@ saved sessions from
 \IM{remote-controlled printing} ANSI printing
 \IM{remote-controlled printing} remote-controlled printing
 \IM{remote-controlled printing} printing, remote-controlled
+\IM{remote-controlled printing} passthrough printing
 
 \IM{Home and End keys} Home key
 \IM{Home and End keys} End key

From 6aac4b9cefbaa651639ef0495ebf9d098e67481c Mon Sep 17 00:00:00 2001
From: Jacob Nevins <jacobn@chiark.greenend.org.uk>
Date: Wed, 7 Jun 2017 22:02:28 +0100
Subject: [PATCH 038/166] StartDocPrinter returns DWORD, not BOOL.

(Introduced in 793ac8727.)
---
 windows/winprint.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/windows/winprint.c b/windows/winprint.c
index 115872739..a17166e69 100644
--- a/windows/winprint.c
+++ b/windows/winprint.c
@@ -23,7 +23,7 @@ DECL_WINDOWS_FUNCTION(static, BOOL, EnumPrinters,
 DECL_WINDOWS_FUNCTION(static, BOOL, OpenPrinter,
                       (LPTSTR, LPHANDLE, LPPRINTER_DEFAULTS));
 DECL_WINDOWS_FUNCTION(static, BOOL, ClosePrinter, (HANDLE));
-DECL_WINDOWS_FUNCTION(static, BOOL, StartDocPrinter, (HANDLE, DWORD, LPBYTE));
+DECL_WINDOWS_FUNCTION(static, DWORD, StartDocPrinter, (HANDLE, DWORD, LPBYTE));
 DECL_WINDOWS_FUNCTION(static, BOOL, EndDocPrinter, (HANDLE));
 DECL_WINDOWS_FUNCTION(static, BOOL, StartPagePrinter, (HANDLE));
 DECL_WINDOWS_FUNCTION(static, BOOL, EndPagePrinter, (HANDLE));

From f31a72ba09d20e076f62e39e0f59404511bf6c86 Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Sat, 10 Jun 2017 11:29:21 +0100
Subject: [PATCH 039/166] Unix: use conf_dest() in 'unable to open connection'
 error box.

Alamy Liu points out that asking for CONF_host will display the wrong
part of the configuration in the case where serial port setup fails.
The Windows front end's analogous message already got this right, but
I must have forgotten to change this one too when I introduced
conf_dest.
---
 unix/gtkwin.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/unix/gtkwin.c b/unix/gtkwin.c
index f54289a36..9e73181e2 100644
--- a/unix/gtkwin.c
+++ b/unix/gtkwin.c
@@ -4274,7 +4274,7 @@ static void start_backend(struct gui_data *inst)
 
     if (error) {
 	char *msg = dupprintf("Unable to open connection to %s:\n%s",
-			      conf_get_str(inst->conf, CONF_host), error);
+			      conf_dest(inst->conf), error);
 	inst->exited = TRUE;
 	fatal_message_box(inst->window, msg);
 	sfree(msg);

From a9e1053c8ae29c80cf0827c346e7dac976fb949b Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Thu, 15 Jun 2017 18:58:01 +0100
Subject: [PATCH 040/166] Log the server's diagnostics if main channel open
 fails.

This has been a FIXME in the code for ages, because back when the main
channel was always a pty session or a program run in a pipe, there
weren't that many circumstances in which the actual CHANNEL_OPEN could
return failure, so it never seemed like a priority to get round to
pulling the error information out of the CHANNEL_OPEN_FAILURE response
message and including it in PuTTY or Plink's local error message.

However, 'plink -nc' is the real reason why this is actually
important; if you tell the SSH server to make a direct-tcpip network
connection as its main channel, then that can fail for all the usual
network-unreliability reasons, and you actually do want to know which
(did you misspell the hostname, or is the target server refusing
connections, or has network connectivity failed?). This actually bit
me today when I had such a network failure, and had to debug it by
pulling that information manually out of a packet log. Time to
eliminate that FIXME.

So I've pulled the error-extracting code out of the previous handler
for OPEN_FAILURE on non-main channels into a separate function, and
arranged to call that function if the main channel open fails too. In
the process I've made a couple of minor tweaks, e.g. if the server
sends back a reason code we haven't heard of, we say _what_ that
reason code was, and also we at least make a token effort to spot if
we see a packet other than OPEN_{CONFIRMATION,FAILURE} reaching the
main loop in response to the main channel-open.
---
 ssh.c | 61 ++++++++++++++++++++++++++++++++++++++++-------------------
 1 file changed, 42 insertions(+), 19 deletions(-)

diff --git a/ssh.c b/ssh.c
index b6298b039..1d80e9194 100644
--- a/ssh.c
+++ b/ssh.c
@@ -8496,18 +8496,37 @@ static void ssh2_msg_channel_open_confirmation(Ssh ssh, struct Packet *pktin)
         ssh_channel_try_eof(c);        /* in case we had a pending EOF */
 }
 
-static void ssh2_msg_channel_open_failure(Ssh ssh, struct Packet *pktin)
+static char *ssh2_channel_open_failure_error_text(struct Packet *pktin)
 {
     static const char *const reasons[] = {
-	"<unknown reason code>",
-	    "Administratively prohibited",
-	    "Connect failed",
-	    "Unknown channel type",
-	    "Resource shortage",
+        NULL,
+        "Administratively prohibited",
+        "Connect failed",
+        "Unknown channel type",
+        "Resource shortage",
     };
     unsigned reason_code;
+    const char *reason_code_string;
+    char reason_code_buf[256];
     char *reason_string;
     int reason_length;
+
+    reason_code = ssh_pkt_getuint32(pktin);
+    if (reason_code < lenof(reasons) && reasons[reason_code]) {
+        reason_code_string = reasons[reason_code];
+    } else {
+        reason_code_string = reason_code_buf;
+        sprintf(reason_code_buf, "unknown reason code %#x", reason_code);
+    }
+
+    ssh_pkt_getstring(pktin, &reason_string, &reason_length);
+
+    return dupprintf("%s [%.*s]", reason_code_string,
+                     reason_length, NULLTOEMPTY(reason_string));
+}
+
+static void ssh2_msg_channel_open_failure(Ssh ssh, struct Packet *pktin)
+{
     struct ssh_channel *c;
 
     c = ssh_channel_msg(ssh, pktin);
@@ -8516,14 +8535,9 @@ static void ssh2_msg_channel_open_failure(Ssh ssh, struct Packet *pktin)
     assert(c->halfopen); /* ssh_channel_msg will have enforced this */
 
     if (c->type == CHAN_SOCKDATA) {
-        reason_code = ssh_pkt_getuint32(pktin);
-        if (reason_code >= lenof(reasons))
-            reason_code = 0; /* ensure reasons[reason_code] in range */
-        ssh_pkt_getstring(pktin, &reason_string, &reason_length);
-        logeventf(ssh, "Forwarded connection refused by server: %s [%.*s]",
-                  reasons[reason_code], reason_length,
-                  NULLTOEMPTY(reason_string));
-
+        char *errtext = ssh2_channel_open_failure_error_text(pktin);
+        logeventf(ssh, "Forwarded connection refused by server: %s", errtext);
+        sfree(errtext);
         pfd_close(c->u.pfd.pf);
     } else if (c->type == CHAN_ZOMBIE) {
         /*
@@ -10727,15 +10741,24 @@ static void do_ssh2_authconn(Ssh ssh, const unsigned char *in, int inlen,
 	    ssh->ncmode = FALSE;
 	}
 	crWaitUntilV(pktin);
-	if (pktin->type != SSH2_MSG_CHANNEL_OPEN_CONFIRMATION) {
-	    bombout(("Server refused to open channel"));
+        if (pktin->type != SSH2_MSG_CHANNEL_OPEN_CONFIRMATION &&
+            pktin->type != SSH2_MSG_CHANNEL_OPEN_FAILURE) {
+            bombout(("Server sent strange packet %d in response to main "
+                     "channel open request", pktin->type));
 	    crStopV;
-	    /* FIXME: error data comes back in FAILURE packet */
-	}
+        }
 	if (ssh_pkt_getuint32(pktin) != ssh->mainchan->localid) {
-	    bombout(("Server's channel confirmation cited wrong channel"));
+	    bombout(("Server's response to main channel open cited wrong"
+                     " channel number"));
+	    crStopV;
+	}
+	if (pktin->type == SSH2_MSG_CHANNEL_OPEN_FAILURE) {
+            char *errtext = ssh2_channel_open_failure_error_text(pktin);
+            bombout(("Server refused to open main channel: %s", errtext));
+            sfree(errtext);
 	    crStopV;
 	}
+
 	ssh->mainchan->remoteid = ssh_pkt_getuint32(pktin);
 	ssh->mainchan->halfopen = FALSE;
 	ssh->mainchan->type = CHAN_MAINSESSION;

From 892d4a0188ffd8aa60dc11b4bace30dfb0f9d50e Mon Sep 17 00:00:00 2001
From: Jacob Nevins <jacobn@chiark.greenend.org.uk>
Date: Thu, 15 Jun 2017 23:33:57 +0100
Subject: [PATCH 041/166] Seek all Windows print functions in winspool.drv.

Rather than loading some from spoolss.dll, which some MSDN documentation
suggests, but which doesn't work very well in practice.
(Also, remove an unused variable.)
---
 windows/winprint.c | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/windows/winprint.c b/windows/winprint.c
index a17166e69..6a1a74c23 100644
--- a/windows/winprint.c
+++ b/windows/winprint.c
@@ -33,20 +33,25 @@ DECL_WINDOWS_FUNCTION(static, BOOL, WritePrinter,
 static void init_winfuncs(void)
 {
     static int initialised = FALSE;
-    char buf[4096];
     if (initialised)
         return;
     {
         HMODULE winspool_module = load_system32_dll("winspool.drv");
-        HMODULE spoolss_module = load_system32_dll("spoolss.dll");
+        /* Some MSDN documentation claims that some of the below functions
+         * should be loaded from spoolss.dll, but this doesn't seem to
+         * be reliable in practice.
+         * Nevertheless, we load spoolss.dll ourselves using our safe
+         * loading method, against the possibility that winspool.drv
+         * later loads it unsafely. */
+        (void) load_system32_dll("spoolss.dll");
         GET_WINDOWS_FUNCTION_PP(winspool_module, EnumPrinters);
         GET_WINDOWS_FUNCTION_PP(winspool_module, OpenPrinter);
-        GET_WINDOWS_FUNCTION_PP(spoolss_module, ClosePrinter);
+        GET_WINDOWS_FUNCTION_PP(winspool_module, ClosePrinter);
         GET_WINDOWS_FUNCTION_PP(winspool_module, StartDocPrinter);
-        GET_WINDOWS_FUNCTION_PP(spoolss_module, EndDocPrinter);
-        GET_WINDOWS_FUNCTION_PP(spoolss_module, StartPagePrinter);
-        GET_WINDOWS_FUNCTION_PP(spoolss_module, EndPagePrinter);
-        GET_WINDOWS_FUNCTION_PP(spoolss_module, WritePrinter);
+        GET_WINDOWS_FUNCTION_PP(winspool_module, EndDocPrinter);
+        GET_WINDOWS_FUNCTION_PP(winspool_module, StartPagePrinter);
+        GET_WINDOWS_FUNCTION_PP(winspool_module, EndPagePrinter);
+        GET_WINDOWS_FUNCTION_PP(winspool_module, WritePrinter);
     }
     initialised = TRUE;
 }

From 4387b5f1617bf0222fc64e3ec73d14e252465309 Mon Sep 17 00:00:00 2001
From: Ilya Shipitsin <chipitsine@gmail.com>
Date: Mon, 19 Jun 2017 20:57:28 +0500
Subject: [PATCH 042/166] resolve an issue found by cppcheck:

[unix/osxlaunch.c:133] -> [unix/osxlaunch.c:134]: (warning) Either the condition '!qhead' is redundant or there is possible null pointer dereference: qhead.
---
 unix/osxlaunch.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/unix/osxlaunch.c b/unix/osxlaunch.c
index 2627c642e..285161853 100644
--- a/unix/osxlaunch.c
+++ b/unix/osxlaunch.c
@@ -130,11 +130,11 @@ char *get_unused_env_prefix(void)
     char **e;
 
     qhead = (struct bucket *)malloc(sizeof(struct bucket));
-    qhead->prefixlen = 0;
     if (!qhead) {
         fprintf(stderr, "out of memory\n");
         exit(1);
     }
+    qhead->prefixlen = 0;
     for (e = environ; *e; e++)
         qhead->first_node = new_node(qhead->first_node, *e, strcspn(*e, "="));
 

From 5efee183569ede0a4155f8195e1b1be58e954b95 Mon Sep 17 00:00:00 2001
From: Ilya Shipitsin <chipitsine@gmail.com>
Date: Mon, 19 Jun 2017 21:39:32 +0500
Subject: [PATCH 043/166] resolve couple of issues found by cppcheck:

[psftp.c:1135] -> [psftp.c:1134]: (warning) Either the condition '!dir' is redundant or there is possible null pointer dereference: dir.
[psftp.c:1420] -> [psftp.c:1419]: (warning) Either the condition '!dir' is redundant or there is possible null pointer dereference: dir.
---
 psftp.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/psftp.c b/psftp.c
index 5394c1fbb..aa3971812 100644
--- a/psftp.c
+++ b/psftp.c
@@ -1128,12 +1128,12 @@ int sftp_cmd_cd(struct sftp_command *cmd)
 
     if (cmd->nwords < 2)
 	dir = dupstr(homedir);
-    else
+    else {
 	dir = canonify(cmd->words[1]);
-
-    if (!dir) {
-	printf("%s: canonify: %s\n", dir, fxp_error());
-	return 0;
+        if (!dir) {
+            printf("%s: canonify: %s\n", cmd->words[1], fxp_error());
+            return 0;
+        }
     }
 
     req = fxp_opendir_send(dir);
@@ -1417,7 +1417,7 @@ int sftp_cmd_mkdir(struct sftp_command *cmd)
     for (i = 1; i < cmd->nwords; i++) {
 	dir = canonify(cmd->words[i]);
 	if (!dir) {
-	    printf("%s: canonify: %s\n", dir, fxp_error());
+	    printf("%s: canonify: %s\n", cmd->words[i], fxp_error());
 	    return 0;
 	}
 

From 3f2df8cc9dc6ae19c6513091eb009999f4406a60 Mon Sep 17 00:00:00 2001
From: Ilya Shipitsin <chipitsine@gmail.com>
Date: Mon, 19 Jun 2017 21:42:16 +0500
Subject: [PATCH 044/166] resolve (no real impact) issue found by cppcheck:

[unix/osxlaunch.c:411]: (error) Memory leak: macos
[unix/osxlaunch.c:411]: (error) Memory leak: contents
[unix/osxlaunch.c:411]: (error) Memory leak: new_argv
---
 unix/osxlaunch.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/unix/osxlaunch.c b/unix/osxlaunch.c
index 285161853..8082f2dee 100644
--- a/unix/osxlaunch.c
+++ b/unix/osxlaunch.c
@@ -408,6 +408,9 @@ int main(int argc, char **argv)
 
     execv(realbin, new_argv);
     perror("execv");
+    free(new_argv);
+    free(contents);
+    free(macos);
     return 127;
 }
 

From 02043ec5ace4985fc35fef8b5d6543a871ccab3c Mon Sep 17 00:00:00 2001
From: Ilya Shipitsin <chipitsine@gmail.com>
Date: Tue, 20 Jun 2017 09:36:07 +0500
Subject: [PATCH 045/166] resolve (no real impact) issue found by cppcheck:

[windows/winnet.c:589]: (error) Uninitialized variable: err
---
 windows/winnet.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/windows/winnet.c b/windows/winnet.c
index ea950bba2..e2edc87a7 100644
--- a/windows/winnet.c
+++ b/windows/winnet.c
@@ -548,7 +548,7 @@ SockAddr sk_namelookup(const char *host, char **canonicalname,
 
     if ((a = p_inet_addr(host)) == (unsigned long) INADDR_NONE) {
 	struct hostent *h = NULL;
-	int err;
+	int err = 0;
 #ifndef NO_IPV6
 	/*
 	 * Use getaddrinfo when it's available

From 20e36ae4a24e06f86ce533a24c5f61f00e2ab91c Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Tue, 20 Jun 2017 07:05:39 +0100
Subject: [PATCH 046/166] Fix a collection of type / format string mismatches.

Ilya Shipitsin sent me a list of errors reported by a tool 'cppcheck',
which I hadn't seen before, together with some fixes for things
already taken off that list. This change picks out all the things from
the remaining list that I could quickly identify as actual errors,
which it turns out are all format-string goofs along the lines of
using a %d with an unsigned int, or a %u with a signed int, or (in the
cases in charset/utf8.c) an actual _size_ mismatch which could in
principle have caused trouble on a big-endian target.
---
 charset/utf8.c   | 4 ++--
 import.c         | 3 ++-
 minibidi.c       | 2 +-
 misc.c           | 3 ++-
 pscp.c           | 2 +-
 terminal.c       | 2 +-
 windows/window.c | 4 ++--
 7 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/charset/utf8.c b/charset/utf8.c
index 3c777292d..fe46cf988 100644
--- a/charset/utf8.c
+++ b/charset/utf8.c
@@ -267,7 +267,7 @@ void utf8_read_test(int line, char *input, int inlen, ...)
 	}
 	if (l != str[i]) {
 	    printf("%d: char %d came out as %08x, should be %08x\n",
-		    line, i, str[i], l);
+                   line, i, str[i], (unsigned)l);
 	    total_errs++;
 	}
     }
@@ -306,7 +306,7 @@ void utf8_write_test(int line, const long *input, int inlen, ...)
 	}
 	if (l != str[i]) {
 	    printf("%d: char %d came out as %08x, should be %08x\n",
-		    line, i, str[i], l);
+                   line, i, str[i], (unsigned)l);
 	    total_errs++;
 	}
     }
diff --git a/import.c b/import.c
index adf68777d..88589a71d 100644
--- a/import.c
+++ b/import.c
@@ -445,7 +445,7 @@ static struct openssh_pem_key *load_openssh_pem_key(const Filename *filename,
 		if (!strcmp(p, "ENCRYPTED"))
 		    ret->encrypted = TRUE;
 	    } else if (!strcmp(line, "DEK-Info")) {
-		int i, j, ivlen;
+		int i, ivlen;
 
 		if (!strncmp(p, "DES-EDE3-CBC,", 13)) {
 		    ret->encryption = OP_E_3DES;
@@ -459,6 +459,7 @@ static struct openssh_pem_key *load_openssh_pem_key(const Filename *filename,
 		}
 		p = strchr(p, ',') + 1;/* always non-NULL, by above checks */
 		for (i = 0; i < ivlen; i++) {
+                    unsigned j;
 		    if (1 != sscanf(p, "%2x", &j)) {
 			errmsg = "expected more iv data in DEK-Info";
 			goto error;
diff --git a/minibidi.c b/minibidi.c
index 8d78594d2..2bdf4deb3 100644
--- a/minibidi.c
+++ b/minibidi.c
@@ -2014,7 +2014,7 @@ int main(int argc, char **argv)
 	unsigned long chr = strtoul(argv[i], NULL, 0);
 	int type = getType(chr);
 	assert(typetoname[type].type == type);
-	printf("U+%04x: %s\n", chr, typetoname[type].name);
+	printf("U+%04x: %s\n", (unsigned)chr, typetoname[type].name);
     }
 
     return 0;
diff --git a/misc.c b/misc.c
index 734ea8b19..469e4aeb6 100644
--- a/misc.c
+++ b/misc.c
@@ -157,7 +157,8 @@ int main(void)
             passes++;                                                   \
         } else {                                                        \
             printf("fail: %s(%s,%s)%s = %u, expected %u\n",             \
-                   #func, #string, #arg2, #suffix, ret, result);        \
+                   #func, #string, #arg2, #suffix, ret,                 \
+                   (unsigned)result);                                   \
             fails++;                                                    \
         }                                                               \
 } while (0)
diff --git a/pscp.c b/pscp.c
index 454ec084c..210362df9 100644
--- a/pscp.c
+++ b/pscp.c
@@ -1476,7 +1476,7 @@ int scp_get_sink_action(struct scp_sink_action *act)
 		act->action = SCP_SINK_ENDDIR;
 		return 0;
 	      case 'T':
-		if (sscanf(act->buf, "%ld %*d %ld %*d",
+		if (sscanf(act->buf, "%lu %*d %lu %*d",
 			   &act->mtime, &act->atime) == 2) {
 		    act->settime = 1;
 		    back->send(backhandle, "", 1);
diff --git a/terminal.c b/terminal.c
index f47fe1bdb..ba9dd6172 100644
--- a/terminal.c
+++ b/terminal.c
@@ -4327,7 +4327,7 @@ static void term_out(Terminal *term)
 			    for (i = 1; i < term->esc_nargs; i++) {
 				if (i != 1)
 				    strcat(term->id_string, ";");
-				sprintf(lbuf, "%d", term->esc_args[i]);
+				sprintf(lbuf, "%u", term->esc_args[i]);
 				strcat(term->id_string, lbuf);
 			    }
 			    strcat(term->id_string, "c");
diff --git a/windows/window.c b/windows/window.c
index 89ddb8636..966003114 100644
--- a/windows/window.c
+++ b/windows/window.c
@@ -5199,8 +5199,8 @@ void write_clip(void *frontend, wchar_t * data, int *attr, int len, int must_des
 		multilen = WideCharToMultiByte(CP_ACP, 0, unitab+uindex, 1,
 					       NULL, 0, NULL, NULL);
 		if (multilen != 1) {
-		    blen = sprintf(before, "{\\uc%d\\u%d", multilen,
-				   udata[uindex]);
+		    blen = sprintf(before, "{\\uc%d\\u%d", (int)multilen,
+				   (int)udata[uindex]);
 		    alen = 1; strcpy(after, "}");
 		} else {
 		    blen = sprintf(before, "\\u%d", udata[uindex]);

From 98cbe6963b8126659cf16c622302cbd872026936 Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Tue, 20 Jun 2017 19:02:13 +0100
Subject: [PATCH 047/166] Another format-string fix.

Oops - I found this in an editor autosave file after pushing the
previous commit. I meant it to be part of the previous commit. Oh
well, better late than never.
---
 tree234.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tree234.c b/tree234.c
index f1c0c2edb..d3c5293d8 100644
--- a/tree234.c
+++ b/tree234.c
@@ -681,7 +681,7 @@ static void *delpos234_internal(tree234 * t, int index)
 	    LOG(("  moving to subtree %d\n", ki));
 	    sub = n->kids[ki];
 	    if (!sub->elems[1]) {
-		LOG(("  subtree has only one element!\n", ki));
+		LOG(("  subtree has only one element!\n"));
 		if (ki > 0 && n->kids[ki - 1]->elems[1]) {
 		    /*
 		     * Case 3a, left-handed variant. Child ki has

From 4696f4a40bd38386dac5bc0f8331ca9c4e579bd6 Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Tue, 20 Jun 2017 19:02:48 +0100
Subject: [PATCH 048/166] Coverity build fixes.

Like every other toolchain I've tried, my Coverity scanning build has
its share of random objections to parts of my Windows API type-
checking system. I do wonder if that bright idea was worth the hassle
- but it would probably cost all the annoyance all over again to back
out now...
---
 windows/wincapi.c  |  9 ++++++++-
 windows/winhsock.c |  5 +++--
 windows/winmisc.c  |  8 +++++---
 windows/winnet.c   | 10 ++++++++++
 4 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/windows/wincapi.c b/windows/wincapi.c
index 2550b6def..2bd03470b 100644
--- a/windows/wincapi.c
+++ b/windows/wincapi.c
@@ -19,7 +19,14 @@ int got_crypt(void)
         attempted = TRUE;
         crypt = load_system32_dll("crypt32.dll");
         successful = crypt &&
-            GET_WINDOWS_FUNCTION(crypt, CryptProtectMemory);
+#ifdef COVERITY
+            /* The build toolchain I use with Coverity doesn't know
+             * about this function, so can't type-check it */
+            GET_WINDOWS_FUNCTION_NO_TYPECHECK(crypt, CryptProtectMemory)
+#else
+            GET_WINDOWS_FUNCTION(crypt, CryptProtectMemory)
+#endif
+            ;
     }
     return successful;
 }
diff --git a/windows/winhsock.c b/windows/winhsock.c
index 799fd28d5..7c8b0ba64 100644
--- a/windows/winhsock.c
+++ b/windows/winhsock.c
@@ -284,10 +284,11 @@ static char *sk_handle_peer_info(Socket s)
 
     if (!kernel32_module) {
         kernel32_module = load_system32_dll("kernel32.dll");
-#if (defined _MSC_VER && _MSC_VER < 1900) || defined __MINGW32__
+#if (defined _MSC_VER && _MSC_VER < 1900) || defined __MINGW32__ || defined COVERITY
         /* For older Visual Studio, and MinGW too (at least as of
          * Ubuntu 16.04), this function isn't available in the header
-         * files to type-check */
+         * files to type-check. Ditto the toolchain I use for
+         * Coveritying the Windows code. */
         GET_WINDOWS_FUNCTION_NO_TYPECHECK(
             kernel32_module, GetNamedPipeClientProcessId);
 #else
diff --git a/windows/winmisc.c b/windows/winmisc.c
index 85fa3c95d..59d643122 100644
--- a/windows/winmisc.c
+++ b/windows/winmisc.c
@@ -177,9 +177,11 @@ void dll_hijacking_protection(void)
 
     if (!kernel32_module) {
         kernel32_module = load_system32_dll("kernel32.dll");
-#if defined _MSC_VER && _MSC_VER < 1900
-        /* For older Visual Studio, this function isn't available in
-         * the header files to type-check */
+#if (defined _MSC_VER && _MSC_VER < 1900) || defined COVERITY
+        /* For older Visual Studio, and also for the system I
+         * currently use for Coveritying the Windows code, this
+         * function isn't available in the header files to
+         * type-check */
         GET_WINDOWS_FUNCTION_NO_TYPECHECK(
             kernel32_module, SetDefaultDllDirectories);
 #else
diff --git a/windows/winnet.c b/windows/winnet.c
index e2edc87a7..86f7735fa 100644
--- a/windows/winnet.c
+++ b/windows/winnet.c
@@ -305,11 +305,21 @@ void sk_init(void)
     GET_WINDOWS_FUNCTION(winsock_module, WSAStartup);
     GET_WINDOWS_FUNCTION(winsock_module, WSACleanup);
     GET_WINDOWS_FUNCTION(winsock_module, closesocket);
+#ifndef COVERITY
     GET_WINDOWS_FUNCTION(winsock_module, ntohl);
     GET_WINDOWS_FUNCTION(winsock_module, htonl);
     GET_WINDOWS_FUNCTION(winsock_module, htons);
     GET_WINDOWS_FUNCTION(winsock_module, ntohs);
     GET_WINDOWS_FUNCTION(winsock_module, gethostname);
+#else
+    /* The toolchain I use for Windows Coverity builds doesn't know
+     * the type signatures of these */
+    GET_WINDOWS_FUNCTION_NO_TYPECHECK(winsock_module, ntohl);
+    GET_WINDOWS_FUNCTION_NO_TYPECHECK(winsock_module, htonl);
+    GET_WINDOWS_FUNCTION_NO_TYPECHECK(winsock_module, htons);
+    GET_WINDOWS_FUNCTION_NO_TYPECHECK(winsock_module, ntohs);
+    GET_WINDOWS_FUNCTION_NO_TYPECHECK(winsock_module, gethostname);
+#endif
     GET_WINDOWS_FUNCTION(winsock_module, gethostbyname);
     GET_WINDOWS_FUNCTION(winsock_module, getservbyname);
     GET_WINDOWS_FUNCTION(winsock_module, inet_addr);

From d61897414cae6e40dc39da6aac84ab48c6cdf149 Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Tue, 20 Jun 2017 21:17:43 +0100
Subject: [PATCH 049/166] Fixes spotted by Coverity.

A lenof() being applied to a non-array, a couple of missing frees on
an error path, and a case in pfd_receive() where we could have gone
round a loop again after freeing the port forwarding structure it was
working on.
---
 config.c  | 2 +-
 portfwd.c | 1 +
 psftp.c   | 2 ++
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/config.c b/config.c
index 220c1aa8f..efe1ff1ec 100644
--- a/config.c
+++ b/config.c
@@ -1005,7 +1005,7 @@ static void ttymodes_handler(union control *ctrl, void *dlg,
 	    char type;
 
 	    {
-		const char *types = "ANV";
+                const char types[] = {'A', 'N', 'V'};
 		int button = dlg_radiobutton_get(td->valradio, dlg);
 		assert(button >= 0 && button < lenof(types));
 		type = types[button];
diff --git a/portfwd.c b/portfwd.c
index febd8af9b..b68e4bb8f 100644
--- a/portfwd.c
+++ b/portfwd.c
@@ -359,6 +359,7 @@ static void pfd_receive(Plug plug, int urgent, char *data, int len)
 	     * close the connection rudely.
 	     */
 	    pfd_close(pf);
+            break;
 	}
 	return;
 
diff --git a/psftp.c b/psftp.c
index aa3971812..e4e77c3af 100644
--- a/psftp.c
+++ b/psftp.c
@@ -1050,6 +1050,8 @@ int sftp_cmd_ls(struct sftp_command *cmd)
 
     if (dirh == NULL) {
 	printf("Unable to open %s: %s\n", dir, fxp_error());
+	sfree(cdir);
+	sfree(unwcdir);
 	return 0;
     } else {
 	nnames = namesize = 0;

From 4241734dde44caea5a9c73a79db9c6d4cae50861 Mon Sep 17 00:00:00 2001
From: David Taylor <davidt@yadt.uk>
Date: Sat, 1 Jul 2017 23:25:49 +0100
Subject: [PATCH 050/166] Update wcwidth.c with Unicode 9.0.0 data

In order to maintain compatibility with screen[1], update
wcwidth functions to use Unicode 9.0.0 character database.

Updated intervals extracted from output of [2] from ucd files[3].

The comments at the head of [2] state that the output is unrestricted.
Therefore it is not subject to the GPL as applies to the script itself.

[1] See: https://savannah.gnu.org/bugs/?func=detailitem&item_id=50044
[2] https://raw.githubusercontent.com/GNOME/glib/37d4c2941bd0326b8b6e6bb22c81bd424fcc040b/glib/gen-unicode-tables.pl
[3] http://www.unicode.org/Public/9.0.0/ucd/
---
 wcwidth.c | 373 ++++++++++++++++++++++++++++++++++++++++++++----------
 1 file changed, 305 insertions(+), 68 deletions(-)

diff --git a/wcwidth.c b/wcwidth.c
index ec0fb2ba0..25372a79b 100644
--- a/wcwidth.c
+++ b/wcwidth.c
@@ -176,6 +176,120 @@ int mk_wcwidth(unsigned int ucs)
     { 0xE0100, 0xE01EF }
   };
 
+  /* A sorted list of intervals of double-width characters generated by:
+   * https://raw.githubusercontent.com/GNOME/glib/37d4c2941bd0326b8b6e6bb22c81bd424fcc040b/glib/gen-unicode-tables.pl
+   * from the Unicode 9.0.0 data files available at:
+   * http://www.unicode.org/Public/9.0.0/ucd/
+   */
+  static const struct interval wide[] = {
+    {0x1100, 0x115F},
+    {0x231A, 0x231B},
+    {0x2329, 0x232A},
+    {0x23E9, 0x23EC},
+    {0x23F0, 0x23F0},
+    {0x23F3, 0x23F3},
+    {0x25FD, 0x25FE},
+    {0x2614, 0x2615},
+    {0x2648, 0x2653},
+    {0x267F, 0x267F},
+    {0x2693, 0x2693},
+    {0x26A1, 0x26A1},
+    {0x26AA, 0x26AB},
+    {0x26BD, 0x26BE},
+    {0x26C4, 0x26C5},
+    {0x26CE, 0x26CE},
+    {0x26D4, 0x26D4},
+    {0x26EA, 0x26EA},
+    {0x26F2, 0x26F3},
+    {0x26F5, 0x26F5},
+    {0x26FA, 0x26FA},
+    {0x26FD, 0x26FD},
+    {0x2705, 0x2705},
+    {0x270A, 0x270B},
+    {0x2728, 0x2728},
+    {0x274C, 0x274C},
+    {0x274E, 0x274E},
+    {0x2753, 0x2755},
+    {0x2757, 0x2757},
+    {0x2795, 0x2797},
+    {0x27B0, 0x27B0},
+    {0x27BF, 0x27BF},
+    {0x2B1B, 0x2B1C},
+    {0x2B50, 0x2B50},
+    {0x2B55, 0x2B55},
+    {0x2E80, 0x2E99},
+    {0x2E9B, 0x2EF3},
+    {0x2F00, 0x2FD5},
+    {0x2FF0, 0x2FFB},
+    {0x3000, 0x303E},
+    {0x3041, 0x3096},
+    {0x3099, 0x30FF},
+    {0x3105, 0x312D},
+    {0x3131, 0x318E},
+    {0x3190, 0x31BA},
+    {0x31C0, 0x31E3},
+    {0x31F0, 0x321E},
+    {0x3220, 0x3247},
+    {0x3250, 0x32FE},
+    {0x3300, 0x4DBF},
+    {0x4E00, 0xA48C},
+    {0xA490, 0xA4C6},
+    {0xA960, 0xA97C},
+    {0xAC00, 0xD7A3},
+    {0xF900, 0xFAFF},
+    {0xFE10, 0xFE19},
+    {0xFE30, 0xFE52},
+    {0xFE54, 0xFE66},
+    {0xFE68, 0xFE6B},
+    {0xFF01, 0xFF60},
+    {0xFFE0, 0xFFE6},
+    {0x16FE0, 0x16FE0},
+    {0x17000, 0x187EC},
+    {0x18800, 0x18AF2},
+    {0x1B000, 0x1B001},
+    {0x1F004, 0x1F004},
+    {0x1F0CF, 0x1F0CF},
+    {0x1F18E, 0x1F18E},
+    {0x1F191, 0x1F19A},
+    {0x1F200, 0x1F202},
+    {0x1F210, 0x1F23B},
+    {0x1F240, 0x1F248},
+    {0x1F250, 0x1F251},
+    {0x1F300, 0x1F320},
+    {0x1F32D, 0x1F335},
+    {0x1F337, 0x1F37C},
+    {0x1F37E, 0x1F393},
+    {0x1F3A0, 0x1F3CA},
+    {0x1F3CF, 0x1F3D3},
+    {0x1F3E0, 0x1F3F0},
+    {0x1F3F4, 0x1F3F4},
+    {0x1F3F8, 0x1F43E},
+    {0x1F440, 0x1F440},
+    {0x1F442, 0x1F4FC},
+    {0x1F4FF, 0x1F53D},
+    {0x1F54B, 0x1F54E},
+    {0x1F550, 0x1F567},
+    {0x1F57A, 0x1F57A},
+    {0x1F595, 0x1F596},
+    {0x1F5A4, 0x1F5A4},
+    {0x1F5FB, 0x1F64F},
+    {0x1F680, 0x1F6C5},
+    {0x1F6CC, 0x1F6CC},
+    {0x1F6D0, 0x1F6D2},
+    {0x1F6EB, 0x1F6EC},
+    {0x1F6F4, 0x1F6F6},
+    {0x1F910, 0x1F91E},
+    {0x1F920, 0x1F927},
+    {0x1F930, 0x1F930},
+    {0x1F933, 0x1F93E},
+    {0x1F940, 0x1F94B},
+    {0x1F950, 0x1F95E},
+    {0x1F980, 0x1F991},
+    {0x1F9C0, 0x1F9C0},
+    {0x20000, 0x2FFFD},
+    {0x30000, 0x3FFFD},
+  };
+
   /* test for 8-bit control characters */
   if (ucs == 0)
     return 0;
@@ -189,20 +303,13 @@ int mk_wcwidth(unsigned int ucs)
 
   /* if we arrive here, ucs is not a combining or C0/C1 control character */
 
-  return 1 + 
-    (ucs >= 0x1100 &&
-     (ucs <= 0x115f ||                    /* Hangul Jamo init. consonants */
-      ucs == 0x2329 || ucs == 0x232a ||
-      (ucs >= 0x2e80 && ucs <= 0xa4cf &&
-       ucs != 0x303f) ||                  /* CJK ... Yi */
-      (ucs >= 0xac00 && ucs <= 0xd7a3) || /* Hangul Syllables */
-      (ucs >= 0xf900 && ucs <= 0xfaff) || /* CJK Compatibility Ideographs */
-      (ucs >= 0xfe10 && ucs <= 0xfe19) || /* Vertical forms */
-      (ucs >= 0xfe30 && ucs <= 0xfe6f) || /* CJK Compatibility Forms */
-      (ucs >= 0xff00 && ucs <= 0xff60) || /* Fullwidth Forms */
-      (ucs >= 0xffe0 && ucs <= 0xffe6) ||
-      (ucs >= 0x20000 && ucs <= 0x2fffd) ||
-      (ucs >= 0x30000 && ucs <= 0x3fffd)));
+  /* binary search in table of double-width characters */
+  if (bisearch(ucs, wide,
+           sizeof(wide) / sizeof(struct interval) - 1))
+    return 2;
+
+  /* normal width character */
+  return 1;
 }
 
 
@@ -231,61 +338,191 @@ int mk_wcswidth(const unsigned int *pwcs, size_t n)
  */
 int mk_wcwidth_cjk(unsigned int ucs)
 {
-  /* sorted list of non-overlapping intervals of East Asian Ambiguous
-   * characters, generated by "uniset +WIDTH-A -cat=Me -cat=Mn -cat=Cf c" */
+  /* A sorted list of intervals of ambiguous width characters generated by:
+   * https://raw.githubusercontent.com/GNOME/glib/37d4c2941bd0326b8b6e6bb22c81bd424fcc040b/glib/gen-unicode-tables.pl
+   * from the Unicode 9.0.0 data files available at:
+   * http://www.unicode.org/Public/9.0.0/ucd/
+   */
   static const struct interval ambiguous[] = {
-    { 0x00A1, 0x00A1 }, { 0x00A4, 0x00A4 }, { 0x00A7, 0x00A8 },
-    { 0x00AA, 0x00AA }, { 0x00AE, 0x00AE }, { 0x00B0, 0x00B4 },
-    { 0x00B6, 0x00BA }, { 0x00BC, 0x00BF }, { 0x00C6, 0x00C6 },
-    { 0x00D0, 0x00D0 }, { 0x00D7, 0x00D8 }, { 0x00DE, 0x00E1 },
-    { 0x00E6, 0x00E6 }, { 0x00E8, 0x00EA }, { 0x00EC, 0x00ED },
-    { 0x00F0, 0x00F0 }, { 0x00F2, 0x00F3 }, { 0x00F7, 0x00FA },
-    { 0x00FC, 0x00FC }, { 0x00FE, 0x00FE }, { 0x0101, 0x0101 },
-    { 0x0111, 0x0111 }, { 0x0113, 0x0113 }, { 0x011B, 0x011B },
-    { 0x0126, 0x0127 }, { 0x012B, 0x012B }, { 0x0131, 0x0133 },
-    { 0x0138, 0x0138 }, { 0x013F, 0x0142 }, { 0x0144, 0x0144 },
-    { 0x0148, 0x014B }, { 0x014D, 0x014D }, { 0x0152, 0x0153 },
-    { 0x0166, 0x0167 }, { 0x016B, 0x016B }, { 0x01CE, 0x01CE },
-    { 0x01D0, 0x01D0 }, { 0x01D2, 0x01D2 }, { 0x01D4, 0x01D4 },
-    { 0x01D6, 0x01D6 }, { 0x01D8, 0x01D8 }, { 0x01DA, 0x01DA },
-    { 0x01DC, 0x01DC }, { 0x0251, 0x0251 }, { 0x0261, 0x0261 },
-    { 0x02C4, 0x02C4 }, { 0x02C7, 0x02C7 }, { 0x02C9, 0x02CB },
-    { 0x02CD, 0x02CD }, { 0x02D0, 0x02D0 }, { 0x02D8, 0x02DB },
-    { 0x02DD, 0x02DD }, { 0x02DF, 0x02DF }, { 0x0391, 0x03A1 },
-    { 0x03A3, 0x03A9 }, { 0x03B1, 0x03C1 }, { 0x03C3, 0x03C9 },
-    { 0x0401, 0x0401 }, { 0x0410, 0x044F }, { 0x0451, 0x0451 },
-    { 0x2010, 0x2010 }, { 0x2013, 0x2016 }, { 0x2018, 0x2019 },
-    { 0x201C, 0x201D }, { 0x2020, 0x2022 }, { 0x2024, 0x2027 },
-    { 0x2030, 0x2030 }, { 0x2032, 0x2033 }, { 0x2035, 0x2035 },
-    { 0x203B, 0x203B }, { 0x203E, 0x203E }, { 0x2074, 0x2074 },
-    { 0x207F, 0x207F }, { 0x2081, 0x2084 }, { 0x20AC, 0x20AC },
-    { 0x2103, 0x2103 }, { 0x2105, 0x2105 }, { 0x2109, 0x2109 },
-    { 0x2113, 0x2113 }, { 0x2116, 0x2116 }, { 0x2121, 0x2122 },
-    { 0x2126, 0x2126 }, { 0x212B, 0x212B }, { 0x2153, 0x2154 },
-    { 0x215B, 0x215E }, { 0x2160, 0x216B }, { 0x2170, 0x2179 },
-    { 0x2190, 0x2199 }, { 0x21B8, 0x21B9 }, { 0x21D2, 0x21D2 },
-    { 0x21D4, 0x21D4 }, { 0x21E7, 0x21E7 }, { 0x2200, 0x2200 },
-    { 0x2202, 0x2203 }, { 0x2207, 0x2208 }, { 0x220B, 0x220B },
-    { 0x220F, 0x220F }, { 0x2211, 0x2211 }, { 0x2215, 0x2215 },
-    { 0x221A, 0x221A }, { 0x221D, 0x2220 }, { 0x2223, 0x2223 },
-    { 0x2225, 0x2225 }, { 0x2227, 0x222C }, { 0x222E, 0x222E },
-    { 0x2234, 0x2237 }, { 0x223C, 0x223D }, { 0x2248, 0x2248 },
-    { 0x224C, 0x224C }, { 0x2252, 0x2252 }, { 0x2260, 0x2261 },
-    { 0x2264, 0x2267 }, { 0x226A, 0x226B }, { 0x226E, 0x226F },
-    { 0x2282, 0x2283 }, { 0x2286, 0x2287 }, { 0x2295, 0x2295 },
-    { 0x2299, 0x2299 }, { 0x22A5, 0x22A5 }, { 0x22BF, 0x22BF },
-    { 0x2312, 0x2312 }, { 0x2460, 0x24E9 }, { 0x24EB, 0x254B },
-    { 0x2550, 0x2573 }, { 0x2580, 0x258F }, { 0x2592, 0x2595 },
-    { 0x25A0, 0x25A1 }, { 0x25A3, 0x25A9 }, { 0x25B2, 0x25B3 },
-    { 0x25B6, 0x25B7 }, { 0x25BC, 0x25BD }, { 0x25C0, 0x25C1 },
-    { 0x25C6, 0x25C8 }, { 0x25CB, 0x25CB }, { 0x25CE, 0x25D1 },
-    { 0x25E2, 0x25E5 }, { 0x25EF, 0x25EF }, { 0x2605, 0x2606 },
-    { 0x2609, 0x2609 }, { 0x260E, 0x260F }, { 0x2614, 0x2615 },
-    { 0x261C, 0x261C }, { 0x261E, 0x261E }, { 0x2640, 0x2640 },
-    { 0x2642, 0x2642 }, { 0x2660, 0x2661 }, { 0x2663, 0x2665 },
-    { 0x2667, 0x266A }, { 0x266C, 0x266D }, { 0x266F, 0x266F },
-    { 0x273D, 0x273D }, { 0x2776, 0x277F }, { 0xE000, 0xF8FF },
-    { 0xFFFD, 0xFFFD }, { 0xF0000, 0xFFFFD }, { 0x100000, 0x10FFFD }
+    {0x00A1, 0x00A1},
+    {0x00A4, 0x00A4},
+    {0x00A7, 0x00A8},
+    {0x00AA, 0x00AA},
+    {0x00AD, 0x00AE},
+    {0x00B0, 0x00B4},
+    {0x00B6, 0x00BA},
+    {0x00BC, 0x00BF},
+    {0x00C6, 0x00C6},
+    {0x00D0, 0x00D0},
+    {0x00D7, 0x00D8},
+    {0x00DE, 0x00E1},
+    {0x00E6, 0x00E6},
+    {0x00E8, 0x00EA},
+    {0x00EC, 0x00ED},
+    {0x00F0, 0x00F0},
+    {0x00F2, 0x00F3},
+    {0x00F7, 0x00FA},
+    {0x00FC, 0x00FC},
+    {0x00FE, 0x00FE},
+    {0x0101, 0x0101},
+    {0x0111, 0x0111},
+    {0x0113, 0x0113},
+    {0x011B, 0x011B},
+    {0x0126, 0x0127},
+    {0x012B, 0x012B},
+    {0x0131, 0x0133},
+    {0x0138, 0x0138},
+    {0x013F, 0x0142},
+    {0x0144, 0x0144},
+    {0x0148, 0x014B},
+    {0x014D, 0x014D},
+    {0x0152, 0x0153},
+    {0x0166, 0x0167},
+    {0x016B, 0x016B},
+    {0x01CE, 0x01CE},
+    {0x01D0, 0x01D0},
+    {0x01D2, 0x01D2},
+    {0x01D4, 0x01D4},
+    {0x01D6, 0x01D6},
+    {0x01D8, 0x01D8},
+    {0x01DA, 0x01DA},
+    {0x01DC, 0x01DC},
+    {0x0251, 0x0251},
+    {0x0261, 0x0261},
+    {0x02C4, 0x02C4},
+    {0x02C7, 0x02C7},
+    {0x02C9, 0x02CB},
+    {0x02CD, 0x02CD},
+    {0x02D0, 0x02D0},
+    {0x02D8, 0x02DB},
+    {0x02DD, 0x02DD},
+    {0x02DF, 0x02DF},
+    {0x0300, 0x036F},
+    {0x0391, 0x03A1},
+    {0x03A3, 0x03A9},
+    {0x03B1, 0x03C1},
+    {0x03C3, 0x03C9},
+    {0x0401, 0x0401},
+    {0x0410, 0x044F},
+    {0x0451, 0x0451},
+    {0x2010, 0x2010},
+    {0x2013, 0x2016},
+    {0x2018, 0x2019},
+    {0x201C, 0x201D},
+    {0x2020, 0x2022},
+    {0x2024, 0x2027},
+    {0x2030, 0x2030},
+    {0x2032, 0x2033},
+    {0x2035, 0x2035},
+    {0x203B, 0x203B},
+    {0x203E, 0x203E},
+    {0x2074, 0x2074},
+    {0x207F, 0x207F},
+    {0x2081, 0x2084},
+    {0x20AC, 0x20AC},
+    {0x2103, 0x2103},
+    {0x2105, 0x2105},
+    {0x2109, 0x2109},
+    {0x2113, 0x2113},
+    {0x2116, 0x2116},
+    {0x2121, 0x2122},
+    {0x2126, 0x2126},
+    {0x212B, 0x212B},
+    {0x2153, 0x2154},
+    {0x215B, 0x215E},
+    {0x2160, 0x216B},
+    {0x2170, 0x2179},
+    {0x2189, 0x2189},
+    {0x2190, 0x2199},
+    {0x21B8, 0x21B9},
+    {0x21D2, 0x21D2},
+    {0x21D4, 0x21D4},
+    {0x21E7, 0x21E7},
+    {0x2200, 0x2200},
+    {0x2202, 0x2203},
+    {0x2207, 0x2208},
+    {0x220B, 0x220B},
+    {0x220F, 0x220F},
+    {0x2211, 0x2211},
+    {0x2215, 0x2215},
+    {0x221A, 0x221A},
+    {0x221D, 0x2220},
+    {0x2223, 0x2223},
+    {0x2225, 0x2225},
+    {0x2227, 0x222C},
+    {0x222E, 0x222E},
+    {0x2234, 0x2237},
+    {0x223C, 0x223D},
+    {0x2248, 0x2248},
+    {0x224C, 0x224C},
+    {0x2252, 0x2252},
+    {0x2260, 0x2261},
+    {0x2264, 0x2267},
+    {0x226A, 0x226B},
+    {0x226E, 0x226F},
+    {0x2282, 0x2283},
+    {0x2286, 0x2287},
+    {0x2295, 0x2295},
+    {0x2299, 0x2299},
+    {0x22A5, 0x22A5},
+    {0x22BF, 0x22BF},
+    {0x2312, 0x2312},
+    {0x2460, 0x24E9},
+    {0x24EB, 0x254B},
+    {0x2550, 0x2573},
+    {0x2580, 0x258F},
+    {0x2592, 0x2595},
+    {0x25A0, 0x25A1},
+    {0x25A3, 0x25A9},
+    {0x25B2, 0x25B3},
+    {0x25B6, 0x25B7},
+    {0x25BC, 0x25BD},
+    {0x25C0, 0x25C1},
+    {0x25C6, 0x25C8},
+    {0x25CB, 0x25CB},
+    {0x25CE, 0x25D1},
+    {0x25E2, 0x25E5},
+    {0x25EF, 0x25EF},
+    {0x2605, 0x2606},
+    {0x2609, 0x2609},
+    {0x260E, 0x260F},
+    {0x261C, 0x261C},
+    {0x261E, 0x261E},
+    {0x2640, 0x2640},
+    {0x2642, 0x2642},
+    {0x2660, 0x2661},
+    {0x2663, 0x2665},
+    {0x2667, 0x266A},
+    {0x266C, 0x266D},
+    {0x266F, 0x266F},
+    {0x269E, 0x269F},
+    {0x26BF, 0x26BF},
+    {0x26C6, 0x26CD},
+    {0x26CF, 0x26D3},
+    {0x26D5, 0x26E1},
+    {0x26E3, 0x26E3},
+    {0x26E8, 0x26E9},
+    {0x26EB, 0x26F1},
+    {0x26F4, 0x26F4},
+    {0x26F6, 0x26F9},
+    {0x26FB, 0x26FC},
+    {0x26FE, 0x26FF},
+    {0x273D, 0x273D},
+    {0x2776, 0x277F},
+    {0x2B56, 0x2B59},
+    {0x3248, 0x324F},
+    {0xE000, 0xF8FF},
+    {0xFE00, 0xFE0F},
+    {0xFFFD, 0xFFFD},
+    {0x1F100, 0x1F10A},
+    {0x1F110, 0x1F12D},
+    {0x1F130, 0x1F169},
+    {0x1F170, 0x1F18D},
+    {0x1F18F, 0x1F190},
+    {0x1F19B, 0x1F1AC},
+    {0xE0100, 0xE01EF},
+    {0xF0000, 0xFFFFD},
+    {0x100000, 0x10FFFD},
   };
 
   /* binary search in table of non-spacing characters */

From 4624115b76903b0b9ad97bee713afafcbd70a31c Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Mon, 3 Jul 2017 07:27:05 +0100
Subject: [PATCH 051/166] Make -DMINEFIELD show up in Windows buildinfo.

I listed a lot of other build options, but not that one. The release
checklist still recommends doing test builds with it, so it seems
sensible to arrange that you can tell if a build _is_ one of those or
not.
---
 misc.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/misc.c b/misc.c
index 469e4aeb6..fc5b149dd 100644
--- a/misc.c
+++ b/misc.c
@@ -1214,6 +1214,9 @@ char *buildinfo(const char *newline)
     }
 #endif
 
+#if defined _WINDOWS && defined MINEFIELD
+    strbuf_catf(buf, "%sBuild option: MINEFIELD", newline);
+#endif
 #ifdef NO_SECURITY
     strbuf_catf(buf, "%sBuild option: NO_SECURITY", newline);
 #endif

From ea0ab1c8218f28957b6e20dd84f9d2a3f19313e6 Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Mon, 3 Jul 2017 07:19:07 +0100
Subject: [PATCH 052/166] Simplify running of release.pl --setver.

Previously, it demanded that your checkout was in a state where you
had run autoconf but not configure; so if you previously did have a
Makefile then you had to 'make distclean' to remove it, whereas if you
previously had no generated files at all (e.g. starting from a
completely clean checkout) then you had to run mkfiles.pl and
mkauto.sh to generate 'configure'.

This is obviously confusing, and moreover, the dependence on prior
generated files is fragile and prone to them having been generated
wrong. Adjusted the script so that it uses 'git archive' to get a
clean directory containing only the version-controlled files, and then
runs scripts itself to get that directory into the state it wants.
---
 CHECKLST.txt | 1 -
 release.pl   | 7 +++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/CHECKLST.txt b/CHECKLST.txt
index 8d55ac412..f757c5e0f 100644
--- a/CHECKLST.txt
+++ b/CHECKLST.txt
@@ -52,7 +52,6 @@ for it:
  - Now update the version numbers and the transcripts in the docs, by
    checking out the release branch and running
 
-      make distclean
       ./release.pl --version=X.YZ --setver
 
    Then check that the resulting automated git commit has updated the
diff --git a/release.pl b/release.pl
index cf73d9eb4..7c76c6ae6 100755
--- a/release.pl
+++ b/release.pl
@@ -31,8 +31,11 @@
     0 == system "git", "diff-files", "--quiet" or die "working tree is dirty";
     -f "Makefile" and die "run 'make distclean' first";
     my $builddir = tempdir(DIR => ".", CLEANUP => 1);
-    0 == system "./mkfiles.pl" or die;
-    0 == system "cd $builddir && ../configure" or die;
+    0 == system "git archive --format=tar HEAD | ( cd $builddir && tar xf - )"
+        or die;
+    0 == system "cd $builddir && ./mkfiles.pl" or die;
+    0 == system "cd $builddir && ./mkauto.sh" or die;
+    0 == system "cd $builddir && ./configure" or die;
     0 == system "cd $builddir && make pscp plink RELEASE=${version}" or die;
     our $pscp_transcript = `cd $builddir && ./pscp --help`;
     $pscp_transcript =~ s/^Unidentified build/Release ${version}/m or die;

From 5cac6013b702b014a063ed98ad91128308bc1b48 Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Mon, 3 Jul 2017 07:38:20 +0100
Subject: [PATCH 053/166] Rework the release checklist for current practice.

In recent releases we've taken to making the actual release build (or
rather, candidates for it) ahead of time so that we can do some
slightly more thorough last-minute testing of the exact binaries that
we're going to release to everyone. It's time I actually wrote that
procedure down in the checklist, so that I remember what it is.

In particular, we had the idea that we should not properly GPG-sign
the release until the last moment, and use the presence of a set of
full GPG signatures as a means of distinguishing the real release
build from an RC that accidentally got out into the wild somehow. This
checklist update formalises that too, and documents the method I used
of ensuring the binaries weren't tampered with between RC building and
release signing (by making a signature on just the sha512sums). I also
include in this commit an extra command-line option to sign.sh to make
that preliminary signature step more convenient.
---
 CHECKLST.txt | 104 +++++++++++++++++++++++++++++++--------------------
 sign.sh      |  43 ++++++++++++++++-----
 2 files changed, 97 insertions(+), 50 deletions(-)

diff --git a/CHECKLST.txt b/CHECKLST.txt
index f757c5e0f..21f386562 100644
--- a/CHECKLST.txt
+++ b/CHECKLST.txt
@@ -24,25 +24,28 @@ pre-releases on the website:
    add a news announcement in components/news. (Previous naming
    convention has been to name it in the form 'X.YZ-pre.mi'.)
 
-Preparing to make a release
----------------------------
+Things to do during the branch-stabilisation period:
 
-Now that PuTTY is in git, a lot of the release preparation can be done
-in advance, in local checkouts, and not pushed until the actual
-process of _releasing_ it.
+ - Go through the source (including the documentation), and the
+   website, and review anything tagged with a comment containing the
+   word XXX-REVIEW-BEFORE-RELEASE. (Any such comments should state
+   clearly what needs to be done.)
 
-To begin with, before dropping the tag, make sure everything is ready
-for it:
+ - Do some testing of the Windows version with Minefield (you can
+   build a Minefield version using 'bob . XFLAGS=-DMINEFIELD'), and of
+   the Unix version with valgrind. In particular, any headline
+   features for the release should get a workout with memory checking
+   enabled!
 
- - First of all, go through the source (including the documentation),
-   and the website, and review anything tagged with a comment
-   containing the word XXX-REVIEW-BEFORE-RELEASE.
-   (Any such comments should state clearly what needs to be done.)
+Making a release candidate build
+--------------------------------
 
- - Also, do some testing of the Windows version with Minefield, and
-   of the Unix version with valgrind or efence or both. In
-   particular, any headline features for the release should get a
-   workout with memory checking enabled!
+ - Make a directory to hold all the release paraphernalia. I usually
+   call it ~/src/putty/X.YZ (where X.YZ will stand throughout for the
+   version number). In that directory, make a git clone of the PuTTY
+   repository, where you can make release-related commits and tags
+   tentatively, and keep them out of the way of any 'git push' you
+   might still be doing in other checkouts.
 
  - Double-check that we have removed anything tagged with a comment
    containing the words XXX-REMOVE-BEFORE-RELEASE or
@@ -50,7 +53,8 @@ for it:
    hits in this file itself.)
 
  - Now update the version numbers and the transcripts in the docs, by
-   checking out the release branch and running
+   checking out the release branch in the release-specific checkout
+   and running
 
       ./release.pl --version=X.YZ --setver
 
@@ -71,6 +75,42 @@ for it:
  - If the release is on a branch (which I expect it generally will
    be), merge that branch to master.
 
+ - Make a release-candidate build from the release tag, and put the
+   build.out and build.log dfiles somewhere safe. Normally I store
+   these in an adjacent directory, so I'll run a command like
+     bob -o ../X.YZ/build-X.YZ-rcN.out -l ../X.YZ/build-X.YZ-rcN.log -c X.YZ . RELEASE=X.YZ
+   This should generate a basically valid release directory as
+   `build-X.YZ-rcN.out/putty', and provide link maps and sign.sh
+   alongside that.
+
+ - Double-check in build-X.YZ-rcN.log that the release was built from
+   the right git commit.
+
+ - Make a preliminary gpg signature, but don't run the full release-
+   signing procedure. (We use the presence of a full set of GPG
+   signatures to distinguish _abandoned_ release candidates from the
+   one that ended up being the release.) In the 'build.X.YZ-rcN.out'
+   directory, run
+     sh sign.sh -r -p putty
+   and you should only have to enter the release key passphrase once,
+   which will generate a clearsigned file called
+   sha512sums-preliminary.gpg _outside_ the 'putty' subdirectory.
+
+ - For my own safety, make the release candidate build read-only.
+     chmod -R a-w build-X.YZ-rcN.out build-X.YZ-rcN.log
+
+ - Now do some checking of the release binaries, and pass them to the
+   rest of the team to do some as well. Do at least these things:
+    * make sure they basically work
+    * check they report the right version number
+    * if there's any easily observable behaviour difference between
+      the release branch and master, arrange to observe it
+    * test the Windows installer
+    * test the Unix source tarball.
+
+Preparing to make the release
+-----------------------------
+
  - Write a release announcement (basically a summary of the changes
    since the last release). Squirrel it away in
    thyestes:src/putty-local/announce-<ver> in case it's needed again
@@ -96,31 +136,15 @@ for it:
       them as fixed in the new release), add appropriate Fixed-in
       headers for those.
 
- - Make a release-candidate build from the release tag, and put the
-   build.out and build.log dfiles somewhere safe. Normally I store
-   these in an adjacent directory, so I'll run a command like
-     bob -o ../X.YZ/build-X.YZ-rcN.out -l ../X.YZ/build-X.YZ-rcN.log -c X.YZ . RELEASE=X.YZ
-   This should generate a basically valid release directory as
-   `build-X.YZ-rcN.out/putty', and provide link maps and sign.sh
-   alongside that.
-
- - Double-check in build-X.YZ-rcN.log that the release was built from
-   the right git commit.
-
- - Do a bit of checking of the release binaries:
-    * make sure they basically work
-    * check they report the right version number
-    * if there's any easily observable behaviour difference between
-      the release branch and master, arrange to observe it
-    * test the Windows installer
-    * test the Unix source tarball.
-
- - Sign the release: in the `build-X.YZ-rcN.out' directory, type
+ - Sign the release in full. In the `build-X.YZ-rcN.out' directory,
+   re-verify that the preliminary signed checksums file has a correct
+   signature on it and also matches the files you're about to sign for real:
+     gpg -d sha512sums-preliminary.gpg | (cd putty; sha512sum -c)
+   If the combined output of that pipeline reports both a good
+   signature (from the release key) and a successful verification of
+   all the sha512sums, then all is well, so now run
      sh sign.sh -r putty
-   and enter the passphrases a lot of times.
-
- - For my own safety, make the release candidate build read-only.
-     chmod -R a-w build-X.YZ-rcN.out build-X.YZ-rcN.log
+   and enter the release key passphrase a lot of times.
 
 The actual release procedure
 ----------------------------
diff --git a/sign.sh b/sign.sh
index bdf6245ff..8dbdb6135 100755
--- a/sign.sh
+++ b/sign.sh
@@ -10,11 +10,27 @@
 set -e
 
 keyname=EEF20295D15F7E8A
+preliminary=false
 
-if test "x$1" = "x-r"; then
-    shift
-    keyname=9DFE2648B43434E4
-fi
+while :; do
+    case "$1" in
+        -r)
+            shift
+            keyname=9DFE2648B43434E4
+            ;;
+        -p)
+            shift
+            preliminary=true
+            ;;
+        -*)
+            echo "Unknown option '$1'" >&2
+            exit 1
+            ;;
+        *)
+            break
+            ;;
+    esac
+done
 
 sign() {
   # Check for the prior existence of the signature, so we can
@@ -27,9 +43,16 @@ sign() {
 
 cd "$1"
 echo "===== Signing with key '$keyname'"
-for i in putty*src.zip putty*.tar.gz w32/*.exe w32/*.zip w32/*.msi w64/*.exe w64/*.zip w64/*.msi w32old/*.exe w32old/*.zip; do
-    sign --detach-sign "$i" "$i.gpg"
-done
-for i in md5sums sha1sums sha256sums sha512sums; do
-    sign --clearsign "$i" "$i.gpg"
-done
+if $preliminary; then
+    sign --clearsign sha512sums ../sha512sums-preliminary.gpg
+else
+    for i in putty*src.zip putty*.tar.gz \
+             w32/*.exe w32/*.zip w32/*.msi \
+             w64/*.exe w64/*.zip w64/*.msi \
+             w32old/*.exe w32old/*.zip; do
+        sign --detach-sign "$i" "$i.gpg"
+    done
+    for i in md5sums sha1sums sha256sums sha512sums; do
+        sign --clearsign "$i" "$i.gpg"
+    done
+fi

From a2b040ee094fcd43b4d53e14121c8c2301fba303 Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Tue, 4 Jul 2017 19:35:18 +0100
Subject: [PATCH 054/166] Expand the About box.

It wasn't big enough to fit the full buildinfo text, when compiling
with clang-cl which has a bulky compiler identification string.
---
 windows/win_res.rc2 | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/windows/win_res.rc2 b/windows/win_res.rc2
index 92d39cd5a..0c486ce51 100644
--- a/windows/win_res.rc2
+++ b/windows/win_res.rc2
@@ -16,15 +16,15 @@ IDI_MAINICON ICON "putty.ico"
 IDI_CFGICON ICON "puttycfg.ico"
 
 /* Accelerators used: clw */
-IDD_ABOUTBOX DIALOG DISCARDABLE 140, 40, 270, 106
+IDD_ABOUTBOX DIALOG DISCARDABLE 140, 40, 270, 136
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "About PuTTY"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    DEFPUSHBUTTON "&Close", IDOK, 216, 88, 48, 14
-    PUSHBUTTON "View &Licence", IDA_LICENCE, 6, 88, 70, 14
-    PUSHBUTTON "Visit &Web Site", IDA_WEB, 140, 88, 70, 14
-    EDITTEXT IDA_TEXT, 10, 6, 250, 80, ES_READONLY | ES_MULTILINE | ES_CENTER, WS_EX_STATICEDGE
+    DEFPUSHBUTTON "&Close", IDOK, 216, 118, 48, 14
+    PUSHBUTTON "View &Licence", IDA_LICENCE, 6, 118, 70, 14
+    PUSHBUTTON "Visit &Web Site", IDA_WEB, 140, 118, 70, 14
+    EDITTEXT IDA_TEXT, 10, 6, 250, 110, ES_READONLY | ES_MULTILINE | ES_CENTER, WS_EX_STATICEDGE
 END
 
 /* Accelerators used: aco */

From 3cd10509a51edf5a21cdc80aabf7e6a934522d47 Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Tue, 4 Jul 2017 20:29:54 +0100
Subject: [PATCH 055/166] Update version number for 0.70 release.

---
 Buildscr          | 2 +-
 LATEST.VER        | 2 +-
 doc/plink.but     | 2 +-
 doc/pscp.but      | 2 +-
 windows/putty.iss | 8 ++++----
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Buildscr b/Buildscr
index ab94ea92f..8833a9c49 100644
--- a/Buildscr
+++ b/Buildscr
@@ -35,7 +35,7 @@ module putty
 ifeq "$(RELEASE)" "" set Ndate $(!builddate)
 ifneq "$(Ndate)" "" in . do echo $(Ndate) | perl -pe 's/(....)(..)(..)/$$1-$$2-$$3/' > date
 ifneq "$(Ndate)" "" read Date date
-set Epoch 16280 # update this at every release
+set Epoch 16351 # update this at every release
 ifneq "$(Ndate)" "" in . do echo $(Ndate) | perl -ne 'use Time::Local; /(....)(..)(..)/ and print timegm(0,0,0,$$3,$$2-1,$$1) / 86400 - $(Epoch)' > days
 ifneq "$(Ndate)" "" read Days days
 
diff --git a/LATEST.VER b/LATEST.VER
index b04c64745..ac37bbeae 100644
--- a/LATEST.VER
+++ b/LATEST.VER
@@ -1 +1 @@
-0.69
+0.70
diff --git a/doc/plink.but b/doc/plink.but
index 153982e07..459ceadf2 100644
--- a/doc/plink.but
+++ b/doc/plink.but
@@ -41,7 +41,7 @@ use Plink:
 
 \c Z:\sysosd>plink
 \c Plink: command-line connection utility
-\c Release 0.69
+\c Release 0.70
 \c Usage: plink [options] [user@]host [command]
 \c        ("host" can also be a PuTTY saved session name)
 \c Options:
diff --git a/doc/pscp.but b/doc/pscp.but
index 30a47f83b..7b90810b5 100644
--- a/doc/pscp.but
+++ b/doc/pscp.but
@@ -39,7 +39,7 @@ use PSCP:
 
 \c Z:\owendadmin>pscp
 \c PuTTY Secure Copy client
-\c Release 0.69
+\c Release 0.70
 \c Usage: pscp [options] [user@]host:source target
 \c        pscp [options] source [source...] [user@]host:target
 \c        pscp [options] -ls [user@]host:filespec
diff --git a/windows/putty.iss b/windows/putty.iss
index 3fadcb922..ae926310a 100644
--- a/windows/putty.iss
+++ b/windows/putty.iss
@@ -14,10 +14,10 @@
 
 [Setup]
 AppName=PuTTY
-AppVerName=PuTTY version 0.69
-VersionInfoTextVersion=Release 0.69
-AppVersion=0.69
-VersionInfoVersion=0.69.0.0
+AppVerName=PuTTY version 0.70
+VersionInfoTextVersion=Release 0.70
+AppVersion=0.70
+VersionInfoVersion=0.70.0.0
 AppPublisher=Simon Tatham
 AppPublisherURL=https://www.chiark.greenend.org.uk/~sgtatham/putty/
 AppReadmeFile={app}\README.txt

From 7470e3bdaffc64260c0f786908682128b58c38c7 Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Sat, 8 Jul 2017 09:20:55 +0100
Subject: [PATCH 056/166] Stop release.pl --setver failing if Makefile exists.

This should have been part of commit ea0ab1c82; it's part of the
general revamp that we regenerate the autoconf files ourselves in a
clean directory - so we don't depend on them being present, but we
also don't depend on them being _absent_ either.

But when I made that commit my immediate priority was to get --setver
to work from a completely clean checkout, not from one already
littered with cruft, so I didn't check quite as carefully that my
changes fixed the problem in the latter case too :-)
---
 release.pl | 1 -
 1 file changed, 1 deletion(-)

diff --git a/release.pl b/release.pl
index 7c76c6ae6..da7d2a887 100755
--- a/release.pl
+++ b/release.pl
@@ -29,7 +29,6 @@
     0 == system "git", "diff-index", "--quiet", "--cached", "HEAD"
         or die "index is dirty";
     0 == system "git", "diff-files", "--quiet" or die "working tree is dirty";
-    -f "Makefile" and die "run 'make distclean' first";
     my $builddir = tempdir(DIR => ".", CLEANUP => 1);
     0 == system "git archive --format=tar HEAD | ( cd $builddir && tar xf - )"
         or die;

From 0e2955ffbff083212d2a8a0d7fd829716f283081 Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Sat, 8 Jul 2017 09:23:51 +0100
Subject: [PATCH 057/166] Add a --no-ftp mode to the release.pl download
 checks.

chiark's ftp server sometimes randomly refuses downloads. In the case
where this happens at postcheck time, this isn't really
release-blocking (all the files have been test-downloaded by precheck
already, so the main aim at this stage is to check that the 'latest'
symlink points to the right place, and even one or two successful
downloads are good enough to confirm that in practice). So now I can
add --no-ftp to the postcheck command line if that makes my life
easier.
---
 release.pl | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/release.pl b/release.pl
index da7d2a887..b5ad149c3 100755
--- a/release.pl
+++ b/release.pl
@@ -15,11 +15,13 @@
 my $upload = 0;
 my $precheck = 0;
 my $postcheck = 0;
+my $skip_ftp = 0;
 GetOptions("version=s" => \$version,
            "setver" => \$setver,
            "upload" => \$upload,
            "precheck" => \$precheck,
-           "postcheck" => \$postcheck)
+           "postcheck" => \$postcheck,
+           "no-ftp" => \$skip_ftp)
     or &usage();
 
 # --set-version: construct a local commit which updates the version
@@ -163,11 +165,13 @@
                    }
 
                    # Now test-download the files themselves.
-                   my $ftpdata = `curl -s $ftp_uri`;
-                   printf "  got %d bytes via FTP", length $ftpdata;
-                   die "FTP download for $ftp_uri did not match"
-                       if $ftpdata ne $real_content;
-                   print ", ok\n";
+                   unless ($skip_ftp) {
+                       my $ftpdata = `curl -s $ftp_uri`;
+                       printf "  got %d bytes via FTP", length $ftpdata;
+                       die "FTP download for $ftp_uri did not match"
+                           if $ftpdata ne $real_content;
+                       print ", ok\n";
+                   }
 
                    my $ua = LWP::UserAgent->new;
                    my $httpresponse = $ua->get($http_uri);

From 309c3dfd95505f1bf1e4b4d488a5f03f0cf24b3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ion=20Gazta=C3=B1aga?= <igaztanaga@gmail.com>
Date: Thu, 6 Jul 2017 10:18:27 +0200
Subject: [PATCH 058/166] Add -share -noshare command line option to plink to
 share SSL connections.

---
 cmdline.c          | 13 ++++++++++++-
 doc/man-pl.but     |  9 +++++++++
 doc/plink.but      | 24 ++++++++++++++++++++++++
 unix/uxplink.c     |  2 ++
 windows/winplink.c |  2 ++
 5 files changed, 49 insertions(+), 1 deletion(-)

diff --git a/cmdline.c b/cmdline.c
index f288ed629..d2a815928 100644
--- a/cmdline.c
+++ b/cmdline.c
@@ -403,7 +403,18 @@ int cmdline_process_param(const char *p, char *value,
 	SAVEABLE(0);
 	conf_set_int(conf, CONF_tryagent, FALSE);
     }
-
+    if (!strcmp(p, "-share")) {
+	RETURN(1);
+	UNAVAILABLE_IN(TOOLTYPE_NONNETWORK);
+	SAVEABLE(0);
+	conf_set_int(conf, CONF_ssh_connection_sharing, TRUE);
+    }
+    if (!strcmp(p, "-noshare")) {
+	RETURN(1);
+	UNAVAILABLE_IN(TOOLTYPE_NONNETWORK);
+	SAVEABLE(0);
+	conf_set_int(conf, CONF_ssh_connection_sharing, FALSE);
+    }
     if (!strcmp(p, "-A")) {
 	RETURN(1);
 	UNAVAILABLE_IN(TOOLTYPE_FILETRANSFER | TOOLTYPE_NONNETWORK);
diff --git a/doc/man-pl.but b/doc/man-pl.but
index 9f4118719..58ca7a289 100644
--- a/doc/man-pl.but
+++ b/doc/man-pl.but
@@ -182,6 +182,15 @@ which of the agent's keys to use. }
 \dd Allow use of an authentication agent. (This option is only necessary
 to override a setting in a saved session.)
 
+\dt \cw{\-noshare}
+
+\dd Don't test and try to share an existing connection, always make
+a new connection.
+
+\dt \cw{\-share}
+
+\dd Test and try to share an existing connection.
+
 \dt \cw{\-hostkey} \e{key}
 
 \dd Specify an acceptable host public key. This option may be specified
diff --git a/doc/plink.but b/doc/plink.but
index 459ceadf2..74da18a1a 100644
--- a/doc/plink.but
+++ b/doc/plink.but
@@ -75,6 +75,8 @@ use Plink:
 \c   -i key    private key file for user authentication
 \c   -noagent  disable use of Pageant
 \c   -agent    enable use of Pageant
+\c   -noshare  disable use of connection sharing
+\c   -share    enable use of connection sharing
 \c   -hostkey aa:bb:cc:...
 \c             manually specify a host key (may be repeated)
 \c   -m file   read remote command(s) from file
@@ -237,6 +239,28 @@ line.
 
 (This option is only meaningful with the SSH-2 protocol.)
 
+\S2{plink-option-share} \I{-share-plink}\c{-share}:
+Test and try to share an existing connection.
+
+This option tris to detect if an existing connection can be shared
+(See \k{config-ssh-sharing} for more information about SSH connection
+sharing.) and reuses that connection.
+
+A Plink invocation of the form:
+
+\c plink -share <session>
+\e              iiiiiiiii
+
+will test whether there is currently a viable \q{upstream} for the
+session in question, which can be specified using any syntax you'd
+normally use with Plink to make an actual connection (a host/port
+number, a bare saved session name, \c{-load}, etc). If no \q{upstream}
+viable session is found and \c{-share} is specified, this connection
+will be become the \q{upstream} connection for subsequent connection
+sharing tries.
+
+(This option is only meaningful with the SSH-2 protocol.)
+
 \S2{plink-option-shareexists} \I{-shareexists-plink}\c{-shareexists}:
 test for connection-sharing upstream
 
diff --git a/unix/uxplink.c b/unix/uxplink.c
index e891d66a8..2a1926efc 100644
--- a/unix/uxplink.c
+++ b/unix/uxplink.c
@@ -579,6 +579,8 @@ static void usage(void)
     printf("  -i key    private key file for user authentication\n");
     printf("  -noagent  disable use of Pageant\n");
     printf("  -agent    enable use of Pageant\n");
+    printf("  -noshare  disable use of connection sharing\n");
+    printf("  -share    enable use of connection sharing\n");
     printf("  -hostkey aa:bb:cc:...\n");
     printf("            manually specify a host key (may be repeated)\n");
     printf("  -m file   read remote command(s) from file\n");
diff --git a/windows/winplink.c b/windows/winplink.c
index ea4175012..84e47d6ec 100644
--- a/windows/winplink.c
+++ b/windows/winplink.c
@@ -207,6 +207,8 @@ static void usage(void)
     printf("  -i key    private key file for user authentication\n");
     printf("  -noagent  disable use of Pageant\n");
     printf("  -agent    enable use of Pageant\n");
+    printf("  -noshare  disable use of connection sharing\n");
+    printf("  -share    enable use of connection sharing\n");
     printf("  -hostkey aa:bb:cc:...\n");
     printf("            manually specify a host key (may be repeated)\n");
     printf("  -m file   read remote command(s) from file\n");

From 25683f0f3d5a654c1e2a8e1d43dca3778a77e7de Mon Sep 17 00:00:00 2001
From: Jacob Nevins <jacobn@chiark.greenend.org.uk>
Date: Wed, 12 Jul 2017 10:19:23 +0100
Subject: [PATCH 059/166] Add a FAQ about servers that don't like IUTF8.

---
 doc/faq.but | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/doc/faq.but b/doc/faq.but
index cd3254a8b..4d9e14a93 100644
--- a/doc/faq.but
+++ b/doc/faq.but
@@ -1002,6 +1002,26 @@ appropriate kind of binaries in \cw{SYSTEM32}. Thus, operations in
 the PuTTY suite that involve it accessing its own executables, such as
 \i{\q{New Session}} and \q{Duplicate Session}, will not work.
 
+\S{faq-iutf8}{Question} After I upgraded PuTTY to 0.68, I can no longer
+connect to my embedded device or appliance.
+
+If your SSH server has started unexpectedly closing SSH connections
+after you enter your password, and it worked before 0.68, you may have
+a buggy server that objects to certain SSH protocol extensions.
+
+The SSH protocol recently gained a new \q{terminal mode}, \cw{IUTF8},
+which PuTTY sends by default; see \k{config-ttymodes}. This is the
+first new terminal mode since the SSH-2 protocol was defined. While
+servers are supposed to ignore modes they don't know about, some buggy
+servers will unceremoniously close the connection if they see anything
+they don't recognise. SSH servers in embedded devices, network
+appliances, and the like seem to disproportionately have this bug.
+
+If you think you have such a server, from 0.69 onwards you can disable
+sending of the \cw{IUTF8} mode: on the SSH / TTY panel, select
+\cw{IUTF8} on the list, select \q{Nothing}, and press \q{Set}. (It's
+not possible to disable sending this mode in 0.68.)
+
 \H{faq-secure} Security questions
 
 \S{faq-publicpc}{Question} Is it safe for me to download PuTTY and

From f0126dd198358f2ae351bc49e8edf056c3ce2c6e Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Mon, 17 Jul 2017 20:57:07 +0100
Subject: [PATCH 060/166] Set ssh->mainchan->type earlier.

A user reported a nonsensical assertion failure (claiming that
ssh->version != 2) which suggested that a channel had somehow outlived
its parent Ssh in the situation where the opening of the main session
channel is rejected by the server. Checking with valgrind suggested
that things start to go wrong at the point where we free the half-set-
up ssh->mainchan before having filled in its type field, so that the
switch in ssh_channel_close_local() picks an arbitrary wrong action.

I haven't reproduced the same failure the user reported, but with this
change, Unix plink is now valgrind-clean in that failure situation.
---
 ssh.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ssh.c b/ssh.c
index 1d80e9194..89041f487 100644
--- a/ssh.c
+++ b/ssh.c
@@ -10722,6 +10722,7 @@ static void do_ssh2_authconn(Ssh ssh, const unsigned char *in, int inlen,
     } else {
 	ssh->mainchan = snew(struct ssh_channel);
 	ssh->mainchan->ssh = ssh;
+	ssh->mainchan->type = CHAN_MAINSESSION;
 	ssh_channel_init(ssh->mainchan);
 
 	if (*conf_get_str(ssh->conf, CONF_ssh_nc_host)) {
@@ -10761,7 +10762,6 @@ static void do_ssh2_authconn(Ssh ssh, const unsigned char *in, int inlen,
 
 	ssh->mainchan->remoteid = ssh_pkt_getuint32(pktin);
 	ssh->mainchan->halfopen = FALSE;
-	ssh->mainchan->type = CHAN_MAINSESSION;
 	ssh->mainchan->v.v2.remwindow = ssh_pkt_getuint32(pktin);
 	ssh->mainchan->v.v2.remmaxpkt = ssh_pkt_getuint32(pktin);
 	update_specials_menu(ssh->frontend);

From 0a93b5d9bc6131c0cd84395f4aa88cac0cb40f23 Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Wed, 19 Jul 2017 07:22:03 +0100
Subject: [PATCH 061/166] Stop ssh2_msg_channel_response using a stale
 ssh_channel.

When it calls through ocr->handler() to process the response to a
channel request, sometimes that call ends up back in the main SSH-2
authconn coroutine, and sometimes _that_ will call bomb_out(), which
closes the whole SSH connection and frees all the channels - so that
when control returns back up the call stack to
ssh2_msg_channel_response itself which continues working with the
channel it was passed, it's using freed memory and things go badly.

This is the sort of thing I'd _like_ to fix using some kind of
large-scale refactoring along the lines of moving all the actual
free() calls out into top-level callbacks, so that _any_ function
which is holding a pointer to something can rely on that pointer still
being valid after it calls a subroutine. But I haven't worked out all
the details of how that system should work, and doubtless it will turn
out to have problems of its own once I do, so here's a point fix which
simply checks if the whole SSH session has been closed (which is easy
- much easier than checking if that _channel_ structure still exists)
and fixes the immediate bug.

(I think this is the real fix for the problem reported by the user I
mention in commit f0126dd19, because I actually got the details wrong
in the log message for that previous commit: the user's SSH server
wasn't rejecting the _opening_ of the main session channel, it was
rejecting the "shell" channel request, so this code path was the one
being exercised. Still, the other bug was real too, so no harm done!)
---
 ssh.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ssh.c b/ssh.c
index 89041f487..aa9fd5dd9 100644
--- a/ssh.c
+++ b/ssh.c
@@ -8105,6 +8105,8 @@ static void ssh2_msg_channel_response(Ssh ssh, struct Packet *pktin)
 	return;
     }
     ocr->handler(c, pktin, ocr->ctx);
+    if (ssh->state == SSH_STATE_CLOSED)
+        return; /* in case the handler called bomb_out(), which some can */
     c->v.v2.chanreq_head = ocr->next;
     sfree(ocr);
     /*

From 55efbc56a0f482d237b2315efac42c2f3301d986 Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Fri, 4 Aug 2017 19:46:21 +0100
Subject: [PATCH 062/166] Fix filename of the 64-bit MIT Kerberos DLL.

64-bit PuTTY should be loading gssapi64.dll, not gssapi32.dll. (In
contrast to the Windows system API DLLs, such as secur32.dll which is
also mentioned in the same source file; those keep the "32" in their
name whether we're in Win32 or Win64.)
---
 windows/wingss.c | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/windows/wingss.c b/windows/wingss.c
index ef0561671..54b1e477e 100644
--- a/windows/wingss.c
+++ b/windows/wingss.c
@@ -13,9 +13,15 @@
 
 /* Windows code to set up the GSSAPI library list. */
 
+#ifdef _WIN64
+#define MIT_KERB_SUFFIX "64"
+#else
+#define MIT_KERB_SUFFIX "32"
+#endif
+
 const int ngsslibs = 3;
 const char *const gsslibnames[3] = {
-    "MIT Kerberos GSSAPI32.DLL",
+    "MIT Kerberos GSSAPI"MIT_KERB_SUFFIX".DLL",
     "Microsoft SSPI SECUR32.DLL",
     "User-specified GSSAPI DLL",
 };
@@ -90,7 +96,6 @@ struct ssh_gss_liblist *ssh_gss_setup(Conf *conf)
     list->nlibraries = 0;
 
     /* MIT Kerberos GSSAPI implementation */
-    /* TODO: For 64-bit builds, check for gssapi64.dll */
     module = NULL;
     if (RegOpenKey(HKEY_LOCAL_MACHINE, "SOFTWARE\\MIT\\Kerberos", &regkey)
 	== ERROR_SUCCESS) {
@@ -115,7 +120,7 @@ struct ssh_gss_liblist *ssh_gss_setup(Conf *conf)
                     p_AddDllDirectory(dllPath);
                     sfree(dllPath);
                 }
-                strcat (buffer, "\\gssapi32.dll");
+                strcat (buffer, "\\gssapi"MIT_KERB_SUFFIX".dll");
                 module = LoadLibraryEx (buffer, NULL,
                                         LOAD_LIBRARY_SEARCH_SYSTEM32 |
                                         LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR |
@@ -130,7 +135,7 @@ struct ssh_gss_liblist *ssh_gss_setup(Conf *conf)
 	    &list->libraries[list->nlibraries++];
 
 	lib->id = 0;
-	lib->gsslogmsg = "Using GSSAPI from GSSAPI32.DLL";
+	lib->gsslogmsg = "Using GSSAPI from GSSAPI"MIT_KERB_SUFFIX".DLL";
 	lib->handle = (void *)module;
 
 #define BIND_GSS_FN(name) \

From a459fc58e844a2152cedb068d5b552bd3aabd654 Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Sat, 26 Aug 2017 15:23:56 +0100
Subject: [PATCH 063/166] Switch to producing .res files, not .res.o.

I've just upgraded my build process to a version of lld-link
that knows how to read .res, and I think it's a slightly more
commonly found format, so less confusing to encounter.
---
 mkfiles.pl | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/mkfiles.pl b/mkfiles.pl
index 1d83912bd..02421316e 100755
--- a/mkfiles.pl
+++ b/mkfiles.pl
@@ -556,10 +556,10 @@ sub manpages {
     print "\n\n";
     foreach $p (&prognames("G:C")) {
 	($prog, $type) = split ",", $p;
-	$objstr = &objects($p, "\$(BUILDDIR)X.obj", "\$(BUILDDIR)X.res.o", undef);
+	$objstr = &objects($p, "\$(BUILDDIR)X.obj", "\$(BUILDDIR)X.res", undef);
 	print &splitline("\$(BUILDDIR)$prog.exe: " . $objstr), "\n";
 
-	$objstr = &objects($p, "\$(BUILDDIR)X.obj", "\$(BUILDDIR)X.res.o", "X.lib");
+	$objstr = &objects($p, "\$(BUILDDIR)X.obj", "\$(BUILDDIR)X.res", "X.lib");
 	$subsys = ($type eq "G") ? "windows" : "console";
 	print &splitline("\t\$(LD) \$(LFLAGS) \$(XLFLAGS) ".
                          "/out:\$(BUILDDIR)$prog.exe ".
@@ -567,11 +567,11 @@ sub manpages {
                          "/subsystem:$subsys\$(SUBSYSVER) ".
                          "\$(EXTRA_$subsys) $objstr")."\n\n";
     }
-    foreach $d (&deps("\$(BUILDDIR)X.obj", "\$(BUILDDIR)X.res.o", $dirpfx, "/", "vc")) {
+    foreach $d (&deps("\$(BUILDDIR)X.obj", "\$(BUILDDIR)X.res", $dirpfx, "/", "vc")) {
         $extradeps = $forceobj{$d->{obj_orig}} ? ["*.c","*.h","*.rc"] : [];
         print &splitline(sprintf("%s: %s", $d->{obj},
                                  join " ", @$extradeps, @{$d->{deps}})), "\n";
-        if ($d->{obj} =~ /\.res\.o$/) {
+        if ($d->{obj} =~ /\.res$/) {
             print "\t\$(RC) \$(RCFLAGS) ".$d->{deps}->[0]." -o ".$d->{obj}."\n\n";
 	} else {
             print "\t\$(CC) /Fo\$(BUILDDIR) \$(COMPAT) \$(CFLAGS) \$(XFLAGS) /c \$<\n\n";
@@ -581,7 +581,7 @@ sub manpages {
     print &def($makefile_extra{'clangcl'}->{'end'});
     print "\nclean:\n".
         &splitline("\trm -f \$(BUILDDIR)*.obj \$(BUILDDIR)*.exe ".
-                   "\$(BUILDDIR)*.res.o \$(BUILDDIR)*.map ".
+                   "\$(BUILDDIR)*.res \$(BUILDDIR)*.map ".
                    "\$(BUILDDIR)*.exe.manifest")."\n";
     select STDOUT; close OUT;
 }

From 4634cd47f75e74a697840fb32f18edb7f1cf41da Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Tue, 5 Sep 2017 20:14:33 +0100
Subject: [PATCH 064/166] Avoid zero-length ldisc_send() in terminal.c.

A user reports that a remote window title query, if the window title
is empty or if the option to return it is disabled, fails the
assertion in ldisc_send that I introduced as part of commit c269dd013
to catch any lingering uses of ldisc_send with length 0 that should
have turned into ldisc_echoedit_update. Added a check for len > 0
guarding that ldisc_send call, and likewise at one or two others I
noticed on my way here.

(Probably at some point I should decide that the period of smoking out
lingering old-style ldisc_send(0) calls is over, and declare it safe
to remove that assertion again and get rid of all the cumbersome
safety checks at call sites like these ones. But not quite yet.)
---
 terminal.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/terminal.c b/terminal.c
index ba9dd6172..f7bcbb957 100644
--- a/terminal.c
+++ b/terminal.c
@@ -3355,7 +3355,7 @@ static void term_out(Terminal *term)
 		    break;
 		  case 'Z':	       /* DECID: terminal type query */
 		    compatibility(VT100);
-		    if (term->ldisc)
+		    if (term->ldisc && term->id_string[0])
 			ldisc_send(term->ldisc, term->id_string,
 				   strlen(term->id_string), 0);
 		    break;
@@ -3662,7 +3662,7 @@ static void term_out(Terminal *term)
 		      case 'c':       /* DA: terminal type query */
 			compatibility(VT100);
 			/* This is the response for a VT102 */
-			if (term->ldisc)
+			if (term->ldisc && term->id_string[0])
 			    ldisc_send(term->ldisc, term->id_string,
  				       strlen(term->id_string), 0);
 			break;
@@ -4069,7 +4069,8 @@ static void term_out(Terminal *term)
 					p = EMPTY_WINDOW_TITLE;
 				    len = strlen(p);
 				    ldisc_send(term->ldisc, "\033]L", 3, 0);
-				    ldisc_send(term->ldisc, p, len, 0);
+                                    if (len > 0)
+                                        ldisc_send(term->ldisc, p, len, 0);
 				    ldisc_send(term->ldisc, "\033\\", 2, 0);
 				}
 				break;
@@ -4082,7 +4083,8 @@ static void term_out(Terminal *term)
 					p = EMPTY_WINDOW_TITLE;
 				    len = strlen(p);
 				    ldisc_send(term->ldisc, "\033]l", 3, 0);
-				    ldisc_send(term->ldisc, p, len, 0);
+                                    if (len > 0)
+                                        ldisc_send(term->ldisc, p, len, 0);
 				    ldisc_send(term->ldisc, "\033\\", 2, 0);
 				}
 				break;

From 4ec27919454102386f18d24df188cac3f663dbdc Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Wed, 13 Sep 2017 19:24:17 +0100
Subject: [PATCH 065/166] Remove Makefile.bor.

After a conversation this week with a user who tried to use it, it's
clear that Borland C can't build the up-to-date PuTTY without having
to make too many compromises of functionality (unsupported API
details, no 'long long' type), even above the issues that could be
worked round with extra porting ifdefs.
---
 .gitignore        |   2 -
 README            |   4 --
 Recipe            |   1 -
 doc/udp.but       |   6 +--
 mkfiles.pl        | 117 +---------------------------------------------
 windows/rcstuff.h |   2 +-
 6 files changed, 5 insertions(+), 127 deletions(-)

diff --git a/.gitignore b/.gitignore
index 15c253c24..c04f119b7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,7 +19,6 @@
 /*.tds
 /*.td2
 /*.map
-/Makefile.bor
 /Makefile.mgw
 /Makefile.vc
 /Makefile.lcc
@@ -128,7 +127,6 @@
 /windows/*.td2
 /windows/*.map
 /windows/Makefile.clangcl
-/windows/Makefile.bor
 /windows/Makefile.mgw
 /windows/Makefile.vc
 /windows/Makefile.lcc
diff --git a/README b/README
index 50314ca63..de6eb9b06 100644
--- a/README
+++ b/README
@@ -34,10 +34,6 @@ For building on Windows:
    MSVC/putty/putty.dsp builds PuTTY itself, MSVC/plink/plink.dsp
    builds Plink, and so on.
 
- - windows/Makefile.bor is for the Borland C compiler. Type `make -f
-   Makefile.bor' while in the `windows' subdirectory to build all
-   the PuTTY binaries.
-
  - windows/Makefile.mgw is for MinGW / Cygwin installations. Type
    `make -f Makefile.mgw' while in the `windows' subdirectory to
    build all the PuTTY binaries.
diff --git a/Recipe b/Recipe
index f54581223..5715938b0 100644
--- a/Recipe
+++ b/Recipe
@@ -16,7 +16,6 @@
 !makefile vc windows/Makefile.vc
 !makefile vcproj windows/MSVC
 !makefile cygwin windows/Makefile.mgw
-!makefile borland windows/Makefile.bor
 !makefile lcc windows/Makefile.lcc
 !makefile gtk unix/Makefile.gtk
 !makefile unix unix/Makefile.ux
diff --git a/doc/udp.but b/doc/udp.but
index 9ca8ed3f8..b71688b7e 100644
--- a/doc/udp.but
+++ b/doc/udp.but
@@ -138,9 +138,9 @@ construct. Use these wherever possible.
 
 \H{udp-multi-compiler} Independence of specific compiler
 
-Windows PuTTY can currently be compiled with any of four Windows
-compilers: MS Visual C, Borland's freely downloadable C compiler,
-the Cygwin / \cw{mingw32} GNU tools, and \cw{lcc-win32}.
+Windows PuTTY can currently be compiled with any of three Windows
+compilers: MS Visual C, the Cygwin / \cw{mingw32} GNU tools, and
+\cw{clang} (in MS compatibility mode).
 
 This is a really useful property of PuTTY, because it means people
 who want to contribute to the coding don't depend on having a
diff --git a/mkfiles.pl b/mkfiles.pl
index 02421316e..6765f2a86 100755
--- a/mkfiles.pl
+++ b/mkfiles.pl
@@ -268,7 +268,7 @@ ($)
     # Returns true if the argument is a known makefile type. Otherwise,
     # prints a warning and returns false;
     if (grep { $type eq $_ }
-	("vc","vcproj","cygwin","borland","lcc","devcppproj","gtk","unix",
+	("vc","vcproj","cygwin","lcc","devcppproj","gtk","unix",
          "am","osx","vstudio10","vstudio12","clangcl")) {
         return 1;
     }
@@ -659,121 +659,6 @@ sub manpages {
 
 }
 
-##-- Borland makefile
-if (defined $makefiles{'borland'}) {
-    $dirpfx = &dirpfx($makefiles{'borland'}, "\\");
-
-    %stdlibs = (  # Borland provides many Win32 API libraries intrinsically
-      "advapi32" => 1,
-      "comctl32" => 1,
-      "comdlg32" => 1,
-      "gdi32" => 1,
-      "imm32" => 1,
-      "shell32" => 1,
-      "user32" => 1,
-      "winmm" => 1,
-      "winspool" => 1,
-      "wsock32" => 1,
-    );
-    open OUT, ">$makefiles{'borland'}"; select OUT;
-    print
-    "# Makefile for $project_name under Borland C.\n".
-    "#\n# This file was created by `mkfiles.pl' from the `Recipe' file.\n".
-    "# DO NOT EDIT THIS FILE DIRECTLY; edit Recipe or mkfiles.pl instead.\n";
-    # bcc32 command line option is -D not /D
-    ($_ = $help) =~ s/([=" ])\/D/$1-D/gs;
-    print $_;
-    print
-    "\n".
-    "# If you rename this file to `Makefile', you should change this line,\n".
-    "# so that the .rsp files still depend on the correct makefile.\n".
-    "MAKEFILE = Makefile.bor\n".
-    "\n".
-    "# C compilation flags\n".
-    "CFLAGS = -D_WINDOWS -DWINVER=0x0500\n".
-    "# Resource compilation flags\n".
-    "RCFLAGS = -DNO_WINRESRC_H -DWIN32 -D_WIN32 -DWINVER=0x0401\n".
-    "\n".
-    "# Get include directory for resource compiler\n".
-    "!if !\$d(BCB)\n".
-    "BCB = \$(MAKEDIR)\\..\n".
-    "!endif\n".
-    "\n".
-    &def($makefile_extra{'borland'}->{'vars'}) .
-    "\n".
-    ".c.obj:\n".
-    &splitline("\tbcc32 -w-aus -w-ccc -w-par -w-pia \$(COMPAT)".
-	       " \$(CFLAGS) \$(XFLAGS) ".
-	       (join " ", map {"-I$dirpfx$_"} @srcdirs) .
-	       " /c \$*.c",69)."\n".
-    ".rc.res:\n".
-    &splitline("\tbrcc32 \$(RCFL) -i \$(BCB)\\include -r".
-      " \$(RCFLAGS) \$*.rc",69)."\n".
-    "\n";
-    print &splitline("all:" . join "", map { " $_.exe" } &progrealnames("G:C"));
-    print "\n\n";
-    foreach $p (&prognames("G:C")) {
-      ($prog, $type) = split ",", $p;
-      $objstr =  &objects($p, "X.obj", "X.res", undef);
-      print &splitline("$prog.exe: " . $objstr . " $prog.rsp"), "\n";
-      my $ap = ($type eq "G") ? "-aa" : "-ap";
-      print "\tilink32 $ap -Gn -L\$(BCB)\\lib \@$prog.rsp\n\n";
-    }
-    foreach $p (&prognames("G:C")) {
-      ($prog, $type) = split ",", $p;
-      print $prog, ".rsp: \$(MAKEFILE)\n";
-      $objstr = &objects($p, "X.obj", undef, undef);
-      @objlist = split " ", $objstr;
-      @objlines = ("");
-      foreach $i (@objlist) {
-        if (length($objlines[$#objlines] . " $i") > 50) {
-          push @objlines, "";
-        }
-        $objlines[$#objlines] .= " $i";
-      }
-      $c0w = ($type eq "G") ? "c0w32" : "c0x32";
-      print "\techo $c0w + > $prog.rsp\n";
-      for ($i=0; $i<=$#objlines; $i++) {
-        $plus = ($i < $#objlines ? " +" : "");
-        print "\techo$objlines[$i]$plus >> $prog.rsp\n";
-      }
-      print "\techo $prog.exe >> $prog.rsp\n";
-      $objstr = &objects($p, "X.obj", "X.res", undef);
-      @libs = split " ", &objects($p, undef, undef, "X");
-      @libs = grep { !$stdlibs{$_} } @libs;
-      unshift @libs, "cw32", "import32";
-      $libstr = join ' ', @libs;
-      print "\techo nul,$libstr, >> $prog.rsp\n";
-      print "\techo " . &objects($p, undef, "X.res", undef) . " >> $prog.rsp\n";
-      print "\n";
-    }
-    foreach $d (&deps("X.obj", "X.res", $dirpfx, "\\", "borland")) {
-      if ($forceobj{$d->{obj_orig}}) {
-        printf("%s: FORCE\n", $d->{obj});
-      } else {
-        print &splitline(sprintf("%s: %s", $d->{obj},
-                                 join " ", @{$d->{deps}})), "\n";
-      }
-    }
-    print "\n";
-    print &def($makefile_extra{'borland'}->{'end'});
-    print "\nclean:\n".
-    "\t-del *.obj\n".
-    "\t-del *.exe\n".
-    "\t-del *.res\n".
-    "\t-del *.pch\n".
-    "\t-del *.aps\n".
-    "\t-del *.il*\n".
-    "\t-del *.pdb\n".
-    "\t-del *.rsp\n".
-    "\t-del *.tds\n".
-    "\t-del *.\$\$\$\$\$\$\n".
-    "\n".
-    "FORCE:\n".
-    "\t-rem dummy command\n";
-    select STDOUT; close OUT;
-}
-
 if (defined $makefiles{'vc'}) {
     $dirpfx = &dirpfx($makefiles{'vc'}, "\\");
 
diff --git a/windows/rcstuff.h b/windows/rcstuff.h
index 22b220358..ee2c76964 100644
--- a/windows/rcstuff.h
+++ b/windows/rcstuff.h
@@ -9,7 +9,7 @@
 #include <win.h>
 #else
 
-/* Some compilers, like Borland, don't have winresrc.h */
+/* Some compilers don't have winresrc.h */
 #ifndef NO_WINRESRC_H
 #ifndef MSVC4
 #include <winresrc.h>

From ba4837dae819cffffe36fd6c0985d8df10d2873c Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Wed, 20 Sep 2017 18:04:37 +0100
Subject: [PATCH 066/166] Add a -restrict-putty-acl option to Windows Pageant.

This causes PuTTY processes spawned from its system-tray menu to run
with the -restrict-acl option (or rather, the synonymous &R prefix
used by my auto-constructed command lines for easier parsing).

The previous behaviour of Pageant was never to pass -restrict-acl to
PuTTY, even when started with -restrict-acl itself; this is not
actually a silly thing to want to do, because Pageant might well have
more need of -restrict-acl than PuTTY (it stores longer-term and more
powerful secrets) and conversely PuTTY might have more need to _not_
restrict its ACL than Pageant (in that among the things enabled by an
unrestricted ACL are various kinds of accessibility software, which is
more useful on the more user-facing PuTTY than on Pageant).

But for those who want to lock everything down with every security
option possible (even though -restrict-acl is only an ad-hoc
precaution and cannot deliver any hard guarantees), this new option
should fill in the UI gap.
---
 doc/using.but     | 12 ++++++++++++
 windows/winpgnt.c | 26 ++++++++++++++++++++------
 2 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/doc/using.but b/doc/using.but
index 7d184b7c2..f5e3b57bd 100644
--- a/doc/using.but
+++ b/doc/using.but
@@ -1042,3 +1042,15 @@ any processes started with Duplicate Session, New Session etc.
 (However, if you're invoking PuTTY tools explicitly, for instance as a
 proxy command, you'll need to arrange to pass them the
 \c{-restrict-acl} option yourself, if that's what you want.)
+
+If Pageant is started with the \c{-restrict-acl} option, and you use
+it to launch a PuTTY session from its System Tray submenu, then
+Pageant will \e{not} default to starting the PuTTY subprocess with a
+restricted ACL. This is because PuTTY is more likely to suffer reduced
+functionality as a result of restricted ACLs (e.g. screen reader
+software will have a greater need to interact with it), whereas
+Pageant stores the more critical information (hence benefits more from
+the extra protection), so it's reasonable to want to run Pageant but
+not PuTTY with the ACL restrictions. You can force Pageant to start
+subsidiary PuTTY processes with a restricted ACL if you also pass the
+\c{-restrict-putty-acl} option.
diff --git a/windows/winpgnt.c b/windows/winpgnt.c
index ebb6c6ace..1919a9b83 100644
--- a/windows/winpgnt.c
+++ b/windows/winpgnt.c
@@ -57,6 +57,7 @@ static HMENU systray_menu, session_menu;
 static int already_running;
 
 static char *putty_path;
+static int restrict_putty_acl = FALSE;
 
 /* CWD for "add key" file requester. */
 static filereq *keypath = NULL;
@@ -847,11 +848,18 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
       case WM_SYSCOMMAND:
 	switch (wParam & ~0xF) {       /* low 4 bits reserved to Windows */
 	  case IDM_PUTTY:
-	    if((INT_PTR)ShellExecute(hwnd, NULL, putty_path, _T(""), _T(""),
-				 SW_SHOW) <= 32) {
-		MessageBox(NULL, "Unable to execute PuTTY!",
-			   "Error", MB_OK | MB_ICONERROR);
-	    }
+            {
+                TCHAR cmdline[10];
+                cmdline[0] = '\0';
+                if (restrict_putty_acl)
+                    strcat(cmdline, "&R");
+
+                if((INT_PTR)ShellExecute(hwnd, NULL, putty_path, cmdline,
+                                         _T(""), SW_SHOW) <= 32) {
+                    MessageBox(NULL, "Unable to execute PuTTY!",
+                               "Error", MB_OK | MB_ICONERROR);
+                }
+            }
 	    break;
 	  case IDM_CLOSE:
 	    if (passphrase_box)
@@ -912,7 +920,10 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
 		    mii.cch = MAX_PATH;
 		    mii.dwTypeData = buf;
 		    GetMenuItemInfo(session_menu, wParam, FALSE, &mii);
-		    strcpy(param, "@");
+                    param[0] = '\0';
+                    if (restrict_putty_acl)
+                        strcat(param, "&R");
+		    strcat(param, "@");
 		    strcat(param, mii.dwTypeData);
 		    if((INT_PTR)ShellExecute(hwnd, NULL, putty_path, param,
 					 _T(""), SW_SHOW) <= 32) {
@@ -1169,6 +1180,9 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
                    !strcmp(argv[i], "-restrict_acl") ||
                    !strcmp(argv[i], "-restrictacl")) {
             restrict_process_acl();
+        } else if (!strcmp(argv[i], "-restrict-putty-acl") ||
+                   !strcmp(argv[i], "-restrict_putty_acl")) {
+            restrict_putty_acl = TRUE;
 	} else if (!strcmp(argv[i], "-c")) {
 	    /*
 	     * If we see `-c', then the rest of the

From 581dd7071ea5131408420654808388ca7c42b3a2 Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Sat, 30 Sep 2017 17:30:11 +0100
Subject: [PATCH 067/166] Squash the 256-colour test text into fewer lines.

I'm about to want to add more stuff to that file, and it would be nice
to have it still fit on a screen after I do.
---
 testdata/colours.txt | 24 ++++++++----------------
 1 file changed, 8 insertions(+), 16 deletions(-)

diff --git a/testdata/colours.txt b/testdata/colours.txt
index 33709d238..2311eb83a 100644
--- a/testdata/colours.txt
+++ b/testdata/colours.txt
@@ -4,19 +4,11 @@ Normal text and bold; reverse video and bold
 ANSI plus bold: 0 bold 1 bold 2 bold 3 bold 4 bold 5 bold 6 bold 7 bold
 xterm bright: fg0 bg0 fg1 bg1 fg2 bg2 fg3 bg3 fg4 bg4 fg5 bg5 fg6 bg6 fg7 bg7
 xterm 256: greys                      reds   greens blues  yellow magent cyans 
-   0   1   2   3   4   5   6   7   8   9  10  11  12  13  14  15
-  16  17  18  19  20  21  22  23  24  25  26  27  28  29  30  31
-  32  33  34  35  36  37  38  39  40  41  42  43  44  45  46  47
-  48  49  50  51  52  53  54  55  56  57  58  59  60  61  62  63
-  64  65  66  67  68  69  70  71  72  73  74  75  76  77  78  79
-  80  81  82  83  84  85  86  87  88  89  90  91  92  93  94  95
-  96  97  98  99 100 101 102 103 104 105 106 107 108 109 110 111
- 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127
- 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143
- 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159
- 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175
- 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191
- 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207
- 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223
- 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239
- 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255
+0001020304050607 08090a0b0c0d0e0f 1011121314151617 18191a1b1c1d1e1f
+2021222324252627 28292a2b2c2d2e2f 3031323334353637 38393a3b3c3d3e3f
+4041424344454647 48494a4b4c4d4e4f 5051525354555657 58595a5b5c5d5e5f
+6061626364656667 68696a6b6c6d6e6f 7071727374757677 78797a7b7c7d7e7f
+8081828384858687 88898a8b8c8d8e8f 9091929394959697 98999a9b9c9d9e9f
+a0a1a2a3a4a5a6a7 a8a9aaabacadaeaf b0b1b2b3b4b5b6b7 b8b9babbbcbdbebf
+c0c1c2c3c4c5c6c7 c8c9cacbcccdcecf d0d1d2d3d4d5d6d7 d8d9dadbdcdddedf
+e0e1e2e3e4e5e6e7 e8e9eaebecedeeef f0f1f2f3f4f5f6f7 f8f9fafbfcfdfeff

From a4cbd3dfdb71d258e83bbf5b03a874c06d0b3106 Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Sat, 30 Sep 2017 17:32:32 +0100
Subject: [PATCH 068/166] Support ESC[38;2;R;G;Bm for 24-bit true colour.

This is a heavily rewritten version of a patch originally by Lorenz
Diener; it was tidied up somewhat by Christian Brabandt, and then
tidied up more by me. The basic idea is to add to the termchar
structure a pair of small structs encoding 24-bit RGB values, each
with a flag indicating whether it's turned on; if it is, it overrides
any other specification of fg or bg colour for that character cell.

I've added a test line to colours.txt containing a few example colours
from /usr/share/X11/rgb.txt. In fact it makes quite a good demo to run
the whole of rgb.txt through this treatment, with a command such as

  perl -pe 's!^\s*(\d+)\s+(\d+)\s+(\d+).*$!\e[38;2;$1;$2;$3m$&\e[m!' rgb.txt
---
 LICENCE              |   3 +-
 fuzzterm.c           |   4 +-
 putty.h              |  28 +++++++++-
 terminal.c           | 129 ++++++++++++++++++++++++++++++++++++++++---
 terminal.h           |   2 +
 testdata/colours.txt |   1 +
 unix/gtkwin.c        |  38 ++++++++++---
 windows/window.c     |  33 ++++++-----
 8 files changed, 204 insertions(+), 34 deletions(-)

diff --git a/LICENCE b/LICENCE
index 7c49ceb3b..30b1fe2b3 100644
--- a/LICENCE
+++ b/LICENCE
@@ -3,7 +3,8 @@ PuTTY is copyright 1997-2017 Simon Tatham.
 Portions copyright Robert de Bath, Joris van Rantwijk, Delian
 Delchev, Andreas Schultz, Jeroen Massar, Wez Furlong, Nicolas Barry,
 Justin Bradford, Ben Harris, Malcolm Smith, Ahmad Khalifa, Markus
-Kuhn, Colin Watson, Christopher Staite, and CORE SDI S.A.
+Kuhn, Colin Watson, Christopher Staite, Lorenz Diener, Christian
+Brabandt, and CORE SDI S.A.
 
 Permission is hereby granted, free of charge, to any person
 obtaining a copy of this software and associated documentation files
diff --git a/fuzzterm.c b/fuzzterm.c
index 15b5d6354..480dca379 100644
--- a/fuzzterm.c
+++ b/fuzzterm.c
@@ -45,7 +45,7 @@ int from_backend(void *frontend, int is_stderr, const char *data, int len)
 
 void request_resize(void *frontend, int x, int y) { }
 void do_text(Context ctx, int x, int y, wchar_t * text, int len,
-	     unsigned long attr, int lattr)
+	     unsigned long attr, int lattr, truecolour tc)
 {
     int i;
 
@@ -56,7 +56,7 @@ void do_text(Context ctx, int x, int y, wchar_t * text, int len,
     printf("\n");
 }
 void do_cursor(Context ctx, int x, int y, wchar_t * text, int len,
-	     unsigned long attr, int lattr)
+	     unsigned long attr, int lattr, truecolour tc)
 {
     int i;
 
diff --git a/putty.h b/putty.h
index fd2d02506..61d6278da 100644
--- a/putty.h
+++ b/putty.h
@@ -592,12 +592,36 @@ void prompt_ensure_result_size(prompt_t *pr, int len);
 /* Burn the evidence. (Assumes _all_ strings want free()ing.) */
 void free_prompts(prompts_t *p);
 
+/*
+ * Data type definitions for true-colour terminal display.
+ * 'optionalrgb' describes a single RGB colour, which overrides the
+ * other colour settings if 'enabled' is nonzero, and is ignored
+ * otherwise. 'truecolour' contains a pair of those for foreground and
+ * background.
+ */
+typedef struct optionalrgb {
+    unsigned char enabled;
+    unsigned char r, g, b;
+} optionalrgb;
+extern const optionalrgb optionalrgb_none;
+typedef struct truecolour {
+    optionalrgb fg, bg;
+} truecolour;
+#define optionalrgb_equal(r1,r2) (                              \
+        (r1).enabled==(r2).enabled &&                           \
+        (r1).r==(r2).r && (r1).g==(r2).g && (r1).b==(r2).b)
+#define truecolour_equal(c1,c2) (               \
+        optionalrgb_equal((c1).fg, (c2).fg) &&  \
+        optionalrgb_equal((c1).bg, (c2).bg))
+
 /*
  * Exports from the front end.
  */
 void request_resize(void *frontend, int, int);
-void do_text(Context, int, int, wchar_t *, int, unsigned long, int);
-void do_cursor(Context, int, int, wchar_t *, int, unsigned long, int);
+void do_text(Context, int, int, wchar_t *, int, unsigned long, int,
+             truecolour);
+void do_cursor(Context, int, int, wchar_t *, int, unsigned long, int,
+               truecolour);
 int char_width(Context ctx, int uc);
 #ifdef OPTIMISE_SCROLL
 void do_scroll(Context, int, int, int);
diff --git a/terminal.c b/terminal.c
index f7bcbb957..e597d472e 100644
--- a/terminal.c
+++ b/terminal.c
@@ -108,6 +108,7 @@ static void update_sbar(Terminal *);
 static void deselect(Terminal *);
 static void term_print_finish(Terminal *);
 static void scroll(Terminal *, int, int, int, int);
+static void parse_optionalrgb(optionalrgb *out, unsigned *values);
 #ifdef OPTIMISE_SCROLL
 static void scroll_display(Terminal *, int, int, int);
 #endif /* OPTIMISE_SCROLL */
@@ -283,6 +284,8 @@ static int termchars_equal_override(termchar *a, termchar *b,
 				    unsigned long bchr, unsigned long battr)
 {
     /* FULL-TERMCHAR */
+    if (!truecolour_equal(a->truecolour, b->truecolour))
+	return FALSE;
     if (a->chr != bchr)
 	return FALSE;
     if ((a->attr &~ DATTR_MASK) != (battr &~ DATTR_MASK))
@@ -607,6 +610,24 @@ static void makeliteral_attr(struct buf *b, termchar *c, unsigned long *state)
 	add(b, (unsigned char)(attr & 0xFF));
     }
 }
+static void makeliteral_truecolour(struct buf *b, termchar *c, unsigned long *state)
+{
+    /*
+     * Put the used parts of the colour info into the buffer.
+     */
+    add(b, ((c->truecolour.fg.enabled ? 1 : 0) |
+            (c->truecolour.bg.enabled ? 2 : 0)));
+    if (c->truecolour.fg.enabled) {
+	add(b, c->truecolour.fg.r);
+	add(b, c->truecolour.fg.g);
+	add(b, c->truecolour.fg.b);
+    }
+    if (c->truecolour.bg.enabled) {
+	add(b, c->truecolour.bg.r);
+	add(b, c->truecolour.bg.g);
+	add(b, c->truecolour.bg.b);
+    }
+}
 static void makeliteral_cc(struct buf *b, termchar *c, unsigned long *state)
 {
     /*
@@ -681,6 +702,7 @@ static unsigned char *compressline(termline *ldata)
      */
     makerle(b, ldata, makeliteral_chr);
     makerle(b, ldata, makeliteral_attr);
+    makerle(b, ldata, makeliteral_truecolour);
     makerle(b, ldata, makeliteral_cc);
 
     /*
@@ -826,6 +848,29 @@ static void readliteral_attr(struct buf *b, termchar *c, termline *ldata,
 
     c->attr = attr;
 }
+static void readliteral_truecolour(struct buf *b, termchar *c, termline *ldata,
+				   unsigned long *state)
+{
+    int flags = get(b);
+
+    if (flags & 1) {
+        c->truecolour.fg.enabled = TRUE;
+	c->truecolour.fg.r = get(b);
+	c->truecolour.fg.g = get(b);
+	c->truecolour.fg.b = get(b);
+    } else {
+	c->truecolour.fg = optionalrgb_none;
+    }
+
+    if (flags & 2) {
+        c->truecolour.bg.enabled = TRUE;
+	c->truecolour.bg.r = get(b);
+	c->truecolour.bg.g = get(b);
+	c->truecolour.bg.b = get(b);
+    } else {
+	c->truecolour.bg = optionalrgb_none;
+    }
+}
 static void readliteral_cc(struct buf *b, termchar *c, termline *ldata,
 			   unsigned long *state)
 {
@@ -899,6 +944,7 @@ static termline *decompressline(unsigned char *data, int *bytes_used)
      */
     readrle(b, ldata, readliteral_chr);
     readrle(b, ldata, readliteral_attr);
+    readrle(b, ldata, readliteral_truecolour);
     readrle(b, ldata, readliteral_cc);
 
     /* Return the number of bytes read, for diagnostic purposes. */
@@ -1570,6 +1616,8 @@ void term_clrsb(Terminal *term)
     update_sbar(term);
 }
 
+const optionalrgb optionalrgb_none = {0, 0, 0, 0};
+
 /*
  * Initialise the terminal.
  */
@@ -1646,6 +1694,8 @@ Terminal *term_init(Conf *myconf, struct unicode_data *ucsdata,
     term->basic_erase_char.chr = CSET_ASCII | ' ';
     term->basic_erase_char.attr = ATTR_DEFAULT;
     term->basic_erase_char.cc_next = 0;
+    term->basic_erase_char.truecolour.fg = optionalrgb_none;
+    term->basic_erase_char.truecolour.bg = optionalrgb_none;
     term->erase_char = term->basic_erase_char;
 
     return term;
@@ -3212,6 +3262,8 @@ static void term_out(Terminal *term)
 			clear_cc(cline, term->curs.x);
 			cline->chars[term->curs.x].chr = c;
 			cline->chars[term->curs.x].attr = term->curr_attr;
+			cline->chars[term->curs.x].truecolour =
+                            term->curr_truecolour;
 
 			term->curs.x++;
 
@@ -3219,6 +3271,8 @@ static void term_out(Terminal *term)
 			clear_cc(cline, term->curs.x);
 			cline->chars[term->curs.x].chr = UCSWIDE;
 			cline->chars[term->curs.x].attr = term->curr_attr;
+			cline->chars[term->curs.x].truecolour =
+                            term->curr_truecolour;
 
 			break;
 		      case 1:
@@ -3229,6 +3283,8 @@ static void term_out(Terminal *term)
 			clear_cc(cline, term->curs.x);
 			cline->chars[term->curs.x].chr = c;
 			cline->chars[term->curs.x].attr = term->curr_attr;
+			cline->chars[term->curs.x].truecolour =
+                            term->curr_truecolour;
 
 			break;
 		      case 0:
@@ -3799,6 +3855,8 @@ static void term_out(Terminal *term)
 				switch (def(term->esc_args[i], 0)) {
 				  case 0:	/* restore defaults */
 				    term->curr_attr = term->default_attr;
+				    term->curr_truecolour =
+                                        term->basic_erase_char.truecolour;
 				    break;
 				  case 1:	/* enable bold */
 				    compatibility(VT100AVO);
@@ -3860,6 +3918,7 @@ static void term_out(Terminal *term)
 				  case 36:
 				  case 37:
 				    /* foreground */
+				    term->curr_truecolour.fg.enabled = FALSE;
 				    term->curr_attr &= ~ATTR_FGMASK;
 				    term->curr_attr |=
 					(term->esc_args[i] - 30)<<ATTR_FGSHIFT;
@@ -3873,12 +3932,14 @@ static void term_out(Terminal *term)
 				  case 96:
 				  case 97:
 				    /* aixterm-style bright foreground */
+				    term->curr_truecolour.fg.enabled = FALSE;
 				    term->curr_attr &= ~ATTR_FGMASK;
 				    term->curr_attr |=
 					((term->esc_args[i] - 90 + 8)
                                          << ATTR_FGSHIFT);
 				    break;
 				  case 39:	/* default-foreground */
+				    term->curr_truecolour.fg.enabled = FALSE;
 				    term->curr_attr &= ~ATTR_FGMASK;
 				    term->curr_attr |= ATTR_DEFFG;
 				    break;
@@ -3891,6 +3952,7 @@ static void term_out(Terminal *term)
 				  case 46:
 				  case 47:
 				    /* background */
+				    term->curr_truecolour.bg.enabled = FALSE;
 				    term->curr_attr &= ~ATTR_BGMASK;
 				    term->curr_attr |=
 					(term->esc_args[i] - 40)<<ATTR_BGSHIFT;
@@ -3904,16 +3966,32 @@ static void term_out(Terminal *term)
 				  case 106:
 				  case 107:
 				    /* aixterm-style bright background */
+				    term->curr_truecolour.bg.enabled = FALSE;
 				    term->curr_attr &= ~ATTR_BGMASK;
 				    term->curr_attr |=
 					((term->esc_args[i] - 100 + 8)
                                          << ATTR_BGSHIFT);
 				    break;
 				  case 49:	/* default-background */
+				    term->curr_truecolour.bg.enabled = FALSE;
 				    term->curr_attr &= ~ATTR_BGMASK;
 				    term->curr_attr |= ATTR_DEFBG;
 				    break;
-				  case 38:   /* xterm 256-colour mode */
+
+                                    /*
+                                     * 256-colour and true-colour
+                                     * sequences. A 256-colour
+                                     * foreground is selected by a
+                                     * sequence of 3 arguments in the
+                                     * form 38;5;n, where n is in the
+                                     * range 0-255. A true-colour RGB
+                                     * triple is selected by 5 args of
+                                     * the form 38;2;r;g;b. Replacing
+                                     * the initial 38 with 48 in both
+                                     * cases selects the same colour
+                                     * as the background.
+                                     */
+				  case 38:
 				    if (i+2 < term->esc_nargs &&
 					term->esc_args[i+1] == 5) {
 					term->curr_attr &= ~ATTR_FGMASK;
@@ -3921,9 +3999,16 @@ static void term_out(Terminal *term)
 					    ((term->esc_args[i+2] & 0xFF)
 					     << ATTR_FGSHIFT);
 					i += 2;
+					}
+				    if (i + 4 < term->esc_nargs &&
+					term->esc_args[i + 1] == 2) {
+					parse_optionalrgb(
+                                            &term->curr_truecolour.fg,
+                                            term->esc_args + (i+2));
+					i += 4;
 				    }
 				    break;
-				  case 48:   /* xterm 256-colour mode */
+				  case 48:
 				    if (i+2 < term->esc_nargs &&
 					term->esc_args[i+1] == 5) {
 					term->curr_attr &= ~ATTR_BGMASK;
@@ -3932,6 +4017,13 @@ static void term_out(Terminal *term)
 					     << ATTR_BGSHIFT);
 					i += 2;
 				    }
+				    if (i + 4 < term->esc_nargs &&
+					term->esc_args[i+1] == 2) {
+					parse_optionalrgb(
+                                            &term->curr_truecolour.bg,
+                                            term->esc_args + (i+2));
+					i += 4;
+				    }
 				    break;
 				}
 			    }
@@ -4733,6 +4825,19 @@ static void term_out(Terminal *term)
 	logflush(term->logctx);
 }
 
+/*
+ * Small subroutine to parse three consecutive escape-sequence
+ * arguments representing a true-colour RGB triple into an
+ * optionalrgb.
+ */
+static void parse_optionalrgb(optionalrgb *out, unsigned *values)
+{
+    out->enabled = TRUE;
+    out->r = values[0] < 256 ? values[0] : 0;
+    out->g = values[1] < 256 ? values[1] : 0;
+    out->b = values[2] < 256 ? values[2] : 0;
+}
+
 /*
  * To prevent having to run the reasonably tricky bidi algorithm
  * too many times, we maintain a cache of the last lineful of data
@@ -5035,6 +5140,7 @@ static void do_paint(Terminal *term, Context ctx, int may_optimise)
 	int last_run_dirty = 0;
 	int laststart, dirtyrect;
 	int *backward;
+        truecolour tc;
 
 	scrpos.y = i + term->disptop;
 	ldata = lineptr(scrpos.y);
@@ -5064,6 +5170,7 @@ static void do_paint(Terminal *term, Context ctx, int may_optimise)
                 tattr = (tattr & ~(ATTR_FGMASK | ATTR_BGMASK)) | 
                 ATTR_DEFFG | ATTR_DEFBG;
 
+	    tc = d->truecolour;
 	    if (!term->xterm_256_colour) {
 		int colour;
 		colour = (tattr & ATTR_FGMASK) >> ATTR_FGSHIFT;
@@ -5131,6 +5238,7 @@ static void do_paint(Terminal *term, Context ctx, int may_optimise)
 	    /* FULL-TERMCHAR */
 	    newline[j].attr = tattr;
 	    newline[j].chr = tchar;
+	    newline[j].truecolour = tc;
 	    /* Combining characters are still read from lchars */
 	    newline[j].cc_next = 0;
 	}
@@ -5181,6 +5289,7 @@ static void do_paint(Terminal *term, Context ctx, int may_optimise)
 				  term->disptext[i]->lattr);
 	term->disptext[i]->lattr = ldata->lattr;
 
+	tc = term->erase_char.truecolour;
 	for (j = 0; j < term->cols; j++) {
 	    unsigned long tattr, tchar;
 	    int break_run, do_copy;
@@ -5194,6 +5303,9 @@ static void do_paint(Terminal *term, Context ctx, int may_optimise)
 
 	    break_run = ((tattr ^ attr) & term->attr_mask) != 0;
 
+            if (!truecolour_equal(newline[j].truecolour, tc))
+                break_run = TRUE;
+
 #ifdef USES_VTLINE_HACK
 	    /* Special hack for VT100 Linedraw glyphs */
 	    if ((tchar >= 0x23BA && tchar <= 0x23BD) ||
@@ -5226,15 +5338,15 @@ static void do_paint(Terminal *term, Context ctx, int may_optimise)
 
 	    if (break_run) {
 		if ((dirty_run || last_run_dirty) && ccount > 0) {
-		    do_text(ctx, start, i, ch, ccount, attr,
-			    ldata->lattr);
+		    do_text(ctx, start, i, ch, ccount, attr, ldata->lattr, tc);
 		    if (attr & (TATTR_ACTCURS | TATTR_PASCURS))
 			do_cursor(ctx, start, i, ch, ccount, attr,
-				  ldata->lattr);
+                                  ldata->lattr, tc);
 		}
 		start = j;
 		ccount = 0;
 		attr = tattr;
+		tc = newline[j].truecolour;
 		cset = CSET_OF(tchar);
 		if (term->ucsdata->dbcs_screenfont)
 		    last_run_dirty = dirty_run;
@@ -5303,6 +5415,7 @@ static void do_paint(Terminal *term, Context ctx, int may_optimise)
 		copy_termchar(term->disptext[i], j, d);
 		term->disptext[i]->chars[j].chr = tchar;
 		term->disptext[i]->chars[j].attr = tattr;
+		term->disptext[i]->chars[j].truecolour = tc;
 		if (start == j)
 		    term->disptext[i]->chars[j].attr |= DATTR_STARTRUN;
 	    }
@@ -5324,11 +5437,9 @@ static void do_paint(Terminal *term, Context ctx, int may_optimise)
 	    }
 	}
 	if (dirty_run && ccount > 0) {
-	    do_text(ctx, start, i, ch, ccount, attr,
-		    ldata->lattr);
+	    do_text(ctx, start, i, ch, ccount, attr, ldata->lattr, tc);
 	    if (attr & (TATTR_ACTCURS | TATTR_PASCURS))
-		do_cursor(ctx, start, i, ch, ccount, attr,
-			  ldata->lattr);
+		do_cursor(ctx, start, i, ch, ccount, attr, ldata->lattr, tc);
 	}
 
 	unlineptr(ldata);
diff --git a/terminal.h b/terminal.h
index 2ed9e6ef5..21b8774a2 100644
--- a/terminal.h
+++ b/terminal.h
@@ -40,6 +40,7 @@ struct termchar {
      */
     unsigned long chr;
     unsigned long attr;
+    truecolour truecolour;
 
     /*
      * The cc_next field is used to link multiple termchars
@@ -102,6 +103,7 @@ struct terminal_tag {
 #endif /* OPTIMISE_SCROLL */
 
     int default_attr, curr_attr, save_attr;
+    truecolour curr_truecolour;
     termchar basic_erase_char, erase_char;
 
     bufchain inbuf;		       /* terminal input buffer */
diff --git a/testdata/colours.txt b/testdata/colours.txt
index 2311eb83a..34dff8a5a 100644
--- a/testdata/colours.txt
+++ b/testdata/colours.txt
@@ -12,3 +12,4 @@ xterm 256: greys[48;5;236
 a0a1a2a3a4a5a6a7 a8a9aaabacadaeaf b0b1b2b3b4b5b6b7 b8b9babbbcbdbebf
 c0c1c2c3c4c5c6c7 c8c9cacbcccdcecf d0d1d2d3d4d5d6d7 d8d9dadbdcdddedf
 e0e1e2e3e4e5e6e7 e8e9eaebecedeeef f0f1f2f3f4f5f6f7 f8f9fafbfcfdfeff
+24-bit colour: SlateGrey OliveDrab goldenrod SaddleBrown DarkViolet (bg)
diff --git a/unix/gtkwin.c b/unix/gtkwin.c
index 9e73181e2..f49f92af6 100644
--- a/unix/gtkwin.c
+++ b/unix/gtkwin.c
@@ -3029,6 +3029,24 @@ static void draw_set_colour(struct draw_ctx *dctx, int col)
 #endif
 }
 
+static void draw_set_colour_rgb(struct draw_ctx *dctx, optionalrgb orgb)
+{
+#ifdef DRAW_TEXT_GDK
+    if (dctx->uctx.type == DRAWTYPE_GDK) {
+	GdkColor color;
+	color.red =   orgb.r * 256;
+	color.green = orgb.g * 256;
+	color.blue =  orgb.b * 256;
+	gdk_gc_set_rgb_fg_color(dctx->uctx.u.gdk.gc, &color);
+    }
+#endif
+#ifdef DRAW_TEXT_CAIRO
+    if (dctx->uctx.type == DRAWTYPE_CAIRO)
+        cairo_set_source_rgb(dctx->uctx.u.cairo.cr,
+                             orgb.r / 255.0, orgb.g / 255.0, orgb.b / 255.0);
+#endif
+}
+
 static void draw_rectangle(struct draw_ctx *dctx, int filled,
                            int x, int y, int w, int h)
 {
@@ -3222,7 +3240,7 @@ static void draw_backing_rect(struct gui_data *inst)
  * We are allowed to fiddle with the contents of `text'.
  */
 void do_text_internal(Context ctx, int x, int y, wchar_t *text, int len,
-		      unsigned long attr, int lattr)
+		      unsigned long attr, int lattr, truecolour truecolour)
 {
     struct draw_ctx *dctx = (struct draw_ctx *)ctx;
     struct gui_data *inst = dctx->inst;
@@ -3316,13 +3334,19 @@ void do_text_internal(Context ctx, int x, int y, wchar_t *text, int len,
                             ((lattr & LATTR_MODE) == LATTR_BOT));
     }
 
-    draw_set_colour(dctx, nbg);
+    if (truecolour.bg.enabled)
+	draw_set_colour_rgb(dctx, truecolour.bg);
+    else
+	draw_set_colour(dctx, nbg);
     draw_rectangle(dctx, TRUE,
                    x*inst->font_width+inst->window_border,
                    y*inst->font_height+inst->window_border,
                    rlen*widefactor*inst->font_width, inst->font_height);
 
-    draw_set_colour(dctx, nfg);
+    if (truecolour.fg.enabled)
+	draw_set_colour_rgb(dctx, truecolour.fg);
+    else
+	draw_set_colour(dctx, nfg);
     if (ncombining > 1) {
         assert(len == 1);
         unifont_draw_combining(&dctx->uctx, inst->fonts[fontid],
@@ -3362,13 +3386,13 @@ void do_text_internal(Context ctx, int x, int y, wchar_t *text, int len,
 }
 
 void do_text(Context ctx, int x, int y, wchar_t *text, int len,
-	     unsigned long attr, int lattr)
+	     unsigned long attr, int lattr, truecolour truecolour)
 {
     struct draw_ctx *dctx = (struct draw_ctx *)ctx;
     struct gui_data *inst = dctx->inst;
     int widefactor;
 
-    do_text_internal(ctx, x, y, text, len, attr, lattr);
+    do_text_internal(ctx, x, y, text, len, attr, lattr, truecolour);
 
     if (attr & ATTR_WIDE) {
 	widefactor = 2;
@@ -3392,7 +3416,7 @@ void do_text(Context ctx, int x, int y, wchar_t *text, int len,
 }
 
 void do_cursor(Context ctx, int x, int y, wchar_t *text, int len,
-	       unsigned long attr, int lattr)
+	       unsigned long attr, int lattr, truecolour truecolour)
 {
     struct draw_ctx *dctx = (struct draw_ctx *)ctx;
     struct gui_data *inst = dctx->inst;
@@ -3409,7 +3433,7 @@ void do_cursor(Context ctx, int x, int y, wchar_t *text, int len,
         active = 1;
     } else
         active = 0;
-    do_text_internal(ctx, x, y, text, len, attr, lattr);
+    do_text_internal(ctx, x, y, text, len, attr, lattr, truecolour);
 
     if (attr & TATTR_COMBINING)
 	len = 1;
diff --git a/windows/window.c b/windows/window.c
index 966003114..452eb7716 100644
--- a/windows/window.c
+++ b/windows/window.c
@@ -3395,7 +3395,7 @@ static void sys_cursor_update(void)
  * We are allowed to fiddle with the contents of `text'.
  */
 void do_text_internal(Context ctx, int x, int y, wchar_t *text, int len,
-		      unsigned long attr, int lattr)
+		      unsigned long attr, int lattr, truecolour truecolour)
 {
     COLORREF fg, bg, t;
     int nfg, nbg, nfont;
@@ -3522,8 +3522,16 @@ void do_text_internal(Context ctx, int x, int y, wchar_t *text, int len,
 	if (nbg < 16) nbg |= 8;
 	else if (nbg >= 256) nbg |= 1;
     }
-    fg = colours[nfg];
-    bg = colours[nbg];
+    if (truecolour.fg.enabled)
+	fg = RGB(truecolour.fg.r, truecolour.fg.g, truecolour.fg.b);
+    else
+	fg = colours[nfg];
+
+    if (truecolour.bg.enabled)
+	bg = RGB(truecolour.bg.r, truecolour.bg.g, truecolour.bg.b);
+    else
+	bg = colours[nbg];
+
     SelectObject(hdc, fonts[nfont]);
     SetTextColor(hdc, fg);
     SetBkColor(hdc, bg);
@@ -3768,7 +3776,7 @@ void do_text_internal(Context ctx, int x, int y, wchar_t *text, int len,
  * Wrapper that handles combining characters.
  */
 void do_text(Context ctx, int x, int y, wchar_t *text, int len,
-	     unsigned long attr, int lattr)
+	     unsigned long attr, int lattr, truecolour truecolour)
 {
     if (attr & TATTR_COMBINING) {
 	unsigned long a = 0;
@@ -3778,13 +3786,13 @@ void do_text(Context ctx, int x, int y, wchar_t *text, int len,
 	    len0 = 2;
 	if (len-len0 >= 1 && IS_LOW_VARSEL(text[len0])) {
 	    attr &= ~TATTR_COMBINING;
-	    do_text_internal(ctx, x, y, text, len0+1, attr, lattr);
+	    do_text_internal(ctx, x, y, text, len0+1, attr, lattr, truecolour);
 	    text += len0+1;
 	    len -= len0+1;
 	    a = TATTR_COMBINING;
 	} else if (len-len0 >= 2 && IS_HIGH_VARSEL(text[len0], text[len0+1])) {
 	    attr &= ~TATTR_COMBINING;
-	    do_text_internal(ctx, x, y, text, len0+2, attr, lattr);
+	    do_text_internal(ctx, x, y, text, len0+2, attr, lattr, truecolour);
 	    text += len0+2;
 	    len -= len0+2;
 	    a = TATTR_COMBINING;
@@ -3794,22 +3802,21 @@ void do_text(Context ctx, int x, int y, wchar_t *text, int len,
 
 	while (len--) {
 	    if (len >= 1 && IS_SURROGATE_PAIR(text[0], text[1])) {
-		do_text_internal(ctx, x, y, text, 2, attr | a, lattr);
+		do_text_internal(ctx, x, y, text, 2, attr | a, lattr, truecolour);
 		len--;
 		text++;
-	    } else {
-                do_text_internal(ctx, x, y, text, 1, attr | a, lattr);
-            }
+	    } else
+                do_text_internal(ctx, x, y, text, 1, attr | a, lattr, truecolour);
 
 	    text++;
 	    a = TATTR_COMBINING;
 	}
     } else
-	do_text_internal(ctx, x, y, text, len, attr, lattr);
+	do_text_internal(ctx, x, y, text, len, attr, lattr, truecolour);
 }
 
 void do_cursor(Context ctx, int x, int y, wchar_t *text, int len,
-	       unsigned long attr, int lattr)
+	       unsigned long attr, int lattr, truecolour truecolour)
 {
 
     int fnt_width;
@@ -3821,7 +3828,7 @@ void do_cursor(Context ctx, int x, int y, wchar_t *text, int len,
 
     if ((attr & TATTR_ACTCURS) && (ctype == 0 || term->big_cursor)) {
 	if (*text != UCSWIDE) {
-	    do_text(ctx, x, y, text, len, attr, lattr);
+	    do_text(ctx, x, y, text, len, attr, lattr, truecolour);
 	    return;
 	}
 	ctype = 2;

From 16214ea0f5de7023c7e08fba57e7a49c2d518583 Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Sun, 1 Oct 2017 20:59:00 +0100
Subject: [PATCH 069/166] Initialise term->curr_truecolour at startup.

Somehow I managed to miss _that_ really obvious bug in the true-
colour patch.
---
 terminal.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/terminal.c b/terminal.c
index e597d472e..0eb1a9a6c 100644
--- a/terminal.c
+++ b/terminal.c
@@ -1296,6 +1296,7 @@ static void power_on(Terminal *term, int clear)
     term->big_cursor = 0;
     term->default_attr = term->save_attr =
 	term->alt_save_attr = term->curr_attr = ATTR_DEFAULT;
+    term->curr_truecolour.fg = term->curr_truecolour.bg = optionalrgb_none;
     term->term_editing = term->term_echoing = FALSE;
     term->app_cursor_keys = conf_get_int(term->conf, CONF_app_cursor);
     term->app_keypad_keys = conf_get_int(term->conf, CONF_app_keypad);

From f813e9f937b5b6198659c8c64b3090dc3902b930 Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Sun, 1 Oct 2017 21:05:25 +0100
Subject: [PATCH 070/166] uxnet.c: don't close a socket's fd if it is -1.

This is harmless in principle (you just get EBADF back from close(2)
and ignore it), but it leads to warnings in valgrind.
---
 unix/uxnet.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/unix/uxnet.c b/unix/uxnet.c
index ddcd92280..f3498527f 100644
--- a/unix/uxnet.c
+++ b/unix/uxnet.c
@@ -1023,9 +1023,11 @@ static void sk_tcp_close(Socket sock)
     if (s->child)
         sk_tcp_close((Socket)s->child);
 
-    uxsel_del(s->s);
     del234(sktree, s);
-    close(s->s);
+    if (s->s >= 0) {
+        uxsel_del(s->s);
+        close(s->s);
+    }
     if (s->addr)
         sk_addr_free(s->addr);
     sfree(s);

From 6b824713d56bf105cede71daa186593aa9906718 Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Sun, 1 Oct 2017 21:53:32 +0100
Subject: [PATCH 071/166] term_mouse: make special treatment of x < 0 more
 selective.

A mouse drag which manages to reach x < 0 (via SetCapture or
equivalent) was treated as having the coordinates of (x_max, y-1).
This is intended to be useful when the mouse drag is part of ordinary
raster-ordered selection.

But we were leaving that treatment enabled even for mouse actions that
went to xterm mouse tracking mode - thanks to Markus Gans for
reporting that - and when I investigated, I realised that this isn't a
sensible transformation in _rectangular_ selection mode either. Fixed
both.
---
 terminal.c | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/terminal.c b/terminal.c
index 0eb1a9a6c..433b3fa52 100644
--- a/terminal.c
+++ b/terminal.c
@@ -6088,7 +6088,18 @@ void term_mouse(Terminal *term, Mouse_Button braw, Mouse_Button bcooked,
 	    term_scroll(term, 0, +1);
     }
     if (x < 0) {
-	if (y > 0) {
+	if (y > 0 && !raw_mouse && term->seltype != RECTANGULAR) {
+            /*
+             * When we're using the mouse for normal raster-based
+             * selection, dragging off the left edge of a terminal row
+             * is treated the same as the right-hand end of the
+             * previous row, in that it's considered to identify a
+             * point _before_ the first character on row y.
+             *
+             * But if the mouse action is going to be used for
+             * anything else - rectangular selection, or xterm mouse
+             * tracking - then we disable this special treatment.
+             */
 	    x = term->cols - 1;
 	    y--;
 	} else

From 2f9738a282c9b738b135198d34c61f7d81aa69c1 Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Thu, 5 Oct 2017 20:27:27 +0100
Subject: [PATCH 072/166] Make terminal true-colour mode configurable.

I know some users don't like any colour _at all_, and we have a
separate option to turn off xterm-style 256-colour sequences, so it
seems remiss not to have an option to disable true colour as well.
---
 config.c          | 3 +++
 doc/config.but    | 9 +++++++++
 putty.h           | 1 +
 settings.c        | 2 ++
 terminal.c        | 8 +++++++-
 terminal.h        | 1 +
 windows/winhelp.h | 1 +
 7 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/config.c b/config.c
index efe1ff1ec..cc5e726b3 100644
--- a/config.c
+++ b/config.c
@@ -1898,6 +1898,9 @@ void setup_config_box(struct controlbox *b, int midsession,
     ctrl_checkbox(s, "Allow terminal to use xterm 256-colour mode", '2',
 		  HELPCTX(colours_xterm256), conf_checkbox_handler,
 		  I(CONF_xterm_256_colour));
+    ctrl_checkbox(s, "Allow terminal to use 24-bit colours", '4',
+		  HELPCTX(colours_truecolour), conf_checkbox_handler,
+		  I(CONF_true_colour));
     ctrl_radiobuttons(s, "Indicate bolded text by changing:", 'b', 3,
                       HELPCTX(colours_bold),
                       conf_radiobutton_handler, I(CONF_bold_style),
diff --git a/doc/config.but b/doc/config.but
index bd12efb28..7ad5e2822 100644
--- a/doc/config.but
+++ b/doc/config.but
@@ -1549,6 +1549,15 @@ If you do not see \cq{colors#256} in the output, you may need to
 change your terminal setting. On modern Linux machines, you could
 try \cq{xterm-256color}.
 
+\S{config-truecolour} \q{Allow terminal to use 24-bit colour}
+
+\cfg{winhelp-topic}{colours.truecolour}
+
+This option is enabled by default. If it is disabled, PuTTY will
+ignore any control sequences sent by the server which use the control
+sequences supported by modern terminals to specify arbitrary 24-bit
+RGB colour value.
+
 \S{config-boldcolour} \q{Indicate bolded text by changing...}
 
 \cfg{winhelp-topic}{colours.bold}
diff --git a/putty.h b/putty.h
index 61d6278da..8a8b54254 100644
--- a/putty.h
+++ b/putty.h
@@ -859,6 +859,7 @@ void cleanup_exit(int);
     /* Colour options */ \
     X(INT, NONE, ansi_colour) \
     X(INT, NONE, xterm_256_colour) \
+    X(INT, NONE, true_colour) \
     X(INT, NONE, system_colour) \
     X(INT, NONE, try_palette) \
     X(INT, NONE, bold_style) \
diff --git a/settings.c b/settings.c
index 00c01c546..47e5b9f75 100644
--- a/settings.c
+++ b/settings.c
@@ -609,6 +609,7 @@ void save_open_settings(void *sesskey, Conf *conf)
     write_setting_i(sesskey, "TryPalette", conf_get_int(conf, CONF_try_palette));
     write_setting_i(sesskey, "ANSIColour", conf_get_int(conf, CONF_ansi_colour));
     write_setting_i(sesskey, "Xterm256Colour", conf_get_int(conf, CONF_xterm_256_colour));
+    write_setting_i(sesskey, "TrueColour", conf_get_int(conf, CONF_true_colour));
     write_setting_i(sesskey, "BoldAsColour", conf_get_int(conf, CONF_bold_style)-1);
 
     for (i = 0; i < 22; i++) {
@@ -1005,6 +1006,7 @@ void load_open_settings(void *sesskey, Conf *conf)
     gppi(sesskey, "TryPalette", 0, conf, CONF_try_palette);
     gppi(sesskey, "ANSIColour", 1, conf, CONF_ansi_colour);
     gppi(sesskey, "Xterm256Colour", 1, conf, CONF_xterm_256_colour);
+    gppi(sesskey, "TrueColour", 1, conf, CONF_true_colour);
     i = gppi_raw(sesskey, "BoldAsColour", 1); conf_set_int(conf, CONF_bold_style, i+1);
 
     for (i = 0; i < 22; i++) {
diff --git a/terminal.c b/terminal.c
index 433b3fa52..5102db12a 100644
--- a/terminal.c
+++ b/terminal.c
@@ -1458,6 +1458,7 @@ void term_copy_stuff_from_conf(Terminal *term)
     term->scroll_on_disp = conf_get_int(term->conf, CONF_scroll_on_disp);
     term->scroll_on_key = conf_get_int(term->conf, CONF_scroll_on_key);
     term->xterm_256_colour = conf_get_int(term->conf, CONF_xterm_256_colour);
+    term->true_colour = conf_get_int(term->conf, CONF_true_colour);
 
     /*
      * Parse the control-character escapes in the configured
@@ -5171,7 +5172,6 @@ static void do_paint(Terminal *term, Context ctx, int may_optimise)
                 tattr = (tattr & ~(ATTR_FGMASK | ATTR_BGMASK)) | 
                 ATTR_DEFFG | ATTR_DEFBG;
 
-	    tc = d->truecolour;
 	    if (!term->xterm_256_colour) {
 		int colour;
 		colour = (tattr & ATTR_FGMASK) >> ATTR_FGSHIFT;
@@ -5182,6 +5182,12 @@ static void do_paint(Terminal *term, Context ctx, int may_optimise)
 		    tattr = (tattr &~ ATTR_BGMASK) | ATTR_DEFBG;
 	    }
 
+            if (term->true_colour) {
+                tc = d->truecolour;
+            } else {
+                tc.fg = tc.bg = optionalrgb_none;
+            }
+
 	    switch (tchar & CSET_MASK) {
 	      case CSET_ASCII:
 		tchar = term->ucsdata->unitab_line[tchar & 0xFF];
diff --git a/terminal.h b/terminal.h
index 21b8774a2..4a205a776 100644
--- a/terminal.h
+++ b/terminal.h
@@ -325,6 +325,7 @@ struct terminal_tag {
     int scroll_on_disp;
     int scroll_on_key;
     int xterm_256_colour;
+    int true_colour;
 };
 
 #define in_utf(term) ((term)->utf || (term)->ucsdata->line_codepage==CP_UTF8)
diff --git a/windows/winhelp.h b/windows/winhelp.h
index 761c8c76a..dbe32c919 100644
--- a/windows/winhelp.h
+++ b/windows/winhelp.h
@@ -125,6 +125,7 @@
 #define WINHELP_CTX_selection_rtf "selection.rtf:config-rtfpaste"
 #define WINHELP_CTX_colours_ansi "colours.ansi:config-ansicolour"
 #define WINHELP_CTX_colours_xterm256 "colours.xterm256:config-xtermcolour"
+#define WINHELP_CTX_colours_truecolour "colours.truecolour:config-truecolour"
 #define WINHELP_CTX_colours_bold "colours.bold:config-boldcolour"
 #define WINHELP_CTX_colours_system "colours.system:config-syscolour"
 #define WINHELP_CTX_colours_logpal "colours.logpal:config-logpalette"

From 1adf211d70e162b50b18ede5a9c6ba6ae73ac8b2 Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Thu, 5 Oct 2017 20:30:09 +0100
Subject: [PATCH 073/166] Disable true colour on monochrome or paletted
 displays.

I'm not sure if any X11 monochrome visuals or Windows paletted display
modes are still around, but just in case they are, we shouldn't
attempt true colour on either kind of display.
---
 unix/gtkwin.c    | 3 +++
 windows/window.c | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/unix/gtkwin.c b/unix/gtkwin.c
index f49f92af6..94ba4069b 100644
--- a/unix/gtkwin.c
+++ b/unix/gtkwin.c
@@ -3255,6 +3255,9 @@ void do_text_internal(Context ctx, int x, int y, wchar_t *text, int len,
     } else
 	ncombining = 1;
 
+    if (monochrome)
+        truecolour.fg = truecolour.bg = optionalrgb_none;
+
     nfg = ((monochrome ? ATTR_DEFFG : (attr & ATTR_FGMASK)) >> ATTR_FGSHIFT);
     nbg = ((monochrome ? ATTR_DEFBG : (attr & ATTR_BGMASK)) >> ATTR_BGSHIFT);
     if (!!(attr & ATTR_REVERSE) ^ (monochrome && (attr & TATTR_ACTCURS))) {
diff --git a/windows/window.c b/windows/window.c
index 452eb7716..79738ff9d 100644
--- a/windows/window.c
+++ b/windows/window.c
@@ -3522,12 +3522,12 @@ void do_text_internal(Context ctx, int x, int y, wchar_t *text, int len,
 	if (nbg < 16) nbg |= 8;
 	else if (nbg >= 256) nbg |= 1;
     }
-    if (truecolour.fg.enabled)
+    if (!pal && truecolour.fg.enabled)
 	fg = RGB(truecolour.fg.r, truecolour.fg.g, truecolour.fg.b);
     else
 	fg = colours[nfg];
 
-    if (truecolour.bg.enabled)
+    if (!pal && truecolour.bg.enabled)
 	bg = RGB(truecolour.bg.r, truecolour.bg.g, truecolour.bg.b);
     else
 	bg = colours[nbg];

From 262376a054719f0c248032df97be66142f0208e3 Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Thu, 5 Oct 2017 20:30:04 +0100
Subject: [PATCH 074/166] Make the cursor colour override true colour.

Otherwise, moving the cursor (at least in active, filled-cell mode) on
to a true-coloured character cell causes it to vanish completely
because the cell's colours override the thing that differentiates the
cursor.
---
 unix/gtkwin.c    | 1 +
 windows/window.c | 1 +
 2 files changed, 2 insertions(+)

diff --git a/unix/gtkwin.c b/unix/gtkwin.c
index 94ba4069b..dcff614ff 100644
--- a/unix/gtkwin.c
+++ b/unix/gtkwin.c
@@ -3274,6 +3274,7 @@ void do_text_internal(Context ctx, int x, int y, wchar_t *text, int len,
 	else if (nbg >= 256) nbg |= 1;
     }
     if ((attr & TATTR_ACTCURS) && !monochrome) {
+        truecolour.fg = truecolour.bg = optionalrgb_none;
 	nfg = 260;
 	nbg = 261;
     }
diff --git a/windows/window.c b/windows/window.c
index 79738ff9d..97c4d462a 100644
--- a/windows/window.c
+++ b/windows/window.c
@@ -3429,6 +3429,7 @@ void do_text_internal(Context ctx, int x, int y, wchar_t *text, int len,
     y += offset_height;
 
     if ((attr & TATTR_ACTCURS) && (cursor_type == 0 || term->big_cursor)) {
+        truecolour.fg = truecolour.bg = optionalrgb_none;
 	attr &= ~(ATTR_REVERSE|ATTR_BLINK|ATTR_COLOURS);
 	/* cursor fg and bg */
 	attr |= (260 << ATTR_FGSHIFT) | (261 << ATTR_BGSHIFT);

From 4743798400e3eeae2902c4540da905a565f05c47 Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Thu, 5 Oct 2017 20:43:02 +0100
Subject: [PATCH 075/166] Support OSC 4 terminal colour-palette queries.

Markus Gans points out that some applications which (not at all
unreasonably) don't trust $TERM to tell them the full capabilities of
their terminal will use the sequence "OSC 4 ; nn ; ? BEL" to ask for
the colour-palette value in position nn, and they may not particularly
care _what_ the results are but they will use them to decide whether
the right number of colour palette entries even exist.
---
 fuzzterm.c       |  1 +
 putty.h          |  1 +
 terminal.c       | 66 +++++++++++++++++++++++++++++++++++-------------
 unix/gtkwin.c    | 11 ++++++++
 windows/window.c | 52 +++++++++++++++++++++++++-------------
 5 files changed, 96 insertions(+), 35 deletions(-)

diff --git a/fuzzterm.c b/fuzzterm.c
index 480dca379..c57412c46 100644
--- a/fuzzterm.c
+++ b/fuzzterm.c
@@ -81,6 +81,7 @@ Context get_ctx(void *frontend) {
 void free_ctx(Context ctx) { }
 void palette_set(void *frontend, int a, int b, int c, int d) { }
 void palette_reset(void *frontend) { }
+int palette_get(void *frontend, int n, int *r, int *g, int *b) {return FALSE;}
 void write_clip(void *frontend, wchar_t *a, int *b, int c, int d) { }
 void get_clip(void *frontend, wchar_t **w, int *i) { }
 void set_raw_mouse_mode(void *frontend, int m) { }
diff --git a/putty.h b/putty.h
index 8a8b54254..f89d07097 100644
--- a/putty.h
+++ b/putty.h
@@ -633,6 +633,7 @@ Context get_ctx(void *frontend);
 void free_ctx(Context);
 void palette_set(void *frontend, int, int, int, int);
 void palette_reset(void *frontend);
+int palette_get(void *frontend, int n, int *r, int *g, int *b);
 void write_aclip(void *frontend, char *, int, int);
 void write_clip(void *frontend, wchar_t *, int *, int, int);
 void get_clip(void *frontend, wchar_t **, int *);
diff --git a/terminal.c b/terminal.c
index 5102db12a..0fa52e172 100644
--- a/terminal.c
+++ b/terminal.c
@@ -2727,6 +2727,22 @@ static void do_osc(Terminal *term)
 	    if (!term->no_remote_wintitle)
 		set_title(term->frontend, term->osc_string);
 	    break;
+          case 4:
+            if (term->ldisc && !strcmp(term->osc_string, "?")) {
+                int r, g, b;
+                if (palette_get(term->frontend, toint(term->esc_args[1]),
+                                &r, &g, &b)) {
+                    char *reply_buf = dupprintf(
+                        "\033]4;%u;rgb:%04x/%04x/%04x\007",
+                        term->esc_args[1],
+                        (unsigned)r * 0x0101,
+                        (unsigned)g * 0x0101,
+                        (unsigned)b * 0x0101);
+                    ldisc_send(term->ldisc, reply_buf, strlen(reply_buf), 0);
+                    sfree(reply_buf);
+                }
+            }
+            break;
 	}
     }
 }
@@ -3365,6 +3381,7 @@ static void term_out(Terminal *term)
 		    compatibility(OTHER);
 		    term->termstate = SEEN_OSC;
 		    term->esc_args[0] = 0;
+                    term->esc_nargs = 1;
 		    break;
 		  case '7':		/* DECSC: save cursor */
 		    compatibility(VT100);
@@ -4470,25 +4487,40 @@ static void term_out(Terminal *term)
 		  case '7':
 		  case '8':
 		  case '9':
-		    if (term->esc_args[0] <= UINT_MAX / 10 &&
-			term->esc_args[0] * 10 <= UINT_MAX - c - '0')
-			term->esc_args[0] = 10 * term->esc_args[0] + c - '0';
+		    if (term->esc_args[term->esc_nargs-1] <= UINT_MAX / 10 &&
+			term->esc_args[term->esc_nargs-1] * 10 <= UINT_MAX - c - '0')
+			term->esc_args[term->esc_nargs-1] =
+                            10 * term->esc_args[term->esc_nargs-1] + c - '0';
 		    else
-			term->esc_args[0] = UINT_MAX;
+			term->esc_args[term->esc_nargs-1] = UINT_MAX;
 		    break;
-		  case 'L':
-		    /*
-		     * Grotty hack to support xterm and DECterm title
-		     * sequences concurrently.
-		     */
-		    if (term->esc_args[0] == 2) {
-			term->esc_args[0] = 1;
-			break;
-		    }
-		    /* else fall through */
-		  default:
-		    term->termstate = OSC_STRING;
-		    term->osc_strlen = 0;
+                  default:
+                    /*
+                     * _Most_ other characters here terminate the
+                     * immediate parsing of the OSC sequence and go
+                     * into OSC_STRING state, but we deal with a
+                     * couple of exceptions first.
+                     */
+                    if (c == 'L' && term->esc_args[0] == 2) {
+                        /*
+                         * Grotty hack to support xterm and DECterm title
+                         * sequences concurrently.
+                         */
+                        term->esc_args[0] = 1;
+                    } else if (c == ';' && term->esc_nargs == 1 &&
+                               term->esc_args[0] == 4) {
+                        /*
+                         * xterm's OSC 4 sequence to query the current
+                         * RGB value of a colour takes a second
+                         * numeric argument which is easiest to parse
+                         * using the existing system rather than in
+                         * do_osc.
+                         */
+                        term->esc_args[term->esc_nargs++] = 0;
+                    } else {
+                        term->termstate = OSC_STRING;
+                        term->osc_strlen = 0;
+                    }
 		}
 		break;
 	      case OSC_STRING:
diff --git a/unix/gtkwin.c b/unix/gtkwin.c
index dcff614ff..969c42ffe 100644
--- a/unix/gtkwin.c
+++ b/unix/gtkwin.c
@@ -2222,6 +2222,17 @@ void palette_set(void *frontend, int n, int r, int g, int b)
     }
 }
 
+int palette_get(void *frontend, int n, int *r, int *g, int *b)
+{
+    struct gui_data *inst = (struct gui_data *)frontend;
+    if (n < 0 || n >= NALLCOLOURS)
+	return FALSE;
+    *r = inst->cols[n].red >> 8;
+    *g = inst->cols[n].green >> 8;
+    *b = inst->cols[n].blue >> 8;
+    return TRUE;
+}
+
 void palette_reset(void *frontend)
 {
     struct gui_data *inst = (struct gui_data *)frontend;
diff --git a/windows/window.c b/windows/window.c
index 97c4d462a..aa96a5789 100644
--- a/windows/window.c
+++ b/windows/window.c
@@ -198,6 +198,9 @@ static int descent;
 #define NEXTCOLOURS 240
 #define NALLCOLOURS (NCFGCOLOURS + NEXTCOLOURS)
 static COLORREF colours[NALLCOLOURS];
+struct rgb {
+    int r, g, b;
+} colours_rgb[NALLCOLOURS];
 static HPALETTE pal;
 static LPLOGPALETTE logpal;
 static RGBTRIPLE defpal[NALLCOLOURS];
@@ -1264,6 +1267,19 @@ static void systopalette(void)
     }
 }
 
+static void internal_set_colour(int i, int r, int g, int b)
+{
+    assert(i >= 0);
+    assert(i < NALLCOLOURS);
+    if (pal)
+        colours[i] = PALETTERGB(r, g, b);
+    else
+        colours[i] = RGB(r, g, b);
+    colours_rgb[i].r = r;
+    colours_rgb[i].g = g;
+    colours_rgb[i].b = b;
+}
+
 /*
  * Set up the colour palette.
  */
@@ -1298,15 +1314,9 @@ static void init_palette(void)
 	}
 	ReleaseDC(hwnd, hdc);
     }
-    if (pal)
-	for (i = 0; i < NALLCOLOURS; i++)
-	    colours[i] = PALETTERGB(defpal[i].rgbtRed,
-				    defpal[i].rgbtGreen,
-				    defpal[i].rgbtBlue);
-    else
-	for (i = 0; i < NALLCOLOURS; i++)
-	    colours[i] = RGB(defpal[i].rgbtRed,
-			     defpal[i].rgbtGreen, defpal[i].rgbtBlue);
+    for (i = 0; i < NALLCOLOURS; i++)
+        internal_set_colour(i, defpal[i].rgbtRed,
+                            defpal[i].rgbtGreen, defpal[i].rgbtBlue);
 }
 
 /*
@@ -4865,15 +4875,24 @@ void free_ctx(Context ctx)
 
 static void real_palette_set(int n, int r, int g, int b)
 {
+    internal_set_colour(n, r, g, b);
     if (pal) {
 	logpal->palPalEntry[n].peRed = r;
 	logpal->palPalEntry[n].peGreen = g;
 	logpal->palPalEntry[n].peBlue = b;
 	logpal->palPalEntry[n].peFlags = PC_NOCOLLAPSE;
-	colours[n] = PALETTERGB(r, g, b);
 	SetPaletteEntries(pal, 0, NALLCOLOURS, logpal->palPalEntry);
-    } else
-	colours[n] = RGB(r, g, b);
+    }
+}
+
+int palette_get(void *frontend, int n, int *r, int *g, int *b)
+{
+    if (n < 0 || n >= NALLCOLOURS)
+	return FALSE;
+    *r = colours_rgb[n].r;
+    *g = colours_rgb[n].g;
+    *b = colours_rgb[n].b;
+    return TRUE;
 }
 
 void palette_set(void *frontend, int n, int r, int g, int b)
@@ -4903,17 +4922,14 @@ void palette_reset(void *frontend)
 
     /* And this */
     for (i = 0; i < NALLCOLOURS; i++) {
+        internal_set_colour(i, defpal[i].rgbtRed,
+                            defpal[i].rgbtGreen, defpal[i].rgbtBlue);
 	if (pal) {
 	    logpal->palPalEntry[i].peRed = defpal[i].rgbtRed;
 	    logpal->palPalEntry[i].peGreen = defpal[i].rgbtGreen;
 	    logpal->palPalEntry[i].peBlue = defpal[i].rgbtBlue;
 	    logpal->palPalEntry[i].peFlags = 0;
-	    colours[i] = PALETTERGB(defpal[i].rgbtRed,
-				    defpal[i].rgbtGreen,
-				    defpal[i].rgbtBlue);
-	} else
-	    colours[i] = RGB(defpal[i].rgbtRed,
-			     defpal[i].rgbtGreen, defpal[i].rgbtBlue);
+	}
     }
 
     if (pal) {

From 1a718403d40ccb88a1436eff98c82bf92268ef96 Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Thu, 5 Oct 2017 21:02:56 +0100
Subject: [PATCH 076/166] Support SGR 2 to dim the foreground colour.

I've done this on a 'where possible' basis: in Windows paletted mode
(in case anyone is still using an old enough graphics card to need
that!) I simply haven't bothered, and will completely ignore the dim
flag.
---
 putty.h          | 19 ++++++++-------
 terminal.c       |  8 +++++--
 unix/gtkwin.c    | 61 ++++++++++++++++++++++++++++++++++--------------
 windows/window.c |  8 ++++++-
 4 files changed, 67 insertions(+), 29 deletions(-)

diff --git a/putty.h b/putty.h
index f89d07097..a9433fa70 100644
--- a/putty.h
+++ b/putty.h
@@ -104,15 +104,16 @@ typedef struct terminal_tag Terminal;
  */
 #define UCSWIDE	     0xDFFF
 
-#define ATTR_NARROW  0x800000U
-#define ATTR_WIDE    0x400000U
-#define ATTR_BOLD    0x040000U
-#define ATTR_UNDER   0x080000U
-#define ATTR_REVERSE 0x100000U
-#define ATTR_BLINK   0x200000U
-#define ATTR_FGMASK  0x0001FFU
-#define ATTR_BGMASK  0x03FE00U
-#define ATTR_COLOURS 0x03FFFFU
+#define ATTR_NARROW  0x0800000U
+#define ATTR_WIDE    0x0400000U
+#define ATTR_BOLD    0x0040000U
+#define ATTR_UNDER   0x0080000U
+#define ATTR_REVERSE 0x0100000U
+#define ATTR_BLINK   0x0200000U
+#define ATTR_FGMASK  0x00001FFU
+#define ATTR_BGMASK  0x003FE00U
+#define ATTR_COLOURS 0x003FFFFU
+#define ATTR_DIM     0x1000000U
 #define ATTR_FGSHIFT 0
 #define ATTR_BGSHIFT 9
 
diff --git a/terminal.c b/terminal.c
index 0fa52e172..de5748e96 100644
--- a/terminal.c
+++ b/terminal.c
@@ -3881,6 +3881,10 @@ static void term_out(Terminal *term)
 				    compatibility(VT100AVO);
 				    term->curr_attr |= ATTR_BOLD;
 				    break;
+				  case 2:	/* enable dim */
+				    compatibility(OTHER);
+				    term->curr_attr |= ATTR_DIM;
+				    break;
 				  case 21:	/* (enable double underline) */
 				    compatibility(OTHER);
 				  case 4:	/* enable underline */
@@ -3912,9 +3916,9 @@ static void term_out(Terminal *term)
 				    compatibility(SCOANSI);
 				    if (term->no_remote_charset) break;
 				    term->sco_acs = 2; break;
-				  case 22:	/* disable bold */
+				  case 22:	/* disable bold and dim */
 				    compatibility2(OTHER, VT220);
-				    term->curr_attr &= ~ATTR_BOLD;
+				    term->curr_attr &= ~(ATTR_BOLD | ATTR_DIM);
 				    break;
 				  case 24:	/* disable underline */
 				    compatibility2(OTHER, VT220);
diff --git a/unix/gtkwin.c b/unix/gtkwin.c
index 969c42ffe..5c6295190 100644
--- a/unix/gtkwin.c
+++ b/unix/gtkwin.c
@@ -3023,24 +3023,44 @@ static void draw_update(struct draw_ctx *dctx, int x, int y, int w, int h)
     gtk_widget_queue_draw_area(dctx->inst->area, x, y, w, h);
 }
 
-static void draw_set_colour(struct draw_ctx *dctx, int col)
+#ifdef DRAW_TEXT_CAIRO
+static void cairo_set_source_rgb_dim(cairo_t *cr, double r, double g, double b,
+                                     int dim)
+{
+    if (dim)
+        cairo_set_source_rgb(cr, r * 2 / 3, g * 2 / 3, b * 2 / 3);
+    else
+        cairo_set_source_rgb(cr, r, g, b);
+}
+#endif
+
+static void draw_set_colour(struct draw_ctx *dctx, int col, int dim)
 {
 #ifdef DRAW_TEXT_GDK
     if (dctx->uctx.type == DRAWTYPE_GDK) {
-        gdk_gc_set_foreground(dctx->uctx.u.gdk.gc, &dctx->inst->cols[col]);
+        if (dim) {
+            GdkColor color;
+            color.red =   dctx->inst->cols[col].red   * 2 / 3;
+            color.green = dctx->inst->cols[col].green * 2 / 3;
+            color.blue =  dctx->inst->cols[col].blue  * 2 / 3;
+            gdk_gc_set_rgb_fg_color(dctx->uctx.u.gdk.gc, &color);
+        } else {
+            gdk_gc_set_foreground(dctx->uctx.u.gdk.gc, &dctx->inst->cols[col]);
+        }
     }
 #endif
 #ifdef DRAW_TEXT_CAIRO
     if (dctx->uctx.type == DRAWTYPE_CAIRO) {
-        cairo_set_source_rgb(dctx->uctx.u.cairo.cr,
-                             dctx->inst->cols[col].red / 65535.0,
-                             dctx->inst->cols[col].green / 65535.0,
-                             dctx->inst->cols[col].blue / 65535.0);
+        cairo_set_source_rgb_dim(dctx->uctx.u.cairo.cr,
+                                 dctx->inst->cols[col].red / 65535.0,
+                                 dctx->inst->cols[col].green / 65535.0,
+                                 dctx->inst->cols[col].blue / 65535.0, dim);
     }
 #endif
 }
 
-static void draw_set_colour_rgb(struct draw_ctx *dctx, optionalrgb orgb)
+static void draw_set_colour_rgb(struct draw_ctx *dctx, optionalrgb orgb,
+                                int dim)
 {
 #ifdef DRAW_TEXT_GDK
     if (dctx->uctx.type == DRAWTYPE_GDK) {
@@ -3048,13 +3068,19 @@ static void draw_set_colour_rgb(struct draw_ctx *dctx, optionalrgb orgb)
 	color.red =   orgb.r * 256;
 	color.green = orgb.g * 256;
 	color.blue =  orgb.b * 256;
+        if (dim) {
+            color.red   = color.red   * 2 / 3;
+            color.green = color.green * 2 / 3;
+            color.blue  = color.blue  * 2 / 3;
+        }
 	gdk_gc_set_rgb_fg_color(dctx->uctx.u.gdk.gc, &color);
     }
 #endif
 #ifdef DRAW_TEXT_CAIRO
-    if (dctx->uctx.type == DRAWTYPE_CAIRO)
-        cairo_set_source_rgb(dctx->uctx.u.cairo.cr,
-                             orgb.r / 255.0, orgb.g / 255.0, orgb.b / 255.0);
+    if (dctx->uctx.type == DRAWTYPE_CAIRO) {
+        cairo_set_source_rgb_dim(dctx->uctx.u.cairo.cr, orgb.r / 255.0,
+                                 orgb.g / 255.0, orgb.b / 255.0, dim);
+    }
 #endif
 }
 
@@ -3238,7 +3264,7 @@ static void draw_backing_rect(struct gui_data *inst)
     struct draw_ctx *dctx = get_ctx(inst);
     int w = inst->width * inst->font_width + 2*inst->window_border;
     int h = inst->height * inst->font_height + 2*inst->window_border;
-    draw_set_colour(dctx, 258);
+    draw_set_colour(dctx, 258, FALSE);
     draw_rectangle(dctx, 1, 0, 0, w, h);
     draw_update(dctx, 0, 0, w, h);
     free_ctx(dctx);
@@ -3288,6 +3314,7 @@ void do_text_internal(Context ctx, int x, int y, wchar_t *text, int len,
         truecolour.fg = truecolour.bg = optionalrgb_none;
 	nfg = 260;
 	nbg = 261;
+        attr &= ~ATTR_DIM;             /* don't dim the cursor */
     }
 
     fontid = shadow = 0;
@@ -3350,18 +3377,18 @@ void do_text_internal(Context ctx, int x, int y, wchar_t *text, int len,
     }
 
     if (truecolour.bg.enabled)
-	draw_set_colour_rgb(dctx, truecolour.bg);
+	draw_set_colour_rgb(dctx, truecolour.bg, attr & ATTR_DIM);
     else
-	draw_set_colour(dctx, nbg);
+	draw_set_colour(dctx, nbg, attr & ATTR_DIM);
     draw_rectangle(dctx, TRUE,
                    x*inst->font_width+inst->window_border,
                    y*inst->font_height+inst->window_border,
                    rlen*widefactor*inst->font_width, inst->font_height);
 
     if (truecolour.fg.enabled)
-	draw_set_colour_rgb(dctx, truecolour.fg);
+	draw_set_colour_rgb(dctx, truecolour.fg, attr & ATTR_DIM);
     else
-	draw_set_colour(dctx, nfg);
+	draw_set_colour(dctx, nfg, attr & ATTR_DIM);
     if (ncombining > 1) {
         assert(len == 1);
         unifont_draw_combining(&dctx->uctx, inst->fonts[fontid],
@@ -3475,7 +3502,7 @@ void do_cursor(Context ctx, int x, int y, wchar_t *text, int len,
 	 * if it's passive.
 	 */
 	if (passive) {
-            draw_set_colour(dctx, 261);
+            draw_set_colour(dctx, 261, FALSE);
             draw_rectangle(dctx, FALSE,
                            x*inst->font_width+inst->window_border,
                            y*inst->font_height+inst->window_border,
@@ -3514,7 +3541,7 @@ void do_cursor(Context ctx, int x, int y, wchar_t *text, int len,
 	    length = inst->font_height;
 	}
 
-        draw_set_colour(dctx, 261);
+        draw_set_colour(dctx, 261, FALSE);
 	if (passive) {
 	    for (i = 0; i < length; i++) {
 		if (i % 2 == 0) {
diff --git a/windows/window.c b/windows/window.c
index aa96a5789..be7b4379e 100644
--- a/windows/window.c
+++ b/windows/window.c
@@ -3440,7 +3440,7 @@ void do_text_internal(Context ctx, int x, int y, wchar_t *text, int len,
 
     if ((attr & TATTR_ACTCURS) && (cursor_type == 0 || term->big_cursor)) {
         truecolour.fg = truecolour.bg = optionalrgb_none;
-	attr &= ~(ATTR_REVERSE|ATTR_BLINK|ATTR_COLOURS);
+	attr &= ~(ATTR_REVERSE|ATTR_BLINK|ATTR_COLOURS|ATTR_DIM);
 	/* cursor fg and bg */
 	attr |= (260 << ATTR_FGSHIFT) | (261 << ATTR_BGSHIFT);
         is_cursor = TRUE;
@@ -3543,6 +3543,12 @@ void do_text_internal(Context ctx, int x, int y, wchar_t *text, int len,
     else
 	bg = colours[nbg];
 
+    if (!pal && (attr & ATTR_DIM)) {
+        fg = RGB(GetRValue(fg) * 2 / 3,
+                 GetGValue(fg) * 2 / 3,
+                 GetBValue(fg) * 2 / 3);
+    }
+
     SelectObject(hdc, fonts[nfont]);
     SetTextColor(hdc, fg);
     SetBkColor(hdc, bg);

From 96a088195fe86cb31347b42b1c262c1aa2ee0a2f Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Sun, 8 Oct 2017 13:43:27 +0100
Subject: [PATCH 077/166] Make true colour work with background-colour erase.

Thanks to Markus Gans for reporting this bug.
---
 terminal.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/terminal.c b/terminal.c
index de5748e96..8c44b9062 100644
--- a/terminal.c
+++ b/terminal.c
@@ -1407,9 +1407,11 @@ void term_pwron(Terminal *term, int clear)
 static void set_erase_char(Terminal *term)
 {
     term->erase_char = term->basic_erase_char;
-    if (term->use_bce)
+    if (term->use_bce) {
 	term->erase_char.attr = (term->curr_attr &
 				 (ATTR_FGMASK | ATTR_BGMASK));
+        term->erase_char.truecolour.bg = term->curr_truecolour.bg;
+    }
 }
 
 /*

From e3d92df936b97aef3cd51f1e85eb3c47409069c5 Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Sun, 8 Oct 2017 13:45:08 +0100
Subject: [PATCH 078/166] Save and restore true-colour state with the cursor.

I spotted this myself while looking through the code in search of the
cause of the background-colour-erase bug: saving and restoring the
cursor via ESC 7 / ESC 8 ought to also save and restore the current
graphics rendition attributes including foreground and background
colour settings, but it was not saving and restoring the new
term->curr_truecolour along with term->curr_attr.

So there's now a term->save_truecolour to keep that in, and also a
term->alt_save_truecolour to take account of the fact that all the
saved cursor state variables get swapped out _again_ when switching
between the main and alternate screens.

(However, there is not a term->alt_truecolour to complete the cross
product, because the _active_ graphics rendition is carried over when
switching between the terminal screens; it's only the _saved_ one from
ESC 7 / ESC 8 that is saved separately. That's consistent with the
behaviour we've had all along for ordinary fg/bg colour selection.)
---
 terminal.c | 8 ++++++++
 terminal.h | 1 +
 2 files changed, 9 insertions(+)

diff --git a/terminal.c b/terminal.c
index 8c44b9062..7a7207a0d 100644
--- a/terminal.c
+++ b/terminal.c
@@ -1297,6 +1297,7 @@ static void power_on(Terminal *term, int clear)
     term->default_attr = term->save_attr =
 	term->alt_save_attr = term->curr_attr = ATTR_DEFAULT;
     term->curr_truecolour.fg = term->curr_truecolour.bg = optionalrgb_none;
+    term->save_truecolour = term->alt_save_truecolour = term->curr_truecolour;
     term->term_editing = term->term_echoing = FALSE;
     term->app_cursor_keys = conf_get_int(term->conf, CONF_app_cursor);
     term->app_keypad_keys = conf_get_int(term->conf, CONF_app_keypad);
@@ -1987,6 +1988,7 @@ static void swap_screen(Terminal *term, int which, int reset, int keep_cur_pos)
 {
     int t;
     pos tp;
+    truecolour ttc;
     tree234 *ttr;
 
     if (!which)
@@ -2051,6 +2053,10 @@ static void swap_screen(Terminal *term, int which, int reset, int keep_cur_pos)
         if (!reset && !keep_cur_pos)
             term->save_attr = term->alt_save_attr;
         term->alt_save_attr = t;
+        ttc = term->save_truecolour;
+        if (!reset && !keep_cur_pos)
+            term->save_truecolour = term->alt_save_truecolour;
+        term->alt_save_truecolour = ttc;
         t = term->save_utf;
         if (!reset && !keep_cur_pos)
             term->save_utf = term->alt_save_utf;
@@ -2346,6 +2352,7 @@ static void save_cursor(Terminal *term, int save)
     if (save) {
 	term->savecurs = term->curs;
 	term->save_attr = term->curr_attr;
+	term->save_truecolour = term->curr_truecolour;
 	term->save_cset = term->cset;
 	term->save_utf = term->utf;
 	term->save_wnext = term->wrapnext;
@@ -2360,6 +2367,7 @@ static void save_cursor(Terminal *term, int save)
 	    term->curs.y = term->rows - 1;
 
 	term->curr_attr = term->save_attr;
+	term->curr_truecolour = term->save_truecolour;
 	term->cset = term->save_cset;
 	term->utf = term->save_utf;
 	term->wrapnext = term->save_wnext;
diff --git a/terminal.h b/terminal.h
index 4a205a776..fcb321c41 100644
--- a/terminal.h
+++ b/terminal.h
@@ -140,6 +140,7 @@ struct terminal_tag {
     /* ESC 7 saved state for the alternate screen */
     pos alt_savecurs;
     int alt_save_attr;
+    truecolour alt_save_truecolour;
     int alt_save_cset, alt_save_csattr;
     int alt_save_utf, alt_save_wnext;
     int alt_save_sco_acs;

From f353e2219e4371cda176bc37a11ddc4bb7e32516 Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Sun, 8 Oct 2017 13:47:39 +0100
Subject: [PATCH 079/166] Turn off true colour on SCO and VT52 colour
 sequences.

After fixing the previous two bugs, I thought it was probably a good
idea to re-check _everywhere_ in terminal.c where curr_attr is used,
to make sure that if curr_truecolour also needed updating at the same
time then that was being done.
---
 terminal.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/terminal.c b/terminal.c
index 7a7207a0d..a55b6e6ac 100644
--- a/terminal.c
+++ b/terminal.c
@@ -4370,6 +4370,7 @@ static void term_out(Terminal *term)
 				ATTR_FGSHIFT;
 			    term->curr_attr &= ~ATTR_FGMASK;
 			    term->curr_attr |= colour;
+                            term->curr_truecolour.fg = optionalrgb_none;
 			    term->default_attr &= ~ATTR_FGMASK;
 			    term->default_attr |= colour;
 			    set_erase_char(term);
@@ -4384,6 +4385,7 @@ static void term_out(Terminal *term)
 				ATTR_BGSHIFT;
 			    term->curr_attr &= ~ATTR_BGMASK;
 			    term->curr_attr |= colour;
+                            term->curr_truecolour.bg = optionalrgb_none;
 			    term->default_attr &= ~ATTR_BGMASK;
 			    term->default_attr |= colour;
 			    set_erase_char(term);
@@ -4811,6 +4813,8 @@ static void term_out(Terminal *term)
 		    /* compatibility(OTHER) */
 		    term->vt52_bold = FALSE;
 		    term->curr_attr = ATTR_DEFAULT;
+                    term->curr_truecolour.fg = optionalrgb_none;
+                    term->curr_truecolour.bg = optionalrgb_none;
 		    set_erase_char(term);
 		    break;
 		  case 'S':

From 916a2574d5fb40ee9ce899ac93e8d31738f5bed4 Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Sun, 8 Oct 2017 13:49:54 +0100
Subject: [PATCH 080/166] Make reverse video interact correctly with true
 colour.

ATTR_REVERSE was being handled in the front ends, and was causing the
foreground and background colours to be switched. (I'm not completely
sure why I made that design decision; it might be purely historical,
but then again, it might also be because reverse video is one effect
on the fg and bg colours that must still be performed even in unusual
frontend-specific situations like display-driven monochrome mode.)

This affected both explicit reverse video enabled using SGR 7, and
also the transient reverse video arising from mouse selection. Thanks
to Markus Gans for reporting the bug in the latter, which when I
investigated it turned out to affect the former as well.
---
 terminal.h       | 2 +-
 unix/gtkwin.c    | 6 ++++++
 windows/window.c | 6 ++++++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/terminal.h b/terminal.h
index fcb321c41..03659744b 100644
--- a/terminal.h
+++ b/terminal.h
@@ -103,7 +103,7 @@ struct terminal_tag {
 #endif /* OPTIMISE_SCROLL */
 
     int default_attr, curr_attr, save_attr;
-    truecolour curr_truecolour;
+    truecolour curr_truecolour, save_truecolour;
     termchar basic_erase_char, erase_char;
 
     bufchain inbuf;		       /* terminal input buffer */
diff --git a/unix/gtkwin.c b/unix/gtkwin.c
index 5c6295190..3e12a4ba9 100644
--- a/unix/gtkwin.c
+++ b/unix/gtkwin.c
@@ -3298,9 +3298,15 @@ void do_text_internal(Context ctx, int x, int y, wchar_t *text, int len,
     nfg = ((monochrome ? ATTR_DEFFG : (attr & ATTR_FGMASK)) >> ATTR_FGSHIFT);
     nbg = ((monochrome ? ATTR_DEFBG : (attr & ATTR_BGMASK)) >> ATTR_BGSHIFT);
     if (!!(attr & ATTR_REVERSE) ^ (monochrome && (attr & TATTR_ACTCURS))) {
+        struct optionalrgb trgb;
+
 	t = nfg;
 	nfg = nbg;
 	nbg = t;
+
+        trgb = truecolour.fg;
+        truecolour.fg = truecolour.bg;
+        truecolour.bg = trgb;
     }
     if ((inst->bold_style & 2) && (attr & ATTR_BOLD)) {
 	if (nfg < 16) nfg |= 8;
diff --git a/windows/window.c b/windows/window.c
index be7b4379e..73f0751c9 100644
--- a/windows/window.c
+++ b/windows/window.c
@@ -3521,9 +3521,15 @@ void do_text_internal(Context ctx, int x, int y, wchar_t *text, int len,
     if (!fonts[nfont])
 	nfont = FONT_NORMAL;
     if (attr & ATTR_REVERSE) {
+        struct optionalrgb trgb;
+
 	t = nfg;
 	nfg = nbg;
 	nbg = t;
+
+        trgb = truecolour.fg;
+        truecolour.fg = truecolour.bg;
+        truecolour.bg = trgb;
     }
     if (bold_colours && (attr & ATTR_BOLD) && !is_cursor) {
 	if (nfg < 16) nfg |= 8;

From 298b9fd4d40a86b192a23a6bceac1f06f89f9eaf Mon Sep 17 00:00:00 2001
From: Jeff Smith <whydoubt@gmail.com>
Date: Fri, 13 Oct 2017 22:49:25 -0500
Subject: [PATCH 081/166] Setting an 8-bit colour should cancel a 24-bit colour

---
 terminal.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/terminal.c b/terminal.c
index a55b6e6ac..2106d10a3 100644
--- a/terminal.c
+++ b/terminal.c
@@ -4031,6 +4031,8 @@ static void term_out(Terminal *term)
 					term->curr_attr |=
 					    ((term->esc_args[i+2] & 0xFF)
 					     << ATTR_FGSHIFT);
+                                        term->curr_truecolour.fg =
+                                            optionalrgb_none;
 					i += 2;
 					}
 				    if (i + 4 < term->esc_nargs &&
@@ -4048,6 +4050,8 @@ static void term_out(Terminal *term)
 					term->curr_attr |=
 					    ((term->esc_args[i+2] & 0xFF)
 					     << ATTR_BGSHIFT);
+                                        term->curr_truecolour.bg =
+                                            optionalrgb_none;
 					i += 2;
 				    }
 				    if (i + 4 < term->esc_nargs &&

From 7bdfdabb5e1c7418074ff43d9b436033c96aa00c Mon Sep 17 00:00:00 2001
From: Jeff Smith <whydoubt@gmail.com>
Date: Wed, 14 Jun 2017 08:11:05 -0500
Subject: [PATCH 082/166] Update clipping interface for true-colour

---
 fuzzterm.c       |  2 +-
 putty.h          |  2 +-
 terminal.c       | 19 ++++++++++++++-----
 unix/gtkwin.c    |  8 ++++----
 windows/window.c |  3 ++-
 5 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/fuzzterm.c b/fuzzterm.c
index c57412c46..255fc6fb7 100644
--- a/fuzzterm.c
+++ b/fuzzterm.c
@@ -82,7 +82,7 @@ void free_ctx(Context ctx) { }
 void palette_set(void *frontend, int a, int b, int c, int d) { }
 void palette_reset(void *frontend) { }
 int palette_get(void *frontend, int n, int *r, int *g, int *b) {return FALSE;}
-void write_clip(void *frontend, wchar_t *a, int *b, int c, int d) { }
+void write_clip(void *frontend, wchar_t *a, int *b, truecolour *c, int d, int e) { }
 void get_clip(void *frontend, wchar_t **w, int *i) { }
 void set_raw_mouse_mode(void *frontend, int m) { }
 void request_paste(void *frontend) { }
diff --git a/putty.h b/putty.h
index a9433fa70..ac35eb73f 100644
--- a/putty.h
+++ b/putty.h
@@ -636,7 +636,7 @@ void palette_set(void *frontend, int, int, int, int);
 void palette_reset(void *frontend);
 int palette_get(void *frontend, int n, int *r, int *g, int *b);
 void write_aclip(void *frontend, char *, int, int);
-void write_clip(void *frontend, wchar_t *, int *, int, int);
+void write_clip(void *frontend, wchar_t *, int *, truecolour *, int, int);
 void get_clip(void *frontend, wchar_t **, int *);
 void optimised_move(void *frontend, int, int, int);
 void set_raw_mouse_mode(void *frontend, int);
diff --git a/terminal.c b/terminal.c
index 2106d10a3..d32d4f423 100644
--- a/terminal.c
+++ b/terminal.c
@@ -5616,9 +5616,11 @@ typedef struct {
     wchar_t *textptr;	    /* = textbuf + bufpos (current insertion point) */
     int *attrbuf;	    /* buffer for copied attributes */
     int *attrptr;	    /* = attrbuf + bufpos */
+    truecolour *tcbuf;	    /* buffer for copied colours */
+    truecolour *tcptr;	    /* = tcbuf + bufpos */
 } clip_workbuf;
 
-static void clip_addchar(clip_workbuf *b, wchar_t chr, int attr)
+static void clip_addchar(clip_workbuf *b, wchar_t chr, int attr, truecolour tc)
 {
     if (b->bufpos >= b->buflen) {
 	b->buflen *= 2;
@@ -5626,9 +5628,12 @@ static void clip_addchar(clip_workbuf *b, wchar_t chr, int attr)
 	b->textptr = b->textbuf + b->bufpos;
 	b->attrbuf = sresize(b->attrbuf, b->buflen, int);
 	b->attrptr = b->attrbuf + b->bufpos;
+	b->tcbuf = sresize(b->tcbuf, b->buflen, truecolour);
+	b->tcptr = b->tcbuf + b->bufpos;
     }
     *b->textptr++ = chr;
     *b->attrptr++ = attr;
+    *b->tcptr++ = tc;
     b->bufpos++;
 }
 
@@ -5637,11 +5642,13 @@ static void clipme(Terminal *term, pos top, pos bottom, int rect, int desel)
     clip_workbuf buf;
     int old_top_x;
     int attr;
+    truecolour tc;
 
     buf.buflen = 5120;			
     buf.bufpos = 0;
     buf.textptr = buf.textbuf = snewn(buf.buflen, wchar_t);
     buf.attrptr = buf.attrbuf = snewn(buf.buflen, int);
+    buf.tcptr = buf.tcbuf = snewn(buf.buflen, truecolour);
 
     old_top_x = top.x;		       /* needed for rect==1 */
 
@@ -5707,6 +5714,7 @@ static void clipme(Terminal *term, pos top, pos bottom, int rect, int desel)
 	    while (1) {
 		int uc = ldata->chars[x].chr;
                 attr = ldata->chars[x].attr;
+		tc = ldata->chars[x].truecolour;
 
 		switch (uc & CSET_MASK) {
 		  case CSET_LINEDRW:
@@ -5767,7 +5775,7 @@ static void clipme(Terminal *term, pos top, pos bottom, int rect, int desel)
 #endif
 
 		for (p = cbuf; *p; p++)
-		    clip_addchar(&buf, *p, attr);
+		    clip_addchar(&buf, *p, attr, tc);
 
 		if (ldata->chars[x].cc_next)
 		    x += ldata->chars[x].cc_next;
@@ -5779,7 +5787,7 @@ static void clipme(Terminal *term, pos top, pos bottom, int rect, int desel)
 	if (nl) {
 	    int i;
 	    for (i = 0; i < sel_nl_sz; i++)
-		clip_addchar(&buf, sel_nl[i], 0);
+		clip_addchar(&buf, sel_nl[i], 0, term->basic_erase_char.truecolour);
 	}
 	top.y++;
 	top.x = rect ? old_top_x : 0;
@@ -5787,12 +5795,13 @@ static void clipme(Terminal *term, pos top, pos bottom, int rect, int desel)
 	unlineptr(ldata);
     }
 #if SELECTION_NUL_TERMINATED
-    clip_addchar(&buf, 0, 0);
+    clip_addchar(&buf, 0, 0, term->basic_erase_char.truecolour);
 #endif
     /* Finally, transfer all that to the clipboard. */
-    write_clip(term->frontend, buf.textbuf, buf.attrbuf, buf.bufpos, desel);
+    write_clip(term->frontend, buf.textbuf, buf.attrbuf, buf.tcbuf, buf.bufpos, desel);
     sfree(buf.textbuf);
     sfree(buf.attrbuf);
+    sfree(buf.tcbuf);
 }
 
 void term_copyall(Terminal *term)
diff --git a/unix/gtkwin.c b/unix/gtkwin.c
index 3e12a4ba9..3a3c2a546 100644
--- a/unix/gtkwin.c
+++ b/unix/gtkwin.c
@@ -2360,8 +2360,8 @@ static void clipboard_clear(GtkClipboard *clipboard, gpointer data)
     sfree(cdi);
 }
 
-void write_clip(void *frontend, wchar_t *data, int *attr, int len,
-                int must_deselect)
+void write_clip(void *frontend, wchar_t *data, int *attr, truecolour *truecolour,
+                int len, int must_deselect)
 {
     struct gui_data *inst = (struct gui_data *)frontend;
     struct clipboard_data_instance *cdi;
@@ -2488,8 +2488,8 @@ static char *retrieve_cutbuffer(int *nbytes)
 #endif
 }
 
-void write_clip(void *frontend, wchar_t *data, int *attr, int len,
-                int must_deselect)
+void write_clip(void *frontend, wchar_t *data, int *attr, truecolour *truecolour,
+                int len, int must_deselect)
 {
     struct gui_data *inst = (struct gui_data *)frontend;
     if (inst->pasteout_data)
diff --git a/windows/window.c b/windows/window.c
index 73f0751c9..8faa57e93 100644
--- a/windows/window.c
+++ b/windows/window.c
@@ -4989,7 +4989,8 @@ void write_aclip(void *frontend, char *data, int len, int must_deselect)
 /*
  * Note: unlike write_aclip() this will not append a nul.
  */
-void write_clip(void *frontend, wchar_t * data, int *attr, int len, int must_deselect)
+void write_clip(void *frontend, wchar_t *data, int *attr, truecolour *truecolour,
+                int len, int must_deselect)
 {
     HGLOBAL clipdata, clipdata2, clipdata3;
     int len2;

From 891d909b3d7fb206e1055feaafbb25e771393ce2 Mon Sep 17 00:00:00 2001
From: Jeff Smith <whydoubt@gmail.com>
Date: Mon, 12 Jun 2017 23:55:57 -0500
Subject: [PATCH 083/166] Implement true-colour in write_clip for Windows

This allows text copied from PuTTY to a rich-text program to retain the
true-colour attribute.
---
 windows/window.c | 126 +++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 111 insertions(+), 15 deletions(-)

diff --git a/windows/window.c b/windows/window.c
index 8faa57e93..88a29dd40 100644
--- a/windows/window.c
+++ b/windows/window.c
@@ -24,6 +24,7 @@
 #include "storage.h"
 #include "win_res.h"
 #include "winsecur.h"
+#include "tree234.h"
 
 #ifndef NO_MULTIMON
 #include <multimon.h>
@@ -4986,6 +4987,18 @@ void write_aclip(void *frontend, char *data, int len, int must_deselect)
 	SendMessage(hwnd, WM_IGNORE_CLIP, FALSE, 0);
 }
 
+typedef struct _rgbindex {
+    int index;
+    COLORREF ref;
+} rgbindex;
+
+int cmpCOLORREF(void *va, void *vb)
+{
+    COLORREF a = ((rgbindex *)va)->ref;
+    COLORREF b = ((rgbindex *)vb)->ref;
+    return (a < b) ? -1 : (a > b) ? +1 : 0;
+}
+
 /*
  * Note: unlike write_aclip() this will not append a nul.
  */
@@ -5033,12 +5046,15 @@ void write_clip(void *frontend, wchar_t *data, int *attr, truecolour *truecolour
 	int rtfsize = 0;
 	int multilen, blen, alen, totallen, i;
 	char before[16], after[4];
-	int fgcolour,  lastfgcolour  = 0;
-	int bgcolour,  lastbgcolour  = 0;
+	int fgcolour,  lastfgcolour  = -1;
+	int bgcolour,  lastbgcolour  = -1;
+	COLORREF fg,   lastfg = -1;
+	COLORREF bg,   lastbg = -1;
 	int attrBold,  lastAttrBold  = 0;
 	int attrUnder, lastAttrUnder = 0;
 	int palette[NALLCOLOURS];
 	int numcolours;
+	tree234 *rgbtree = NULL;
 	FontSpec *font = conf_get_fontspec(conf, CONF_font);
 
 	get_unitab(CP_ACP, unitab, 0);
@@ -5076,7 +5092,7 @@ void write_clip(void *frontend, wchar_t *data, int *attr, truecolour *truecolour
 			fgcolour ++;
 		}
 
-		if (attr[i] & ATTR_BLINK) {
+		if ((attr[i] & ATTR_BLINK)) {
 		    if (bgcolour  <   8)	/* ANSI colours */
 			bgcolour +=   8;
     		    else if (bgcolour >= 256)	/* Default colours */
@@ -5087,6 +5103,28 @@ void write_clip(void *frontend, wchar_t *data, int *attr, truecolour *truecolour
 		palette[bgcolour]++;
 	    }
 
+	    if (truecolour) {
+		rgbtree = newtree234(cmpCOLORREF);
+		for (i = 0; i < (len-1); i++) {
+		    if (truecolour[i].fg.enabled) {
+			rgbindex *rgbp = snew(rgbindex);
+			rgbp->ref = RGB(truecolour[i].fg.r,
+			                truecolour[i].fg.g,
+			                truecolour[i].fg.b);
+			if (add234(rgbtree, rgbp) != rgbp)
+			    sfree(rgbp);
+		    }
+		    if (truecolour[i].bg.enabled) {
+			rgbindex *rgbp = snew(rgbindex);
+			rgbp->ref = RGB(truecolour[i].bg.r,
+			                truecolour[i].bg.g,
+			                truecolour[i].bg.b);
+			if (add234(rgbtree, rgbp) != rgbp)
+			    sfree(rgbp);
+		    }
+		}
+	    }
+
 	    /*
 	     * Next - Create a reduced palette
 	     */
@@ -5096,6 +5134,12 @@ void write_clip(void *frontend, wchar_t *data, int *attr, truecolour *truecolour
 		    palette[i]  = ++numcolours;
 	    }
 
+	    if (rgbtree) {
+		rgbindex *rgbp;
+		for (i = 0; (rgbp = index234(rgbtree, i)) != NULL; i++)
+		    rgbp->index = ++numcolours;
+	    }
+
 	    /*
 	     * Finally - Write the colour table
 	     */
@@ -5108,6 +5152,12 @@ void write_clip(void *frontend, wchar_t *data, int *attr, truecolour *truecolour
 		    rtflen += sprintf(&rtf[rtflen], "\\red%d\\green%d\\blue%d;", defpal[i].rgbtRed, defpal[i].rgbtGreen, defpal[i].rgbtBlue);
 		}
 	    }
+	    if (rgbtree) {
+		rgbindex *rgbp;
+		for (i = 0; (rgbp = index234(rgbtree, i)) != NULL; i++)
+		    rtflen += sprintf(&rtf[rtflen], "\\red%d\\green%d\\blue%d;",
+				      GetRValue(rgbp->ref), GetGValue(rgbp->ref), GetBValue(rgbp->ref));
+	    }
 	    strcpy(&rtf[rtflen], "}");
 	    rtflen ++;
 	}
@@ -5151,23 +5201,44 @@ void write_clip(void *frontend, wchar_t *data, int *attr, truecolour *truecolour
                 /*
                  * Determine foreground and background colours
                  */
-                fgcolour = ((attr[tindex] & ATTR_FGMASK) >> ATTR_FGSHIFT);
-                bgcolour = ((attr[tindex] & ATTR_BGMASK) >> ATTR_BGSHIFT);
+		if (truecolour && truecolour[tindex].fg.enabled) {
+		    fgcolour = -1;
+		    fg = RGB(truecolour[tindex].fg.r,
+		             truecolour[tindex].fg.g,
+		             truecolour[tindex].fg.b);
+		} else {
+		    fgcolour = ((attr[tindex] & ATTR_FGMASK) >> ATTR_FGSHIFT);
+		    fg = -1;
+		}
+
+		if (truecolour && truecolour[tindex].bg.enabled) {
+		    bgcolour = -1;
+		    bg = RGB(truecolour[tindex].bg.r,
+		             truecolour[tindex].bg.g,
+		             truecolour[tindex].bg.b);
+		} else {
+		    bgcolour = ((attr[tindex] & ATTR_BGMASK) >> ATTR_BGSHIFT);
+		    bg = -1;
+		}
 
 		if (attr[tindex] & ATTR_REVERSE) {
 		    int tmpcolour = fgcolour;	    /* Swap foreground and background */
 		    fgcolour = bgcolour;
 		    bgcolour = tmpcolour;
+
+		    COLORREF tmpref = fg;
+		    fg = bg;
+		    bg = tmpref;
 		}
 
-		if (bold_colours && (attr[tindex] & ATTR_BOLD)) {
+		if (bold_colours && (attr[tindex] & ATTR_BOLD) && (fgcolour >= 0)) {
 		    if (fgcolour  <   8)	    /* ANSI colours */
 			fgcolour +=   8;
 		    else if (fgcolour >= 256)	    /* Default colours */
 			fgcolour ++;
                 }
 
-		if (attr[tindex] & ATTR_BLINK) {
+		if ((attr[tindex] & ATTR_BLINK) && (bgcolour >= 0)) {
 		    if (bgcolour  <   8)	    /* ANSI colours */
 			bgcolour +=   8;
 		    else if (bgcolour >= 256)	    /* Default colours */
@@ -5206,15 +5277,33 @@ void write_clip(void *frontend, wchar_t *data, int *attr, truecolour *truecolour
                 /*
                  * Write RTF text attributes
                  */
-		if (lastfgcolour != fgcolour) {
-                    lastfgcolour  = fgcolour;
-		    rtflen       += sprintf(&rtf[rtflen], "\\cf%d ", (fgcolour >= 0) ? palette[fgcolour] : 0);
-                }
+		if ((lastfgcolour != fgcolour) || (lastfg != fg)) {
+		    lastfgcolour  = fgcolour;
+		    lastfg        = fg;
+		    if (fg == -1)
+			rtflen += sprintf(&rtf[rtflen], "\\cf%d ",
+					  (fgcolour >= 0) ? palette[fgcolour] : 0);
+		    else {
+			rgbindex rgb, *rgbp;
+			rgb.ref = fg;
+			if ((rgbp = find234(rgbtree, &rgb, NULL)) != NULL)
+			    rtflen += sprintf(&rtf[rtflen], "\\cf%d ", rgbp->index);
+		    }
+		}
 
-                if (lastbgcolour != bgcolour) {
-                    lastbgcolour  = bgcolour;
-                    rtflen       += sprintf(&rtf[rtflen], "\\highlight%d ", (bgcolour >= 0) ? palette[bgcolour] : 0);
-                }
+		if ((lastbgcolour != bgcolour) || (lastbg != bg)) {
+		    lastbgcolour  = bgcolour;
+		    lastbg        = bg;
+		    if (bg == -1)
+			rtflen += sprintf(&rtf[rtflen], "\\highlight%d ",
+					  (bgcolour >= 0) ? palette[bgcolour] : 0);
+		    else {
+			rgbindex rgb, *rgbp;
+			rgb.ref = bg;
+			if ((rgbp = find234(rgbtree, &rgb, NULL)) != NULL)
+			    rtflen += sprintf(&rtf[rtflen], "\\highlight%d ", rgbp->index);
+		    }
+		}
 
 		if (lastAttrBold != attrBold) {
 		    lastAttrBold  = attrBold;
@@ -5295,6 +5384,13 @@ void write_clip(void *frontend, wchar_t *data, int *attr, truecolour *truecolour
 	    GlobalUnlock(clipdata3);
 	}
 	sfree(rtf);
+
+	if (rgbtree) {
+	    rgbindex *rgbp;
+	    while ((rgbp = delpos234(rgbtree, 0)) != NULL)
+		sfree(rgbp);
+	    freetree234(rgbtree);
+	}
     } else
 	clipdata3 = NULL;
 

From b4e5485caa1ba9286db3f51ba1b8a5498db52411 Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Thu, 19 Oct 2017 18:27:03 +0100
Subject: [PATCH 084/166] Add Jeff Smith as a copyright holder.

---
 LICENCE | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/LICENCE b/LICENCE
index 30b1fe2b3..05fbb7d39 100644
--- a/LICENCE
+++ b/LICENCE
@@ -4,7 +4,7 @@ Portions copyright Robert de Bath, Joris van Rantwijk, Delian
 Delchev, Andreas Schultz, Jeroen Massar, Wez Furlong, Nicolas Barry,
 Justin Bradford, Ben Harris, Malcolm Smith, Ahmad Khalifa, Markus
 Kuhn, Colin Watson, Christopher Staite, Lorenz Diener, Christian
-Brabandt, and CORE SDI S.A.
+Brabandt, Jeff Smith, and CORE SDI S.A.
 
 Permission is hereby granted, free of charge, to any person
 obtaining a copy of this software and associated documentation files

From ea5425939297e0f41de4be3168fbb8d68854bb64 Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Thu, 19 Oct 2017 18:55:22 +0100
Subject: [PATCH 085/166] sshaes.c: fix file name in header comment.

Apparently I forgot to edit that when I originally imported this AES
implementation into PuTTY's SSH code from the more generically named
source file in which I'd originally developed it.
---
 sshaes.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sshaes.c b/sshaes.c
index 904cbdb2b..0368d6e9f 100644
--- a/sshaes.c
+++ b/sshaes.c
@@ -1,5 +1,5 @@
 /*
- * aes.c - implementation of AES / Rijndael
+ * sshaes.c - implementation of AES / Rijndael
  * 
  * AES is a flexible algorithm as regards endianness: it has no
  * inherent preference as to which way round you should form words

From 4dfadcfb2643fe3b54bb29277ca73bc5ba647208 Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Thu, 19 Oct 2017 19:13:02 +0100
Subject: [PATCH 086/166] sshaes.c: remove completely unused #define MAX_NK.

---
 sshaes.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/sshaes.c b/sshaes.c
index 0368d6e9f..9be58dabf 100644
--- a/sshaes.c
+++ b/sshaes.c
@@ -33,7 +33,6 @@
 #include "ssh.h"
 
 #define MAX_NR 14		       /* max no of rounds */
-#define MAX_NK 8		       /* max no of words in input key */
 #define MAX_NB 8		       /* max no of words in cipher blk */
 
 #define mulby2(x) ( ((x&0x7F) << 1) ^ (x & 0x80 ? 0x1B : 0) )

From 5592312636988869517026b6b8ead0a0dfd45266 Mon Sep 17 00:00:00 2001
From: "Pavel I. Kryukov" <kryukov@frtk.ru>
Date: Fri, 20 Oct 2017 19:13:21 +0100
Subject: [PATCH 087/166] AES: remove support for block sizes other than 128
 bits.

They're not really part of AES at all, in that they were part of the
Rijndael design but not part of the subset standardised by NIST. More
relevantly, they're not used by any SSH cipher definition, so they're
just adding complexity to the code which is about to get in the way of
refactoring it.

Removing them means there's only one pair of core encrypt/decrypt
functions, so the 'encrypt' and 'decrypt' function pointer fields can
be completely removed from AESContext.
---
 sshaes.c | 277 ++++++++-----------------------------------------------
 1 file changed, 40 insertions(+), 237 deletions(-)

diff --git a/sshaes.c b/sshaes.c
index 9be58dabf..48d0ca16c 100644
--- a/sshaes.c
+++ b/sshaes.c
@@ -33,19 +33,17 @@
 #include "ssh.h"
 
 #define MAX_NR 14		       /* max no of rounds */
-#define MAX_NB 8		       /* max no of words in cipher blk */
+#define NB 4                          /* no of words in cipher blk */
 
 #define mulby2(x) ( ((x&0x7F) << 1) ^ (x & 0x80 ? 0x1B : 0) )
 
 typedef struct AESContext AESContext;
 
 struct AESContext {
-    word32 keysched[(MAX_NR + 1) * MAX_NB];
-    word32 invkeysched[(MAX_NR + 1) * MAX_NB];
-    void (*encrypt) (AESContext * ctx, word32 * block);
-    void (*decrypt) (AESContext * ctx, word32 * block);
-    word32 iv[MAX_NB];
-    int Nb, Nr;
+    word32 keysched[(MAX_NR + 1) * NB];
+    word32 invkeysched[(MAX_NR + 1) * NB];
+    word32 iv[NB];
+    int Nr; /* number of rounds */
 };
 
 static const unsigned char Sbox[256] = {
@@ -652,36 +650,28 @@ static const word32 D3[256] = {
  */
 #define ADD_ROUND_KEY_4 (block[0]^=*keysched++, block[1]^=*keysched++, \
 		         block[2]^=*keysched++, block[3]^=*keysched++)
-#define ADD_ROUND_KEY_6 (block[0]^=*keysched++, block[1]^=*keysched++, \
-		         block[2]^=*keysched++, block[3]^=*keysched++, \
-		         block[4]^=*keysched++, block[5]^=*keysched++)
-#define ADD_ROUND_KEY_8 (block[0]^=*keysched++, block[1]^=*keysched++, \
-		         block[2]^=*keysched++, block[3]^=*keysched++, \
-		         block[4]^=*keysched++, block[5]^=*keysched++, \
-		         block[6]^=*keysched++, block[7]^=*keysched++)
 #define MOVEWORD(i) ( block[i] = newstate[i] )
 
 /*
- * Macros for the encryption routine. There are three encryption
- * cores, for Nb=4,6,8.
+ * Macros for the encryption routine.
  */
 #define MAKEWORD(i) ( newstate[i] = (E0[(block[i] >> 24) & 0xFF] ^ \
-				     E1[(block[(i+C1)%Nb] >> 16) & 0xFF] ^ \
-				     E2[(block[(i+C2)%Nb] >> 8) & 0xFF] ^ \
-				     E3[block[(i+C3)%Nb] & 0xFF]) )
+				     E1[(block[(i+C1)%NB] >> 16) & 0xFF] ^ \
+				     E2[(block[(i+C2)%NB] >> 8) & 0xFF] ^ \
+				     E3[block[(i+C3)%NB] & 0xFF]) )
 #define LASTWORD(i) ( newstate[i] = (Sbox[(block[i] >> 24) & 0xFF] << 24) | \
-			    (Sbox[(block[(i+C1)%Nb] >> 16) & 0xFF] << 16) | \
-			    (Sbox[(block[(i+C2)%Nb] >>  8) & 0xFF] <<  8) | \
-			    (Sbox[(block[(i+C3)%Nb]      ) & 0xFF]      ) )
+			    (Sbox[(block[(i+C1)%NB] >> 16) & 0xFF] << 16) | \
+			    (Sbox[(block[(i+C2)%NB] >>  8) & 0xFF] <<  8) | \
+			    (Sbox[(block[(i+C3)%NB]      ) & 0xFF]      ) )
 
 /*
- * Core encrypt routines, expecting word32 inputs read big-endian
+ * Core encrypt routine, expecting word32 inputs read big-endian
  * from the byte-oriented input stream.
  */
-static void aes_encrypt_nb_4(AESContext * ctx, word32 * block)
+static void aes_encrypt(AESContext * ctx, word32 * block)
 {
     int i;
-    static const int C1 = 1, C2 = 2, C3 = 3, Nb = 4;
+    static const int C1 = 1, C2 = 2, C3 = 3;
     word32 *keysched = ctx->keysched;
     word32 newstate[4];
     for (i = 0; i < ctx->Nr - 1; i++) {
@@ -706,111 +696,30 @@ static void aes_encrypt_nb_4(AESContext * ctx, word32 * block)
     MOVEWORD(3);
     ADD_ROUND_KEY_4;
 }
-static void aes_encrypt_nb_6(AESContext * ctx, word32 * block)
-{
-    int i;
-    static const int C1 = 1, C2 = 2, C3 = 3, Nb = 6;
-    word32 *keysched = ctx->keysched;
-    word32 newstate[6];
-    for (i = 0; i < ctx->Nr - 1; i++) {
-	ADD_ROUND_KEY_6;
-	MAKEWORD(0);
-	MAKEWORD(1);
-	MAKEWORD(2);
-	MAKEWORD(3);
-	MAKEWORD(4);
-	MAKEWORD(5);
-	MOVEWORD(0);
-	MOVEWORD(1);
-	MOVEWORD(2);
-	MOVEWORD(3);
-	MOVEWORD(4);
-	MOVEWORD(5);
-    }
-    ADD_ROUND_KEY_6;
-    LASTWORD(0);
-    LASTWORD(1);
-    LASTWORD(2);
-    LASTWORD(3);
-    LASTWORD(4);
-    LASTWORD(5);
-    MOVEWORD(0);
-    MOVEWORD(1);
-    MOVEWORD(2);
-    MOVEWORD(3);
-    MOVEWORD(4);
-    MOVEWORD(5);
-    ADD_ROUND_KEY_6;
-}
-static void aes_encrypt_nb_8(AESContext * ctx, word32 * block)
-{
-    int i;
-    static const int C1 = 1, C2 = 3, C3 = 4, Nb = 8;
-    word32 *keysched = ctx->keysched;
-    word32 newstate[8];
-    for (i = 0; i < ctx->Nr - 1; i++) {
-	ADD_ROUND_KEY_8;
-	MAKEWORD(0);
-	MAKEWORD(1);
-	MAKEWORD(2);
-	MAKEWORD(3);
-	MAKEWORD(4);
-	MAKEWORD(5);
-	MAKEWORD(6);
-	MAKEWORD(7);
-	MOVEWORD(0);
-	MOVEWORD(1);
-	MOVEWORD(2);
-	MOVEWORD(3);
-	MOVEWORD(4);
-	MOVEWORD(5);
-	MOVEWORD(6);
-	MOVEWORD(7);
-    }
-    ADD_ROUND_KEY_8;
-    LASTWORD(0);
-    LASTWORD(1);
-    LASTWORD(2);
-    LASTWORD(3);
-    LASTWORD(4);
-    LASTWORD(5);
-    LASTWORD(6);
-    LASTWORD(7);
-    MOVEWORD(0);
-    MOVEWORD(1);
-    MOVEWORD(2);
-    MOVEWORD(3);
-    MOVEWORD(4);
-    MOVEWORD(5);
-    MOVEWORD(6);
-    MOVEWORD(7);
-    ADD_ROUND_KEY_8;
-}
 
 #undef MAKEWORD
 #undef LASTWORD
 
 /*
- * Macros for the decryption routine. There are three decryption
- * cores, for Nb=4,6,8.
+ * Macros for the decryption routine.
  */
 #define MAKEWORD(i) ( newstate[i] = (D0[(block[i] >> 24) & 0xFF] ^ \
-				     D1[(block[(i+C1)%Nb] >> 16) & 0xFF] ^ \
-				     D2[(block[(i+C2)%Nb] >> 8) & 0xFF] ^ \
-				     D3[block[(i+C3)%Nb] & 0xFF]) )
+				     D1[(block[(i+C1)%NB] >> 16) & 0xFF] ^ \
+				     D2[(block[(i+C2)%NB] >> 8) & 0xFF] ^ \
+				     D3[block[(i+C3)%NB] & 0xFF]) )
 #define LASTWORD(i) (newstate[i] = (Sboxinv[(block[i] >> 24) & 0xFF] << 24) | \
-			   (Sboxinv[(block[(i+C1)%Nb] >> 16) & 0xFF] << 16) | \
-			   (Sboxinv[(block[(i+C2)%Nb] >>  8) & 0xFF] <<  8) | \
-			   (Sboxinv[(block[(i+C3)%Nb]      ) & 0xFF]      ) )
+			   (Sboxinv[(block[(i+C1)%NB] >> 16) & 0xFF] << 16) | \
+			   (Sboxinv[(block[(i+C2)%NB] >>  8) & 0xFF] <<  8) | \
+			   (Sboxinv[(block[(i+C3)%NB]      ) & 0xFF]      ) )
 
 /*
- * Core decrypt routines, expecting word32 inputs read big-endian
+ * Core decrypt routine, expecting word32 inputs read big-endian
  * from the byte-oriented input stream.
  */
-static void aes_decrypt_nb_4(AESContext * ctx, word32 * block)
+static void aes_decrypt(AESContext * ctx, word32 * block)
 {
     int i;
-    static const int C1 = 4 - 1, C2 = 4 - 2, C3 = 4 - 3, Nb = 4;
+    static const int C1 = 4 - 1, C2 = 4 - 2, C3 = 4 - 3;
     word32 *keysched = ctx->invkeysched;
     word32 newstate[4];
     for (i = 0; i < ctx->Nr - 1; i++) {
@@ -835,126 +744,30 @@ static void aes_decrypt_nb_4(AESContext * ctx, word32 * block)
     MOVEWORD(3);
     ADD_ROUND_KEY_4;
 }
-static void aes_decrypt_nb_6(AESContext * ctx, word32 * block)
-{
-    int i;
-    static const int C1 = 6 - 1, C2 = 6 - 2, C3 = 6 - 3, Nb = 6;
-    word32 *keysched = ctx->invkeysched;
-    word32 newstate[6];
-    for (i = 0; i < ctx->Nr - 1; i++) {
-	ADD_ROUND_KEY_6;
-	MAKEWORD(0);
-	MAKEWORD(1);
-	MAKEWORD(2);
-	MAKEWORD(3);
-	MAKEWORD(4);
-	MAKEWORD(5);
-	MOVEWORD(0);
-	MOVEWORD(1);
-	MOVEWORD(2);
-	MOVEWORD(3);
-	MOVEWORD(4);
-	MOVEWORD(5);
-    }
-    ADD_ROUND_KEY_6;
-    LASTWORD(0);
-    LASTWORD(1);
-    LASTWORD(2);
-    LASTWORD(3);
-    LASTWORD(4);
-    LASTWORD(5);
-    MOVEWORD(0);
-    MOVEWORD(1);
-    MOVEWORD(2);
-    MOVEWORD(3);
-    MOVEWORD(4);
-    MOVEWORD(5);
-    ADD_ROUND_KEY_6;
-}
-static void aes_decrypt_nb_8(AESContext * ctx, word32 * block)
-{
-    int i;
-    static const int C1 = 8 - 1, C2 = 8 - 3, C3 = 8 - 4, Nb = 8;
-    word32 *keysched = ctx->invkeysched;
-    word32 newstate[8];
-    for (i = 0; i < ctx->Nr - 1; i++) {
-	ADD_ROUND_KEY_8;
-	MAKEWORD(0);
-	MAKEWORD(1);
-	MAKEWORD(2);
-	MAKEWORD(3);
-	MAKEWORD(4);
-	MAKEWORD(5);
-	MAKEWORD(6);
-	MAKEWORD(7);
-	MOVEWORD(0);
-	MOVEWORD(1);
-	MOVEWORD(2);
-	MOVEWORD(3);
-	MOVEWORD(4);
-	MOVEWORD(5);
-	MOVEWORD(6);
-	MOVEWORD(7);
-    }
-    ADD_ROUND_KEY_8;
-    LASTWORD(0);
-    LASTWORD(1);
-    LASTWORD(2);
-    LASTWORD(3);
-    LASTWORD(4);
-    LASTWORD(5);
-    LASTWORD(6);
-    LASTWORD(7);
-    MOVEWORD(0);
-    MOVEWORD(1);
-    MOVEWORD(2);
-    MOVEWORD(3);
-    MOVEWORD(4);
-    MOVEWORD(5);
-    MOVEWORD(6);
-    MOVEWORD(7);
-    ADD_ROUND_KEY_8;
-}
 
 #undef MAKEWORD
 #undef LASTWORD
 
 
 /*
- * Set up an AESContext. `keylen' and `blocklen' are measured in
- * bytes; each can be either 16 (128-bit), 24 (192-bit), or 32
+ * Set up an AESContext. `keylen' is measured in
+ * bytes; it can be either 16 (128-bit), 24 (192-bit), or 32
  * (256-bit).
  */
-static void aes_setup(AESContext * ctx, int blocklen,
-	       unsigned char *key, int keylen)
+static void aes_setup(AESContext * ctx, unsigned char *key, int keylen)
 {
     int i, j, Nk, rconst;
 
-    assert(blocklen == 16 || blocklen == 24 || blocklen == 32);
-    assert(keylen == 16 || keylen == 24 || keylen == 32);
-
-    /*
-     * Basic parameters. Words per block, words in key, rounds.
-     */
-    Nk = keylen / 4;
-    ctx->Nb = blocklen / 4;
-    ctx->Nr = 6 + (ctx->Nb > Nk ? ctx->Nb : Nk);
+    ctx->Nr = 6 + (keylen / 4); /* Number of rounds */
 
-    /*
-     * Assign core-function pointers.
-     */
-    if (ctx->Nb == 8)
-	ctx->encrypt = aes_encrypt_nb_8, ctx->decrypt = aes_decrypt_nb_8;
-    else if (ctx->Nb == 6)
-	ctx->encrypt = aes_encrypt_nb_6, ctx->decrypt = aes_decrypt_nb_6;
-    else if (ctx->Nb == 4)
-	ctx->encrypt = aes_encrypt_nb_4, ctx->decrypt = aes_decrypt_nb_4;
+    assert(keylen == 16 || keylen == 24 || keylen == 32);
 
     /*
      * Now do the key setup itself.
      */
+    Nk = keylen / 4;
     rconst = 1;
-    for (i = 0; i < (ctx->Nr + 1) * ctx->Nb; i++) {
+    for (i = 0; i < (ctx->Nr + 1) * NB; i++) {
 	if (i < Nk)
 	    ctx->keysched[i] = GET_32BIT_MSB_FIRST(key + 4 * i);
 	else {
@@ -989,9 +802,9 @@ static void aes_setup(AESContext * ctx, int blocklen,
      * Now prepare the modified keys for the inverse cipher.
      */
     for (i = 0; i <= ctx->Nr; i++) {
-	for (j = 0; j < ctx->Nb; j++) {
+        for (j = 0; j < NB; j++) {
 	    word32 temp;
-	    temp = ctx->keysched[(ctx->Nr - i) * ctx->Nb + j];
+            temp = ctx->keysched[(ctx->Nr - i) * NB + j];
 	    if (i != 0 && i != ctx->Nr) {
 		/*
 		 * Perform the InvMixColumn operation on i. The D
@@ -1009,21 +822,11 @@ static void aes_setup(AESContext * ctx, int blocklen,
 		temp ^= D2[Sbox[c]];
 		temp ^= D3[Sbox[d]];
 	    }
-	    ctx->invkeysched[i * ctx->Nb + j] = temp;
+            ctx->invkeysched[i * NB + j] = temp;
 	}
     }
 }
 
-static void aes_encrypt(AESContext * ctx, word32 * block)
-{
-    ctx->encrypt(ctx, block);
-}
-
-static void aes_decrypt(AESContext * ctx, word32 * block)
-{
-    ctx->decrypt(ctx, block);
-}
-
 static void aes_encrypt_cbc(unsigned char *blk, int len, AESContext * ctx)
 {
     word32 iv[4];
@@ -1109,19 +912,19 @@ void aes_free_context(void *handle)
 void aes128_key(void *handle, unsigned char *key)
 {
     AESContext *ctx = (AESContext *)handle;
-    aes_setup(ctx, 16, key, 16);
+    aes_setup(ctx, key, 16);
 }
 
 void aes192_key(void *handle, unsigned char *key)
 {
     AESContext *ctx = (AESContext *)handle;
-    aes_setup(ctx, 16, key, 24);
+    aes_setup(ctx, key, 24);
 }
 
 void aes256_key(void *handle, unsigned char *key)
 {
     AESContext *ctx = (AESContext *)handle;
-    aes_setup(ctx, 16, key, 32);
+    aes_setup(ctx, key, 32);
 }
 
 void aes_iv(void *handle, unsigned char *iv)
@@ -1153,7 +956,7 @@ static void aes_ssh2_sdctr(void *handle, unsigned char *blk, int len)
 void aes256_encrypt_pubkey(unsigned char *key, unsigned char *blk, int len)
 {
     AESContext ctx;
-    aes_setup(&ctx, 16, key, 32);
+    aes_setup(&ctx, key, 32);
     memset(ctx.iv, 0, sizeof(ctx.iv));
     aes_encrypt_cbc(blk, len, &ctx);
     smemclr(&ctx, sizeof(ctx));
@@ -1162,7 +965,7 @@ void aes256_encrypt_pubkey(unsigned char *key, unsigned char *blk, int len)
 void aes256_decrypt_pubkey(unsigned char *key, unsigned char *blk, int len)
 {
     AESContext ctx;
-    aes_setup(&ctx, 16, key, 32);
+    aes_setup(&ctx, key, 32);
     memset(ctx.iv, 0, sizeof(ctx.iv));
     aes_decrypt_cbc(blk, len, &ctx);
     smemclr(&ctx, sizeof(ctx));

From 0816e2b1a019e97b37eb6007c34f0c58c257635c Mon Sep 17 00:00:00 2001
From: "Pavel I. Kryukov" <kryukov@frtk.ru>
Date: Fri, 20 Oct 2017 19:13:39 +0100
Subject: [PATCH 088/166] AES: fold the core and outer routines together.

The outer routines are the ones which handle the CBC encrypt, CBC
decrypt and SDCTR cipher modes. Previously each of those had to be
able to dispatch to one of the per-block-size core routines, which
made it worth dividing the system up into two layers. But now there's
only one set of core routines, they may as well be inlined into the
outer ones.

Also as part of this commit, the nasty undef/redef of MAKEWORD and
LASTWORD have been removed, and the different macro definitions now
have different macro _names_, to make it clearer which one is used
where.
---
 sshaes.c | 277 ++++++++++++++++++++++++++++---------------------------
 1 file changed, 142 insertions(+), 135 deletions(-)

diff --git a/sshaes.c b/sshaes.c
index 48d0ca16c..443031844 100644
--- a/sshaes.c
+++ b/sshaes.c
@@ -645,110 +645,6 @@ static const word32 D3[256] = {
     0xcb84617b, 0x32b670d5, 0x6c5c7448, 0xb85742d0,
 };
 
-/*
- * Common macros in both the encryption and decryption routines.
- */
-#define ADD_ROUND_KEY_4 (block[0]^=*keysched++, block[1]^=*keysched++, \
-		         block[2]^=*keysched++, block[3]^=*keysched++)
-#define MOVEWORD(i) ( block[i] = newstate[i] )
-
-/*
- * Macros for the encryption routine.
- */
-#define MAKEWORD(i) ( newstate[i] = (E0[(block[i] >> 24) & 0xFF] ^ \
-				     E1[(block[(i+C1)%NB] >> 16) & 0xFF] ^ \
-				     E2[(block[(i+C2)%NB] >> 8) & 0xFF] ^ \
-				     E3[block[(i+C3)%NB] & 0xFF]) )
-#define LASTWORD(i) ( newstate[i] = (Sbox[(block[i] >> 24) & 0xFF] << 24) | \
-			    (Sbox[(block[(i+C1)%NB] >> 16) & 0xFF] << 16) | \
-			    (Sbox[(block[(i+C2)%NB] >>  8) & 0xFF] <<  8) | \
-			    (Sbox[(block[(i+C3)%NB]      ) & 0xFF]      ) )
-
-/*
- * Core encrypt routine, expecting word32 inputs read big-endian
- * from the byte-oriented input stream.
- */
-static void aes_encrypt(AESContext * ctx, word32 * block)
-{
-    int i;
-    static const int C1 = 1, C2 = 2, C3 = 3;
-    word32 *keysched = ctx->keysched;
-    word32 newstate[4];
-    for (i = 0; i < ctx->Nr - 1; i++) {
-	ADD_ROUND_KEY_4;
-	MAKEWORD(0);
-	MAKEWORD(1);
-	MAKEWORD(2);
-	MAKEWORD(3);
-	MOVEWORD(0);
-	MOVEWORD(1);
-	MOVEWORD(2);
-	MOVEWORD(3);
-    }
-    ADD_ROUND_KEY_4;
-    LASTWORD(0);
-    LASTWORD(1);
-    LASTWORD(2);
-    LASTWORD(3);
-    MOVEWORD(0);
-    MOVEWORD(1);
-    MOVEWORD(2);
-    MOVEWORD(3);
-    ADD_ROUND_KEY_4;
-}
-
-#undef MAKEWORD
-#undef LASTWORD
-
-/*
- * Macros for the decryption routine.
- */
-#define MAKEWORD(i) ( newstate[i] = (D0[(block[i] >> 24) & 0xFF] ^ \
-				     D1[(block[(i+C1)%NB] >> 16) & 0xFF] ^ \
-				     D2[(block[(i+C2)%NB] >> 8) & 0xFF] ^ \
-				     D3[block[(i+C3)%NB] & 0xFF]) )
-#define LASTWORD(i) (newstate[i] = (Sboxinv[(block[i] >> 24) & 0xFF] << 24) | \
-			   (Sboxinv[(block[(i+C1)%NB] >> 16) & 0xFF] << 16) | \
-			   (Sboxinv[(block[(i+C2)%NB] >>  8) & 0xFF] <<  8) | \
-			   (Sboxinv[(block[(i+C3)%NB]      ) & 0xFF]      ) )
-
-/*
- * Core decrypt routine, expecting word32 inputs read big-endian
- * from the byte-oriented input stream.
- */
-static void aes_decrypt(AESContext * ctx, word32 * block)
-{
-    int i;
-    static const int C1 = 4 - 1, C2 = 4 - 2, C3 = 4 - 3;
-    word32 *keysched = ctx->invkeysched;
-    word32 newstate[4];
-    for (i = 0; i < ctx->Nr - 1; i++) {
-	ADD_ROUND_KEY_4;
-	MAKEWORD(0);
-	MAKEWORD(1);
-	MAKEWORD(2);
-	MAKEWORD(3);
-	MOVEWORD(0);
-	MOVEWORD(1);
-	MOVEWORD(2);
-	MOVEWORD(3);
-    }
-    ADD_ROUND_KEY_4;
-    LASTWORD(0);
-    LASTWORD(1);
-    LASTWORD(2);
-    LASTWORD(3);
-    MOVEWORD(0);
-    MOVEWORD(1);
-    MOVEWORD(2);
-    MOVEWORD(3);
-    ADD_ROUND_KEY_4;
-}
-
-#undef MAKEWORD
-#undef LASTWORD
-
-
 /*
  * Set up an AESContext. `keylen' is measured in
  * bytes; it can be either 16 (128-bit), 24 (192-bit), or 32
@@ -762,9 +658,6 @@ static void aes_setup(AESContext * ctx, unsigned char *key, int keylen)
 
     assert(keylen == 16 || keylen == 24 || keylen == 32);
 
-    /*
-     * Now do the key setup itself.
-     */
     Nk = keylen / 4;
     rconst = 1;
     for (i = 0; i < (ctx->Nr + 1) * NB; i++) {
@@ -827,73 +720,187 @@ static void aes_setup(AESContext * ctx, unsigned char *key, int keylen)
     }
 }
 
+/*
+ * Software encrypt/decrypt macros
+ */
+#define ADD_ROUND_KEY (block[0]^=*keysched++,   \
+                       block[1]^=*keysched++,   \
+                       block[2]^=*keysched++,   \
+                       block[3]^=*keysched++)
+#define MOVEWORD(i) ( block[i] = newstate[i] )
+
+#define ENCWORD(i) ( newstate[i] = (E0[(block[i       ] >> 24) & 0xFF] ^ \
+                                    E1[(block[(i+1)%NB] >> 16) & 0xFF] ^ \
+                                    E2[(block[(i+2)%NB] >>  8) & 0xFF] ^ \
+                                    E3[ block[(i+3)%NB]        & 0xFF]) )
+#define ENCROUND { ENCWORD(0); ENCWORD(1); ENCWORD(2); ENCWORD(3);      \
+        MOVEWORD(0); MOVEWORD(1); MOVEWORD(2); MOVEWORD(3); ADD_ROUND_KEY; }
+
+#define ENCLASTWORD(i) ( newstate[i] =                                  \
+                         (Sbox[(block[i]        >> 24) & 0xFF] << 24) |  \
+                         (Sbox[(block[(i+1)%NB] >> 16) & 0xFF] << 16) |  \
+                         (Sbox[(block[(i+2)%NB] >>  8) & 0xFF] <<  8) |  \
+                         (Sbox[(block[(i+3)%NB]      ) & 0xFF]      ) )
+#define ENCLASTROUND { ENCLASTWORD(0); ENCLASTWORD(1); ENCLASTWORD(2); ENCLASTWORD(3); \
+        MOVEWORD(0); MOVEWORD(1); MOVEWORD(2); MOVEWORD(3); ADD_ROUND_KEY; }
+
+#define DECWORD(i) ( newstate[i] =  (D0[(block[i]        >> 24) & 0xFF] ^ \
+                                     D1[(block[(i+3)%NB] >> 16) & 0xFF] ^ \
+                                     D2[(block[(i+2)%NB] >> 8)  & 0xFF] ^ \
+                                     D3[ block[(i+1)%NB]        & 0xFF]) )
+#define DECROUND { DECWORD(0); DECWORD(1); DECWORD(2); DECWORD(3);      \
+        MOVEWORD(0); MOVEWORD(1); MOVEWORD(2); MOVEWORD(3); ADD_ROUND_KEY; }
+
+#define DECLASTWORD(i) (newstate[i] =                                   \
+                        (Sboxinv[(block[i]        >> 24) & 0xFF] << 24) | \
+                        (Sboxinv[(block[(i+3)%NB] >> 16) & 0xFF] << 16) | \
+                        (Sboxinv[(block[(i+2)%NB] >>  8) & 0xFF] <<  8) | \
+                        (Sboxinv[(block[(i+1)%NB]      ) & 0xFF]      ) )
+#define DECLASTROUND { DECLASTWORD(0); DECLASTWORD(1); DECLASTWORD(2); DECLASTWORD(3); \
+        MOVEWORD(0); MOVEWORD(1); MOVEWORD(2); MOVEWORD(3); ADD_ROUND_KEY; }
+
+/*
+ * Software AES encrypt/decrypt core
+ */
 static void aes_encrypt_cbc(unsigned char *blk, int len, AESContext * ctx)
 {
-    word32 iv[4];
+    word32 block[4];
+    unsigned char* finish = blk + len;
     int i;
 
     assert((len & 15) == 0);
 
-    memcpy(iv, ctx->iv, sizeof(iv));
+    memcpy(block, ctx->iv, sizeof(block));
 
-    while (len > 0) {
+    while (blk < finish) {
+        word32 *keysched = ctx->keysched;
+        word32 newstate[4];
 	for (i = 0; i < 4; i++)
-	    iv[i] ^= GET_32BIT_MSB_FIRST(blk + 4 * i);
-	aes_encrypt(ctx, iv);
+            block[i] ^= GET_32BIT_MSB_FIRST(blk + 4 * i);
+        ADD_ROUND_KEY;
+        switch (ctx->Nr) {
+          case 14:
+            ENCROUND;
+            ENCROUND;
+          case 12:
+            ENCROUND;
+            ENCROUND;
+          case 10:
+            ENCROUND;
+            ENCROUND;
+            ENCROUND;
+            ENCROUND;
+            ENCROUND;
+            ENCROUND;
+            ENCROUND;
+            ENCROUND;
+            ENCROUND;
+            ENCLASTROUND;
+            break;
+          default:
+            assert(0);
+        }
 	for (i = 0; i < 4; i++)
-	    PUT_32BIT_MSB_FIRST(blk + 4 * i, iv[i]);
+            PUT_32BIT_MSB_FIRST(blk + 4 * i, block[i]);
 	blk += 16;
-	len -= 16;
     }
 
-    memcpy(ctx->iv, iv, sizeof(iv));
+    memcpy(ctx->iv, block, sizeof(block));
 }
 
-static void aes_decrypt_cbc(unsigned char *blk, int len, AESContext * ctx)
+static void aes_sdctr(unsigned char *blk, int len, AESContext *ctx)
 {
-    word32 iv[4], x[4], ct[4];
+    word32 iv[4];
+    unsigned char* finish = blk + len;
     int i;
 
     assert((len & 15) == 0);
 
     memcpy(iv, ctx->iv, sizeof(iv));
 
-    while (len > 0) {
-	for (i = 0; i < 4; i++)
-	    x[i] = ct[i] = GET_32BIT_MSB_FIRST(blk + 4 * i);
-	aes_decrypt(ctx, x);
+    while (blk < finish) {
+        word32 *keysched = ctx->keysched;
+        word32 newstate[4], block[4], tmp;
+        memcpy(block, iv, sizeof(block));
+        ADD_ROUND_KEY;
+        switch (ctx->Nr) {
+          case 14:
+            ENCROUND;
+            ENCROUND;
+          case 12:
+            ENCROUND;
+            ENCROUND;
+          case 10:
+            ENCROUND;
+            ENCROUND;
+            ENCROUND;
+            ENCROUND;
+            ENCROUND;
+            ENCROUND;
+            ENCROUND;
+            ENCROUND;
+            ENCROUND;
+            ENCLASTROUND;
+            break;
+          default:
+            assert(0);
+        }
 	for (i = 0; i < 4; i++) {
-	    PUT_32BIT_MSB_FIRST(blk + 4 * i, iv[i] ^ x[i]);
-	    iv[i] = ct[i];
+            tmp = GET_32BIT_MSB_FIRST(blk + 4 * i);
+            PUT_32BIT_MSB_FIRST(blk + 4 * i, tmp ^ block[i]);
 	}
+        for (i = 3; i >= 0; i--)
+            if ((iv[i] = (iv[i] + 1) & 0xffffffff) != 0)
+                break;
 	blk += 16;
-	len -= 16;
     }
 
     memcpy(ctx->iv, iv, sizeof(iv));
 }
 
-static void aes_sdctr(unsigned char *blk, int len, AESContext *ctx)
+static void aes_decrypt_cbc(unsigned char *blk, int len, AESContext * ctx)
 {
-    word32 iv[4], b[4], tmp;
+    word32 iv[4];
+    unsigned char* finish = blk + len;
     int i;
 
     assert((len & 15) == 0);
 
     memcpy(iv, ctx->iv, sizeof(iv));
 
-    while (len > 0) {
-	memcpy(b, iv, sizeof(b));
-	aes_encrypt(ctx, b);
+    while (blk < finish) {
+        word32 *keysched = ctx->invkeysched;
+        word32 newstate[4], ct[4], block[4];
+        for (i = 0; i < 4; i++)
+            block[i] = ct[i] = GET_32BIT_MSB_FIRST(blk + 4 * i);
+        ADD_ROUND_KEY;
+        switch (ctx->Nr) {
+          case 14:
+            DECROUND;
+            DECROUND;
+          case 12:
+            DECROUND;
+            DECROUND;
+          case 10:
+            DECROUND;
+            DECROUND;
+            DECROUND;
+            DECROUND;
+            DECROUND;
+            DECROUND;
+            DECROUND;
+            DECROUND;
+            DECROUND;
+            DECLASTROUND;
+            break;
+          default:
+            assert(0);
+        }
 	for (i = 0; i < 4; i++) {
-	    tmp = GET_32BIT_MSB_FIRST(blk + 4 * i);
-	    PUT_32BIT_MSB_FIRST(blk + 4 * i, tmp ^ b[i]);
+            PUT_32BIT_MSB_FIRST(blk + 4 * i, iv[i] ^ block[i]);
+            iv[i] = ct[i];
 	}
-	for (i = 3; i >= 0; i--)
-	    if ((iv[i] = (iv[i] + 1) & 0xffffffff) != 0)
-		break;
 	blk += 16;
-	len -= 16;
     }
 
     memcpy(ctx->iv, iv, sizeof(iv));

From e8be7ea98a4c21a839dcd4b75dc62688778bdde8 Mon Sep 17 00:00:00 2001
From: "Pavel I. Kryukov" <kryukov@frtk.ru>
Date: Fri, 20 Oct 2017 19:13:47 +0100
Subject: [PATCH 089/166] AES: 16-byte align the key schedule arrays.

This is going to be important in the next commit, when we start
accessing them using x86 SSE instructions.
---
 sshaes.c | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/sshaes.c b/sshaes.c
index 443031844..488e32a34 100644
--- a/sshaes.c
+++ b/sshaes.c
@@ -40,8 +40,9 @@
 typedef struct AESContext AESContext;
 
 struct AESContext {
-    word32 keysched[(MAX_NR + 1) * NB];
-    word32 invkeysched[(MAX_NR + 1) * NB];
+    word32 keysched_buf[(MAX_NR + 1) * NB + 3];
+    word32 invkeysched_buf[(MAX_NR + 1) * NB + 3];
+    word32 *keysched, *invkeysched;
     word32 iv[NB];
     int Nr; /* number of rounds */
 };
@@ -653,9 +654,20 @@ static const word32 D3[256] = {
 static void aes_setup(AESContext * ctx, unsigned char *key, int keylen)
 {
     int i, j, Nk, rconst;
+    size_t bufaddr;
 
     ctx->Nr = 6 + (keylen / 4); /* Number of rounds */
 
+    /* Ensure the key schedule arrays are 16-byte aligned */
+    bufaddr = (size_t)ctx->keysched_buf;
+    ctx->keysched = ctx->keysched_buf +
+        (0xF & -bufaddr) / sizeof(word32);
+    assert((size_t)ctx->keysched % 16 == 0);
+    bufaddr = (size_t)ctx->invkeysched_buf;
+    ctx->invkeysched = ctx->invkeysched_buf +
+        (0xF & -bufaddr) / sizeof(word32);
+    assert((size_t)ctx->invkeysched % 16 == 0);
+
     assert(keylen == 16 || keylen == 24 || keylen == 32);
 
     Nk = keylen / 4;

From 2d31305af9d3bf4096bb0c30e8a8336caaa70673 Mon Sep 17 00:00:00 2001
From: "Pavel I. Kryukov" <kryukov@frtk.ru>
Date: Fri, 20 Oct 2017 19:13:54 +0100
Subject: [PATCH 090/166] Alternative AES routines, using x86 hardware support.

The new AES routines are compiled into the code on any platform where
the compiler can be made to generate the necessary AES-NI and SSE
instructions. But not every CPU will support those instructions, so
the pure-software routines haven't gone away: both sets of functions
sit side by side in the code, and at key setup time we check the CPUID
bitmap to decide which set to select.

(This reintroduces function pointers into AESContext, replacing the
ones that we managed to remove a few commits ago.)
---
 sshaes.c | 667 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 661 insertions(+), 6 deletions(-)

diff --git a/sshaes.c b/sshaes.c
index 488e32a34..7ebeb5be0 100644
--- a/sshaes.c
+++ b/sshaes.c
@@ -37,6 +37,17 @@
 
 #define mulby2(x) ( ((x&0x7F) << 1) ^ (x & 0x80 ? 0x1B : 0) )
 
+/*
+ * Select appropriate inline keyword for the compiler
+ */
+#if defined __GNUC__ || defined __clang__
+#    define INLINE __inline__
+#elif defined (_MSC_VER)
+#    define INLINE __forceinline
+#else
+#    define INLINE
+#endif
+
 typedef struct AESContext AESContext;
 
 struct AESContext {
@@ -45,8 +56,37 @@ struct AESContext {
     word32 *keysched, *invkeysched;
     word32 iv[NB];
     int Nr; /* number of rounds */
+    void (*encrypt_cbc)(unsigned char*, int, AESContext*);
+    void (*decrypt_cbc)(unsigned char*, int, AESContext*);
+    void (*sdctr)(unsigned char*, int, AESContext*);
+    int isNI;
 };
 
+static void aes_encrypt_cbc_sw(unsigned char*, int, AESContext*);
+static void aes_decrypt_cbc_sw(unsigned char*, int, AESContext*);
+static void aes_sdctr_sw(unsigned char*, int, AESContext*);
+
+INLINE static int supports_aes_ni();
+static void aes_setup_ni(AESContext * ctx, unsigned char *key, int keylen);
+
+INLINE static void aes_encrypt_cbc(unsigned char *blk, int len, AESContext * ctx)
+{
+    ctx->encrypt_cbc(blk, len, ctx);
+}
+
+INLINE static void aes_decrypt_cbc(unsigned char *blk, int len, AESContext * ctx)
+{
+    ctx->decrypt_cbc(blk, len, ctx);
+}
+
+INLINE static void aes_sdctr(unsigned char *blk, int len, AESContext * ctx)
+{
+    ctx->sdctr(blk, len, ctx);
+}
+
+/*
+ * SW AES lookup tables
+ */
 static const unsigned char Sbox[256] = {
     0x63, 0x7c, 0x77, 0x7b, 0xf2, 0x6b, 0x6f, 0xc5,
     0x30, 0x01, 0x67, 0x2b, 0xfe, 0xd7, 0xab, 0x76,
@@ -668,8 +708,19 @@ static void aes_setup(AESContext * ctx, unsigned char *key, int keylen)
         (0xF & -bufaddr) / sizeof(word32);
     assert((size_t)ctx->invkeysched % 16 == 0);
 
+    ctx->isNI = supports_aes_ni();
+
+    if (ctx->isNI) {
+        aes_setup_ni(ctx, key, keylen);
+        return;
+    }
+
     assert(keylen == 16 || keylen == 24 || keylen == 32);
 
+    ctx->encrypt_cbc = aes_encrypt_cbc_sw;
+    ctx->decrypt_cbc = aes_decrypt_cbc_sw;
+    ctx->sdctr = aes_sdctr_sw;
+
     Nk = keylen / 4;
     rconst = 1;
     for (i = 0; i < (ctx->Nr + 1) * NB; i++) {
@@ -774,7 +825,7 @@ static void aes_setup(AESContext * ctx, unsigned char *key, int keylen)
 /*
  * Software AES encrypt/decrypt core
  */
-static void aes_encrypt_cbc(unsigned char *blk, int len, AESContext * ctx)
+static void aes_encrypt_cbc_sw(unsigned char *blk, int len, AESContext * ctx)
 {
     word32 block[4];
     unsigned char* finish = blk + len;
@@ -820,7 +871,7 @@ static void aes_encrypt_cbc(unsigned char *blk, int len, AESContext * ctx)
     memcpy(ctx->iv, block, sizeof(block));
 }
 
-static void aes_sdctr(unsigned char *blk, int len, AESContext *ctx)
+static void aes_sdctr_sw(unsigned char *blk, int len, AESContext *ctx)
 {
     word32 iv[4];
     unsigned char* finish = blk + len;
@@ -870,7 +921,7 @@ static void aes_sdctr(unsigned char *blk, int len, AESContext *ctx)
     memcpy(ctx->iv, iv, sizeof(iv));
 }
 
-static void aes_decrypt_cbc(unsigned char *blk, int len, AESContext * ctx)
+static void aes_decrypt_cbc_sw(unsigned char *blk, int len, AESContext * ctx)
 {
     word32 iv[4];
     unsigned char* finish = blk + len;
@@ -949,9 +1000,14 @@ void aes256_key(void *handle, unsigned char *key)
 void aes_iv(void *handle, unsigned char *iv)
 {
     AESContext *ctx = (AESContext *)handle;
-    int i;
-    for (i = 0; i < 4; i++)
-	ctx->iv[i] = GET_32BIT_MSB_FIRST(iv + 4 * i);
+    if (ctx->isNI) {
+        memcpy(ctx->iv, iv, sizeof(ctx->iv));
+    }
+    else {
+        int i;
+        for (i = 0; i < 4; i++)
+            ctx->iv[i] = GET_32BIT_MSB_FIRST(iv + 4 * i);
+    }
 }
 
 void aes_ssh2_encrypt_blk(void *handle, unsigned char *blk, int len)
@@ -1060,3 +1116,602 @@ const struct ssh2_ciphers ssh2_aes = {
     sizeof(aes_list) / sizeof(*aes_list),
     aes_list
 };
+
+/*
+ * Implementation of AES for PuTTY using AES-NI
+ * instuction set expansion was made by:
+ * @author Pavel Kryukov <kryukov@frtk.ru>
+ * @author Maxim Kuznetsov <maks.kuznetsov@gmail.com>
+ * @author Svyatoslav Kuzmich <svatoslav1@gmail.com>
+ *
+ * For Putty AES NI project
+ * http://pavelkryukov.github.io/putty-aes-ni/
+ */
+
+/*
+ * Check of compiler version
+ */
+#ifdef _FORCE_AES_NI
+#   define COMPILER_SUPPORTS_AES_NI
+#elif defined(__clang__)
+#   if (__clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ >= 8)) && (defined(__x86_64__) || defined(__i386))
+#       define COMPILER_SUPPORTS_AES_NI
+#   endif
+#elif defined(__GNUC__)
+#    if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)) && (defined(__x86_64__) || defined(__i386))
+#       define COMPILER_SUPPORTS_AES_NI
+#    endif
+#elif defined (_MSC_VER)
+#   if (defined(_M_X64) || defined(_M_IX86)) && _MSC_FULL_VER >= 150030729
+#      define COMPILER_SUPPORTS_AES_NI
+#   endif
+#endif
+
+#ifdef _FORCE_SOFTWARE_AES
+#   undef COMPILER_SUPPORTS_AES_NI
+#endif
+
+#ifdef COMPILER_SUPPORTS_AES_NI
+
+/*
+ * Set target architecture for Clang and GCC
+ */
+#if !defined(__clang__) && defined(__GNUC__)
+#    pragma GCC target("aes")
+#    pragma GCC target("sse4.1")
+#endif
+
+#if defined(__clang__) || (defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 8)))
+#    define FUNC_ISA __attribute__ ((target("sse4.1,aes")))
+#else
+#    define FUNC_ISA
+#endif
+
+#include <wmmintrin.h>
+#include <smmintrin.h>
+
+/*
+ * Determinators of CPU type
+ */
+#if defined(__clang__) || defined(__GNUC__)
+
+#include <cpuid.h>
+INLINE static int supports_aes_ni()
+{
+    unsigned int CPUInfo[4];
+    __cpuid(1, CPUInfo[0], CPUInfo[1], CPUInfo[2], CPUInfo[3]);
+    return (CPUInfo[2] & (1 << 25)) && (CPUInfo[2] & (1 << 19)); /* Check AES and SSE4.1 */
+}
+
+#else /* defined(__clang__) || defined(__GNUC__) */
+
+INLINE static int supports_aes_ni()
+{
+    unsigned int CPUInfo[4];
+    __cpuid(CPUInfo, 1);
+    return (CPUInfo[2] & (1 << 25)) && (CPUInfo[2] & (1 << 19)); /* Check AES and SSE4.1 */
+}
+
+#endif /* defined(__clang__) || defined(__GNUC__) */
+
+/*
+ * Wrapper of SHUFPD instruction for MSVC
+ */
+#ifdef _MSC_VER
+INLINE static __m128i mm_shuffle_pd_i0(__m128i a, __m128i b)
+{
+    union {
+        __m128i i;
+        __m128d d;
+    } au, bu, ru;
+    au.i = a;
+    bu.i = b;
+    ru.d = _mm_shuffle_pd(au.d, bu.d, 0);
+    return ru.i;
+}
+
+INLINE static __m128i mm_shuffle_pd_i1(__m128i a, __m128i b)
+{
+    union {
+        __m128i i;
+        __m128d d;
+    } au, bu, ru;
+    au.i = a;
+    bu.i = b;
+    ru.d = _mm_shuffle_pd(au.d, bu.d, 1);
+    return ru.i;
+}
+#else
+#define mm_shuffle_pd_i0(a, b) ((__m128i)_mm_shuffle_pd((__m128d)a, (__m128d)b, 0));
+#define mm_shuffle_pd_i1(a, b) ((__m128i)_mm_shuffle_pd((__m128d)a, (__m128d)b, 1));
+#endif
+
+/*
+ * AES-NI key expansion assist functions
+ */
+FUNC_ISA
+INLINE static __m128i AES_128_ASSIST (__m128i temp1, __m128i temp2)
+{
+    __m128i temp3;
+    temp2 = _mm_shuffle_epi32 (temp2 ,0xff);
+    temp3 = _mm_slli_si128 (temp1, 0x4);
+    temp1 = _mm_xor_si128 (temp1, temp3);
+    temp3 = _mm_slli_si128 (temp3, 0x4);
+    temp1 = _mm_xor_si128 (temp1, temp3);
+    temp3 = _mm_slli_si128 (temp3, 0x4);
+    temp1 = _mm_xor_si128 (temp1, temp3);
+    temp1 = _mm_xor_si128 (temp1, temp2);
+    return temp1;
+}
+
+FUNC_ISA
+INLINE static void KEY_192_ASSIST(__m128i* temp1, __m128i * temp2, __m128i * temp3)
+{
+    __m128i temp4;
+    *temp2 = _mm_shuffle_epi32 (*temp2, 0x55);
+    temp4 = _mm_slli_si128 (*temp1, 0x4);
+    *temp1 = _mm_xor_si128 (*temp1, temp4);
+    temp4 = _mm_slli_si128 (temp4, 0x4);
+    *temp1 = _mm_xor_si128 (*temp1, temp4);
+    temp4 = _mm_slli_si128 (temp4, 0x4);
+    *temp1 = _mm_xor_si128 (*temp1, temp4);
+    *temp1 = _mm_xor_si128 (*temp1, *temp2);
+    *temp2 = _mm_shuffle_epi32(*temp1, 0xff);
+    temp4 = _mm_slli_si128 (*temp3, 0x4);
+    *temp3 = _mm_xor_si128 (*temp3, temp4);
+    *temp3 = _mm_xor_si128 (*temp3, *temp2);
+}
+
+FUNC_ISA
+INLINE static void KEY_256_ASSIST_1(__m128i* temp1, __m128i * temp2)
+{
+    __m128i temp4;
+    *temp2 = _mm_shuffle_epi32(*temp2, 0xff);
+    temp4 = _mm_slli_si128 (*temp1, 0x4);
+    *temp1 = _mm_xor_si128 (*temp1, temp4);
+    temp4 = _mm_slli_si128 (temp4, 0x4);
+    *temp1 = _mm_xor_si128 (*temp1, temp4);
+    temp4 = _mm_slli_si128 (temp4, 0x4);
+    *temp1 = _mm_xor_si128 (*temp1, temp4);
+    *temp1 = _mm_xor_si128 (*temp1, *temp2);
+}
+
+FUNC_ISA
+INLINE static void KEY_256_ASSIST_2(__m128i* temp1, __m128i * temp3)
+{
+    __m128i temp2,temp4;
+    temp4 = _mm_aeskeygenassist_si128 (*temp1, 0x0);
+    temp2 = _mm_shuffle_epi32(temp4, 0xaa);
+    temp4 = _mm_slli_si128 (*temp3, 0x4);
+    *temp3 = _mm_xor_si128 (*temp3, temp4);
+    temp4 = _mm_slli_si128 (temp4, 0x4);
+    *temp3 = _mm_xor_si128 (*temp3, temp4);
+    temp4 = _mm_slli_si128 (temp4, 0x4);
+    *temp3 = _mm_xor_si128 (*temp3, temp4);
+    *temp3 = _mm_xor_si128 (*temp3, temp2);
+}
+
+/*
+ * AES-NI key expansion core
+ */
+FUNC_ISA
+static void AES_128_Key_Expansion (unsigned char *userkey, __m128i *key)
+{
+    __m128i temp1, temp2;
+    temp1 = _mm_loadu_si128((__m128i*)userkey);
+    key[0] = temp1;
+    temp2 = _mm_aeskeygenassist_si128 (temp1 ,0x1);
+    temp1 = AES_128_ASSIST(temp1, temp2);
+    key[1] = temp1;
+    temp2 = _mm_aeskeygenassist_si128 (temp1,0x2);
+    temp1 = AES_128_ASSIST(temp1, temp2);
+    key[2] = temp1;
+    temp2 = _mm_aeskeygenassist_si128 (temp1,0x4);
+    temp1 = AES_128_ASSIST(temp1, temp2);
+    key[3] = temp1;
+    temp2 = _mm_aeskeygenassist_si128 (temp1,0x8);
+    temp1 = AES_128_ASSIST(temp1, temp2);
+    key[4] = temp1;
+    temp2 = _mm_aeskeygenassist_si128 (temp1,0x10);
+    temp1 = AES_128_ASSIST(temp1, temp2);
+    key[5] = temp1;
+    temp2 = _mm_aeskeygenassist_si128 (temp1,0x20);
+    temp1 = AES_128_ASSIST(temp1, temp2);
+    key[6] = temp1;
+    temp2 = _mm_aeskeygenassist_si128 (temp1,0x40);
+    temp1 = AES_128_ASSIST(temp1, temp2);
+    key[7] = temp1;
+    temp2 = _mm_aeskeygenassist_si128 (temp1,0x80);
+    temp1 = AES_128_ASSIST(temp1, temp2);
+    key[8] = temp1;
+    temp2 = _mm_aeskeygenassist_si128 (temp1,0x1b);
+    temp1 = AES_128_ASSIST(temp1, temp2);
+    key[9] = temp1;
+    temp2 = _mm_aeskeygenassist_si128 (temp1,0x36);
+    temp1 = AES_128_ASSIST(temp1, temp2);
+    key[10] = temp1;
+}
+
+FUNC_ISA
+static void AES_192_Key_Expansion (unsigned char *userkey, __m128i *key)
+{
+    __m128i temp1, temp2, temp3;
+    temp1 = _mm_loadu_si128((__m128i*)userkey);
+    temp3 = _mm_loadu_si128((__m128i*)(userkey+16));
+    key[0]=temp1;
+    key[1]=temp3;
+    temp2=_mm_aeskeygenassist_si128 (temp3,0x1);
+    KEY_192_ASSIST(&temp1, &temp2, &temp3);
+    key[1] = mm_shuffle_pd_i0(key[1], temp1);
+    key[2] = mm_shuffle_pd_i1(temp1, temp3);
+    temp2=_mm_aeskeygenassist_si128 (temp3,0x2);
+    KEY_192_ASSIST(&temp1, &temp2, &temp3);
+    key[3]=temp1;
+    key[4]=temp3;
+    temp2=_mm_aeskeygenassist_si128 (temp3,0x4);
+    KEY_192_ASSIST(&temp1, &temp2, &temp3);
+    key[4] = mm_shuffle_pd_i0(key[4], temp1);
+    key[5] = mm_shuffle_pd_i1(temp1, temp3);
+    temp2=_mm_aeskeygenassist_si128 (temp3,0x8);
+    KEY_192_ASSIST(&temp1, &temp2, &temp3);
+    key[6]=temp1;
+    key[7]=temp3;
+    temp2=_mm_aeskeygenassist_si128 (temp3,0x10);
+    KEY_192_ASSIST(&temp1, &temp2, &temp3);
+    key[7] = mm_shuffle_pd_i0(key[7], temp1);
+    key[8] = mm_shuffle_pd_i1(temp1, temp3);
+    temp2=_mm_aeskeygenassist_si128 (temp3,0x20);
+    KEY_192_ASSIST(&temp1, &temp2, &temp3);
+    key[9]=temp1;
+    key[10]=temp3;
+    temp2=_mm_aeskeygenassist_si128 (temp3,0x40);
+    KEY_192_ASSIST(&temp1, &temp2, &temp3);
+    key[10] = mm_shuffle_pd_i0(key[10], temp1);
+    key[11] = mm_shuffle_pd_i1(temp1, temp3);
+    temp2=_mm_aeskeygenassist_si128 (temp3,0x80);
+    KEY_192_ASSIST(&temp1, &temp2, &temp3);
+    key[12]=temp1;
+    key[13]=temp3;
+}
+
+FUNC_ISA
+static void AES_256_Key_Expansion (unsigned char *userkey, __m128i *key)
+{
+    __m128i temp1, temp2, temp3;
+    temp1 = _mm_loadu_si128((__m128i*)userkey);
+    temp3 = _mm_loadu_si128((__m128i*)(userkey+16));
+    key[0] = temp1;
+    key[1] = temp3;
+    temp2 = _mm_aeskeygenassist_si128 (temp3,0x01);
+    KEY_256_ASSIST_1(&temp1, &temp2);
+    key[2]=temp1;
+    KEY_256_ASSIST_2(&temp1, &temp3);
+    key[3]=temp3;
+    temp2 = _mm_aeskeygenassist_si128 (temp3,0x02);
+    KEY_256_ASSIST_1(&temp1, &temp2);
+    key[4]=temp1;
+    KEY_256_ASSIST_2(&temp1, &temp3);
+    key[5]=temp3;
+    temp2 = _mm_aeskeygenassist_si128 (temp3,0x04);
+    KEY_256_ASSIST_1(&temp1, &temp2);
+    key[6]=temp1;
+    KEY_256_ASSIST_2(&temp1, &temp3);
+    key[7]=temp3;
+    temp2 = _mm_aeskeygenassist_si128 (temp3,0x08);
+    KEY_256_ASSIST_1(&temp1, &temp2);
+    key[8]=temp1;
+    KEY_256_ASSIST_2(&temp1, &temp3);
+    key[9]=temp3;
+    temp2 = _mm_aeskeygenassist_si128 (temp3,0x10);
+    KEY_256_ASSIST_1(&temp1, &temp2);
+    key[10]=temp1;
+    KEY_256_ASSIST_2(&temp1, &temp3);
+    key[11]=temp3;
+    temp2 = _mm_aeskeygenassist_si128 (temp3,0x20);
+    KEY_256_ASSIST_1(&temp1, &temp2);
+    key[12]=temp1;
+    KEY_256_ASSIST_2(&temp1, &temp3);
+    key[13]=temp3;
+    temp2 = _mm_aeskeygenassist_si128 (temp3,0x40);
+    KEY_256_ASSIST_1(&temp1, &temp2);
+    key[14]=temp1;
+}
+
+/*
+ * AES-NI encrypt/decrypt core
+ */
+FUNC_ISA
+static void aes_encrypt_cbc_ni(unsigned char *blk, int len, AESContext * ctx)
+{
+    __m128i enc;
+    __m128i* block = (__m128i*)blk;
+    const __m128i* finish = (__m128i*)(blk + len);
+
+    assert((len & 15) == 0);
+
+    /* Load IV */
+    enc = _mm_loadu_si128((__m128i*)(ctx->iv));
+    while (block < finish) {
+        /* Key schedule ptr   */
+        __m128i* keysched = (__m128i*)ctx->keysched;
+
+        /* Xor data with IV */
+        enc  = _mm_xor_si128(_mm_loadu_si128(block), enc);
+
+        /* Perform rounds */
+        enc  = _mm_xor_si128(enc, *keysched);
+        switch (ctx->Nr) {
+          case 14:
+            enc = _mm_aesenc_si128(enc, *(++keysched));
+            enc = _mm_aesenc_si128(enc, *(++keysched));
+          case 12:
+            enc = _mm_aesenc_si128(enc, *(++keysched));
+            enc = _mm_aesenc_si128(enc, *(++keysched));
+          case 10:
+            enc = _mm_aesenc_si128(enc, *(++keysched));
+            enc = _mm_aesenc_si128(enc, *(++keysched));
+            enc = _mm_aesenc_si128(enc, *(++keysched));
+            enc = _mm_aesenc_si128(enc, *(++keysched));
+            enc = _mm_aesenc_si128(enc, *(++keysched));
+            enc = _mm_aesenc_si128(enc, *(++keysched));
+            enc = _mm_aesenc_si128(enc, *(++keysched));
+            enc = _mm_aesenc_si128(enc, *(++keysched));
+            enc = _mm_aesenc_si128(enc, *(++keysched));
+            enc = _mm_aesenclast_si128(enc, *(++keysched));
+            break;
+          default:
+            assert(0);
+        }
+
+        /* Store and go to next block */
+        _mm_storeu_si128(block, enc);
+        ++block;
+    }
+
+    /* Update IV */
+    _mm_storeu_si128((__m128i*)(ctx->iv), enc);
+}
+
+FUNC_ISA
+static void aes_decrypt_cbc_ni(unsigned char *blk, int len, AESContext * ctx)
+{
+    __m128i dec = _mm_setzero_si128();
+    __m128i last, iv;
+    __m128i* block = (__m128i*)blk;
+    const __m128i* finish = (__m128i*)(blk + len);
+
+    assert((len & 15) == 0);
+
+    /* Load IV */
+    iv = _mm_loadu_si128((__m128i*)(ctx->iv));
+    while (block < finish) {
+        /* Key schedule ptr   */
+        __m128i* keysched = (__m128i*)ctx->invkeysched;
+        last = _mm_loadu_si128(block);
+        dec  = _mm_xor_si128(last, *keysched);
+        switch (ctx->Nr) {
+          case 14:
+            dec = _mm_aesdec_si128(dec, *(++keysched));
+            dec = _mm_aesdec_si128(dec, *(++keysched));
+          case 12:
+            dec = _mm_aesdec_si128(dec, *(++keysched));
+            dec = _mm_aesdec_si128(dec, *(++keysched));
+          case 10:
+            dec = _mm_aesdec_si128(dec, *(++keysched));
+            dec = _mm_aesdec_si128(dec, *(++keysched));
+            dec = _mm_aesdec_si128(dec, *(++keysched));
+            dec = _mm_aesdec_si128(dec, *(++keysched));
+            dec = _mm_aesdec_si128(dec, *(++keysched));
+            dec = _mm_aesdec_si128(dec, *(++keysched));
+            dec = _mm_aesdec_si128(dec, *(++keysched));
+            dec = _mm_aesdec_si128(dec, *(++keysched));
+            dec = _mm_aesdec_si128(dec, *(++keysched));
+            dec = _mm_aesdeclast_si128(dec, *(++keysched));
+            break;
+          default:
+            assert(0);
+        }
+
+        /* Xor data with IV */
+        dec  = _mm_xor_si128(iv, dec);
+
+        /* Store data */
+        _mm_storeu_si128(block, dec);
+        iv = last;
+
+        /* Go to next block */
+        ++block;
+    }
+
+    /* Update IV */
+    _mm_storeu_si128((__m128i*)(ctx->iv), dec);
+}
+
+FUNC_ISA
+static void aes_sdctr_ni(unsigned char *blk, int len, AESContext *ctx)
+{
+    const __m128i BSWAP_EPI64 = _mm_setr_epi8(3,2,1,0,7,6,5,4,11,10,9,8,15,14,13,12);
+    const __m128i ONE  = _mm_setr_epi32(0,0,0,1);
+    const __m128i ZERO = _mm_setzero_si128();
+    __m128i iv;
+    __m128i* block = (__m128i*)blk;
+    const __m128i* finish = (__m128i*)(blk + len);
+
+    assert((len & 15) == 0);
+
+    iv = _mm_loadu_si128((__m128i*)ctx->iv);
+
+    while (block < finish) {
+        __m128i enc;
+        __m128i* keysched = (__m128i*)ctx->keysched;/* Key schedule ptr   */
+
+        /* Perform rounds */
+        enc  = _mm_xor_si128(iv, *keysched); /* Note that we use IV */
+        switch (ctx->Nr) {
+          case 14:
+            enc = _mm_aesenc_si128(enc, *(++keysched));
+            enc = _mm_aesenc_si128(enc, *(++keysched));
+          case 12:
+            enc = _mm_aesenc_si128(enc, *(++keysched));
+            enc = _mm_aesenc_si128(enc, *(++keysched));
+          case 10:
+            enc = _mm_aesenc_si128(enc, *(++keysched));
+            enc = _mm_aesenc_si128(enc, *(++keysched));
+            enc = _mm_aesenc_si128(enc, *(++keysched));
+            enc = _mm_aesenc_si128(enc, *(++keysched));
+            enc = _mm_aesenc_si128(enc, *(++keysched));
+            enc = _mm_aesenc_si128(enc, *(++keysched));
+            enc = _mm_aesenc_si128(enc, *(++keysched));
+            enc = _mm_aesenc_si128(enc, *(++keysched));
+            enc = _mm_aesenc_si128(enc, *(++keysched));
+            enc = _mm_aesenclast_si128(enc, *(++keysched));
+            break;
+          default:
+            assert(0);
+        }
+
+        /* Xor with block and store result */
+        enc = _mm_xor_si128(enc, _mm_loadu_si128(block));
+        _mm_storeu_si128(block, enc);
+
+        /* Increment of IV */
+        iv  = _mm_shuffle_epi8(iv, BSWAP_EPI64); /* Swap endianess     */
+        iv  = _mm_add_epi64(iv, ONE);            /* Inc low part       */
+        enc = _mm_cmpeq_epi64(iv, ZERO);         /* Check for carry    */
+        enc = _mm_unpacklo_epi64(ZERO, enc);     /* Pack carry reg     */
+        iv  = _mm_sub_epi64(iv, enc);            /* Sub carry reg      */
+        iv  = _mm_shuffle_epi8(iv, BSWAP_EPI64); /* Swap enianess back */
+
+        /* Go to next block */
+        ++block;
+    }
+
+    /* Update IV */
+    _mm_storeu_si128((__m128i*)ctx->iv, iv);
+}
+
+FUNC_ISA
+static void aes_inv_key_10(AESContext * ctx)
+{
+    __m128i* keysched = (__m128i*)ctx->keysched;
+    __m128i* invkeysched = (__m128i*)ctx->invkeysched;
+
+    *(invkeysched + 10) = *(keysched + 0);
+    *(invkeysched + 9) = _mm_aesimc_si128(*(keysched + 1));
+    *(invkeysched + 8) = _mm_aesimc_si128(*(keysched + 2));
+    *(invkeysched + 7) = _mm_aesimc_si128(*(keysched + 3));
+    *(invkeysched + 6) = _mm_aesimc_si128(*(keysched + 4));
+    *(invkeysched + 5) = _mm_aesimc_si128(*(keysched + 5));
+    *(invkeysched + 4) = _mm_aesimc_si128(*(keysched + 6));
+    *(invkeysched + 3) = _mm_aesimc_si128(*(keysched + 7));
+    *(invkeysched + 2) = _mm_aesimc_si128(*(keysched + 8));
+    *(invkeysched + 1) = _mm_aesimc_si128(*(keysched + 9));
+    *(invkeysched + 0) = *(keysched + 10);
+}
+
+FUNC_ISA
+static void aes_inv_key_12(AESContext * ctx)
+{
+    __m128i* keysched = (__m128i*)ctx->keysched;
+    __m128i* invkeysched = (__m128i*)ctx->invkeysched;
+
+    *(invkeysched + 12) = *(keysched + 0);
+    *(invkeysched + 11) = _mm_aesimc_si128(*(keysched + 1));
+    *(invkeysched + 10) = _mm_aesimc_si128(*(keysched + 2));
+    *(invkeysched + 9) = _mm_aesimc_si128(*(keysched + 3));
+    *(invkeysched + 8) = _mm_aesimc_si128(*(keysched + 4));
+    *(invkeysched + 7) = _mm_aesimc_si128(*(keysched + 5));
+    *(invkeysched + 6) = _mm_aesimc_si128(*(keysched + 6));
+    *(invkeysched + 5) = _mm_aesimc_si128(*(keysched + 7));
+    *(invkeysched + 4) = _mm_aesimc_si128(*(keysched + 8));
+    *(invkeysched + 3) = _mm_aesimc_si128(*(keysched + 9));
+    *(invkeysched + 2) = _mm_aesimc_si128(*(keysched + 10));
+    *(invkeysched + 1) = _mm_aesimc_si128(*(keysched + 11));
+    *(invkeysched + 0) = *(keysched + 12);
+}
+
+FUNC_ISA
+static void aes_inv_key_14(AESContext * ctx)
+{
+    __m128i* keysched = (__m128i*)ctx->keysched;
+    __m128i* invkeysched = (__m128i*)ctx->invkeysched;
+
+    *(invkeysched + 14) = *(keysched + 0);
+    *(invkeysched + 13) = _mm_aesimc_si128(*(keysched + 1));
+    *(invkeysched + 12) = _mm_aesimc_si128(*(keysched + 2));
+    *(invkeysched + 11) = _mm_aesimc_si128(*(keysched + 3));
+    *(invkeysched + 10) = _mm_aesimc_si128(*(keysched + 4));
+    *(invkeysched + 9) = _mm_aesimc_si128(*(keysched + 5));
+    *(invkeysched + 8) = _mm_aesimc_si128(*(keysched + 6));
+    *(invkeysched + 7) = _mm_aesimc_si128(*(keysched + 7));
+    *(invkeysched + 6) = _mm_aesimc_si128(*(keysched + 8));
+    *(invkeysched + 5) = _mm_aesimc_si128(*(keysched + 9));
+    *(invkeysched + 4) = _mm_aesimc_si128(*(keysched + 10));
+    *(invkeysched + 3) = _mm_aesimc_si128(*(keysched + 11));
+    *(invkeysched + 2) = _mm_aesimc_si128(*(keysched + 12));
+    *(invkeysched + 1) = _mm_aesimc_si128(*(keysched + 13));
+    *(invkeysched + 0) = *(keysched + 14);
+}
+
+/*
+ * Set up an AESContext. `keylen' is measured in
+ * bytes; it can be either 16 (128-bit), 24 (192-bit), or 32
+ * (256-bit).
+ */
+FUNC_ISA
+static void aes_setup_ni(AESContext * ctx, unsigned char *key, int keylen)
+{
+    __m128i *keysched = (__m128i*)ctx->keysched;
+
+    ctx->encrypt_cbc = aes_encrypt_cbc_ni;
+    ctx->decrypt_cbc = aes_decrypt_cbc_ni;
+    ctx->sdctr = aes_sdctr_ni;
+
+    /*
+     * Now do the key setup itself.
+     */
+    switch (keylen) {
+      case 16:
+        AES_128_Key_Expansion (key, keysched);
+        break;
+      case 24:
+        AES_192_Key_Expansion (key, keysched);
+        break;
+      case 32:
+        AES_256_Key_Expansion (key, keysched);
+        break;
+      default:
+        assert(0);
+    }
+
+    /*
+     * Now prepare the modified keys for the inverse cipher.
+     */
+    switch (ctx->Nr) {
+      case 10:
+        aes_inv_key_10(ctx);
+        break;
+      case 12:
+        aes_inv_key_12(ctx);
+        break;
+      case 14:
+        aes_inv_key_14(ctx);
+        break;
+      default:
+        assert(0);
+    }
+}
+
+#else /* COMPILER_SUPPORTS_AES_NI */
+
+static void aes_setup_ni(AESContext * ctx, unsigned char *key, int keylen)
+{
+    assert(0);
+}
+
+INLINE static int supports_aes_ni()
+{
+    return 0;
+}
+
+#endif /* COMPILER_SUPPORTS_AES_NI */

From 0a0a1c01d7cc6ca750d39f43b902e86987c5d376 Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Fri, 20 Oct 2017 19:14:41 +0100
Subject: [PATCH 091/166] Additional copyright holders, from the AES-NI work.

---
 LICENCE | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/LICENCE b/LICENCE
index 05fbb7d39..c473a6a40 100644
--- a/LICENCE
+++ b/LICENCE
@@ -4,7 +4,8 @@ Portions copyright Robert de Bath, Joris van Rantwijk, Delian
 Delchev, Andreas Schultz, Jeroen Massar, Wez Furlong, Nicolas Barry,
 Justin Bradford, Ben Harris, Malcolm Smith, Ahmad Khalifa, Markus
 Kuhn, Colin Watson, Christopher Staite, Lorenz Diener, Christian
-Brabandt, Jeff Smith, and CORE SDI S.A.
+Brabandt, Jeff Smith, Pavel Kryukov, Maxim Kuznetsov, Svyatoslav
+Kuzmich, and CORE SDI S.A.
 
 Permission is hereby granted, free of charge, to any person
 obtaining a copy of this software and associated documentation files

From 4d15d46473907515d31cd0dc92b3ce86e5c5cb1e Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Sun, 26 Nov 2017 08:45:19 +0000
Subject: [PATCH 092/166] Memory leak: free conn->retbuf in uxagentc.c.

While debugging some new code, I ran valgrind in leak-checking mode
and it pointed out a handful of existing memory leaks, which got in the
way of spotting any _new_ leaks I might be introducing :-)

This was one: in the case where an asynchronous agent query on Unix is
aborted, the dynamically allocated buffer holding the response was not
freed.
---
 unix/uxagentc.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/unix/uxagentc.c b/unix/uxagentc.c
index 51f9a1ebe..2c7483437 100644
--- a/unix/uxagentc.c
+++ b/unix/uxagentc.c
@@ -95,6 +95,8 @@ void agent_cancel_query(agent_pending_query *conn)
     uxsel_del(conn->fd);
     close(conn->fd);
     del234(agent_pending_queries, conn);
+    if (conn->retbuf && conn->retbuf != conn->sizebuf)
+        sfree(conn->retbuf);
     sfree(conn);
 }
 
@@ -114,11 +116,12 @@ static void agent_select_result(int fd, int event)
 	return;		       /* more data to come */
 
     /*
-     * We have now completed the agent query. Do the callback, and
-     * clean up. (Of course we don't free retbuf, since ownership
-     * of that passes to the callback.)
+     * We have now completed the agent query. Do the callback.
      */
     conn->callback(conn->callback_ctx, conn->retbuf, conn->retlen);
+    /* Null out conn->retbuf, since ownership of that buffer has
+     * passed to the callback. */
+    conn->retbuf = NULL;
     agent_cancel_query(conn);
 }
 

From 90a402c017b6b262b0b2181cf193dd8188fac5c7 Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Sun, 26 Nov 2017 08:45:37 +0000
Subject: [PATCH 093/166] Memory leak: free term->answerback in term_free().

Not a large leak as these things go, but valgrind's error dump for a
memory leak is just as annoying regardless of the size of the leaked
object!
---
 terminal.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/terminal.c b/terminal.c
index d32d4f423..d5d5314a1 100644
--- a/terminal.c
+++ b/terminal.c
@@ -1739,6 +1739,7 @@ void term_free(Terminal *term)
     sfree(term->ltemp);
     sfree(term->wcFrom);
     sfree(term->wcTo);
+    sfree(term->answerback);
 
     for (i = 0; i < term->bidi_cache_size; i++) {
 	sfree(term->pre_bidi_cache[i].chars);

From f1eeeff8cfea1001a1791ba95782ba7bbed3b976 Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Sun, 26 Nov 2017 08:45:45 +0000
Subject: [PATCH 094/166] Memory leak: add a columns_finalize() method.

My custom GTK layout class 'Columns' includes a linked list of
dynamically allocated data, and apparently I forgot to write a
destructor that frees it all when the class is deallocated, and have
never noticed until now.
---
 unix/gtkcols.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 53 insertions(+), 2 deletions(-)

diff --git a/unix/gtkcols.c b/unix/gtkcols.c
index e8223a726..ef060d639 100644
--- a/unix/gtkcols.c
+++ b/unix/gtkcols.c
@@ -8,6 +8,11 @@
 
 static void columns_init(Columns *cols);
 static void columns_class_init(ColumnsClass *klass);
+#if !GTK_CHECK_VERSION(2,0,0)
+static void columns_finalize(GtkObject *object);
+#else
+static void columns_finalize(GObject *object);
+#endif
 static void columns_map(GtkWidget *widget);
 static void columns_unmap(GtkWidget *widget);
 #if !GTK_CHECK_VERSION(2,0,0)
@@ -96,11 +101,11 @@ static gint (*columns_inherited_focus)(GtkContainer *container,
 static void columns_class_init(ColumnsClass *klass)
 {
 #if !GTK_CHECK_VERSION(2,0,0)
-    /* GtkObjectClass *object_class = (GtkObjectClass *)klass; */
+    GtkObjectClass *object_class = (GtkObjectClass *)klass;
     GtkWidgetClass *widget_class = (GtkWidgetClass *)klass;
     GtkContainerClass *container_class = (GtkContainerClass *)klass;
 #else
-    /* GObjectClass *object_class = G_OBJECT_CLASS(klass); */
+    GObjectClass *object_class = G_OBJECT_CLASS(klass);
     GtkWidgetClass *widget_class = GTK_WIDGET_CLASS(klass);
     GtkContainerClass *container_class = GTK_CONTAINER_CLASS(klass);
 #endif
@@ -111,6 +116,7 @@ static void columns_class_init(ColumnsClass *klass)
     parent_class = g_type_class_peek_parent(klass);
 #endif
 
+    object_class->finalize = columns_finalize;
     widget_class->map = columns_map;
     widget_class->unmap = columns_unmap;
 #if !GTK_CHECK_VERSION(2,0,0)
@@ -149,6 +155,50 @@ static void columns_init(Columns *cols)
     cols->spacing = 0;
 }
 
+static void columns_child_free(gpointer vchild)
+{
+    ColumnsChild *child = (ColumnsChild *)vchild;
+    if (child->percentages)
+        g_free(child->percentages);
+    g_free(child);
+}
+
+static void columns_finalize(
+#if !GTK_CHECK_VERSION(2,0,0)
+    GtkObject *object
+#else
+    GObject *object
+#endif
+    )
+{
+    Columns *cols;
+
+    g_return_if_fail(object != NULL);
+    g_return_if_fail(IS_COLUMNS(object));
+
+    cols = COLUMNS(object);
+
+#if !GTK_CHECK_VERSION(2,0,0)
+    {
+        GList *node;
+        for (node = cols->children; node; node = node->next)
+            if (node->data)
+                columns_child_free(node->data);
+    }
+    g_list_free(cols->children);
+#else
+    g_list_free_full(cols->children, columns_child_free);
+#endif
+
+    cols->children = NULL;
+
+#if !GTK_CHECK_VERSION(2,0,0)
+    GTK_OBJECT_CLASS(parent_class)->finalize(object);
+#else
+    G_OBJECT_CLASS(parent_class)->finalize(object);
+#endif
+}
+
 /*
  * These appear to be thoroughly tedious functions; the only reason
  * we have to reimplement them at all is because we defined our own
@@ -406,6 +456,7 @@ void columns_add(Columns *cols, GtkWidget *child,
     childdata->colspan = colspan;
     childdata->force_left = FALSE;
     childdata->same_height_as = NULL;
+    childdata->percentages = NULL;
 
     cols->children = g_list_append(cols->children, childdata);
     cols->taborder = g_list_append(cols->taborder, child);

From 9909077be131c5dc7b3dee14cb25b8a799040616 Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Sun, 26 Nov 2017 08:56:16 +0000
Subject: [PATCH 095/166] Make the current code compile again under GTK1.

Apparently I haven't tested this compile mode in a while: I had a
couple of compile errors due to new code not properly #ifdeffed (the
true-colour mode has to be effectively disabled in the palette-based
GTK1 graphics model) and one for an unused static function
(get_monitor_geometry is only used in GTK2 and above, and with -Werror
that means I mustn't even _define_ it in GTK1).

With these changes, I still didn't get a clean compile unless I also
configured CFLAGS=-std=gnu89, due to the GTK1 headers having an
outdated set of ifdefs to figure out the compiler's semantics of
'inline'. (They seem to expect old-style gcc, which inconveniently
treats 'inline' and 'extern inline' more or less the opposite way
round from the version standardised by C99.)
---
 unix/gtkwin.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/unix/gtkwin.c b/unix/gtkwin.c
index 3a3c2a546..a851c2584 100644
--- a/unix/gtkwin.c
+++ b/unix/gtkwin.c
@@ -3039,11 +3039,16 @@ static void draw_set_colour(struct draw_ctx *dctx, int col, int dim)
 #ifdef DRAW_TEXT_GDK
     if (dctx->uctx.type == DRAWTYPE_GDK) {
         if (dim) {
+#if GTK_CHECK_VERSION(2,0,0)
             GdkColor color;
             color.red =   dctx->inst->cols[col].red   * 2 / 3;
             color.green = dctx->inst->cols[col].green * 2 / 3;
             color.blue =  dctx->inst->cols[col].blue  * 2 / 3;
             gdk_gc_set_rgb_fg_color(dctx->uctx.u.gdk.gc, &color);
+#else
+            /* Poor GTK1 fallback */
+            gdk_gc_set_foreground(dctx->uctx.u.gdk.gc, &dctx->inst->cols[col]);
+#endif
         } else {
             gdk_gc_set_foreground(dctx->uctx.u.gdk.gc, &dctx->inst->cols[col]);
         }
@@ -3064,6 +3069,7 @@ static void draw_set_colour_rgb(struct draw_ctx *dctx, optionalrgb orgb,
 {
 #ifdef DRAW_TEXT_GDK
     if (dctx->uctx.type == DRAWTYPE_GDK) {
+#if GTK_CHECK_VERSION(2,0,0)
 	GdkColor color;
 	color.red =   orgb.r * 256;
 	color.green = orgb.g * 256;
@@ -3074,6 +3080,10 @@ static void draw_set_colour_rgb(struct draw_ctx *dctx, optionalrgb orgb,
             color.blue  = color.blue  * 2 / 3;
         }
 	gdk_gc_set_rgb_fg_color(dctx->uctx.u.gdk.gc, &color);
+#else
+        /* Poor GTK1 fallback */
+        gdk_gc_set_foreground(dctx->uctx.u.gdk.gc, &dctx->inst->cols[256]);
+#endif
     }
 #endif
 #ifdef DRAW_TEXT_CAIRO
@@ -4374,6 +4384,7 @@ static void start_backend(struct gui_data *inst)
     gtk_widget_set_sensitive(inst->restartitem, FALSE);
 }
 
+#if GTK_CHECK_VERSION(2,0,0)
 static void get_monitor_geometry(GtkWidget *widget, GdkRectangle *geometry)
 {
 #if GTK_CHECK_VERSION(3,4,0)
@@ -4397,6 +4408,7 @@ static void get_monitor_geometry(GtkWidget *widget, GdkRectangle *geometry)
     geometry->height = gdk_screen_height();
 #endif
 }
+#endif
 
 struct gui_data *new_session_window(Conf *conf, const char *geometry_string)
 {

From c74d1e3c6a0aa2c4ef275e18fcdc5844f536bab6 Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Sun, 26 Nov 2017 09:16:22 +0000
Subject: [PATCH 096/166] GTK1 runtime fix: widen extent of ignore_sbar.

ignore_sbar is a flag that we set while manually changing the
scrollbar settings, so that when those half-finished changes trigger
GTK event callbacks, we know to ignore them, and wait until we've
finished setting everything up before actually updating the window.
But somehow I had managed to leave the functions that actually _have
the effect_ (at least in GTK1) outside the pair of statements that set
and unset the ignore flag.

The effect was that compiling pterm for GTK1, starting it up, and
issuing a command like 'ls -l' that scrolls off the bottom of the
window would lead to the _top_ half of the ls output being visible,
and the scrollbar at the top of the scrollback rather than the bottom.
---
 unix/gtkwin.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/unix/gtkwin.c b/unix/gtkwin.c
index a851c2584..1038e7569 100644
--- a/unix/gtkwin.c
+++ b/unix/gtkwin.c
@@ -2884,13 +2884,13 @@ void set_sbar(void *frontend, int total, int start, int page)
     struct gui_data *inst = (struct gui_data *)frontend;
     if (!conf_get_int(inst->conf, CONF_scrollbar))
 	return;
+    inst->ignore_sbar = TRUE;
     gtk_adjustment_set_lower(inst->sbar_adjust, 0);
     gtk_adjustment_set_upper(inst->sbar_adjust, total);
     gtk_adjustment_set_value(inst->sbar_adjust, start);
     gtk_adjustment_set_page_size(inst->sbar_adjust, page);
     gtk_adjustment_set_step_increment(inst->sbar_adjust, 1);
     gtk_adjustment_set_page_increment(inst->sbar_adjust, page/2);
-    inst->ignore_sbar = TRUE;
 #if !GTK_CHECK_VERSION(3,18,0)
     gtk_adjustment_changed(inst->sbar_adjust);
 #endif

From 116dac29ccc99ff498edd7dfcda0f456ce47c3ef Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Sat, 25 Nov 2017 21:49:31 +0000
Subject: [PATCH 097/166] Reinstate the SIGCHLD handler in ptermapp.

Detecting that the child process in a pterm has terminated is
important for _any_ kind of pterm, so it's a mistake to put the signal
handler setup _solely_ inside the optional pty_pre_init function which
does the privileged setup and forks off a utmp watchdog process. Now
the signal handler is installed even in the GtkApplication-based
multi-window front end to pterm, meaning it will exist even on OS X.
---
 unix/uxpty.c | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/unix/uxpty.c b/unix/uxpty.c
index 618fe9bd7..4387ad8fa 100644
--- a/unix/uxpty.c
+++ b/unix/uxpty.c
@@ -261,13 +261,20 @@ static void cleanup_utmp(void)
 }
 #endif
 
-#ifndef NO_PTY_PRE_INIT
 static void sigchld_handler(int signum)
 {
     if (write(pty_signal_pipe[1], "x", 1) <= 0)
 	/* not much we can do about it */;
 }
-#endif
+
+static void pty_setup_sigchld_handler(void)
+{
+    static int setup = FALSE;
+    if (!setup) {
+        putty_signal(SIGCHLD, sigchld_handler);
+        setup = TRUE;
+    }
+}
 
 #ifndef OMIT_UTMP
 static void fatal_sig_handler(int signum)
@@ -433,7 +440,7 @@ void pty_pre_init(void)
 
     /* set the child signal handler straight away; it needs to be set
      * before we ever fork. */
-    putty_signal(SIGCHLD, sigchld_handler);
+    pty_setup_sigchld_handler();
     pty->master_fd = pty->slave_fd = -1;
 #ifndef OMIT_UTMP
     pty_stamped_utmp = FALSE;
@@ -790,6 +797,12 @@ static const char *pty_init(void *frontend, void **backend_handle, Conf *conf,
     windowid = get_windowid(pty->frontend);
 #endif
 
+    /*
+     * Set up the signal handler to catch SIGCHLD, if pty_pre_init
+     * didn't already do it.
+     */
+    pty_setup_sigchld_handler();
+
     /*
      * Fork and execute the command.
      */

From 5b13a1b01518c23f38525ec2ae9b4ac9ca3110cd Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Sat, 25 Nov 2017 21:51:45 +0000
Subject: [PATCH 098/166] Add a missing conf_copy in gtkapp's Duplicate
 Session.

Without this, the Conf objects in a session and its duplicate were
aliases of each other, which could lead to confusing semantic effects
if one of the sessions was reconfigured in mid-run, and worse still, a
crash if one session got cleaned up and called conf_free on a Conf
that the other was still using.

None of that was intentional; it was just a matter of forgetting to
clone the Conf for the duplicated session. Now we do.
---
 unix/gtkapp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/unix/gtkapp.c b/unix/gtkapp.c
index 8b2a794fc..b544684ed 100644
--- a/unix/gtkapp.c
+++ b/unix/gtkapp.c
@@ -196,7 +196,7 @@ void launch_duplicate_session(Conf *conf)
 {
     extern const int dup_check_launchable;
     assert(!dup_check_launchable || conf_launchable(conf));
-    new_session_window(conf, NULL);
+    new_session_window(conf_copy(conf), NULL);
 }
 
 void launch_new_session(void)

From b6b91b8e177958d870caa116e10cec537892eba8 Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Sun, 26 Nov 2017 10:58:56 +0000
Subject: [PATCH 099/166] OS X makefile: stop depending on JHBUILD_PREFIX.

People who use a packaging system other than jhbuild still ought to be
able to run the OS X GTK3 build, so now the gtk-mac-bundler command
finds out the locations of things by a more portable method.

(I've had this change lurking around uncommitted in a working tree for
a while, and only just found it in the course of doing other OS X-
related work. Oops.)
---
 Recipe            |  4 ++--
 unix/pterm.bundle |  6 +++++-
 unix/putty.bundle | 36 +++++++++++++++++++++++++++++++++++-
 3 files changed, 42 insertions(+), 4 deletions(-)

diff --git a/Recipe b/Recipe
index 5715938b0..33d0f2f7e 100644
--- a/Recipe
+++ b/Recipe
@@ -208,9 +208,9 @@ endif
 if HAVE_QUARTZ
 noinst_SCRIPTS = unix/PuTTY.app unix/Pterm.app
 unix/PuTTY.app: unix/putty.bundle puttyapp osxlaunch
-	rm -rf $@ && gtk-mac-bundler $<
+	rm -rf $@ && PUTTY_GTK_PREFIX_FROM_MAKEFILE=$$(pkg-config --variable=prefix gtk+-3.0) gtk-mac-bundler $<
 unix/Pterm.app: unix/pterm.bundle ptermapp osxlaunch
-	rm -rf $@ && gtk-mac-bundler $<
+	rm -rf $@ && PUTTY_GTK_PREFIX_FROM_MAKEFILE=$$(pkg-config --variable=prefix gtk+-3.0) gtk-mac-bundler $<
 endif
 !end
 
diff --git a/unix/pterm.bundle b/unix/pterm.bundle
index 377fee0dc..0d7012160 100644
--- a/unix/pterm.bundle
+++ b/unix/pterm.bundle
@@ -2,7 +2,11 @@
 <app-bundle>
 
   <meta>
-    <prefix name="default">${env:JHBUILD_PREFIX}</prefix>
+    <!-- If you try to use this script outside the makefile, you'll
+         have to set PUTTY_GTK_PREFIX_FROM_MAKEFILE by hand. See the
+         full rant in putty.bundle for further explanation. -->
+    <prefix name="default">${env:PUTTY_GTK_PREFIX_FROM_MAKEFILE}</prefix>
+
     <run-install-name-tool/>
     <gtk>gtk+-3.0</gtk>
     <!-- Optionally specify a launcher script to use. If the
diff --git a/unix/putty.bundle b/unix/putty.bundle
index 91b0def00..d635c4f25 100644
--- a/unix/putty.bundle
+++ b/unix/putty.bundle
@@ -2,7 +2,41 @@
 <app-bundle>
 
   <meta>
-    <prefix name="default">${env:JHBUILD_PREFIX}</prefix>
+    <!--
+        Set up the pathname prefix where the bundler will look for GTK
+        components such as themes and input method modules.
+
+        This is more of a pain than it ought to be. The example bundle
+        files that come with gtk-mac-bundler set this up by writing
+
+            <prefix name="default">${env:JHBUILD_PREFIX}</prefix>
+
+        which works provided your OS X GTK dev environment was set up
+        by jhbuild. But not everybody's is: some people prefer
+        alternative packaging systems. So that environment variable
+        won't be reliably set in everyone's world.
+
+        The gtk-mac-bundler README suggests that you _ought_ to be
+        able to write this instead:
+
+            <prefix name="default">${pkg:gtk+-3.0:prefix}</prefix>
+
+        which uses pkg-config from $PATH to get the 'prefix' variable.
+        That's surely exactly what you want - except that it doesn't
+        work, because ${pkg:...} is not expanded when processing
+        <prefix> directives in particular!
+
+        So instead, to make this work sensibly whether or not
+        someone's using jhbuild, I work around it by inventing an
+        environment variable of my own and setting that in the
+        Makefile to the value given by the above pkg-config command.
+        It's absurd that I have to, but there we go. As a result, if
+        you try to run the bundler command standalone, you'll find you
+        have to set that variable up manually before you run it.
+
+    -->
+    <prefix name="default">${env:PUTTY_GTK_PREFIX_FROM_MAKEFILE}</prefix>
+
     <run-install-name-tool/>
     <gtk>gtk+-3.0</gtk>
     <!-- Optionally specify a launcher script to use. If the

From 99bdaa7752df6c8feb27ca1de60a463433d43be4 Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Sat, 25 Nov 2017 21:55:17 +0000
Subject: [PATCH 100/166] gtkapp.c: fix a copy-paste error in stub main().

Apparently I copied that rather too literally from osxlaunch.c, where
the text about OS X and 'launcher' made more sense. The stub main in
gtkapp.c has nothing to do with launchers and OS X, so I've corrected
the wording to say that a completely different thing won't work in
completely different circumstances :-)
---
 unix/gtkapp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/unix/gtkapp.c b/unix/gtkapp.c
index b544684ed..602dbf8ba 100644
--- a/unix/gtkapp.c
+++ b/unix/gtkapp.c
@@ -135,7 +135,7 @@ const int buildinfo_gtk_relevant = TRUE;
  * in the source than it is to remove it in the makefile edifice. */
 int main(int argc, char **argv)
 {
-    fprintf(stderr, "launcher does nothing on non-OSX platforms\n");
+    fprintf(stderr, "GtkApplication frontend doesn't work pre-GTK3\n");
     return 1;
 }
 GtkWidget *make_gtk_toplevel_window(void *frontend) { return NULL; }

From afa9734b7de6656fd8db0b077f00f39d8218a4c6 Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Sat, 25 Nov 2017 17:17:21 +0000
Subject: [PATCH 101/166] New facility for removing pending toplevel callbacks.

This is used when you're about to destroy an object that is
(potentially) the context parameter for some still-pending toplevel
callback. It causes callbacks.c to go through its pending list and
delete any callback records referring to that context parameter, so
that when you destroy the object those callbacks aren't still waiting
to cause stale-pointer dereferences.
---
 callback.c | 65 +++++++++++++++++++++++++++++++++++++++++-------------
 putty.h    |  1 +
 2 files changed, 51 insertions(+), 15 deletions(-)

diff --git a/callback.c b/callback.c
index c70dc53fb..84ea0c807 100644
--- a/callback.c
+++ b/callback.c
@@ -14,7 +14,7 @@ struct callback {
     void *ctx;
 };
 
-struct callback *cbhead = NULL, *cbtail = NULL;
+struct callback *cbcurr = NULL, *cbhead = NULL, *cbtail = NULL;
 
 toplevel_callback_notify_fn_t notify_frontend = NULL;
 void *frontend = NULL;
@@ -26,6 +26,30 @@ void request_callback_notifications(toplevel_callback_notify_fn_t fn,
     frontend = fr;
 }
 
+void delete_callbacks_for_context(void *ctx)
+{
+    struct callback *newhead, *newtail;
+
+    newhead = newtail = NULL;
+    while (cbhead) {
+        struct callback *cb = cbhead;
+        cbhead = cbhead->next;
+        if (cb->ctx == ctx) {
+            sfree(cb);
+        } else {
+            if (!newhead)
+                newhead = cb;
+            else
+                newtail->next = cb;
+
+            newtail = cb;
+        }
+    }
+
+    cbhead = newhead;
+    cbtail = newtail;
+}
+
 void queue_toplevel_callback(toplevel_callback_fn_t fn, void *ctx)
 {
     struct callback *cb;
@@ -34,10 +58,18 @@ void queue_toplevel_callback(toplevel_callback_fn_t fn, void *ctx)
     cb->fn = fn;
     cb->ctx = ctx;
 
-    /* If the front end has requested notification of pending
+    /*
+     * If the front end has requested notification of pending
      * callbacks, and we didn't already have one queued, let it know
-     * we do have one now. */
-    if (notify_frontend && !cbhead)
+     * we do have one now.
+     *
+     * If cbcurr is non-NULL, i.e. we are actually in the middle of
+     * executing a callback right now, then we count that as the queue
+     * already having been non-empty. That saves the front end getting
+     * a constant stream of needless re-notifications if the last
+     * callback keeps re-scheduling itself.
+     */
+    if (notify_frontend && !cbhead && !cbcurr)
         notify_frontend(frontend);
 
     if (cbtail)
@@ -51,24 +83,27 @@ void queue_toplevel_callback(toplevel_callback_fn_t fn, void *ctx)
 void run_toplevel_callbacks(void)
 {
     if (cbhead) {
-        struct callback *cb = cbhead;
         /*
-         * Careful ordering here. We call the function _before_
-         * advancing cbhead (though, of course, we must free cb
-         * _after_ advancing it). This means that if the very last
-         * callback schedules another callback, cbhead does not become
-         * NULL at any point, and so the frontend notification
-         * function won't be needlessly pestered.
+         * Transfer the head callback into cbcurr to indicate that
+         * it's being executed. Then operations which transform the
+         * queue, like delete_callbacks_for_context, can proceed as if
+         * it's not there.
          */
-        cb->fn(cb->ctx);
-        cbhead = cb->next;
-        sfree(cb);
+        cbcurr = cbhead;
+        cbhead = cbhead->next;
         if (!cbhead)
             cbtail = NULL;
+
+        /*
+         * Now run the callback, and then clear it out of cbcurr.
+         */
+        cbcurr->fn(cbcurr->ctx);
+        sfree(cbcurr);
+        cbcurr = NULL;
     }
 }
 
 int toplevel_callback_pending(void)
 {
-    return cbhead != NULL;
+    return cbcurr != NULL || cbhead != NULL;
 }
diff --git a/putty.h b/putty.h
index ac35eb73f..0dd48a5ac 100644
--- a/putty.h
+++ b/putty.h
@@ -1534,6 +1534,7 @@ typedef void (*toplevel_callback_fn_t)(void *ctx);
 void queue_toplevel_callback(toplevel_callback_fn_t fn, void *ctx);
 void run_toplevel_callbacks(void);
 int toplevel_callback_pending(void);
+void delete_callbacks_for_context(void *ctx);
 
 typedef void (*toplevel_callback_notify_fn_t)(void *frontend);
 void request_callback_notifications(toplevel_callback_notify_fn_t notify,

From 94a2904ab606ace64db968c95cd0d9d34cf26164 Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Sun, 26 Nov 2017 11:50:49 +0000
Subject: [PATCH 102/166] GTK: add a delete_inst() function to clean up a
 gui_data.

This has been logically necessary in principle for ages, but we got
away without it because we just exited the program. But in the multi-
window GtkApplication front ends, we can't get away with that for
ever; we need to be able to free _one_ of our 'struct gui_data'
instances and everything dangling off it (or, at least, everything
that GTK's reference counting system doesn't clean up for us), without
also doing anything global to the process in which that gui_data is
contained.
---
 unix/gtkwin.c | 47 ++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 44 insertions(+), 3 deletions(-)

diff --git a/unix/gtkwin.c b/unix/gtkwin.c
index 1038e7569..e5345349b 100644
--- a/unix/gtkwin.c
+++ b/unix/gtkwin.c
@@ -1993,9 +1993,6 @@ static void exit_callback(void *vinst)
         (exitcode = inst->back->exitcode(inst->backhandle)) >= 0) {
 	inst->exited = TRUE;
 	close_on_exit = conf_get_int(inst->conf, CONF_close_on_exit);
-	if (close_on_exit == FORCE_ON ||
-	    (close_on_exit == AUTO && exitcode == 0))
-	    gtk_main_quit();	       /* just go */
 	if (inst->ldisc) {
 	    ldisc_free(inst->ldisc);
 	    inst->ldisc = NULL;
@@ -2006,6 +2003,12 @@ static void exit_callback(void *vinst)
         term_provide_resize_fn(inst->term, NULL, NULL);
         update_specials_menu(inst);
 	gtk_widget_set_sensitive(inst->restartitem, TRUE);
+
+	if (close_on_exit == FORCE_ON ||
+	    (close_on_exit == AUTO && exitcode == 0)) {
+            gtk_widget_destroy(inst->window);
+            gtk_main_quit();
+        }
     }
 }
 
@@ -2016,8 +2019,46 @@ void notify_remote_exit(void *frontend)
     queue_toplevel_callback(exit_callback, inst);
 }
 
+static void delete_inst(struct gui_data *inst)
+{
+    delete_callbacks_for_context(inst);
+    if (inst->window) {
+        gtk_widget_destroy(inst->window);
+        inst->window = NULL;
+    }
+    if (inst->menu) {
+        gtk_widget_destroy(inst->menu);
+        inst->menu = NULL;
+    }
+    if (inst->backhandle) {
+        inst->back->free(inst->backhandle);
+        inst->backhandle = NULL;
+        inst->back = NULL;
+    }
+    if (inst->term) {
+        term_free(inst->term);
+        inst->term = NULL;
+    }
+    if (inst->ldisc) {
+        ldisc_free(inst->ldisc);
+        inst->ldisc = NULL;
+    }
+    if (inst->conf) {
+        conf_free(inst->conf);
+        inst->conf = NULL;
+    }
+    if (inst->logctx) {
+        log_free(inst->logctx);
+        inst->logctx = NULL;
+    }
+    sfree(inst);
+}
+
 void destroy(GtkWidget *widget, gpointer data)
 {
+    struct gui_data *inst = (struct gui_data *)data;
+    inst->window = NULL;
+    delete_inst(inst);
     gtk_main_quit();
 }
 

From 817e4ad2dd39d2390c85e2e9d6dcb39524b37653 Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Sun, 26 Nov 2017 11:58:02 +0000
Subject: [PATCH 103/166] Make the configuration dialog non-modal.

Now every call to do_config_box is replaced with a call to
create_config_box, which returns immediately having constructed the
new GTK window object, and is passed a callback function which it will
arrange to be called when the dialog terminates (whether by OK or by
Cancel). That callback is now what triggers the construction of a
session window after 'Open' is pressed in the initial config box, or
the actual mid-session reconfiguration action after 'Apply' is pressed
in a Change Settings box.

We were already prepared to ignore the re-selection of 'Change
Settings' from the context menu of a window that already had a Change
Settings box open (and not accidentally create a second config box for
the same window); but now we do slightly better, by finding the
existing config box and un-minimising and raising it, in case the user
had forgotten it was there.

That's a useful featurelet, but not the main purpose of this change.
The mani point, of course, is that now the multi-window GtkApplication
based front ends now don't do anything confusing to the nesting of
gtk_main() when config boxes are involved. Whether you're changing the
settings of one (or more than one) of your already-running sessions,
preparing to start up a new PuTTY connection, or both at once, we stay
in the same top-level instance of gtk_main() and all sessions' top-
level callbacks continue to run sensibly.
---
 unix/gtkapp.c  |  33 +++++++++++----
 unix/gtkdlg.c  | 111 +++++++++++++++++++++++++++++--------------------
 unix/gtkmain.c |  68 +++++++++++++++++++++---------
 unix/gtkwin.c  |  76 +++++++++++++++++++++++----------
 unix/unix.h    |  16 +++++--
 unix/uxpterm.c |  11 ++---
 unix/uxputty.c |   7 ++--
 7 files changed, 217 insertions(+), 105 deletions(-)

diff --git a/unix/gtkapp.c b/unix/gtkapp.c
index 602dbf8ba..30ee64da1 100644
--- a/unix/gtkapp.c
+++ b/unix/gtkapp.c
@@ -142,6 +142,7 @@ GtkWidget *make_gtk_toplevel_window(void *frontend) { return NULL; }
 void launch_duplicate_session(Conf *conf) {}
 void launch_new_session(void) {}
 void launch_saved_session(const char *str) {}
+void session_window_closed(void) {}
 #else /* GTK_CHECK_VERSION(3,0,0) */
 
 static void startup(GApplication *app, gpointer user_data)
@@ -190,8 +191,6 @@ GtkWidget *make_gtk_toplevel_window(void *frontend)
     return win;
 }
 
-extern int cfgbox(Conf *conf);
-
 void launch_duplicate_session(Conf *conf)
 {
     extern const int dup_check_launchable;
@@ -199,12 +198,20 @@ void launch_duplicate_session(Conf *conf)
     new_session_window(conf_copy(conf), NULL);
 }
 
-void launch_new_session(void)
+void session_window_closed(void)
 {
-    Conf *conf = conf_new();
-    do_defaults(NULL, conf);
-    if (conf_launchable(conf) || cfgbox(conf)) {
+    g_application_release(G_APPLICATION(app));
+}
+
+static void post_initial_config_box(void *vctx, int result)
+{
+    Conf *conf = (Conf *)vctx;
+
+    if (result) {
         new_session_window(conf, NULL);
+    } else {
+        conf_free(conf);
+        g_application_release(G_APPLICATION(app));
     }
 }
 
@@ -212,11 +219,23 @@ void launch_saved_session(const char *str)
 {
     Conf *conf = conf_new();
     do_defaults(str, conf);
-    if (conf_launchable(conf) || cfgbox(conf)) {
+
+    g_application_hold(G_APPLICATION(app));
+
+    if (!conf_launchable(conf)) {
+        initial_config_box(conf, post_initial_config_box, conf);
+    } else {
         new_session_window(conf, NULL);
     }
 }
 
+void launch_new_session(void)
+{
+    /* Same as launch_saved_session except that we pass NULL to
+     * do_defaults. */
+    launch_saved_session(NULL);
+}
+
 void new_app_win(GtkApplication *app)
 {
     launch_new_session();
diff --git a/unix/gtkdlg.c b/unix/gtkdlg.c
index f16119488..f6f624278 100644
--- a/unix/gtkdlg.c
+++ b/unix/gtkdlg.c
@@ -92,7 +92,10 @@ struct dlgparam {
     int nselparams;
     struct selparam *selparams;
 #endif
+    struct controlbox *ctrlbox;
     int retval;
+    post_dialog_fn_t after;
+    void *afterctx;
 };
 #define FLAG_UPDATING_COMBO_LIST 1
 #define FLAG_UPDATING_LISTBOX    2
@@ -143,6 +146,7 @@ static void coloursel_ok(GtkButton *button, gpointer data);
 static void coloursel_cancel(GtkButton *button, gpointer data);
 #endif
 static void window_destroy(GtkWidget *widget, gpointer data);
+static void dlgparam_destroy(GtkWidget *widget, gpointer data);
 int get_listitemheight(GtkWidget *widget);
 
 static int uctrl_cmp_byctrl(void *av, void *bv)
@@ -2958,13 +2962,13 @@ void treeview_map_event(GtkWidget *tree, gpointer data)
 }
 #endif
 
-int do_config_box(const char *title, Conf *conf, int midsession,
-		  int protcfginfo)
+GtkWidget *create_config_box(const char *title, Conf *conf,
+                             int midsession, int protcfginfo,
+                             post_dialog_fn_t after, void *afterctx)
 {
     GtkWidget *window, *hbox, *vbox, *cols, *label,
 	*tree, *treescroll, *panels, *panelvbox;
     int index, level, protocol;
-    struct controlbox *ctrlbox;
     char *path;
 #if GTK_CHECK_VERSION(2,0,0)
     GtkTreeStore *treestore;
@@ -2976,13 +2980,17 @@ int do_config_box(const char *title, Conf *conf, int midsession,
     GtkTreeItem *treeitemlevels[8];
     GtkTree *treelevels[8];
 #endif
-    struct dlgparam dp;
+    struct dlgparam *dp;
     struct Shortcuts scs;
 
     struct selparam *selparams = NULL;
     int nselparams = 0, selparamsize = 0;
 
-    dlg_init(&dp);
+    dp = snew(struct dlgparam);
+    dp->after = after;
+    dp->afterctx = afterctx;
+
+    dlg_init(dp);
 
     for (index = 0; index < lenof(scs.sc); index++) {
 	scs.sc[index].action = SHORTCUT_EMPTY;
@@ -2990,11 +2998,11 @@ int do_config_box(const char *title, Conf *conf, int midsession,
 
     window = our_dialog_new();
 
-    ctrlbox = ctrl_new_box();
+    dp->ctrlbox = ctrl_new_box();
     protocol = conf_get_int(conf, CONF_protocol);
-    setup_config_box(ctrlbox, midsession, protocol, protcfginfo);
-    unix_setup_config_box(ctrlbox, midsession, protocol);
-    gtk_setup_config_box(ctrlbox, midsession, window);
+    setup_config_box(dp->ctrlbox, midsession, protocol, protcfginfo);
+    unix_setup_config_box(dp->ctrlbox, midsession, protocol);
+    gtk_setup_config_box(dp->ctrlbox, midsession, window);
 
     gtk_window_set_title(GTK_WINDOW(window), title);
     hbox = gtk_hbox_new(FALSE, 4);
@@ -3028,11 +3036,10 @@ int do_config_box(const char *title, Conf *conf, int midsession,
     tree = gtk_tree_new();
     gtk_tree_set_view_mode(GTK_TREE(tree), GTK_TREE_VIEW_ITEM);
     gtk_tree_set_selection_mode(GTK_TREE(tree), GTK_SELECTION_BROWSE);
-    g_signal_connect(G_OBJECT(tree), "focus",
-                     G_CALLBACK(tree_focus), &dp);
+    g_signal_connect(G_OBJECT(tree), "focus", G_CALLBACK(tree_focus), dp);
 #endif
     g_signal_connect(G_OBJECT(tree), "focus_in_event",
-                     G_CALLBACK(widget_focus), &dp);
+                     G_CALLBACK(widget_focus), dp);
     shortcut_add(&scs, label, 'g', SHORTCUT_TREE, tree);
     gtk_widget_show(treescroll);
     gtk_box_pack_start(GTK_BOX(vbox), treescroll, TRUE, TRUE, 0);
@@ -3045,12 +3052,12 @@ int do_config_box(const char *title, Conf *conf, int midsession,
     panelvbox = NULL;
     path = NULL;
     level = 0;
-    for (index = 0; index < ctrlbox->nctrlsets; index++) {
-	struct controlset *s = ctrlbox->ctrlsets[index];
+    for (index = 0; index < dp->ctrlbox->nctrlsets; index++) {
+	struct controlset *s = dp->ctrlbox->ctrlsets[index];
 	GtkWidget *w;
 
 	if (!*s->pathname) {
-	    w = layout_ctrls(&dp, &scs, s, GTK_WINDOW(window));
+	    w = layout_ctrls(dp, &scs, s, GTK_WINDOW(window));
 
 	    our_dialog_set_action_area(GTK_WINDOW(window), w);
 	} else {
@@ -3104,7 +3111,7 @@ int do_config_box(const char *title, Conf *conf, int midsession,
 		    selparams = sresize(selparams, selparamsize,
 					struct selparam);
 		}
-		selparams[nselparams].dp = &dp;
+		selparams[nselparams].dp = dp;
 		selparams[nselparams].panels = GTK_NOTEBOOK(panels);
 		selparams[nselparams].panel = panelvbox;
 		selparams[nselparams].shortcuts = scs;   /* structure copy */
@@ -3164,9 +3171,9 @@ int do_config_box(const char *title, Conf *conf, int midsession,
 		treelevels[j] = NULL;
 
                 g_signal_connect(G_OBJECT(treeitem), "key_press_event",
-                                 G_CALLBACK(tree_key_press), &dp);
+                                 G_CALLBACK(tree_key_press), dp);
                 g_signal_connect(G_OBJECT(treeitem), "focus_in_event",
-                                 G_CALLBACK(widget_focus), &dp);
+                                 G_CALLBACK(widget_focus), dp);
 
 		gtk_widget_show(treeitem);
 
@@ -3179,7 +3186,7 @@ int do_config_box(const char *title, Conf *conf, int midsession,
 		nselparams++;
 	    }
 
-	    w = layout_ctrls(&dp, &selparams[nselparams-1].shortcuts, s, NULL);
+	    w = layout_ctrls(dp, &selparams[nselparams-1].shortcuts, s, NULL);
 	    gtk_box_pack_start(GTK_BOX(panelvbox), w, FALSE, FALSE, 0);
             gtk_widget_show(w);
 	}
@@ -3201,8 +3208,8 @@ int do_config_box(const char *title, Conf *conf, int midsession,
      * enough to have all branches expanded without further resizing.
      */
 
-    dp.nselparams = nselparams;
-    dp.selparams = selparams;
+    dp->nselparams = nselparams;
+    dp->selparams = selparams;
 
 #if !GTK_CHECK_VERSION(3,0,0)
     {
@@ -3211,7 +3218,7 @@ int do_config_box(const char *title, Conf *conf, int midsession,
          */
 	GtkRequisition req;
 	gtk_widget_size_request(tree, &req);
-        initial_treeview_collapse(&dp, tree);
+        initial_treeview_collapse(dp, tree);
 	gtk_widget_set_size_request(tree, req.width, -1);
     }
 #else
@@ -3220,7 +3227,7 @@ int do_config_box(const char *title, Conf *conf, int midsession,
      * mapped, because the size computation won't have been done yet.
      */
     g_signal_connect(G_OBJECT(tree), "map",
-                     G_CALLBACK(treeview_map_event), &dp);
+                     G_CALLBACK(treeview_map_event), dp);
 #endif /* GTK 2 vs 3 */
 #endif /* GTK 2+ vs 1 */
 
@@ -3228,26 +3235,26 @@ int do_config_box(const char *title, Conf *conf, int midsession,
     g_signal_connect(G_OBJECT(treeselection), "changed",
 		     G_CALLBACK(treeselection_changed), selparams);
 #else
-    dp.ntreeitems = nselparams;
-    dp.treeitems = snewn(dp.ntreeitems, GtkWidget *);
+    dp->ntreeitems = nselparams;
+    dp->treeitems = snewn(dp->ntreeitems, GtkWidget *);
     for (index = 0; index < nselparams; index++) {
         g_signal_connect(G_OBJECT(selparams[index].treeitem), "select",
                          G_CALLBACK(treeitem_sel),
                          &selparams[index]);
-        dp.treeitems[index] = selparams[index].treeitem;
+        dp->treeitems[index] = selparams[index].treeitem;
     }
 #endif
 
-    dp.data = conf;
-    dlg_refresh(NULL, &dp);
+    dp->data = conf;
+    dlg_refresh(NULL, dp);
 
-    dp.shortcuts = &selparams[0].shortcuts;
+    dp->shortcuts = &selparams[0].shortcuts;
 #if !GTK_CHECK_VERSION(2,0,0)
-    dp.currtreeitem = dp.treeitems[0];
+    dp->currtreeitem = dp->treeitems[0];
 #endif
-    dp.lastfocus = NULL;
-    dp.retval = 0;
-    dp.window = window;
+    dp->lastfocus = NULL;
+    dp->retval = -1;
+    dp->window = window;
 
     {
 	/* in gtkwin.c */
@@ -3274,8 +3281,8 @@ int do_config_box(const char *title, Conf *conf, int midsession,
     /*
      * Set focus into the first available control.
      */
-    for (index = 0; index < ctrlbox->nctrlsets; index++) {
-	struct controlset *s = ctrlbox->ctrlsets[index];
+    for (index = 0; index < dp->ctrlbox->nctrlsets; index++) {
+	struct controlset *s = dp->ctrlbox->ctrlsets[index];
         int done = 0;
         int j;
 
@@ -3284,8 +3291,8 @@ int do_config_box(const char *title, Conf *conf, int midsession,
                 if (s->ctrls[j]->generic.type != CTRL_TABDELAY &&
                     s->ctrls[j]->generic.type != CTRL_COLUMNS &&
                     s->ctrls[j]->generic.type != CTRL_TEXT) {
-                    dlg_set_focus(s->ctrls[j], &dp);
-                    dp.lastfocus = s->ctrls[j];
+                    dlg_set_focus(s->ctrls[j], dp);
+                    dp->lastfocus = s->ctrls[j];
                     done = 1;
                     break;
                 }
@@ -3295,18 +3302,30 @@ int do_config_box(const char *title, Conf *conf, int midsession,
     }
 
     g_signal_connect(G_OBJECT(window), "destroy",
-                     G_CALLBACK(window_destroy), NULL);
+                     G_CALLBACK(dlgparam_destroy), dp);
     g_signal_connect(G_OBJECT(window), "key_press_event",
-                     G_CALLBACK(win_key_press), &dp);
+                     G_CALLBACK(win_key_press), dp);
 
-    gtk_main();
-    post_main();
-
-    dlg_cleanup(&dp);
-    sfree(selparams);
-    ctrl_free_box(ctrlbox);
+    return window;
+}
 
-    return dp.retval;
+static void dlgparam_destroy(GtkWidget *widget, gpointer data)
+{
+    struct dlgparam *dp = (struct dlgparam *)data;
+    if (dp->retval >= 0)
+        dp->after(dp->afterctx, dp->retval);
+    dlg_cleanup(dp);
+    ctrl_free_box(dp->ctrlbox);
+#if GTK_CHECK_VERSION(2,0,0)
+    {
+        int i;
+        for (i = 0; i < dp->nselparams; i++)
+            if (dp->selparams[i].treepath)
+                gtk_tree_path_free(dp->selparams[i].treepath);
+    }
+    sfree(dp->selparams);
+#endif
+    sfree(dp);
 }
 
 static void messagebox_handler(union control *ctrl, void *dlg,
diff --git a/unix/gtkmain.c b/unix/gtkmain.c
index c80da702a..a70ceb5ba 100644
--- a/unix/gtkmain.c
+++ b/unix/gtkmain.c
@@ -296,8 +296,6 @@ static void version(FILE *fp) {
     sfree(buildinfo_text);
 }
 
-static struct gui_data *the_inst;
-
 static const char *geometry_string;
 
 int do_cmdline(int argc, char **argv, int do_everything, int *allow_launch,
@@ -540,10 +538,35 @@ GtkWidget *make_gtk_toplevel_window(void *frontend)
     return gtk_window_new(GTK_WINDOW_TOPLEVEL);
 }
 
-extern int cfgbox(Conf *conf);
-
 const int buildinfo_gtk_relevant = TRUE;
 
+struct post_initial_config_box_ctx {
+    Conf *conf;
+    const char *geometry_string;
+};
+
+static void post_initial_config_box(void *vctx, int result)
+{
+    struct post_initial_config_box_ctx ctx =
+        *(struct post_initial_config_box_ctx *)vctx;
+    sfree(vctx);
+
+    if (result) {
+        new_session_window(ctx.conf, ctx.geometry_string);
+    } else {
+        /* In this main(), which only runs one session in total, a
+         * negative result from the initial config box means we simply
+         * terminate. */
+        conf_free(ctx.conf);
+        gtk_main_quit();
+    }
+}
+
+void session_window_closed(void)
+{
+    gtk_main_quit();
+}
+
 int main(int argc, char **argv)
 {
     Conf *conf;
@@ -614,21 +637,28 @@ int main(int argc, char **argv)
         need_config_box = (!allow_launch || !conf_launchable(conf));
     }
 
-    /*
-     * Put up the config box.
-     */
-    if (need_config_box && !cfgbox(conf))
-        exit(0);		       /* config box hit Cancel */
-
-    /*
-     * Create the main session window. We don't really need to keep
-     * the return value - the fact that it'll be linked from a zillion
-     * GTK and glib bits and bobs known to the main loop will be
-     * sufficient to make everything actually happen - but we stash it
-     * in a global variable anyway, so that it'll be easy to find in a
-     * debugger.
-     */
-    the_inst = new_session_window(conf, geometry_string);
+    if (need_config_box) {
+        /*
+         * Put up the initial config box, which will pass the provided
+         * parameters (with conf updated) to new_session_window() when
+         * (if) the user selects Open. Or it might close without
+         * creating a session window, if the user selects Cancel. Or
+         * it might just create the session window immediately if this
+         * is a pterm-style app which doesn't have an initial config
+         * box at all.
+         */
+        struct post_initial_config_box_ctx *ctx =
+            snew(struct post_initial_config_box_ctx);
+        ctx->conf = conf;
+        ctx->geometry_string = geometry_string;
+        initial_config_box(conf, post_initial_config_box, ctx);
+    } else {
+        /*
+         * No initial config needed; just create the session window
+         * now.
+         */
+        new_session_window(conf, geometry_string);
+    }
 
     gtk_main();
 
diff --git a/unix/gtkwin.c b/unix/gtkwin.c
index e5345349b..f5f4fb387 100644
--- a/unix/gtkwin.c
+++ b/unix/gtkwin.c
@@ -130,7 +130,7 @@ struct gui_data {
     Conf *conf;
     void *eventlogstuff;
     guint32 input_event_time; /* Timestamp of the most recent input event. */
-    int reconfiguring;
+    GtkWidget *reconfigure_dialog;
 #if GTK_CHECK_VERSION(3,4,0)
     gdouble cumulative_scroll;
 #endif
@@ -2007,7 +2007,6 @@ static void exit_callback(void *vinst)
 	if (close_on_exit == FORCE_ON ||
 	    (close_on_exit == AUTO && exitcode == 0)) {
             gtk_widget_destroy(inst->window);
-            gtk_main_quit();
         }
     }
 }
@@ -2022,6 +2021,10 @@ void notify_remote_exit(void *frontend)
 static void delete_inst(struct gui_data *inst)
 {
     delete_callbacks_for_context(inst);
+    if (inst->reconfigure_dialog) {
+        gtk_widget_destroy(inst->reconfigure_dialog);
+        inst->reconfigure_dialog = NULL;
+    }
     if (inst->window) {
         gtk_widget_destroy(inst->window);
         inst->window = NULL;
@@ -2059,7 +2062,7 @@ void destroy(GtkWidget *widget, gpointer data)
     struct gui_data *inst = (struct gui_data *)data;
     inst->window = NULL;
     delete_inst(inst);
-    gtk_main_quit();
+    session_window_closed();
 }
 
 gint focus_event(GtkWidget *widget, GdkEventFocus *event, gpointer data)
@@ -3958,7 +3961,46 @@ void event_log_menuitem(GtkMenuItem *item, gpointer data)
     showeventlog(inst->eventlogstuff, inst->window);
 }
 
+struct after_change_settings_dialog_ctx {
+    struct gui_data *inst;
+    Conf *newconf;
+};
+
+static void after_change_settings_dialog(void *vctx, int retval);
+
 void change_settings_menuitem(GtkMenuItem *item, gpointer data)
+{
+    struct gui_data *inst = (struct gui_data *)data;
+    struct after_change_settings_dialog_ctx *ctx;
+    char *title;
+
+    if (inst->reconfigure_dialog) {
+        /*
+         * If this window already had a Change Settings box open, just
+         * find it and try to make it more prominent.
+         */
+#if GTK_CHECK_VERSION(2,0,0)
+        gtk_window_deiconify(GTK_WINDOW(inst->reconfigure_dialog));
+#endif
+	gdk_window_raise(gtk_widget_get_window(inst->reconfigure_dialog));
+        return;
+    }
+
+    title = dupcat(appname, " Reconfiguration", NULL);
+
+    ctx = snew(struct after_change_settings_dialog_ctx);
+    ctx->inst = inst;
+    ctx->newconf = conf_copy(inst->conf);
+
+    inst->reconfigure_dialog = create_config_box(
+        title, ctx->newconf, 1,
+        inst->back ? inst->back->cfg_info(inst->backhandle) : 0,
+        after_change_settings_dialog, ctx);
+
+    sfree(title);
+}
+
+static void after_change_settings_dialog(void *vctx, int retval)
 {
     /* This maps colour indices in inst->conf to those used in inst->cols. */
     static const int ww[] = {
@@ -3966,25 +4008,19 @@ void change_settings_menuitem(GtkMenuItem *item, gpointer data)
 	0, 8, 1, 9, 2, 10, 3, 11,
 	4, 12, 5, 13, 6, 14, 7, 15
     };
-    struct gui_data *inst = (struct gui_data *)data;
-    char *title;
-    Conf *oldconf, *newconf;
+    struct after_change_settings_dialog_ctx ctx =
+        *(struct after_change_settings_dialog_ctx *)vctx;
+    struct gui_data *inst = ctx.inst;
+    Conf *oldconf = inst->conf, *newconf = ctx.newconf;
     int i, j, need_size;
 
-    assert(lenof(ww) == NCFGCOLOURS);
-
-    if (inst->reconfiguring)
-      return;
-    else
-      inst->reconfiguring = TRUE;
+    sfree(vctx); /* we've copied this already */
 
-    title = dupcat(appname, " Reconfiguration", NULL);
+    assert(lenof(ww) == NCFGCOLOURS);
 
-    oldconf = inst->conf;
-    newconf = conf_copy(inst->conf);
+    inst->reconfigure_dialog = NULL;
 
-    if (do_config_box(title, newconf, 1,
-		      inst->back?inst->back->cfg_info(inst->backhandle):0)) {
+    if (retval) {
         inst->conf = newconf;
 
         /* Pass new config data to the logging module */
@@ -4139,8 +4175,6 @@ void change_settings_menuitem(GtkMenuItem *item, gpointer data)
     } else {
 	conf_free(newconf);
     }
-    sfree(title);
-    inst->reconfiguring = FALSE;
 }
 
 static void change_font_size(struct gui_data *inst, int increment)
@@ -4451,7 +4485,7 @@ static void get_monitor_geometry(GtkWidget *widget, GdkRectangle *geometry)
 }
 #endif
 
-struct gui_data *new_session_window(Conf *conf, const char *geometry_string)
+void new_session_window(Conf *conf, const char *geometry_string)
 {
     struct gui_data *inst;
 
@@ -4781,6 +4815,4 @@ struct gui_data *new_session_window(Conf *conf, const char *geometry_string)
     ldisc_echoedit_update(inst->ldisc);     /* cause ldisc to notice changes */
 
     inst->exited = FALSE;
-
-    return inst;
 }
diff --git a/unix/unix.h b/unix/unix.h
index f21d23ffa..a14f8acc5 100644
--- a/unix/unix.h
+++ b/unix/unix.h
@@ -121,12 +121,19 @@ unsigned long getticks(void);
 
 /* The per-session frontend structure managed by gtkwin.c */
 struct gui_data;
-struct gui_data *new_session_window(Conf *conf, const char *geometry_string);
+
+/* Callback when a dialog box finishes */
+typedef void (*post_dialog_fn_t)(void *ctx, int result);
+
+/* Start up a session window, with or without a preliminary config box */
+void initial_config_box(Conf *conf, post_dialog_fn_t after, void *afterctx);
+void new_session_window(Conf *conf, const char *geometry_string);
 
 /* Defined in gtkmain.c */
 void launch_duplicate_session(Conf *conf);
 void launch_new_session(void);
 void launch_saved_session(const char *str);
+void session_window_closed(void);
 #ifdef MAY_REFER_TO_GTK_IN_HEADERS
 GtkWidget *make_gtk_toplevel_window(void *frontend);
 #endif
@@ -144,8 +151,11 @@ void *get_window(void *frontend);      /* void * to avoid depending on gtk.h */
 void post_main(void);     /* called after any subsidiary gtk_main() */
 
 /* Things pterm.c needs from gtkdlg.c */
-int do_config_box(const char *title, Conf *conf,
-		  int midsession, int protcfginfo);
+#ifdef MAY_REFER_TO_GTK_IN_HEADERS
+GtkWidget *create_config_box(const char *title, Conf *conf,
+                             int midsession, int protcfginfo,
+                             post_dialog_fn_t after, void *afterctx);
+#endif
 void fatal_message_box(void *window, const char *msg);
 void nonfatal_message_box(void *window, const char *msg);
 void about_box(void *window);
diff --git a/unix/uxpterm.c b/unix/uxpterm.c
index 5d0b5f553..687974a26 100644
--- a/unix/uxpterm.c
+++ b/unix/uxpterm.c
@@ -18,15 +18,16 @@ Backend *select_backend(Conf *conf)
     return &pty_backend;
 }
 
-int cfgbox(Conf *conf)
+void initial_config_box(Conf *conf, post_dialog_fn_t after, void *afterctx)
 {
     /*
-     * This is a no-op in pterm, except that we'll ensure the
-     * protocol is set to -1 to inhibit the useless Connection
-     * panel in the config box.
+     * This is a no-op in pterm, except that we'll ensure the protocol
+     * is set to -1 to inhibit the useless Connection panel in the
+     * config box. So we do that and then just immediately call the
+     * post-dialog function with a positive result.
      */
     conf_set_int(conf, CONF_protocol, -1);
-    return 1;
+    after(afterctx, 1);
 }
 
 void cleanup_exit(int code)
diff --git a/unix/uxputty.c b/unix/uxputty.c
index 6d22fceb7..c982e2246 100644
--- a/unix/uxputty.c
+++ b/unix/uxputty.c
@@ -10,6 +10,8 @@
 #include <gtk/gtk.h>
 #include <gdk/gdk.h>
 
+#define MAY_REFER_TO_GTK_IN_HEADERS
+
 #include "putty.h"
 #include "storage.h"
 
@@ -42,12 +44,11 @@ Backend *select_backend(Conf *conf)
     return back;
 }
 
-int cfgbox(Conf *conf)
+void initial_config_box(Conf *conf, post_dialog_fn_t after, void *afterctx)
 {
     char *title = dupcat(appname, " Configuration", NULL);
-    int ret = do_config_box(title, conf, 0, 0);
+    create_config_box(title, conf, FALSE, 0, after, afterctx);
     sfree(title);
-    return ret;
 }
 
 static int got_host = 0;

From 7891cb1ac10938c2d6cf8b88b29eae8cdc0c8633 Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Sun, 26 Nov 2017 11:58:05 +0000
Subject: [PATCH 104/166] Remove an item from gtkapp.c's OS X TODO comment.

The last few changes between them have fixed the problem of windows
not closing properly when their sessions terminated. The problem was
really more than one problem - pterm session termination wasn't even
detected due to the missing SIGCHLD handler, window-closing wasn't
done explicitly due to exit_callback() just calling gtk_main_quit
instead of a proper gtk_widget_destroy(), and that in turn wouldn't do
quite the right thing without the g_application_{hold,release} system
which I added in gtkapp.c as part of the non-model config box rework.

Now that all of those are fixed, things seem to be working sensibly;
the OS X Pterm.app and PuTTY.app, and the ordinary X GTK ptermapp and
puttyapp too, now allow windows to be closed independently of each
other, close them automatically in the right way, and automatically
terminate the whole application when the last window is gone.

So I can clean up that TODO item, including its handwavy 'need to work
out some kind of mechanism'. Some kind of mechanism has now been
worked out, and given that there turned out to be a whole cluster of
interacting structural issues, no wonder I wasn't _quite_ sure what it
ought to be!
---
 unix/gtkapp.c | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/unix/gtkapp.c b/unix/gtkapp.c
index 30ee64da1..e5cc6c6fa 100644
--- a/unix/gtkapp.c
+++ b/unix/gtkapp.c
@@ -36,21 +36,6 @@ keyboard reflexes expect the Meta key to be in that position; but if
 you don't turn that option on, then these shortcuts should work as an
 ordinary Mac user expects, and currently they don't.
 
-Windows don't close sensibly when their sessions terminate. This is
-because until now I've relied on calling cleanup_exit() or
-gtk_main_quit() in gtkwin.c to terminate the program, which is
-conceptually wrong in this situation (we don't want to quit the whole
-application when just one window closes) and also doesn't reliably
-work anyway (GtkApplication doesn't seem to have a gtk_main invocation
-in it at all, so those calls to gtk_main_quit produce a GTK assertion
-failure message on standard error). Need to introduce a proper 'clean
-up this struct gui_data' function (including finalising other stuff
-dangling off it like the backend), call that, and delete just that one
-window. (And then work out a replacement mechanism for having the
-ordinary Unix-style gtkmain.c based programs terminate when their
-session does.) connection_fatal() in particular should invoke this
-mechanism, and terminate just the connection that had trouble.
-
 Mouse wheel events and trackpad scrolling gestures don't work quite
 right in the terminal drawing area.
 

From 5726940153e07bfffde97bb2c1efc20a9c1d5500 Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Sun, 26 Nov 2017 13:00:38 +0000
Subject: [PATCH 105/166] Remove an outdated comment.

ssh1_rdpkt claimed to be handling SSH1_MSG_DEBUG and SSH1_MSG_IGNORE
packets, but in fact, the handling of those has long since been moved
into the dispatch table; those particular entries are set up in
ssh1_protocol_setup().
---
 ssh.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ssh.c b/ssh.c
index aa9fd5dd9..01a58575f 100644
--- a/ssh.c
+++ b/ssh.c
@@ -1351,7 +1351,6 @@ static void ssh1_log_outgoing_packet(Ssh ssh, struct Packet *pkt)
 /*
  * Collect incoming data in the incoming packet buffer.
  * Decipher and verify the packet when it is completely read.
- * Drop SSH1_MSG_DEBUG and SSH1_MSG_IGNORE packets.
  * Update the *data and *datalen variables.
  * Return a Packet structure when a packet is completed.
  */

From 2d289a99703d1c2bf0dcc6927cae79ed87926ebf Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Sun, 26 Nov 2017 14:05:02 +0000
Subject: [PATCH 106/166] Make the GTK message-box function non-variadic.

Now, in place of a variadic argument list with four parameters per
button and a terminating NULL, it takes a pointer to a struct which in
turn contains an (array,length) pair of small per-button structures.

In the process I've renamed the function from messagebox() to
message_box(). Partly that was just because it gave me a convenient
way to search the source for calls I hadn't converted yet, but also
I've thought for a while that that missing underscore didn't really
match the rest of my naming.

NFCI. Partly this minor refactor has the virtue that we can reuse the
more common button layouts without having to type them in at multiple
places in the code (and, indeed, I've provided buttons_yn and
buttons_ok for easy reuse, and could easily provide other things like
yesnocancel any time I need them). But mostly it's because I'm about
to split up message_box into multiple functions, and this saves me the
hassle of deciding which ones to make variadic and which to pass an
actual va_list to - particularly since messagebox() used to go over
its variadic argument list twice, which always makes delegating it to
another function that much more annoying.
---
 unix/gtkdlg.c | 164 +++++++++++++++++++++++++-------------------------
 unix/gtkwin.c |   8 +--
 unix/unix.h   |  16 ++++-
 3 files changed, 101 insertions(+), 87 deletions(-)

diff --git a/unix/gtkdlg.c b/unix/gtkdlg.c
index f6f624278..01f3d624e 100644
--- a/unix/gtkdlg.c
+++ b/unix/gtkdlg.c
@@ -3334,8 +3334,24 @@ static void messagebox_handler(union control *ctrl, void *dlg,
     if (event == EVENT_ACTION)
 	dlg_end(dlg, ctrl->generic.context.i);
 }
-int messagebox(GtkWidget *parentwin, const char *title, const char *msg,
-               int minwid, int selectable, ...)
+
+const struct message_box_button button_array_yn[] = {
+    {"Yes", 'y', +1, 1},
+    {"No", 'n', -1, 0},
+};
+const struct message_box_buttons buttons_yn = {
+    button_array_yn, lenof(button_array_yn),
+};
+const struct message_box_button button_array_ok[] = {
+    {"OK", 'o', 1, 1},
+};
+const struct message_box_buttons buttons_ok = {
+    button_array_ok, lenof(button_array_ok),
+};
+
+int message_box(
+    GtkWidget *parentwin, const char *title, const char *msg, int minwid,
+    int selectable, const struct message_box_buttons *buttons)
 {
     GtkWidget *window, *w0, *w1;
     struct controlbox *ctrlbox;
@@ -3343,8 +3359,7 @@ int messagebox(GtkWidget *parentwin, const char *title, const char *msg,
     union control *c, *textctrl;
     struct dlgparam dp;
     struct Shortcuts scs;
-    int index, ncols, min_type;
-    va_list ap;
+    int i, index, ncols, min_type;
 
     dlg_init(&dp);
 
@@ -3355,24 +3370,17 @@ int messagebox(GtkWidget *parentwin, const char *title, const char *msg,
     ctrlbox = ctrl_new_box();
 
     /*
-     * Preliminary pass over the va_list, to count up the number of
-     * buttons and find out what kinds there are.
+     * Count up the number of buttons and find out what kinds there
+     * are.
      */
     ncols = 0;
-    va_start(ap, selectable);
     min_type = +1;
-    while (va_arg(ap, char *) != NULL) {
-        int type;
-
-	(void) va_arg(ap, int);	       /* shortcut */
-	type = va_arg(ap, int);	       /* normal/default/cancel */
-	(void) va_arg(ap, int);	       /* end value */
-
+    for (i = 0; i < buttons->nbuttons; i++) {
+        const struct message_box_button *button = &buttons->buttons[i];
 	ncols++;
-        if (min_type > type)
-            min_type = type;
+        if (min_type > button->type)
+            min_type = button->type;
     }
-    va_end(ap);
 
     s0 = ctrl_getset(ctrlbox, "", "", "");
     c = ctrl_columns(s0, 2, 50, 50);
@@ -3380,20 +3388,14 @@ int messagebox(GtkWidget *parentwin, const char *title, const char *msg,
     c->columns.percentages = sresize(c->columns.percentages, ncols, int);
     for (index = 0; index < ncols; index++)
 	c->columns.percentages[index] = (index+1)*100/ncols - index*100/ncols;
-    va_start(ap, selectable);
     index = 0;
-    while (1) {
-	char *title = va_arg(ap, char *);
-	int shortcut, type, value;
-	if (title == NULL)
-	    break;
-	shortcut = va_arg(ap, int);
-	type = va_arg(ap, int);
-	value = va_arg(ap, int);
-	c = ctrl_pushbutton(s0, title, shortcut, HELPCTX(no_help),
-			    messagebox_handler, I(value));
+    for (i = 0; i < buttons->nbuttons; i++) {
+        const struct message_box_button *button = &buttons->buttons[i];
+	c = ctrl_pushbutton(s0, button->title, button->shortcut,
+                            HELPCTX(no_help), messagebox_handler,
+                            I(button->value));
 	c->generic.column = index++;
-	if (type > 0)
+	if (button->type > 0)
 	    c->button.isdefault = TRUE;
 
         /* We always arrange that _some_ button is labelled as
@@ -3405,10 +3407,9 @@ int messagebox(GtkWidget *parentwin, const char *title, const char *msg,
          * no will be picked, and if there's only one option (a box
          * that really is just showing a _message_ and not even asking
          * a question) then that will be picked. */
-	if (type == min_type)
+	if (button->type == min_type)
 	    c->button.iscancel = TRUE;
     }
-    va_end(ap);
 
     s1 = ctrl_getset(ctrlbox, "x", "", "");
     textctrl = ctrl_text(s1, msg, HELPCTX(no_help));
@@ -3477,13 +3478,10 @@ int messagebox(GtkWidget *parentwin, const char *title, const char *msg,
 int reallyclose(void *frontend)
 {
     char *title = dupcat(appname, " Exit Confirmation", NULL);
-    int ret = messagebox(GTK_WIDGET(get_window(frontend)),
-			 title, "Are you sure you want to close this session?",
-			 string_width("Most of the width of the above text"),
-                         FALSE,
-			 "Yes", 'y', +1, 1,
-			 "No", 'n', -1, 0,
-			 NULL);
+    int ret = message_box(GTK_WIDGET(get_window(frontend)), title,
+                          "Are you sure you want to close this session?",
+                          string_width("Most of the width of the above text"),
+                          FALSE, &buttons_yn);
     sfree(title);
     return ret;
 }
@@ -3518,6 +3516,15 @@ int verify_ssh_host_key(void *frontend, char *host, int port,
 	"If you want to abandon the connection completely, press "
 	"\"Cancel\" to cancel. Pressing \"Cancel\" is the ONLY guaranteed "
 	"safe choice.";
+    static const struct message_box_button button_array_hostkey[] = {
+        {"Accept", 'a', 0, 2},
+        {"Connect Once", 'o', 0, 1},
+        {"Cancel", 'c', -1, 0},
+    };
+    static const struct message_box_buttons buttons_hostkey = {
+        button_array_hostkey, lenof(button_array_hostkey),
+    };
+
     char *text;
     int ret;
 
@@ -3531,14 +3538,10 @@ int verify_ssh_host_key(void *frontend, char *host, int port,
 
     text = dupprintf((ret == 2 ? wrongtxt : absenttxt), keytype, fingerprint);
 
-    ret = messagebox(GTK_WIDGET(get_window(frontend)),
-		     "PuTTY Security Alert", text,
-		     string_width(fingerprint),
-                     TRUE,
-		     "Accept", 'a', 0, 2,
-		     "Connect Once", 'o', 0, 1,
-		     "Cancel", 'c', -1, 0,
-		     NULL);
+    ret = message_box(GTK_WIDGET(get_window(frontend)),
+                      "PuTTY Security Alert", text,
+                      string_width(fingerprint),
+                      TRUE, &buttons_hostkey);
 
     sfree(text);
 
@@ -3565,14 +3568,11 @@ int askalg(void *frontend, const char *algtype, const char *algname,
     int ret;
 
     text = dupprintf(msg, algtype, algname);
-    ret = messagebox(GTK_WIDGET(get_window(frontend)),
-		     "PuTTY Security Alert", text,
-		     string_width("Reasonably long line of text as a width"
-                                  " template"),
-                     FALSE,
-		     "Yes", 'y', 0, 1,
-		     "No", 'n', 0, 0,
-		     NULL);
+    ret = message_box(GTK_WIDGET(get_window(frontend)),
+                      "PuTTY Security Alert", text,
+                      string_width("Reasonably long line of text as a width"
+                                   " template"),
+                      FALSE, &buttons_yn);
     sfree(text);
 
     if (ret) {
@@ -3596,14 +3596,11 @@ int askhk(void *frontend, const char *algname, const char *betteralgs,
     int ret;
 
     text = dupprintf(msg, algname, betteralgs);
-    ret = messagebox(GTK_WIDGET(get_window(frontend)),
-		     "PuTTY Security Alert", text,
-		     string_width("is ecdsa-nistp521, which is"
-                                  " below the configured warning threshold."),
-                     FALSE,
-		     "Yes", 'y', 0, 1,
-		     "No", 'n', 0, 0,
-		     NULL);
+    ret = message_box(GTK_WIDGET(get_window(frontend)),
+                      "PuTTY Security Alert", text,
+                      string_width("is ecdsa-nistp521, which is"
+                                   " below the configured warning threshold."),
+                      FALSE, &buttons_yn);
     sfree(text);
 
     if (ret) {
@@ -3622,16 +3619,16 @@ void old_keyfile_warning(void)
 
 void fatal_message_box(void *window, const char *msg)
 {
-    messagebox(window, "PuTTY Fatal Error", msg,
-               string_width("REASONABLY LONG LINE OF TEXT FOR BASIC SANITY"),
-               FALSE, "OK", 'o', 1, 1, NULL);
+    message_box(window, "PuTTY Fatal Error", msg,
+                string_width("REASONABLY LONG LINE OF TEXT FOR BASIC SANITY"),
+                FALSE, &buttons_ok);
 }
 
 void nonfatal_message_box(void *window, const char *msg)
 {
-    messagebox(window, "PuTTY Error", msg,
-               string_width("REASONABLY LONG LINE OF TEXT FOR BASIC SANITY"),
-               FALSE, "OK", 'o', 1, 1, NULL);
+    message_box(window, "PuTTY Error", msg,
+                string_width("REASONABLY LONG LINE OF TEXT FOR BASIC SANITY"),
+                FALSE, &buttons_ok);
 }
 
 void fatalbox(const char *p, ...)
@@ -3680,10 +3677,10 @@ static void licence_clicked(GtkButton *button, gpointer data)
 
     title = dupcat(appname, " Licence", NULL);
     assert(aboutbox != NULL);
-    messagebox(aboutbox, title, LICENCE_TEXT("\n\n"),
-	       string_width("LONGISH LINE OF TEXT SO THE LICENCE"
-			    " BOX ISN'T EXCESSIVELY TALL AND THIN"),
-               TRUE, "OK", 'o', 1, 1, NULL);
+    message_box(aboutbox, title, LICENCE_TEXT("\n\n"),
+                string_width("LONGISH LINE OF TEXT SO THE LICENCE"
+                             " BOX ISN'T EXCESSIVELY TALL AND THIN"),
+                TRUE, &buttons_ok);
     sfree(title);
 }
 
@@ -3736,7 +3733,7 @@ void about_box(void *window)
     our_dialog_add_to_content_area(GTK_WINDOW(aboutbox), w, FALSE, FALSE, 0);
 #if GTK_CHECK_VERSION(2,0,0)
     /*
-     * Same precautions against initial select-all as in messagebox().
+     * Same precautions against initial select-all as in message_box().
      */
     gtk_widget_grab_focus(w);
     gtk_label_select_region(GTK_LABEL(w), 0, 0);
@@ -4003,6 +4000,15 @@ int askappend(void *frontend, Filename *filename,
 	"You can overwrite it with a new session log, "
 	"append your session log to the end of it, "
 	"or disable session logging for this session.";
+    static const struct message_box_button button_array_append[] = {
+        {"Overwrite", 'o', 1, 2},
+        {"Append", 'a', 0, 1},
+        {"Disable", 'd', -1, 0},
+    };
+    static const struct message_box_buttons buttons_append = {
+        button_array_append, lenof(button_array_append),
+    };
+
     char *message;
     char *mbtitle;
     int mbret;
@@ -4010,14 +4016,10 @@ int askappend(void *frontend, Filename *filename,
     message = dupprintf(msgtemplate, FILENAME_MAX, filename->path);
     mbtitle = dupprintf("%s Log to File", appname);
 
-    mbret = messagebox(get_window(frontend), mbtitle, message,
-		       string_width("LINE OF TEXT SUITABLE FOR THE"
-				    " ASKAPPEND WIDTH"),
-                       FALSE,
-		       "Overwrite", 'o', 1, 2,
-		       "Append", 'a', 0, 1,
-		       "Disable", 'd', -1, 0,
-		       NULL);
+    mbret = message_box(get_window(frontend), mbtitle, message,
+                        string_width("LINE OF TEXT SUITABLE FOR THE"
+                                     " ASKAPPEND WIDTH"),
+                        FALSE, &buttons_append);
 
     sfree(message);
     sfree(mbtitle);
diff --git a/unix/gtkwin.c b/unix/gtkwin.c
index f5f4fb387..046cf09c5 100644
--- a/unix/gtkwin.c
+++ b/unix/gtkwin.c
@@ -4125,10 +4125,10 @@ static void after_change_settings_dialog(void *vctx, int retval)
                 char *msgboxtext =
                     dupprintf("Could not change fonts in terminal window: %s\n",
                               errmsg);
-                messagebox(inst->window, "Font setup error", msgboxtext,
-                           string_width("Could not change fonts in terminal window:"),
-                           FALSE, "OK", 'o', +1, 1,
-                           NULL);
+                message_box(inst->window, "Font setup error", msgboxtext,
+                            string_width("Could not change fonts in terminal"
+                                         " window:"),
+                            FALSE, &buttons_ok);
                 sfree(msgboxtext);
                 sfree(errmsg);
             } else {
diff --git a/unix/unix.h b/unix/unix.h
index a14f8acc5..a9bd71f47 100644
--- a/unix/unix.h
+++ b/unix/unix.h
@@ -164,8 +164,20 @@ void showeventlog(void *estuff, void *parentwin);
 void logevent_dlg(void *estuff, const char *string);
 int reallyclose(void *frontend);
 #ifdef MAY_REFER_TO_GTK_IN_HEADERS
-int messagebox(GtkWidget *parentwin, const char *title,
-               const char *msg, int minwid, int selectable, ...);
+struct message_box_button {
+    const char *title;
+    char shortcut;
+    int type; /* more negative means more appropriate to be the Esc action */
+    int value;     /* message box's return value if this is pressed */
+};
+struct message_box_buttons {
+    const struct message_box_button *buttons;
+    int nbuttons;
+};
+extern const struct message_box_buttons buttons_yn, buttons_ok;
+int message_box(
+    GtkWidget *parentwin, const char *title, const char *msg, int minwid,
+    int selectable, const struct message_box_buttons *buttons);
 #endif
 
 /* Things pterm.c needs from {ptermm,uxputty}.c */

From 46ba9de2c2025bd776e23849f093c7d932e9278b Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Sun, 26 Nov 2017 14:29:31 +0000
Subject: [PATCH 107/166] Introduce a non-modal create_message_box().

This does the bulk of the work previously done by message_box()
proper, but takes a pointer to a result-reporting callback function
identical to the one we pass to create_config_box().

The modal version of message_box() still exists and is a small wrapper
on this function, running its own subsidiary gtk_main() loop which the
result callback terminates. But now I can start switching over
individual uses of message_box() to the non-modal version, and when
that's done, remove the modal function completely.
---
 unix/gtkdlg.c | 76 +++++++++++++++++++++++++++++++++++----------------
 1 file changed, 52 insertions(+), 24 deletions(-)

diff --git a/unix/gtkdlg.c b/unix/gtkdlg.c
index 01f3d624e..9e5ebf206 100644
--- a/unix/gtkdlg.c
+++ b/unix/gtkdlg.c
@@ -145,7 +145,9 @@ static void colourchoose_response(GtkDialog *dialog,
 static void coloursel_ok(GtkButton *button, gpointer data);
 static void coloursel_cancel(GtkButton *button, gpointer data);
 #endif
+#if !GTK_CHECK_VERSION(3,0,0)
 static void window_destroy(GtkWidget *widget, gpointer data);
+#endif
 static void dlgparam_destroy(GtkWidget *widget, gpointer data);
 int get_listitemheight(GtkWidget *widget);
 
@@ -2619,10 +2621,12 @@ static void treeitem_sel(GtkItem *item, gpointer data)
 }
 #endif
 
+#if !GTK_CHECK_VERSION(3,0,0)
 static void window_destroy(GtkWidget *widget, gpointer data)
 {
     gtk_main_quit();
 }
+#endif
 
 #if !GTK_CHECK_VERSION(2,0,0)
 static int tree_grab_focus(struct dlgparam *dp)
@@ -3317,13 +3321,13 @@ static void dlgparam_destroy(GtkWidget *widget, gpointer data)
     dlg_cleanup(dp);
     ctrl_free_box(dp->ctrlbox);
 #if GTK_CHECK_VERSION(2,0,0)
-    {
+    if (dp->selparams) {
         int i;
         for (i = 0; i < dp->nselparams; i++)
             if (dp->selparams[i].treepath)
                 gtk_tree_path_free(dp->selparams[i].treepath);
+        sfree(dp->selparams);
     }
-    sfree(dp->selparams);
 #endif
     sfree(dp);
 }
@@ -3349,25 +3353,29 @@ const struct message_box_buttons buttons_ok = {
     button_array_ok, lenof(button_array_ok),
 };
 
-int message_box(
+GtkWidget *create_message_box(
     GtkWidget *parentwin, const char *title, const char *msg, int minwid,
-    int selectable, const struct message_box_buttons *buttons)
+    int selectable, const struct message_box_buttons *buttons,
+    post_dialog_fn_t after, void *afterctx)
 {
     GtkWidget *window, *w0, *w1;
-    struct controlbox *ctrlbox;
     struct controlset *s0, *s1;
     union control *c, *textctrl;
-    struct dlgparam dp;
+    struct dlgparam *dp;
     struct Shortcuts scs;
     int i, index, ncols, min_type;
 
-    dlg_init(&dp);
+    dp = snew(struct dlgparam);
+    dp->after = after;
+    dp->afterctx = afterctx;
+
+    dlg_init(dp);
 
     for (index = 0; index < lenof(scs.sc); index++) {
 	scs.sc[index].action = SHORTCUT_EMPTY;
     }
 
-    ctrlbox = ctrl_new_box();
+    dp->ctrlbox = ctrl_new_box();
 
     /*
      * Count up the number of buttons and find out what kinds there
@@ -3380,9 +3388,10 @@ int message_box(
 	ncols++;
         if (min_type > button->type)
             min_type = button->type;
+        assert(button->value >= 0);    /* <0 means no return value available */
     }
 
-    s0 = ctrl_getset(ctrlbox, "", "", "");
+    s0 = ctrl_getset(dp->ctrlbox, "", "", "");
     c = ctrl_columns(s0, 2, 50, 50);
     c->columns.ncols = s0->ncolumns = ncols;
     c->columns.percentages = sresize(c->columns.percentages, ncols, int);
@@ -3411,28 +3420,28 @@ int message_box(
 	    c->button.iscancel = TRUE;
     }
 
-    s1 = ctrl_getset(ctrlbox, "x", "", "");
+    s1 = ctrl_getset(dp->ctrlbox, "x", "", "");
     textctrl = ctrl_text(s1, msg, HELPCTX(no_help));
 
     window = our_dialog_new();
     gtk_window_set_title(GTK_WINDOW(window), title);
-    w0 = layout_ctrls(&dp, &scs, s0, GTK_WINDOW(window));
+    w0 = layout_ctrls(dp, &scs, s0, GTK_WINDOW(window));
     our_dialog_set_action_area(GTK_WINDOW(window), w0);
     gtk_widget_show(w0);
-    w1 = layout_ctrls(&dp, &scs, s1, GTK_WINDOW(window));
+    w1 = layout_ctrls(dp, &scs, s1, GTK_WINDOW(window));
     gtk_container_set_border_width(GTK_CONTAINER(w1), 10);
     gtk_widget_set_size_request(w1, minwid+20, -1);
     our_dialog_add_to_content_area(GTK_WINDOW(window), w1, TRUE, TRUE, 0);
     gtk_widget_show(w1);
 
-    dp.shortcuts = &scs;
-    dp.lastfocus = NULL;
-    dp.retval = 0;
-    dp.window = window;
+    dp->shortcuts = &scs;
+    dp->lastfocus = NULL;
+    dp->retval = 0;
+    dp->window = window;
 
     if (selectable) {
 #if GTK_CHECK_VERSION(2,0,0)
-        struct uctrl *uc = dlg_find_byctrl(&dp, textctrl);
+        struct uctrl *uc = dlg_find_byctrl(dp, textctrl);
         gtk_label_set_selectable(GTK_LABEL(uc->text), TRUE);
 
         /*
@@ -3450,7 +3459,6 @@ int message_box(
 #endif
     }
 
-    gtk_window_set_modal(GTK_WINDOW(window), TRUE);
     if (parentwin) {
         set_transient_window_pos(parentwin, window);
 	gtk_window_set_transient_for(GTK_WINDOW(window),
@@ -3461,18 +3469,38 @@ int message_box(
     gtk_widget_show(window);
     gtk_window_set_focus(GTK_WINDOW(window), NULL);
 
+    dp->selparams = NULL;
+
     g_signal_connect(G_OBJECT(window), "destroy",
-                     G_CALLBACK(window_destroy), NULL);
+                     G_CALLBACK(dlgparam_destroy), dp);
     g_signal_connect(G_OBJECT(window), "key_press_event",
-                     G_CALLBACK(win_key_press), &dp);
+                     G_CALLBACK(win_key_press), dp);
+
+    return window;
+}
+
+static void modal_message_box_after(void *ctx, int result)
+{
+    *(int *)ctx = result;
+    gtk_main_quit();
+}
+
+int message_box(
+    GtkWidget *parentwin, const char *title, const char *msg, int minwid,
+    int selectable, const struct message_box_buttons *buttons)
+{
+    int retval = INT_MIN;
+    GtkWidget *dialog;
+
+    dialog = create_message_box(parentwin, title, msg, minwid, selectable,
+                                buttons, modal_message_box_after, &retval);
+    gtk_window_set_modal(GTK_WINDOW(dialog), TRUE);
 
     gtk_main();
     post_main();
 
-    dlg_cleanup(&dp);
-    ctrl_free_box(ctrlbox);
-
-    return dp.retval;
+    assert(retval != INT_MIN);
+    return retval;
 }
 
 int reallyclose(void *frontend)

From 946405341ffc12fa6433dab0900da3cff9b1d629 Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Sun, 26 Nov 2017 14:37:38 +0000
Subject: [PATCH 108/166] Fix a cleanup issue in dlgparam_destroy.

If a dialog box is destroyed by the program before the user has
pressed one of the result-delivering buttons - e.g. because the parent
window closes so the dialog is no longer relevant to anything anyway -
then dlgparam_destroy would never call the client code's provided
callback. That makes sense in terms of the callback wanting to _take
action_ based on the result of the dialog box, but it ignores the
possibility that the callback may simply need to free its own context
structure.

So now dlgparam_destroy always calls the client's callback, even if
the result it passes is negative (meaning 'the user never got round to
pressing any of the dialog-ending buttons'), and all the existing
client callbacks handle the negative-result case by doing nothing
except freeing any allocated memory they might have.
---
 unix/gtkapp.c  | 4 ++--
 unix/gtkdlg.c  | 3 +--
 unix/gtkmain.c | 4 ++--
 unix/gtkwin.c  | 7 +++++++
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/unix/gtkapp.c b/unix/gtkapp.c
index e5cc6c6fa..d7add6d11 100644
--- a/unix/gtkapp.c
+++ b/unix/gtkapp.c
@@ -192,9 +192,9 @@ static void post_initial_config_box(void *vctx, int result)
 {
     Conf *conf = (Conf *)vctx;
 
-    if (result) {
+    if (result > 0) {
         new_session_window(conf, NULL);
-    } else {
+    } else if (result == 0) {
         conf_free(conf);
         g_application_release(G_APPLICATION(app));
     }
diff --git a/unix/gtkdlg.c b/unix/gtkdlg.c
index 9e5ebf206..35973d9a6 100644
--- a/unix/gtkdlg.c
+++ b/unix/gtkdlg.c
@@ -3316,8 +3316,7 @@ GtkWidget *create_config_box(const char *title, Conf *conf,
 static void dlgparam_destroy(GtkWidget *widget, gpointer data)
 {
     struct dlgparam *dp = (struct dlgparam *)data;
-    if (dp->retval >= 0)
-        dp->after(dp->afterctx, dp->retval);
+    dp->after(dp->afterctx, dp->retval);
     dlg_cleanup(dp);
     ctrl_free_box(dp->ctrlbox);
 #if GTK_CHECK_VERSION(2,0,0)
diff --git a/unix/gtkmain.c b/unix/gtkmain.c
index a70ceb5ba..751a80ff7 100644
--- a/unix/gtkmain.c
+++ b/unix/gtkmain.c
@@ -551,9 +551,9 @@ static void post_initial_config_box(void *vctx, int result)
         *(struct post_initial_config_box_ctx *)vctx;
     sfree(vctx);
 
-    if (result) {
+    if (result > 0) {
         new_session_window(ctx.conf, ctx.geometry_string);
-    } else {
+    } else if (result == 0) {
         /* In this main(), which only runs one session in total, a
          * negative result from the initial config box means we simply
          * terminate. */
diff --git a/unix/gtkwin.c b/unix/gtkwin.c
index 046cf09c5..88b438a5a 100644
--- a/unix/gtkwin.c
+++ b/unix/gtkwin.c
@@ -4016,6 +4016,13 @@ static void after_change_settings_dialog(void *vctx, int retval)
 
     sfree(vctx); /* we've copied this already */
 
+    if (retval < 0) {
+        /* If the dialog box was aborted without giving a result
+         * (probably because the whole session window closed), we have
+         * nothing further to do. */
+        return;
+    }
+
     assert(lenof(ww) == NCFGCOLOURS);
 
     inst->reconfigure_dialog = NULL;

From 671267f44bdb0940ce0cd3f92a15c0da7daaf5f6 Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Sun, 26 Nov 2017 14:55:15 +0000
Subject: [PATCH 109/166] GTK: system for not leaving stale network prompt
 dialogs.

When I switch verify_ssh_host_key() and friends over to creating
non-modal message boxes and returning to the main loop, there will be
a risk that their parent window will need to close for some other
reason while the user hasn't answered the pending question yet. (E.g.
if the user presses the main session window's close button, which will
no longer be a prohibited UI action once the transient dialog is not
modal.)

At that point we need to get rid of the pending dialog box, both for
UI purposes (it would look silly and be confusing to leave it lying
around) and for memory management (if the user subsequently clicks OK
in such a dialog it would probably try to leave its result somewhere
stale).

So now there's a mechanism for gtkwin.c remembering what the current
'network prompt dialog' is, if any (in which category I intend to
include everything triggered from ssh.c's various reasons for asking
crypto-related questions), and cleaning it up when the struct gui_data
it belongs to goes away.
---
 unix/gtkwin.c | 25 ++++++++++++++++++++++++-
 unix/unix.h   |  6 +++++-
 2 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/unix/gtkwin.c b/unix/gtkwin.c
index 88b438a5a..00e07485f 100644
--- a/unix/gtkwin.c
+++ b/unix/gtkwin.c
@@ -131,6 +131,7 @@ struct gui_data {
     void *eventlogstuff;
     guint32 input_event_time; /* Timestamp of the most recent input event. */
     GtkWidget *reconfigure_dialog;
+    GtkWidget *network_prompt_dialog;
 #if GTK_CHECK_VERSION(3,4,0)
     gdouble cumulative_scroll;
 #endif
@@ -301,12 +302,30 @@ static Mouse_Button translate_button(Mouse_Button button)
  * Return the top-level GtkWindow associated with a particular
  * front end instance.
  */
-void *get_window(void *frontend)
+GtkWidget *get_window(void *frontend)
 {
     struct gui_data *inst = (struct gui_data *)frontend;
     return inst->window;
 }
 
+/*
+ * Set and clear a pointer to a dialog box created as a result of the
+ * network code wanting to ask an asynchronous user question (e.g.
+ * 'what about this dodgy host key, then?').
+ */
+void register_network_prompt_dialog(void *frontend, GtkWidget *dialog)
+{
+    struct gui_data *inst = (struct gui_data *)frontend;
+    assert(!inst->network_prompt_dialog);
+    inst->network_prompt_dialog = dialog;
+}
+void unregister_network_prompt_dialog(void *frontend)
+{
+    struct gui_data *inst = (struct gui_data *)frontend;
+    assert(inst->network_prompt_dialog);
+    inst->network_prompt_dialog = NULL;
+}
+
 /*
  * Minimise or restore the window in response to a server-side
  * request.
@@ -2025,6 +2044,10 @@ static void delete_inst(struct gui_data *inst)
         gtk_widget_destroy(inst->reconfigure_dialog);
         inst->reconfigure_dialog = NULL;
     }
+    if (inst->network_prompt_dialog) {
+        gtk_widget_destroy(inst->network_prompt_dialog);
+        inst->network_prompt_dialog = NULL;
+    }
     if (inst->window) {
         gtk_widget_destroy(inst->window);
         inst->window = NULL;
diff --git a/unix/unix.h b/unix/unix.h
index a9bd71f47..979fe4482 100644
--- a/unix/unix.h
+++ b/unix/unix.h
@@ -147,7 +147,11 @@ int font_dimension(void *frontend, int which);/* 0 for width, 1 for height */
 long get_windowid(void *frontend);
 
 /* Things gtkdlg.c needs from pterm.c */
-void *get_window(void *frontend);      /* void * to avoid depending on gtk.h */
+#ifdef MAY_REFER_TO_GTK_IN_HEADERS
+GtkWidget *get_window(void *frontend);
+void register_network_prompt_dialog(void *frontend, GtkWidget *dialog);
+void unregister_network_prompt_dialog(void *frontend);
+#endif
 void post_main(void);     /* called after any subsidiary gtk_main() */
 
 /* Things pterm.c needs from gtkdlg.c */

From 624f5b7d47088979dc6d45c994f1988c10653c09 Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Sun, 26 Nov 2017 14:29:42 +0000
Subject: [PATCH 110/166] Make the GTK host-key verification box non-modal.

I've switched it to using the new non-modal create_message_box, and
provided a callback function which handles the cleanup afterwards.

I had expected this to be a lot more work, because I'd imagined that
I'd have to contort the coroutines in ssh.c to give them the ability
to wait for an asynchronously delivered result from that user prompt.
But in fact that wasn't necessary, because just such a mechanism has
been sitting there unused since commit 8574822b9 in 2005, when I added
it as part of my _previous_ attempt to write an OS X front end! (The
abandoned one written in native ObjC + Cocoa.)
---
 unix/gtkdlg.c | 75 ++++++++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 65 insertions(+), 10 deletions(-)

diff --git a/unix/gtkdlg.c b/unix/gtkdlg.c
index 35973d9a6..e6f88e6de 100644
--- a/unix/gtkdlg.c
+++ b/unix/gtkdlg.c
@@ -3513,6 +3513,54 @@ int reallyclose(void *frontend)
     return ret;
 }
 
+struct verify_ssh_host_key_result_ctx {
+    char *host;
+    int port;
+    char *keytype;
+    char *keystr;
+    void (*callback)(void *callback_ctx, int result);
+    void *callback_ctx;
+    void *frontend;
+};
+
+static void verify_ssh_host_key_result_callback(void *vctx, int result)
+{
+    struct verify_ssh_host_key_result_ctx *ctx =
+        (struct verify_ssh_host_key_result_ctx *)vctx;
+
+    if (result >= 0) {
+        int logical_result;
+
+        /*
+         * Convert the dialog-box return value (one of three
+         * possibilities) into the return value we pass back to the SSH
+         * code (one of only two possibilities, because the SSH code
+         * doesn't care whether we saved the host key or not).
+         */
+        if (result == 2) {
+            store_host_key(ctx->host, ctx->port, ctx->keytype, ctx->keystr);
+            logical_result = 1;      /* continue with connection */
+        } else if (result == 1) {
+            logical_result = 1;      /* continue with connection */
+        } else {
+            logical_result = 0;      /* do not continue with connection */
+        }
+
+        ctx->callback(ctx->callback_ctx, logical_result);
+    }
+
+    /*
+     * Clean up this context structure, whether or not a result was
+     * ever actually delivered from the dialog box.
+     */
+    unregister_network_prompt_dialog(ctx->frontend);
+
+    sfree(ctx->host);
+    sfree(ctx->keytype);
+    sfree(ctx->keystr);
+    sfree(ctx);
+}
+
 int verify_ssh_host_key(void *frontend, char *host, int port,
                         const char *keytype, char *keystr, char *fingerprint,
                         void (*callback)(void *ctx, int result), void *ctx)
@@ -3554,6 +3602,8 @@ int verify_ssh_host_key(void *frontend, char *host, int port,
 
     char *text;
     int ret;
+    struct verify_ssh_host_key_result_ctx *result_ctx;
+    GtkWidget *mainwin, *msgbox;
 
     /*
      * Verify the key.
@@ -3565,19 +3615,24 @@ int verify_ssh_host_key(void *frontend, char *host, int port,
 
     text = dupprintf((ret == 2 ? wrongtxt : absenttxt), keytype, fingerprint);
 
-    ret = message_box(GTK_WIDGET(get_window(frontend)),
-                      "PuTTY Security Alert", text,
-                      string_width(fingerprint),
-                      TRUE, &buttons_hostkey);
+    result_ctx = snew(struct verify_ssh_host_key_result_ctx);
+    result_ctx->callback = callback;
+    result_ctx->callback_ctx = ctx;
+    result_ctx->host = dupstr(host);
+    result_ctx->port = port;
+    result_ctx->keytype = dupstr(keytype);
+    result_ctx->keystr = dupstr(keystr);
+    result_ctx->frontend = frontend;
+
+    mainwin = GTK_WIDGET(get_window(frontend));
+    msgbox = create_message_box(
+        mainwin, "PuTTY Security Alert", text, string_width(fingerprint), TRUE,
+        &buttons_hostkey, verify_ssh_host_key_result_callback, result_ctx);
+    register_network_prompt_dialog(frontend, msgbox);
 
     sfree(text);
 
-    if (ret == 2) {
-	store_host_key(host, port, keytype, keystr);
-	return 1;		       /* continue with connection */
-    } else if (ret == 1)
-	return 1;		       /* continue with connection */
-    return 0;			       /* do not continue with connection */
+    return -1;                         /* dialog still in progress */
 }
 
 /*

From 199f381aa9fb81c80929a590a6a4bd4c046148ee Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Sun, 26 Nov 2017 15:13:08 +0000
Subject: [PATCH 111/166] Make GTK askalg() and askhk() non-modal.

This follows exactly the same pattern as for verify_ssh_host_key, but
the results of the dialog box are simpler (a plain yes-no response),
so the two dialog types can share a callback.
---
 unix/gtkdlg.c | 79 +++++++++++++++++++++++++++++++++++++--------------
 1 file changed, 57 insertions(+), 22 deletions(-)

diff --git a/unix/gtkdlg.c b/unix/gtkdlg.c
index e6f88e6de..4370ce2a8 100644
--- a/unix/gtkdlg.c
+++ b/unix/gtkdlg.c
@@ -3635,6 +3635,28 @@ int verify_ssh_host_key(void *frontend, char *host, int port,
     return -1;                         /* dialog still in progress */
 }
 
+struct simple_network_prompt_result_ctx {
+    void (*callback)(void *callback_ctx, int result);
+    void *callback_ctx;
+    void *frontend;
+};
+
+static void simple_network_prompt_result_callback(void *vctx, int result)
+{
+    struct simple_network_prompt_result_ctx *ctx =
+        (struct simple_network_prompt_result_ctx *)vctx;
+
+    if (result >= 0)
+        ctx->callback(ctx->callback_ctx, result);
+
+    /*
+     * Clean up this context structure, whether or not a result was
+     * ever actually delivered from the dialog box.
+     */
+    unregister_network_prompt_dialog(ctx->frontend);
+    sfree(ctx);
+}
+
 /*
  * Ask whether the selected algorithm is acceptable (since it was
  * below the configured 'warn' threshold).
@@ -3646,22 +3668,28 @@ int askalg(void *frontend, const char *algtype, const char *algname,
 	"The first %s supported by the server is "
 	"%s, which is below the configured warning threshold.\n"
 	"Continue with connection?";
+
     char *text;
-    int ret;
+    struct simple_network_prompt_result_ctx *result_ctx;
+    GtkWidget *mainwin, *msgbox;
 
     text = dupprintf(msg, algtype, algname);
-    ret = message_box(GTK_WIDGET(get_window(frontend)),
-                      "PuTTY Security Alert", text,
-                      string_width("Reasonably long line of text as a width"
-                                   " template"),
-                      FALSE, &buttons_yn);
+
+    result_ctx = snew(struct simple_network_prompt_result_ctx);
+    result_ctx->callback = callback;
+    result_ctx->callback_ctx = ctx;
+    result_ctx->frontend = frontend;
+
+    mainwin = GTK_WIDGET(get_window(frontend));
+    msgbox = create_message_box(
+        mainwin, "PuTTY Security Alert", text,
+        string_width("Reasonably long line of text as a width template"),
+        FALSE, &buttons_yn, simple_network_prompt_result_callback, result_ctx);
+    register_network_prompt_dialog(frontend, msgbox);
+
     sfree(text);
 
-    if (ret) {
-	return 1;
-    } else {
-	return 0;
-    }
+    return -1;                         /* dialog still in progress */
 }
 
 int askhk(void *frontend, const char *algname, const char *betteralgs,
@@ -3674,22 +3702,29 @@ int askhk(void *frontend, const char *algname, const char *betteralgs,
         "above the threshold, which we do not have stored:\n"
         "%s\n"
 	"Continue with connection?";
+
     char *text;
-    int ret;
+    struct simple_network_prompt_result_ctx *result_ctx;
+    GtkWidget *mainwin, *msgbox;
 
     text = dupprintf(msg, algname, betteralgs);
-    ret = message_box(GTK_WIDGET(get_window(frontend)),
-                      "PuTTY Security Alert", text,
-                      string_width("is ecdsa-nistp521, which is"
-                                   " below the configured warning threshold."),
-                      FALSE, &buttons_yn);
+
+    result_ctx = snew(struct simple_network_prompt_result_ctx);
+    result_ctx->callback = callback;
+    result_ctx->callback_ctx = ctx;
+    result_ctx->frontend = frontend;
+
+    mainwin = GTK_WIDGET(get_window(frontend));
+    msgbox = create_message_box(
+        mainwin, "PuTTY Security Alert", text,
+        string_width("is ecdsa-nistp521, which is below the configured"
+                     " warning threshold."),
+        FALSE, &buttons_yn, simple_network_prompt_result_callback, result_ctx);
+    register_network_prompt_dialog(frontend, msgbox);
+
     sfree(text);
 
-    if (ret) {
-	return 1;
-    } else {
-	return 0;
-    }
+    return -1;                         /* dialog still in progress */
 }
 
 void old_keyfile_warning(void)

From f212e2cbea8c492f43f998df6b8da08d28ccd4d7 Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Sun, 26 Nov 2017 15:35:25 +0000
Subject: [PATCH 112/166] Change order of cleanup in delete_inst.

If you close a session window with an associated SSH back end, the
back end may call back to notify_remote_exit() from ssh_free(), which
queues a new top-level callback citing the inst structure we were
about to delete.

We could fix this by introducing a special 'moribund' flag which
inhibits notify_remote_exit from queueing a callback, but far easier
is to move the delete_callbacks_for_context() call to _after_ all
subsidiary things have been cleaned up, so that any last-minute
callbacks they might schedule will be promptly unscheduled again
before they do any damage.
---
 unix/gtkwin.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/unix/gtkwin.c b/unix/gtkwin.c
index 00e07485f..811823623 100644
--- a/unix/gtkwin.c
+++ b/unix/gtkwin.c
@@ -2039,7 +2039,6 @@ void notify_remote_exit(void *frontend)
 
 static void delete_inst(struct gui_data *inst)
 {
-    delete_callbacks_for_context(inst);
     if (inst->reconfigure_dialog) {
         gtk_widget_destroy(inst->reconfigure_dialog);
         inst->reconfigure_dialog = NULL;
@@ -2077,6 +2076,17 @@ static void delete_inst(struct gui_data *inst)
         log_free(inst->logctx);
         inst->logctx = NULL;
     }
+
+    /*
+     * Delete any top-level callbacks associated with inst, which
+     * would otherwise become stale-pointer dereferences waiting to
+     * happen. We do this last, because some of the above cleanups
+     * (notably shutting down the backend) might themelves queue such
+     * callbacks, so we need to make sure they don't do that _after_
+     * we're supposed to have cleaned everything up.
+     */
+    delete_callbacks_for_context(inst);
+
     sfree(inst);
 }
 

From 86741a1b098ad9d3ad052b2483de96a580c4710a Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Sun, 26 Nov 2017 16:51:19 +0000
Subject: [PATCH 113/166] Expand the dialog registering/unregistering system.

Now it has several 'slots', each named for a particular class of
subsidiary dialog box that a session window can have at most one of,
and register_network_prompt_dialog has a more general name and takes
an enum-typed argument identifying a slot. This lets me avoid writing
a zillion annoyingly similar function pairs and corresponding snippets
of cleanup code in delete_inst.
---
 unix/gtkdlg.c | 10 +++++-----
 unix/gtkwin.c | 42 ++++++++++++++++++++++--------------------
 unix/unix.h   |  9 +++++++--
 3 files changed, 34 insertions(+), 27 deletions(-)

diff --git a/unix/gtkdlg.c b/unix/gtkdlg.c
index 4370ce2a8..67683dba8 100644
--- a/unix/gtkdlg.c
+++ b/unix/gtkdlg.c
@@ -3553,7 +3553,7 @@ static void verify_ssh_host_key_result_callback(void *vctx, int result)
      * Clean up this context structure, whether or not a result was
      * ever actually delivered from the dialog box.
      */
-    unregister_network_prompt_dialog(ctx->frontend);
+    unregister_dialog(ctx->frontend, DIALOG_SLOT_NETWORK_PROMPT);
 
     sfree(ctx->host);
     sfree(ctx->keytype);
@@ -3628,7 +3628,7 @@ int verify_ssh_host_key(void *frontend, char *host, int port,
     msgbox = create_message_box(
         mainwin, "PuTTY Security Alert", text, string_width(fingerprint), TRUE,
         &buttons_hostkey, verify_ssh_host_key_result_callback, result_ctx);
-    register_network_prompt_dialog(frontend, msgbox);
+    register_dialog(frontend, DIALOG_SLOT_NETWORK_PROMPT, msgbox);
 
     sfree(text);
 
@@ -3653,7 +3653,7 @@ static void simple_network_prompt_result_callback(void *vctx, int result)
      * Clean up this context structure, whether or not a result was
      * ever actually delivered from the dialog box.
      */
-    unregister_network_prompt_dialog(ctx->frontend);
+    unregister_dialog(ctx->frontend, DIALOG_SLOT_NETWORK_PROMPT);
     sfree(ctx);
 }
 
@@ -3685,7 +3685,7 @@ int askalg(void *frontend, const char *algtype, const char *algname,
         mainwin, "PuTTY Security Alert", text,
         string_width("Reasonably long line of text as a width template"),
         FALSE, &buttons_yn, simple_network_prompt_result_callback, result_ctx);
-    register_network_prompt_dialog(frontend, msgbox);
+    register_dialog(frontend, DIALOG_SLOT_NETWORK_PROMPT, msgbox);
 
     sfree(text);
 
@@ -3720,7 +3720,7 @@ int askhk(void *frontend, const char *algname, const char *betteralgs,
         string_width("is ecdsa-nistp521, which is below the configured"
                      " warning threshold."),
         FALSE, &buttons_yn, simple_network_prompt_result_callback, result_ctx);
-    register_network_prompt_dialog(frontend, msgbox);
+    register_dialog(frontend, DIALOG_SLOT_NETWORK_PROMPT, msgbox);
 
     sfree(text);
 
diff --git a/unix/gtkwin.c b/unix/gtkwin.c
index 811823623..1b5fc86eb 100644
--- a/unix/gtkwin.c
+++ b/unix/gtkwin.c
@@ -130,8 +130,7 @@ struct gui_data {
     Conf *conf;
     void *eventlogstuff;
     guint32 input_event_time; /* Timestamp of the most recent input event. */
-    GtkWidget *reconfigure_dialog;
-    GtkWidget *network_prompt_dialog;
+    GtkWidget *dialogs[DIALOG_SLOT_LIMIT];
 #if GTK_CHECK_VERSION(3,4,0)
     gdouble cumulative_scroll;
 #endif
@@ -313,17 +312,19 @@ GtkWidget *get_window(void *frontend)
  * network code wanting to ask an asynchronous user question (e.g.
  * 'what about this dodgy host key, then?').
  */
-void register_network_prompt_dialog(void *frontend, GtkWidget *dialog)
+void register_dialog(void *frontend, enum DialogSlot slot, GtkWidget *dialog)
 {
     struct gui_data *inst = (struct gui_data *)frontend;
-    assert(!inst->network_prompt_dialog);
-    inst->network_prompt_dialog = dialog;
+    assert(slot < DIALOG_SLOT_LIMIT);
+    assert(!inst->dialogs[slot]);
+    inst->dialogs[slot] = dialog;
 }
-void unregister_network_prompt_dialog(void *frontend)
+void unregister_dialog(void *frontend, enum DialogSlot slot)
 {
     struct gui_data *inst = (struct gui_data *)frontend;
-    assert(inst->network_prompt_dialog);
-    inst->network_prompt_dialog = NULL;
+    assert(slot < DIALOG_SLOT_LIMIT);
+    assert(inst->dialogs[slot]);
+    inst->dialogs[slot] = NULL;
 }
 
 /*
@@ -2039,13 +2040,12 @@ void notify_remote_exit(void *frontend)
 
 static void delete_inst(struct gui_data *inst)
 {
-    if (inst->reconfigure_dialog) {
-        gtk_widget_destroy(inst->reconfigure_dialog);
-        inst->reconfigure_dialog = NULL;
-    }
-    if (inst->network_prompt_dialog) {
-        gtk_widget_destroy(inst->network_prompt_dialog);
-        inst->network_prompt_dialog = NULL;
+    int dialog_slot;
+    for (dialog_slot = 0; dialog_slot < DIALOG_SLOT_LIMIT; dialog_slot++) {
+        if (inst->dialogs[dialog_slot]) {
+            gtk_widget_destroy(inst->dialogs[dialog_slot]);
+            inst->dialogs[dialog_slot] = NULL;
+        }
     }
     if (inst->window) {
         gtk_widget_destroy(inst->window);
@@ -4005,17 +4005,18 @@ void change_settings_menuitem(GtkMenuItem *item, gpointer data)
 {
     struct gui_data *inst = (struct gui_data *)data;
     struct after_change_settings_dialog_ctx *ctx;
+    GtkWidget *dialog;
     char *title;
 
-    if (inst->reconfigure_dialog) {
+    if ((dialog = inst->dialogs[DIALOG_SLOT_RECONFIGURE]) != NULL) {
         /*
          * If this window already had a Change Settings box open, just
          * find it and try to make it more prominent.
          */
 #if GTK_CHECK_VERSION(2,0,0)
-        gtk_window_deiconify(GTK_WINDOW(inst->reconfigure_dialog));
+        gtk_window_deiconify(GTK_WINDOW(dialog));
 #endif
-	gdk_window_raise(gtk_widget_get_window(inst->reconfigure_dialog));
+	gdk_window_raise(gtk_widget_get_window(dialog));
         return;
     }
 
@@ -4025,10 +4026,11 @@ void change_settings_menuitem(GtkMenuItem *item, gpointer data)
     ctx->inst = inst;
     ctx->newconf = conf_copy(inst->conf);
 
-    inst->reconfigure_dialog = create_config_box(
+    dialog = create_config_box(
         title, ctx->newconf, 1,
         inst->back ? inst->back->cfg_info(inst->backhandle) : 0,
         after_change_settings_dialog, ctx);
+    register_dialog(inst, DIALOG_SLOT_RECONFIGURE, dialog);
 
     sfree(title);
 }
@@ -4058,7 +4060,7 @@ static void after_change_settings_dialog(void *vctx, int retval)
 
     assert(lenof(ww) == NCFGCOLOURS);
 
-    inst->reconfigure_dialog = NULL;
+    unregister_dialog(inst, DIALOG_SLOT_RECONFIGURE);
 
     if (retval) {
         inst->conf = newconf;
diff --git a/unix/unix.h b/unix/unix.h
index 979fe4482..e416cc8b0 100644
--- a/unix/unix.h
+++ b/unix/unix.h
@@ -149,8 +149,13 @@ long get_windowid(void *frontend);
 /* Things gtkdlg.c needs from pterm.c */
 #ifdef MAY_REFER_TO_GTK_IN_HEADERS
 GtkWidget *get_window(void *frontend);
-void register_network_prompt_dialog(void *frontend, GtkWidget *dialog);
-void unregister_network_prompt_dialog(void *frontend);
+enum DialogSlot {
+    DIALOG_SLOT_RECONFIGURE,
+    DIALOG_SLOT_NETWORK_PROMPT,
+    DIALOG_SLOT_LIMIT /* must remain last */
+};
+void register_dialog(void *frontend, enum DialogSlot slot, GtkWidget *dialog);
+void unregister_dialog(void *frontend, enum DialogSlot slot);
 #endif
 void post_main(void);     /* called after any subsidiary gtk_main() */
 

From b6ed82321ce917eb2e7c18169e99df63580d01c9 Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Sun, 26 Nov 2017 16:56:03 +0000
Subject: [PATCH 114/166] Make the askappend() prompt non-modal.

This fits into a new dialog-box slot (because it might have to come up
at the same time as a network prompt), and makes use of the existing
callback system in logging.c which buffers the logging data until the
user says what they want done with it.
---
 unix/gtkdlg.c | 50 +++++++++++++++++++++++++++++++-------------------
 unix/unix.h   |  1 +
 2 files changed, 32 insertions(+), 19 deletions(-)

diff --git a/unix/gtkdlg.c b/unix/gtkdlg.c
index 67683dba8..956dc2b1b 100644
--- a/unix/gtkdlg.c
+++ b/unix/gtkdlg.c
@@ -3635,16 +3635,17 @@ int verify_ssh_host_key(void *frontend, char *host, int port,
     return -1;                         /* dialog still in progress */
 }
 
-struct simple_network_prompt_result_ctx {
+struct simple_prompt_result_ctx {
     void (*callback)(void *callback_ctx, int result);
     void *callback_ctx;
     void *frontend;
+    enum DialogSlot dialog_slot;
 };
 
-static void simple_network_prompt_result_callback(void *vctx, int result)
+static void simple_prompt_result_callback(void *vctx, int result)
 {
-    struct simple_network_prompt_result_ctx *ctx =
-        (struct simple_network_prompt_result_ctx *)vctx;
+    struct simple_prompt_result_ctx *ctx =
+        (struct simple_prompt_result_ctx *)vctx;
 
     if (result >= 0)
         ctx->callback(ctx->callback_ctx, result);
@@ -3653,7 +3654,7 @@ static void simple_network_prompt_result_callback(void *vctx, int result)
      * Clean up this context structure, whether or not a result was
      * ever actually delivered from the dialog box.
      */
-    unregister_dialog(ctx->frontend, DIALOG_SLOT_NETWORK_PROMPT);
+    unregister_dialog(ctx->frontend, ctx->dialog_slot);
     sfree(ctx);
 }
 
@@ -3670,22 +3671,23 @@ int askalg(void *frontend, const char *algtype, const char *algname,
 	"Continue with connection?";
 
     char *text;
-    struct simple_network_prompt_result_ctx *result_ctx;
+    struct simple_prompt_result_ctx *result_ctx;
     GtkWidget *mainwin, *msgbox;
 
     text = dupprintf(msg, algtype, algname);
 
-    result_ctx = snew(struct simple_network_prompt_result_ctx);
+    result_ctx = snew(struct simple_prompt_result_ctx);
     result_ctx->callback = callback;
     result_ctx->callback_ctx = ctx;
     result_ctx->frontend = frontend;
+    result_ctx->dialog_slot = DIALOG_SLOT_NETWORK_PROMPT;
 
     mainwin = GTK_WIDGET(get_window(frontend));
     msgbox = create_message_box(
         mainwin, "PuTTY Security Alert", text,
         string_width("Reasonably long line of text as a width template"),
-        FALSE, &buttons_yn, simple_network_prompt_result_callback, result_ctx);
-    register_dialog(frontend, DIALOG_SLOT_NETWORK_PROMPT, msgbox);
+        FALSE, &buttons_yn, simple_prompt_result_callback, result_ctx);
+    register_dialog(frontend, result_ctx->dialog_slot, msgbox);
 
     sfree(text);
 
@@ -3704,23 +3706,24 @@ int askhk(void *frontend, const char *algname, const char *betteralgs,
 	"Continue with connection?";
 
     char *text;
-    struct simple_network_prompt_result_ctx *result_ctx;
+    struct simple_prompt_result_ctx *result_ctx;
     GtkWidget *mainwin, *msgbox;
 
     text = dupprintf(msg, algname, betteralgs);
 
-    result_ctx = snew(struct simple_network_prompt_result_ctx);
+    result_ctx = snew(struct simple_prompt_result_ctx);
     result_ctx->callback = callback;
     result_ctx->callback_ctx = ctx;
     result_ctx->frontend = frontend;
+    result_ctx->dialog_slot = DIALOG_SLOT_NETWORK_PROMPT;
 
     mainwin = GTK_WIDGET(get_window(frontend));
     msgbox = create_message_box(
         mainwin, "PuTTY Security Alert", text,
         string_width("is ecdsa-nistp521, which is below the configured"
                      " warning threshold."),
-        FALSE, &buttons_yn, simple_network_prompt_result_callback, result_ctx);
-    register_dialog(frontend, DIALOG_SLOT_NETWORK_PROMPT, msgbox);
+        FALSE, &buttons_yn, simple_prompt_result_callback, result_ctx);
+    register_dialog(frontend, result_ctx->dialog_slot, msgbox);
 
     sfree(text);
 
@@ -4128,18 +4131,27 @@ int askappend(void *frontend, Filename *filename,
 
     char *message;
     char *mbtitle;
-    int mbret;
+    struct simple_prompt_result_ctx *result_ctx;
+    GtkWidget *mainwin, *msgbox;
 
     message = dupprintf(msgtemplate, FILENAME_MAX, filename->path);
     mbtitle = dupprintf("%s Log to File", appname);
 
-    mbret = message_box(get_window(frontend), mbtitle, message,
-                        string_width("LINE OF TEXT SUITABLE FOR THE"
-                                     " ASKAPPEND WIDTH"),
-                        FALSE, &buttons_append);
+    result_ctx = snew(struct simple_prompt_result_ctx);
+    result_ctx->callback = callback;
+    result_ctx->callback_ctx = ctx;
+    result_ctx->frontend = frontend;
+    result_ctx->dialog_slot = DIALOG_SLOT_LOGFILE_PROMPT;
+
+    mainwin = GTK_WIDGET(get_window(frontend));
+    msgbox = create_message_box(
+        mainwin, mbtitle, message,
+        string_width("LINE OF TEXT SUITABLE FOR THE ASKAPPEND WIDTH"),
+        FALSE, &buttons_append, simple_prompt_result_callback, result_ctx);
+    register_dialog(frontend, result_ctx->dialog_slot, msgbox);
 
     sfree(message);
     sfree(mbtitle);
 
-    return mbret;
+    return -1;                         /* dialog still in progress */
 }
diff --git a/unix/unix.h b/unix/unix.h
index e416cc8b0..c06bdcafb 100644
--- a/unix/unix.h
+++ b/unix/unix.h
@@ -152,6 +152,7 @@ GtkWidget *get_window(void *frontend);
 enum DialogSlot {
     DIALOG_SLOT_RECONFIGURE,
     DIALOG_SLOT_NETWORK_PROMPT,
+    DIALOG_SLOT_LOGFILE_PROMPT,
     DIALOG_SLOT_LIMIT /* must remain last */
 };
 void register_dialog(void *frontend, enum DialogSlot slot, GtkWidget *dialog);

From 8b0d460578db3502d465a4d002aab5e2a9a4c35a Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Sun, 26 Nov 2017 17:05:51 +0000
Subject: [PATCH 115/166] Replace dlg_error_message() with a non-modal message
 box.

Apart from the specific benefit of non-modality, this also makes it a
lot simpler compared to the previous code! I'm not completely sure why
I wasn't using the standard gtkdlg.c message box system all along.
---
 unix/gtkdlg.c | 51 ++++++++-------------------------------------------
 unix/unix.h   |  4 ++++
 2 files changed, 12 insertions(+), 43 deletions(-)

diff --git a/unix/gtkdlg.c b/unix/gtkdlg.c
index 956dc2b1b..4389b5922 100644
--- a/unix/gtkdlg.c
+++ b/unix/gtkdlg.c
@@ -1084,52 +1084,17 @@ static void set_transient_window_pos(GtkWidget *parent, GtkWidget *child)
 #endif
 }
 
+static void trivial_post_dialog_fn(void *vctx, int result)
+{
+}
+
 void dlg_error_msg(void *dlg, const char *msg)
 {
     struct dlgparam *dp = (struct dlgparam *)dlg;
-    GtkWidget *window;
-
-#if GTK_CHECK_VERSION(3,0,0)
-    window = gtk_message_dialog_new(GTK_WINDOW(dp->window),
-                                    (GTK_DIALOG_MODAL |
-                                     GTK_DIALOG_DESTROY_WITH_PARENT),
-                                    GTK_MESSAGE_ERROR,
-                                    GTK_BUTTONS_CLOSE,
-                                    "%s", msg);
-    gtk_dialog_run(GTK_DIALOG(window));
-    gtk_widget_destroy(window);
-#else
-    GtkWidget *hbox, *text, *ok;
-
-    window = gtk_dialog_new();
-    text = gtk_label_new(msg);
-    align_label_left(GTK_LABEL(text));
-    hbox = gtk_hbox_new(FALSE, 0);
-    gtk_box_pack_start(GTK_BOX(hbox), text, FALSE, FALSE, 20);
-    gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(window))),
-                       hbox, FALSE, FALSE, 20);
-    gtk_widget_show(text);
-    gtk_widget_show(hbox);
-    gtk_window_set_title(GTK_WINDOW(window), "Error");
-    gtk_label_set_line_wrap(GTK_LABEL(text), TRUE);
-    ok = gtk_button_new_with_label("OK");
-    gtk_box_pack_end(GTK_BOX(gtk_dialog_get_action_area(GTK_DIALOG(window))),
-                     ok, FALSE, FALSE, 0);
-    gtk_widget_show(ok);
-    gtk_widget_set_can_default(ok, TRUE);
-    gtk_window_set_default(GTK_WINDOW(window), ok);
-    g_signal_connect(G_OBJECT(ok), "clicked",
-                     G_CALLBACK(errmsg_button_clicked), window);
-    g_signal_connect(G_OBJECT(window), "destroy",
-                     G_CALLBACK(window_destroy), NULL);
-    gtk_window_set_modal(GTK_WINDOW(window), TRUE);
-    gtk_window_set_transient_for(GTK_WINDOW(window), GTK_WINDOW(dp->window));
-    set_transient_window_pos(dp->window, window);
-    gtk_widget_show(window);
-    gtk_main();
-#endif
-
-    post_main();
+    create_message_box(
+        dp->window, "Error", msg,
+        string_width("Some sort of text about a config-box error message"),
+        FALSE, &buttons_ok, trivial_post_dialog_fn, NULL);
 }
 
 /*
diff --git a/unix/unix.h b/unix/unix.h
index c06bdcafb..35941ebe4 100644
--- a/unix/unix.h
+++ b/unix/unix.h
@@ -185,6 +185,10 @@ struct message_box_buttons {
     int nbuttons;
 };
 extern const struct message_box_buttons buttons_yn, buttons_ok;
+GtkWidget *create_message_box(
+    GtkWidget *parentwin, const char *title, const char *msg, int minwid,
+    int selectable, const struct message_box_buttons *buttons,
+    post_dialog_fn_t after, void *afterctx);
 int message_box(
     GtkWidget *parentwin, const char *title, const char *msg, int minwid,
     int selectable, const struct message_box_buttons *buttons);

From 71ed04dbc32fb373e62f5162260a244f104ff444 Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Sun, 26 Nov 2017 17:07:47 +0000
Subject: [PATCH 116/166] Make the GTK font setup error box non-modal.

That was the last (in fact, the only) call to the modal version of
message_box() outside gtkdlg.c, so I can remove it from the header
file.
---
 unix/gtkdlg.c | 2 +-
 unix/gtkwin.c | 8 ++++----
 unix/unix.h   | 6 ++----
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/unix/gtkdlg.c b/unix/gtkdlg.c
index 4389b5922..3b7d9ab59 100644
--- a/unix/gtkdlg.c
+++ b/unix/gtkdlg.c
@@ -1084,7 +1084,7 @@ static void set_transient_window_pos(GtkWidget *parent, GtkWidget *child)
 #endif
 }
 
-static void trivial_post_dialog_fn(void *vctx, int result)
+void trivial_post_dialog_fn(void *vctx, int result)
 {
 }
 
diff --git a/unix/gtkwin.c b/unix/gtkwin.c
index 1b5fc86eb..ffb4040d0 100644
--- a/unix/gtkwin.c
+++ b/unix/gtkwin.c
@@ -4167,10 +4167,10 @@ static void after_change_settings_dialog(void *vctx, int retval)
                 char *msgboxtext =
                     dupprintf("Could not change fonts in terminal window: %s\n",
                               errmsg);
-                message_box(inst->window, "Font setup error", msgboxtext,
-                            string_width("Could not change fonts in terminal"
-                                         " window:"),
-                            FALSE, &buttons_ok);
+                create_message_box(
+                    inst->window, "Font setup error", msgboxtext,
+                    string_width("Could not change fonts in terminal window:"),
+                    FALSE, &buttons_ok, trivial_post_dialog_fn, NULL);
                 sfree(msgboxtext);
                 sfree(errmsg);
             } else {
diff --git a/unix/unix.h b/unix/unix.h
index 35941ebe4..2d9600c4d 100644
--- a/unix/unix.h
+++ b/unix/unix.h
@@ -122,8 +122,9 @@ unsigned long getticks(void);
 /* The per-session frontend structure managed by gtkwin.c */
 struct gui_data;
 
-/* Callback when a dialog box finishes */
+/* Callback when a dialog box finishes, and a no-op implementation of it */
 typedef void (*post_dialog_fn_t)(void *ctx, int result);
+void trivial_post_dialog_fn(void *vctx, int result);
 
 /* Start up a session window, with or without a preliminary config box */
 void initial_config_box(Conf *conf, post_dialog_fn_t after, void *afterctx);
@@ -189,9 +190,6 @@ GtkWidget *create_message_box(
     GtkWidget *parentwin, const char *title, const char *msg, int minwid,
     int selectable, const struct message_box_buttons *buttons,
     post_dialog_fn_t after, void *afterctx);
-int message_box(
-    GtkWidget *parentwin, const char *title, const char *msg, int minwid,
-    int selectable, const struct message_box_buttons *buttons);
 #endif
 
 /* Things pterm.c needs from {ptermm,uxputty}.c */

From a8e9fd7860a3b7137ef45be294d370e2537dd495 Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Sun, 26 Nov 2017 17:21:32 +0000
Subject: [PATCH 117/166] Reimplement 'really close session?' as a non-modal
 message box.

I've also moved it out into gtkwin.c, because it seemed easier to do
the 'find existing instance of this dialog and raise it' dance there
than to split it across source files pointlessly.
---
 unix/gtkdlg.c | 11 ---------
 unix/gtkwin.c | 66 +++++++++++++++++++++++++++++++++++++++++----------
 unix/unix.h   |  2 +-
 3 files changed, 55 insertions(+), 24 deletions(-)

diff --git a/unix/gtkdlg.c b/unix/gtkdlg.c
index 3b7d9ab59..23fe909ce 100644
--- a/unix/gtkdlg.c
+++ b/unix/gtkdlg.c
@@ -3467,17 +3467,6 @@ int message_box(
     return retval;
 }
 
-int reallyclose(void *frontend)
-{
-    char *title = dupcat(appname, " Exit Confirmation", NULL);
-    int ret = message_box(GTK_WIDGET(get_window(frontend)), title,
-                          "Are you sure you want to close this session?",
-                          string_width("Most of the width of the above text"),
-                          FALSE, &buttons_yn);
-    sfree(title);
-    return ret;
-}
-
 struct verify_ssh_host_key_result_ctx {
     char *host;
     int port;
diff --git a/unix/gtkwin.c b/unix/gtkwin.c
index ffb4040d0..e8bc2894f 100644
--- a/unix/gtkwin.c
+++ b/unix/gtkwin.c
@@ -450,6 +450,25 @@ void get_window_pixels(void *frontend, int *x, int *y)
 #endif
 }
 
+/*
+ * Find out whether a dialog box already exists for this window in a
+ * particular DialogSlot. If it does, uniconify it (if we can) and
+ * raise it, so that the user realises they've already been asked this
+ * question.
+ */
+static int find_and_raise_dialog(struct gui_data *inst, enum DialogSlot slot)
+{
+    GtkWidget *dialog = inst->dialogs[slot];
+    if (!dialog)
+        return FALSE;
+
+#if GTK_CHECK_VERSION(2,0,0)
+    gtk_window_deiconify(GTK_WINDOW(dialog));
+#endif
+    gdk_window_raise(gtk_widget_get_window(dialog));
+    return TRUE;
+}
+
 /*
  * Return the window or icon title.
  */
@@ -459,12 +478,44 @@ char *get_window_title(void *frontend, int icon)
     return icon ? inst->icontitle : inst->wintitle;
 }
 
+static void warn_on_close_callback(void *vctx, int result)
+{
+    struct gui_data *inst = (struct gui_data *)vctx;
+    unregister_dialog(inst, DIALOG_SLOT_WARN_ON_CLOSE);
+    if (result)
+        gtk_widget_destroy(inst->window);
+}
+
+/*
+ * Handle the 'delete window' event (e.g. user clicking the WM close
+ * button). The return value FALSE means the window should close, and
+ * TRUE means it shouldn't.
+ *
+ * (That's counterintuitive, but really, in GTK terms, TRUE means 'I
+ * have done everything necessary to handle this event, so the default
+ * handler need not do anything', i.e. 'suppress default handler',
+ * i.e. 'do not close the window'.)
+ */
 gint delete_window(GtkWidget *widget, GdkEvent *event, gpointer data)
 {
     struct gui_data *inst = (struct gui_data *)data;
     if (!inst->exited && conf_get_int(inst->conf, CONF_warn_on_close)) {
-	if (!reallyclose(inst))
-	    return TRUE;
+        /*
+         * We're not going to exit right now. We must put up a
+         * warn-on-close dialog, unless one already exists, in which
+         * case we'll just re-emphasise that one.
+         */
+        if (!find_and_raise_dialog(inst, DIALOG_SLOT_WARN_ON_CLOSE)) {
+            char *title = dupcat(appname, " Exit Confirmation", NULL);
+            GtkWidget *dialog = create_message_box(
+                inst->window, title,
+                "Are you sure you want to close this session?",
+                string_width("Most of the width of the above text"),
+                FALSE, &buttons_yn, warn_on_close_callback, inst);
+            register_dialog(inst, DIALOG_SLOT_WARN_ON_CLOSE, dialog);
+            sfree(title);
+        }
+        return TRUE;
     }
     return FALSE;
 }
@@ -4008,17 +4059,8 @@ void change_settings_menuitem(GtkMenuItem *item, gpointer data)
     GtkWidget *dialog;
     char *title;
 
-    if ((dialog = inst->dialogs[DIALOG_SLOT_RECONFIGURE]) != NULL) {
-        /*
-         * If this window already had a Change Settings box open, just
-         * find it and try to make it more prominent.
-         */
-#if GTK_CHECK_VERSION(2,0,0)
-        gtk_window_deiconify(GTK_WINDOW(dialog));
-#endif
-	gdk_window_raise(gtk_widget_get_window(dialog));
+    if (find_and_raise_dialog(inst, DIALOG_SLOT_RECONFIGURE))
         return;
-    }
 
     title = dupcat(appname, " Reconfiguration", NULL);
 
diff --git a/unix/unix.h b/unix/unix.h
index 2d9600c4d..893f084e6 100644
--- a/unix/unix.h
+++ b/unix/unix.h
@@ -154,6 +154,7 @@ enum DialogSlot {
     DIALOG_SLOT_RECONFIGURE,
     DIALOG_SLOT_NETWORK_PROMPT,
     DIALOG_SLOT_LOGFILE_PROMPT,
+    DIALOG_SLOT_WARN_ON_CLOSE,
     DIALOG_SLOT_LIMIT /* must remain last */
 };
 void register_dialog(void *frontend, enum DialogSlot slot, GtkWidget *dialog);
@@ -173,7 +174,6 @@ void about_box(void *window);
 void *eventlogstuff_new(void);
 void showeventlog(void *estuff, void *parentwin);
 void logevent_dlg(void *estuff, const char *string);
-int reallyclose(void *frontend);
 #ifdef MAY_REFER_TO_GTK_IN_HEADERS
 struct message_box_button {
     const char *title;

From d1f62c3e0f458c686f8bbda69288ccf512245390 Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Sun, 26 Nov 2017 17:32:01 +0000
Subject: [PATCH 118/166] Make the Licence message box non-modal.

---
 unix/gtkdlg.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/unix/gtkdlg.c b/unix/gtkdlg.c
index 23fe909ce..9015dff3b 100644
--- a/unix/gtkdlg.c
+++ b/unix/gtkdlg.c
@@ -3751,10 +3751,10 @@ static void licence_clicked(GtkButton *button, gpointer data)
 
     title = dupcat(appname, " Licence", NULL);
     assert(aboutbox != NULL);
-    message_box(aboutbox, title, LICENCE_TEXT("\n\n"),
-                string_width("LONGISH LINE OF TEXT SO THE LICENCE"
-                             " BOX ISN'T EXCESSIVELY TALL AND THIN"),
-                TRUE, &buttons_ok);
+    create_message_box(aboutbox, title, LICENCE_TEXT("\n\n"),
+                       string_width("LONGISH LINE OF TEXT SO THE LICENCE"
+                                    " BOX ISN'T EXCESSIVELY TALL AND THIN"),
+                       TRUE, &buttons_ok, trivial_post_dialog_fn, NULL);
     sfree(title);
 }
 

From 4f3f4ed691ed88701d542de71d665a03dee22b1c Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Sun, 26 Nov 2017 17:43:02 +0000
Subject: [PATCH 119/166] Get rid of fatalbox() completely.

It's an incoherent concept! There should not be any such thing as an
error box that terminates the entire program but is not modal. If it's
bad enough to terminate the whole program, i.e. _all_ currently live
connections, then there's no point in permitting progress to continue
in windows other than the affected one, because all windows are
affected anyway.

So all previous uses of fatalbox() have become modalfatalbox(), except
those which looked to me as if they shouldn't have been fatal in the
first place, e.g. lingering pieces of error handling in winnet.c which
ought to have had the severity of 'give up on this particular Socket
and close it' rather than 'give up on the ENTIRE UNIVERSE'.
---
 fuzzterm.c         |  1 -
 pscp.c             | 15 ---------------
 psftp.c            | 14 --------------
 putty.h            |  2 --
 terminal.c         | 26 +++++++++++++-------------
 unix/gtkdlg.c      | 12 ------------
 unix/uxpgnt.c      | 10 ----------
 unix/uxplink.c     | 17 -----------------
 windows/window.c   | 17 -----------------
 windows/winnet.c   | 36 +++++++++++++-----------------------
 windows/winplink.c | 14 --------------
 11 files changed, 26 insertions(+), 138 deletions(-)

diff --git a/fuzzterm.c b/fuzzterm.c
index 255fc6fb7..707c4ae8a 100644
--- a/fuzzterm.c
+++ b/fuzzterm.c
@@ -88,7 +88,6 @@ void set_raw_mouse_mode(void *frontend, int m) { }
 void request_paste(void *frontend) { }
 void do_beep(void *frontend, int a) { }
 void sys_cursor(void *frontend, int x, int y) { }
-void fatalbox(const char *fmt, ...) { exit(0); }
 void modalfatalbox(const char *fmt, ...) { exit(0); }
 void nonfatal(const char *fmt, ...) { }
 
diff --git a/pscp.c b/pscp.c
index 210362df9..87a760c2f 100644
--- a/pscp.c
+++ b/pscp.c
@@ -91,21 +91,6 @@ static void tell_user(FILE *stream, const char *fmt, ...)
 /*
  *  Print an error message and perform a fatal exit.
  */
-void fatalbox(const char *fmt, ...)
-{
-    char *str, *str2;
-    va_list ap;
-    va_start(ap, fmt);
-    str = dupvprintf(fmt, ap);
-    str2 = dupcat("Fatal: ", str, "\n", NULL);
-    sfree(str);
-    va_end(ap);
-    tell_str(stderr, str2);
-    sfree(str2);
-    errs++;
-
-    cleanup_exit(1);
-}
 void modalfatalbox(const char *fmt, ...)
 {
     char *str, *str2;
diff --git a/psftp.c b/psftp.c
index e4e77c3af..643389dab 100644
--- a/psftp.c
+++ b/psftp.c
@@ -2442,20 +2442,6 @@ static int verbose = 0;
 /*
  *  Print an error message and perform a fatal exit.
  */
-void fatalbox(const char *fmt, ...)
-{
-    char *str, *str2;
-    va_list ap;
-    va_start(ap, fmt);
-    str = dupvprintf(fmt, ap);
-    str2 = dupcat("Fatal: ", str, "\n", NULL);
-    sfree(str);
-    va_end(ap);
-    fputs(str2, stderr);
-    sfree(str2);
-
-    cleanup_exit(1);
-}
 void modalfatalbox(const char *fmt, ...)
 {
     char *str, *str2;
diff --git a/putty.h b/putty.h
index 0dd48a5ac..ba7e123ae 100644
--- a/putty.h
+++ b/putty.h
@@ -642,10 +642,8 @@ void optimised_move(void *frontend, int, int, int);
 void set_raw_mouse_mode(void *frontend, int);
 void connection_fatal(void *frontend, const char *, ...);
 void nonfatal(const char *, ...);
-void fatalbox(const char *, ...);
 void modalfatalbox(const char *, ...);
 #ifdef macintosh
-#pragma noreturn(fatalbox)
 #pragma noreturn(modalfatalbox)
 #endif
 void do_beep(void *frontend, int);
diff --git a/terminal.c b/terminal.c
index d5d5314a1..96a002667 100644
--- a/terminal.c
+++ b/terminal.c
@@ -1085,19 +1085,19 @@ static termline *lineptr(Terminal *term, int y, int lineno, int screen)
 
     /* We assume that we don't screw up and retrieve something out of range. */
     if (line == NULL) {
-	fatalbox("line==NULL in terminal.c\n"
-		 "lineno=%d y=%d w=%d h=%d\n"
-		 "count(scrollback=%p)=%d\n"
-		 "count(screen=%p)=%d\n"
-		 "count(alt=%p)=%d alt_sblines=%d\n"
-		 "whichtree=%p treeindex=%d\n\n"
-		 "Please contact <putty@projects.tartarus.org> "
-		 "and pass on the above information.",
-		 lineno, y, term->cols, term->rows,
-		 term->scrollback, count234(term->scrollback),
-		 term->screen, count234(term->screen),
-		 term->alt_screen, count234(term->alt_screen), term->alt_sblines,
-		 whichtree, treeindex);
+	modalfatalbox("line==NULL in terminal.c\n"
+                      "lineno=%d y=%d w=%d h=%d\n"
+                      "count(scrollback=%p)=%d\n"
+                      "count(screen=%p)=%d\n"
+                      "count(alt=%p)=%d alt_sblines=%d\n"
+                      "whichtree=%p treeindex=%d\n\n"
+                      "Please contact <putty@projects.tartarus.org> "
+                      "and pass on the above information.",
+                      lineno, y, term->cols, term->rows,
+                      term->scrollback, count234(term->scrollback),
+                      term->screen, count234(term->screen),
+                      term->alt_screen, count234(term->alt_screen),
+                      term->alt_sblines, whichtree, treeindex);
     }
     assert(line != NULL);
 
diff --git a/unix/gtkdlg.c b/unix/gtkdlg.c
index 9015dff3b..5c69cb564 100644
--- a/unix/gtkdlg.c
+++ b/unix/gtkdlg.c
@@ -3705,18 +3705,6 @@ void nonfatal_message_box(void *window, const char *msg)
                 FALSE, &buttons_ok);
 }
 
-void fatalbox(const char *p, ...)
-{
-    va_list ap;
-    char *msg;
-    va_start(ap, p);
-    msg = dupvprintf(p, ap);
-    va_end(ap);
-    fatal_message_box(NULL, msg);
-    sfree(msg);
-    cleanup_exit(1);
-}
-
 void nonfatal(const char *p, ...)
 {
     va_list ap;
diff --git a/unix/uxpgnt.c b/unix/uxpgnt.c
index cb85b1606..de990b93a 100644
--- a/unix/uxpgnt.c
+++ b/unix/uxpgnt.c
@@ -23,16 +23,6 @@
 SockAddr unix_sock_addr(const char *path);
 Socket new_unix_listener(SockAddr listenaddr, Plug plug);
 
-void fatalbox(const char *p, ...)
-{
-    va_list ap;
-    fprintf(stderr, "FATAL ERROR: ");
-    va_start(ap, p);
-    vfprintf(stderr, p, ap);
-    va_end(ap);
-    fputc('\n', stderr);
-    exit(1);
-}
 void modalfatalbox(const char *p, ...)
 {
     va_list ap;
diff --git a/unix/uxplink.c b/unix/uxplink.c
index 2a1926efc..11ca7d1d6 100644
--- a/unix/uxplink.c
+++ b/unix/uxplink.c
@@ -29,23 +29,6 @@ static void *logctx;
 
 static struct termios orig_termios;
 
-void fatalbox(const char *p, ...)
-{
-    struct termios cf;
-    va_list ap;
-    premsg(&cf);
-    fprintf(stderr, "FATAL ERROR: ");
-    va_start(ap, p);
-    vfprintf(stderr, p, ap);
-    va_end(ap);
-    fputc('\n', stderr);
-    postmsg(&cf);
-    if (logctx) {
-        log_free(logctx);
-        logctx = NULL;
-    }
-    cleanup_exit(1);
-}
 void modalfatalbox(const char *p, ...)
 {
     struct termios cf;
diff --git a/windows/window.c b/windows/window.c
index 88a29dd40..30cbbdc94 100644
--- a/windows/window.c
+++ b/windows/window.c
@@ -5522,23 +5522,6 @@ void optimised_move(void *frontend, int to, int from, int lines)
 }
 #endif
 
-/*
- * Print a message box and perform a fatal exit.
- */
-void fatalbox(const char *fmt, ...)
-{
-    va_list ap;
-    char *stuff, morestuff[100];
-
-    va_start(ap, fmt);
-    stuff = dupvprintf(fmt, ap);
-    va_end(ap);
-    sprintf(morestuff, "%.70s Fatal Error", appname);
-    MessageBox(hwnd, stuff, morestuff, MB_ICONERROR | MB_OK);
-    sfree(stuff);
-    cleanup_exit(1);
-}
-
 /*
  * Print a modal (Really Bad) message box and perform a fatal exit.
  */
diff --git a/windows/winnet.c b/windows/winnet.c
index 86f7735fa..12fce5f9a 100644
--- a/windows/winnet.c
+++ b/windows/winnet.c
@@ -257,7 +257,7 @@ void sk_init(void)
 	winsock_module = load_system32_dll("wsock32.dll");
     }
     if (!winsock_module)
-	fatalbox("Unable to load any WinSock library");
+	modalfatalbox("Unable to load any WinSock library");
 
 #ifndef NO_IPV6
     /* Check if we have getaddrinfo in Winsock */
@@ -348,7 +348,7 @@ void sk_init(void)
     if (!sk_startup(2,2) &&
 	!sk_startup(2,0) &&
 	!sk_startup(1,1)) {
-	fatalbox("Unable to initialise WinSock");
+	modalfatalbox("Unable to initialise WinSock");
     }
 
     sktree = newtree234(cmpfortree);
@@ -1529,26 +1529,20 @@ void try_send(Actual_Socket s)
 		 */
 		s->writable = FALSE;
 		return;
-	    } else if (nsent == 0 ||
-		       err == WSAECONNABORTED || err == WSAECONNRESET) {
+	    } else {
 		/*
-		 * If send() returns CONNABORTED or CONNRESET, we
-		 * unfortunately can't just call plug_closing(),
-		 * because it's quite likely that we're currently
-		 * _in_ a call from the code we'd be calling back
-		 * to, so we'd have to make half the SSH code
-		 * reentrant. Instead we flag a pending error on
-		 * the socket, to be dealt with (by calling
-		 * plug_closing()) at some suitable future moment.
+		 * If send() returns a socket error, we unfortunately
+		 * can't just call plug_closing(), because it's quite
+		 * likely that we're currently _in_ a call from the
+		 * code we'd be calling back to, so we'd have to make
+		 * half the SSH code reentrant. Instead we flag a
+		 * pending error on the socket, to be dealt with (by
+		 * calling plug_closing()) at some suitable future
+		 * moment.
 		 */
 		s->pending_error = err;
                 queue_toplevel_callback(socket_error_callback, s);
 		return;
-	    } else {
-		/* We're inside the Windows frontend here, so we know
-		 * that the frontend handle is unnecessary. */
-		logevent(NULL, winsock_error_string(err));
-		fatalbox("%s", winsock_error_string(err));
 	    }
 	} else {
 	    if (s->sending_oob) {
@@ -1738,12 +1732,8 @@ void select_result(WPARAM wParam, LPARAM lParam)
 	ret = p_recv(s->s, buf, sizeof(buf), MSG_OOB);
 	noise_ultralight(ret);
 	if (ret <= 0) {
-	    const char *str = (ret == 0 ? "Internal networking trouble" :
-			 winsock_error_string(p_WSAGetLastError()));
-	    /* We're inside the Windows frontend here, so we know
-	     * that the frontend handle is unnecessary. */
-	    logevent(NULL, str);
-	    fatalbox("%s", str);
+            int err = p_WSAGetLastError();
+	    plug_closing(s->plug, winsock_error_string(err), err, 0);
 	} else {
 	    plug_receive(s->plug, 2, buf, ret);
 	}
diff --git a/windows/winplink.c b/windows/winplink.c
index 84e47d6ec..65dd7702d 100644
--- a/windows/winplink.c
+++ b/windows/winplink.c
@@ -22,20 +22,6 @@ struct agent_callback {
     int len;
 };
 
-void fatalbox(const char *p, ...)
-{
-    va_list ap;
-    fprintf(stderr, "FATAL ERROR: ");
-    va_start(ap, p);
-    vfprintf(stderr, p, ap);
-    va_end(ap);
-    fputc('\n', stderr);
-    if (logctx) {
-        log_free(logctx);
-        logctx = NULL;
-    }
-    cleanup_exit(1);
-}
 void modalfatalbox(const char *p, ...)
 {
     va_list ap;

From 813c380470ef5f80145332f265ea8a2facdcac28 Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Sun, 26 Nov 2017 17:55:00 +0000
Subject: [PATCH 120/166] Make nonfatal() nonmodal.

This one was completely trivial, except that while I was at it, I took
the opportunity to put the right program name in the window title.
---
 unix/gtkdlg.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/unix/gtkdlg.c b/unix/gtkdlg.c
index 5c69cb564..1b9b8d42c 100644
--- a/unix/gtkdlg.c
+++ b/unix/gtkdlg.c
@@ -3700,9 +3700,12 @@ void fatal_message_box(void *window, const char *msg)
 
 void nonfatal_message_box(void *window, const char *msg)
 {
-    message_box(window, "PuTTY Error", msg,
-                string_width("REASONABLY LONG LINE OF TEXT FOR BASIC SANITY"),
-                FALSE, &buttons_ok);
+    char *title = dupcat(appname, " Error", NULL);
+    create_message_box(
+        window, title, msg,
+        string_width("REASONABLY LONG LINE OF TEXT FOR BASIC SANITY"),
+        FALSE, &buttons_ok, trivial_post_dialog_fn, NULL);
+    sfree(title);
 }
 
 void nonfatal(const char *p, ...)

From 3e24bb610d970255ffcf99597021f5913d5d7cc6 Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Sun, 26 Nov 2017 19:59:24 +0000
Subject: [PATCH 121/166] Make connection_fatal() nonmodal.

This change requires me to break up the general cleanups in
delete_inst() into two halves: one runs when the error message box is
created, and cleans up the network connection and all the stuff
associated with it, and the other runs when the error message is
dismissed and the window can actually close.
---
 unix/gtkdlg.c |  7 -----
 unix/gtkwin.c | 83 ++++++++++++++++++++++++++++++++++++---------------
 unix/unix.h   |  2 +-
 3 files changed, 60 insertions(+), 32 deletions(-)

diff --git a/unix/gtkdlg.c b/unix/gtkdlg.c
index 1b9b8d42c..a8143ef58 100644
--- a/unix/gtkdlg.c
+++ b/unix/gtkdlg.c
@@ -3691,13 +3691,6 @@ void old_keyfile_warning(void)
      */
 }
 
-void fatal_message_box(void *window, const char *msg)
-{
-    message_box(window, "PuTTY Fatal Error", msg,
-                string_width("REASONABLY LONG LINE OF TEXT FOR BASIC SANITY"),
-                FALSE, &buttons_ok);
-}
-
 void nonfatal_message_box(void *window, const char *msg)
 {
     char *title = dupcat(appname, " Error", NULL);
diff --git a/unix/gtkwin.c b/unix/gtkwin.c
index e8bc2894f..a4c704750 100644
--- a/unix/gtkwin.c
+++ b/unix/gtkwin.c
@@ -167,6 +167,38 @@ static int send_raw_mouse;
 
 static void start_backend(struct gui_data *inst);
 static void exit_callback(void *vinst);
+static void destroy_inst_connection(struct gui_data *inst);
+static void delete_inst(struct gui_data *inst);
+
+static void post_fatal_message_box_toplevel(void *vctx)
+{
+    struct gui_data *inst = (struct gui_data *)vctx;
+    gtk_widget_destroy(inst->window);
+}
+
+static void post_fatal_message_box(void *vctx, int result)
+{
+    struct gui_data *inst = (struct gui_data *)vctx;
+    unregister_dialog(inst, DIALOG_SLOT_CONNECTION_FATAL);
+    queue_toplevel_callback(post_fatal_message_box_toplevel, inst);
+}
+
+void fatal_message_box(struct gui_data *inst, const char *msg)
+{
+    char *title = dupcat(appname, " Fatal Error", NULL);
+    GtkWidget *dialog = create_message_box(
+        inst->window, title, msg,
+        string_width("REASONABLY LONG LINE OF TEXT FOR BASIC SANITY"),
+        FALSE, &buttons_ok, post_fatal_message_box, inst);
+    register_dialog(inst, DIALOG_SLOT_CONNECTION_FATAL, dialog);
+    sfree(title);
+}
+
+static void connection_fatal_callback(void *vinst)
+{
+    struct gui_data *inst = (struct gui_data *)vinst;
+    destroy_inst_connection(inst);
+}
 
 void connection_fatal(void *frontend, const char *p, ...)
 {
@@ -177,10 +209,11 @@ void connection_fatal(void *frontend, const char *p, ...)
     va_start(ap, p);
     msg = dupvprintf(p, ap);
     va_end(ap);
-    fatal_message_box(inst->window, msg);
+    fatal_message_box(inst, msg);
     sfree(msg);
 
-    queue_toplevel_callback(exit_callback, inst);
+    inst->exited = TRUE;   /* suppress normal exit handling */
+    queue_toplevel_callback(connection_fatal_callback, frontend);
 }
 
 /*
@@ -2062,19 +2095,9 @@ static void exit_callback(void *vinst)
 
     if (!inst->exited &&
         (exitcode = inst->back->exitcode(inst->backhandle)) >= 0) {
-	inst->exited = TRUE;
-	close_on_exit = conf_get_int(inst->conf, CONF_close_on_exit);
-	if (inst->ldisc) {
-	    ldisc_free(inst->ldisc);
-	    inst->ldisc = NULL;
-	}
-        inst->back->free(inst->backhandle);
-        inst->backhandle = NULL;
-        inst->back = NULL;
-        term_provide_resize_fn(inst->term, NULL, NULL);
-        update_specials_menu(inst);
-	gtk_widget_set_sensitive(inst->restartitem, TRUE);
+        destroy_inst_connection(inst);
 
+	close_on_exit = conf_get_int(inst->conf, CONF_close_on_exit);
 	if (close_on_exit == FORCE_ON ||
 	    (close_on_exit == AUTO && exitcode == 0)) {
             gtk_widget_destroy(inst->window);
@@ -2089,6 +2112,26 @@ void notify_remote_exit(void *frontend)
     queue_toplevel_callback(exit_callback, inst);
 }
 
+static void destroy_inst_connection(struct gui_data *inst)
+{
+    inst->exited = TRUE;
+    if (inst->ldisc) {
+        ldisc_free(inst->ldisc);
+        inst->ldisc = NULL;
+    }
+    if (inst->backhandle) {
+        inst->back->free(inst->backhandle);
+        inst->backhandle = NULL;
+        inst->back = NULL;
+    }
+    if (inst->term)
+        term_provide_resize_fn(inst->term, NULL, NULL);
+    if (inst->menu) {
+        update_specials_menu(inst);
+        gtk_widget_set_sensitive(inst->restartitem, TRUE);
+    }
+}
+
 static void delete_inst(struct gui_data *inst)
 {
     int dialog_slot;
@@ -2106,19 +2149,11 @@ static void delete_inst(struct gui_data *inst)
         gtk_widget_destroy(inst->menu);
         inst->menu = NULL;
     }
-    if (inst->backhandle) {
-        inst->back->free(inst->backhandle);
-        inst->backhandle = NULL;
-        inst->back = NULL;
-    }
+    destroy_inst_connection(inst);
     if (inst->term) {
         term_free(inst->term);
         inst->term = NULL;
     }
-    if (inst->ldisc) {
-        ldisc_free(inst->ldisc);
-        inst->ldisc = NULL;
-    }
     if (inst->conf) {
         conf_free(inst->conf);
         inst->conf = NULL;
@@ -4517,7 +4552,7 @@ static void start_backend(struct gui_data *inst)
 	char *msg = dupprintf("Unable to open connection to %s:\n%s",
 			      conf_dest(inst->conf), error);
 	inst->exited = TRUE;
-	fatal_message_box(inst->window, msg);
+	fatal_message_box(inst, msg);
 	sfree(msg);
 	exit(0);
     }
diff --git a/unix/unix.h b/unix/unix.h
index 893f084e6..cc9e71d8a 100644
--- a/unix/unix.h
+++ b/unix/unix.h
@@ -155,6 +155,7 @@ enum DialogSlot {
     DIALOG_SLOT_NETWORK_PROMPT,
     DIALOG_SLOT_LOGFILE_PROMPT,
     DIALOG_SLOT_WARN_ON_CLOSE,
+    DIALOG_SLOT_CONNECTION_FATAL,
     DIALOG_SLOT_LIMIT /* must remain last */
 };
 void register_dialog(void *frontend, enum DialogSlot slot, GtkWidget *dialog);
@@ -168,7 +169,6 @@ GtkWidget *create_config_box(const char *title, Conf *conf,
                              int midsession, int protcfginfo,
                              post_dialog_fn_t after, void *afterctx);
 #endif
-void fatal_message_box(void *window, const char *msg);
 void nonfatal_message_box(void *window, const char *msg);
 void about_box(void *window);
 void *eventlogstuff_new(void);

From 57ceac8f1d53a38766e993177a736d48d35c6f34 Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Sun, 26 Nov 2017 19:59:27 +0000
Subject: [PATCH 122/166] Fix stale-pointer bugs in connection-fatal network
 errors.

I think these began to appear as a consequencce of replacing
fatalbox() calls with more sensible error reports: the more specific a
direction I send a report in, the greater the annoying possibility of
re-entrance when the resulting error handler starts closing stuff.
---
 ssh.c        | 2 ++
 unix/uxnet.c | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/ssh.c b/ssh.c
index 01a58575f..223e5555d 100644
--- a/ssh.c
+++ b/ssh.c
@@ -7784,6 +7784,8 @@ static int ssh2_try_send(struct ssh_channel *c)
 	ssh2_pkt_addstring_start(pktout);
 	ssh2_pkt_addstring_data(pktout, data, len);
 	ssh2_pkt_send(ssh, pktout);
+        if (!ssh->s)   /* a network error might have closed the socket */
+            break;
 	bufchain_consume(&c->v.v2.outbuffer, len);
 	c->v.v2.remwindow -= len;
     }
diff --git a/unix/uxnet.c b/unix/uxnet.c
index f3498527f..e47826523 100644
--- a/unix/uxnet.c
+++ b/unix/uxnet.c
@@ -1431,8 +1431,10 @@ static void net_select_result(int fd, int event)
                     while (err && s->addr && sk_nextaddr(s->addr, &s->step)) {
                         err = try_connect(s);
                     }
-                    if (err)
+                    if (err) {
                         plug_closing(s->plug, strerror(err), err, 0);
+                        return;      /* socket is now presumably defunct */
+                    }
                     if (!s->connected)
                         return;      /* another async attempt in progress */
                 }

From ef6e38d8ebeab7e98ad82edad81413ae2e833109 Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Sun, 26 Nov 2017 20:01:16 +0000
Subject: [PATCH 123/166] Remove the modal message_box function completely.

Now there's nothing left that calls it, it's obsolete.
---
 unix/gtkdlg.c | 27 ++-------------------------
 1 file changed, 2 insertions(+), 25 deletions(-)

diff --git a/unix/gtkdlg.c b/unix/gtkdlg.c
index a8143ef58..08579356a 100644
--- a/unix/gtkdlg.c
+++ b/unix/gtkdlg.c
@@ -3443,30 +3443,6 @@ GtkWidget *create_message_box(
     return window;
 }
 
-static void modal_message_box_after(void *ctx, int result)
-{
-    *(int *)ctx = result;
-    gtk_main_quit();
-}
-
-int message_box(
-    GtkWidget *parentwin, const char *title, const char *msg, int minwid,
-    int selectable, const struct message_box_buttons *buttons)
-{
-    int retval = INT_MIN;
-    GtkWidget *dialog;
-
-    dialog = create_message_box(parentwin, title, msg, minwid, selectable,
-                                buttons, modal_message_box_after, &retval);
-    gtk_window_set_modal(GTK_WINDOW(dialog), TRUE);
-
-    gtk_main();
-    post_main();
-
-    assert(retval != INT_MIN);
-    return retval;
-}
-
 struct verify_ssh_host_key_result_ctx {
     char *host;
     int port;
@@ -3791,7 +3767,8 @@ void about_box(void *window)
     our_dialog_add_to_content_area(GTK_WINDOW(aboutbox), w, FALSE, FALSE, 0);
 #if GTK_CHECK_VERSION(2,0,0)
     /*
-     * Same precautions against initial select-all as in message_box().
+     * Same precautions against initial select-all as in
+     * create_message_box().
      */
     gtk_widget_grab_focus(w);
     gtk_label_select_region(GTK_LABEL(w), 0, 0);

From 71b00097dd8a755c600dd4da9fab65c0f0d0b29b Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Sun, 26 Nov 2017 20:03:12 +0000
Subject: [PATCH 124/166] Remove the post_main() mechanism.

This existed in order to avoid the various confusions that could
happen if a toplevel callback ran in the context of a subsidiary
instance of gtk_main(). Now there aren't any subsidiary gtk_main
instances any more, this mechanism is no longer needed, and I can
throw it out. It was horrible anyway.
---
 unix/gtkcomm.c | 33 +--------------------------------
 unix/unix.h    |  1 -
 2 files changed, 1 insertion(+), 33 deletions(-)

diff --git a/unix/gtkcomm.c b/unix/gtkcomm.c
index 288846549..9c3d1c53a 100644
--- a/unix/gtkcomm.c
+++ b/unix/gtkcomm.c
@@ -203,40 +203,9 @@ static int idle_fn_scheduled;
 
 static void notify_toplevel_callback(void *);
 
-/*
- * Replacement code for the gtk_quit_add() function, which GTK2 - in
- * their unbounded wisdom - deprecated without providing any usable
- * replacement, and which we were using to ensure that our idle
- * function for toplevel callbacks was only run from the outermost
- * gtk_main().
- *
- * We must make sure that all our subsidiary calls to gtk_main() are
- * followed by a call to post_main(), so that the idle function can be
- * re-established when we end up back at the top level.
- */
-void post_main(void)
-{
-    if (gtk_main_level() == 1)
-        notify_toplevel_callback(NULL);
-}
-
 static gint idle_toplevel_callback_func(gpointer data)
 {
-    if (gtk_main_level() > 1) {
-        /*
-         * We don't run callbacks if we're in the middle of a
-         * subsidiary gtk_main. So unschedule this idle function; it
-         * will be rescheduled by post_main() when we come back up a
-         * level, which is the earliest we might actually do
-         * something.
-         */
-        if (idle_fn_scheduled) {      /* double-check, just in case */
-            g_source_remove(toplevel_callback_idle_id);
-            idle_fn_scheduled = FALSE;
-        }
-    } else {
-        run_toplevel_callbacks();
-    }
+    run_toplevel_callbacks();
 
     /*
      * If we've emptied our toplevel callback queue, unschedule
diff --git a/unix/unix.h b/unix/unix.h
index cc9e71d8a..8dcfa24f1 100644
--- a/unix/unix.h
+++ b/unix/unix.h
@@ -161,7 +161,6 @@ enum DialogSlot {
 void register_dialog(void *frontend, enum DialogSlot slot, GtkWidget *dialog);
 void unregister_dialog(void *frontend, enum DialogSlot slot);
 #endif
-void post_main(void);     /* called after any subsidiary gtk_main() */
 
 /* Things pterm.c needs from gtkdlg.c */
 #ifdef MAY_REFER_TO_GTK_IN_HEADERS

From 28145fe21a4335e34dfc6cfbc5f97068b9d3af24 Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Mon, 27 Nov 2017 19:29:47 +0000
Subject: [PATCH 125/166] Avoid duplicate random_unref on freeing an Ssh.

If ssh_init encounters a synchronous error, it will call random_unref
before returning. But the Ssh structure it created will still exist,
and if the caller (sensibly) responds by freeing it, then that will
cause a second random_unref, leading to the RNG's refcount going below
zero and failing an assertion.

We never noticed this before because with only one PuTTY connection
per process it was easier to just exit(1) without bothering to clean
things up. Now, with all the multi-sessions-per-process fixes I'm
doing, this has shown up as a problem. But other front ends may
legitimately still just exit - I don't think I can sensibly enforce
_not_ doing so at this late stage - so I've had to arrange to set a
flag in the Ssh saying whether a random_unref is still pending or not.
---
 ssh.c | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/ssh.c b/ssh.c
index 223e5555d..9fcfe9e3e 100644
--- a/ssh.c
+++ b/ssh.c
@@ -991,6 +991,8 @@ struct ssh_tag {
      * agent-forwarding channels live in their channel structure.)
      */
     agent_pending_query *auth_agent_query;
+
+    int need_random_unref;
 };
 
 static const char *ssh_pkt_type(Ssh ssh, int type)
@@ -11316,9 +11318,15 @@ static const char *ssh_init(void *frontend_handle, void **backend_handle,
 #endif
 
     random_ref(); /* do this now - may be needed by sharing setup code */
+    ssh->need_random_unref = TRUE;
 
     p = connect_to_host(ssh, host, port, realhost, nodelay, keepalive);
     if (p != NULL) {
+        /* Call random_unref now instead of waiting until the caller
+         * frees this useless Ssh object, in case the caller is
+         * impatient and just exits without bothering, in which case
+         * the random seed won't be re-saved. */
+        ssh->need_random_unref = FALSE;
         random_unref();
 	return p;
     }
@@ -11332,6 +11340,7 @@ static void ssh_free(void *handle)
     struct ssh_channel *c;
     struct ssh_rportfwd *pf;
     struct X11FakeAuth *auth;
+    int need_random_unref;
 
     if (ssh->v1_cipher_ctx)
 	ssh->cipher->free_context(ssh->v1_cipher_ctx);
@@ -11434,9 +11443,11 @@ static void ssh_free(void *handle)
     if (ssh->gsslibs)
 	ssh_gss_cleanup(ssh->gsslibs);
 #endif
+    need_random_unref = ssh->need_random_unref;
     sfree(ssh);
 
-    random_unref();
+    if (need_random_unref)
+        random_unref();
 }
 
 /*

From 61f3e3e299ed24aa58736bd8d2214bd5c8abb2f1 Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Mon, 27 Nov 2017 19:32:39 +0000
Subject: [PATCH 126/166] GTK: handle synchronous connection-setup failures
 sensibly.

This was one of a handful of remaining places in gtkwin.c where exit()
is called incautiously. Of course, a failure to set up one SSH
connection should only be fatal to that connection, not the whole
process, so really we should be feeding into the connection_fatal
system.
---
 unix/gtkwin.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/unix/gtkwin.c b/unix/gtkwin.c
index a4c704750..418d68752 100644
--- a/unix/gtkwin.c
+++ b/unix/gtkwin.c
@@ -4552,9 +4552,9 @@ static void start_backend(struct gui_data *inst)
 	char *msg = dupprintf("Unable to open connection to %s:\n%s",
 			      conf_dest(inst->conf), error);
 	inst->exited = TRUE;
-	fatal_message_box(inst, msg);
+	connection_fatal(inst, msg);
 	sfree(msg);
-	exit(0);
+        return;
     }
 
     s = conf_get_str(inst->conf, CONF_wintitle);
@@ -4929,9 +4929,10 @@ void new_session_window(Conf *conf, const char *geometry_string)
     term_size(inst->term, inst->height, inst->width,
 	      conf_get_int(inst->conf, CONF_savelines));
 
-    start_backend(inst);
+    inst->exited = FALSE;
 
-    ldisc_echoedit_update(inst->ldisc);     /* cause ldisc to notice changes */
+    start_backend(inst);
 
-    inst->exited = FALSE;
+    if (inst->ldisc) /* early backend failure might make this NULL already */
+        ldisc_echoedit_update(inst->ldisc); /* cause ldisc to notice changes */
 }

From c99338b750aed3714d56faa39bd0074db58a0d4a Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Mon, 27 Nov 2017 19:38:02 +0000
Subject: [PATCH 127/166] Stop linking cmdline.c into the gtkapp-based
 programs.

They don't do normal command-line processing, so they don't need it. A
few stray references to machinery provided in there are now satisfied
instead by a new stub module nocmdline.c.
---
 Recipe      | 19 ++++++++++---------
 nocmdline.c | 42 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 52 insertions(+), 9 deletions(-)
 create mode 100644 nocmdline.c

diff --git a/Recipe b/Recipe
index 33d0f2f7e..e065c37d5 100644
--- a/Recipe
+++ b/Recipe
@@ -241,6 +241,7 @@ GUITERM  = TERMINAL window windlg winctrls sizetip winprint winutils
 UXTERM   = TERMINAL uxcfg sercfg uxucs uxprint timing callback miscucs
 GTKTERM  = UXTERM gtkwin gtkcfg gtkdlg gtkfont gtkcols gtkmisc xkeysym
 	 + x11misc gtkcomm
+GTKMAIN  = gtkmain cmdline
 
 # Non-SSH back ends (putty, puttytel, plink).
 NONSSH   = telnet raw rlogin ldisc pinger
@@ -255,14 +256,14 @@ WINSSH   = SSH winnoise wincapi winpgntc wingss winshare winnps winnpc
 UXSSH    = SSH uxnoise uxagentc uxgss uxshare
 
 # SFTP implementation (pscp, psftp).
-SFTP     = sftp int64 logging
+SFTP     = sftp int64 logging cmdline
 
 # Miscellaneous objects appearing in all the network utilities (not
 # Pageant or PuTTYgen).
 MISC     = timing callback misc version settings tree234 proxy conf be_misc
 WINMISC  = MISC winstore winnet winhandl cmdline windefs winmisc winproxy
          + wintime winhsock errsock winsecur winucs miscucs
-UXMISC   = MISC uxstore uxsel uxnet uxpeer cmdline uxmisc uxproxy time
+UXMISC   = MISC uxstore uxsel uxnet uxpeer uxmisc uxproxy time
 
 # import.c and dependencies, for PuTTYgen-like utilities that have to
 # load foreign key files.
@@ -315,16 +316,16 @@ puttygen : [G] winpgen sshrsag sshdssg sshprime sshdes sshbn sshmd5 version
 
 pterm    : [X] GTKTERM uxmisc misc ldisc settings uxpty uxsel BE_NONE uxstore
          + uxsignal CHARSET cmdline uxpterm version time xpmpterm xpmptcfg
-	 + nogss gtkmain
+	 + nogss GTKMAIN
 putty    : [X] GTKTERM uxmisc misc ldisc settings uxsel U_BE_ALL uxstore
          + uxsignal CHARSET uxputty NONSSH UXSSH UXMISC ux_x11 xpmputty
-         + xpmpucfg gtkmain
+         + xpmpucfg GTKMAIN
 puttytel : [X] GTKTERM uxmisc misc ldisc settings uxsel U_BE_NOSSH
 	 + uxstore uxsignal CHARSET uxputty NONSSH UXMISC xpmputty xpmpucfg
-	 + nogss gtkmain
+	 + nogss GTKMAIN
 
 plink    : [U] uxplink uxcons NONSSH UXSSH U_BE_ALL logging UXMISC uxsignal
-         + ux_x11 noterm uxnogtk
+         + ux_x11 noterm uxnogtk cmdline
 
 PUTTYGEN_UNIX = sshrsag sshdssg sshprime sshdes sshbn sshmd5 version
          + sshrand uxnoise sshsha misc sshrsa sshdss uxcons uxstore uxmisc
@@ -342,11 +343,11 @@ pageant  : [X] uxpgnt uxagentc aqsync pageant sshrsa sshpubk sshdes sshbn
 	 + gtkask gtkmisc UXMISC
 
 ptermapp : [XT] GTKTERM uxmisc misc ldisc settings uxpty uxsel BE_NONE uxstore
-         + uxsignal CHARSET cmdline uxpterm version time xpmpterm xpmptcfg
-         + nogss gtkapp
+         + uxsignal CHARSET uxpterm version time xpmpterm xpmptcfg
+         + nogss gtkapp nocmdline
 puttyapp : [XT] GTKTERM uxmisc misc ldisc settings uxsel U_BE_ALL uxstore
          + uxsignal CHARSET uxputty NONSSH UXSSH UXMISC ux_x11 xpmputty
-         + xpmpucfg gtkapp
+         + xpmpucfg gtkapp nocmdline
 osxlaunch : [UT] osxlaunch
 
 fuzzterm : [UT] UXTERM CHARSET misc version uxmisc uxucs fuzzterm time settings
diff --git a/nocmdline.c b/nocmdline.c
new file mode 100644
index 000000000..a76433857
--- /dev/null
+++ b/nocmdline.c
@@ -0,0 +1,42 @@
+/*
+ * nocmdline.c - stubs in applications which don't do the
+ * standard(ish) PuTTY tools' command-line parsing
+ */
+
+#include <stdio.h>
+#include <assert.h>
+#include <stdlib.h>
+#include "putty.h"
+
+/*
+ * Stub version of the function in cmdline.c which provides the
+ * password to SSH authentication by remembering it having been passed
+ * as a command-line option. If we're not doing normal command-line
+ * handling, then there is no such option, so that function always
+ * returns failure.
+ */
+int cmdline_get_passwd_input(prompts_t *p, const unsigned char *in, int inlen)
+{
+    return -1;
+}
+
+/*
+ * The main cmdline_process_param function is normally called from
+ * applications' main(). An application linking against this stub
+ * module shouldn't have a main() that calls it in the first place :-)
+ * but it is just occasionally called by other supporting functions,
+ * such as one in uxputty.c which sometimes handles a non-option
+ * argument by making up equivalent options and passing them back to
+ * this function. So we have to provide a link-time stub of this
+ * function, but it had better not end up being called at run time.
+ */
+int cmdline_process_param(const char *p, char *value,
+                          int need_save, Conf *conf)
+{
+    assert(FALSE && "cmdline_process_param should never be called");
+}
+
+/*
+ * This variable will be referred to, so it has to exist. It's ignored.
+ */
+int cmdline_tooltype = 0;

From ba55b228a38071cd6d4be39f0c409fc5c08f3d19 Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Mon, 27 Nov 2017 19:40:13 +0000
Subject: [PATCH 128/166] Move gtkwin.c's cmdline_error() into gtkmain.c.

Not all gtkwin-based tools use it. Only the ones with one session per
process, which parse a command line describing that session and might
reasonably want to report errors in that command line by writing to
standard error and exiting the program.

In other words, precisely the ones that link in gtkmain.c and not
gtkapp.c. So gtkmain.c is a more sensible place to put that
error-reporting function.
---
 unix/gtkmain.c | 11 +++++++++++
 unix/gtkwin.c  | 11 -----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/unix/gtkmain.c b/unix/gtkmain.c
index 751a80ff7..a3cdb2703 100644
--- a/unix/gtkmain.c
+++ b/unix/gtkmain.c
@@ -298,6 +298,17 @@ static void version(FILE *fp) {
 
 static const char *geometry_string;
 
+void cmdline_error(const char *p, ...)
+{
+    va_list ap;
+    fprintf(stderr, "%s: ", appname);
+    va_start(ap, p);
+    vfprintf(stderr, p, ap);
+    va_end(ap);
+    fputc('\n', stderr);
+    exit(1);
+}
+
 int do_cmdline(int argc, char **argv, int do_everything, int *allow_launch,
                Conf *conf)
 {
diff --git a/unix/gtkwin.c b/unix/gtkwin.c
index 418d68752..f0c3c3fb2 100644
--- a/unix/gtkwin.c
+++ b/unix/gtkwin.c
@@ -3789,17 +3789,6 @@ void modalfatalbox(const char *p, ...)
     exit(1);
 }
 
-void cmdline_error(const char *p, ...)
-{
-    va_list ap;
-    fprintf(stderr, "%s: ", appname);
-    va_start(ap, p);
-    vfprintf(stderr, p, ap);
-    va_end(ap);
-    fputc('\n', stderr);
-    exit(1);
-}
-
 const char *get_x_display(void *frontend)
 {
     return gdk_get_display();

From 4b8baed84af04cb9f2d5c3318bb057567e3eaadc Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Mon, 27 Nov 2017 20:09:54 +0000
Subject: [PATCH 129/166] GTK: fix the exit(1) response to startup-time font
 errors.

For gtkapp-based tools that will have to stop being a program-fatal
error, so I've turned it into a function called window_setup_error
(which I could in principle reuse for other problems in the long and
tortuous progress of new_session_window), and kept the original
handling in gtkmain.c's implementation of that function while gtkapp.c
does something more sensible with a message box.
---
 unix/gtkapp.c  | 14 ++++++++++++++
 unix/gtkmain.c |  6 ++++++
 unix/gtkwin.c  | 16 ++++++++++------
 unix/unix.h    |  1 +
 4 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/unix/gtkapp.c b/unix/gtkapp.c
index d7add6d11..6a48da35e 100644
--- a/unix/gtkapp.c
+++ b/unix/gtkapp.c
@@ -109,6 +109,7 @@ I suppose I'll have to look into OS X code signing.
 #define MAY_REFER_TO_GTK_IN_HEADERS
 
 #include "putty.h"
+#include "gtkmisc.h"
 
 char *x_get_default(const char *key) { return NULL; }
 
@@ -226,6 +227,19 @@ void new_app_win(GtkApplication *app)
     launch_new_session();
 }
 
+static void window_setup_error_callback(void *vctx, int result)
+{
+    g_application_release(G_APPLICATION(app));
+}
+
+void window_setup_error(const char *errmsg)
+{
+    create_message_box(NULL, "Error creating session window", errmsg,
+                       string_width("Some sort of fiddly error message that "
+                                    "might be technical"),
+                       TRUE, &buttons_ok, window_setup_error_callback, NULL);
+}
+
 static void activate(GApplication *app,
                      gpointer      user_data)
 {
diff --git a/unix/gtkmain.c b/unix/gtkmain.c
index a3cdb2703..9860cd796 100644
--- a/unix/gtkmain.c
+++ b/unix/gtkmain.c
@@ -309,6 +309,12 @@ void cmdline_error(const char *p, ...)
     exit(1);
 }
 
+void window_setup_error(const char *errmsg)
+{
+    fprintf(stderr, "%s: %s\n", appname, errmsg);
+    exit(1);
+}
+
 int do_cmdline(int argc, char **argv, int do_everything, int *allow_launch,
                Conf *conf)
 {
diff --git a/unix/gtkwin.c b/unix/gtkwin.c
index f0c3c3fb2..a427b20ab 100644
--- a/unix/gtkwin.c
+++ b/unix/gtkwin.c
@@ -4639,17 +4639,21 @@ void new_session_window(Conf *conf, const char *geometry_string)
     inst->area = gtk_drawing_area_new();
     gtk_widget_set_name(GTK_WIDGET(inst->area), "drawing-area");
 
-#if GTK_CHECK_VERSION(2,0,0)
-    inst->imc = gtk_im_multicontext_new();
-#endif
-
     {
         char *errmsg = setup_fonts_ucs(inst);
         if (errmsg) {
-            fprintf(stderr, "%s: %s\n", appname, errmsg);
-            exit(1);
+            window_setup_error(errmsg);
+            sfree(errmsg);
+            gtk_widget_destroy(inst->area);
+            sfree(inst);
+            return;
         }
     }
+
+#if GTK_CHECK_VERSION(2,0,0)
+    inst->imc = gtk_im_multicontext_new();
+#endif
+
     inst->window = make_gtk_toplevel_window(inst);
     gtk_widget_set_name(GTK_WIDGET(inst->window), "top-level");
     {
diff --git a/unix/unix.h b/unix/unix.h
index 8dcfa24f1..2516bf3e0 100644
--- a/unix/unix.h
+++ b/unix/unix.h
@@ -135,6 +135,7 @@ void launch_duplicate_session(Conf *conf);
 void launch_new_session(void);
 void launch_saved_session(const char *str);
 void session_window_closed(void);
+void window_setup_error(const char *errmsg);
 #ifdef MAY_REFER_TO_GTK_IN_HEADERS
 GtkWidget *make_gtk_toplevel_window(void *frontend);
 #endif

From 032a9da179082bafa4c16eb6b0c06b02b20cd275 Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Mon, 27 Nov 2017 20:18:23 +0000
Subject: [PATCH 130/166] Remove one last stray process exit().

This one's in frontend_keypress(), which is supposed to close the
window on the first keypress after the session inside it terminates
(that is, if your close-on-exit settings haven't made it close already
at that point).

It looks to me as if that behaviour doesn't currently _work_, and
hasn't worked for quite a while (certainly it was broken as of 0.70,
well before I started on this weekend's refactoring), because when the
session terminates we delete inst->ldisc and that's what would
otherwise be calling frontend_keypress. I should probably decide what
to do about that at some point. But for the moment, I'm satisfied to
simply not break this functionality any worse by making it not a
process-global exit :-)
---
 unix/gtkwin.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/unix/gtkwin.c b/unix/gtkwin.c
index a427b20ab..2ed7fffe7 100644
--- a/unix/gtkwin.c
+++ b/unix/gtkwin.c
@@ -2085,7 +2085,7 @@ void frontend_keypress(void *handle)
      * any keypress.
      */
     if (inst->exited)
-	cleanup_exit(0);
+        gtk_widget_destroy(inst->window);
 }
 
 static void exit_callback(void *vinst)

From 46cf862c31a0a5b3b6332c0ed713b11f447afb87 Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Mon, 27 Nov 2017 20:22:10 +0000
Subject: [PATCH 131/166] Knock off another refactoring from the OS X to-do
 list.

Stopping dialog boxes from being modal is now done; post_main() is
defunct; nothing left in gtkwin.c does an inappropriate whole-process
termination in response to a window-level error or closure condition.

(There is still modalfatalbox(), but that's not an _inappropriate_
process termination.)
---
 unix/gtkapp.c | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/unix/gtkapp.c b/unix/gtkapp.c
index 6a48da35e..d1861b1e4 100644
--- a/unix/gtkapp.c
+++ b/unix/gtkapp.c
@@ -62,18 +62,6 @@ behaviour inherited from ordinary Unix PuTTY. Should arrange to have a
 mode in which you have to take an explicit Copy action, and then
 arrange that the Edit menu includes one of those.
 
-Dialog boxes shouldn't be modal. I think this is a good policy change
-in general, and the required infrastructure changes will benefit the
-Windows front end too, but for a multi-session process it's even more
-critical - you need to be able to type into one session window while
-setting up the configuration for launching another. So everywhere we
-currently run a sub-instance of gtk_main, or call any API function
-that implicitly does that (like gtk_dialog_run), we should switch to
-putting up the dialog box and going back to our ordinary main loop,
-and whatever we were going to do after the dialog closed we should
-remember to do it when that happens later on. Also then we can remove
-the post_main() horror from gtkcomm.c.
-
 The application menu bar is very minimal at the moment. Should include
 all the usual stuff from the Ctrl-right-click menu - saved sessions,
 mid-session special commands, Duplicate Session, Change Settings,

From cd3093bcfedcfd0742d9eccfbe484eeeb1b06f19 Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Mon, 27 Nov 2017 20:39:17 +0000
Subject: [PATCH 132/166] SSH packet logs: don't rely on locale's isprint().

I've just noticed that on OS X I get high-bit-set junk in the text
side of my hex/ASCII dumps. That's going to confuse all sorts of
things that will interpret them in the wrong character set (indeed, in
many cases there won't even be a _right_ character set). Coerce to
ordinary ASCII.
---
 logging.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/logging.c b/logging.c
index 865fe9b82..c36342746 100644
--- a/logging.c
+++ b/logging.c
@@ -351,7 +351,7 @@ void log_packet(void *handle, int direction, int type,
 	    }
 	    dumpdata[10+2+3*(p%16)] = smalldata[0];
 	    dumpdata[10+2+3*(p%16)+1] = smalldata[1];
-	    dumpdata[10+1+3*16+2+(p%16)] = (isprint(c) ? c : '.');
+	    dumpdata[10+1+3*16+2+(p%16)] = (c >= 0x20 && c < 0x7F ? c : '.');
 	    output_pos = (p%16) + 1;
 	}
 

From e3796cb779fd5b87c65cf82b5c87c6c01c4c3749 Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Sun, 3 Dec 2017 14:35:03 +0000
Subject: [PATCH 133/166] Factor out common pre-session-launch preparation.

A more or less identical piece of code to sanitise the CONF_host
string prior to session launch existed in Windows PuTTY and both
Windows and Unix Plink. It's long past time it was centralised.

While I'm here, I've added a couple of extra comments in the
centralised version, including one that - unfortunately - tries _but
fails_ to explain why a string of the form "host.name:1234" doesn't
get the suffix moved into CONF_port the way "user@host" moves the
prefix into CONF_username. Commit c1c1bc471 is the one I'm referring
to in the comment, and unfortunately it has an unexplained one-liner
log message from before I got into the habit of being usefully
verbose.
---
 Recipe             |  8 ++---
 putty.h            |  5 +++
 sessprep.c         | 84 ++++++++++++++++++++++++++++++++++++++++++++++
 unix/uxplink.c     | 58 +-------------------------------
 windows/window.c   | 58 +-------------------------------
 windows/winplink.c | 58 +-------------------------------
 6 files changed, 96 insertions(+), 175 deletions(-)
 create mode 100644 sessprep.c

diff --git a/Recipe b/Recipe
index e065c37d5..b3739b977 100644
--- a/Recipe
+++ b/Recipe
@@ -235,12 +235,12 @@ TERMINAL = terminal wcwidth ldiscucs logging tree234 minibidi
 
 # GUI front end and terminal emulator (putty, puttytel).
 GUITERM  = TERMINAL window windlg winctrls sizetip winprint winutils
-	 + wincfg sercfg winhelp winjump
+	 + wincfg sercfg winhelp winjump sessprep
 
 # Same thing on Unix.
 UXTERM   = TERMINAL uxcfg sercfg uxucs uxprint timing callback miscucs
 GTKTERM  = UXTERM gtkwin gtkcfg gtkdlg gtkfont gtkcols gtkmisc xkeysym
-	 + x11misc gtkcomm
+	 + x11misc gtkcomm sessprep
 GTKMAIN  = gtkmain cmdline
 
 # Non-SSH back ends (putty, puttytel, plink).
@@ -298,7 +298,7 @@ U_BE_NOSSH = be_nos_s uxser nocproxy
 putty    : [G] GUITERM NONSSH WINSSH W_BE_ALL WINMISC winx11 putty.res LIBS
 puttytel : [G] GUITERM NONSSH W_BE_NOSSH WINMISC puttytel.res nogss LIBS
 plink    : [C] winplink wincons NONSSH WINSSH W_BE_ALL logging WINMISC
-         + winx11 plink.res winnojmp noterm LIBS
+         + winx11 plink.res winnojmp sessprep noterm LIBS
 pscp     : [C] pscp winsftp wincons WINSSH BE_SSH SFTP wildcard WINMISC
          + pscp.res winnojmp LIBS
 psftp    : [C] psftp winsftp wincons WINSSH BE_SSH SFTP wildcard WINMISC
@@ -325,7 +325,7 @@ puttytel : [X] GTKTERM uxmisc misc ldisc settings uxsel U_BE_NOSSH
 	 + nogss GTKMAIN
 
 plink    : [U] uxplink uxcons NONSSH UXSSH U_BE_ALL logging UXMISC uxsignal
-         + ux_x11 noterm uxnogtk cmdline
+         + ux_x11 noterm uxnogtk sessprep cmdline
 
 PUTTYGEN_UNIX = sshrsag sshdssg sshprime sshdes sshbn sshmd5 version
          + sshrand uxnoise sshsha misc sshrsa sshdss uxcons uxstore uxmisc
diff --git a/putty.h b/putty.h
index ba7e123ae..3ca82b620 100644
--- a/putty.h
+++ b/putty.h
@@ -1176,6 +1176,11 @@ void pinger_free(Pinger);
 int conf_launchable(Conf *conf);
 char const *conf_dest(Conf *conf);
 
+/*
+ * Exports from sessprep.c.
+ */
+void prepare_session(Conf *conf);
+
 /*
  * Exports from sercfg.c.
  */
diff --git a/sessprep.c b/sessprep.c
new file mode 100644
index 000000000..15d830d92
--- /dev/null
+++ b/sessprep.c
@@ -0,0 +1,84 @@
+/*
+ * sessprep.c: centralise some preprocessing done on Conf objects
+ * before launching them.
+ */
+
+#include "putty.h"
+
+void prepare_session(Conf *conf)
+{
+    char *hostbuf = dupstr(conf_get_str(conf, CONF_host));
+    char *host = hostbuf;
+    char *p, *q;
+
+    /*
+     * Trim leading whitespace from the hostname.
+     */
+    host += strspn(host, " \t");
+
+    /*
+     * See if host is of the form user@host, and separate out the
+     * username if so.
+     */
+    if (host[0] != '\0') {
+        /*
+         * Use strrchr, in case the _username_ in turn is of the form
+         * user@host, which has been known.
+         */
+        char *atsign = strrchr(host, '@');
+        if (atsign) {
+            *atsign = '\0';
+            conf_set_str(conf, CONF_username, host);
+            host = atsign + 1;
+        }
+    }
+
+    /*
+     * Trim a colon suffix off the hostname if it's there, and discard
+     * the text after it.
+     *
+     * The exact reason why we _ignore_ this text, rather than
+     * treating it as a port number, is unfortunately lost in the
+     * mists of history: the commit which originally introduced this
+     * change on 2001-05-06 was clear on _what_ it was doing but
+     * didn't bother to explain _why_. But I [SGT, 2017-12-03] suspect
+     * it has to do with priority order: what should a saved session
+     * do if its CONF_host contains 'server.example.com:123' and its
+     * CONF_port contains 456? If CONF_port contained the _default_
+     * port number then it might be a good guess that the colon suffix
+     * on the host name was intended to override that, but you don't
+     * really want to get into making heuristic judgments on that
+     * basis.
+     *
+     * (Then again, you could just as easily make the same argument
+     * about whether a 'user@' prefix on the host name should override
+     * CONF_username, which this code _does_ do. I don't have a good
+     * answer, sadly. Both these pieces of behaviour have been around
+     * for years and it would probably cause subtle breakage in all
+     * sorts of long-forgotten scripting to go changing things around
+     * now.)
+     *
+     * In order to protect unbracketed IPv6 address literals against
+     * this treatment, we do not make this change at all if there's
+     * _more_ than one (un-IPv6-bracketed) colon.
+     */
+    p = host_strchr(host, ':');
+    if (p && p != host_strrchr(host, ':')) {
+        *p = '\0';
+    }
+
+    /*
+     * Remove any remaining whitespace.
+     */
+    p = hostbuf;
+    q = host;
+    while (*q) {
+        if (*q != ' ' && *q != '\t')
+            *p++ = *q;
+        q++;
+    }
+    *p = '\0';
+
+    conf_set_str(conf, CONF_host, hostbuf);
+    sfree(hostbuf);
+}
diff --git a/unix/uxplink.c b/unix/uxplink.c
index 11ca7d1d6..ebf144583 100644
--- a/unix/uxplink.c
+++ b/unix/uxplink.c
@@ -823,63 +823,7 @@ int main(int argc, char **argv)
 	usage();
     }
 
-    /*
-     * Muck about with the hostname in various ways.
-     */
-    {
-	char *hostbuf = dupstr(conf_get_str(conf, CONF_host));
-	char *host = hostbuf;
-	char *p, *q;
-
-	/*
-	 * Trim leading whitespace.
-	 */
-	host += strspn(host, " \t");
-
-	/*
-	 * See if host is of the form user@host, and separate out
-	 * the username if so.
-	 */
-	if (host[0] != '\0') {
-	    char *atsign = strrchr(host, '@');
-	    if (atsign) {
-		*atsign = '\0';
-		conf_set_str(conf, CONF_username, host);
-		host = atsign + 1;
-	    }
-	}
-
-        /*
-         * Trim a colon suffix off the hostname if it's there. In
-         * order to protect unbracketed IPv6 address literals
-         * against this treatment, we do not do this if there's
-         * _more_ than one colon.
-         */
-        {
-            char *c = host_strchr(host, ':');
- 
-            if (c) {
-                char *d = host_strchr(c+1, ':');
-                if (!d)
-                    *c = '\0';
-            }
-        }
-
-	/*
-	 * Remove any remaining whitespace.
-	 */
-	p = hostbuf;
-	q = host;
-	while (*q) {
-	    if (*q != ' ' && *q != '\t')
-		*p++ = *q;
-	    q++;
-	}
-	*p = '\0';
-
-	conf_set_str(conf, CONF_host, hostbuf);
-	sfree(hostbuf);
-    }
+    prepare_session(conf);
 
     /*
      * Perform command-line overrides on session configuration.
diff --git a/windows/window.c b/windows/window.c
index 30cbbdc94..1bef1daa6 100644
--- a/windows/window.c
+++ b/windows/window.c
@@ -606,63 +606,7 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
 	    cleanup_exit(0);
 	}
 
-	/*
-	 * Muck about with the hostname in various ways.
-	 */
-	{
-	    char *hostbuf = dupstr(conf_get_str(conf, CONF_host));
-	    char *host = hostbuf;
-	    char *p, *q;
-
-	    /*
-	     * Trim leading whitespace.
-	     */
-	    host += strspn(host, " \t");
-
-	    /*
-	     * See if host is of the form user@host, and separate
-	     * out the username if so.
-	     */
-	    if (host[0] != '\0') {
-		char *atsign = strrchr(host, '@');
-		if (atsign) {
-		    *atsign = '\0';
-		    conf_set_str(conf, CONF_username, host);
-		    host = atsign + 1;
-		}
-	    }
-
-            /*
-             * Trim a colon suffix off the hostname if it's there. In
-             * order to protect unbracketed IPv6 address literals
-             * against this treatment, we do not do this if there's
-             * _more_ than one colon.
-             */
-            {
-                char *c = host_strchr(host, ':');
- 
-                if (c) {
-                    char *d = host_strchr(c+1, ':');
-                    if (!d)
-                        *c = '\0';
-                }
-            }
-
-	    /*
-	     * Remove any remaining whitespace.
-	     */
-	    p = hostbuf;
-	    q = host;
-	    while (*q) {
-		if (*q != ' ' && *q != '\t')
-		    *p++ = *q;
-		q++;
-	    }
-	    *p = '\0';
-
-	    conf_set_str(conf, CONF_host, hostbuf);
-	    sfree(hostbuf);
-	}
+        prepare_session(conf);
     }
 
     if (!prev) {
diff --git a/windows/winplink.c b/windows/winplink.c
index 65dd7702d..959db5b09 100644
--- a/windows/winplink.c
+++ b/windows/winplink.c
@@ -498,63 +498,7 @@ int main(int argc, char **argv)
 	usage();
     }
 
-    /*
-     * Muck about with the hostname in various ways.
-     */
-    {
-	char *hostbuf = dupstr(conf_get_str(conf, CONF_host));
-	char *host = hostbuf;
-	char *p, *q;
-
-	/*
-	 * Trim leading whitespace.
-	 */
-	host += strspn(host, " \t");
-
-	/*
-	 * See if host is of the form user@host, and separate out
-	 * the username if so.
-	 */
-	if (host[0] != '\0') {
-	    char *atsign = strrchr(host, '@');
-	    if (atsign) {
-		*atsign = '\0';
-		conf_set_str(conf, CONF_username, host);
-		host = atsign + 1;
-	    }
-	}
-
-        /*
-         * Trim a colon suffix off the hostname if it's there. In
-         * order to protect unbracketed IPv6 address literals
-         * against this treatment, we do not do this if there's
-         * _more_ than one colon.
-         */
-        {
-            char *c = host_strchr(host, ':');
- 
-            if (c) {
-                char *d = host_strchr(c+1, ':');
-                if (!d)
-                    *c = '\0';
-            }
-        }
-
-	/*
-	 * Remove any remaining whitespace.
-	 */
-	p = hostbuf;
-	q = host;
-	while (*q) {
-	    if (*q != ' ' && *q != '\t')
-		*p++ = *q;
-	    q++;
-	}
-	*p = '\0';
-
-	conf_set_str(conf, CONF_host, hostbuf);
-	sfree(hostbuf);
-    }
+    prepare_session(conf);
 
     /*
      * Perform command-line overrides on session configuration.

From 247d1b9b78f570173f812fda0aee636f2c7a68e0 Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Sun, 3 Dec 2017 14:38:55 +0000
Subject: [PATCH 134/166] Unix PuTTY: add missing call to prepare_session.

Now 'putty user@host' will do what you wanted on Unix the same way it
always has on Windows.

(Thanks to Geoff Winkless for pointing out this inconsistency. I've
redone his actual patch my way, but he should still be credited for
the inspiration!)
---
 unix/gtkwin.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/unix/gtkwin.c b/unix/gtkwin.c
index 2ed7fffe7..74b0a2d8f 100644
--- a/unix/gtkwin.c
+++ b/unix/gtkwin.c
@@ -4597,6 +4597,8 @@ void new_session_window(Conf *conf, const char *geometry_string)
 {
     struct gui_data *inst;
 
+    prepare_session(conf);
+
     /*
      * Create an instance structure and initialise to zeroes
      */

From 81345e9a8251206164199bc3aaf592e20f816143 Mon Sep 17 00:00:00 2001
From: Geoff Winkless <geoff@defgeoff.co.uk>
Date: Fri, 3 Nov 2017 14:31:10 +0000
Subject: [PATCH 135/166] ctrl-shift-page-up/down to top or bottom of
 scrollback

Just a small patch, that I find really useful.
---
 unix/gtkwin.c    | 18 ++++++++++++++++++
 windows/window.c |  9 +++++++++
 2 files changed, 27 insertions(+)

diff --git a/unix/gtkwin.c b/unix/gtkwin.c
index 74b0a2d8f..b8607665b 100644
--- a/unix/gtkwin.c
+++ b/unix/gtkwin.c
@@ -965,6 +965,15 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data)
 	 * Shift-PgUp and Shift-PgDn don't even generate keystrokes
 	 * at all.
 	 */
+        if (event->keyval == GDK_KEY_Page_Up &&
+            ((event->state & (GDK_CONTROL_MASK | GDK_SHIFT_MASK)) ==
+             (GDK_CONTROL_MASK | GDK_SHIFT_MASK))) {
+#ifdef KEY_EVENT_DIAGNOSTICS
+            debug((" - Ctrl-Shift-PgUp scroll\n"));
+#endif
+            term_scroll(inst->term, 1, 0);
+            return TRUE;
+        }
 	if (event->keyval == GDK_KEY_Page_Up &&
             (event->state & GDK_SHIFT_MASK)) {
 #ifdef KEY_EVENT_DIAGNOSTICS
@@ -981,6 +990,15 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data)
 	    term_scroll(inst->term, 0, -1);
 	    return TRUE;
 	}
+        if (event->keyval == GDK_KEY_Page_Down &&
+            ((event->state & (GDK_CONTROL_MASK | GDK_SHIFT_MASK)) ==
+             (GDK_CONTROL_MASK | GDK_SHIFT_MASK))) {
+#ifdef KEY_EVENT_DIAGNOSTICS
+            debug((" - Ctrl-shift-PgDn scroll\n"));
+#endif
+            term_scroll(inst->term, -1, 0);
+            return TRUE;
+        }
 	if (event->keyval == GDK_KEY_Page_Down &&
             (event->state & GDK_SHIFT_MASK)) {
 #ifdef KEY_EVENT_DIAGNOSTICS
diff --git a/windows/window.c b/windows/window.c
index 1bef1daa6..5a7040c49 100644
--- a/windows/window.c
+++ b/windows/window.c
@@ -4170,6 +4170,15 @@ static int TranslateKey(UINT message, WPARAM wParam, LPARAM lParam,
 	    SendMessage(hwnd, WM_VSCROLL, SB_PAGEUP, 0);
 	    return 0;
 	}
+        if (wParam == VK_PRIOR && shift_state == 3) { /* ctrl-shift-pageup */
+            SendMessage(hwnd, WM_VSCROLL, SB_TOP, 0);
+            return 0;
+        }
+        if (wParam == VK_NEXT && shift_state == 3) { /* ctrl-shift-pagedown */
+            SendMessage(hwnd, WM_VSCROLL, SB_BOTTOM, 0);
+            return 0;
+        }
+
 	if (wParam == VK_PRIOR && shift_state == 2) {
 	    SendMessage(hwnd, WM_VSCROLL, SB_LINEUP, 0);
 	    return 0;

From b9a25510b0c31468a649660966b093e46b7e9533 Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Thu, 7 Dec 2017 19:59:43 +0000
Subject: [PATCH 136/166] Centralise PuTTY and Plink's non-option argument
 handling.

This is another piece of long-overdue refactoring similar to the
recent commit e3796cb77. But where that one dealt with normalisation
of stuff already stored _in_ a Conf by whatever means (including, in
particular, handling a user typing 'username@host.name' into the
Hostname box of the GUI session dialog box), this one deals with
handling argv entries and putting them into the Conf.

This isn't exactly a pure no-functional-change-at-all refactoring. On
the other hand, it isn't a full-on cleanup that completely
rationalises all the user-visible behaviour as well as the code
structure. It's somewhere in between: I've preserved all the behaviour
quirks that I could imagine a reason for having intended, but taken
the opportunity to _not_ faithfully replicate anything I thought was
clearly just a bug.

So, for example, the following inconsistency is carefully preserved:
the command 'plink -load session nextword' treats 'nextword' as a host
name if the loaded session hasn't provided a hostname already, and
otherwise treats 'nextword' as the remote command to execute on the
already-specified remote host, but the same combination of arguments
to GUI PuTTY will _always_ treat 'nextword' as a hostname, overriding
a hostname (if any) in the saved session. That makes some sense to me
because of the different shapes of the overall command lines.

On the other hand, there are two behaviour changes I know of as a
result of this commit: a third argument to GUI PuTTY (after a hostname
and port) now provokes an error message instead of being silently
ignored, and in Plink, if you combine a -P option (specifying a port
number) with the historical comma-separated protocol selection prefix
on the hostname argument (which I'd completely forgotten even existed
until this piece of work), then the -P will now override the selected
protocol's default port number, whereas previously the default port
would win. For example, 'plink -P 12345 telnet,hostname' will now
connect via Telnet to port 12345 instead of to port 23.

There may be scope for removing or rethinking some of the command-
line syntax quirks in the wake of this change. If we do decide to do
anything like that, then hopefully having it all in one place will
make it easier to remove or change things consistently across the
tools.
---
 cmdline.c          | 263 +++++++++++++++++++++++++++++++++++++++++++++
 putty.h            |   6 ++
 unix/gtkmain.c     |  27 ++---
 unix/unix.h        |   1 -
 unix/uxplink.c     | 245 +++++++++++++----------------------------
 unix/uxpterm.c     |   5 -
 unix/uxputty.c     |  61 +----------
 windows/window.c   |  70 +++---------
 windows/winplink.c | 219 +++++++++++--------------------------
 9 files changed, 430 insertions(+), 467 deletions(-)

diff --git a/cmdline.c b/cmdline.c
index d2a815928..1a14cc997 100644
--- a/cmdline.c
+++ b/cmdline.c
@@ -159,11 +159,242 @@ static int cmdline_check_unavailable(int flag, const char *p)
     if (need_save < 0) return x; \
 } while (0)
 
+static int seen_hostname_argument = FALSE;
+static int seen_port_argument = FALSE;
+
 int cmdline_process_param(const char *p, char *value,
                           int need_save, Conf *conf)
 {
     int ret = 0;
 
+    if (p[0] != '-') {
+        if (need_save < 0)
+            return 0;
+
+        /*
+         * Common handling for the tools whose initial command-line
+         * arguments specify a hostname to connect to, i.e. PuTTY and
+         * Plink. Doesn't count the file transfer tools, because their
+         * hostname specification appears as part of a more
+         * complicated scheme.
+         */
+
+        if ((cmdline_tooltype & TOOLTYPE_HOST_ARG) &&
+            !seen_hostname_argument &&
+            (!(cmdline_tooltype & TOOLTYPE_HOST_ARG_FROM_LAUNCHABLE_LOAD) ||
+             !loaded_session || !conf_launchable(conf))) {
+            /*
+             * Treat this argument as a host name, if we have not yet
+             * seen a host name argument or -load.
+             *
+             * Exception, in some tools (Plink): if we have seen -load
+             * but it didn't create a launchable session, then we
+             * still accept a hostname argument following that -load.
+             * This allows you to make saved sessions that configure
+             * lots of other stuff (colour schemes, terminal settings
+             * etc) and then say 'putty -load sessionname hostname'.
+             *
+             * Also, we carefully _don't_ test conf for launchability
+             * if we haven't been explicitly told to load a session
+             * (otherwise saving a host name into Default Settings
+             * would cause 'putty' on its own to immediately launch
+             * the default session and never be able to do anything
+             * else).
+             */
+            if (!strncmp(p, "telnet:", 7)) {
+                /*
+                 * If the argument starts with "telnet:", set the
+                 * protocol to Telnet and process the string as a
+                 * Telnet URL.
+                 */
+
+                /*
+                 * Skip the "telnet:" or "telnet://" prefix.
+                 */
+                p += 7;
+                if (p[0] == '/' && p[1] == '/')
+                    p += 2;
+                conf_set_int(conf, CONF_protocol, PROT_TELNET);
+
+                /*
+                 * The next thing we expect is a host name.
+                 */
+                {
+                    const char *host = p;
+                    char *buf;
+
+                    p += host_strcspn(p, ":/");
+                    buf = dupprintf("%.*s", (int)(p - host), host);
+                    conf_set_str(conf, CONF_host, buf);
+                    sfree(buf);
+                    seen_hostname_argument = TRUE;
+                }
+
+                /*
+                 * If the host name is followed by a colon, then
+                 * expect a port number after it.
+                 */
+                if (*p == ':') {
+                    p++;
+
+                    conf_set_int(conf, CONF_port, atoi(p));
+                    /*
+                     * Set the flag that will stop us from treating
+                     * the next argument as a separate port; this one
+                     * counts as explicitly provided.
+                     */
+                    seen_port_argument = TRUE;
+                } else {
+                    conf_set_int(conf, CONF_port, -1);
+                }
+            } else {
+                char *user = NULL, *hostname = NULL;
+                const char *hostname_after_user;
+                int port_override = -1;
+                size_t len;
+
+                /*
+                 * Otherwise, treat it as a bare host name.
+                 */
+
+                if (cmdline_tooltype & TOOLTYPE_HOST_ARG_PROTOCOL_PREFIX) {
+                    /*
+                     * Here Plink checks for a comma-separated
+                     * protocol prefix, e.g. 'ssh,hostname' or
+                     * 'ssh,user@hostname'.
+                     *
+                     * I'm not entirely sure why; this behaviour dates
+                     * from 2000 and isn't explained. But I _think_ it
+                     * has to do with CVS transport or similar use
+                     * cases, in which the end user invokes the SSH
+                     * client indirectly, via some means that only
+                     * lets them pass a single string argument, and it
+                     * was occasionally useful to shoehorn the choice
+                     * of protocol into that argument.
+                     */
+                    const char *comma = strchr(p, ',');
+                    if (comma) {
+                        char *prefix = dupprintf("%.*s", (int)(comma - p), p);
+                        const Backend *b = backend_from_name(prefix);
+
+                        if (b) {
+                            default_protocol = b->protocol;
+                            conf_set_int(conf, CONF_protocol,
+                                         default_protocol);
+                            port_override = b->default_port;
+                        } else {
+                            cmdline_error("unrecognised protocol prefix '%s'",
+                                          prefix);
+                        }
+
+                        sfree(prefix);
+                        p = comma + 1;
+                    }
+                }
+
+                hostname_after_user = p;
+                if (cmdline_tooltype & TOOLTYPE_HOST_ARG_CAN_BE_SESSION) {
+                    /*
+                     * If the hostname argument can also be a saved
+                     * session (see below), then here we also check
+                     * for a user@ prefix, which will override the
+                     * username from the saved session.
+                     *
+                     * (If the hostname argument _isn't_ a saved
+                     * session, we don't do this.)
+                     */
+                    const char *at = strrchr(p, '@');
+                    if (at) {
+                        user = dupprintf("%.*s", (int)(at - p), p);
+                        hostname_after_user = at + 1;
+                    }
+                }
+
+                /*
+                 * Write the whole hostname argument (minus only that
+                 * optional protocol prefix) into the existing Conf,
+                 * for tools that don't treat it as a saved session
+                 * and as a fallback for those that do.
+                 */
+                hostname = dupstr(p + strspn(p, " \t"));
+                len = strlen(hostname);
+                while (len > 0 && (hostname[len-1] == ' ' ||
+                                   hostname[len-1] == '\t'))
+                    hostname[--len] = '\0';
+                seen_hostname_argument = TRUE;
+                conf_set_str(conf, CONF_host, hostname);
+
+                if ((cmdline_tooltype & TOOLTYPE_HOST_ARG_CAN_BE_SESSION) &&
+                    !loaded_session) {
+                    /*
+                     * For some tools, we equivocate between a
+		     * hostname argument and an argument naming a
+		     * saved session. Here we attempt to load a
+		     * session with the specified name, and if that
+		     * succeeds, we overwrite the entire Conf with it.
+                     *
+                     * We skip this check if a -load option has
+                     * already happened, so that
+                     *
+                     *   plink -load non-launchable-session hostname
+                     *
+                     * will treat 'hostname' as a hostname _even_ if a
+                     * saved session called 'hostname' exists. (This
+                     * doesn't lose any functionality someone could
+                     * have needed, because if 'hostname' did cause a
+                     * session to be loaded, then it would overwrite
+                     * everything from the previously loaded session.
+                     * So if that was the behaviour someone wanted,
+                     * then they could get it by leaving off the
+                     * -load completely.)
+		     */
+                    Conf *conf2 = conf_new();
+                    do_defaults(hostname_after_user, conf2);
+                    if (conf_launchable(conf2)) {
+                        conf_copy_into(conf, conf2);
+                        loaded_session = TRUE;
+                        /* And override the username if one was given. */
+                        if (user)
+                            conf_set_str(conf, CONF_username, user);
+                    }
+                    conf_free(conf2);
+                }
+
+                sfree(hostname);
+                sfree(user);
+
+                if (port_override >= 0)
+                    conf_set_int(conf, CONF_port, port_override);
+            }
+
+            return 1;
+        } else if ((cmdline_tooltype & TOOLTYPE_PORT_ARG) &&
+                   !seen_port_argument) {
+            /*
+             * If we've already got a host name from the command line
+             * (either as a hostname argument or a qualifying -load),
+             * but not a port number, then treat the next argument as
+             * a port number.
+             *
+             * We handle this by calling ourself recursively to
+             * pretend we received a -P argument, so that it will be
+             * deferred until it's a good moment to run it.
+             */
+            char *dup = dupstr(p);     /* 'value' is not a const char * */
+            int retd = cmdline_process_param("-P", dup, 1, conf);
+            sfree(dup);
+            assert(retd == 2);
+            seen_port_argument = TRUE;
+            return 1;
+        } else {
+            /*
+             * Refuse to recognise this argument, and give it back to
+             * the tool's own command-line processing.
+             */
+            return 0;
+        }
+    }
+
     if (!strcmp(p, "-load")) {
 	RETURN(2);
 	/* This parameter must be processed immediately rather than being
@@ -648,3 +879,35 @@ void cmdline_run_saved(Conf *conf)
         saves[pri].nsaved = 0;
     }
 }
+
+int cmdline_host_ok(Conf *conf)
+{
+    /*
+     * Return TRUE if the command-line arguments we've processed in
+     * TOOLTYPE_HOST_ARG mode are sufficient to justify launching a
+     * session.
+     */
+    assert(cmdline_tooltype & TOOLTYPE_HOST_ARG);
+
+    /*
+     * Of course, if we _can't_ launch a session, the answer is
+     * clearly no.
+     */
+    if (!conf_launchable(conf))
+        return FALSE;
+
+    /*
+     * But also, if we haven't seen either a -load option or a
+     * hostname argument, i.e. the only saved settings we've loaded
+     * are Default Settings plus any non-hostname-based stuff from the
+     * command line, then the answer is still no, _even_ if this Conf
+     * is launchable. Otherwise, if you saved your favourite hostname
+     * into Default Settings, then just running 'putty' without
+     * arguments would connect to it without ever offering you the
+     * option to connect to something else or change the setting.
+     */
+    if (!seen_hostname_argument && !loaded_session)
+        return FALSE;
+
+    return TRUE;
+}
diff --git a/putty.h b/putty.h
index 3ca82b620..97ef71302 100644
--- a/putty.h
+++ b/putty.h
@@ -1350,8 +1350,14 @@ int cmdline_process_param(const char *, char *, int, Conf *);
 void cmdline_run_saved(Conf *);
 void cmdline_cleanup(void);
 int cmdline_get_passwd_input(prompts_t *p, const unsigned char *in, int inlen);
+int cmdline_host_ok(Conf *);
 #define TOOLTYPE_FILETRANSFER 1
 #define TOOLTYPE_NONNETWORK 2
+#define TOOLTYPE_HOST_ARG 4
+#define TOOLTYPE_HOST_ARG_CAN_BE_SESSION 8
+#define TOOLTYPE_HOST_ARG_PROTOCOL_PREFIX 16
+#define TOOLTYPE_HOST_ARG_FROM_LAUNCHABLE_LOAD 32
+#define TOOLTYPE_PORT_ARG 64
 extern int cmdline_tooltype;
 
 void cmdline_error(const char *, ...);
diff --git a/unix/gtkmain.c b/unix/gtkmain.c
index 9860cd796..bd9a8e315 100644
--- a/unix/gtkmain.c
+++ b/unix/gtkmain.c
@@ -315,8 +315,7 @@ void window_setup_error(const char *errmsg)
     exit(1);
 }
 
-int do_cmdline(int argc, char **argv, int do_everything, int *allow_launch,
-               Conf *conf)
+int do_cmdline(int argc, char **argv, int do_everything, Conf *conf)
 {
     int err = 0;
     char *val;
@@ -536,10 +535,13 @@ int do_cmdline(int argc, char **argv, int do_everything, int *allow_launch,
             pgp_fingerprints();
             exit(1);
 
-	} else if(p[0] != '-' && (!do_everything ||
-                                  process_nonoption_arg(p, conf,
-							allow_launch))) {
-            /* do nothing */
+	} else if (p[0] != '-') {
+            /* Non-option arguments not handled by cmdline.c are errors. */
+            if (do_everything) {
+                err = 1;
+                fprintf(stderr, "%s: unexpected non-option argument '%s'\n",
+                        appname, p);
+            }
 
 	} else {
 	    err = 1;
@@ -636,22 +638,15 @@ int main(int argc, char **argv)
         assert(!dup_check_launchable || conf_launchable(conf));
         need_config_box = FALSE;
     } else {
-	/* By default, we bring up the config dialog, rather than launching
-	 * a session. This gets set to TRUE if something happens to change
-	 * that (e.g., a hostname is specified on the command-line). */
-	int allow_launch = FALSE;
-	if (do_cmdline(argc, argv, 0, &allow_launch, conf))
+	if (do_cmdline(argc, argv, 0, conf))
 	    exit(1);		       /* pre-defaults pass to get -class */
 	do_defaults(NULL, conf);
-	if (do_cmdline(argc, argv, 1, &allow_launch, conf))
+	if (do_cmdline(argc, argv, 1, conf))
 	    exit(1);		       /* post-defaults, do everything */
 
 	cmdline_run_saved(conf);
 
-	if (loaded_session)
-	    allow_launch = TRUE;
-
-        need_config_box = (!allow_launch || !conf_launchable(conf));
+        need_config_box = !cmdline_host_ok(conf);
     }
 
     if (need_config_box) {
diff --git a/unix/unix.h b/unix/unix.h
index 2516bf3e0..bedb28d07 100644
--- a/unix/unix.h
+++ b/unix/unix.h
@@ -194,7 +194,6 @@ GtkWidget *create_message_box(
 
 /* Things pterm.c needs from {ptermm,uxputty}.c */
 char *make_default_wintitle(char *hostname);
-int process_nonoption_arg(const char *arg, Conf *conf, int *allow_launch);
 
 /* pterm.c needs this special function in xkeysym.c */
 int keysym_to_unicode(int keysym);
diff --git a/unix/uxplink.c b/unix/uxplink.c
index ebf144583..93c12b226 100644
--- a/unix/uxplink.c
+++ b/unix/uxplink.c
@@ -597,14 +597,12 @@ const int buildinfo_gtk_relevant = FALSE;
 int main(int argc, char **argv)
 {
     int sending;
-    int portnumber = -1;
     int *fdlist;
     int fd;
     int i, fdcount, fdsize, fdstate;
     int exitcode;
     int errors;
     int use_subsystem = 0;
-    int got_host = FALSE;
     int just_test_share_exists = FALSE;
     unsigned long now;
     struct winsize size;
@@ -623,6 +621,11 @@ int main(int argc, char **argv)
     outgoingeof = EOF_NO;
 
     flags = FLAG_STDERR | FLAG_STDERR_TTY;
+    cmdline_tooltype |=
+        (TOOLTYPE_HOST_ARG |
+         TOOLTYPE_HOST_ARG_CAN_BE_SESSION |
+         TOOLTYPE_HOST_ARG_PROTOCOL_PREFIX |
+         TOOLTYPE_HOST_ARG_FROM_LAUNCHABLE_LOAD);
 
     stderr_tty_init();
     /*
@@ -651,175 +654,81 @@ int main(int argc, char **argv)
     }
     while (--argc) {
 	char *p = *++argv;
-	if (*p == '-') {
-	    int ret = cmdline_process_param(p, (argc > 1 ? argv[1] : NULL),
-					    1, conf);
-	    if (ret == -2) {
-		fprintf(stderr,
-			"plink: option \"%s\" requires an argument\n", p);
-		errors = 1;
-	    } else if (ret == 2) {
-		--argc, ++argv;
-	    } else if (ret == 1) {
-		continue;
-	    } else if (!strcmp(p, "-batch")) {
-		console_batch_mode = 1;
-	    } else if (!strcmp(p, "-s")) {
-                /* Save status to write to conf later. */
-		use_subsystem = 1;
-	    } else if (!strcmp(p, "-V") || !strcmp(p, "--version")) {
-                version();
-	    } else if (!strcmp(p, "--help")) {
-                usage();
-                exit(0);
-            } else if (!strcmp(p, "-pgpfp")) {
-                pgp_fingerprints();
-                exit(1);
-	    } else if (!strcmp(p, "-o")) {
-                if (argc <= 1) {
-                    fprintf(stderr,
-                            "plink: option \"-o\" requires an argument\n");
-		    errors = 1;
-		} else {
-                    --argc;
-		    provide_xrm_string(*++argv);
-		}
-	    } else if (!strcmp(p, "-shareexists")) {
-                just_test_share_exists = TRUE;
-	    } else if (!strcmp(p, "-fuzznet")) {
-		conf_set_int(conf, CONF_proxy_type, PROXY_FUZZ);
-		conf_set_str(conf, CONF_proxy_telnet_command,
-			     "%host");
-	    } else {
-		fprintf(stderr, "plink: unknown option \"%s\"\n", p);
-		errors = 1;
-	    }
-	} else if (*p) {
-	    if (!conf_launchable(conf) || !(got_host || loaded_session)) {
-		char *q = p;
-
-		/*
-		 * If the hostname starts with "telnet:", set the
-		 * protocol to Telnet and process the string as a
-		 * Telnet URL.
-		 */
-		if (!strncmp(q, "telnet:", 7)) {
-		    char c;
-
-		    q += 7;
-		    if (q[0] == '/' && q[1] == '/')
-			q += 2;
-		    conf_set_int(conf, CONF_protocol, PROT_TELNET);
-		    p = q;
-                    p += host_strcspn(p, ":/");
-		    c = *p;
-		    if (*p)
-			*p++ = '\0';
-		    if (c == ':')
-			conf_set_int(conf, CONF_port, atoi(p));
-		    else
-			conf_set_int(conf, CONF_port, -1);
-		    conf_set_str(conf, CONF_host, q);
-		    got_host = TRUE;
-		} else {
-		    char *r, *user, *host;
-		    /*
-		     * Before we process the [user@]host string, we
-		     * first check for the presence of a protocol
-		     * prefix (a protocol name followed by ",").
-		     */
-		    r = strchr(p, ',');
-		    if (r) {
-			const Backend *b;
-			*r = '\0';
-			b = backend_from_name(p);
-			if (b) {
-			    default_protocol = b->protocol;
-			    conf_set_int(conf, CONF_protocol,
-					 default_protocol);
-			    portnumber = b->default_port;
-			}
-			p = r + 1;
-		    }
-
-		    /*
-		     * A nonzero length string followed by an @ is treated
-		     * as a username. (We discount an _initial_ @.) The
-		     * rest of the string (or the whole string if no @)
-		     * is treated as a session name and/or hostname.
-		     */
-		    r = strrchr(p, '@');
-		    if (r == p)
-			p++, r = NULL; /* discount initial @ */
-		    if (r) {
-			*r++ = '\0';
-			user = p, host = r;
-		    } else {
-			user = NULL, host = p;
-		    }
-
-		    /*
-		     * Now attempt to load a saved session with the
-		     * same name as the hostname.
-		     */
-		    {
-			Conf *conf2 = conf_new();
-			do_defaults(host, conf2);
-			if (loaded_session || !conf_launchable(conf2)) {
-			    /* No settings for this host; use defaults */
-			    /* (or session was already loaded with -load) */
-			    conf_set_str(conf, CONF_host, host);
-			    conf_set_int(conf, CONF_port, default_port);
-			    got_host = TRUE;
-			} else {
-			    conf_copy_into(conf, conf2);
-			    loaded_session = TRUE;
-			}
-			conf_free(conf2);
-		    }
-
-		    if (user) {
-			/* Patch in specified username. */
-			conf_set_str(conf, CONF_username, user);
-		    }
-
-		}
-	    } else {
-		char *command;
-		int cmdlen, cmdsize;
-		cmdlen = cmdsize = 0;
-		command = NULL;
-
-		while (argc) {
-		    while (*p) {
-			if (cmdlen >= cmdsize) {
-			    cmdsize = cmdlen + 512;
-			    command = sresize(command, cmdsize, char);
-			}
-			command[cmdlen++]=*p++;
-		    }
-		    if (cmdlen >= cmdsize) {
-			cmdsize = cmdlen + 512;
-			command = sresize(command, cmdsize, char);
-		    }
-		    command[cmdlen++]=' '; /* always add trailing space */
-		    if (--argc) p = *++argv;
-		}
-		if (cmdlen) command[--cmdlen]='\0';
-				       /* change trailing blank to NUL */
-		conf_set_str(conf, CONF_remote_cmd, command);
-		conf_set_str(conf, CONF_remote_cmd2, "");
-		conf_set_int(conf, CONF_nopty, TRUE);  /* command => no tty */
-
-		break;		       /* done with cmdline */
-	    }
+        int ret = cmdline_process_param(p, (argc > 1 ? argv[1] : NULL),
+                                        1, conf);
+        if (ret == -2) {
+            fprintf(stderr,
+                    "plink: option \"%s\" requires an argument\n", p);
+            errors = 1;
+        } else if (ret == 2) {
+            --argc, ++argv;
+        } else if (ret == 1) {
+            continue;
+        } else if (!strcmp(p, "-batch")) {
+            console_batch_mode = 1;
+        } else if (!strcmp(p, "-s")) {
+            /* Save status to write to conf later. */
+            use_subsystem = 1;
+        } else if (!strcmp(p, "-V") || !strcmp(p, "--version")) {
+            version();
+        } else if (!strcmp(p, "--help")) {
+            usage();
+            exit(0);
+        } else if (!strcmp(p, "-pgpfp")) {
+            pgp_fingerprints();
+            exit(1);
+        } else if (!strcmp(p, "-o")) {
+            if (argc <= 1) {
+                fprintf(stderr,
+                        "plink: option \"-o\" requires an argument\n");
+                errors = 1;
+            } else {
+                --argc;
+                provide_xrm_string(*++argv);
+            }
+        } else if (!strcmp(p, "-shareexists")) {
+            just_test_share_exists = TRUE;
+        } else if (!strcmp(p, "-fuzznet")) {
+            conf_set_int(conf, CONF_proxy_type, PROXY_FUZZ);
+            conf_set_str(conf, CONF_proxy_telnet_command, "%host");
+	} else if (*p != '-') {
+            char *command;
+            int cmdlen, cmdsize;
+            cmdlen = cmdsize = 0;
+            command = NULL;
+
+            while (argc) {
+                while (*p) {
+                    if (cmdlen >= cmdsize) {
+                        cmdsize = cmdlen + 512;
+                        command = sresize(command, cmdsize, char);
+                    }
+                    command[cmdlen++]=*p++;
+                }
+                if (cmdlen >= cmdsize) {
+                    cmdsize = cmdlen + 512;
+                    command = sresize(command, cmdsize, char);
+                }
+                command[cmdlen++]=' '; /* always add trailing space */
+                if (--argc) p = *++argv;
+            }
+            if (cmdlen) command[--cmdlen]='\0';
+            /* change trailing blank to NUL */
+            conf_set_str(conf, CONF_remote_cmd, command);
+            conf_set_str(conf, CONF_remote_cmd2, "");
+            conf_set_int(conf, CONF_nopty, TRUE);  /* command => no tty */
+
+            break;		       /* done with cmdline */
+        } else {
+            fprintf(stderr, "plink: unknown option \"%s\"\n", p);
+            errors = 1;
 	}
     }
 
     if (errors)
 	return 1;
 
-    if (!conf_launchable(conf) || !(got_host || loaded_session)) {
+    if (!cmdline_host_ok(conf)) {
 	usage();
     }
 
@@ -864,12 +773,6 @@ int main(int argc, char **argv)
 	return 1;
     }
 
-    /*
-     * Select port.
-     */
-    if (portnumber != -1)
-	conf_set_int(conf, CONF_port, portnumber);
-
     /*
      * Block SIGPIPE, so that we'll get EPIPE individually on
      * particular network connections that go wrong.
diff --git a/unix/uxpterm.c b/unix/uxpterm.c
index 687974a26..d80c37805 100644
--- a/unix/uxpterm.c
+++ b/unix/uxpterm.c
@@ -35,11 +35,6 @@ void cleanup_exit(int code)
     exit(code);
 }
 
-int process_nonoption_arg(const char *arg, Conf *conf, int *allow_launch)
-{
-    return 0;                          /* pterm doesn't have any. */
-}
-
 char *make_default_wintitle(char *hostname)
 {
     return dupstr("pterm");
diff --git a/unix/uxputty.c b/unix/uxputty.c
index c982e2246..fb2801879 100644
--- a/unix/uxputty.c
+++ b/unix/uxputty.c
@@ -51,69 +51,9 @@ void initial_config_box(Conf *conf, post_dialog_fn_t after, void *afterctx)
     sfree(title);
 }
 
-static int got_host = 0;
-
 const int use_event_log = 1, new_session = 1, saved_sessions = 1;
 const int dup_check_launchable = 1;
 
-int process_nonoption_arg(const char *arg, Conf *conf, int *allow_launch)
-{
-    char *argdup, *p, *q;
-    argdup = dupstr(arg);
-    q = argdup;
-
-    if (got_host) {
-        /*
-         * If we already have a host name, treat this argument as a
-         * port number. NB we have to treat this as a saved -P
-         * argument, so that it will be deferred until it's a good
-         * moment to run it.
-         */
-        int ret = cmdline_process_param("-P", argdup, 1, conf);
-        assert(ret == 2);
-    } else if (!strncmp(q, "telnet:", 7)) {
-        /*
-         * If the hostname starts with "telnet:",
-         * set the protocol to Telnet and process
-         * the string as a Telnet URL.
-         */
-        char c;
-
-        q += 7;
-        if (q[0] == '/' && q[1] == '/')
-            q += 2;
-        conf_set_int(conf, CONF_protocol, PROT_TELNET);
-        p = q;
-        p += host_strcspn(p, ":/");
-        c = *p;
-        if (*p)
-            *p++ = '\0';
-        if (c == ':')
-            conf_set_int(conf, CONF_port, atoi(p));
-        else
-            conf_set_int(conf, CONF_port, -1);
-	conf_set_str(conf, CONF_host, q);
-        got_host = 1;
-    } else {
-        /*
-         * Otherwise, treat this argument as a host name.
-         */
-        p = argdup;
-        while (*p && !isspace((unsigned char)*p))
-            p++;
-        if (*p)
-            *p++ = '\0';
-        conf_set_str(conf, CONF_host, q);
-        got_host = 1;
-    }
-    if (got_host)
-	*allow_launch = TRUE;
-
-    sfree(argdup);
-
-    return 1;
-}
-
 char *make_default_wintitle(char *hostname)
 {
     return dupcat(hostname, " - ", appname, NULL);
@@ -139,6 +79,7 @@ void setup(int single)
 {
     sk_init();
     flags = FLAG_VERBOSE | FLAG_INTERACTIVE;
+    cmdline_tooltype |= TOOLTYPE_HOST_ARG | TOOLTYPE_PORT_ARG;
     default_protocol = be_default_protocol;
     /* Find the appropriate default port. */
     {
diff --git a/windows/window.c b/windows/window.c
index 5a7040c49..e5bd5b7f0 100644
--- a/windows/window.c
+++ b/windows/window.c
@@ -360,6 +360,7 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
     hinst = inst;
     hwnd = NULL;
     flags = FLAG_VERBOSE | FLAG_INTERACTIVE;
+    cmdline_tooltype |= TOOLTYPE_HOST_ARG | TOOLTYPE_PORT_ARG;
 
     sk_init();
 
@@ -416,11 +417,7 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
      */
     {
 	char *p;
-	int got_host = 0;
-	/* By default, we bring up the config dialog, rather than launching
-	 * a session. This gets set to TRUE if something happens to change
-	 * that (e.g., a hostname is specified on the command-line). */
-	int allow_launch = FALSE;
+        int special_launchable_argument = FALSE;
 
 	default_protocol = be_default_protocol;
 	/* Find the appropriate default port. */
@@ -470,7 +467,7 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
 	    if (!conf_launchable(conf) && !do_config()) {
 		cleanup_exit(0);
 	    }
-	    allow_launch = TRUE;    /* allow it to be launched directly */
+            special_launchable_argument = TRUE;
 	} else if (*p == '&') {
 	    /*
 	     * An initial & means we've been given a command line
@@ -490,7 +487,7 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
 	    } else if (!do_config()) {
 		cleanup_exit(0);
 	    }
-	    allow_launch = TRUE;
+            special_launchable_argument = TRUE;
 	} else if (!*p) {
             /* Do-nothing case for an empty command line - or rather,
              * for a command line that's empty _after_ we strip off
@@ -545,52 +542,7 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
 		    pgp_fingerprints();
 		    exit(1);
 		} else if (*p != '-') {
-		    char *q = p;
-		    if (got_host) {
-			/*
-			 * If we already have a host name, treat
-			 * this argument as a port number. NB we
-			 * have to treat this as a saved -P
-			 * argument, so that it will be deferred
-			 * until it's a good moment to run it.
-			 */
-			int ret = cmdline_process_param("-P", p, 1, conf);
-			assert(ret == 2);
-		    } else if (!strncmp(q, "telnet:", 7)) {
-			/*
-			 * If the hostname starts with "telnet:",
-			 * set the protocol to Telnet and process
-			 * the string as a Telnet URL.
-			 */
-			char c;
-
-			q += 7;
-			if (q[0] == '/' && q[1] == '/')
-			    q += 2;
-			conf_set_int(conf, CONF_protocol, PROT_TELNET);
-			p = q;
-                        p += host_strcspn(p, ":/");
-			c = *p;
-			if (*p)
-			    *p++ = '\0';
-			if (c == ':')
-			    conf_set_int(conf, CONF_port, atoi(p));
-			else
-			    conf_set_int(conf, CONF_port, -1);
-			conf_set_str(conf, CONF_host, q);
-			got_host = 1;
-		    } else {
-			/*
-			 * Otherwise, treat this argument as a host
-			 * name.
-			 */
-			while (*p && !isspace(*p))
-			    p++;
-			if (*p)
-			    *p++ = '\0';
-			conf_set_str(conf, CONF_host, q);
-			got_host = 1;
-		    }
+		    cmdline_error("unexpected argument \"%s\"", p);
 		} else {
 		    cmdline_error("unknown option \"%s\"", p);
 		}
@@ -599,11 +551,13 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
 
 	cmdline_run_saved(conf);
 
-	if (loaded_session || got_host)
-	    allow_launch = TRUE;
-
-	if ((!allow_launch || !conf_launchable(conf)) && !do_config()) {
-	    cleanup_exit(0);
+	/*
+         * Bring up the config dialog if the command line hasn't
+         * (explicitly) specified a launchable configuration.
+         */
+        if (!(special_launchable_argument || cmdline_host_ok(conf))) {
+            if (!do_config())
+                cleanup_exit(0);
 	}
 
         prepare_session(conf);
diff --git a/windows/winplink.c b/windows/winplink.c
index 959db5b09..a6b518eca 100644
--- a/windows/winplink.c
+++ b/windows/winplink.c
@@ -293,7 +293,6 @@ const int share_can_be_upstream = TRUE;
 int main(int argc, char **argv)
 {
     int sending;
-    int portnumber = -1;
     SOCKET *sklist;
     int skcount, sksize;
     int exitcode;
@@ -315,6 +314,12 @@ int main(int argc, char **argv)
     default_port = 22;
 
     flags = FLAG_STDERR;
+    cmdline_tooltype |=
+        (TOOLTYPE_HOST_ARG |
+         TOOLTYPE_HOST_ARG_CAN_BE_SESSION |
+         TOOLTYPE_HOST_ARG_PROTOCOL_PREFIX |
+         TOOLTYPE_HOST_ARG_FROM_LAUNCHABLE_LOAD);
+
     /*
      * Process the command line.
      */
@@ -341,160 +346,68 @@ int main(int argc, char **argv)
     }
     while (--argc) {
 	char *p = *++argv;
-	if (*p == '-') {
-	    int ret = cmdline_process_param(p, (argc > 1 ? argv[1] : NULL),
-					    1, conf);
-	    if (ret == -2) {
-		fprintf(stderr,
-			"plink: option \"%s\" requires an argument\n", p);
-		errors = 1;
-	    } else if (ret == 2) {
-		--argc, ++argv;
-	    } else if (ret == 1) {
-		continue;
-	    } else if (!strcmp(p, "-batch")) {
-		console_batch_mode = 1;
-	    } else if (!strcmp(p, "-s")) {
-		/* Save status to write to conf later. */
-		use_subsystem = 1;
-	    } else if (!strcmp(p, "-V") || !strcmp(p, "--version")) {
-                version();
-	    } else if (!strcmp(p, "--help")) {
-                usage();
-            } else if (!strcmp(p, "-pgpfp")) {
-                pgp_fingerprints();
-                exit(1);
-	    } else if (!strcmp(p, "-shareexists")) {
-                just_test_share_exists = TRUE;
-	    } else {
-		fprintf(stderr, "plink: unknown option \"%s\"\n", p);
-		errors = 1;
-	    }
-	} else if (*p) {
-	    if (!conf_launchable(conf) || !(got_host || loaded_session)) {
-		char *q = p;
-		/*
-		 * If the hostname starts with "telnet:", set the
-		 * protocol to Telnet and process the string as a
-		 * Telnet URL.
-		 */
-		if (!strncmp(q, "telnet:", 7)) {
-		    char c;
-
-		    q += 7;
-		    if (q[0] == '/' && q[1] == '/')
-			q += 2;
-		    conf_set_int(conf, CONF_protocol, PROT_TELNET);
-		    p = q;
-                    p += host_strcspn(p, ":/");
-		    c = *p;
-		    if (*p)
-			*p++ = '\0';
-		    if (c == ':')
-			conf_set_int(conf, CONF_port, atoi(p));
-		    else
-			conf_set_int(conf, CONF_port, -1);
-		    conf_set_str(conf, CONF_host, q);
-		    got_host = TRUE;
-		} else {
-		    char *r, *user, *host;
-		    /*
-		     * Before we process the [user@]host string, we
-		     * first check for the presence of a protocol
-		     * prefix (a protocol name followed by ",").
-		     */
-		    r = strchr(p, ',');
-		    if (r) {
-			const Backend *b;
-			*r = '\0';
-			b = backend_from_name(p);
-			if (b) {
-			    default_protocol = b->protocol;
-			    conf_set_int(conf, CONF_protocol,
-					 default_protocol);
-			    portnumber = b->default_port;
-			}
-			p = r + 1;
-		    }
-
-		    /*
-		     * A nonzero length string followed by an @ is treated
-		     * as a username. (We discount an _initial_ @.) The
-		     * rest of the string (or the whole string if no @)
-		     * is treated as a session name and/or hostname.
-		     */
-		    r = strrchr(p, '@');
-		    if (r == p)
-			p++, r = NULL; /* discount initial @ */
-		    if (r) {
-			*r++ = '\0';
-			user = p, host = r;
-		    } else {
-			user = NULL, host = p;
-		    }
-
-		    /*
-		     * Now attempt to load a saved session with the
-		     * same name as the hostname.
-		     */
-		    {
-			Conf *conf2 = conf_new();
-			do_defaults(host, conf2);
-			if (loaded_session || !conf_launchable(conf2)) {
-			    /* No settings for this host; use defaults */
-			    /* (or session was already loaded with -load) */
-			    conf_set_str(conf, CONF_host, host);
-			    conf_set_int(conf, CONF_port, default_port);
-			    got_host = TRUE;
-			} else {
-			    conf_copy_into(conf, conf2);
-			    loaded_session = TRUE;
-			}
-			conf_free(conf2);
-		    }
-
-		    if (user) {
-			/* Patch in specified username. */
-			conf_set_str(conf, CONF_username, user);
-		    }
-
-		}
-	    } else {
-		char *command;
-		int cmdlen, cmdsize;
-		cmdlen = cmdsize = 0;
-		command = NULL;
-
-		while (argc) {
-		    while (*p) {
-			if (cmdlen >= cmdsize) {
-			    cmdsize = cmdlen + 512;
-			    command = sresize(command, cmdsize, char);
-			}
-			command[cmdlen++]=*p++;
-		    }
-		    if (cmdlen >= cmdsize) {
-			cmdsize = cmdlen + 512;
-			command = sresize(command, cmdsize, char);
-		    }
-		    command[cmdlen++]=' '; /* always add trailing space */
-		    if (--argc) p = *++argv;
-		}
-		if (cmdlen) command[--cmdlen]='\0';
-				       /* change trailing blank to NUL */
-		conf_set_str(conf, CONF_remote_cmd, command);
-		conf_set_str(conf, CONF_remote_cmd2, "");
-		conf_set_int(conf, CONF_nopty, TRUE);  /* command => no tty */
-
-		break;		       /* done with cmdline */
-	    }
-	}
+        int ret = cmdline_process_param(p, (argc > 1 ? argv[1] : NULL),
+                                        1, conf);
+        if (ret == -2) {
+            fprintf(stderr,
+                    "plink: option \"%s\" requires an argument\n", p);
+            errors = 1;
+        } else if (ret == 2) {
+            --argc, ++argv;
+        } else if (ret == 1) {
+            continue;
+        } else if (!strcmp(p, "-batch")) {
+            console_batch_mode = 1;
+        } else if (!strcmp(p, "-s")) {
+            /* Save status to write to conf later. */
+            use_subsystem = 1;
+        } else if (!strcmp(p, "-V") || !strcmp(p, "--version")) {
+            version();
+        } else if (!strcmp(p, "--help")) {
+            usage();
+        } else if (!strcmp(p, "-pgpfp")) {
+            pgp_fingerprints();
+            exit(1);
+        } else if (!strcmp(p, "-shareexists")) {
+            just_test_share_exists = TRUE;
+	} else if (*p != '-') {
+            char *command;
+            int cmdlen, cmdsize;
+            cmdlen = cmdsize = 0;
+            command = NULL;
+
+            while (argc) {
+                while (*p) {
+                    if (cmdlen >= cmdsize) {
+                        cmdsize = cmdlen + 512;
+                        command = sresize(command, cmdsize, char);
+                    }
+                    command[cmdlen++]=*p++;
+                }
+                if (cmdlen >= cmdsize) {
+                    cmdsize = cmdlen + 512;
+                    command = sresize(command, cmdsize, char);
+                }
+                command[cmdlen++]=' '; /* always add trailing space */
+                if (--argc) p = *++argv;
+            }
+            if (cmdlen) command[--cmdlen]='\0';
+            /* change trailing blank to NUL */
+            conf_set_str(conf, CONF_remote_cmd, command);
+            conf_set_str(conf, CONF_remote_cmd2, "");
+            conf_set_int(conf, CONF_nopty, TRUE);  /* command => no tty */
+
+            break;		       /* done with cmdline */
+        } else {
+            fprintf(stderr, "plink: unknown option \"%s\"\n", p);
+            errors = 1;
+        }
     }
 
     if (errors)
 	return 1;
 
-    if (!conf_launchable(conf) || !(got_host || loaded_session)) {
+    if (!cmdline_host_ok(conf)) {
 	usage();
     }
 
@@ -527,12 +440,6 @@ int main(int argc, char **argv)
 	return 1;
     }
 
-    /*
-     * Select port.
-     */
-    if (portnumber != -1)
-	conf_set_int(conf, CONF_port, portnumber);
-
     sk_init();
     if (p_WSAEventSelect == NULL) {
 	fprintf(stderr, "Plink requires WinSock 2\n");

From 2a2153f4ced735bb75c87776c6b062b9b68679b4 Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Fri, 8 Dec 2017 19:34:35 +0000
Subject: [PATCH 137/166] Fix assertion failure that prevents pterm starting
 up.

When testing the previous commit, I went to great lengths to check all
the tricky corner cases of the detailed command-line argument handling
in Plink and PuTTY, on Windows and Unix. And did I also double-check
that I had not completely broken the very simplest possible invocation
of pterm? I did not.

The call to cmdline_host_ok() in gtkmain.c was failing an assertion in
pterm, because that function only expects to have been called by a
program that has the TOOLTYPE_HOST_ARG flag set - if that flag isn't
set, the program is expected to come up with its own answer to the
question (because I wasn't sure what the right fallback answer would
be). And I forgot to conditionalise the call between PuTTY and pterm.
---
 unix/gtkmain.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/unix/gtkmain.c b/unix/gtkmain.c
index bd9a8e315..675816048 100644
--- a/unix/gtkmain.c
+++ b/unix/gtkmain.c
@@ -646,7 +646,10 @@ int main(int argc, char **argv)
 
 	cmdline_run_saved(conf);
 
-        need_config_box = !cmdline_host_ok(conf);
+        if (cmdline_tooltype & TOOLTYPE_HOST_ARG)
+            need_config_box = !cmdline_host_ok(conf);
+        else
+            need_config_box = FALSE;
     }
 
     if (need_config_box) {

From c05fdb7d617149ac1da82c9760ed9d601dfd324f Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Sun, 10 Dec 2017 09:19:15 +0000
Subject: [PATCH 138/166] A small pile of Windows compiler-warning fixes.

These include an unused variable left over from the command-line
refactoring; an explicit referencing of the module handle for
sspicli.dll which we really do deliberately load and then don't
(directly) use; a missing pointer-type cast in the Windows handle
socket code; and two 32/64 bit integer size mismatches in the types of
functions I was importing from system API DLLs.

The last of those are a bit worrying, and suggest to me that after
going to all that trouble to add type-checking of those runtime
imports in commit 49fb598b0, I might have only checked the resulting
compiler output in a 32-bit build and not a 64-bit one. Oops!
---
 mkfiles.pl         | 3 ++-
 windows/winctrls.c | 2 +-
 windows/wingss.c   | 2 +-
 windows/winhelp.c  | 2 +-
 windows/winhsock.c | 2 +-
 windows/winmisc.c  | 1 +
 windows/winnet.c   | 4 ++--
 windows/winplink.c | 1 -
 8 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/mkfiles.pl b/mkfiles.pl
index 6765f2a86..a0a78fee1 100755
--- a/mkfiles.pl
+++ b/mkfiles.pl
@@ -544,7 +544,8 @@ sub manpages {
     &splitline("CFLAGS = /nologo /W3 /O1 " .
                (join " ", map {"-I$dirpfx$_"} @srcdirs) .
                " /D_WINDOWS /D_WIN32_WINDOWS=0x500 /DWINVER=0x500 ".
-               "/D_CRT_SECURE_NO_WARNINGS")."\n".
+               "/D_CRT_SECURE_NO_WARNINGS /D_WINSOCK_DEPRECATED_NO_WARNINGS").
+               "\n".
     "LFLAGS = /incremental:no /dynamicbase /nxcompat\n".
     &splitline("RCFLAGS = ".(join " ", map {"-I$dirpfx$_"} @srcdirs).
                " -DWIN32 -D_WIN32 -DWINVER=0x0400")."\n".
diff --git a/windows/winctrls.c b/windows/winctrls.c
index 737018e45..da2fac62f 100644
--- a/windows/winctrls.c
+++ b/windows/winctrls.c
@@ -41,7 +41,7 @@
 DECL_WINDOWS_FUNCTION(static, void, InitCommonControls, (void));
 DECL_WINDOWS_FUNCTION(static, BOOL, MakeDragList, (HWND));
 DECL_WINDOWS_FUNCTION(static, int, LBItemFromPt, (HWND, POINT, BOOL));
-DECL_WINDOWS_FUNCTION(static, int, DrawInsert, (HWND, HWND, int));
+DECL_WINDOWS_FUNCTION(static, void, DrawInsert, (HWND, HWND, int));
 
 void init_common_controls(void)
 {
diff --git a/windows/wingss.c b/windows/wingss.c
index 54b1e477e..2661ff762 100644
--- a/windows/wingss.c
+++ b/windows/wingss.c
@@ -33,7 +33,7 @@ const struct keyvalwhere gsslibkeywords[] = {
 
 DECL_WINDOWS_FUNCTION(static, SECURITY_STATUS,
 		      AcquireCredentialsHandleA,
-		      (SEC_CHAR *, SEC_CHAR *, ULONG, PLUID,
+		      (SEC_CHAR *, SEC_CHAR *, ULONG, PVOID,
 		       PVOID, SEC_GET_KEY_FN, PVOID, PCredHandle, PTimeStamp));
 DECL_WINDOWS_FUNCTION(static, SECURITY_STATUS,
 		      InitializeSecurityContextA,
diff --git a/windows/winhelp.c b/windows/winhelp.c
index 47539e539..daf92ed9e 100644
--- a/windows/winhelp.c
+++ b/windows/winhelp.c
@@ -19,7 +19,7 @@ static int requested_help;
 static char *help_path;
 static int help_has_contents;
 #ifndef NO_HTMLHELP
-DECL_WINDOWS_FUNCTION(static, HWND, HtmlHelpA, (HWND, LPCSTR, UINT, DWORD));
+DECL_WINDOWS_FUNCTION(static, HWND, HtmlHelpA, (HWND, LPCSTR, UINT, DWORD_PTR));
 static char *chm_path;
 #endif /* NO_HTMLHELP */
 
diff --git a/windows/winhsock.c b/windows/winhsock.c
index 7c8b0ba64..4cd4744af 100644
--- a/windows/winhsock.c
+++ b/windows/winhsock.c
@@ -194,7 +194,7 @@ static void handle_socket_unfreeze(void *psv)
     bufchain_consume(&ps->inputdata, len);
     ps->defer_close = FALSE;
     if (ps->deferred_close) {
-        sk_handle_close(ps);
+        sk_handle_close((Socket)ps);
         return;
     }
 
diff --git a/windows/winmisc.c b/windows/winmisc.c
index 59d643122..fca8af01f 100644
--- a/windows/winmisc.c
+++ b/windows/winmisc.c
@@ -106,6 +106,7 @@ char *get_username(void)
 	       sspicli.dll WITHOUT proper path sanitizing, so better
 	       load it properly before */
 	    HMODULE sspicli = load_system32_dll("sspicli.dll");
+            (void)sspicli; /* squash compiler warning about unused variable */
 	    GET_WINDOWS_FUNCTION(secur32, GetUserNameExA);
 	    tried_usernameex = TRUE;
 	}
diff --git a/windows/winnet.c b/windows/winnet.c
index 12fce5f9a..dc52efe55 100644
--- a/windows/winnet.c
+++ b/windows/winnet.c
@@ -201,8 +201,8 @@ DECL_WINDOWS_FUNCTION(static, int, getaddrinfo,
 DECL_WINDOWS_FUNCTION(static, void, freeaddrinfo, (struct addrinfo *res));
 DECL_WINDOWS_FUNCTION(static, int, getnameinfo,
 		      (const struct sockaddr FAR * sa, socklen_t salen,
-		       char FAR * host, size_t hostlen, char FAR * serv,
-		       size_t servlen, int flags));
+		       char FAR * host, DWORD hostlen, char FAR * serv,
+		       DWORD servlen, int flags));
 DECL_WINDOWS_FUNCTION(static, char *, gai_strerror, (int ecode));
 DECL_WINDOWS_FUNCTION(static, int, WSAAddressToStringA,
 		      (LPSOCKADDR, DWORD, LPWSAPROTOCOL_INFO,
diff --git a/windows/winplink.c b/windows/winplink.c
index a6b518eca..35c67fed4 100644
--- a/windows/winplink.c
+++ b/windows/winplink.c
@@ -297,7 +297,6 @@ int main(int argc, char **argv)
     int skcount, sksize;
     int exitcode;
     int errors;
-    int got_host = FALSE;
     int use_subsystem = 0;
     int just_test_share_exists = FALSE;
     unsigned long now, next, then;

From f26654f618cbfd99ff4c72b843db2f5fda5daa51 Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Sat, 9 Dec 2017 08:41:03 +0000
Subject: [PATCH 139/166] Stop front ends remembering the data of their last
 paste.

Previously, both the Unix and Windows front ends would respond to a
paste action by retrieving data from the system clipboard, converting
it appropriately, _storing_ it in a persistent dynamic data block
inside the front end, and then calling term_do_paste(term), which in
turn would call back to the front end via get_clip() to retrieve the
current contents of that stored data block.

But, as far as I can tell, this was a completely pointless mechanism,
because after a data block was written into this storage area, it
would be immediately used for exactly one paste, and then never
accessed again until the next paste action caused it to be freed and
replaced with a new chunk of pasted data.

So why on earth was it stored persistently at all, and why that
callback mechanism from frontend to terminal back to frontend to
retrieve it for the actual paste action? I have no idea. This change
removes the entire system and replaces it with the completely obvious
alternative: the character-set-converted version of paste data is
allocated in a _local_ variable in the frontend paste functions,
passed directly to term_do_paste which now takes (buffer,length)
parameters, and freed immediately afterwards. get_clip() is gone.
---
 fuzzterm.c       |   1 -
 putty.h          |   3 +-
 terminal.c       | 102 +++++++++++++++++++++++------------------------
 unix/gtkwin.c    |  38 ++++++------------
 windows/window.c |  29 ++++----------
 5 files changed, 72 insertions(+), 101 deletions(-)

diff --git a/fuzzterm.c b/fuzzterm.c
index 707c4ae8a..3ce8b5840 100644
--- a/fuzzterm.c
+++ b/fuzzterm.c
@@ -83,7 +83,6 @@ void palette_set(void *frontend, int a, int b, int c, int d) { }
 void palette_reset(void *frontend) { }
 int palette_get(void *frontend, int n, int *r, int *g, int *b) {return FALSE;}
 void write_clip(void *frontend, wchar_t *a, int *b, truecolour *c, int d, int e) { }
-void get_clip(void *frontend, wchar_t **w, int *i) { }
 void set_raw_mouse_mode(void *frontend, int m) { }
 void request_paste(void *frontend) { }
 void do_beep(void *frontend, int a) { }
diff --git a/putty.h b/putty.h
index 97ef71302..964b4b234 100644
--- a/putty.h
+++ b/putty.h
@@ -637,7 +637,6 @@ void palette_reset(void *frontend);
 int palette_get(void *frontend, int n, int *r, int *g, int *b);
 void write_aclip(void *frontend, char *, int, int);
 void write_clip(void *frontend, wchar_t *, int *, truecolour *, int, int);
-void get_clip(void *frontend, wchar_t **, int *);
 void optimised_move(void *frontend, int, int, int);
 void set_raw_mouse_mode(void *frontend, int);
 void connection_fatal(void *frontend, const char *, ...);
@@ -1057,7 +1056,7 @@ void term_deselect(Terminal *);
 void term_update(Terminal *);
 void term_invalidate(Terminal *);
 void term_blink(Terminal *, int set_cursor);
-void term_do_paste(Terminal *);
+void term_do_paste(Terminal *, const wchar_t *, int);
 void term_nopaste(Terminal *);
 int term_ldisc(Terminal *, int option);
 void term_copyall(Terminal *);
diff --git a/terminal.c b/terminal.c
index 96a002667..f416e109e 100644
--- a/terminal.c
+++ b/terminal.c
@@ -6073,66 +6073,66 @@ static void term_paste_callback(void *vterm)
     term->paste_len = 0;
 }
 
-void term_do_paste(Terminal *term)
+void term_do_paste(Terminal *term, const wchar_t *data, int len)
 {
-    wchar_t *data;
-    int len;
-
-    get_clip(term->frontend, &data, &len);
-    if (data && len > 0) {
-        wchar_t *p, *q;
-
-	term_seen_key_event(term);     /* pasted data counts */
+    const wchar_t *p, *q;
 
-        if (term->paste_buffer)
-            sfree(term->paste_buffer);
-        term->paste_pos = term->paste_len = 0;
-        term->paste_buffer = snewn(len + 12, wchar_t);
-
-        if (term->bracketed_paste) {
-            memcpy(term->paste_buffer, L"\033[200~", 6 * sizeof(wchar_t));
-            term->paste_len += 6;
-        }
-
-        p = q = data;
-        while (p < data + len) {
-            while (p < data + len &&
-                   !(p <= data + len - sel_nl_sz &&
-                     !memcmp(p, sel_nl, sizeof(sel_nl))))
-                p++;
-
-            {
-                int i;
-                for (i = 0; i < p - q; i++) {
-                    term->paste_buffer[term->paste_len++] = q[i];
-                }
-            }
+    /*
+     * Pasting data into the terminal counts as a keyboard event (for
+     * purposes of the 'Reset scrollback on keypress' config option),
+     * unless the paste is zero-length.
+     */
+    if (len == 0)
+        return;
+    term_seen_key_event(term);
+
+    if (term->paste_buffer)
+        sfree(term->paste_buffer);
+    term->paste_pos = term->paste_len = 0;
+    term->paste_buffer = snewn(len + 12, wchar_t);
+
+    if (term->bracketed_paste) {
+        memcpy(term->paste_buffer, L"\033[200~", 6 * sizeof(wchar_t));
+        term->paste_len += 6;
+    }
 
-            if (p <= data + len - sel_nl_sz &&
-                !memcmp(p, sel_nl, sizeof(sel_nl))) {
-                term->paste_buffer[term->paste_len++] = '\015';
-                p += sel_nl_sz;
+    p = q = data;
+    while (p < data + len) {
+        while (p < data + len &&
+               !(p <= data + len - sel_nl_sz &&
+                 !memcmp(p, sel_nl, sizeof(sel_nl))))
+            p++;
+
+        {
+            int i;
+            for (i = 0; i < p - q; i++) {
+                term->paste_buffer[term->paste_len++] = q[i];
             }
-            q = p;
         }
 
-        if (term->bracketed_paste) {
-            memcpy(term->paste_buffer + term->paste_len,
-                   L"\033[201~", 6 * sizeof(wchar_t));
-            term->paste_len += 6;
+        if (p <= data + len - sel_nl_sz &&
+            !memcmp(p, sel_nl, sizeof(sel_nl))) {
+            term->paste_buffer[term->paste_len++] = '\015';
+            p += sel_nl_sz;
         }
+        q = p;
+    }
 
-        /* Assume a small paste will be OK in one go. */
-        if (term->paste_len < 256) {
-            if (term->ldisc)
-		luni_send(term->ldisc, term->paste_buffer, term->paste_len, 0);
-            if (term->paste_buffer)
-                sfree(term->paste_buffer);
-            term->paste_buffer = 0;
-            term->paste_pos = term->paste_len = 0;
-        }
+    if (term->bracketed_paste) {
+        memcpy(term->paste_buffer + term->paste_len,
+               L"\033[201~", 6 * sizeof(wchar_t));
+        term->paste_len += 6;
+    }
+
+    /* Assume a small paste will be OK in one go. */
+    if (term->paste_len < 256) {
+        if (term->ldisc)
+            luni_send(term->ldisc, term->paste_buffer, term->paste_len, 0);
+        if (term->paste_buffer)
+            sfree(term->paste_buffer);
+        term->paste_buffer = 0;
+        term->paste_pos = term->paste_len = 0;
     }
-    get_clip(term->frontend, NULL, NULL);
 
     queue_toplevel_callback(term_paste_callback, term);
 }
diff --git a/unix/gtkwin.c b/unix/gtkwin.c
index b8607665b..96421ac59 100644
--- a/unix/gtkwin.c
+++ b/unix/gtkwin.c
@@ -101,8 +101,6 @@ struct gui_data {
     GdkColormap *colmap;
 #endif
     int direct_to_font;
-    wchar_t *pastein_data;
-    int pastein_data_len;
 #ifdef JUST_USE_GTK_CLIPBOARD_UTF8
     GtkClipboard *clipboard;
     struct clipboard_data_instance *current_cdi;
@@ -2594,6 +2592,8 @@ static void clipboard_text_received(GtkClipboard *clipboard,
                                     const gchar *text, gpointer data)
 {
     struct gui_data *inst = (struct gui_data *)data;
+    wchar_t *paste;
+    int paste_len;
     int length;
 
     if (!text)
@@ -2601,14 +2601,12 @@ static void clipboard_text_received(GtkClipboard *clipboard,
 
     length = strlen(text);
 
-    if (inst->pastein_data)
-	sfree(inst->pastein_data);
+    paste = snewn(length, wchar_t);
+    paste_len = mb_to_wc(CS_UTF8, 0, text, length, paste, length);
 
-    inst->pastein_data = snewn(length, wchar_t);
-    inst->pastein_data_len = mb_to_wc(CS_UTF8, 0, text, length,
-                                      inst->pastein_data, length);
+    term_do_paste(inst->term, paste, paste_len);
 
-    term_do_paste(inst->term);
+    sfree(paste);
 }
 
 void request_paste(void *frontend)
@@ -2855,6 +2853,8 @@ static void selection_received(GtkWidget *widget, GtkSelectionData *seldata,
     GdkAtom seldata_type = gtk_selection_data_get_data_type(seldata);
     const guchar *seldata_data = gtk_selection_data_get_data(seldata);
     gint seldata_length = gtk_selection_data_get_length(seldata);
+    wchar_t *paste;
+    int paste_len;
 
     if (seldata_target == utf8_string_atom && seldata_length <= 0) {
 	/*
@@ -2942,16 +2942,12 @@ static void selection_received(GtkWidget *widget, GtkSelectionData *seldata,
 	}
     }
 
-    if (inst->pastein_data)
-	sfree(inst->pastein_data);
+    paste = snewn(length, wchar_t);
+    paste_len = mb_to_wc(charset, 0, text, length, paste, length);
 
-    inst->pastein_data = snewn(length, wchar_t);
-    inst->pastein_data_len = length;
-    inst->pastein_data_len =
-	mb_to_wc(charset, 0, text, length,
-		 inst->pastein_data, inst->pastein_data_len);
+    term_do_paste(inst->term, paste, paste_len);
 
-    term_do_paste(inst->term);
+    sfree(paste);
 
 #ifndef NOT_X_WINDOWS
     if (free_list_required)
@@ -3011,16 +3007,6 @@ void init_clipboard(struct gui_data *inst)
 
 #endif /* JUST_USE_GTK_CLIPBOARD_UTF8 */
 
-void get_clip(void *frontend, wchar_t ** p, int *len)
-{
-    struct gui_data *inst = (struct gui_data *)frontend;
-
-    if (p) {
-	*p = inst->pastein_data;
-	*len = inst->pastein_data_len;
-    }
-}
-
 static void set_window_titles(struct gui_data *inst)
 {
     /*
diff --git a/windows/window.c b/windows/window.c
index e5bd5b7f0..3a67fb870 100644
--- a/windows/window.c
+++ b/windows/window.c
@@ -105,7 +105,7 @@ static int is_full_screen(void);
 static void make_full_screen(void);
 static void clear_full_screen(void);
 static void flip_full_screen(void);
-static int process_clipdata(HGLOBAL clipdata, int unicode);
+static void process_clipdata(HGLOBAL clipdata, int unicode);
 
 /* Window layout information */
 static void reset_window(int);
@@ -135,9 +135,6 @@ static const struct telnet_special *specials = NULL;
 static HMENU specials_menu = NULL;
 static int n_specials = 0;
 
-static wchar_t *clipboard_contents;
-static size_t clipboard_length;
-
 #define TIMING_TIMER_ID 1234
 static long timing_next_time;
 
@@ -3176,8 +3173,7 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
 	}
 	return 0;
       case WM_GOT_CLIPDATA:
-	if (process_clipdata((HGLOBAL)lParam, wParam))
-	    term_do_paste(term);
+	process_clipdata((HGLOBAL)lParam, wParam);
 	return 0;
       default:
 	if (message == wm_mousewheel || message == WM_MOUSEWHEEL) {
@@ -5340,11 +5336,10 @@ static DWORD WINAPI clipboard_read_threadfunc(void *param)
     return 0;
 }
 
-static int process_clipdata(HGLOBAL clipdata, int unicode)
+static void process_clipdata(HGLOBAL clipdata, int unicode)
 {
-    sfree(clipboard_contents);
-    clipboard_contents = NULL;
-    clipboard_length = 0;
+    wchar_t *clipboard_contents = NULL;
+    size_t clipboard_length = 0;
 
     if (unicode) {
 	wchar_t *p = GlobalLock(clipdata);
@@ -5357,7 +5352,7 @@ static int process_clipdata(HGLOBAL clipdata, int unicode)
 	    clipboard_contents = snewn(clipboard_length + 1, wchar_t);
 	    memcpy(clipboard_contents, p, clipboard_length * sizeof(wchar_t));
 	    clipboard_contents[clipboard_length] = L'\0';
-	    return TRUE;
+	    term_do_paste(term, clipboard_contents, clipboard_length);
 	}
     } else {
 	char *s = GlobalLock(clipdata);
@@ -5370,11 +5365,11 @@ static int process_clipdata(HGLOBAL clipdata, int unicode)
 				clipboard_contents, i);
 	    clipboard_length = i - 1;
 	    clipboard_contents[clipboard_length] = L'\0';
-	    return TRUE;
+	    term_do_paste(term, clipboard_contents, clipboard_length);
 	}
     }
 
-    return FALSE;
+    sfree(clipboard_contents);
 }
 
 void request_paste(void *frontend)
@@ -5400,14 +5395,6 @@ void request_paste(void *frontend)
 		 hwnd, 0, &in_threadid);
 }
 
-void get_clip(void *frontend, wchar_t **p, int *len)
-{
-    if (p) {
-	*p = clipboard_contents;
-	*len = clipboard_length;
-    }
-}
-
 #if 0
 /*
  * Move `lines' lines from position `from' to position `to' in the

From 9bff5595a279f2882768323e482287286ec44998 Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Sat, 9 Dec 2017 11:57:34 +0000
Subject: [PATCH 140/166] Move declaration of write_aclip into winstuff.h.

It's actually a function specific to the Windows front end, and has
been all along - but I've only just noticed that no other front end
either uses it or defines it.
---
 putty.h            | 1 -
 windows/winstuff.h | 7 +++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/putty.h b/putty.h
index 964b4b234..d53eaca0d 100644
--- a/putty.h
+++ b/putty.h
@@ -635,7 +635,6 @@ void free_ctx(Context);
 void palette_set(void *frontend, int, int, int, int);
 void palette_reset(void *frontend);
 int palette_get(void *frontend, int n, int *r, int *g, int *b);
-void write_aclip(void *frontend, char *, int, int);
 void write_clip(void *frontend, wchar_t *, int *, truecolour *, int, int);
 void optimised_move(void *frontend, int, int, int);
 void set_raw_mouse_mode(void *frontend, int);
diff --git a/windows/winstuff.h b/windows/winstuff.h
index 546c273b7..0b535822e 100644
--- a/windows/winstuff.h
+++ b/windows/winstuff.h
@@ -242,6 +242,13 @@ void quit_help(HWND hwnd);
 GLOBAL Terminal *term;
 GLOBAL void *logctx;
 
+/*
+ * Windows-specific clipboard helper function shared with windlg.c,
+ * which takes the data string in the system code page instead of
+ * Unicode.
+ */
+void write_aclip(void *frontend, char *, int, int);
+
 #define WM_NETEVENT  (WM_APP + 5)
 
 /*

From 18297196391d1130a794654397552e8a4858b1cc Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Sat, 9 Dec 2017 12:00:13 +0000
Subject: [PATCH 141/166] Add a system of clipboard identifiers.

This lays some groundwork for making PuTTY's cut and paste handling
more flexible in the area of which clipboard(s) it reads and writes,
if more than one is available on the system.

I've introduced a system of list macros which define an enumeration of
integer clipboard ids, some defined centrally in putty.h (at present
just a CLIP_NULL which never has any text in it, because that seems
like the sort of thing that will come in useful for configuring a
given copy or paste UI action to be ignored) and some defined per
platform. All the front end functions that copy and paste take a
clipboard id, and the Terminal structure is now configured at startup
to tell it which clipboard id it should paste from on a mouse click,
and which it should copy from on a selection.

However, I haven't actually added _real_ support for multiple X11
clipboards, in that the Unix front end supports a single CLIP_SYSTEM
regardless of whether it's in OS X or GTK mode. So this is currently a
NFC refactoring which does nothing but prepare the way for real
changes to come.
---
 fuzzterm.c         |  5 +++--
 putty.h            | 29 +++++++++++++++++++++++++----
 terminal.c         | 32 +++++++++++++++++++++++++-------
 terminal.h         |  3 +++
 unix/gtkapp.c      |  2 +-
 unix/gtkwin.c      | 36 +++++++++++++++++++++++++-----------
 unix/unix.h        |  7 +++++++
 windows/windlg.c   |  2 +-
 windows/window.c   | 28 ++++++++++++++++++++--------
 windows/winstuff.h |  6 +++++-
 10 files changed, 115 insertions(+), 35 deletions(-)

diff --git a/fuzzterm.c b/fuzzterm.c
index 3ce8b5840..667d2eea5 100644
--- a/fuzzterm.c
+++ b/fuzzterm.c
@@ -82,9 +82,10 @@ void free_ctx(Context ctx) { }
 void palette_set(void *frontend, int a, int b, int c, int d) { }
 void palette_reset(void *frontend) { }
 int palette_get(void *frontend, int n, int *r, int *g, int *b) {return FALSE;}
-void write_clip(void *frontend, wchar_t *a, int *b, truecolour *c, int d, int e) { }
+void write_clip(void *frontend, int clipboard,
+                wchar_t *a, int *b, truecolour *c, int d, int e) { }
 void set_raw_mouse_mode(void *frontend, int m) { }
-void request_paste(void *frontend) { }
+void frontend_request_paste(void *frontend, int clipboard) { }
 void do_beep(void *frontend, int a) { }
 void sys_cursor(void *frontend, int x, int y) { }
 void modalfatalbox(const char *fmt, ...) { exit(0); }
diff --git a/putty.h b/putty.h
index d53eaca0d..eea7fe9cd 100644
--- a/putty.h
+++ b/putty.h
@@ -615,6 +615,25 @@ typedef struct truecolour {
         optionalrgb_equal((c1).fg, (c2).fg) &&  \
         optionalrgb_equal((c1).bg, (c2).bg))
 
+/*
+ * Enumeration of clipboards. CLIP_NULL is the only one provided
+ * systemwide: it's a non=clipboard, writes to which are ignored and
+ * reads from which return no data. Each platform front end extends
+ * this enumeration in its own way.
+ */
+#define CROSS_PLATFORM_CLIPBOARDS(X)            \
+    X(CLIP_NULL, "null clipboard")              \
+    /* end of list */
+
+#define ALL_CLIPBOARDS(X)                       \
+    CROSS_PLATFORM_CLIPBOARDS(X)                \
+    PLATFORM_CLIPBOARDS(X)                      \
+    /* end of list */
+
+#define CLIP_ID(id,name) id,
+enum { ALL_CLIPBOARDS(CLIP_ID) N_CLIPBOARDS };
+#undef CLIP_ID
+
 /*
  * Exports from the front end.
  */
@@ -635,7 +654,8 @@ void free_ctx(Context);
 void palette_set(void *frontend, int, int, int, int);
 void palette_reset(void *frontend);
 int palette_get(void *frontend, int n, int *r, int *g, int *b);
-void write_clip(void *frontend, wchar_t *, int *, truecolour *, int, int);
+void write_clip(void *frontend, int clipboard, wchar_t *, int *,
+                truecolour *, int, int);
 void optimised_move(void *frontend, int, int, int);
 void set_raw_mouse_mode(void *frontend, int);
 void connection_fatal(void *frontend, const char *, ...);
@@ -647,7 +667,7 @@ void modalfatalbox(const char *, ...);
 void do_beep(void *frontend, int);
 void begin_session(void *frontend);
 void sys_cursor(void *frontend, int x, int y);
-void request_paste(void *frontend);
+void frontend_request_paste(void *frontend, int clipboard);
 void frontend_keypress(void *frontend);
 void frontend_echoedit_update(void *frontend, int echo, int edit);
 /* It's the backend's responsibility to invoke this at the start of a
@@ -1051,15 +1071,16 @@ void term_mouse(Terminal *, Mouse_Button, Mouse_Button, Mouse_Action,
 		int,int,int,int,int);
 void term_key(Terminal *, Key_Sym, wchar_t *, size_t, unsigned int,
 	      unsigned int);
-void term_deselect(Terminal *);
+void term_lost_clipboard_ownership(Terminal *, int clipboard);
 void term_update(Terminal *);
 void term_invalidate(Terminal *);
 void term_blink(Terminal *, int set_cursor);
 void term_do_paste(Terminal *, const wchar_t *, int);
 void term_nopaste(Terminal *);
 int term_ldisc(Terminal *, int option);
-void term_copyall(Terminal *);
+void term_copyall(Terminal *, int clipboard);
 void term_reconfig(Terminal *, Conf *);
+void term_request_paste(Terminal *, int clipboard);
 void term_seen_key_event(Terminal *); 
 int term_data(Terminal *, int is_stderr, const char *data, int len);
 int term_data_untrusted(Terminal *, const char *data, int len);
diff --git a/terminal.c b/terminal.c
index f416e109e..dd3c8548c 100644
--- a/terminal.c
+++ b/terminal.c
@@ -1703,6 +1703,11 @@ Terminal *term_init(Conf *myconf, struct unicode_data *ucsdata,
     term->basic_erase_char.truecolour.bg = optionalrgb_none;
     term->erase_char = term->basic_erase_char;
 
+    /* frontends will typically overwrite these with clipboard ids they
+     * know about */
+    term->mouse_select_clipboard = CLIP_NULL;
+    term->mouse_paste_clipboard = CLIP_NULL;
+
     return term;
 }
 
@@ -5638,7 +5643,8 @@ static void clip_addchar(clip_workbuf *b, wchar_t chr, int attr, truecolour tc)
     b->bufpos++;
 }
 
-static void clipme(Terminal *term, pos top, pos bottom, int rect, int desel)
+static void clipme(Terminal *term, pos top, pos bottom, int rect, int desel,
+                   int clipboard)
 {
     clip_workbuf buf;
     int old_top_x;
@@ -5799,13 +5805,14 @@ static void clipme(Terminal *term, pos top, pos bottom, int rect, int desel)
     clip_addchar(&buf, 0, 0, term->basic_erase_char.truecolour);
 #endif
     /* Finally, transfer all that to the clipboard. */
-    write_clip(term->frontend, buf.textbuf, buf.attrbuf, buf.tcbuf, buf.bufpos, desel);
+    write_clip(term->frontend, clipboard,
+               buf.textbuf, buf.attrbuf, buf.tcbuf, buf.bufpos, desel);
     sfree(buf.textbuf);
     sfree(buf.attrbuf);
     sfree(buf.tcbuf);
 }
 
-void term_copyall(Terminal *term)
+void term_copyall(Terminal *term, int clipboard)
 {
     pos top;
     pos bottom;
@@ -5814,7 +5821,14 @@ void term_copyall(Terminal *term)
     top.x = 0;
     bottom.y = find_last_nonempty_line(term, screen);
     bottom.x = term->cols;
-    clipme(term, top, bottom, 0, TRUE);
+    clipme(term, top, bottom, 0, TRUE, clipboard);
+}
+
+void term_request_paste(Terminal *term, int clipboard)
+{
+    if (clipboard == CLIP_NULL)
+        return;
+    frontend_request_paste(term->frontend, clipboard);
 }
 
 /*
@@ -6397,7 +6411,8 @@ void term_mouse(Terminal *term, Mouse_Button braw, Mouse_Button bcooked,
 	     * data to the clipboard.
 	     */
 	    clipme(term, term->selstart, term->selend,
-		   (term->seltype == RECTANGULAR), FALSE);
+		   (term->seltype == RECTANGULAR), FALSE,
+                   term->mouse_select_clipboard);
 	    term->selstate = SELECTED;
 	} else
 	    term->selstate = NO_SELECTION;
@@ -6407,7 +6422,7 @@ void term_mouse(Terminal *term, Mouse_Button braw, Mouse_Button bcooked,
 		   || a == MA_2CLK || a == MA_3CLK
 #endif
 		   )) {
-	request_paste(term->frontend);
+	term_request_paste(term, term->mouse_paste_clipboard);
     }
 
     /*
@@ -6471,8 +6486,11 @@ static void deselect(Terminal *term)
     term->selstart.x = term->selstart.y = term->selend.x = term->selend.y = 0;
 }
 
-void term_deselect(Terminal *term)
+void term_lost_clipboard_ownership(Terminal *term, int clipboard)
 {
+    if (clipboard != term->mouse_select_clipboard)
+        return;
+
     deselect(term);
     term_update(term);
 
diff --git a/terminal.h b/terminal.h
index 03659744b..8cb56f6fc 100644
--- a/terminal.h
+++ b/terminal.h
@@ -327,6 +327,9 @@ struct terminal_tag {
     int scroll_on_key;
     int xterm_256_colour;
     int true_colour;
+
+    int mouse_select_clipboard;
+    int mouse_paste_clipboard;
 };
 
 #define in_utf(term) ((term)->utf || (term)->ucsdata->line_codepage==CP_UTF8)
diff --git a/unix/gtkapp.c b/unix/gtkapp.c
index d1861b1e4..57358dcb6 100644
--- a/unix/gtkapp.c
+++ b/unix/gtkapp.c
@@ -147,7 +147,7 @@ static void paste_cb(GSimpleAction *action,
                      GVariant      *parameter,
                      gpointer       user_data)
 {
-    request_paste(user_data);
+    paste_menu_action(user_data);
 }
 
 static const GActionEntry win_actions[] = {
diff --git a/unix/gtkwin.c b/unix/gtkwin.c
index 96421ac59..99144557f 100644
--- a/unix/gtkwin.c
+++ b/unix/gtkwin.c
@@ -1022,7 +1022,7 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data)
 #ifdef KEY_EVENT_DIAGNOSTICS
             debug((" - Shift-Insert paste\n"));
 #endif
-	    request_paste(inst);
+	    term_request_paste(inst->term, CLIP_SYSTEM);
 	    return TRUE;
 	}
 
@@ -2532,15 +2532,16 @@ static void clipboard_clear(GtkClipboard *clipboard, gpointer data)
     struct gui_data *inst = cdi->inst;
 
     if (inst->current_cdi == cdi) {
-        term_deselect(inst->term);
+        term_lost_clipboard_ownership(inst->term, CLIP_SYSTEM);
         inst->current_cdi = NULL;
     }
     sfree(cdi->pasteout_data_utf8);
     sfree(cdi);
 }
 
-void write_clip(void *frontend, wchar_t *data, int *attr, truecolour *truecolour,
-                int len, int must_deselect)
+void write_clip(void *frontend, int clipboard,
+                char_t *data, int *attr, truecolour *truecolour, int len,
+                int must_deselect)
 {
     struct gui_data *inst = (struct gui_data *)frontend;
     struct clipboard_data_instance *cdi;
@@ -2609,9 +2610,10 @@ static void clipboard_text_received(GtkClipboard *clipboard,
     sfree(paste);
 }
 
-void request_paste(void *frontend)
+void frontend_request_paste(void *frontend, int clipboard)
 {
     struct gui_data *inst = (struct gui_data *)frontend;
+    assert(clipboard == CLIP_SYSTEM);
     gtk_clipboard_request_text(inst->clipboard, clipboard_text_received, inst);
 }
 
@@ -2667,8 +2669,9 @@ static char *retrieve_cutbuffer(int *nbytes)
 #endif
 }
 
-void write_clip(void *frontend, wchar_t *data, int *attr, truecolour *truecolour,
-                int len, int must_deselect)
+void write_clip(void *frontend, int clipboard,
+                wchar_t *data, int *attr, truecolour *truecolour, int len,
+                int must_deselect)
 {
     struct gui_data *inst = (struct gui_data *)frontend;
     if (inst->pasteout_data)
@@ -2763,7 +2766,7 @@ void write_clip(void *frontend, wchar_t *data, int *attr, truecolour *truecolour
     }
 
     if (must_deselect)
-	term_deselect(inst->term);
+	term_lost_clipboard_ownership(inst->term, clipboard);
 }
 
 static void selection_get(GtkWidget *widget, GtkSelectionData *seldata,
@@ -2790,7 +2793,7 @@ static gint selection_clear(GtkWidget *widget, GdkEventSelection *seldata,
 {
     struct gui_data *inst = (struct gui_data *)data;
 
-    term_deselect(inst->term);
+    term_lost_clipboard_ownership(inst->term, CLIP_SYSTEM);
     if (inst->pasteout_data)
 	sfree(inst->pasteout_data);
     if (inst->pasteout_data_ctext)
@@ -2806,9 +2809,12 @@ static gint selection_clear(GtkWidget *widget, GdkEventSelection *seldata,
     return TRUE;
 }
 
-void request_paste(void *frontend)
+void frontend_request_paste(void *frontend, int clipboard)
 {
     struct gui_data *inst = (struct gui_data *)frontend;
+
+    assert(clipboard == CLIP_SYSTEM);
+
     /*
      * In Unix, pasting is asynchronous: all we can do at the
      * moment is to call gtk_selection_convert(), and when the data
@@ -3007,6 +3013,12 @@ void init_clipboard(struct gui_data *inst)
 
 #endif /* JUST_USE_GTK_CLIPBOARD_UTF8 */
 
+void paste_menu_action(void *frontend)
+{
+    struct gui_data *inst = (struct gui_data *)frontend;
+    term_request_paste(inst->term, CLIP_SYSTEM);
+}
+
 static void set_window_titles(struct gui_data *inst)
 {
     /*
@@ -4048,7 +4060,7 @@ void reset_terminal_menuitem(GtkMenuItem *item, gpointer data)
 void copy_all_menuitem(GtkMenuItem *item, gpointer data)
 {
     struct gui_data *inst = (struct gui_data *)data;
-    term_copyall(inst->term);
+    term_copyall(inst->term, CLIP_SYSTEM);
 }
 
 void special_menuitem(GtkMenuItem *item, gpointer data)
@@ -4922,6 +4934,8 @@ void new_session_window(Conf *conf, const char *geometry_string)
     inst->eventlogstuff = eventlogstuff_new();
 
     inst->term = term_init(inst->conf, &inst->ucsdata, inst);
+    inst->term->mouse_select_clipboard = CLIP_SYSTEM;
+    inst->term->mouse_paste_clipboard = CLIP_SYSTEM;
     inst->logctx = log_init(inst, inst->conf);
     term_provide_logctx(inst->term, inst->logctx);
 
diff --git a/unix/unix.h b/unix/unix.h
index bedb28d07..6c9d11c76 100644
--- a/unix/unix.h
+++ b/unix/unix.h
@@ -119,6 +119,10 @@ unsigned long getticks(void);
  */
 #define FLAG_STDERR_TTY 0x1000
 
+#define PLATFORM_CLIPBOARDS(X)                      \
+    X(CLIP_SYSTEM, "system clipboard")              \
+    /* end of list */
+
 /* The per-session frontend structure managed by gtkwin.c */
 struct gui_data;
 
@@ -143,6 +147,9 @@ GtkWidget *make_gtk_toplevel_window(void *frontend);
 /* Defined in gtkcomm.c */
 void gtkcomm_setup(void);
 
+/* Defined in gtkwin.c */
+void paste_menu_action(void *frontend);
+
 /* Things pty.c needs from pterm.c */
 const char *get_x_display(void *frontend);
 int font_dimension(void *frontend, int which);/* 0 for width, 1 for height */
diff --git a/windows/windlg.c b/windows/windlg.c
index 8bd02d855..39d2adddd 100644
--- a/windows/windlg.c
+++ b/windows/windlg.c
@@ -140,7 +140,7 @@ static INT_PTR CALLBACK LogProc(HWND hwnd, UINT msg,
 			    memcpy(p, sel_nl, sizeof(sel_nl));
 			    p += sizeof(sel_nl);
 			}
-			write_aclip(NULL, clipdata, size, TRUE);
+			write_aclip(NULL, CLIP_SYSTEM, clipdata, size, TRUE);
 			sfree(clipdata);
 		    }
 		    sfree(selitems);
diff --git a/windows/window.c b/windows/window.c
index 3a67fb870..b84527571 100644
--- a/windows/window.c
+++ b/windows/window.c
@@ -637,6 +637,8 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
      * timer_change_notify() which will expect hwnd to exist.)
      */
     term = term_init(conf, &ucsdata, NULL);
+    term->mouse_select_clipboard = CLIP_SYSTEM;
+    term->mouse_paste_clipboard = CLIP_SYSTEM;
     logctx = log_init(NULL, conf);
     term_provide_logctx(term, logctx);
     term_size(term, conf_get_int(conf, CONF_height),
@@ -2328,10 +2330,10 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
 	    }
 	    break;
 	  case IDM_COPYALL:
-	    term_copyall(term);
+	    term_copyall(term, CLIP_SYSTEM);
 	    break;
 	  case IDM_PASTE:
-	    request_paste(NULL);
+	    term_request_paste(term, CLIP_SYSTEM);
 	    break;
 	  case IDM_CLRSB:
 	    term_clrsb(term);
@@ -2563,7 +2565,7 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
 	break;
       case WM_DESTROYCLIPBOARD:
 	if (!ignore_clip)
-	    term_deselect(term);
+	    term_lost_clipboard_ownership(term, CLIP_SYSTEM);
 	ignore_clip = FALSE;
 	return 0;
       case WM_PAINT:
@@ -4146,7 +4148,7 @@ static int TranslateKey(UINT message, WPARAM wParam, LPARAM lParam,
 	    return 0;
 	}
 	if (wParam == VK_INSERT && shift_state == 1) {
-	    request_paste(NULL);
+	    term_request_paste(term, CLIP_SYSTEM);
 	    return 0;
 	}
 	if (left_alt && wParam == VK_F4 && conf_get_int(conf, CONF_alt_f4)) {
@@ -4861,11 +4863,15 @@ void palette_reset(void *frontend)
     }
 }
 
-void write_aclip(void *frontend, char *data, int len, int must_deselect)
+void write_aclip(void *frontend, int clipboard,
+                 char *data, int len, int must_deselect)
 {
     HGLOBAL clipdata;
     void *lock;
 
+    if (clipboard != CLIP_SYSTEM)
+        return;
+
     clipdata = GlobalAlloc(GMEM_DDESHARE | GMEM_MOVEABLE, len + 1);
     if (!clipdata)
 	return;
@@ -4905,13 +4911,17 @@ int cmpCOLORREF(void *va, void *vb)
 /*
  * Note: unlike write_aclip() this will not append a nul.
  */
-void write_clip(void *frontend, wchar_t *data, int *attr, truecolour *truecolour,
-                int len, int must_deselect)
+void write_clip(void *frontend, int clipboard,
+                wchar_t *data, int *attr, truecolour *truecolour, int len,
+                int must_deselect)
 {
     HGLOBAL clipdata, clipdata2, clipdata3;
     int len2;
     void *lock, *lock2, *lock3;
 
+    if (clipboard != CLIP_SYSTEM)
+        return;
+
     len2 = WideCharToMultiByte(CP_ACP, 0, data, len, 0, 0, NULL, NULL);
 
     clipdata = GlobalAlloc(GMEM_DDESHARE | GMEM_MOVEABLE,
@@ -5372,8 +5382,10 @@ static void process_clipdata(HGLOBAL clipdata, int unicode)
     sfree(clipboard_contents);
 }
 
-void request_paste(void *frontend)
+void frontend_request_paste(void *frontend, int clipboard)
 {
+    assert(clipboard == CLIP_SYSTEM);
+
     /*
      * I always thought pasting was synchronous in Windows; the
      * clipboard access functions certainly _look_ synchronous,
diff --git a/windows/winstuff.h b/windows/winstuff.h
index 0b535822e..39ff94265 100644
--- a/windows/winstuff.h
+++ b/windows/winstuff.h
@@ -55,6 +55,10 @@ struct FontSpec *fontspec_new(const char *name,
 #define PLATFORM_IS_UTF16 /* enable UTF-16 processing when exchanging
 			   * wchar_t strings with environment */
 
+#define PLATFORM_CLIPBOARDS(X)                      \
+    X(CLIP_SYSTEM, "system clipboard")              \
+    /* end of list */
+
 /*
  * Where we can, we use GetWindowLongPtr and friends because they're
  * more useful on 64-bit platforms, but they're a relatively recent
@@ -247,7 +251,7 @@ GLOBAL void *logctx;
  * which takes the data string in the system code page instead of
  * Unicode.
  */
-void write_aclip(void *frontend, char *, int, int);
+void write_aclip(void *frontend, int clipboard, char *, int, int);
 
 #define WM_NETEVENT  (WM_APP + 5)
 

From 41aa675a5b7ca1d5055e444ae7146fcc13b140c4 Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Sun, 10 Dec 2017 10:23:39 +0000
Subject: [PATCH 142/166] Make gtkwin.c able to support multiple selections.

All the data fields referring to the selection in 'struct gui_data'
have been pulled out into a separate structure of which there are now
multiple instances, and I've plumbed through what should be the right
pointers and integer ids to everywhere they should go. So now the GTK
front end defines CLIP_PRIMARY and CLIP_CLIPBOARD in place of the
temporary cop-out CLIP_SYSTEM from the previous commit, and copying
and pasting can be done via either one.

The defaults should be the same as before, except that now the non-Mac
versions of the GtkApplication front ends will access CLIP_PRIMARY in
response to most actions but the 'Paste' menu item will paste from
CLIP_CLIPBOARD. (That's mostly just as a demonstration that accessing
multiple clipboards even works.)
---
 unix/gtkwin.c | 278 +++++++++++++++++++++++++++++++-------------------
 unix/unix.h   |  18 +++-
 2 files changed, 189 insertions(+), 107 deletions(-)

diff --git a/unix/gtkwin.c b/unix/gtkwin.c
index 99144557f..01bf6f29d 100644
--- a/unix/gtkwin.c
+++ b/unix/gtkwin.c
@@ -54,6 +54,19 @@ GdkAtom compound_text_atom, utf8_string_atom;
 
 struct clipboard_data_instance;
 
+struct clipboard_state {
+    struct gui_data *inst;
+    int clipboard;
+    GdkAtom atom;
+#ifdef JUST_USE_GTK_CLIPBOARD_UTF8
+    GtkClipboard *gtkclipboard;
+    struct clipboard_data_instance *current_cdi;
+#else
+    char *pasteout_data, *pasteout_data_ctext, *pasteout_data_utf8;
+    int pasteout_data_len, pasteout_data_ctext_len, pasteout_data_utf8_len;
+#endif
+};
+
 struct gui_data {
     GtkWidget *window, *area, *sbar;
     gboolean sbar_visible;
@@ -101,13 +114,7 @@ struct gui_data {
     GdkColormap *colmap;
 #endif
     int direct_to_font;
-#ifdef JUST_USE_GTK_CLIPBOARD_UTF8
-    GtkClipboard *clipboard;
-    struct clipboard_data_instance *current_cdi;
-#else
-    char *pasteout_data, *pasteout_data_ctext, *pasteout_data_utf8;
-    int pasteout_data_len, pasteout_data_ctext_len, pasteout_data_utf8_len;
-#endif
+    struct clipboard_state clipstates[N_CLIPBOARDS];
     int font_width, font_height;
     int width, height;
     int ignore_sbar;
@@ -1022,7 +1029,7 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data)
 #ifdef KEY_EVENT_DIAGNOSTICS
             debug((" - Shift-Insert paste\n"));
 #endif
-	    term_request_paste(inst->term, CLIP_SYSTEM);
+	    term_request_paste(inst->term, SHIFT_INS_CLIPBOARD);
 	    return TRUE;
 	}
 
@@ -2490,10 +2497,26 @@ void palette_reset(void *frontend)
  * formats it feels like.
  */
 
-void init_clipboard(struct gui_data *inst)
+static void init_one_clipboard(struct gui_data *inst, int clipboard,
+                               GdkAtom atom)
+{
+    struct clipboard_state *state = &inst->clipstates[clipboard];
+
+    state->inst = inst;
+    state->atom = atom;
+    state->clipboard = clipboard;
+
+    state->gtkclipboard = gtk_clipboard_get_for_display(
+        gdk_display_get_default(), atom);
+
+    g_object_set_data(G_OBJECT(state->gtkclipboard), "user-data", state);
+}
+
+int init_clipboard(struct gui_data *inst)
 {
-    inst->clipboard = gtk_clipboard_get_for_display(gdk_display_get_default(),
-                                                    DEFAULT_CLIPBOARD);
+    init_one_clipboard(inst, CLIP_PRIMARY, GDK_SELECTION_PRIMARY);
+    init_one_clipboard(inst, CLIP_CLIPBOARD, GDK_SELECTION_CLIPBOARD);
+    return TRUE;
 }
 
 /*
@@ -2506,7 +2529,6 @@ void init_clipboard(struct gui_data *inst)
  * to 'inst', to one of these.
  */
 struct clipboard_data_instance {
-    struct gui_data *inst;
     char *pasteout_data_utf8;
     int pasteout_data_utf8_len;
 };
@@ -2517,9 +2539,10 @@ static void clipboard_provide_data(GtkClipboard *clipboard,
 {
     struct clipboard_data_instance *cdi =
         (struct clipboard_data_instance *)data;
-    struct gui_data *inst = cdi->inst;
+    struct clipboard_state *state = (struct clipboard_state *)
+        g_object_get_data(G_OBJECT(clipboard), "user-data");
 
-    if (inst->current_cdi == cdi) {
+    if (state->current_cdi == cdi) {
         gtk_selection_data_set_text(selection_data, cdi->pasteout_data_utf8,
                                     cdi->pasteout_data_utf8_len);
     }
@@ -2529,21 +2552,23 @@ static void clipboard_clear(GtkClipboard *clipboard, gpointer data)
 {
     struct clipboard_data_instance *cdi =
         (struct clipboard_data_instance *)data;
-    struct gui_data *inst = cdi->inst;
+    struct clipboard_state *state = (struct clipboard_state *)
+        g_object_get_data(G_OBJECT(clipboard), "user-data");
 
-    if (inst->current_cdi == cdi) {
-        term_lost_clipboard_ownership(inst->term, CLIP_SYSTEM);
-        inst->current_cdi = NULL;
+    if (state->current_cdi == cdi) {
+        term_lost_clipboard_ownership(state->inst->term, state->clipboard);
+        state->current_cdi = NULL;
     }
     sfree(cdi->pasteout_data_utf8);
     sfree(cdi);
 }
 
 void write_clip(void *frontend, int clipboard,
-                char_t *data, int *attr, truecolour *truecolour, int len,
+                wchar_t *data, int *attr, truecolour *truecolour, int len,
                 int must_deselect)
 {
     struct gui_data *inst = (struct gui_data *)frontend;
+    struct clipboard_state *state = &inst->clipstates[clipboard];
     struct clipboard_data_instance *cdi;
 
     if (inst->direct_to_font) {
@@ -2556,8 +2581,7 @@ void write_clip(void *frontend, int clipboard,
     }
 
     cdi = snew(struct clipboard_data_instance);
-    cdi->inst = inst;
-    inst->current_cdi = cdi;
+    state->current_cdi = cdi;
     cdi->pasteout_data_utf8 = snewn(len*6, char);
     {
         const wchar_t *tmp = data;
@@ -2581,9 +2605,9 @@ void write_clip(void *frontend, int clipboard,
         targetlist = gtk_target_list_new(NULL, 0);
         gtk_target_list_add_text_targets(targetlist, 0);
         targettable = gtk_target_table_new_from_list(targetlist, &n_targets);
-        gtk_clipboard_set_with_data(inst->clipboard, targettable, n_targets,
-                                    clipboard_provide_data, clipboard_clear,
-                                    cdi);
+        gtk_clipboard_set_with_data(state->gtkclipboard, targettable,
+                                    n_targets, clipboard_provide_data,
+                                    clipboard_clear, cdi);
         gtk_target_table_free(targettable, n_targets);
         gtk_target_list_unref(targetlist);
     }
@@ -2613,8 +2637,9 @@ static void clipboard_text_received(GtkClipboard *clipboard,
 void frontend_request_paste(void *frontend, int clipboard)
 {
     struct gui_data *inst = (struct gui_data *)frontend;
-    assert(clipboard == CLIP_SYSTEM);
-    gtk_clipboard_request_text(inst->clipboard, clipboard_text_received, inst);
+    struct clipboard_state *state = &inst->clipstates[clipboard];
+    gtk_clipboard_request_text(state->gtkclipboard,
+                               clipboard_text_received, inst);
 }
 
 #else /* JUST_USE_GTK_CLIPBOARD_UTF8 */
@@ -2674,12 +2699,14 @@ void write_clip(void *frontend, int clipboard,
                 int must_deselect)
 {
     struct gui_data *inst = (struct gui_data *)frontend;
-    if (inst->pasteout_data)
-	sfree(inst->pasteout_data);
-    if (inst->pasteout_data_ctext)
-	sfree(inst->pasteout_data_ctext);
-    if (inst->pasteout_data_utf8)
-	sfree(inst->pasteout_data_utf8);
+    struct clipboard_state *state = &inst->clipstates[clipboard];
+
+    if (state->pasteout_data)
+	sfree(state->pasteout_data);
+    if (state->pasteout_data_ctext)
+	sfree(state->pasteout_data_ctext);
+    if (state->pasteout_data_utf8)
+	sfree(state->pasteout_data_utf8);
 
     /*
      * Set up UTF-8 and compound text paste data. This only happens
@@ -2694,74 +2721,76 @@ void write_clip(void *frontend, int clipboard,
         Display *disp = GDK_DISPLAY_XDISPLAY(gdk_display_get_default());
 #endif
 
-	inst->pasteout_data_utf8 = snewn(len*6, char);
-	inst->pasteout_data_utf8_len = len*6;
-	inst->pasteout_data_utf8_len =
-	    charset_from_unicode(&tmp, &tmplen, inst->pasteout_data_utf8,
-				 inst->pasteout_data_utf8_len,
+	state->pasteout_data_utf8 = snewn(len*6, char);
+	state->pasteout_data_utf8_len = len*6;
+	state->pasteout_data_utf8_len =
+	    charset_from_unicode(&tmp, &tmplen, state->pasteout_data_utf8,
+				 state->pasteout_data_utf8_len,
 				 CS_UTF8, NULL, NULL, 0);
-	if (inst->pasteout_data_utf8_len == 0) {
-	    sfree(inst->pasteout_data_utf8);
-	    inst->pasteout_data_utf8 = NULL;
+	if (state->pasteout_data_utf8_len == 0) {
+	    sfree(state->pasteout_data_utf8);
+	    state->pasteout_data_utf8 = NULL;
 	} else {
-	    inst->pasteout_data_utf8 =
-		sresize(inst->pasteout_data_utf8,
-			inst->pasteout_data_utf8_len + 1, char);
-	    inst->pasteout_data_utf8[inst->pasteout_data_utf8_len] = '\0';
+	    state->pasteout_data_utf8 =
+		sresize(state->pasteout_data_utf8,
+			state->pasteout_data_utf8_len + 1, char);
+	    state->pasteout_data_utf8[state->pasteout_data_utf8_len] = '\0';
 	}
 
 	/*
 	 * Now let Xlib convert our UTF-8 data into compound text.
 	 */
 #ifndef NOT_X_WINDOWS
-	list[0] = inst->pasteout_data_utf8;
+	list[0] = state->pasteout_data_utf8;
 	if (Xutf8TextListToTextProperty(disp, list, 1,
 					XCompoundTextStyle, &tp) == 0) {
-	    inst->pasteout_data_ctext = snewn(tp.nitems+1, char);
-	    memcpy(inst->pasteout_data_ctext, tp.value, tp.nitems);
-	    inst->pasteout_data_ctext_len = tp.nitems;
+	    state->pasteout_data_ctext = snewn(tp.nitems+1, char);
+	    memcpy(state->pasteout_data_ctext, tp.value, tp.nitems);
+	    state->pasteout_data_ctext_len = tp.nitems;
 	    XFree(tp.value);
 	} else
 #endif
         {
-            inst->pasteout_data_ctext = NULL;
-            inst->pasteout_data_ctext_len = 0;
+            state->pasteout_data_ctext = NULL;
+            state->pasteout_data_ctext_len = 0;
         }
     } else {
-	inst->pasteout_data_utf8 = NULL;
-	inst->pasteout_data_utf8_len = 0;
-	inst->pasteout_data_ctext = NULL;
-	inst->pasteout_data_ctext_len = 0;
+	state->pasteout_data_utf8 = NULL;
+	state->pasteout_data_utf8_len = 0;
+	state->pasteout_data_ctext = NULL;
+	state->pasteout_data_ctext_len = 0;
     }
 
-    inst->pasteout_data = snewn(len*6, char);
-    inst->pasteout_data_len = len*6;
-    inst->pasteout_data_len = wc_to_mb(inst->ucsdata.line_codepage, 0,
-				       data, len, inst->pasteout_data,
-				       inst->pasteout_data_len,
+    state->pasteout_data = snewn(len*6, char);
+    state->pasteout_data_len = len*6;
+    state->pasteout_data_len = wc_to_mb(inst->ucsdata.line_codepage, 0,
+				       data, len, state->pasteout_data,
+				       state->pasteout_data_len,
 				       NULL, NULL, NULL);
-    if (inst->pasteout_data_len == 0) {
-	sfree(inst->pasteout_data);
-	inst->pasteout_data = NULL;
+    if (state->pasteout_data_len == 0) {
+	sfree(state->pasteout_data);
+	state->pasteout_data = NULL;
     } else {
-	inst->pasteout_data =
-	    sresize(inst->pasteout_data, inst->pasteout_data_len, char);
+	state->pasteout_data =
+	    sresize(state->pasteout_data, state->pasteout_data_len, char);
     }
 
-    store_cutbuffer(inst->pasteout_data, inst->pasteout_data_len);
+    /* The legacy X cut buffers go with PRIMARY, not any other clipboard */
+    if (state->atom == GDK_SELECTION_PRIMARY)
+        store_cutbuffer(state->pasteout_data, state->pasteout_data_len);
 
-    if (gtk_selection_owner_set(inst->area, GDK_SELECTION_PRIMARY,
+    if (gtk_selection_owner_set(inst->area, state->atom,
 				inst->input_event_time)) {
 #if GTK_CHECK_VERSION(2,0,0)
-	gtk_selection_clear_targets(inst->area, GDK_SELECTION_PRIMARY);
+	gtk_selection_clear_targets(inst->area, state->atom);
 #endif
-	gtk_selection_add_target(inst->area, GDK_SELECTION_PRIMARY,
+	gtk_selection_add_target(inst->area, state->atom,
 				 GDK_SELECTION_TYPE_STRING, 1);
-	if (inst->pasteout_data_ctext)
-	    gtk_selection_add_target(inst->area, GDK_SELECTION_PRIMARY,
+	if (state->pasteout_data_ctext)
+	    gtk_selection_add_target(inst->area, state->atom,
 				     compound_text_atom, 1);
-	if (inst->pasteout_data_utf8)
-	    gtk_selection_add_target(inst->area, GDK_SELECTION_PRIMARY,
+	if (state->pasteout_data_utf8)
+	    gtk_selection_add_target(inst->area, state->atom,
 				     utf8_string_atom, 1);
     }
 
@@ -2769,51 +2798,75 @@ void write_clip(void *frontend, int clipboard,
 	term_lost_clipboard_ownership(inst->term, clipboard);
 }
 
+static struct clipboard_state *clipboard_from_atom(
+    struct gui_data *inst, GdkAtom atom)
+{
+    int i;
+
+    for (i = 0; i < N_CLIPBOARDS; i++) {
+        struct clipboard_state *state = &inst->clipstates[i];
+        if (state->inst == inst && state->atom == atom)
+            return state;
+    }
+
+    return NULL;
+}
+
 static void selection_get(GtkWidget *widget, GtkSelectionData *seldata,
                           guint info, guint time_stamp, gpointer data)
 {
     struct gui_data *inst = (struct gui_data *)data;
     GdkAtom target = gtk_selection_data_get_target(seldata);
+    struct clipboard_state *state = clipboard_from_atom(
+        inst, gtk_selection_data_get_selection(seldata));
+
+    if (!state)
+        return;
+
     if (target == utf8_string_atom)
 	gtk_selection_data_set(seldata, target, 8,
-                               (unsigned char *)inst->pasteout_data_utf8,
-			       inst->pasteout_data_utf8_len);
+                               (unsigned char *)state->pasteout_data_utf8,
+			       state->pasteout_data_utf8_len);
     else if (target == compound_text_atom)
 	gtk_selection_data_set(seldata, target, 8,
-                               (unsigned char *)inst->pasteout_data_ctext,
-			       inst->pasteout_data_ctext_len);
+                               (unsigned char *)state->pasteout_data_ctext,
+			       state->pasteout_data_ctext_len);
     else
 	gtk_selection_data_set(seldata, target, 8,
-                               (unsigned char *)inst->pasteout_data,
-			       inst->pasteout_data_len);
+                               (unsigned char *)state->pasteout_data,
+			       state->pasteout_data_len);
 }
 
 static gint selection_clear(GtkWidget *widget, GdkEventSelection *seldata,
                             gpointer data)
 {
     struct gui_data *inst = (struct gui_data *)data;
+    struct clipboard_state *state = clipboard_from_atom(
+        inst, seldata->selection);
 
-    term_lost_clipboard_ownership(inst->term, CLIP_SYSTEM);
-    if (inst->pasteout_data)
-	sfree(inst->pasteout_data);
-    if (inst->pasteout_data_ctext)
-	sfree(inst->pasteout_data_ctext);
-    if (inst->pasteout_data_utf8)
-	sfree(inst->pasteout_data_utf8);
-    inst->pasteout_data = NULL;
-    inst->pasteout_data_len = 0;
-    inst->pasteout_data_ctext = NULL;
-    inst->pasteout_data_ctext_len = 0;
-    inst->pasteout_data_utf8 = NULL;
-    inst->pasteout_data_utf8_len = 0;
+    if (!state)
+        return TRUE;
+
+    term_lost_clipboard_ownership(inst->term, state->clipboard);
+    if (state->pasteout_data)
+	sfree(state->pasteout_data);
+    if (state->pasteout_data_ctext)
+	sfree(state->pasteout_data_ctext);
+    if (state->pasteout_data_utf8)
+	sfree(state->pasteout_data_utf8);
+    state->pasteout_data = NULL;
+    state->pasteout_data_len = 0;
+    state->pasteout_data_ctext = NULL;
+    state->pasteout_data_ctext_len = 0;
+    state->pasteout_data_utf8 = NULL;
+    state->pasteout_data_utf8_len = 0;
     return TRUE;
 }
 
 void frontend_request_paste(void *frontend, int clipboard)
 {
     struct gui_data *inst = (struct gui_data *)frontend;
-
-    assert(clipboard == CLIP_SYSTEM);
+    struct clipboard_state *state = &inst->clipstates[clipboard];
 
     /*
      * In Unix, pasting is asynchronous: all we can do at the
@@ -2829,17 +2882,16 @@ void frontend_request_paste(void *frontend, int clipboard)
 	 * fails, selection_received() will be informed and will
 	 * fall back to an ordinary string.
 	 */
-	gtk_selection_convert(inst->area, GDK_SELECTION_PRIMARY,
-			      utf8_string_atom,
+	gtk_selection_convert(inst->area, state->atom, utf8_string_atom,
 			      inst->input_event_time);
     } else {
 	/*
 	 * If we're in direct-to-font mode, we disable UTF-8
 	 * pasting, and go straight to ordinary string data.
 	 */
-	gtk_selection_convert(inst->area, GDK_SELECTION_PRIMARY,
-			      GDK_SELECTION_TYPE_STRING,
-			      inst->input_event_time);
+	gtk_selection_convert(inst->area, state->atom,
+                              GDK_SELECTION_TYPE_STRING,
+                              inst->input_event_time);
     }
 }
 
@@ -2861,13 +2913,18 @@ static void selection_received(GtkWidget *widget, GtkSelectionData *seldata,
     gint seldata_length = gtk_selection_data_get_length(seldata);
     wchar_t *paste;
     int paste_len;
+    struct clipboard_state *state = clipboard_from_atom(
+        inst, gtk_selection_data_get_selection(seldata));
+
+    if (!state)
+        return;
 
     if (seldata_target == utf8_string_atom && seldata_length <= 0) {
 	/*
 	 * Failed to get a UTF-8 selection string. Try compound
 	 * text next.
 	 */
-	gtk_selection_convert(inst->area, GDK_SELECTION_PRIMARY,
+	gtk_selection_convert(inst->area, state->atom,
 			      compound_text_atom,
 			      inst->input_event_time);
 	return;
@@ -2878,7 +2935,7 @@ static void selection_received(GtkWidget *widget, GtkSelectionData *seldata,
 	 * Failed to get UTF-8 or compound text. Try an ordinary
 	 * string.
 	 */
-	gtk_selection_convert(inst->area, GDK_SELECTION_PRIMARY,
+	gtk_selection_convert(inst->area, state->atom,
 			      GDK_SELECTION_TYPE_STRING,
 			      inst->input_event_time);
 	return;
@@ -2935,7 +2992,7 @@ static void selection_received(GtkWidget *widget, GtkSelectionData *seldata,
 		/*
 		 * Compound text failed; fall back to STRING.
 		 */
-		gtk_selection_convert(inst->area, GDK_SELECTION_PRIMARY,
+		gtk_selection_convert(inst->area, state->atom,
 				      GDK_SELECTION_TYPE_STRING,
 				      inst->input_event_time);
 		return;
@@ -2963,6 +3020,16 @@ static void selection_received(GtkWidget *widget, GtkSelectionData *seldata,
 #endif
 }
 
+static void init_one_clipboard(struct gui_data *inst, int clipboard,
+                               GdkAtom atom)
+{
+    struct clipboard_state *state = &inst->clipstates[clipboard];
+
+    state->inst = inst;
+    state->atom = atom;
+    state->clipboard = clipboard;
+}
+
 void init_clipboard(struct gui_data *inst)
 {
 #ifndef NOT_X_WINDOWS
@@ -2998,6 +3065,9 @@ void init_clipboard(struct gui_data *inst)
 		    XA_CUT_BUFFER7, XA_STRING, 8, PropModeAppend, empty, 0);
 #endif
 
+    init_one_clipboard(inst, CLIP_PRIMARY, GDK_SELECTION_PRIMARY);
+    init_one_clipboard(inst, CLIP_CLIPBOARD, GDK_SELECTION_CLIPBOARD);
+
     g_signal_connect(G_OBJECT(inst->area), "selection_received",
                      G_CALLBACK(selection_received), inst);
     g_signal_connect(G_OBJECT(inst->area), "selection_get",
@@ -3016,7 +3086,7 @@ void init_clipboard(struct gui_data *inst)
 void paste_menu_action(void *frontend)
 {
     struct gui_data *inst = (struct gui_data *)frontend;
-    term_request_paste(inst->term, CLIP_SYSTEM);
+    term_request_paste(inst->term, MENU_PASTE_CLIPBOARD);
 }
 
 static void set_window_titles(struct gui_data *inst)
@@ -4934,8 +5004,8 @@ void new_session_window(Conf *conf, const char *geometry_string)
     inst->eventlogstuff = eventlogstuff_new();
 
     inst->term = term_init(inst->conf, &inst->ucsdata, inst);
-    inst->term->mouse_select_clipboard = CLIP_SYSTEM;
-    inst->term->mouse_paste_clipboard = CLIP_SYSTEM;
+    inst->term->mouse_select_clipboard = MOUSE_SELECT_CLIPBOARD;
+    inst->term->mouse_paste_clipboard = MOUSE_PASTE_CLIPBOARD;
     inst->logctx = log_init(inst, inst->conf);
     term_provide_logctx(inst->term, inst->logctx);
 
diff --git a/unix/unix.h b/unix/unix.h
index 6c9d11c76..d9e8f7a32 100644
--- a/unix/unix.h
+++ b/unix/unix.h
@@ -29,7 +29,6 @@
 /* this potential one of the Meta keys needs manual handling */
 #define META_MANUAL_MASK (GDK_MOD1_MASK)
 #define JUST_USE_GTK_CLIPBOARD_UTF8 /* low-level gdk_selection_* fails */
-#define DEFAULT_CLIPBOARD GDK_SELECTION_CLIPBOARD /* OS X has no PRIMARY */
 
 #define BUILDINFO_PLATFORM_GTK "OS X (GTK)"
 #define BUILDINFO_GTK
@@ -119,10 +118,23 @@ unsigned long getticks(void);
  */
 #define FLAG_STDERR_TTY 0x1000
 
-#define PLATFORM_CLIPBOARDS(X)                      \
-    X(CLIP_SYSTEM, "system clipboard")              \
+#define PLATFORM_CLIPBOARDS(X)                            \
+    X(CLIP_PRIMARY, "X11 primary selection")              \
+    X(CLIP_CLIPBOARD, "XDG clipboard")                    \
     /* end of list */
 
+#ifdef OSX_GTK
+/* OS X has no PRIMARY selection */
+#define SHIFT_INS_CLIPBOARD CLIP_CLIPBOARD
+#define MOUSE_SELECT_CLIPBOARD CLIP_CLIPBOARD
+#define MOUSE_PASTE_CLIPBOARD CLIP_CLIPBOARD
+#else
+#define SHIFT_INS_CLIPBOARD CLIP_PRIMARY
+#define MOUSE_SELECT_CLIPBOARD CLIP_PRIMARY
+#define MOUSE_PASTE_CLIPBOARD CLIP_PRIMARY
+#endif
+#define MENU_PASTE_CLIPBOARD CLIP_CLIPBOARD
+
 /* The per-session frontend structure managed by gtkwin.c */
 struct gui_data;
 

From cd7348281b05398212214197622961ecbf0936c2 Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Sun, 10 Dec 2017 14:53:55 +0000
Subject: [PATCH 143/166] Add a cross-platform clipboard called CLIP_LOCAL.

This stores the last text selected in _this_ terminal, regardless of
whether any other application has since taken back whatever system
clipboard we also copied it to. It's written unconditionally whenever
text is selected in terminal.c.

The main purpose of this will be that it's also the place that you can
go and find the data you need to write to a system clipboard in
response to an explicit Copy operation. But it can also act as a data
source for pastes in its own right, so you can use it to implement an
intra-window private extra clipboard if that's useful. (OS X Terminal
has one of those, so _someone_ at least seems to like the idea.)
---
 putty.h    | 23 +++++++++++++++++------
 terminal.c | 47 +++++++++++++++++++++++++++++++++++++++++------
 terminal.h |  4 ++++
 3 files changed, 62 insertions(+), 12 deletions(-)

diff --git a/putty.h b/putty.h
index eea7fe9cd..efde2d446 100644
--- a/putty.h
+++ b/putty.h
@@ -616,13 +616,23 @@ typedef struct truecolour {
         optionalrgb_equal((c1).bg, (c2).bg))
 
 /*
- * Enumeration of clipboards. CLIP_NULL is the only one provided
- * systemwide: it's a non=clipboard, writes to which are ignored and
- * reads from which return no data. Each platform front end extends
- * this enumeration in its own way.
+ * Enumeration of clipboards. We provide some standard ones cross-
+ * platform, and then permit each platform to extend this enumeration
+ * further by defining PLATFORM_CLIPBOARDS in its own header file.
+ *
+ * CLIP_NULL is a non-clipboard, writes to which are ignored and reads
+ * from which return no data.
+ *
+ * CLIP_LOCAL refers to a buffer within terminal.c, which
+ * unconditionally saves the last data selected in the terminal. In
+ * configurations where a system clipboard is not written
+ * automatically on selection but instead by an explicit UI action,
+ * this is where the code responding to that action can find the data
+ * to write to the clipboard in question.
  */
-#define CROSS_PLATFORM_CLIPBOARDS(X)            \
-    X(CLIP_NULL, "null clipboard")              \
+#define CROSS_PLATFORM_CLIPBOARDS(X)                    \
+    X(CLIP_NULL, "null clipboard")                      \
+    X(CLIP_LOCAL, "last text selected in terminal")     \
     /* end of list */
 
 #define ALL_CLIPBOARDS(X)                       \
@@ -1080,6 +1090,7 @@ void term_nopaste(Terminal *);
 int term_ldisc(Terminal *, int option);
 void term_copyall(Terminal *, int clipboard);
 void term_reconfig(Terminal *, Conf *);
+void term_request_copy(Terminal *, int clipboard);
 void term_request_paste(Terminal *, int clipboard);
 void term_seen_key_event(Terminal *); 
 int term_data(Terminal *, int is_stderr, const char *data, int len);
diff --git a/terminal.c b/terminal.c
index dd3c8548c..32fb6576d 100644
--- a/terminal.c
+++ b/terminal.c
@@ -1703,6 +1703,10 @@ Terminal *term_init(Conf *myconf, struct unicode_data *ucsdata,
     term->basic_erase_char.truecolour.bg = optionalrgb_none;
     term->erase_char = term->basic_erase_char;
 
+    term->last_selected_text = NULL;
+    term->last_selected_attr = NULL;
+    term->last_selected_tc = NULL;
+    term->last_selected_len = 0;
     /* frontends will typically overwrite these with clipboard ids they
      * know about */
     term->mouse_select_clipboard = CLIP_NULL;
@@ -5805,11 +5809,15 @@ static void clipme(Terminal *term, pos top, pos bottom, int rect, int desel,
     clip_addchar(&buf, 0, 0, term->basic_erase_char.truecolour);
 #endif
     /* Finally, transfer all that to the clipboard. */
+    sfree(term->last_selected_text);
+    sfree(term->last_selected_attr);
+    sfree(term->last_selected_tc);
+    term->last_selected_text = buf.textbuf;
+    term->last_selected_attr = buf.attrbuf;
+    term->last_selected_tc = buf.tcbuf;
+    term->last_selected_len = buf.bufpos;
     write_clip(term->frontend, clipboard,
                buf.textbuf, buf.attrbuf, buf.tcbuf, buf.bufpos, desel);
-    sfree(buf.textbuf);
-    sfree(buf.attrbuf);
-    sfree(buf.tcbuf);
 }
 
 void term_copyall(Terminal *term, int clipboard)
@@ -5824,11 +5832,38 @@ void term_copyall(Terminal *term, int clipboard)
     clipme(term, top, bottom, 0, TRUE, clipboard);
 }
 
+static void paste_from_clip_local(void *vterm)
+{
+    Terminal *term = (Terminal *)vterm;
+    term_do_paste(term, term->last_selected_text, term->last_selected_len);
+}
+
+void term_request_copy(Terminal *term, int clipboard)
+{
+    assert(clipboard != CLIP_LOCAL);
+    if (clipboard != CLIP_NULL) {
+        write_clip(term->frontend, clipboard,
+                   term->last_selected_text,
+                   term->last_selected_attr,
+                   term->last_selected_tc,
+                   term->last_selected_len,
+                   FALSE);
+    }
+}
+
 void term_request_paste(Terminal *term, int clipboard)
 {
-    if (clipboard == CLIP_NULL)
-        return;
-    frontend_request_paste(term->frontend, clipboard);
+    switch (clipboard) {
+      case CLIP_NULL:
+        /* Do nothing: CLIP_NULL never has data in it. */
+        break;
+      case CLIP_LOCAL:
+        queue_toplevel_callback(paste_from_clip_local, term);
+        break;
+      default:
+        frontend_request_paste(term->frontend, clipboard);
+        break;
+    }
 }
 
 /*
diff --git a/terminal.h b/terminal.h
index 8cb56f6fc..c46bf5e1d 100644
--- a/terminal.h
+++ b/terminal.h
@@ -328,6 +328,10 @@ struct terminal_tag {
     int xterm_256_colour;
     int true_colour;
 
+    wchar_t *last_selected_text;
+    int *last_selected_attr;
+    truecolour *last_selected_tc;
+    size_t last_selected_len;
     int mouse_select_clipboard;
     int mouse_paste_clipboard;
 };

From 131a8e946898f0d3ea4bf28f4495685ab5a14731 Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Sun, 10 Dec 2017 15:45:45 +0000
Subject: [PATCH 144/166] Ability to copy to multiple clipboards at once.

---
 putty.h          |  4 +--
 terminal.c       | 75 +++++++++++++++++++++++++++++++-----------------
 terminal.h       |  3 +-
 unix/gtkwin.c    |  6 ++--
 windows/window.c |  8 ++++--
 5 files changed, 63 insertions(+), 33 deletions(-)

diff --git a/putty.h b/putty.h
index efde2d446..e768cf7f9 100644
--- a/putty.h
+++ b/putty.h
@@ -1088,9 +1088,9 @@ void term_blink(Terminal *, int set_cursor);
 void term_do_paste(Terminal *, const wchar_t *, int);
 void term_nopaste(Terminal *);
 int term_ldisc(Terminal *, int option);
-void term_copyall(Terminal *, int clipboard);
+void term_copyall(Terminal *, const int *, int);
 void term_reconfig(Terminal *, Conf *);
-void term_request_copy(Terminal *, int clipboard);
+void term_request_copy(Terminal *, const int *clipboards, int n_clipboards);
 void term_request_paste(Terminal *, int clipboard);
 void term_seen_key_event(Terminal *); 
 int term_data(Terminal *, int is_stderr, const char *data, int len);
diff --git a/terminal.c b/terminal.c
index 32fb6576d..06f41e446 100644
--- a/terminal.c
+++ b/terminal.c
@@ -1707,9 +1707,10 @@ Terminal *term_init(Conf *myconf, struct unicode_data *ucsdata,
     term->last_selected_attr = NULL;
     term->last_selected_tc = NULL;
     term->last_selected_len = 0;
-    /* frontends will typically overwrite these with clipboard ids they
+    /* frontends will typically extend these with clipboard ids they
      * know about */
-    term->mouse_select_clipboard = CLIP_NULL;
+    term->mouse_select_clipboards[0] = CLIP_LOCAL;
+    term->n_mouse_select_clipboards = 1;
     term->mouse_paste_clipboard = CLIP_NULL;
 
     return term;
@@ -5648,7 +5649,7 @@ static void clip_addchar(clip_workbuf *b, wchar_t chr, int attr, truecolour tc)
 }
 
 static void clipme(Terminal *term, pos top, pos bottom, int rect, int desel,
-                   int clipboard)
+                   const int *clipboards, int n_clipboards)
 {
     clip_workbuf buf;
     int old_top_x;
@@ -5808,19 +5809,36 @@ static void clipme(Terminal *term, pos top, pos bottom, int rect, int desel,
 #if SELECTION_NUL_TERMINATED
     clip_addchar(&buf, 0, 0, term->basic_erase_char.truecolour);
 #endif
-    /* Finally, transfer all that to the clipboard. */
-    sfree(term->last_selected_text);
-    sfree(term->last_selected_attr);
-    sfree(term->last_selected_tc);
-    term->last_selected_text = buf.textbuf;
-    term->last_selected_attr = buf.attrbuf;
-    term->last_selected_tc = buf.tcbuf;
-    term->last_selected_len = buf.bufpos;
-    write_clip(term->frontend, clipboard,
-               buf.textbuf, buf.attrbuf, buf.tcbuf, buf.bufpos, desel);
+    /* Finally, transfer all that to the clipboard(s). */
+    {
+        int i;
+        int clip_local = FALSE;
+        for (i = 0; i < n_clipboards; i++) {
+            if (clipboards[i] == CLIP_LOCAL) {
+                clip_local = TRUE;
+            } else if (clipboards[i] != CLIP_NULL) {
+                write_clip(term->frontend, clipboards[i],
+                           buf.textbuf, buf.attrbuf, buf.tcbuf, buf.bufpos,
+                           desel);
+            }
+        }
+        if (clip_local) {
+            sfree(term->last_selected_text);
+            sfree(term->last_selected_attr);
+            sfree(term->last_selected_tc);
+            term->last_selected_text = buf.textbuf;
+            term->last_selected_attr = buf.attrbuf;
+            term->last_selected_tc = buf.tcbuf;
+            term->last_selected_len = buf.bufpos;
+        } else {
+            sfree(buf.textbuf);
+            sfree(buf.attrbuf);
+            sfree(buf.tcbuf);
+        }
+    }
 }
 
-void term_copyall(Terminal *term, int clipboard)
+void term_copyall(Terminal *term, const int *clipboards, int n_clipboards)
 {
     pos top;
     pos bottom;
@@ -5829,7 +5847,7 @@ void term_copyall(Terminal *term, int clipboard)
     top.x = 0;
     bottom.y = find_last_nonempty_line(term, screen);
     bottom.x = term->cols;
-    clipme(term, top, bottom, 0, TRUE, clipboard);
+    clipme(term, top, bottom, 0, TRUE, clipboards, n_clipboards);
 }
 
 static void paste_from_clip_local(void *vterm)
@@ -5838,16 +5856,19 @@ static void paste_from_clip_local(void *vterm)
     term_do_paste(term, term->last_selected_text, term->last_selected_len);
 }
 
-void term_request_copy(Terminal *term, int clipboard)
+void term_request_copy(Terminal *term, const int *clipboards, int n_clipboards)
 {
-    assert(clipboard != CLIP_LOCAL);
-    if (clipboard != CLIP_NULL) {
-        write_clip(term->frontend, clipboard,
-                   term->last_selected_text,
-                   term->last_selected_attr,
-                   term->last_selected_tc,
-                   term->last_selected_len,
-                   FALSE);
+    int i;
+    for (i = 0; i < n_clipboards; i++) {
+        assert(clipboards[i] != CLIP_LOCAL);
+        if (clipboards[i] != CLIP_NULL) {
+            write_clip(term->frontend, clipboards[i],
+                       term->last_selected_text,
+                       term->last_selected_attr,
+                       term->last_selected_tc,
+                       term->last_selected_len,
+                       FALSE);
+        }
     }
 }
 
@@ -6447,7 +6468,8 @@ void term_mouse(Terminal *term, Mouse_Button braw, Mouse_Button bcooked,
 	     */
 	    clipme(term, term->selstart, term->selend,
 		   (term->seltype == RECTANGULAR), FALSE,
-                   term->mouse_select_clipboard);
+                   term->mouse_select_clipboards,
+                   term->n_mouse_select_clipboards);
 	    term->selstate = SELECTED;
 	} else
 	    term->selstate = NO_SELECTION;
@@ -6523,7 +6545,8 @@ static void deselect(Terminal *term)
 
 void term_lost_clipboard_ownership(Terminal *term, int clipboard)
 {
-    if (clipboard != term->mouse_select_clipboard)
+    if (!(term->n_mouse_select_clipboards > 1 &&
+          clipboard == term->mouse_select_clipboards[1]))
         return;
 
     deselect(term);
diff --git a/terminal.h b/terminal.h
index c46bf5e1d..0057e34ff 100644
--- a/terminal.h
+++ b/terminal.h
@@ -332,7 +332,8 @@ struct terminal_tag {
     int *last_selected_attr;
     truecolour *last_selected_tc;
     size_t last_selected_len;
-    int mouse_select_clipboard;
+    int mouse_select_clipboards[N_CLIPBOARDS];
+    int n_mouse_select_clipboards;
     int mouse_paste_clipboard;
 };
 
diff --git a/unix/gtkwin.c b/unix/gtkwin.c
index 01bf6f29d..cdd1d49b9 100644
--- a/unix/gtkwin.c
+++ b/unix/gtkwin.c
@@ -4130,7 +4130,8 @@ void reset_terminal_menuitem(GtkMenuItem *item, gpointer data)
 void copy_all_menuitem(GtkMenuItem *item, gpointer data)
 {
     struct gui_data *inst = (struct gui_data *)data;
-    term_copyall(inst->term, CLIP_SYSTEM);
+    static const int clips[] = { CLIP_PRIMARY, CLIP_CLIPBOARD };
+    term_copyall(inst->term, clips, lenof(clips));
 }
 
 void special_menuitem(GtkMenuItem *item, gpointer data)
@@ -5004,7 +5005,8 @@ void new_session_window(Conf *conf, const char *geometry_string)
     inst->eventlogstuff = eventlogstuff_new();
 
     inst->term = term_init(inst->conf, &inst->ucsdata, inst);
-    inst->term->mouse_select_clipboard = MOUSE_SELECT_CLIPBOARD;
+    inst->term->mouse_select_clipboards[
+        inst->term->n_mouse_select_clipboards++] = MOUSE_SELECT_CLIPBOARD;
     inst->term->mouse_paste_clipboard = MOUSE_PASTE_CLIPBOARD;
     inst->logctx = log_init(inst, inst->conf);
     term_provide_logctx(inst->term, inst->logctx);
diff --git a/windows/window.c b/windows/window.c
index b84527571..84799f480 100644
--- a/windows/window.c
+++ b/windows/window.c
@@ -637,7 +637,8 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
      * timer_change_notify() which will expect hwnd to exist.)
      */
     term = term_init(conf, &ucsdata, NULL);
-    term->mouse_select_clipboard = CLIP_SYSTEM;
+    term->mouse_select_clipboards[
+        term->n_mouse_select_clipboards++] = CLIP_SYSTEM;
     term->mouse_paste_clipboard = CLIP_SYSTEM;
     logctx = log_init(NULL, conf);
     term_provide_logctx(term, logctx);
@@ -2330,7 +2331,10 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
 	    }
 	    break;
 	  case IDM_COPYALL:
-	    term_copyall(term, CLIP_SYSTEM);
+            {
+                static const int clips[] = { CLIP_SYSTEM };
+                term_copyall(term, clips, lenof(clips));
+            }
 	    break;
 	  case IDM_PASTE:
 	    term_request_paste(term, CLIP_SYSTEM);

From 3d9372492dbd150c6ba43cf702304f5dbfbc995d Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Sun, 10 Dec 2017 16:25:54 +0000
Subject: [PATCH 145/166] GTK context menu options to copy/paste CLIPBOARD.

---
 unix/gtkwin.c | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/unix/gtkwin.c b/unix/gtkwin.c
index cdd1d49b9..507a9a3e8 100644
--- a/unix/gtkwin.c
+++ b/unix/gtkwin.c
@@ -4127,6 +4127,19 @@ void reset_terminal_menuitem(GtkMenuItem *item, gpointer data)
 	ldisc_echoedit_update(inst->ldisc);
 }
 
+void copy_clipboard_menuitem(GtkMenuItem *item, gpointer data)
+{
+    struct gui_data *inst = (struct gui_data *)data;
+    static const int clips[] = { CLIP_CLIPBOARD };
+    term_request_copy(inst->term, clips, lenof(clips));
+}
+
+void paste_clipboard_menuitem(GtkMenuItem *item, gpointer data)
+{
+    struct gui_data *inst = (struct gui_data *)data;
+    term_request_paste(inst->term, CLIP_CLIPBOARD);
+}
+
 void copy_all_menuitem(GtkMenuItem *item, gpointer data)
 {
     struct gui_data *inst = (struct gui_data *)data;
@@ -4985,6 +4998,9 @@ void new_session_window(Conf *conf, const char *geometry_string)
 	gtk_widget_hide(inst->specialsitem2);
 	MKMENUITEM("Clear Scrollback", clear_scrollback_menuitem);
 	MKMENUITEM("Reset Terminal", reset_terminal_menuitem);
+	MKSEP();
+	MKMENUITEM("Copy to CLIPBOARD", copy_clipboard_menuitem);
+	MKMENUITEM("Paste from CLIPBOARD", paste_clipboard_menuitem);
 	MKMENUITEM("Copy All", copy_all_menuitem);
 	MKSEP();
 	s = dupcat("About ", appname, NULL);

From 98fa733a96f08cc4bead58560461266f9757264b Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Sat, 16 Dec 2017 11:13:31 +0000
Subject: [PATCH 146/166] Move char-class list box out into a new config panel.

This makes space in the Selection panel (at least on Windows; it
wasn't overfull on Unix) to add a new set of config options
controlling the mapping of UI actions to clipboards.

(A possible future advantage of having spare space in this new Words
panel is that there's room to add controls for context-sensitive
special-casing, e.g. I'd quite like ':' to be treated differently when
it appears as part of "http://".)
---
 config.c       | 10 ++++++++--
 doc/config.but | 12 +++++++-----
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/config.c b/config.c
index cc5e726b3..d949f423a 100644
--- a/config.c
+++ b/config.c
@@ -1860,8 +1860,14 @@ void setup_config_box(struct controlbox *b, int midsession,
 		      "Normal", 'n', I(0),
 		      "Rectangular block", 'r', I(1), NULL);
 
-    s = ctrl_getset(b, "Window/Selection", "charclass",
-		    "Control the select-one-word-at-a-time mode");
+    /*
+     * The Window/Selection/Words panel.
+     */
+    ctrl_settitle(b, "Window/Selection/Words",
+                  "Options controlling word-by-word selection");
+
+    s = ctrl_getset(b, "Window/Selection/Words", "charclass",
+		    "Classes of character that group together");
     ccd = (struct charclass_data *)
 	ctrl_alloc(b, sizeof(struct charclass_data));
     ccd->listbox = ctrl_listbox(s, "Character classes:", 'e',
diff --git a/doc/config.but b/doc/config.but
index 7ad5e2822..c4a7b9ef1 100644
--- a/doc/config.but
+++ b/doc/config.but
@@ -1469,13 +1469,15 @@ select a rectangular block. Using the \q{Default selection mode}
 control, you can set \i{rectangular selection} as the default, and then
 you have to hold down Alt to get the \e{normal} behaviour.
 
-\S{config-charclasses} Configuring \i{word-by-word selection}
+\H{config-selection-words} The Words panel
 
-\cfg{winhelp-topic}{selection.charclasses}
+PuTTY will \I{word-by-word selection}select a word at a time in the
+terminal window if you \i{double-click} to begin the drag. This panel
+allows you to control precisely what is considered to be a word.
+
+\S{config-charclasses} Character classes
 
-PuTTY will select a word at a time in the terminal window if you
-\i{double-click} to begin the drag. This panel allows you to control
-precisely what is considered to be a word.
+\cfg{winhelp-topic}{selection.charclasses}
 
 Each character is given a \e{class}, which is a small number
 (typically 0, 1 or 2). PuTTY considers a single word to be any

From 0e7f0883a955545bb901d7506b362d0b5cdb149b Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Sun, 10 Dec 2017 17:16:50 +0000
Subject: [PATCH 147/166] Add GUI configuration for choice of clipboards.

On all platforms, you can now configure which clipboard the mouse
pastes from, which clipboard Ctrl-Ins and Shift-Ins access, and which
Ctrl-Shift-C and Ctrl-Shift-V access. In each case, the options are:

 - nothing at all
 - a clipboard which is implicitly written by the act of mouse
   selection (the PRIMARY selection on X, CLIP_LOCAL everywhere else)
 - the standard clipboard written by explicit copy/paste UI actions
   (CLIPBOARD on X, the unique system clipboard elsewhere).

Also, you can control whether selecting text with the mouse _also_
writes to the explicitly accessed clipboard.

The wording of the various messages changes between platforms, but the
basic UI shape is the same everywhere.
---
 config.c           |  47 +++++++++++++++++
 doc/config.but     |  62 +++++++++++++++++++++++
 putty.h            |  14 +++++
 settings.c         |  49 ++++++++++++++++++
 unix/gtkwin.c      | 124 ++++++++++++++++++++++++++++++++++++++++++---
 unix/unix.h        |  26 ++++++++--
 windows/window.c   |  92 +++++++++++++++++++++++++++++----
 windows/winhelp.h  |   2 +
 windows/winstuff.h |  11 ++++
 9 files changed, 405 insertions(+), 22 deletions(-)

diff --git a/config.c b/config.c
index d949f423a..df9998499 100644
--- a/config.c
+++ b/config.c
@@ -1337,6 +1337,34 @@ static void manual_hostkey_handler(union control *ctrl, void *dlg,
     }
 }
 
+static void clipboard_selector_handler(union control *ctrl, void *dlg,
+                                       void *data, int event)
+{
+    Conf *conf = (Conf *)data;
+    int setting = ctrl->generic.context.i;
+
+    if (event == EVENT_REFRESH) {
+        int i, val = conf_get_int(conf, setting);
+
+        dlg_update_start(ctrl, dlg);
+        dlg_listbox_clear(ctrl, dlg);
+        dlg_listbox_addwithid(ctrl, dlg, "No action", CLIPUI_NONE);
+        dlg_listbox_addwithid(ctrl, dlg, CLIPNAME_IMPLICIT, CLIPUI_IMPLICIT);
+        dlg_listbox_addwithid(ctrl, dlg, CLIPNAME_EXPLICIT, CLIPUI_EXPLICIT);
+        dlg_listbox_select(ctrl, dlg, 0); /* fallback */
+        for (i = 0; i < 3; i++)
+            if (val == dlg_listbox_getid(ctrl, dlg, i))
+                dlg_listbox_select(ctrl, dlg, i);
+	dlg_update_done(ctrl, dlg);
+    } else if (event == EVENT_SELCHANGE) {
+        int index = dlg_listbox_index(ctrl, dlg);
+        if (index >= 0) {
+            int val = dlg_listbox_getid(ctrl, dlg, index);
+            conf_set_int(conf, setting, val);
+        }
+    }
+}
+
 void setup_config_box(struct controlbox *b, int midsession,
 		      int protocol, int protcfginfo)
 {
@@ -1860,6 +1888,25 @@ void setup_config_box(struct controlbox *b, int midsession,
 		      "Normal", 'n', I(0),
 		      "Rectangular block", 'r', I(1), NULL);
 
+    s = ctrl_getset(b, "Window/Selection", "clipboards",
+                    "Assign copy/paste actions to clipboards");
+    ctrl_checkbox(s, "Auto-copy selected text to "
+                  CLIPNAME_EXPLICIT_OBJECT,
+                  NO_SHORTCUT, HELPCTX(selection_autocopy),
+                  conf_checkbox_handler, I(CONF_mouseautocopy));
+    ctrl_droplist(s, "Mouse paste action:", NO_SHORTCUT, 60,
+                  HELPCTX(selection_clipactions),
+                  clipboard_selector_handler,
+                  I(CONF_mousepaste));
+    ctrl_droplist(s, "{Ctrl,Shift} + Ins:", NO_SHORTCUT, 60,
+                  HELPCTX(selection_clipactions),
+                  clipboard_selector_handler,
+                  I(CONF_ctrlshiftins));
+    ctrl_droplist(s, "Ctrl + Shift + {C,V}:", NO_SHORTCUT, 60,
+                  HELPCTX(selection_clipactions),
+                  clipboard_selector_handler,
+                  I(CONF_ctrlshiftcv));
+
     /*
      * The Window/Selection/Words panel.
      */
diff --git a/doc/config.but b/doc/config.but
index c4a7b9ef1..3edce1b7d 100644
--- a/doc/config.but
+++ b/doc/config.but
@@ -1469,6 +1469,68 @@ select a rectangular block. Using the \q{Default selection mode}
 control, you can set \i{rectangular selection} as the default, and then
 you have to hold down Alt to get the \e{normal} behaviour.
 
+\S{config-clipboards} Assigning copy and paste actions to clipboards
+
+Here you can configure which clipboard(s) are written or read by
+PuTTY's various copy and paste actions.
+
+The X Window System provides multiple clipboards (or \q{selections}),
+and many applications support more than one of them by a different
+user interface mechanism.
+
+The two most commonly used selections are called \cq{PRIMARY} and
+\cq{CLIPBOARD}; in applications supporting both, the usual behaviour
+is that \cw{PRIMARY} is used by mouse-only actions (selecting text
+automatically copies it to \cw{PRIMARY}, and middle-clicking pastes
+from \cw{PRIMARY}), whereas \cw{CLIPBOARD} is used by explicit Copy
+and Paste menu items or keypresses such as Ctrl-C and Ctrl-V.
+
+On other platforms, where there is a single system clipboard, PuTTY
+provides a second clipboard-like facility by permitting you to paste
+the text you last selected in \e{this window}, whether or not it is
+currently also in the system clipboard.
+
+\S2{config-selection-autocopy} \q{Auto-copy selected text}
+
+\cfg{winhelp-topic}{selection.autocopy}
+
+The checkbox \q{Auto-copy selected text to system clipboard} controls
+whether or not selecting text in the PuTTY terminal window
+automatically has the side effect of copying it to the system
+clipboard, without requiring a separate user interface action.
+
+On X, the wording of this option is changed slightly so that
+\cq{CLIPBOARD} is mentioned in place of the \q{system clipboard}. Text
+selected in the terminal window will \e{always} be automatically
+placed in the \cw{PRIMARY} selection, but if you tick this box, it
+will \e{also} be placed in \cq{CLIPBOARD} at the same time.
+
+\S2{config-selection-clipactions} Choosing a clipboard for UI actions
+
+\cfg{winhelp-topic}{selection.clipactions}
+
+PuTTY has three user-interface actions which can be configured to
+paste into the terminal (not counting menu items). You can click
+whichever mouse button (if any) is configured to paste (see
+\k{config-mouse}); you can press Shift-Ins; or you can press
+Ctrl-Shift-V, although that action is not enabled by default.
+
+You can configure which of the available clipboards each of these
+actions pastes from (including turning the paste action off
+completely). On platforms with a single system clipboard, the
+available options are to paste from that clipboard or to paste from
+PuTTY's internal memory of the last selected text within that window.
+On X, the options are \cw{CLIPBOARD} or \cw{PRIMARY}.
+
+(\cw{PRIMARY} is conceptually similar in that it \e{also} refers to
+the last selected text \dash just across all applications instead of
+just this window.)
+
+The two keyboard options each come with a corresponding key to copy
+\e{to} the same clipboard. Whatever you configure Shift-Ins to paste
+from, Ctrl-Ins will copy to the same location; similarly, Ctrl-Shift-C
+will copy to whatever Ctrl-Shift-V pastes from.
+
 \H{config-selection-words} The Words panel
 
 PuTTY will \I{word-by-word selection}select a word at a time in the
diff --git a/putty.h b/putty.h
index e768cf7f9..ca00b666c 100644
--- a/putty.h
+++ b/putty.h
@@ -899,6 +899,10 @@ void cleanup_exit(int);
     X(INT, NONE, rtf_paste) \
     X(INT, NONE, mouse_override) \
     X(INT, INT, wordness) \
+    X(INT, NONE, mouseautocopy) \
+    X(INT, NONE, mousepaste) \
+    X(INT, NONE, ctrlshiftins) \
+    X(INT, NONE, ctrlshiftcv) \
     /* translations */ \
     X(INT, NONE, vtmode) \
     X(STR, NONE, line_codepage) \
@@ -1433,6 +1437,16 @@ enum {
 };
 extern const char *const x11_authnames[];  /* declared in x11fwd.c */
 
+/*
+ * An enum for the copy-paste UI action configuration.
+ */
+enum {
+    CLIPUI_NONE,     /* UI action has no copy/paste effect */
+    CLIPUI_IMPLICIT, /* use the default clipboard implicit in mouse actions  */
+    CLIPUI_EXPLICIT, /* use the default clipboard for explicit Copy/Paste */
+    CLIPUI_CUSTOM,   /* use a named clipboard (on systems that support it) */
+};
+
 /*
  * Miscellaneous exports from the platform-specific code.
  *
diff --git a/settings.c b/settings.c
index 47e5b9f75..0433adc3c 100644
--- a/settings.c
+++ b/settings.c
@@ -447,6 +447,42 @@ static void wprefs(void *sesskey, const char *name,
     sfree(buf);
 }
 
+static void write_clip_setting(void *handle, const char *savekey,
+                               Conf *conf, int confkey)
+{
+    int val = conf_get_int(conf, confkey);
+    switch (val) {
+      case CLIPUI_NONE:
+      default:
+        write_setting_s(handle, savekey, "none");
+        break;
+      case CLIPUI_IMPLICIT:
+        write_setting_s(handle, savekey, "implicit");
+        break;
+      case CLIPUI_EXPLICIT:
+        write_setting_s(handle, savekey, "explicit");
+        break;
+    }
+}
+
+static void read_clip_setting(void *handle, const char *savekey,
+                              int def, Conf *conf, int confkey)
+{
+    char *setting = read_setting_s(handle, savekey);
+    int val;
+
+    if (!setting) {
+        val = def;
+    } else if (!strcmp(setting, "implicit")) {
+        val = CLIPUI_IMPLICIT;
+    } else if (!strcmp(setting, "explicit")) {
+        val = CLIPUI_EXPLICIT;
+    } else {
+        val = CLIPUI_NONE;
+    }
+    conf_set_int(conf, confkey, val);
+}
+
 char *save_settings(const char *section, Conf *conf)
 {
     void *sesskey;
@@ -638,6 +674,11 @@ void save_open_settings(void *sesskey, Conf *conf)
 	}
 	write_setting_s(sesskey, buf, buf2);
     }
+    write_setting_i(sesskey, "MouseAutocopy",
+                    conf_get_int(conf, CONF_mouseautocopy));
+    write_clip_setting(sesskey, "MousePaste", conf, CONF_mousepaste);
+    write_clip_setting(sesskey, "CtrlShiftIns", conf, CONF_ctrlshiftins);
+    write_clip_setting(sesskey, "CtrlShiftCV", conf, CONF_ctrlshiftcv);
     write_setting_s(sesskey, "LineCodePage", conf_get_str(conf, CONF_line_codepage));
     write_setting_i(sesskey, "CJKAmbigWide", conf_get_int(conf, CONF_cjk_ambig_wide));
     write_setting_i(sesskey, "UTF8Override", conf_get_int(conf, CONF_utf8_override));
@@ -1059,6 +1100,14 @@ void load_open_settings(void *sesskey, Conf *conf)
 	}
 	sfree(buf2);
     }
+    gppi(sesskey, "MouseAutocopy", CLIPUI_DEFAULT_AUTOCOPY,
+         conf, CONF_mouseautocopy);
+    read_clip_setting(sesskey, "MousePaste", CLIPUI_DEFAULT_MOUSE,
+                      conf, CONF_mousepaste);
+    read_clip_setting(sesskey, "CtrlShiftIns", CLIPUI_DEFAULT_INS,
+                      conf, CONF_ctrlshiftins);
+    read_clip_setting(sesskey, "CtrlShiftCV", CLIPUI_NONE,
+                      conf, CONF_ctrlshiftcv);
     /*
      * The empty default for LineCodePage will be converted later
      * into a plausible default for the locale.
diff --git a/unix/gtkwin.c b/unix/gtkwin.c
index 507a9a3e8..6811838ab 100644
--- a/unix/gtkwin.c
+++ b/unix/gtkwin.c
@@ -1022,15 +1022,98 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data)
 	}
 
 	/*
-	 * Neither does Shift-Ins.
+	 * Neither do Shift-Ins or Ctrl-Ins (if enabled).
 	 */
 	if (event->keyval == GDK_KEY_Insert &&
             (event->state & GDK_SHIFT_MASK)) {
+            int cfgval = conf_get_int(inst->conf, CONF_ctrlshiftins);
+
+            switch (cfgval) {
+              case CLIPUI_IMPLICIT:
 #ifdef KEY_EVENT_DIAGNOSTICS
-            debug((" - Shift-Insert paste\n"));
+                debug((" - Shift-Insert: paste from PRIMARY\n"));
 #endif
-	    term_request_paste(inst->term, SHIFT_INS_CLIPBOARD);
-	    return TRUE;
+                term_request_paste(inst->term, CLIP_PRIMARY);
+                return TRUE;
+              case CLIPUI_EXPLICIT:
+#ifdef KEY_EVENT_DIAGNOSTICS
+                debug((" - Shift-Insert: paste from CLIPBOARD\n"));
+#endif
+                term_request_paste(inst->term, CLIP_CLIPBOARD);
+                return TRUE;
+              default:
+#ifdef KEY_EVENT_DIAGNOSTICS
+                debug((" - Shift-Insert: no paste action\n"));
+#endif
+                break;
+            }
+	}
+	if (event->keyval == GDK_KEY_Insert &&
+            (event->state & GDK_CONTROL_MASK)) {
+            static const int clips_clipboard[] = { CLIP_CLIPBOARD };
+            int cfgval = conf_get_int(inst->conf, CONF_ctrlshiftins);
+
+            switch (cfgval) {
+              case CLIPUI_IMPLICIT:
+                /* do nothing; re-copy to PRIMARY is not needed */
+#ifdef KEY_EVENT_DIAGNOSTICS
+                debug((" - Ctrl-Insert: non-copy to PRIMARY\n"));
+#endif
+                return TRUE;
+              case CLIPUI_EXPLICIT:
+#ifdef KEY_EVENT_DIAGNOSTICS
+                debug((" - Ctrl-Insert: copy to CLIPBOARD\n"));
+#endif
+                term_request_copy(inst->term,
+                                  clips_clipboard, lenof(clips_clipboard));
+                return TRUE;
+              default:
+#ifdef KEY_EVENT_DIAGNOSTICS
+                debug((" - Ctrl-Insert: no copy action\n"));
+#endif
+                break;
+            }
+	}
+
+        /*
+         * Another pair of copy-paste keys.
+         */
+	if ((event->state & GDK_SHIFT_MASK) &&
+            (event->state & GDK_CONTROL_MASK) &&
+            (event->keyval == GDK_KEY_C || event->keyval == GDK_KEY_c ||
+             event->keyval == GDK_KEY_V || event->keyval == GDK_KEY_v)) {
+            int cfgval = conf_get_int(inst->conf, CONF_ctrlshiftcv);
+            int paste = (event->keyval == GDK_KEY_V ||
+                         event->keyval == GDK_KEY_v);
+
+            switch (cfgval) {
+              case CLIPUI_IMPLICIT:
+                if (paste) {
+#ifdef KEY_EVENT_DIAGNOSTICS
+                    debug((" - Ctrl-Shift-V: paste from PRIMARY\n"));
+#endif
+                    term_request_paste(inst->term, CLIP_PRIMARY);
+                } else {
+#ifdef KEY_EVENT_DIAGNOSTICS
+                    debug((" - Ctrl-Shift-C: non-copy to PRIMARY\n"));
+#endif
+                }
+                return TRUE;
+              case CLIPUI_EXPLICIT:
+                if (paste) {
+#ifdef KEY_EVENT_DIAGNOSTICS
+                    debug((" - Ctrl-Shift-V: paste from CLIPBOARD\n"));
+#endif
+                    term_request_paste(inst->term, CLIP_CLIPBOARD);
+                } else {
+                    static const int clips[] = { CLIP_CLIPBOARD };
+#ifdef KEY_EVENT_DIAGNOSTICS
+                    debug((" - Ctrl-Shift-C: copy to CLIPBOARD\n"));
+#endif
+                    term_request_copy(inst->term, clips, lenof(clips));
+                }
+                return TRUE;
+            }
 	}
 
 	special = FALSE;
@@ -3086,7 +3169,7 @@ void init_clipboard(struct gui_data *inst)
 void paste_menu_action(void *frontend)
 {
     struct gui_data *inst = (struct gui_data *)frontend;
-    term_request_paste(inst->term, MENU_PASTE_CLIPBOARD);
+    term_request_paste(inst->term, CLIP_CLIPBOARD);
 }
 
 static void set_window_titles(struct gui_data *inst)
@@ -4169,6 +4252,32 @@ void event_log_menuitem(GtkMenuItem *item, gpointer data)
     showeventlog(inst->eventlogstuff, inst->window);
 }
 
+void setup_clipboards(Terminal *term, Conf *conf)
+{
+    assert(term->mouse_select_clipboards[0] == CLIP_LOCAL);
+
+    term->n_mouse_select_clipboards = 1;
+    term->mouse_select_clipboards[
+        term->n_mouse_select_clipboards++] = MOUSE_SELECT_CLIPBOARD;
+
+    if (conf_get_int(conf, CONF_mouseautocopy)) {
+        term->mouse_select_clipboards[
+            term->n_mouse_select_clipboards++] = CLIP_CLIPBOARD;
+    }
+
+    switch (conf_get_int(conf, CONF_mousepaste)) {
+      case CLIPUI_IMPLICIT:
+        term->mouse_paste_clipboard = MOUSE_PASTE_CLIPBOARD;
+        break;
+      case CLIPUI_EXPLICIT:
+        term->mouse_paste_clipboard = CLIP_CLIPBOARD;
+        break;
+      default:
+        term->mouse_paste_clipboard = CLIP_NULL;
+        break;
+    }
+}
+
 struct after_change_settings_dialog_ctx {
     struct gui_data *inst;
     Conf *newconf;
@@ -4243,6 +4352,7 @@ static void after_change_settings_dialog(void *vctx, int retval)
         }
         /* Pass new config data to the terminal */
         term_reconfig(inst->term, inst->conf);
+        setup_clipboards(inst->term, inst->conf);
         /* Pass new config data to the back end */
         if (inst->back)
 	    inst->back->reconfig(inst->backhandle, inst->conf);
@@ -5021,9 +5131,7 @@ void new_session_window(Conf *conf, const char *geometry_string)
     inst->eventlogstuff = eventlogstuff_new();
 
     inst->term = term_init(inst->conf, &inst->ucsdata, inst);
-    inst->term->mouse_select_clipboards[
-        inst->term->n_mouse_select_clipboards++] = MOUSE_SELECT_CLIPBOARD;
-    inst->term->mouse_paste_clipboard = MOUSE_PASTE_CLIPBOARD;
+    setup_clipboards(inst->term, inst->conf);
     inst->logctx = log_init(inst, inst->conf);
     term_provide_logctx(inst->term, inst->logctx);
 
diff --git a/unix/unix.h b/unix/unix.h
index d9e8f7a32..25f3cbda9 100644
--- a/unix/unix.h
+++ b/unix/unix.h
@@ -125,15 +125,31 @@ unsigned long getticks(void);
 
 #ifdef OSX_GTK
 /* OS X has no PRIMARY selection */
-#define SHIFT_INS_CLIPBOARD CLIP_CLIPBOARD
-#define MOUSE_SELECT_CLIPBOARD CLIP_CLIPBOARD
-#define MOUSE_PASTE_CLIPBOARD CLIP_CLIPBOARD
+#define MOUSE_SELECT_CLIPBOARD CLIP_NULL
+#define MOUSE_PASTE_CLIPBOARD CLIP_LOCAL
+#define CLIPNAME_IMPLICIT "Last selected text"
+#define CLIPNAME_EXPLICIT "System clipboard"
+#define CLIPNAME_EXPLICIT_OBJECT "system clipboard"
+/* These defaults are the ones that more or less comply with the OS X
+ * Human Interface Guidelines, i.e. copy/paste to the system clipboard
+ * is _not_ implicit but requires a specific UI action. This is at
+ * odds with all other PuTTY front ends' defaults, but on OS X there
+ * is no multi-decade precedent for PuTTY working the other way. */
+#define CLIPUI_DEFAULT_AUTOCOPY FALSE
+#define CLIPUI_DEFAULT_MOUSE CLIPUI_IMPLICIT
+#define CLIPUI_DEFAULT_INS CLIPUI_EXPLICIT
 #else
-#define SHIFT_INS_CLIPBOARD CLIP_PRIMARY
 #define MOUSE_SELECT_CLIPBOARD CLIP_PRIMARY
 #define MOUSE_PASTE_CLIPBOARD CLIP_PRIMARY
+#define CLIPNAME_IMPLICIT "PRIMARY"
+#define CLIPNAME_EXPLICIT "CLIPBOARD"
+#define CLIPNAME_EXPLICIT_OBJECT "CLIPBOARD"
+/* These defaults are the ones Unix PuTTY has historically had since
+ * it was first thought of in 2002 */
+#define CLIPUI_DEFAULT_AUTOCOPY FALSE
+#define CLIPUI_DEFAULT_MOUSE CLIPUI_IMPLICIT
+#define CLIPUI_DEFAULT_INS CLIPUI_IMPLICIT
 #endif
-#define MENU_PASTE_CLIPBOARD CLIP_CLIPBOARD
 
 /* The per-session frontend structure managed by gtkwin.c */
 struct gui_data;
diff --git a/windows/window.c b/windows/window.c
index 84799f480..4c63d7b0e 100644
--- a/windows/window.c
+++ b/windows/window.c
@@ -52,7 +52,8 @@
 #define IDM_SAVEDSESS 0x0160
 #define IDM_COPYALL   0x0170
 #define IDM_FULLSCREEN	0x0180
-#define IDM_PASTE     0x0190
+#define IDM_COPY      0x0190
+#define IDM_PASTE     0x01A0
 #define IDM_SPECIALSEP 0x0200
 
 #define IDM_SPECIAL_MIN 0x0400
@@ -106,6 +107,7 @@ static void make_full_screen(void);
 static void clear_full_screen(void);
 static void flip_full_screen(void);
 static void process_clipdata(HGLOBAL clipdata, int unicode);
+static void setup_clipboards(Terminal *, Conf *);
 
 /* Window layout information */
 static void reset_window(int);
@@ -637,9 +639,7 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
      * timer_change_notify() which will expect hwnd to exist.)
      */
     term = term_init(conf, &ucsdata, NULL);
-    term->mouse_select_clipboards[
-        term->n_mouse_select_clipboards++] = CLIP_SYSTEM;
-    term->mouse_paste_clipboard = CLIP_SYSTEM;
+    setup_clipboards(term, conf);
     logctx = log_init(NULL, conf);
     term_provide_logctx(term, logctx);
     term_size(term, conf_get_int(conf, CONF_height),
@@ -712,6 +712,7 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
 
 	popup_menus[SYSMENU].menu = GetSystemMenu(hwnd, FALSE);
 	popup_menus[CTXMENU].menu = CreatePopupMenu();
+	AppendMenu(popup_menus[CTXMENU].menu, MF_ENABLED, IDM_COPY, "&Copy");
 	AppendMenu(popup_menus[CTXMENU].menu, MF_ENABLED, IDM_PASTE, "&Paste");
 
 	savedsess_menu = CreateMenu();
@@ -853,6 +854,30 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
     return msg.wParam;		       /* ... but optimiser doesn't know */
 }
 
+static void setup_clipboards(Terminal *term, Conf *conf)
+{
+    assert(term->mouse_select_clipboards[0] == CLIP_LOCAL);
+
+    term->n_mouse_select_clipboards = 1;
+
+    if (conf_get_int(conf, CONF_mouseautocopy)) {
+        term->mouse_select_clipboards[
+            term->n_mouse_select_clipboards++] = CLIP_SYSTEM;
+    }
+
+    switch (conf_get_int(conf, CONF_mousepaste)) {
+      case CLIPUI_IMPLICIT:
+        term->mouse_paste_clipboard = CLIP_LOCAL;
+        break;
+      case CLIPUI_EXPLICIT:
+        term->mouse_paste_clipboard = CLIP_SYSTEM;
+        break;
+      default:
+        term->mouse_paste_clipboard = CLIP_NULL;
+        break;
+    }
+}
+
 /*
  * Clean up and exit.
  */
@@ -1998,6 +2023,8 @@ static void conf_cache_data(void)
     vtmode = conf_get_int(conf, CONF_vtmode);
 }
 
+static const int clips_system[] = { CLIP_SYSTEM };
+
 static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
 				WPARAM wParam, LPARAM lParam)
 {
@@ -2210,6 +2237,7 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
 
 		/* Pass new config data to the terminal */
 		term_reconfig(term, conf);
+                setup_clipboards(term, conf);
 
 		/* Pass new config data to the back end */
 		if (back)
@@ -2331,10 +2359,10 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
 	    }
 	    break;
 	  case IDM_COPYALL:
-            {
-                static const int clips[] = { CLIP_SYSTEM };
-                term_copyall(term, clips, lenof(clips));
-            }
+            term_copyall(term, clips_system, lenof(clips_system));
+	    break;
+	  case IDM_COPY:
+            term_request_copy(term, clips_system, lenof(clips_system));
 	    break;
 	  case IDM_PASTE:
 	    term_request_paste(term, CLIP_SYSTEM);
@@ -4151,8 +4179,54 @@ static int TranslateKey(UINT message, WPARAM wParam, LPARAM lParam,
 	    term_scroll_to_selection(term, (wParam == VK_PRIOR ? 0 : 1));
 	    return 0;
 	}
+	if (wParam == VK_INSERT && shift_state == 2) {
+            switch (conf_get_int(conf, CONF_ctrlshiftins)) {
+              case CLIPUI_IMPLICIT:
+                break;          /* no need to re-copy to CLIP_LOCAL */
+              case CLIPUI_EXPLICIT:
+                term_request_copy(term, clips_system, lenof(clips_system));
+                break;
+              default:
+                break;
+            }
+	    return 0;
+	}
 	if (wParam == VK_INSERT && shift_state == 1) {
-	    term_request_paste(term, CLIP_SYSTEM);
+            switch (conf_get_int(conf, CONF_ctrlshiftins)) {
+              case CLIPUI_IMPLICIT:
+                term_request_paste(term, CLIP_LOCAL);
+                break;
+              case CLIPUI_EXPLICIT:
+                term_request_paste(term, CLIP_SYSTEM);
+                break;
+              default:
+                break;
+            }
+	    return 0;
+	}
+	if (wParam == 'C' && shift_state == 3) {
+            switch (conf_get_int(conf, CONF_ctrlshiftcv)) {
+              case CLIPUI_IMPLICIT:
+                break;          /* no need to re-copy to CLIP_LOCAL */
+              case CLIPUI_EXPLICIT:
+                term_request_copy(term, clips_system, lenof(clips_system));
+                break;
+              default:
+                break;
+            }
+	    return 0;
+	}
+	if (wParam == 'V' && shift_state == 3) {
+            switch (conf_get_int(conf, CONF_ctrlshiftcv)) {
+              case CLIPUI_IMPLICIT:
+                term_request_paste(term, CLIP_LOCAL);
+                break;
+              case CLIPUI_EXPLICIT:
+                term_request_paste(term, CLIP_SYSTEM);
+                break;
+              default:
+                break;
+            }
 	    return 0;
 	}
 	if (left_alt && wParam == VK_F4 && conf_get_int(conf, CONF_alt_f4)) {
diff --git a/windows/winhelp.h b/windows/winhelp.h
index dbe32c919..56f06d785 100644
--- a/windows/winhelp.h
+++ b/windows/winhelp.h
@@ -123,6 +123,8 @@
 #define WINHELP_CTX_selection_charclasses "selection.charclasses:config-charclasses"
 #define WINHELP_CTX_selection_linedraw "selection.linedraw:config-linedrawpaste"
 #define WINHELP_CTX_selection_rtf "selection.rtf:config-rtfpaste"
+#define WINHELP_CTX_selection_autocopy "selection.autocopy:config-selection-autocopy"
+#define WINHELP_CTX_selection_clipactions "selection.clipactions:config-selection-clipactions"
 #define WINHELP_CTX_colours_ansi "colours.ansi:config-ansicolour"
 #define WINHELP_CTX_colours_xterm256 "colours.xterm256:config-xtermcolour"
 #define WINHELP_CTX_colours_truecolour "colours.truecolour:config-truecolour"
diff --git a/windows/winstuff.h b/windows/winstuff.h
index 39ff94265..84340b2f5 100644
--- a/windows/winstuff.h
+++ b/windows/winstuff.h
@@ -634,4 +634,15 @@ int remove_from_jumplist_registry(const char *item);
  * empty one. */
 char *get_jumplist_registry_entries(void);
 
+/*
+ * Windows clipboard-UI wording.
+ */
+#define CLIPNAME_IMPLICIT "Last selected text"
+#define CLIPNAME_EXPLICIT "System clipboard"
+#define CLIPNAME_EXPLICIT_OBJECT "system clipboard"
+/* These defaults are the ones PuTTY has historically had */
+#define CLIPUI_DEFAULT_AUTOCOPY TRUE
+#define CLIPUI_DEFAULT_MOUSE CLIPUI_EXPLICIT
+#define CLIPUI_DEFAULT_INS CLIPUI_EXPLICIT
+
 #endif

From 018aa5764505634e86df7c6eff6aae4ce98f6fe4 Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Sun, 17 Dec 2017 10:54:13 +0000
Subject: [PATCH 148/166] Tick off another two OS X todo items.

I've done the general clipboard revamp, and also, since I added
Ctrl-Shift-{C,V} as a new pair of UI actions for copy and paste, I've
also fulfilled the requirement that there should be some method of
non-menu-based pasting that doesn't depend on a middle mouse button or
an Ins key.

I think the list of OS X missing features is now down to details of
the OS X GTK port _itself_, as opposed to structural issues in the
general code base.
---
 unix/gtkapp.c | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/unix/gtkapp.c b/unix/gtkapp.c
index 57358dcb6..c492d2b23 100644
--- a/unix/gtkapp.c
+++ b/unix/gtkapp.c
@@ -49,19 +49,6 @@ but if I mouse off the menu and back on (without un-popping-it-up)
 then suddenly that does work. I don't know if this is something I can
 fix, though; it might very well be a quirk of the underlying GTK.
 
-I want to arrange *some* way to paste efficiently using my Apple
-wireless keyboard and trackpad. The trackpad doesn't provide a middle
-button; I can't use the historic Shift-Ins shortcut because the
-keyboard has no Ins key; I configure the Command key to be Meta, so
-Command-V is off the table too. I can always use the menu, but I'd
-prefer there to be _some_ easily reachable mouse or keyboard gesture.
-
-Revamping the clipboard handling in general is going to be needed, as
-well. Not everybody will want the current auto-copy-on-select
-behaviour inherited from ordinary Unix PuTTY. Should arrange to have a
-mode in which you have to take an explicit Copy action, and then
-arrange that the Edit menu includes one of those.
-
 The application menu bar is very minimal at the moment. Should include
 all the usual stuff from the Ctrl-right-click menu - saved sessions,
 mid-session special commands, Duplicate Session, Change Settings,

From 2a76f8d4a28e01d4cb82ee9858616f13759089f6 Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Sun, 17 Dec 2017 18:44:27 +0000
Subject: [PATCH 149/166] Support custom clipboard names under X.

This required me to turn the drop-lists into combo boxes and add an
extra string-typed Conf setting alongside each enumerated value.
---
 config.c       | 104 +++++++++++++++++++++++++++++------
 doc/config.but |  12 +++-
 putty.h        |   3 +
 settings.c     |  31 ++++++++---
 unix/gtkwin.c  | 145 ++++++++++++++++++++++++++++++++++++++-----------
 unix/unix.h    |   5 ++
 6 files changed, 242 insertions(+), 58 deletions(-)

diff --git a/config.c b/config.c
index df9998499..a12a6d646 100644
--- a/config.c
+++ b/config.c
@@ -1342,29 +1342,100 @@ static void clipboard_selector_handler(union control *ctrl, void *dlg,
 {
     Conf *conf = (Conf *)data;
     int setting = ctrl->generic.context.i;
+#ifdef NAMED_CLIPBOARDS
+    int strsetting = ctrl->editbox.context2.i;
+#endif
+
+    static const struct {
+        const char *name;
+        int id;
+    } options[] = {
+        {"No action", CLIPUI_NONE},
+        {CLIPNAME_IMPLICIT, CLIPUI_IMPLICIT},
+        {CLIPNAME_EXPLICIT, CLIPUI_EXPLICIT},
+    };
 
     if (event == EVENT_REFRESH) {
         int i, val = conf_get_int(conf, setting);
 
         dlg_update_start(ctrl, dlg);
         dlg_listbox_clear(ctrl, dlg);
-        dlg_listbox_addwithid(ctrl, dlg, "No action", CLIPUI_NONE);
-        dlg_listbox_addwithid(ctrl, dlg, CLIPNAME_IMPLICIT, CLIPUI_IMPLICIT);
-        dlg_listbox_addwithid(ctrl, dlg, CLIPNAME_EXPLICIT, CLIPUI_EXPLICIT);
+
+#ifdef NAMED_CLIPBOARDS
+        for (i = 0; i < lenof(options); i++)
+            dlg_listbox_add(ctrl, dlg, options[i].name);
+        if (val == CLIPUI_CUSTOM) {
+            const char *sval = conf_get_str(conf, strsetting);
+            for (i = 0; i < lenof(options); i++)
+                if (!strcmp(sval, options[i].name))
+                    break;             /* needs escaping */
+            if (i < lenof(options) || sval[0] == '=') {
+                char *escaped = dupcat("=", sval, (const char *)NULL);
+                dlg_editbox_set(ctrl, dlg, escaped);
+                sfree(escaped);
+            } else {
+                dlg_editbox_set(ctrl, dlg, sval);
+            }
+        } else {
+            dlg_editbox_set(ctrl, dlg, options[0].name); /* fallback */
+            for (i = 0; i < lenof(options); i++)
+                if (val == options[i].id)
+                    dlg_editbox_set(ctrl, dlg, options[i].name);
+        }
+#else
+        for (i = 0; i < lenof(options); i++)
+            dlg_listbox_addwithid(ctrl, dlg, options[i].name, options[i].id);
         dlg_listbox_select(ctrl, dlg, 0); /* fallback */
-        for (i = 0; i < 3; i++)
-            if (val == dlg_listbox_getid(ctrl, dlg, i))
+        for (i = 0; i < lenof(options); i++)
+            if (val == options[i].id)
                 dlg_listbox_select(ctrl, dlg, i);
+#endif
 	dlg_update_done(ctrl, dlg);
-    } else if (event == EVENT_SELCHANGE) {
+    } else if (event == EVENT_SELCHANGE
+#ifdef NAMED_CLIPBOARDS
+               || event == EVENT_VALCHANGE
+#endif
+        ) {
+#ifdef NAMED_CLIPBOARDS
+        const char *sval = dlg_editbox_get(ctrl, dlg);
+        int i;
+
+        for (i = 0; i < lenof(options); i++)
+            if (!strcmp(sval, options[i].name)) {
+                conf_set_int(conf, setting, options[i].id);
+                conf_set_str(conf, strsetting, "");
+                break;
+            }
+        if (i == lenof(options)) {
+            conf_set_int(conf, setting, CLIPUI_CUSTOM);
+            if (sval[0] == '=')
+                sval++;
+            conf_set_str(conf, strsetting, sval);
+        }
+#else
         int index = dlg_listbox_index(ctrl, dlg);
         if (index >= 0) {
             int val = dlg_listbox_getid(ctrl, dlg, index);
             conf_set_int(conf, setting, val);
         }
+#endif
     }
 }
 
+static void clipboard_control(struct controlset *s, const char *label,
+                              char shortcut, int percentage, intorptr helpctx,
+                              int setting, int strsetting)
+{
+#ifdef NAMED_CLIPBOARDS
+    ctrl_combobox(s, label, shortcut, percentage, helpctx,
+                  clipboard_selector_handler, I(setting), I(strsetting));
+#else
+    /* strsetting isn't needed in this case */
+    ctrl_droplist(s, label, shortcut, percentage, helpctx,
+                  clipboard_selector_handler, I(setting));
+#endif
+}
+
 void setup_config_box(struct controlbox *b, int midsession,
 		      int protocol, int protcfginfo)
 {
@@ -1894,18 +1965,15 @@ void setup_config_box(struct controlbox *b, int midsession,
                   CLIPNAME_EXPLICIT_OBJECT,
                   NO_SHORTCUT, HELPCTX(selection_autocopy),
                   conf_checkbox_handler, I(CONF_mouseautocopy));
-    ctrl_droplist(s, "Mouse paste action:", NO_SHORTCUT, 60,
-                  HELPCTX(selection_clipactions),
-                  clipboard_selector_handler,
-                  I(CONF_mousepaste));
-    ctrl_droplist(s, "{Ctrl,Shift} + Ins:", NO_SHORTCUT, 60,
-                  HELPCTX(selection_clipactions),
-                  clipboard_selector_handler,
-                  I(CONF_ctrlshiftins));
-    ctrl_droplist(s, "Ctrl + Shift + {C,V}:", NO_SHORTCUT, 60,
-                  HELPCTX(selection_clipactions),
-                  clipboard_selector_handler,
-                  I(CONF_ctrlshiftcv));
+    clipboard_control(s, "Mouse paste action:", NO_SHORTCUT, 60,
+                      HELPCTX(selection_clipactions),
+                      CONF_mousepaste, CONF_mousepaste_custom);
+    clipboard_control(s, "{Ctrl,Shift} + Ins:", NO_SHORTCUT, 60,
+                      HELPCTX(selection_clipactions),
+                      CONF_ctrlshiftins, CONF_ctrlshiftins_custom);
+    clipboard_control(s, "Ctrl + Shift + {C,V}:", NO_SHORTCUT, 60,
+                      HELPCTX(selection_clipactions),
+                      CONF_ctrlshiftcv, CONF_ctrlshiftcv_custom);
 
     /*
      * The Window/Selection/Words panel.
diff --git a/doc/config.but b/doc/config.but
index 3edce1b7d..790365827 100644
--- a/doc/config.but
+++ b/doc/config.but
@@ -1520,7 +1520,7 @@ actions pastes from (including turning the paste action off
 completely). On platforms with a single system clipboard, the
 available options are to paste from that clipboard or to paste from
 PuTTY's internal memory of the last selected text within that window.
-On X, the options are \cw{CLIPBOARD} or \cw{PRIMARY}.
+On X, the standard options are \cw{CLIPBOARD} or \cw{PRIMARY}.
 
 (\cw{PRIMARY} is conceptually similar in that it \e{also} refers to
 the last selected text \dash just across all applications instead of
@@ -1531,6 +1531,16 @@ The two keyboard options each come with a corresponding key to copy
 from, Ctrl-Ins will copy to the same location; similarly, Ctrl-Shift-C
 will copy to whatever Ctrl-Shift-V pastes from.
 
+On X, you can also enter a selection name of your choice. For example,
+there is a rarely-used standard selection called \cq{SECONDARY}, which
+Emacs (for example) can work with if you hold down the Meta key while
+dragging to select or clicking to paste; if you configure a PuTTY
+keyboard action to access this clipboard, then you can interoperate
+with other applications' use of it. Another thing you could do would
+be to invent a clipboard name yourself, to create a special clipboard
+shared \e{only} between instances of PuTTY, or between just instances
+configured in that particular way.
+
 \H{config-selection-words} The Words panel
 
 PuTTY will \I{word-by-word selection}select a word at a time in the
diff --git a/putty.h b/putty.h
index ca00b666c..4c64cb85e 100644
--- a/putty.h
+++ b/putty.h
@@ -903,6 +903,9 @@ void cleanup_exit(int);
     X(INT, NONE, mousepaste) \
     X(INT, NONE, ctrlshiftins) \
     X(INT, NONE, ctrlshiftcv) \
+    X(STR, NONE, mousepaste_custom) \
+    X(STR, NONE, ctrlshiftins_custom) \
+    X(STR, NONE, ctrlshiftcv_custom) \
     /* translations */ \
     X(INT, NONE, vtmode) \
     X(STR, NONE, line_codepage) \
diff --git a/settings.c b/settings.c
index 0433adc3c..a51f3d588 100644
--- a/settings.c
+++ b/settings.c
@@ -448,7 +448,7 @@ static void wprefs(void *sesskey, const char *name,
 }
 
 static void write_clip_setting(void *handle, const char *savekey,
-                               Conf *conf, int confkey)
+                               Conf *conf, int confkey, int strconfkey)
 {
     int val = conf_get_int(conf, confkey);
     switch (val) {
@@ -462,21 +462,33 @@ static void write_clip_setting(void *handle, const char *savekey,
       case CLIPUI_EXPLICIT:
         write_setting_s(handle, savekey, "explicit");
         break;
+      case CLIPUI_CUSTOM:
+        {
+            char *sval = dupcat("custom:", conf_get_str(conf, strconfkey),
+                                (const char *)NULL);
+            write_setting_s(handle, savekey, sval);
+            sfree(sval);
+        }
+        break;
     }
 }
 
 static void read_clip_setting(void *handle, const char *savekey,
-                              int def, Conf *conf, int confkey)
+                              int def, Conf *conf, int confkey, int strconfkey)
 {
     char *setting = read_setting_s(handle, savekey);
     int val;
 
+    conf_set_str(conf, strconfkey, "");
     if (!setting) {
         val = def;
     } else if (!strcmp(setting, "implicit")) {
         val = CLIPUI_IMPLICIT;
     } else if (!strcmp(setting, "explicit")) {
         val = CLIPUI_EXPLICIT;
+    } else if (!strncmp(setting, "custom:", 7)) {
+        val = CLIPUI_CUSTOM;
+        conf_set_str(conf, strconfkey, setting + 7);
     } else {
         val = CLIPUI_NONE;
     }
@@ -676,9 +688,12 @@ void save_open_settings(void *sesskey, Conf *conf)
     }
     write_setting_i(sesskey, "MouseAutocopy",
                     conf_get_int(conf, CONF_mouseautocopy));
-    write_clip_setting(sesskey, "MousePaste", conf, CONF_mousepaste);
-    write_clip_setting(sesskey, "CtrlShiftIns", conf, CONF_ctrlshiftins);
-    write_clip_setting(sesskey, "CtrlShiftCV", conf, CONF_ctrlshiftcv);
+    write_clip_setting(sesskey, "MousePaste", conf,
+                       CONF_mousepaste, CONF_mousepaste_custom);
+    write_clip_setting(sesskey, "CtrlShiftIns", conf,
+                       CONF_ctrlshiftins, CONF_ctrlshiftins_custom);
+    write_clip_setting(sesskey, "CtrlShiftCV", conf,
+                       CONF_ctrlshiftcv, CONF_ctrlshiftcv_custom);
     write_setting_s(sesskey, "LineCodePage", conf_get_str(conf, CONF_line_codepage));
     write_setting_i(sesskey, "CJKAmbigWide", conf_get_int(conf, CONF_cjk_ambig_wide));
     write_setting_i(sesskey, "UTF8Override", conf_get_int(conf, CONF_utf8_override));
@@ -1103,11 +1118,11 @@ void load_open_settings(void *sesskey, Conf *conf)
     gppi(sesskey, "MouseAutocopy", CLIPUI_DEFAULT_AUTOCOPY,
          conf, CONF_mouseautocopy);
     read_clip_setting(sesskey, "MousePaste", CLIPUI_DEFAULT_MOUSE,
-                      conf, CONF_mousepaste);
+                      conf, CONF_mousepaste, CONF_mousepaste_custom);
     read_clip_setting(sesskey, "CtrlShiftIns", CLIPUI_DEFAULT_INS,
-                      conf, CONF_ctrlshiftins);
+                      conf, CONF_ctrlshiftins, CONF_ctrlshiftins_custom);
     read_clip_setting(sesskey, "CtrlShiftCV", CLIPUI_NONE,
-                      conf, CONF_ctrlshiftcv);
+                      conf, CONF_ctrlshiftcv, CONF_ctrlshiftcv_custom);
     /*
      * The empty default for LineCodePage will be converted later
      * into a plausible default for the locale.
diff --git a/unix/gtkwin.c b/unix/gtkwin.c
index 6811838ab..f117f6108 100644
--- a/unix/gtkwin.c
+++ b/unix/gtkwin.c
@@ -115,6 +115,7 @@ struct gui_data {
 #endif
     int direct_to_font;
     struct clipboard_state clipstates[N_CLIPBOARDS];
+    int clipboard_ctrlshiftins, clipboard_ctrlshiftcv;
     int font_width, font_height;
     int width, height;
     int ignore_sbar;
@@ -1041,6 +1042,12 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data)
 #endif
                 term_request_paste(inst->term, CLIP_CLIPBOARD);
                 return TRUE;
+              case CLIPUI_CUSTOM:
+#ifdef KEY_EVENT_DIAGNOSTICS
+                debug((" - Shift-Insert: paste from custom clipboard\n"));
+#endif
+                term_request_paste(inst->term, inst->clipboard_ctrlshiftins);
+                return TRUE;
               default:
 #ifdef KEY_EVENT_DIAGNOSTICS
                 debug((" - Shift-Insert: no paste action\n"));
@@ -1067,6 +1074,13 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data)
                 term_request_copy(inst->term,
                                   clips_clipboard, lenof(clips_clipboard));
                 return TRUE;
+              case CLIPUI_CUSTOM:
+#ifdef KEY_EVENT_DIAGNOSTICS
+                debug((" - Ctrl-Insert: copy to custom clipboard\n"));
+#endif
+                term_request_copy(inst->term,
+                                  &inst->clipboard_ctrlshiftins, 1);
+                return TRUE;
               default:
 #ifdef KEY_EVENT_DIAGNOSTICS
                 debug((" - Ctrl-Insert: no copy action\n"));
@@ -1113,6 +1127,21 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data)
                     term_request_copy(inst->term, clips, lenof(clips));
                 }
                 return TRUE;
+              case CLIPUI_CUSTOM:
+                if (paste) {
+#ifdef KEY_EVENT_DIAGNOSTICS
+                    debug((" - Ctrl-Shift-V: paste from custom clipboard\n"));
+#endif
+                    term_request_paste(inst->term,
+                                       inst->clipboard_ctrlshiftcv);
+                } else {
+#ifdef KEY_EVENT_DIAGNOSTICS
+                    debug((" - Ctrl-Shift-C: copy to custom clipboard\n"));
+#endif
+                    term_request_copy(inst->term,
+                                      &inst->clipboard_ctrlshiftcv, 1);
+                }
+                return TRUE;
             }
 	}
 
@@ -2571,6 +2600,20 @@ void palette_reset(void *frontend)
     }
 }
 
+static struct clipboard_state *clipboard_from_atom(
+    struct gui_data *inst, GdkAtom atom)
+{
+    int i;
+
+    for (i = 0; i < N_CLIPBOARDS; i++) {
+        struct clipboard_state *state = &inst->clipstates[i];
+        if (state->inst == inst && state->atom == atom)
+            return state;
+    }
+
+    return NULL;
+}
+
 #ifdef JUST_USE_GTK_CLIPBOARD_UTF8
 
 /* ----------------------------------------------------------------------
@@ -2580,25 +2623,27 @@ void palette_reset(void *frontend)
  * formats it feels like.
  */
 
-static void init_one_clipboard(struct gui_data *inst, int clipboard,
-                               GdkAtom atom)
+void set_clipboard_atom(struct gui_data *inst, int clipboard, GdkAtom atom)
 {
     struct clipboard_state *state = &inst->clipstates[clipboard];
 
     state->inst = inst;
-    state->atom = atom;
     state->clipboard = clipboard;
+    state->atom = atom;
 
-    state->gtkclipboard = gtk_clipboard_get_for_display(
-        gdk_display_get_default(), atom);
-
-    g_object_set_data(G_OBJECT(state->gtkclipboard), "user-data", state);
+    if (state->atom != GDK_NONE) {
+        state->gtkclipboard = gtk_clipboard_get_for_display(
+            gdk_display_get_default(), state->atom);
+        g_object_set_data(G_OBJECT(state->gtkclipboard), "user-data", state);
+    } else {
+        state->gtkclipboard = NULL;
+    }
 }
 
 int init_clipboard(struct gui_data *inst)
 {
-    init_one_clipboard(inst, CLIP_PRIMARY, GDK_SELECTION_PRIMARY);
-    init_one_clipboard(inst, CLIP_CLIPBOARD, GDK_SELECTION_CLIPBOARD);
+    set_clipboard_atom(inst, CLIP_PRIMARY, GDK_SELECTION_PRIMARY);
+    set_clipboard_atom(inst, CLIP_CLIPBOARD, GDK_SELECTION_CLIPBOARD);
     return TRUE;
 }
 
@@ -2663,6 +2708,9 @@ void write_clip(void *frontend, int clipboard,
         return;
     }
 
+    if (!state->gtkclipboard)
+        return;
+
     cdi = snew(struct clipboard_data_instance);
     state->current_cdi = cdi;
     cdi->pasteout_data_utf8 = snewn(len*6, char);
@@ -2721,6 +2769,10 @@ void frontend_request_paste(void *frontend, int clipboard)
 {
     struct gui_data *inst = (struct gui_data *)frontend;
     struct clipboard_state *state = &inst->clipstates[clipboard];
+
+    if (!state->gtkclipboard)
+        return;
+
     gtk_clipboard_request_text(state->gtkclipboard,
                                clipboard_text_received, inst);
 }
@@ -2881,20 +2933,6 @@ void write_clip(void *frontend, int clipboard,
 	term_lost_clipboard_ownership(inst->term, clipboard);
 }
 
-static struct clipboard_state *clipboard_from_atom(
-    struct gui_data *inst, GdkAtom atom)
-{
-    int i;
-
-    for (i = 0; i < N_CLIPBOARDS; i++) {
-        struct clipboard_state *state = &inst->clipstates[i];
-        if (state->inst == inst && state->atom == atom)
-            return state;
-    }
-
-    return NULL;
-}
-
 static void selection_get(GtkWidget *widget, GtkSelectionData *seldata,
                           guint info, guint time_stamp, gpointer data)
 {
@@ -3103,14 +3141,22 @@ static void selection_received(GtkWidget *widget, GtkSelectionData *seldata,
 #endif
 }
 
-static void init_one_clipboard(struct gui_data *inst, int clipboard,
-                               GdkAtom atom)
+static void init_one_clipboard(struct gui_data *inst, int clipboard)
+{
+    struct clipboard_state *state = &inst->clipstates[clipboard];
+
+    state->inst = inst;
+    state->clipboard = clipboard;
+}
+
+void set_clipboard_atom(struct gui_data *inst, int clipboard, GdkAtom atom)
 {
     struct clipboard_state *state = &inst->clipstates[clipboard];
 
     state->inst = inst;
-    state->atom = atom;
     state->clipboard = clipboard;
+
+    state->atom = atom;
 }
 
 void init_clipboard(struct gui_data *inst)
@@ -3148,8 +3194,10 @@ void init_clipboard(struct gui_data *inst)
 		    XA_CUT_BUFFER7, XA_STRING, 8, PropModeAppend, empty, 0);
 #endif
 
-    init_one_clipboard(inst, CLIP_PRIMARY, GDK_SELECTION_PRIMARY);
-    init_one_clipboard(inst, CLIP_CLIPBOARD, GDK_SELECTION_CLIPBOARD);
+    inst->clipstates[CLIP_PRIMARY].atom = GDK_SELECTION_PRIMARY;
+    inst->clipstates[CLIP_CLIPBOARD].atom = GDK_SELECTION_CLIPBOARD;
+    init_one_clipboard(inst, CLIP_PRIMARY);
+    init_one_clipboard(inst, CLIP_CLIPBOARD);
 
     g_signal_connect(G_OBJECT(inst->area), "selection_received",
                      G_CALLBACK(selection_received), inst);
@@ -4252,7 +4300,7 @@ void event_log_menuitem(GtkMenuItem *item, gpointer data)
     showeventlog(inst->eventlogstuff, inst->window);
 }
 
-void setup_clipboards(Terminal *term, Conf *conf)
+void setup_clipboards(struct gui_data *inst, Terminal *term, Conf *conf)
 {
     assert(term->mouse_select_clipboards[0] == CLIP_LOCAL);
 
@@ -4265,6 +4313,10 @@ void setup_clipboards(Terminal *term, Conf *conf)
             term->n_mouse_select_clipboards++] = CLIP_CLIPBOARD;
     }
 
+    set_clipboard_atom(inst, CLIP_CUSTOM_1, GDK_NONE);
+    set_clipboard_atom(inst, CLIP_CUSTOM_2, GDK_NONE);
+    set_clipboard_atom(inst, CLIP_CUSTOM_3, GDK_NONE);
+
     switch (conf_get_int(conf, CONF_mousepaste)) {
       case CLIPUI_IMPLICIT:
         term->mouse_paste_clipboard = MOUSE_PASTE_CLIPBOARD;
@@ -4272,10 +4324,41 @@ void setup_clipboards(Terminal *term, Conf *conf)
       case CLIPUI_EXPLICIT:
         term->mouse_paste_clipboard = CLIP_CLIPBOARD;
         break;
+      case CLIPUI_CUSTOM:
+        term->mouse_paste_clipboard = CLIP_CUSTOM_1;
+        set_clipboard_atom(inst, CLIP_CUSTOM_1,
+                           gdk_atom_intern(
+                               conf_get_str(conf, CONF_mousepaste_custom),
+                               FALSE));
+        break;
       default:
         term->mouse_paste_clipboard = CLIP_NULL;
         break;
     }
+
+    if (conf_get_int(conf, CONF_ctrlshiftins) == CLIPUI_CUSTOM) {
+        GdkAtom atom = gdk_atom_intern(
+            conf_get_str(conf, CONF_ctrlshiftins_custom), FALSE);
+        struct clipboard_state *state = clipboard_from_atom(inst, atom);
+        if (state) {
+            inst->clipboard_ctrlshiftins = state->clipboard;
+        } else {
+            inst->clipboard_ctrlshiftins = CLIP_CUSTOM_2;
+            set_clipboard_atom(inst, CLIP_CUSTOM_2, atom);
+        }
+    }
+
+    if (conf_get_int(conf, CONF_ctrlshiftcv) == CLIPUI_CUSTOM) {
+        GdkAtom atom = gdk_atom_intern(
+            conf_get_str(conf, CONF_ctrlshiftcv_custom), FALSE);
+        struct clipboard_state *state = clipboard_from_atom(inst, atom);
+        if (state) {
+            inst->clipboard_ctrlshiftins = state->clipboard;
+        } else {
+            inst->clipboard_ctrlshiftcv = CLIP_CUSTOM_3;
+            set_clipboard_atom(inst, CLIP_CUSTOM_3, atom);
+        }
+    }
 }
 
 struct after_change_settings_dialog_ctx {
@@ -4352,7 +4435,7 @@ static void after_change_settings_dialog(void *vctx, int retval)
         }
         /* Pass new config data to the terminal */
         term_reconfig(inst->term, inst->conf);
-        setup_clipboards(inst->term, inst->conf);
+        setup_clipboards(inst, inst->term, inst->conf);
         /* Pass new config data to the back end */
         if (inst->back)
 	    inst->back->reconfig(inst->backhandle, inst->conf);
@@ -5131,7 +5214,7 @@ void new_session_window(Conf *conf, const char *geometry_string)
     inst->eventlogstuff = eventlogstuff_new();
 
     inst->term = term_init(inst->conf, &inst->ucsdata, inst);
-    setup_clipboards(inst->term, inst->conf);
+    setup_clipboards(inst, inst->term, inst->conf);
     inst->logctx = log_init(inst, inst->conf);
     term_provide_logctx(inst->term, inst->logctx);
 
diff --git a/unix/unix.h b/unix/unix.h
index 25f3cbda9..dc216b4ae 100644
--- a/unix/unix.h
+++ b/unix/unix.h
@@ -121,6 +121,9 @@ unsigned long getticks(void);
 #define PLATFORM_CLIPBOARDS(X)                            \
     X(CLIP_PRIMARY, "X11 primary selection")              \
     X(CLIP_CLIPBOARD, "XDG clipboard")                    \
+    X(CLIP_CUSTOM_1, "<custom#1>")                        \
+    X(CLIP_CUSTOM_2, "<custom#2>")                        \
+    X(CLIP_CUSTOM_3, "<custom#3>")                        \
     /* end of list */
 
 #ifdef OSX_GTK
@@ -149,6 +152,8 @@ unsigned long getticks(void);
 #define CLIPUI_DEFAULT_AUTOCOPY FALSE
 #define CLIPUI_DEFAULT_MOUSE CLIPUI_IMPLICIT
 #define CLIPUI_DEFAULT_INS CLIPUI_IMPLICIT
+/* X11 supports arbitrary named clipboards */
+#define NAMED_CLIPBOARDS
 #endif
 
 /* The per-session frontend structure managed by gtkwin.c */

From 1af9c425ba520957f08372d707ae9d957c437db4 Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Sun, 17 Dec 2017 20:12:52 +0000
Subject: [PATCH 150/166] Better protection against stale
 clipboard_data_instances.

I had a segfault on OS X today at Pterm.app shutdown. I wasn't able to
reproduce it in a debugger, but the cause seemed to be that
clipboard_clear called term_deselect (this was from before the patch
series that renamed that function) when inst->term was already NULL.

This must be because a clipboard_data_instance outlived its associated
inst->term, and quite likely its associated inst as well. But we can't
free those structures when a gui_data is freed, because GTK callbacks
will still depend on them; so instead we must have each gui_data keep
a list of active cdis pointing at it, and then at destruction time,
walk along the list nulling out each one's pointer to part of itself.
---
 unix/gtkwin.c | 78 ++++++++++++++++++++++++++++++++++++---------------
 1 file changed, 55 insertions(+), 23 deletions(-)

diff --git a/unix/gtkwin.c b/unix/gtkwin.c
index f117f6108..4b380ddcb 100644
--- a/unix/gtkwin.c
+++ b/unix/gtkwin.c
@@ -52,7 +52,23 @@
 
 GdkAtom compound_text_atom, utf8_string_atom;
 
-struct clipboard_data_instance;
+#ifdef JUST_USE_GTK_CLIPBOARD_UTF8
+/*
+ * Because calling gtk_clipboard_set_with_data triggers a call to the
+ * clipboard_clear function from the last time, we need to arrange a
+ * way to distinguish a real call to clipboard_clear for the _new_
+ * instance of the clipboard data from the leftover call for the
+ * outgoing one. We do this by setting the user data field in our
+ * gtk_clipboard_set_with_data() call, instead of the obvious pointer
+ * to 'inst', to one of these.
+ */
+struct clipboard_data_instance {
+    char *pasteout_data_utf8;
+    int pasteout_data_utf8_len;
+    struct clipboard_state *state;
+    struct clipboard_data_instance *next, *prev;
+};
+#endif
 
 struct clipboard_state {
     struct gui_data *inst;
@@ -115,6 +131,12 @@ struct gui_data {
 #endif
     int direct_to_font;
     struct clipboard_state clipstates[N_CLIPBOARDS];
+#ifdef JUST_USE_GTK_CLIPBOARD_UTF8
+    /* Remember all clipboard_data_instance structures currently
+     * associated with this gui_data, in case they're still around
+     * when it gets destroyed */
+    struct clipboard_data_instance cdi_headtail;
+#endif
     int clipboard_ctrlshiftins, clipboard_ctrlshiftcv;
     int font_width, font_height;
     int width, height;
@@ -2298,6 +2320,21 @@ static void delete_inst(struct gui_data *inst)
         inst->logctx = NULL;
     }
 
+#ifdef JUST_USE_GTK_CLIPBOARD_UTF8
+    /*
+     * Clear up any in-flight clipboard_data_instances. We can't
+     * actually _free_ them, but we detach them from the inst that's
+     * about to be destroyed.
+     */
+    while (inst->cdi_headtail.next != &inst->cdi_headtail) {
+        struct clipboard_data_instance *cdi = inst->cdi_headtail.next;
+        cdi->state = NULL;
+        cdi->next->prev = cdi->prev;
+        cdi->prev->next = cdi->next;
+        cdi->next = cdi->prev = cdi;
+    }
+#endif
+
     /*
      * Delete any top-level callbacks associated with inst, which
      * would otherwise become stale-pointer dereferences waiting to
@@ -2647,30 +2684,14 @@ int init_clipboard(struct gui_data *inst)
     return TRUE;
 }
 
-/*
- * Because calling gtk_clipboard_set_with_data triggers a call to the
- * clipboard_clear function from the last time, we need to arrange a
- * way to distinguish a real call to clipboard_clear for the _new_
- * instance of the clipboard data from the leftover call for the
- * outgoing one. We do this by setting the user data field in our
- * gtk_clipboard_set_with_data() call, instead of the obvious pointer
- * to 'inst', to one of these.
- */
-struct clipboard_data_instance {
-    char *pasteout_data_utf8;
-    int pasteout_data_utf8_len;
-};
-
 static void clipboard_provide_data(GtkClipboard *clipboard,
                                    GtkSelectionData *selection_data,
                                    guint info, gpointer data)
 {
     struct clipboard_data_instance *cdi =
         (struct clipboard_data_instance *)data;
-    struct clipboard_state *state = (struct clipboard_state *)
-        g_object_get_data(G_OBJECT(clipboard), "user-data");
 
-    if (state->current_cdi == cdi) {
+    if (cdi->state && cdi->state->current_cdi == cdi) {
         gtk_selection_data_set_text(selection_data, cdi->pasteout_data_utf8,
                                     cdi->pasteout_data_utf8_len);
     }
@@ -2680,14 +2701,17 @@ static void clipboard_clear(GtkClipboard *clipboard, gpointer data)
 {
     struct clipboard_data_instance *cdi =
         (struct clipboard_data_instance *)data;
-    struct clipboard_state *state = (struct clipboard_state *)
-        g_object_get_data(G_OBJECT(clipboard), "user-data");
 
-    if (state->current_cdi == cdi) {
-        term_lost_clipboard_ownership(state->inst->term, state->clipboard);
-        state->current_cdi = NULL;
+    if (cdi->state && cdi->state->current_cdi == cdi) {
+        if (cdi->state->inst && cdi->state->inst->term) {
+            term_lost_clipboard_ownership(cdi->state->inst->term,
+                                          cdi->state->clipboard);
+        }
+        cdi->state->current_cdi = NULL;
     }
     sfree(cdi->pasteout_data_utf8);
+    cdi->next->prev = cdi->next;
+    cdi->prev->next = cdi->prev;
     sfree(cdi);
 }
 
@@ -2712,8 +2736,13 @@ void write_clip(void *frontend, int clipboard,
         return;
 
     cdi = snew(struct clipboard_data_instance);
+    cdi->state = state;
     state->current_cdi = cdi;
     cdi->pasteout_data_utf8 = snewn(len*6, char);
+    cdi->prev = inst->cdi_headtail.prev;
+    cdi->next = &inst->cdi_headtail;
+    cdi->next->prev = cdi;
+    cdi->prev->next = cdi;
     {
         const wchar_t *tmp = data;
         int tmplen = len;
@@ -4897,6 +4926,9 @@ void new_session_window(Conf *conf, const char *geometry_string)
      */
     inst = snew(struct gui_data);
     memset(inst, 0, sizeof(*inst));
+#ifdef JUST_USE_GTK_CLIPBOARD_UTF8
+    inst->cdi_headtail.next = inst->cdi_headtail.prev = &inst->cdi_headtail;
+#endif
     inst->alt_keycode = -1;            /* this one needs _not_ to be zero */
     inst->busy_status = BUSY_NOT;
     inst->conf = conf;

From 1ed2f98c899b17e39004401d4dfbeb9857726864 Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Sun, 17 Dec 2017 20:18:20 +0000
Subject: [PATCH 151/166] Add missing g_application_hold on Duplicate Session.

The omission of this call caused a GTK assertion failure when the
GApplication's use count went negative after two releases and only one
hold.
---
 unix/gtkapp.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/unix/gtkapp.c b/unix/gtkapp.c
index c492d2b23..4afe8be53 100644
--- a/unix/gtkapp.c
+++ b/unix/gtkapp.c
@@ -156,6 +156,7 @@ void launch_duplicate_session(Conf *conf)
 {
     extern const int dup_check_launchable;
     assert(!dup_check_launchable || conf_launchable(conf));
+    g_application_hold(G_APPLICATION(app));
     new_session_window(conf_copy(conf), NULL);
 }
 

From 7bc637ad0785ebb5749bd74f6a7be7d637516456 Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Sun, 17 Dec 2017 20:35:45 +0000
Subject: [PATCH 152/166] Sort out clipboard-related menu items.

The gtkapp.c menu now has a Copy as well as Paste option; those menu
items, as well as the corresponding ones on the context menu and Copy
All, now address sets of clipboards parametrised between OS X and
ordinary GTK in unix.h. Also I've tweaked the wording of the
context-menu items to not use the X-specific terminology "CLIPBOARD"
on OS X.
---
 unix/gtkapp.c |  9 +++++++++
 unix/gtkwin.c | 21 +++++++++++++++------
 unix/unix.h   |  5 +++++
 3 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/unix/gtkapp.c b/unix/gtkapp.c
index 4afe8be53..1c057f212 100644
--- a/unix/gtkapp.c
+++ b/unix/gtkapp.c
@@ -124,12 +124,20 @@ static void startup(GApplication *app, gpointer user_data)
 
     section = g_menu_new();
     g_menu_append_section(menu, NULL, G_MENU_MODEL(section));
+    g_menu_append(section, "Copy", "win.copy");
     g_menu_append(section, "Paste", "win.paste");
 
     gtk_application_set_menubar(GTK_APPLICATION(app),
                                 G_MENU_MODEL(menubar));
 }
 
+static void copy_cb(GSimpleAction *action,
+                    GVariant      *parameter,
+                    gpointer       user_data)
+{
+    copy_menu_action(user_data);
+}
+
 static void paste_cb(GSimpleAction *action,
                      GVariant      *parameter,
                      gpointer       user_data)
@@ -138,6 +146,7 @@ static void paste_cb(GSimpleAction *action,
 }
 
 static const GActionEntry win_actions[] = {
+    { "copy", copy_cb },
     { "paste", paste_cb },
 };
 
diff --git a/unix/gtkwin.c b/unix/gtkwin.c
index 4b380ddcb..76abb7366 100644
--- a/unix/gtkwin.c
+++ b/unix/gtkwin.c
@@ -3243,10 +3243,17 @@ void init_clipboard(struct gui_data *inst)
 
 #endif /* JUST_USE_GTK_CLIPBOARD_UTF8 */
 
+void copy_menu_action(void *frontend)
+{
+    struct gui_data *inst = (struct gui_data *)frontend;
+    static const int clips[] = { MENU_CLIPBOARD };
+    term_request_copy(inst->term, clips, lenof(clips));
+}
+
 void paste_menu_action(void *frontend)
 {
     struct gui_data *inst = (struct gui_data *)frontend;
-    term_request_paste(inst->term, CLIP_CLIPBOARD);
+    term_request_paste(inst->term, MENU_CLIPBOARD);
 }
 
 static void set_window_titles(struct gui_data *inst)
@@ -4290,20 +4297,20 @@ void reset_terminal_menuitem(GtkMenuItem *item, gpointer data)
 void copy_clipboard_menuitem(GtkMenuItem *item, gpointer data)
 {
     struct gui_data *inst = (struct gui_data *)data;
-    static const int clips[] = { CLIP_CLIPBOARD };
+    static const int clips[] = { MENU_CLIPBOARD };
     term_request_copy(inst->term, clips, lenof(clips));
 }
 
 void paste_clipboard_menuitem(GtkMenuItem *item, gpointer data)
 {
     struct gui_data *inst = (struct gui_data *)data;
-    term_request_paste(inst->term, CLIP_CLIPBOARD);
+    term_request_paste(inst->term, MENU_CLIPBOARD);
 }
 
 void copy_all_menuitem(GtkMenuItem *item, gpointer data)
 {
     struct gui_data *inst = (struct gui_data *)data;
-    static const int clips[] = { CLIP_PRIMARY, CLIP_CLIPBOARD };
+    static const int clips[] = { COPYALL_CLIPBOARDS };
     term_copyall(inst->term, clips, lenof(clips));
 }
 
@@ -5224,8 +5231,10 @@ void new_session_window(Conf *conf, const char *geometry_string)
 	MKMENUITEM("Clear Scrollback", clear_scrollback_menuitem);
 	MKMENUITEM("Reset Terminal", reset_terminal_menuitem);
 	MKSEP();
-	MKMENUITEM("Copy to CLIPBOARD", copy_clipboard_menuitem);
-	MKMENUITEM("Paste from CLIPBOARD", paste_clipboard_menuitem);
+	MKMENUITEM("Copy to " CLIPNAME_EXPLICIT_OBJECT,
+                   copy_clipboard_menuitem);
+	MKMENUITEM("Paste from " CLIPNAME_EXPLICIT_OBJECT,
+                   paste_clipboard_menuitem);
 	MKMENUITEM("Copy All", copy_all_menuitem);
 	MKSEP();
 	s = dupcat("About ", appname, NULL);
diff --git a/unix/unix.h b/unix/unix.h
index dc216b4ae..eac1eb565 100644
--- a/unix/unix.h
+++ b/unix/unix.h
@@ -141,6 +141,8 @@ unsigned long getticks(void);
 #define CLIPUI_DEFAULT_AUTOCOPY FALSE
 #define CLIPUI_DEFAULT_MOUSE CLIPUI_IMPLICIT
 #define CLIPUI_DEFAULT_INS CLIPUI_EXPLICIT
+#define MENU_CLIPBOARD CLIP_SYSTEM
+#define COPYALL_CLIPBOARDS CLIP_SYSTEM
 #else
 #define MOUSE_SELECT_CLIPBOARD CLIP_PRIMARY
 #define MOUSE_PASTE_CLIPBOARD CLIP_PRIMARY
@@ -152,6 +154,8 @@ unsigned long getticks(void);
 #define CLIPUI_DEFAULT_AUTOCOPY FALSE
 #define CLIPUI_DEFAULT_MOUSE CLIPUI_IMPLICIT
 #define CLIPUI_DEFAULT_INS CLIPUI_IMPLICIT
+#define MENU_CLIPBOARD CLIP_CLIPBOARD
+#define COPYALL_CLIPBOARDS CLIP_PRIMARY, CLIP_CLIPBOARD
 /* X11 supports arbitrary named clipboards */
 #define NAMED_CLIPBOARDS
 #endif
@@ -181,6 +185,7 @@ GtkWidget *make_gtk_toplevel_window(void *frontend);
 void gtkcomm_setup(void);
 
 /* Defined in gtkwin.c */
+void copy_menu_action(void *frontend);
 void paste_menu_action(void *frontend);
 
 /* Things pty.c needs from pterm.c */

From 136c119da6388b27ce77966356f3726505b70a5b Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Sun, 17 Dec 2017 20:43:44 +0000
Subject: [PATCH 153/166] Fix linked-list mismanagement.

Oh dear. I have no excuse.
---
 unix/gtkwin.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/unix/gtkwin.c b/unix/gtkwin.c
index 76abb7366..e1ac33edf 100644
--- a/unix/gtkwin.c
+++ b/unix/gtkwin.c
@@ -2710,8 +2710,8 @@ static void clipboard_clear(GtkClipboard *clipboard, gpointer data)
         cdi->state->current_cdi = NULL;
     }
     sfree(cdi->pasteout_data_utf8);
-    cdi->next->prev = cdi->next;
-    cdi->prev->next = cdi->prev;
+    cdi->next->prev = cdi->prev;
+    cdi->prev->next = cdi->next;
     sfree(cdi);
 }
 

From 3faca7724a833a24dcb7c056017f72a74109ecda Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Mon, 18 Dec 2017 10:31:42 +0000
Subject: [PATCH 154/166] Correct the OS X branch of the clipboards ifdef.

That's what I get for not testing on all platforms before I push.
Forgot that, since OS X GTK mimics X11 GTK closely enough to still use
the name "CLIPBOARD" for the unique system clipboard, I had left this
code base's internal name for it as CLIP_CLIPBOARD and not the
CLIP_SYSTEM I used on Windows.
---
 unix/unix.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/unix/unix.h b/unix/unix.h
index eac1eb565..b2271cd3b 100644
--- a/unix/unix.h
+++ b/unix/unix.h
@@ -141,8 +141,8 @@ unsigned long getticks(void);
 #define CLIPUI_DEFAULT_AUTOCOPY FALSE
 #define CLIPUI_DEFAULT_MOUSE CLIPUI_IMPLICIT
 #define CLIPUI_DEFAULT_INS CLIPUI_EXPLICIT
-#define MENU_CLIPBOARD CLIP_SYSTEM
-#define COPYALL_CLIPBOARDS CLIP_SYSTEM
+#define MENU_CLIPBOARD CLIP_CLIPBOARD
+#define COPYALL_CLIPBOARDS CLIP_CLIPBOARD
 #else
 #define MOUSE_SELECT_CLIPBOARD CLIP_PRIMARY
 #define MOUSE_PASTE_CLIPBOARD CLIP_PRIMARY

From 1904c404ed426a3c6b7151e5a21a8d9a1678f611 Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Mon, 18 Dec 2017 10:43:13 +0000
Subject: [PATCH 155/166] OS X: pass Command key back to GTK if it's not being
 Meta.

This fixes the problem I'd previously noticed, that if you don't
configure the "Command key acts as Meta" setting, then keystrokes like
Command-Q which _ought_ to function as accelerators for the
application menu bar don't.

Turns out that this was for the totally obvious reason: the keyboard
event was still being processed by gtkwin.c's key_event() and
translated via the GTK IM into ordinary keyboard input. If instead I
return FALSE from key_event on detecting that a key event has a
non-Meta-configured Command modifier, then it will go to the next-
level key-event handler inside GTK itself which implements the menu
accelerator behaviour. Another problem ticked off the OS X checklist.
---
 unix/gtkapp.c | 9 ---------
 unix/gtkwin.c | 9 +++++++++
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/unix/gtkapp.c b/unix/gtkapp.c
index 1c057f212..2a592eb38 100644
--- a/unix/gtkapp.c
+++ b/unix/gtkapp.c
@@ -27,15 +27,6 @@ and you should get unix/PuTTY.app and unix/PTerm.app as output.
 
 TODO list for a sensible GTK3 PuTTY/pterm on OS X:
 
-Menu items' keyboard shortcuts (Command-Q for Quit, Command-V for
-Paste) do not currently work. It's intentional that if you turn on
-'Command key acts as Meta' in the configuration then those shortcuts
-should be superseded by the Meta-key functionality (e.g. Cmd-Q should
-send ESC Q to the session), for the benefit of people whose non-Mac
-keyboard reflexes expect the Meta key to be in that position; but if
-you don't turn that option on, then these shortcuts should work as an
-ordinary Mac user expects, and currently they don't.
-
 Mouse wheel events and trackpad scrolling gestures don't work quite
 right in the terminal drawing area.
 
diff --git a/unix/gtkwin.c b/unix/gtkwin.c
index e1ac33edf..feaa2e18e 100644
--- a/unix/gtkwin.c
+++ b/unix/gtkwin.c
@@ -168,6 +168,9 @@ struct gui_data {
     int cursor_type;
     int drawtype;
     int meta_mod_mask;
+#ifdef OSX_META_KEY_CONFIG
+    int system_mod_mask;
+#endif
 };
 
 static void cache_conf_values(struct gui_data *inst)
@@ -181,6 +184,7 @@ static void cache_conf_values(struct gui_data *inst)
         inst->meta_mod_mask |= GDK_MOD1_MASK;
     if (conf_get_int(inst->conf, CONF_osx_command_meta))
         inst->meta_mod_mask |= GDK_MOD2_MASK;
+    inst->system_mod_mask = GDK_MOD2_MASK & ~inst->meta_mod_mask;
 #else
     inst->meta_mod_mask = GDK_MOD1_MASK;
 #endif
@@ -780,6 +784,11 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data)
     int ucsval, start, end, special, output_charset, use_ucsoutput;
     int nethack_mode, app_keypad_mode;
 
+#ifdef OSX_META_KEY_CONFIG
+    if (event->state & inst->system_mod_mask)
+        return FALSE;                  /* let GTK process OS X Command key */
+#endif
+
     /* Remember the timestamp. */
     inst->input_event_time = event->time;
 

From 31080bf8a7cc0fb7c9b73762fd38244110256ff9 Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Mon, 18 Dec 2017 11:01:42 +0000
Subject: [PATCH 156/166] Add keyboard accelerators in the GtkApplication menu.

Now that they actually _work_, it seems more useful to start putting
them in on purpose.
---
 unix/gtkapp.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/unix/gtkapp.c b/unix/gtkapp.c
index 2a592eb38..4a4af5a04 100644
--- a/unix/gtkapp.c
+++ b/unix/gtkapp.c
@@ -118,6 +118,19 @@ static void startup(GApplication *app, gpointer user_data)
     g_menu_append(section, "Copy", "win.copy");
     g_menu_append(section, "Paste", "win.paste");
 
+#define SET_ACCEL(app, command, accel) do                       \
+    {                                                           \
+        static const char *const accels[] = { accel, NULL };    \
+        gtk_application_set_accels_for_action(                  \
+            GTK_APPLICATION(app), command, accels);             \
+    } while (0)
+
+    SET_ACCEL(app, "app.newwin", "<Primary>n");
+    SET_ACCEL(app, "win.copy", "<Primary>c");
+    SET_ACCEL(app, "win.paste", "<Primary>v");
+
+#undef SET_ACCEL
+
     gtk_application_set_menubar(GTK_APPLICATION(app),
                                 G_MENU_MODEL(menubar));
 }

From 2065fb647fb6f6d8c5699eac190ea8d188867454 Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Mon, 18 Dec 2017 11:15:44 +0000
Subject: [PATCH 157/166] Minor refactoring of gtkapp.c -> gtkwin.c menu
 triggers.

Just to avoid an endless proliferation of functions too small to see,
I've arranged an enumeration of action ids and a single
app_menu_action function on the receiving end, and in gtkapp.c, a list
macro that means I at least don't have to define the tiny callback
functions and the GActionEntry records by hand and keep them in sync.
---
 unix/gtkapp.c | 26 ++++++++++++--------------
 unix/gtkwin.c | 21 ++++++++++++---------
 unix/unix.h   |  8 +++++---
 3 files changed, 29 insertions(+), 26 deletions(-)

diff --git a/unix/gtkapp.c b/unix/gtkapp.c
index 4a4af5a04..27468f2c3 100644
--- a/unix/gtkapp.c
+++ b/unix/gtkapp.c
@@ -135,23 +135,21 @@ static void startup(GApplication *app, gpointer user_data)
                                 G_MENU_MODEL(menubar));
 }
 
-static void copy_cb(GSimpleAction *action,
-                    GVariant      *parameter,
-                    gpointer       user_data)
-{
-    copy_menu_action(user_data);
-}
+#define WIN_ACTION_LIST(X)                      \
+    X("copy", MA_COPY)                          \
+    X("paste", MA_PASTE)                        \
+    /* end of list */
 
-static void paste_cb(GSimpleAction *action,
-                     GVariant      *parameter,
-                     gpointer       user_data)
-{
-    paste_menu_action(user_data);
-}
+#define WIN_ACTION_CALLBACK(name, id) \
+static void win_action_cb_ ## id(GSimpleAction *a, GVariant *p, gpointer d) \
+{ app_menu_action(d, id); }
+WIN_ACTION_LIST(WIN_ACTION_CALLBACK)
+#undef WIN_ACTION_CALLBACK
 
 static const GActionEntry win_actions[] = {
-    { "copy", copy_cb },
-    { "paste", paste_cb },
+#define WIN_ACTION_ENTRY(name, id) { name, win_action_cb_ ## id },
+WIN_ACTION_LIST(WIN_ACTION_ENTRY)
+#undef WIN_ACTION_ENTRY
 };
 
 static GtkApplication *app;
diff --git a/unix/gtkwin.c b/unix/gtkwin.c
index feaa2e18e..634f772de 100644
--- a/unix/gtkwin.c
+++ b/unix/gtkwin.c
@@ -3252,17 +3252,20 @@ void init_clipboard(struct gui_data *inst)
 
 #endif /* JUST_USE_GTK_CLIPBOARD_UTF8 */
 
-void copy_menu_action(void *frontend)
+void app_menu_action(void *frontend, enum MenuAction action)
 {
     struct gui_data *inst = (struct gui_data *)frontend;
-    static const int clips[] = { MENU_CLIPBOARD };
-    term_request_copy(inst->term, clips, lenof(clips));
-}
-
-void paste_menu_action(void *frontend)
-{
-    struct gui_data *inst = (struct gui_data *)frontend;
-    term_request_paste(inst->term, MENU_CLIPBOARD);
+    switch (action) {
+      case MA_COPY:
+        {
+            static const int clips[] = { MENU_CLIPBOARD };
+            term_request_copy(inst->term, clips, lenof(clips));
+        }
+        break;
+      case MA_PASTE:
+        term_request_paste(inst->term, MENU_CLIPBOARD);
+        break;
+    }
 }
 
 static void set_window_titles(struct gui_data *inst)
diff --git a/unix/unix.h b/unix/unix.h
index b2271cd3b..20986ef78 100644
--- a/unix/unix.h
+++ b/unix/unix.h
@@ -184,9 +184,11 @@ GtkWidget *make_gtk_toplevel_window(void *frontend);
 /* Defined in gtkcomm.c */
 void gtkcomm_setup(void);
 
-/* Defined in gtkwin.c */
-void copy_menu_action(void *frontend);
-void paste_menu_action(void *frontend);
+/* Used to pass application-menu operations from gtkapp.c to gtkwin.c */
+enum MenuAction {
+    MA_COPY, MA_PASTE,
+};
+void app_menu_action(void *frontend, enum MenuAction);
 
 /* Things pty.c needs from pterm.c */
 const char *get_x_display(void *frontend);

From 04184c87ccf9f45e7794219341e7f46435f54883 Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Mon, 18 Dec 2017 11:46:48 +0000
Subject: [PATCH 158/166] Fill in some more of the OS X menu bar.

This still isn't complete: I also need to add the variable collections
of things like mid-session special commands and saved session names,
and also I need to try to grey out menu items when they're not
applicable. But it's a start.
---
 unix/gtkapp.c | 50 +++++++++++++++++++++++++++++++++++++++++++++-----
 unix/gtkdlg.c |  5 +++--
 unix/gtkwin.c | 50 ++++++++++++++++++++++++++++++++++----------------
 unix/unix.h   |  4 +++-
 4 files changed, 85 insertions(+), 24 deletions(-)

diff --git a/unix/gtkapp.c b/unix/gtkapp.c
index 27468f2c3..0261c69d1 100644
--- a/unix/gtkapp.c
+++ b/unix/gtkapp.c
@@ -40,11 +40,10 @@ but if I mouse off the menu and back on (without un-popping-it-up)
 then suddenly that does work. I don't know if this is something I can
 fix, though; it might very well be a quirk of the underlying GTK.
 
-The application menu bar is very minimal at the moment. Should include
-all the usual stuff from the Ctrl-right-click menu - saved sessions,
-mid-session special commands, Duplicate Session, Change Settings,
-Event Log, clear scrollback, reset terminal, about box, anything else
-I can think of.
+Still to do on the application menu bar: items that have to vary with
+context or user action (saved sessions and mid-session special
+commands), and disabling/enabling the main actions in parallel with
+their counterparts in the Ctrl-rightclick context menu.
 
 Does OS X have a standard system of online help that I could tie into?
 
@@ -97,6 +96,8 @@ void launch_saved_session(const char *str) {}
 void session_window_closed(void) {}
 #else /* GTK_CHECK_VERSION(3,0,0) */
 
+extern const int use_event_log;
+
 static void startup(GApplication *app, gpointer user_data)
 {
     GMenu *menubar, *menu, *section;
@@ -117,6 +118,30 @@ static void startup(GApplication *app, gpointer user_data)
     g_menu_append_section(menu, NULL, G_MENU_MODEL(section));
     g_menu_append(section, "Copy", "win.copy");
     g_menu_append(section, "Paste", "win.paste");
+    g_menu_append(section, "Copy All", "win.copyall");
+
+    menu = g_menu_new();
+    g_menu_append_submenu(menubar, "Window", G_MENU_MODEL(menu));
+
+    section = g_menu_new();
+    g_menu_append_section(menu, NULL, G_MENU_MODEL(section));
+    g_menu_append(section, "Restart Session", "win.restart");
+    g_menu_append(section, "Duplicate Session", "win.duplicate");
+
+    section = g_menu_new();
+    g_menu_append_section(menu, NULL, G_MENU_MODEL(section));
+    g_menu_append(section, "Change Settings", "win.changesettings");
+
+    if (use_event_log) {
+        section = g_menu_new();
+        g_menu_append_section(menu, NULL, G_MENU_MODEL(section));
+        g_menu_append(section, "Event Log", "win.eventlog");
+    }
+
+    section = g_menu_new();
+    g_menu_append_section(menu, NULL, G_MENU_MODEL(section));
+    g_menu_append(section, "Clear Scrollback", "win.clearscrollback");
+    g_menu_append(section, "Reset Terminal", "win.resetterm");
 
 #define SET_ACCEL(app, command, accel) do                       \
     {                                                           \
@@ -138,6 +163,13 @@ static void startup(GApplication *app, gpointer user_data)
 #define WIN_ACTION_LIST(X)                      \
     X("copy", MA_COPY)                          \
     X("paste", MA_PASTE)                        \
+    X("copyall", MA_COPY_ALL)                   \
+    X("duplicate", MA_DUPLICATE_SESSION)        \
+    X("restart", MA_RESTART_SESSION)            \
+    X("changesettings", MA_CHANGE_SETTINGS)     \
+    X("clearscrollback", MA_CLEAR_SCROLLBACK)   \
+    X("resetterm", MA_RESET_TERMINAL)           \
+    X("eventlog", MA_EVENT_LOG)                 \
     /* end of list */
 
 #define WIN_ACTION_CALLBACK(name, id) \
@@ -247,8 +279,16 @@ static void quit_cb(GSimpleAction *action,
     g_application_quit(G_APPLICATION(user_data));
 }
 
+static void about_cb(GSimpleAction *action,
+                     GVariant      *parameter,
+                     gpointer       user_data)
+{
+    about_box(NULL);
+}
+
 static const GActionEntry app_actions[] = {
     { "newwin", newwin_cb },
+    { "about", about_cb },
     { "quit", quit_cb },
 };
 
diff --git a/unix/gtkdlg.c b/unix/gtkdlg.c
index 08579356a..72a9ad680 100644
--- a/unix/gtkdlg.c
+++ b/unix/gtkdlg.c
@@ -3779,8 +3779,9 @@ void about_box(void *window)
                      G_CALLBACK(about_key_press), NULL);
 
     set_transient_window_pos(GTK_WIDGET(window), aboutbox);
-    gtk_window_set_transient_for(GTK_WINDOW(aboutbox),
-				 GTK_WINDOW(window));
+    if (window)
+        gtk_window_set_transient_for(GTK_WINDOW(aboutbox),
+                                     GTK_WINDOW(window));
     gtk_container_set_focus_child(GTK_CONTAINER(aboutbox), NULL);
     gtk_widget_show(aboutbox);
     gtk_window_set_focus(GTK_WINDOW(aboutbox), NULL);
diff --git a/unix/gtkwin.c b/unix/gtkwin.c
index 634f772de..5cfd5f448 100644
--- a/unix/gtkwin.c
+++ b/unix/gtkwin.c
@@ -3252,22 +3252,6 @@ void init_clipboard(struct gui_data *inst)
 
 #endif /* JUST_USE_GTK_CLIPBOARD_UTF8 */
 
-void app_menu_action(void *frontend, enum MenuAction action)
-{
-    struct gui_data *inst = (struct gui_data *)frontend;
-    switch (action) {
-      case MA_COPY:
-        {
-            static const int clips[] = { MENU_CLIPBOARD };
-            term_request_copy(inst->term, clips, lenof(clips));
-        }
-        break;
-      case MA_PASTE:
-        term_request_paste(inst->term, MENU_CLIPBOARD);
-        break;
-    }
-}
-
 static void set_window_titles(struct gui_data *inst)
 {
     /*
@@ -4725,6 +4709,40 @@ void saved_session_freedata(GtkMenuItem *item, gpointer data)
     sfree(str);
 }
 
+void app_menu_action(void *frontend, enum MenuAction action)
+{
+    struct gui_data *inst = (struct gui_data *)frontend;
+    switch (action) {
+      case MA_COPY:
+        copy_clipboard_menuitem(NULL, inst);
+        break;
+      case MA_PASTE:
+        paste_clipboard_menuitem(NULL, inst);
+        break;
+      case MA_COPY_ALL:
+        copy_all_menuitem(NULL, inst);
+        break;
+      case MA_DUPLICATE_SESSION:
+        dup_session_menuitem(NULL, inst);
+        break;
+      case MA_RESTART_SESSION:
+        restart_session_menuitem(NULL, inst);
+        break;
+      case MA_CHANGE_SETTINGS:
+        change_settings_menuitem(NULL, inst);
+        break;
+      case MA_CLEAR_SCROLLBACK:
+        clear_scrollback_menuitem(NULL, inst);
+        break;
+      case MA_RESET_TERMINAL:
+        reset_terminal_menuitem(NULL, inst);
+        break;
+      case MA_EVENT_LOG:
+        event_log_menuitem(NULL, inst);
+        break;
+    }
+}
+
 static void update_savedsess_menu(GtkMenuItem *menuitem, gpointer data)
 {
     struct gui_data *inst = (struct gui_data *)data;
diff --git a/unix/unix.h b/unix/unix.h
index 20986ef78..e6609aa92 100644
--- a/unix/unix.h
+++ b/unix/unix.h
@@ -186,7 +186,9 @@ void gtkcomm_setup(void);
 
 /* Used to pass application-menu operations from gtkapp.c to gtkwin.c */
 enum MenuAction {
-    MA_COPY, MA_PASTE,
+    MA_COPY, MA_PASTE, MA_COPY_ALL, MA_DUPLICATE_SESSION,
+    MA_RESTART_SESSION, MA_CHANGE_SETTINGS, MA_CLEAR_SCROLLBACK,
+    MA_RESET_TERMINAL, MA_EVENT_LOG
 };
 void app_menu_action(void *frontend, enum MenuAction);
 

From faef0ea679155e4ae2d921e4af3913f5dbc895a8 Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Mon, 18 Dec 2017 14:04:57 +0000
Subject: [PATCH 159/166] Rewrite the OS X TODO a bit.

I've filled in the results of some not-entirely-conclusive
investigation into the trackpad scrolling issue, some thoughts on
resizing, and reordered the items into what currently seems the most
sensible order to me.
---
 unix/gtkapp.c | 30 ++++++++++++++++++++----------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/unix/gtkapp.c b/unix/gtkapp.c
index 0261c69d1..6d53c38ec 100644
--- a/unix/gtkapp.c
+++ b/unix/gtkapp.c
@@ -27,12 +27,27 @@ and you should get unix/PuTTY.app and unix/PTerm.app as output.
 
 TODO list for a sensible GTK3 PuTTY/pterm on OS X:
 
-Mouse wheel events and trackpad scrolling gestures don't work quite
-right in the terminal drawing area.
+Still to do on the application menu bar: items that have to vary with
+context or user action (saved sessions and mid-session special
+commands), and disabling/enabling the main actions in parallel with
+their counterparts in the Ctrl-rightclick context menu.
 
-There doesn't seem to be a resize handle on terminal windows. I don't
-think this is a fundamental limitation of OS X GTK (their demo app has
-one), so perhaps I need to do something to make sure it appears?
+Mouse wheel events and trackpad scrolling gestures don't work quite
+right in the terminal drawing area. This seems to be a combination of
+two things, neither of which I completely understand yet. Firstly, on
+OS X GTK my trackpad seems to generate GDK scroll events for which
+gdk_event_get_scroll_deltas returns integers rather than integer
+multiples of 1/30, so we end up scrolling by very large amounts;
+secondly, the window doesn't seem to receive a GTK "draw" event until
+after the entire scroll gesture is complete, which means we don't get
+constant visual feedback on how much we're scrolling by.
+
+There doesn't seem to be a resize handle on terminal windows. Then
+again, they do seem to _be_ resizable; the handle just isn't shown.
+Perhaps that's a feature (certainly in a scrollbarless configuration
+the handle gets in the way of the bottom right character cell in the
+terminal itself), but it would be nice to at least understand _why_ it
+happens and perhaps include an option to put it back again.
 
 A slight oddity with menus that pop up directly under the mouse
 pointer: mousing over the menu items doesn't highlight them initially,
@@ -40,11 +55,6 @@ but if I mouse off the menu and back on (without un-popping-it-up)
 then suddenly that does work. I don't know if this is something I can
 fix, though; it might very well be a quirk of the underlying GTK.
 
-Still to do on the application menu bar: items that have to vary with
-context or user action (saved sessions and mid-session special
-commands), and disabling/enabling the main actions in parallel with
-their counterparts in the Ctrl-rightclick context menu.
-
 Does OS X have a standard system of online help that I could tie into?
 
 Need to work out what if anything we can do with Pageant on OS X.

From eef8cac28e01333939f97524ed6346c503b6a6f0 Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Wed, 20 Dec 2017 09:53:02 +0000
Subject: [PATCH 160/166] osxlaunch: bodge to let me test-build on Linux.

By default, the program still builds on Linux to a stub that just
prints 'nothing to see here'. But if you compile with
-DTEST_COMPILE_ON_LINUX, it compiles to a program that still doesn't
do anything _actually_ useful, but goes through all the same motions
that real osxlaunch would go through, until the final execv(2) fails
because of course it's not _really_ living in an application bundle
directory of the right shape.

That allows me to run all the setup code under the debugging tools I'm
most used to, in my preferred environment. (Same rationale as having
puttyapp / ptermapp build for Linux too.)
---
 unix/osxlaunch.c | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/unix/osxlaunch.c b/unix/osxlaunch.c
index 8082f2dee..3d10c7d87 100644
--- a/unix/osxlaunch.c
+++ b/unix/osxlaunch.c
@@ -48,7 +48,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#ifndef __APPLE__
+#if !defined __APPLE__ && !defined TEST_COMPILE_ON_LINUX
 /* When we're not compiling for OS X, it's easier to just turn this
  * program into a trivial hello-world by ifdef in the source than it
  * is to remove it in the makefile edifice. */
@@ -61,7 +61,24 @@ int main(int argc, char **argv)
 
 #include <unistd.h>
 #include <libgen.h>
+
+#ifdef __APPLE__
 #include <mach-o/dyld.h>
+#else
+/* For Linux, a bodge to let as much of this code still run as
+ * possible, so that you can run it under friendly debugging tools
+ * like valgrind. */
+int _NSGetExecutablePath(char *out, uint32_t *outlen)
+{
+    static const char toret[] = "/proc/self/exe";
+    if (out != NULL && *outlen < sizeof(toret))
+        return -1;
+    *outlen = sizeof(toret);
+    if (out)
+        memcpy(out, toret, sizeof(toret));
+    return 0;
+}
+#endif
 
 /* ----------------------------------------------------------------------
  * Find an alphabetic prefix unused by any environment variable name.

From 6b8cd49aa7aa1643b58b57e13eec48410aa68e0f Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Wed, 20 Dec 2017 09:54:40 +0000
Subject: [PATCH 161/166] osxlaunch: add diagnostics under an #ifdef.

Now I can compile with -DDEBUG_OSXLAUNCH and see exactly what the
program is doing, if I suspect it of misbehaviour.
---
 unix/osxlaunch.c | 44 +++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 39 insertions(+), 5 deletions(-)

diff --git a/unix/osxlaunch.c b/unix/osxlaunch.c
index 3d10c7d87..6ad43a51b 100644
--- a/unix/osxlaunch.c
+++ b/unix/osxlaunch.c
@@ -352,19 +352,35 @@ char *alloc_cat(const char *str1, const char *str2)
  * Overwrite an environment variable, preserving the old one for the
  * real app to restore.
  */
+void setenv_wrap(const char *name, const char *value)
+{
+#ifdef DEBUG_OSXLAUNCH
+    printf("setenv(\"%s\",\"%s\")\n", name, value);
+#endif
+    setenv(name, value, 1);
+}
+
+void unsetenv_wrap(const char *name)
+{
+#ifdef DEBUG_OSXLAUNCH
+    printf("unsetenv(\"%s\")\n", name);
+#endif
+    unsetenv(name);
+}
+
 char *prefix, *prefixset, *prefixunset;
 void overwrite_env(const char *name, const char *value)
 {
     const char *oldvalue = getenv(name);
     if (oldvalue) {
-        setenv(alloc_cat(prefixset, name), oldvalue, 1);
+        setenv_wrap(alloc_cat(prefixset, name), oldvalue);
     } else {
-        setenv(alloc_cat(prefixunset, name), "", 1);
+        setenv_wrap(alloc_cat(prefixunset, name), "");
     }
     if (value)
-        setenv(name, value, 1);
+        setenv_wrap(name, value);
     else
-        unsetenv(name);
+        unsetenv_wrap(name);
 }
 
 /* ----------------------------------------------------------------------
@@ -377,6 +393,11 @@ int main(int argc, char **argv)
     prefixset = alloc_cat(prefix, "s");
     prefixunset = alloc_cat(prefix, "u");
 
+#ifdef DEBUG_OSXLAUNCH
+    printf("Environment prefixes: main=\"%s\", set=\"%s\", unset=\"%s\"\n",
+           prefix, prefixset, prefixunset);
+#endif
+
     char *prog_path = get_program_path(); // <bundle>/Contents/MacOS/<filename>
     char *macos = dirname_wrapper(prog_path); // <bundle>/Contents/MacOS
     char *contents = dirname_wrapper(macos);  // <bundle>/Contents
@@ -412,17 +433,30 @@ int main(int argc, char **argv)
     }
     int j = 0;
     new_argv[j++] = realbin;
+#ifdef DEBUG_OSXLAUNCH
+    printf("argv[%d] = \"%s\"\n", j-1, new_argv[j-1]);
+#endif
     {
         int i = 1;
         if (i < argc && !strncmp(argv[i], "-psn_", 5))
             i++;
 
-        for (; i < argc; i++)
+        for (; i < argc; i++) {
             new_argv[j++] = argv[i];
+#ifdef DEBUG_OSXLAUNCH
+            printf("argv[%d] = \"%s\"\n", j-1, new_argv[j-1]);
+#endif
+        }
     }
     new_argv[j++] = prefix;
+#ifdef DEBUG_OSXLAUNCH
+    printf("argv[%d] = \"%s\"\n", j-1, new_argv[j-1]);
+#endif
     new_argv[j++] = NULL;
 
+#ifdef DEBUG_OSXLAUNCH
+    printf("executing \"%s\"\n", realbin);
+#endif
     execv(realbin, new_argv);
     perror("execv");
     free(new_argv);

From 10e570cc797499e25777f0514fd047639d41fed4 Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Wed, 20 Dec 2017 09:38:14 +0000
Subject: [PATCH 162/166] osxlaunch: fix some uninitialised pointers.

I've been having intermittent segfaults in this launcher program, and
by means of the new TEST_COMPILE_ON_LINUX facility introduced by
commit eef8cac28, I ran it under valgrind which helpfully pointed out
several pointers between linked-list nodes which I'd been relying on
OS memory allocation to happen to have zeroed for me.
---
 unix/osxlaunch.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/unix/osxlaunch.c b/unix/osxlaunch.c
index 6ad43a51b..0241d6a9d 100644
--- a/unix/osxlaunch.c
+++ b/unix/osxlaunch.c
@@ -152,6 +152,8 @@ char *get_unused_env_prefix(void)
         exit(1);
     }
     qhead->prefixlen = 0;
+    qhead->first_node = NULL;
+    qhead->next_bucket = NULL;
     for (e = environ; *e; e++)
         qhead->first_node = new_node(qhead->first_node, *e, strcspn(*e, "="));
 
@@ -168,6 +170,7 @@ char *get_unused_env_prefix(void)
                 exit(1);
             }
             buckets[i]->prefixlen = qhead->prefixlen + 1;
+            buckets[i]->first_node = NULL;
             qtail->next_bucket = buckets[i];
             qtail = buckets[i];
         }

From 8ec55ef25facc7c494bb4ebb7160c06a8d376d7d Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Wed, 20 Dec 2017 09:57:12 +0000
Subject: [PATCH 163/166] osxlaunch: stop setting DYLD_LIBRARY_PATH.

It actually doesn't seem to be necessary: running 'otool -L' on the
real binary in the application bundle (Pterm-bin or PuTTY-bin) lists a
lot of paths starting with "@executable_path/../Resources/", which I
take to mean that the application is already set up to automatically
load the GTK shared libraries out of its own bundle directory, without
me having to give it the extra hint of DYLD_LIBRARY_PATH.

Moreover, I just got round to upgrading my Mac to High Sierra, and now
the version of osxlaunch _with_ DYLD_LIBRARY_PATH is causing a crash
at program load time, when the libpng in the MacOS system library
directory tries to use the libz in the application bundle and finds
that it doesn't provide an entry point it was expecting
('inflateValidate'). I could try to fix that by updating the libz
version in my OS X PuTTY build environment, but that seems to me to
set a precedent of running to keep up with any further dependencies
the system libraries happen to acquire in later releases. Better to
reset DYLD_LIBRARY_PATH so that the system libpng will load the system
libz and not get confused in the first place.
---
 unix/osxlaunch.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/unix/osxlaunch.c b/unix/osxlaunch.c
index 0241d6a9d..d560df938 100644
--- a/unix/osxlaunch.c
+++ b/unix/osxlaunch.c
@@ -10,8 +10,8 @@
  *
  * But the GTK program won't start up unless all those shared
  * libraries etc are already pointed to by environment variables like
- * DYLD_LIBRARY_PATH, which won't be set up when the bundle is
- * launched.
+ * GTK_PATH and PANGO_LIBDIR and things like that, which won't be set
+ * up when the bundle is launched.
  *
  * Hence, gtk-mac-bundler expects to install the program in the bundle
  * under a name like 'Contents/MacOS/Program-bin'; and the file called
@@ -415,7 +415,7 @@ int main(int argc, char **argv)
     char *locale = alloc_cat(share, "/locale");
     char *realbin = alloc_cat(prog_path, "-bin");
 
-    overwrite_env("DYLD_LIBRARY_PATH", lib);
+//    overwrite_env("DYLD_LIBRARY_PATH", lib);
     overwrite_env("XDG_CONFIG_DIRS", xdg);
     overwrite_env("XDG_DATA_DIRS", share);
     overwrite_env("GTK_DATA_PREFIX", resources);

From 599bab84a1019ccd6228dcc5a8bf8b9a33a96452 Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Wed, 20 Dec 2017 10:12:28 +0000
Subject: [PATCH 164/166] Condition out AES-NI support if using a too-old
 clang.

A clang too old to have __attribute__((target)) will not manage to
compile the clang-style hardware-accelerated functions, so it
shouldn't try.
---
 sshaes.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/sshaes.c b/sshaes.c
index 7ebeb5be0..508799135 100644
--- a/sshaes.c
+++ b/sshaes.c
@@ -1151,6 +1151,14 @@ const struct ssh2_ciphers ssh2_aes = {
 #   undef COMPILER_SUPPORTS_AES_NI
 #endif
 
+#if defined(__clang__)
+#   if !__has_attribute(target)
+/* If clang is old enough not to support __attribute__((target(...)))
+ * as used below, then we can't use this code after all. */
+#      undef COMPILER_SUPPORTS_AES_NI
+#   endif
+#endif
+
 #ifdef COMPILER_SUPPORTS_AES_NI
 
 /*

From 5f7604888bcd5a2a96392874b947f4a74056d303 Mon Sep 17 00:00:00 2001
From: Jacob Nevins <jacobn@chiark.greenend.org.uk>
Date: Wed, 20 Dec 2017 11:55:51 +0000
Subject: [PATCH 165/166] Let puttyapp/ptermapp build against old Gtk 3.

gtk_application_set_accels_for_action() is new in Gtk 3.12, but (e.g.)
Ubuntu 14.04 LTS still ships with Gtk 3.10.
On the other hand, the function I've used instead,
gtk_application_add_accelerator(), is deprecated from Gtk 3.14 onwards,
indicating that it will disappear in some future version, so I've left
the newer code in against that day.
---
 unix/gtkapp.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/unix/gtkapp.c b/unix/gtkapp.c
index 6d53c38ec..351238db8 100644
--- a/unix/gtkapp.c
+++ b/unix/gtkapp.c
@@ -153,12 +153,20 @@ static void startup(GApplication *app, gpointer user_data)
     g_menu_append(section, "Clear Scrollback", "win.clearscrollback");
     g_menu_append(section, "Reset Terminal", "win.resetterm");
 
+#if GTK_CHECK_VERSION(3,12,0)
 #define SET_ACCEL(app, command, accel) do                       \
     {                                                           \
         static const char *const accels[] = { accel, NULL };    \
         gtk_application_set_accels_for_action(                  \
             GTK_APPLICATION(app), command, accels);             \
     } while (0)
+#else
+    /* The Gtk function used above was new in 3.12; the one below
+     * was deprecated from 3.14. */
+#define SET_ACCEL(app, command, accel) \
+    gtk_application_add_accelerator(GTK_APPLICATION(app), accel, \
+                                    command, NULL)
+#endif
 
     SET_ACCEL(app, "app.newwin", "<Primary>n");
     SET_ACCEL(app, "win.copy", "<Primary>c");

From 8fcc4332d8270b55e050c2f6e7350b2486322036 Mon Sep 17 00:00:00 2001
From: Nico Williams <nico@cryptonector.com>
Date: Mon, 22 Jul 2013 19:09:04 -0400
Subject: [PATCH 166/166] Don't grow logevent buf indefinitely

The PuTTY GUIs (Unix and Windows) maintain an in-memory event log
for display to users as they request.  This uses ints for tracking
eventlog size, which is subject to memory exhaustion and (given
enough heap space) overflow attacks by servers (via, e.g., constant
rekeying).

Also a bounded log is more user-friendly.  It is rare to want more
than the initial logging and the logging from a few recent rekey
events.

The Windows fix has been tested using Dr. Memory as a valgrind
substitute.  No errors corresponding to the affected code showed up.
The Dr. Memory results.txt was split into a file per-error and then

    grep Error $(grep -l windlg *)|cut -d: -f3-|sort |uniq -c

was used to compare.  Differences arose from different usage of the GUI,
but no error could be traced to the code modified in this commit.

The Unix fix has been tested using valgrind.  We don't destroy the
eventlog_stuff eventlog arrays, so we can't be entirely sure that we
don't leak more than we did before, but from code inspection it looks
like we don't (and anyways, if we leaked as much as before, just without
the integer overflow, well, that's still an improvement).
---
 unix/gtkdlg.c    | 80 ++++++++++++++++++++++++++++++++++++++----------
 windows/windlg.c | 66 +++++++++++++++++++++++++++++----------
 2 files changed, 112 insertions(+), 34 deletions(-)

diff --git a/unix/gtkdlg.c b/unix/gtkdlg.c
index 72a9ad680..85e04bb8c 100644
--- a/unix/gtkdlg.c
+++ b/unix/gtkdlg.c
@@ -3787,14 +3787,18 @@ void about_box(void *window)
     gtk_window_set_focus(GTK_WINDOW(aboutbox), NULL);
 }
 
+#define LOGEVENT_INITIAL_MAX 128
+#define LOGEVENT_CIRCULAR_MAX 128
+
 struct eventlog_stuff {
     GtkWidget *parentwin, *window;
     struct controlbox *eventbox;
     struct Shortcuts scs;
     struct dlgparam dp;
     union control *listctrl;
-    char **events;
-    int nevents, negsize;
+    char **events_initial;
+    char **events_circular;
+    int ninitial, ncircular, circular_first;
     char *seldata;
     int sellen;
     int ignore_selchange;
@@ -3826,8 +3830,11 @@ static void eventlog_list_handler(union control *ctrl, void *dlg,
 
 	dlg_update_start(ctrl, dlg);
 	dlg_listbox_clear(ctrl, dlg);
-	for (i = 0; i < es->nevents; i++) {
-	    dlg_listbox_add(ctrl, dlg, es->events[i]);
+	for (i = 0; i < es->ninitial; i++) {
+	    dlg_listbox_add(ctrl, dlg, es->events_initial[i]);
+	}
+	for (i = 0; i < es->ncircular; i++) {
+	    dlg_listbox_add(ctrl, dlg, es->events_circular[(es->circular_first + i) % LOGEVENT_CIRCULAR_MAX]);
 	}
 	dlg_update_done(ctrl, dlg);
     } else if (event == EVENT_SELCHANGE) {
@@ -3849,16 +3856,30 @@ static void eventlog_list_handler(union control *ctrl, void *dlg,
         sfree(es->seldata);
         es->seldata = NULL;
         es->sellen = 0;
-        for (i = 0; i < es->nevents; i++) {
+        for (i = 0; i < es->ninitial; i++) {
             if (dlg_listbox_issel(ctrl, dlg, i)) {
-                int extralen = strlen(es->events[i]);
+                int extralen = strlen(es->events_initial[i]);
+
+                if (es->sellen + extralen + 2 > selsize) {
+                    selsize = es->sellen + extralen + 512;
+                    es->seldata = sresize(es->seldata, selsize, char);
+                }
+
+                strcpy(es->seldata + es->sellen, es->events_initial[i]);
+                es->sellen += extralen;
+                es->seldata[es->sellen++] = '\n';
+            }
+        }
+        for (i = 0; i < es->ncircular; i++) {
+            if (dlg_listbox_issel(ctrl, dlg, ninitial + i)) {
+                int extralen = strlen(es->events_circular[(es->circular_first + i) % LOGEVENT_CIRCULAR_MAX]);
 
                 if (es->sellen + extralen + 2 > selsize) {
                     selsize = es->sellen + extralen + 512;
                     es->seldata = sresize(es->seldata, selsize, char);
                 }
 
-                strcpy(es->seldata + es->sellen, es->events[i]);
+                strcpy(es->seldata + es->sellen, es->events_circular[i]);
                 es->sellen += extralen;
                 es->seldata[es->sellen++] = '\n';
             }
@@ -4004,28 +4025,53 @@ void *eventlogstuff_new(void)
     return es;
 }
 
+#define MAXLOGMSGLEN 1000
+
 void logevent_dlg(void *estuff, const char *string)
 {
     struct eventlog_stuff *es = (struct eventlog_stuff *)estuff;
-
     char timebuf[40];
     struct tm tm;
-
-    if (es->nevents >= es->negsize) {
-	es->negsize += 64;
-	es->events = sresize(es->events, es->negsize, char *);
+    char **location;
+    size_t i;
+    size_t slen = strlen(string);
+    size_t len = (slen > MAXLOGMSGLEN) ? MAXLOGMSGLEN : slen;
+
+    if (es->ninitial == 0) {
+        es->events_initial = sresize(es->events_initial, LOGEVENT_INITIAL_MAX, char *);
+        for (i = 0; i < LOGEVENT_INITIAL_MAX; i++)
+            es->events_initial[i] = NULL;
+        es->events_circular = sresize(es->events_circular, LOGEVENT_CIRCULAR_MAX, char *);
+        for (i = 0; i < LOGEVENT_CIRCULAR_MAX; i++)
+            es->events_circular[i] = NULL;
     }
 
+    if (es->ninitial < LOGEVENT_INITIAL_MAX)
+        location = &es->events_initial[es->ninitial];
+    else
+        location = &es->events_circular[(es->circular_first + es->ncircular) % LOGEVENT_CIRCULAR_MAX];
+
     tm=ltime();
     strftime(timebuf, sizeof(timebuf), "%Y-%m-%d %H:%M:%S\t", &tm);
 
-    es->events[es->nevents] = snewn(strlen(timebuf) + strlen(string) + 1, char);
-    strcpy(es->events[es->nevents], timebuf);
-    strcat(es->events[es->nevents], string);
+    sfree(*location);
+    *location = snewn(strlen(timebuf) + len + 1, char);
+    strcpy(*location, timebuf);
+    strncat(*location, string, len);
     if (es->window) {
-	dlg_listbox_add(es->listctrl, &es->dp, es->events[es->nevents]);
+	dlg_listbox_add(es->listctrl, &es->dp, *location);
+    }
+    if (es->ninitial < LOGEVENT_INITIAL_MAX) {
+        es->ninitial++;
+    } else if (es->ncircular < LOGEVENT_CIRCULAR_MAX) {
+        es->ncircular++;
+    } else if (es->ncircular == LOGEVENT_CIRCULAR_MAX) {
+        es->circular_first = (es->circular_first + 1) % LOGEVENT_CIRCULAR_MAX;
+        sfree(es->events_circular[es->circular_first]);
+        es->events_circular[es->circular_first] = snewn(sizeof(".."), char);
+        strcpy(es->events_circular[es->circular_first], "..");
+        es->events_circular[es->circular_first][sizeof("..") - 1] = '\0';
     }
-    es->nevents++;
 }
 
 int askappend(void *frontend, Filename *filename,
diff --git a/windows/windlg.c b/windows/windlg.c
index 39d2adddd..3df1506b1 100644
--- a/windows/windlg.c
+++ b/windows/windlg.c
@@ -42,8 +42,12 @@ static struct controlbox *ctrlbox;
 static struct winctrls ctrls_base, ctrls_panel;
 static struct dlgparam dp;
 
-static char **events = NULL;
-static int nevents = 0, negsize = 0;
+#define LOGEVENT_INITIAL_MAX 128
+#define LOGEVENT_CIRCULAR_MAX 128
+
+static char *events_initial[LOGEVENT_INITIAL_MAX];
+static char *events_circular[LOGEVENT_CIRCULAR_MAX];
+static int ninitial = 0, ncircular = 0, circular_first = 0;
 
 extern Conf *conf;		       /* defined in window.c */
 
@@ -67,6 +71,15 @@ void force_normal(HWND hwnd)
     recurse = 0;
 }
 
+static char *getevent(int i)
+{
+    if (i < ninitial)
+        return events_initial[i];
+    if ((i -= ninitial) < ncircular)
+        return events_circular[(circular_first + i) % LOGEVENT_CIRCULAR_MAX];
+    return NULL;
+}
+
 static INT_PTR CALLBACK LogProc(HWND hwnd, UINT msg,
                                 WPARAM wParam, LPARAM lParam)
 {
@@ -84,9 +97,12 @@ static INT_PTR CALLBACK LogProc(HWND hwnd, UINT msg,
 	    SendDlgItemMessage(hwnd, IDN_LIST, LB_SETTABSTOPS, 2,
 			       (LPARAM) tabs);
 	}
-	for (i = 0; i < nevents; i++)
+	for (i = 0; i < ninitial; i++)
+	    SendDlgItemMessage(hwnd, IDN_LIST, LB_ADDSTRING,
+			       0, (LPARAM) events_initial[i]);
+	for (i = 0; i < ncircular; i++)
 	    SendDlgItemMessage(hwnd, IDN_LIST, LB_ADDSTRING,
-			       0, (LPARAM) events[i]);
+			       0, (LPARAM) events_circular[(circular_first + i) % LOGEVENT_CIRCULAR_MAX]);
 	return 1;
       case WM_COMMAND:
 	switch (LOWORD(wParam)) {
@@ -127,13 +143,13 @@ static INT_PTR CALLBACK LogProc(HWND hwnd, UINT msg,
 		    size = 0;
 		    for (i = 0; i < count; i++)
 			size +=
-			    strlen(events[selitems[i]]) + sizeof(sel_nl);
+			    strlen(getevent(selitems[i])) + sizeof(sel_nl);
 
 		    clipdata = snewn(size, char);
 		    if (clipdata) {
 			char *p = clipdata;
 			for (i = 0; i < count; i++) {
-			    char *q = events[selitems[i]];
+			    char *q = getevent(selitems[i]);
 			    int qlen = strlen(q);
 			    memcpy(p, q, qlen);
 			    p += qlen;
@@ -145,7 +161,7 @@ static INT_PTR CALLBACK LogProc(HWND hwnd, UINT msg,
 		    }
 		    sfree(selitems);
 
-		    for (i = 0; i < nevents; i++)
+		    for (; i < (ninitial + ncircular); i++)
 			SendDlgItemMessage(hwnd, IDN_LIST, LB_SETSEL,
 					   FALSE, i);
 		}
@@ -745,32 +761,48 @@ int do_reconfig(HWND hwnd, int protcfginfo)
     return ret;
 }
 
+#define MAXLOGMSGLEN 1000
+
 void logevent(void *frontend, const char *string)
 {
     char timebuf[40];
+    char **location;
     struct tm tm;
+    size_t slen = strlen(string);
+    size_t len = (slen > MAXLOGMSGLEN) ? MAXLOGMSGLEN : slen;
 
     log_eventlog(logctx, string);
 
-    if (nevents >= negsize) {
-	negsize += 64;
-	events = sresize(events, negsize, char *);
-    }
-
     tm=ltime();
     strftime(timebuf, sizeof(timebuf), "%Y-%m-%d %H:%M:%S\t", &tm);
 
-    events[nevents] = snewn(strlen(timebuf) + strlen(string) + 1, char);
-    strcpy(events[nevents], timebuf);
-    strcat(events[nevents], string);
+    if (ninitial < LOGEVENT_INITIAL_MAX)
+        location = &events_initial[ninitial];
+    else
+        location = &events_circular[(circular_first + ncircular) % LOGEVENT_CIRCULAR_MAX];
+
+    if (*location)
+        sfree(*location);
+    *location = snewn(strlen(timebuf) + len + 1, char);
+    strcpy(*location, timebuf);
+    strncat(*location, string, len);
     if (logbox) {
 	int count;
 	SendDlgItemMessage(logbox, IDN_LIST, LB_ADDSTRING,
-			   0, (LPARAM) events[nevents]);
+			   0, (LPARAM) *location);
 	count = SendDlgItemMessage(logbox, IDN_LIST, LB_GETCOUNT, 0, 0);
 	SendDlgItemMessage(logbox, IDN_LIST, LB_SETTOPINDEX, count - 1, 0);
     }
-    nevents++;
+    if (ninitial < LOGEVENT_INITIAL_MAX) {
+        ninitial++;
+    } else if (ncircular < LOGEVENT_CIRCULAR_MAX) {
+        ncircular++;
+    } else if (ncircular == LOGEVENT_CIRCULAR_MAX) {
+        circular_first = (circular_first + 1) % LOGEVENT_CIRCULAR_MAX;
+        sfree(events_circular[circular_first]);
+        events_circular[circular_first] = snewn(sizeof(".."), char);
+        strcpy(events_circular[circular_first], "..");
+    }
 }
 
 void showeventlog(HWND hwnd)