Merge tag 'v0.76.1.6' into cnKiTTY

# Conflicts: # 0.76b_My_PuTTY/windows/putty-common.rc2 # 0.76b_My_PuTTY/windows/winstuff.h
dZ8Lx9OwX · May 3, 2023 · f953d70 · f953d70
2 parents a0f7f82 + 59da291
commit f953d70
Show file tree

Hide file tree

Showing 39 changed files with 1,396 additions and 1,269 deletions.
diff --git a/0.76b_My_PuTTY/puttyps.h b/0.76b_My_PuTTY/puttyps.h
@@ -7,7 +7,7 @@
 
 #ifdef _WINDOWS
 
-#include "winstuff.h"
+#include "platform.h"
 
 #else
 

diff --git a/0.76b_My_PuTTY/version.h b/0.76b_My_PuTTY/version.h
@@ -1,5 +1,5 @@
 #define RELEASE 0.76
 #define TEXTVER "Release 0.76"
 #define SSHVER "-Release-0.76"
-#define BINARY_VERSION 0,76,1,5
+#define BINARY_VERSION 0,76,1,6
 #define SOURCE_COMMIT "unavailable"
diff --git a/0.76b_My_PuTTY/windows/MAKEFILE.MINGW b/0.76b_My_PuTTY/windows/MAKEFILE.MINGW
diff --git a/0.76b_My_PuTTY/windows/agent-client.c b/0.76b_My_PuTTY/windows/agent-client.c
@@ -10,7 +10,7 @@
 #include "pageant.h" /* for AGENT_MAX_MSGLEN */
 
 #ifndef NO_SECURITY
-#include "winsecur.h"
+#include "security-api.h"
 #include "cryptoapi.h"
 #endif
 

diff --git a/0.76b_My_PuTTY/windows/dialog.c b/0.76b_My_PuTTY/windows/dialog.c
@@ -12,7 +12,7 @@
 #include "putty.h"
 #include "ssh.h"
 #include "putty-rc.h"
-#include "winseat.h"
+#include "win-gui-seat.h"
 #include "storage.h"
 #include "dialog.h"
 #include "licence.h"
@@ -275,7 +275,7 @@ static INT_PTR CALLBACK AboutProc(HWND hwnd, UINT msg,
 		sprintf( buffer, "KiTTY - %s", BuildVersionTime ) ;
 		SetDlgItemText(hwnd,IDA_VERSION,buffer);
 
-		str = dupprintf("关于%s_v0.76.1.5.1 - 这是一个KiTTY中文版本！", appname);
+		str = dupprintf("关于%s_v0.76.1.6.1 - 这是一个KiTTY中文版本！", appname);
 		SetWindowText(hwnd, str);
 		sfree(str);
 

diff --git a/0.76b_My_PuTTY/windows/winproxy.c → 0.76b_My_PuTTY/windows/local-proxy.c b/0.76b_My_PuTTY/windows/winproxy.c → 0.76b_My_PuTTY/windows/local-proxy.c
diff --git a/0.76b_My_PuTTY/windows/named-pipe-client.c b/0.76b_My_PuTTY/windows/named-pipe-client.c
@@ -13,7 +13,7 @@
 
 #if !defined NO_SECURITY
 
-#include "winsecur.h"
+#include "security-api.h"
 
 HANDLE connect_to_named_pipe(const char *pipename, char **err)
 {

diff --git a/0.76b_My_PuTTY/windows/named-pipe-server.c b/0.76b_My_PuTTY/windows/named-pipe-server.c
@@ -13,7 +13,7 @@
 
 #if !defined NO_SECURITY
 
-#include "winsecur.h"
+#include "security-api.h"
 
 typedef struct NamedPipeServerSocket {
     /* Parameters for (repeated) creation of named pipe objects */

diff --git a/0.76b_My_PuTTY/windows/pageant.c b/0.76b_My_PuTTY/windows/pageant.c
@@ -13,7 +13,7 @@
 #include "ssh.h"
 #include "misc.h"
 #include "tree234.h"
-#include "winsecur.h"
+#include "security-api.h"
 #include "cryptoapi.h"
 #include "pageant.h"
 #include "licence.h"
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,7 +7,7 @@ @@
     #ifdef _WINDOWS
-    #include "winstuff.h"
+    #include "platform.h"
     #else
@@ Expand Down @@