Handle SOS and PM escape sequences like APC and improve OSC parsing

.gitignore

@@ -74,12 +74,15 @@ cmake_install.cmake
 /build.out
 /empty.h
 Makefile
+!/contrib/cygtermd/Makefile
+!/icons/Makefile
 /compile
 *.a
 /charset/sbcsdat.c
 /contrib/cygtermd/cygtermd.exe
 /doc/*.html
 /doc/*.txt
+!/doc/CMakeLists.txt
 /doc/*.cnt
 /doc/*.hlp
 /doc/*.gid
@@ -99,6 +102,7 @@ Makefile
 /icons/*.ico
 /icons/*.icns
 /icons/*.xpm
+/icons/*.svg
 /icons/*.c
 /unix/empty.h
 /unix/plink

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 19120 # update this at every release
+set Epoch 19587 # 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
 

CHECKLST.txt

@@ -94,6 +94,14 @@ Making a release candidate build
  - Make the release tag, pointing at the version-update commit we just
    generated.
 
+ - If the release tag is on a branch (which I expect it generally will
+   be), prepare a merge to main, and make sure it builds sensibly.
+   Even if the branch consists of nothing but cherry-picks _from_
+   main, this will mean that the 'update version number' change
+   appears on main and the snapshots start announcing themselves as
+   post-X.YZ. But also, if there's anything new on the branch, this is
+   how it gets on to main as well.
+
  - Make a release-candidate build from the release tag, and put the
    build.out and build.log files somewhere safe. Normally I store
    these inside the ~/src/putty/X.YZ directory, alongside the git
@@ -146,24 +154,10 @@ Making a release candidate build
     * do some testing on a system with a completely clean slate (no
       prior saved session data)
 
-Preparing to make the release
------------------------------
-
  - Write a release announcement (basically a summary of the changes
    since the last release). Check the draft version into the putty-aux
    repository, so the whole team can help wordsmith it if they want to.
 
- - Update the website, in a local checkout:
-    * Write a release file in components/releases which identifies the
-      new version, a section for the Changes page, and a news
-      announcement for the front page.
-       + The one thing this can't yet contain is the release date;
-         that has to be put in at the last minute, when the release
-         goes live. Fill in 'FIXME', for the moment.
-    * Disable the pre-release sections of the website (if previously
-      enabled), by editing prerel_version() in components/Base.mc to
-      return undef.
-
  - Prepare some 'what's new in this release' blurb for the Windows
    Store. This should be very brief - even briefer than the website
    news item.
@@ -184,14 +178,43 @@ Preparing to make the release
       fixing a #vulnerability. That's how people will find the toot.
     * Again, commit to putty-aux for team review.
 
- - Update the wishlist, in a local checkout:
+ - Prepare a website update:
+    * Write a release file in components/releases which identifies the
+      new version, a section for the Changes page, and a news
+      announcement for the front page.
+       + The one thing this can't yet contain is the release date;
+         that has to be put in at the last minute, when the release
+         goes live. Fill in 'FIXME', for the moment.
+    * Disable the pre-release sections of the website (if previously
+      enabled), by editing prerel_version() in components/Base.mc to
+      return undef.
+    * Push to the private clone of the website repo for the team to
+      check over.
+
+ - Prepare a wishlist update:
     * If there are any last-minute wishlist entries (e.g. security
       vulnerabilities fixed in the new release), write entries for
       them.
     * If any other bug fixes have been cherry-picked to the release
       branch (so that the wishlist mechanism can't automatically mark
       them as fixed in the new release), add appropriate Fixed-in
       headers for those.
+    * Push to the private clone of the wishlist repo for the team to
+      check over.
+
+The actual release procedure
+----------------------------
+
+Once all the above preparation is done and we've decided we have a
+good release candidate and a good set of announcements, wishlist
+entries etc, this is the procedure for putting it all up on the web.
+
+ - Log in to the MS Partner Center and make sure everything is in
+   order. If the UI has completely changed, make sure you can find
+   your way around the new one; if it wants you to read an enormous
+   document of revised T&Cs, get that out of the way in advance, so it
+   doesn't suddenly become a delay in the middle of the actual
+   release.
 
  - Sign the release in full. In the `build-X.YZ-rcN.out' directory,
    re-verify that the preliminary signed checksums file has a correct
@@ -209,29 +232,10 @@ Preparing to make the release
      sh sign.sh -r putty     # and enter the release key passphrase
      chmod -R a-w putty
 
- - If the release is on a branch (which I expect it generally will
-   be), prepare a merge of that branch to main. Even if the branch
-   consists of nothing but cherry-picks _from_ main, this will mean
-   that the 'update version number' change appears on main and the
-   snapshots start announcing themselves as post-X.YZ. But also, if
-   there's anything new on the branch, this is how it gets on to main
-   as well.
-
- - Log in to the MS Partner Center and make sure everything is in
-   order. If the UI has completely changed, make sure you can find
-   your way around the new one; if it wants you to read an enormous
-   document of revised T&Cs, get that out of the way in advance, so it
-   doesn't suddenly become a delay in the middle of the actual
-   release.
-
-The actual release procedure
-----------------------------
-
-Once all the above preparation is done and the release has been built
-locally, this is the procedure for putting it up on the web.
-
- - Make a final adjustment to your local website changes, filling in
-   the release date in components/releases/X.YZ.mi.
+ - Make final adjustments to the local website and wishlist changes,
+   filling in the release date in components/releases/X.YZ.mi, and any
+   missing (e.g. not previously finalised) commit hashes in wishlist
+   entries. Check that both look sensible locally.
 
  - Upload the release itself and its link maps to everywhere it needs
    to be, by running this in the build-X.YZ-rcN.out directory:

CMakeLists.txt

@@ -43,6 +43,7 @@ add_library(network STATIC
   proxy/socks4.c
   proxy/socks5.c
   proxy/telnet.c
+  proxy/newmain.c
   proxy/local.c
   proxy/interactor.c)
 

LATEST.VER

@@ -1 +1 @@
-0.83
+0.84

LICENCE

@@ -1,4 +1,4 @@
-PuTTY is copyright 1997-2025 Simon Tatham.
+PuTTY is copyright 1997-2026 Simon Tatham.
 
 部分版权属于 Robert de Bath, Joris van Rantwijk, Delian
 Delchev, Andreas Schultz, Jeroen Massar, Wez Furlong, Nicolas Barry,
@@ -14,4 +14,4 @@ Kuzmich, Nico Williams, Viktor Dukhovni, Josh Dersch, Lars Brinkhoff,
 
 该软件是作为 "AS IS" 提供，没有任何保证、表示或暗示，包括但不限于适销性、适用性和不侵权。在任何情况下作者不对任何声明、损坏或其他责任负责，无论是发生在合同行为、侵权或其它任何来自软件的、与软件相关或无关的以及软件的使用。
 
-PuTTY 中文版的版权属于 2003-2025 李峰，保留所有权利。
+PuTTY 中文版的版权属于 2003-2026 李峰，保留所有权利。

callback.c

@@ -41,17 +41,17 @@ void queue_idempotent_callback(struct IdempotentCallback *ic)
     queue_toplevel_callback(run_idempotent_callback, ic);
 }
 
-void delete_callbacks_for_context(void *ctx)
+void delete_callbacks(
+    bool (*delete_this_one)(void *predicate_ctx, toplevel_callback_fn_t fn,
+                            void *callback_ctx), void *predicate_ctx)
 {
     struct callback *newhead, *newtail;
 
     newhead = newtail = NULL;
     while (cbhead) {
         struct callback *cb = cbhead;
         cbhead = cbhead->next;
-        if (cb->ctx == ctx ||
-            (cb->fn == run_idempotent_callback &&
-             ((struct IdempotentCallback *)cb->ctx)->ctx == ctx)) {
+        if (delete_this_one(predicate_ctx, cb->fn, cb->ctx)) {
             sfree(cb);
         } else {
             if (!newhead)
@@ -69,6 +69,19 @@ void delete_callbacks_for_context(void *ctx)
         newtail->next = NULL;
 }
 
+static bool callback_is_for_context(
+    void *predicate_ctx, toplevel_callback_fn_t fn, void *callback_ctx)
+{
+    return callback_ctx == predicate_ctx ||
+        (fn == run_idempotent_callback &&
+         ((struct IdempotentCallback *)callback_ctx)->ctx == predicate_ctx);
+}
+
+void delete_callbacks_for_context(void *ctx)
+{
+    delete_callbacks(callback_is_for_context, ctx);
+}
+
 void queue_toplevel_callback(toplevel_callback_fn_t fn, void *ctx)
 {
     struct callback *cb;

charset/internal.h

@@ -6,7 +6,13 @@
 #define charset_internal_h
 
 /* This invariably comes in handy */
