update license

Author: mayswind

putty/LICENCE

@@ -3,7 +3,9 @@ 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, Jeff Smith, Pavel Kryukov, Maxim Kuznetsov, Svyatoslav
+Kuzmich, and CORE SDI S.A.
 Portions copyright Lu Dong for the putty-nd's changes.
 Portions copyright MaysWind for the PuTTY-ng's changes.
 

putty/licence.h

@@ -6,6 +6,35 @@
  */
 
 #define LICENCE_TEXT(parsep) \
-    "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. Portions copyright Lu Dong for the putty-nd's changes. Portions copyright MaysWind for the PuTTY-ng's changes.  Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the \"Software\"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:  The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.  THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE."
+    "PuTTY is copyright 1997-2017 Simon Tatham.\r\n\
+\r\n\
+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, Pavel Kryukov, Maxim Kuznetsov, Svyatoslav \
+Kuzmich, and CORE SDI S.A.\r\n\
+Portions copyright Lu Dong for the putty-nd's changes.\r\n\
+Portions copyright MaysWind for the PuTTY-ng's changes.\r\n\
+\r\n\
+Permission is hereby granted, free of charge, to any person \
+obtaining a copy of this software and associated documentation files \
+(the \r\n\"Software\"), to deal in the Software without restriction, \
+including without limitation the rights to use, copy, modify, merge, \
+publish, distribute, sublicense, and/or sell copies of the Software, \
+and to permit persons to whom the Software is furnished to do so, \
+subject to the following conditions:\r\n\
+\r\n\
+The above copyright notice and this permission notice shall be \
+included in all copies or substantial portions of the Software.\r\n\
+\r\n\
+THE SOFTWARE IS PROVIDED \r\n\"AS IS\", WITHOUT WARRANTY OF ANY KIND, \
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF \
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND \
+NONINFRINGEMENT.  IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE \
+FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF \
+CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION \
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\
+"
 
-#define SHORT_COPYRIGHT_DETAILS "1997-2017 Simon Tatham, 2011-2019 Lu Dong, 2019 MaysWind"
+#define SHORT_COPYRIGHT_DETAILS "2019 MaysWind"

putty/windows/version.rc2

@@ -38,11 +38,11 @@ BEGIN
 	/* "lang-charset" LLLLCCCC = (UK English, Unicode) */
 	BLOCK "080904B0"
 	BEGIN
-	    VALUE "CompanyName",	"Simon Tatham"  /* required :/ */
-	    VALUE "ProductName",	"PuTTY suite"
+	    VALUE "CompanyName",	"MaysWind"  /* required :/ */
+	    VALUE "ProductName",	"PuTTY-ng"
 	    VALUE "FileDescription",	APPDESC
 	    VALUE "InternalName",	APPNAME
-	    VALUE "OriginalFilename",	APPNAME
+	    VALUE "OriginalFilename",	"putty-ng.exe"
 	    VALUE "FileVersion",	TEXTVER
 	    VALUE "ProductVersion",	TEXTVER
 	    VALUE "LegalCopyright",	"Copyright \251 " SHORT_COPYRIGHT_DETAILS "."

putty/windows/win_res.rc2

@@ -78,14 +78,14 @@ BEGIN
 END
 
 /* No accelerators used */
-IDD_LICENCEBOX DIALOG DISCARDABLE 50, 50, 326, 231
+IDD_LICENCEBOX DIALOG DISCARDABLE 50, 50, 326, 251
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "PuTTY Licence"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    DEFPUSHBUTTON "OK", IDOK, 148, 211, 44, 14
+    DEFPUSHBUTTON "OK", IDOK, 148, 231, 44, 14
 
-    EDITTEXT IDA_TEXT, 10, 10, 306, 192, ES_READONLY | ES_MULTILINE | ES_LEFT, WS_EX_STATICEDGE
+    EDITTEXT IDA_TEXT, 10, 10, 306, 212, ES_READONLY | ES_MULTILINE | ES_LEFT, WS_EX_STATICEDGE
 END
 
 #include "version.rc2"