From 06f98ff7d4cdb89ec5059228bb7dc16fc21a5226 Mon Sep 17 00:00:00 2001 From: cyd01 Date: Wed, 8 Jan 2020 22:48:34 +0100 Subject: [PATCH] Prepare for 2020 --- 0.73_My_PuTTY/licence.h | 4 ++-- 0.73_My_PuTTY/windows/MAKEFILE.MINGW | 5 +---- 0.73_My_PuTTY/windows/version.rc2 | 2 +- 0.73_My_PuTTY/windows/win_res.rc2 | 2 +- 0.73_My_PuTTY/windows/windlg.c | 2 +- kitty_launcher.c | 2 +- mini/mini.c | 2 +- 7 files changed, 8 insertions(+), 11 deletions(-) diff --git a/0.73_My_PuTTY/licence.h b/0.73_My_PuTTY/licence.h index f95652f..f3bc734 100644 --- a/0.73_My_PuTTY/licence.h +++ b/0.73_My_PuTTY/licence.h @@ -6,7 +6,7 @@ */ #define LICENCE_TEXT(parsep) \ - "PuTTY is copyright 1997-2019 Simon Tatham." \ + "PuTTY is copyright 1997-2020 Simon Tatham." \ parsep \ "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, Nico Williams, Viktor Dukhovni, and CORE SDI S.A." \ parsep \ @@ -16,4 +16,4 @@ parsep \ "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." -#define SHORT_COPYRIGHT_DETAILS "1997-2019 Simon Tatham" +#define SHORT_COPYRIGHT_DETAILS "1997-2020 Simon Tatham" diff --git a/0.73_My_PuTTY/windows/MAKEFILE.MINGW b/0.73_My_PuTTY/windows/MAKEFILE.MINGW index dbdf88a..4201546 100644 --- a/0.73_My_PuTTY/windows/MAKEFILE.MINGW +++ b/0.73_My_PuTTY/windows/MAKEFILE.MINGW @@ -2153,10 +2153,7 @@ cross: cross64: sed -i 's#^typedef enum _WTS_VIRTUAL_CLASS #// typedef enum _WTS_VIRTUAL_CLASS #' window.c make -e TOOLPATH=/usr/bin/x86_64-w64-mingw32- -f MAKEFILE.MINGW putty.exe - /usr/bin/x86_64-w64-mingw32-gcc -o kitty64.exe *.o ../../base64/base64_64.a ../../bcrypt/bcrypt_64.a ../../blocnote/notepad_64.a ../../jpeg/libjpeg_64.a \ - ../../md5/MD5check_64.a ../../mini/mini_64.a ../../regex/libregex_64.a \ - -ladvapi32 -lcomdlg32 -lgdi32 -limm32 -lpsapi -lole32 -lshell32 \ - -luser32 -lwsock32 -lwtsapi32 + /usr/bin/x86_64-w64-mingw32-gcc -o kitty64.exe *.o ../../base64/base64_64.a ../../bcrypt/bcrypt_64.a ../../blocnote/notepad_64.a ../../jpeg/libjpeg_64.a ../../md5/MD5check_64.a ../../mini/mini_64.a ../../regex/libregex_64.a -ladvapi32 -lcomdlg32 -lgdi32 -limm32 -lpsapi -lole32 -lshell32 -luser32 -lwsock32 -lwtsapi32 -mwindows 9bis: putty.exe putty_portable.exe plink.exe pscp.exe psftp.exe pageant.exe puttygen.exe diff --git a/0.73_My_PuTTY/windows/version.rc2 b/0.73_My_PuTTY/windows/version.rc2 index 7e068a1..9c379fc 100644 --- a/0.73_My_PuTTY/windows/version.rc2 +++ b/0.73_My_PuTTY/windows/version.rc2 @@ -54,7 +54,7 @@ BEGIN VALUE "FileVersion", TEXTVER #endif #if (defined MOD_PERSO) && (!defined FDJ) - VALUE "ProductVersion", TEXTVER " - KiTTY fork - Additional features on KiTTY That's all folks! by 9bis.com, 2019" + VALUE "ProductVersion", TEXTVER " - KiTTY fork - Additional features on KiTTY That's all folks! by 9bis.com, 2005-2020" #else VALUE "ProductVersion", TEXTVER #endif diff --git a/0.73_My_PuTTY/windows/win_res.rc2 b/0.73_My_PuTTY/windows/win_res.rc2 index bc1a7bf..49def9e 100644 --- a/0.73_My_PuTTY/windows/win_res.rc2 +++ b/0.73_My_PuTTY/windows/win_res.rc2 @@ -212,7 +212,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN ICON IDI_MAINICON_0,IDC_STATIC,7,7,30,20 LTEXT "",IDA_VERSION,45,7,198,8 - LTEXT "Copyright \251 2006-2019",IDC_STATIC,45,19,78,8 + LTEXT "Copyright \251 2005-2020",IDC_STATIC,45,19,78,8 LTEXT "9bis software - http://kitty.9bis.com", IDC_WEBPAGE,45,31,145,8 LTEXT "Contact:",IDC_STATIC,45,43,46,8 diff --git a/0.73_My_PuTTY/windows/windlg.c b/0.73_My_PuTTY/windows/windlg.c index 6bc0b05..3fa176a 100644 --- a/0.73_My_PuTTY/windows/windlg.c +++ b/0.73_My_PuTTY/windows/windlg.c @@ -239,7 +239,7 @@ static INT_PTR CALLBACK LicenceProc(HWND hwnd, UINT msg, #if (defined MOD_PERSO) && (!defined FDJ) //static const char MESSAGE[] = ""; -static const char MESSAGE[] = " KiTTY software is developed by Cyd for 9bis.com, copyright \251 2006-2019, thanks to Leo for bcrypt and mini libraries, thanks to all contributors " ; +static const char MESSAGE[] = " KiTTY software is developed by Cyd for 9bis.com, copyright \251 2005-2020, thanks to Leo for bcrypt and mini libraries, thanks to all contributors " ; static INT_PTR CALLBACK AboutProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) { diff --git a/kitty_launcher.c b/kitty_launcher.c index 7107934..00f0c92 100644 --- a/kitty_launcher.c +++ b/kitty_launcher.c @@ -581,7 +581,7 @@ LRESULT CALLBACK Launcher_WndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lP case WM_COMMAND: {//Commandes du menu switch( LOWORD(wParam) ) { case IDM_ABOUT: - MessageBox(hwnd," TTY Launcher\nSession launcher for TTY terminal emulator\n(c), 2009-2019","About", MB_OK ) ; + MessageBox(hwnd," TTY Launcher\nSession launcher for TTY terminal emulator\n(c), 2009-2020","About", MB_OK ) ; break ; case IDM_QUIT: ResShell = Shell_NotifyIcon(NIM_DELETE, &TrayIcone) ; diff --git a/mini/mini.c b/mini/mini.c index 3ce6f17..e5bdd58 100644 --- a/mini/mini.c +++ b/mini/mini.c @@ -493,7 +493,7 @@ int delINISec( const char * filename, const char * section, const char * key ) { } void destroyINI( void ) { - if(mini_filename!=NULL) ; free(mini_filename) ; mini_filename=NULL ; + if(mini_filename!=NULL) { free(mini_filename) ; } mini_filename=NULL ; freeINI( &mini_Ini ) ; }