-#define lenof(x) ( sizeof((x)) / sizeof(*(x)) )
+#ifndef lenof
+#if HAVE_COUNTOF
+#define lenof(x) _Countof(x)
+#else
+#define lenof(x) ( (sizeof((x))) / (sizeof(*(x))))
+#endif
+#endif
 
 /* This is an invalid Unicode value used to indicate an error. */
 #define ERROR 0xFFFFL                  /* Unicode value representing error */

cmake/cmake.h.in

@@ -5,6 +5,8 @@
 
 #cmakedefine NO_MULTIMON
 
+#cmakedefine01 HAVE_COUNTOF
+
 #cmakedefine01 HAVE_WINRESRC_H
 #cmakedefine01 HAVE_WINRES_H
 #cmakedefine01 HAVE_WIN_H
@@ -15,7 +17,6 @@
 #cmakedefine01 HAVE_GETNAMEDPIPECLIENTPROCESSID
 #cmakedefine01 HAVE_SETDEFAULTDLLDIRECTORIES
 #cmakedefine01 HAVE_STRTOUMAX
-#cmakedefine01 HAVE_WMEMCHR
 #cmakedefine01 HAVE_DWMAPI_H
 
 #cmakedefine NOT_X_WINDOWS

cmake/gitcommit.cmake

@@ -6,34 +6,32 @@ set(commit "${DEFAULT_COMMIT}")
 set(TOPLEVEL_SOURCE_DIR ${CMAKE_SOURCE_DIR})
 
 execute_process(
-  COMMAND ${GIT_EXECUTABLE} rev-parse --show-toplevel
-  OUTPUT_VARIABLE git_worktree
+  COMMAND ${GIT_EXECUTABLE} rev-parse --show-cdup
+  OUTPUT_VARIABLE path_to_top
   ERROR_VARIABLE stderr
   RESULT_VARIABLE status)
-string(REGEX REPLACE "\n$" "" git_worktree "${git_worktree}")
+string(REGEX REPLACE "\n$" "" path_to_top "${path_to_top}")
 
-if(status EQUAL 0)
-  if(git_worktree STREQUAL CMAKE_SOURCE_DIR)
-    execute_process(
-      COMMAND ${GIT_EXECUTABLE} rev-parse HEAD
-      OUTPUT_VARIABLE git_commit
-      ERROR_VARIABLE stderr
-      RESULT_VARIABLE status)
-    if(status EQUAL 0)
-      string(REGEX REPLACE "\n$" "" commit "${git_commit}")
-    else()
-      if(commit STREQUAL "unavailable")
-        message("Unable to determine git commit: 'git rev-parse HEAD' returned status ${status} and error output:\n${stderr}\n")
-      endif()
-    endif()
+# If we're at the top of a git repository, --show-cdup will print the
+# empty string (followed by a newline) and return success. If we're
+# lower down, it will return a sequence of "../../" that leads to the
+# top; if we're higher up it will fail with an error.
+if(status EQUAL 0 AND path_to_top STREQUAL "")
+  execute_process(
+    COMMAND ${GIT_EXECUTABLE} rev-parse HEAD
+    OUTPUT_VARIABLE git_commit
+    ERROR_VARIABLE stderr
+    RESULT_VARIABLE status)
+  if(status EQUAL 0)
+    string(REGEX REPLACE "\n$" "" commit "${git_commit}")
   else()
     if(commit STREQUAL "unavailable")
-      message("Unable to determine git commit: top-level source dir ${CMAKE_SOURCE_DIR} is not the root of a repository")
+      message("Unable to determine git commit: 'git rev-parse HEAD' returned status ${status} and error output:\n${stderr}\n")
     endif()
   endif()
 else()
   if(commit STREQUAL "unavailable")
-    message("Unable to determine git commit: 'git rev-parse --show-toplevel' returned status ${status} and error output:\n${stderr}\n")
+    message("Unable to determine git commit: top-level source dir ${CMAKE_SOURCE_DIR} is not the root of a repository")
   endif()
 endif()
 

cmake/platforms/unix.cmake

@@ -89,7 +89,7 @@ if(GTK_FOUND)
     list(APPEND CMAKE_REQUIRED_INCLUDES ${GTK_INCLUDE_DIRS})
     check_include_file(gdk/gdkx.h HAVE_GDK_GDKX_H)
 
-    if(X11_FOUND AND HAVE_GDK_GDKX_H)
+    if(X11_FOUND AND X11_Xrender_FOUND AND HAVE_GDK_GDKX_H)
       set(NOT_X_WINDOWS OFF PARENT_SCOPE)
     else()
       set(NOT_X_WINDOWS ON PARENT_SCOPE)

cmake/platforms/windows.cmake

@@ -53,7 +53,6 @@ define_negation(NO_HTMLHELP HAVE_HTMLHELP_H)
 check_include_files("winsock2.h;afunix.h" HAVE_AFUNIX_H)
 
 check_symbol_exists(strtoumax "inttypes.h" HAVE_STRTOUMAX)
-check_symbol_exists(wmemchr "wchar.h" HAVE_WMEMCHR)
 check_symbol_exists(AddDllDirectory "windows.h" HAVE_ADDDLLDIRECTORY)
 check_symbol_exists(SetDefaultDllDirectories "windows.h"
   HAVE_SETDEFAULTDLLDIRECTORIES)

cmake/setup.cmake

@@ -116,6 +116,12 @@ int main(int argc, char **argv) {
     free(p);
 }" HAVE_ALIGNED_ALLOC)
 
+check_c_source_compiles("
+int main(int argc, char **argv) {
+    int a[3];
+    return _Countof(a);
+}" HAVE_COUNTOF)
+
 if(PUTTY_DEBUG)
   add_compile_definitions(DEBUG)
 endif()

cmdline.c

@@ -471,6 +471,12 @@ int cmdline_process_param(CmdlineArg *arg, CmdlineArg *nextarg,
         SAVEABLE(0);
         conf_set_str(conf, CONF_loghost, value);
     }
+    if (!strcmp(p, "-preconnectcommand")) {
+        RETURN(2);
+        UNAVAILABLE_IN(TOOLTYPE_NONNETWORK);
+        SAVEABLE(1);
+        conf_set_str(conf, CONF_pre_connect_command, value);
+    }
     if (!strcmp(p, "-hostkey")) {
         char *dup;
         RETURN(2);

conf.h

@@ -90,6 +90,11 @@ CONF_OPTION(loghost, /* logical host being contacted, for host key check */
     DEFAULT_STR(""),
     SAVE_KEYWORD("LogHost"),
 )
+CONF_OPTION(pre_connect_command,
+    VALUE_TYPE(STR),
+    DEFAULT_STR(""),
+    SAVE_KEYWORD("PreConnectCommand"),
+)
 
 /* Proxy options */
 CONF_OPTION(proxy_exclude_list,

config.c

@@ -2512,6 +2512,12 @@ void setup_config_box(struct controlbox *b, bool midsession,
                              HELPCTX(connection_loghost),
                              conf_editbox_handler, I(CONF_loghost), ED_STR);
             }
+
+            s = ctrl_getset(b, "连接", "hooks",
+                            "连接事件发生时运行的命令");
+            ctrl_editbox(s, "连接前运行命令(B)", 'b', 100,
+                         HELPCTX(connection_pre_hook),
+                         conf_editbox_handler, I(CONF_pre_connect_command), ED_STR);
         }
 
         /*

crypto/CMakeLists.txt

@@ -237,9 +237,16 @@ if(neon)
 endif()
 
 test_compile_with_flags(HAVE_ARM_DIT
-  GNU_FLAGS -march=armv8.4-a
   TEST_SOURCE "
-    int main(void) { asm volatile(\"msr dit, %0\" :: \"r\"(1)); }"
+    #ifndef __aarch64__
+    #error make sure this only even tries to work on AArch64
+    #endif
+    #include <stdint.h>
+    int main(void) {
+      register uint64_t one asm(\"x8\");
+      one = 1;
+      asm volatile(\".inst 0xd51b42a8\" :: \"r\"(one));
+    }"
   ADD_SOURCES_IF_SUCCESSFUL enable_dit.c)
 
 set(HAVE_AES_NI ${HAVE_AES_NI} PARENT_SCOPE)