Update pre0.77

0.76b_My_PuTTY/windows/wincfg.c → 0.76b_My_PuTTY/windows/config.c

@@ -43,6 +43,7 @@ static void variable_pitch_handler(union control *ctrl, dlgparam *dlg,
 #include "kitty.h"
 int get_param( const char * val ) ;
 char * get_param_str( const char * val ) ;
+int GetPuttyFlag(void) ;
 #if (defined MOD_BACKGROUNDIMAGE) && (!defined FLJ)
 void DisableBackgroundImage( void ) ;
 #endif

0.76b_My_PuTTY/windows/windlg.c → 0.76b_My_PuTTY/windows/dialog.c

@@ -11,7 +11,7 @@
 
 #include "putty.h"
 #include "ssh.h"
-#include "win_res.h"
+#include "putty-rc.h"
 #include "winseat.h"
 #include "storage.h"
 #include "dialog.h"

0.76b_My_PuTTY/windows/win_res.rc2 → 0.76b_My_PuTTY/windows/putty-common.rc2

@@ -13,90 +13,7 @@
  * from it (which happens if the extension is '.h').
  */
 
-#include "win_res.h"
-
-IDI_MAINICON ICON "putty.ico"
-
-#ifdef MOD_PERSO
-
-IDI_FILEASSOC ICON "../../res/file_assoc/kitty_assoc.ico"
-IDI_PUTTY_LAUNCH ICON "../../res/putty_launcher.ico"
-IDI_BLACKBALL ICON "../../res/black.ico"
-IDI_NOCON ICON "../../res/nocon/kitty_nocon.ico"
-
-#ifndef FLJ
-IDI_MAINICON_0 ICON "../../kitty.ico"
-IDI_MAINICON_1 ICON "putty.ico"
-#else
-IDI_MAINICON_0 ICON "putty.ico"
-IDI_MAINICON_1 ICON "../../kitty.ico"
-#endif
-
-IDI_MAINICON_2 ICON "../../res/puttyprd.ico"
-IDI_MAINICON_3 ICON "../../res/putty2.ico"
-IDI_MAINICON_4 ICON "../../res/putty3.ico"
-
-#ifndef FLJ
-IDI_MAINICON_5 ICON "../../res/coyote.ico"
-IDI_MAINICON_6 ICON "../../res/daffy.ico"
-IDI_MAINICON_7 ICON "../../res/tweety.ico"
-IDI_MAINICON_8 ICON "../../res/sylvester.ico"
-
-IDI_MAINICON_9 ICON "../../res/0.ico"
-IDI_MAINICON_10 ICON "../../res/1.ico"
-IDI_MAINICON_11 ICON "../../res/2.ico"
-IDI_MAINICON_12 ICON "../../res/3.ico"
-IDI_MAINICON_13 ICON "../../res/4.ico"
-IDI_MAINICON_14 ICON "../../res/5.ico"
-IDI_MAINICON_15 ICON "../../res/6.ico"
-IDI_MAINICON_16 ICON "../../res/7.ico"
-IDI_MAINICON_17 ICON "../../res/8.ico"
-IDI_MAINICON_18 ICON "../../res/9.ico"
-
-IDI_MAINICON_19 ICON "../../res/porky.ico"
-IDI_MAINICON_20 ICON "../../res/taz.ico"
-IDI_MAINICON_21 ICON "../../res/coq.ico"
-IDI_MAINICON_22 ICON "../../res/elmer.ico"
-IDI_MAINICON_23 ICON "../../res/mars.ico"
-IDI_MAINICON_24 ICON "../../res/speedy.ico"
-IDI_MAINICON_25 ICON "../../res/rocky.ico"
-IDI_MAINICON_26 ICON "../../res/pepepu.ico"
-IDI_MAINICON_27 ICON "../../res/general.ico"
-IDI_MAINICON_28 ICON "../../res/hagar.ico"
-IDI_MAINICON_29 ICON "../../res/jerry.ico"
-IDI_MAINICON_30 ICON "../../res/tom.ico"
-IDI_MAINICON_31 ICON "../../res/snoopy.ico"
-IDI_MAINICON_32 ICON "../../res/woods.ico"
-IDI_MAINICON_33 ICON "../../res/yogi.ico"
-IDI_MAINICON_34 ICON "../../res/scooby.ico"
-IDI_MAINICON_35 ICON "../../res/shaggy.ico"
-IDI_MAINICON_36 ICON "../../res/freddie.ico"
-IDI_MAINICON_37 ICON "../../res/velma.ico"
-IDI_MAINICON_38 ICON "../../res/daphne.ico"
-IDI_MAINICON_39 ICON "../../res/woody.ico"
-IDI_MAINICON_40 ICON "../../res/sam.ico"
-IDI_MAINICON_41 ICON "../../res/runner.ico"
-IDI_MAINICON_42 ICON "../../res/bunny.ico"
-IDI_MAINICON_43 ICON "../../res/hellokitty.ico"
-IDI_MAINICON_44 ICON "../../cthelper/puttycyg.ico"
-IDI_MAINICON_45 ICON "../../res/putty4.ico"
-IDI_MAINICON_46 ICON "../../res/putty5.ico"
-IDI_MAINICON_47 ICON "../../res/putty6.ico"
-IDI_MAINICON_48 ICON "../../res/putty7.ico"
-IDI_MAINICON_49 ICON "../../res/putty8.ico"
-#endif
-
-IDC_HOVER CURSOR "../../res/Hover.cur"
-
-//IDI_NUCLEAR ICON "../../res/nuclear.ico"
-
-#define IDB_OK	1098
-
-#else
-IDI_MAINICON ICON "putty.ico"
-#endif
-
-IDI_CFGICON ICON "puttycfg.ico"
+#include "putty-rc.h"
 
 /* Accelerators used: clw */
 IDD_ABOUTBOX DIALOG DISCARDABLE 140, 40, 270, 136

0.76b_My_PuTTY/windows/putty.rc

@@ -4,7 +4,91 @@
 #define APPDESC "SSH, Telnet, Rlogin, and SUPDUP client"
 
 #include "winhelp.rc2"
-#include "win_res.rc2"
+
+IDI_MAINICON ICON "putty.ico"
+
+#ifdef MOD_PERSO
+
+IDI_FILEASSOC ICON "../../res/file_assoc/kitty_assoc.ico"
+IDI_PUTTY_LAUNCH ICON "../../res/putty_launcher.ico"
+IDI_BLACKBALL ICON "../../res/black.ico"
+IDI_NOCON ICON "../../res/nocon/kitty_nocon.ico"
+
+#ifndef FLJ
+IDI_MAINICON_0 ICON "../../kitty.ico"
+IDI_MAINICON_1 ICON "putty.ico"
+#else
+IDI_MAINICON_0 ICON "putty.ico"
+IDI_MAINICON_1 ICON "../../kitty.ico"
+#endif
+
+IDI_MAINICON_2 ICON "../../res/puttyprd.ico"
+IDI_MAINICON_3 ICON "../../res/putty2.ico"
+IDI_MAINICON_4 ICON "../../res/putty3.ico"
+
+#ifndef FLJ
+IDI_MAINICON_5 ICON "../../res/coyote.ico"
+IDI_MAINICON_6 ICON "../../res/daffy.ico"
+IDI_MAINICON_7 ICON "../../res/tweety.ico"
+IDI_MAINICON_8 ICON "../../res/sylvester.ico"
+
+IDI_MAINICON_9 ICON "../../res/0.ico"
+IDI_MAINICON_10 ICON "../../res/1.ico"
+IDI_MAINICON_11 ICON "../../res/2.ico"
+IDI_MAINICON_12 ICON "../../res/3.ico"
+IDI_MAINICON_13 ICON "../../res/4.ico"
+IDI_MAINICON_14 ICON "../../res/5.ico"
+IDI_MAINICON_15 ICON "../../res/6.ico"
+IDI_MAINICON_16 ICON "../../res/7.ico"
+IDI_MAINICON_17 ICON "../../res/8.ico"
+IDI_MAINICON_18 ICON "../../res/9.ico"
+
+IDI_MAINICON_19 ICON "../../res/porky.ico"
+IDI_MAINICON_20 ICON "../../res/taz.ico"
+IDI_MAINICON_21 ICON "../../res/coq.ico"
+IDI_MAINICON_22 ICON "../../res/elmer.ico"
+IDI_MAINICON_23 ICON "../../res/mars.ico"
+IDI_MAINICON_24 ICON "../../res/speedy.ico"
+IDI_MAINICON_25 ICON "../../res/rocky.ico"
+IDI_MAINICON_26 ICON "../../res/pepepu.ico"
+IDI_MAINICON_27 ICON "../../res/general.ico"
+IDI_MAINICON_28 ICON "../../res/hagar.ico"
+IDI_MAINICON_29 ICON "../../res/jerry.ico"
+IDI_MAINICON_30 ICON "../../res/tom.ico"
+IDI_MAINICON_31 ICON "../../res/snoopy.ico"
+IDI_MAINICON_32 ICON "../../res/woods.ico"
+IDI_MAINICON_33 ICON "../../res/yogi.ico"
+IDI_MAINICON_34 ICON "../../res/scooby.ico"
+IDI_MAINICON_35 ICON "../../res/shaggy.ico"
+IDI_MAINICON_36 ICON "../../res/freddie.ico"
+IDI_MAINICON_37 ICON "../../res/velma.ico"
+IDI_MAINICON_38 ICON "../../res/daphne.ico"
+IDI_MAINICON_39 ICON "../../res/woody.ico"
+IDI_MAINICON_40 ICON "../../res/sam.ico"
+IDI_MAINICON_41 ICON "../../res/runner.ico"
+IDI_MAINICON_42 ICON "../../res/bunny.ico"
+IDI_MAINICON_43 ICON "../../res/hellokitty.ico"
+IDI_MAINICON_44 ICON "../../cthelper/puttycyg.ico"
+IDI_MAINICON_45 ICON "../../res/putty4.ico"
+IDI_MAINICON_46 ICON "../../res/putty5.ico"
+IDI_MAINICON_47 ICON "../../res/putty6.ico"
+IDI_MAINICON_48 ICON "../../res/putty7.ico"
+IDI_MAINICON_49 ICON "../../res/putty8.ico"
+#endif
+
+IDC_HOVER CURSOR "../../res/Hover.cur"
+
+//IDI_NUCLEAR ICON "../../res/nuclear.ico"
+
+#define IDB_OK	1098
+
+#else
+IDI_MAINICON ICON "putty.ico"
+#endif
+
+IDI_CFGICON ICON "puttycfg.ico"
+
+#include "putty-common.rc2"
 
 #ifdef MOD_PERSO
 #ifndef NO_MANIFESTS

0.76b_My_PuTTY/windows/puttytel.rc

@@ -4,7 +4,7 @@
 #define APPDESC "Telnet and Rlogin client"
 
 #include "winhelp.rc2"
-#include "win_res.rc2"
+#include "putty-common.rc2"
 
 #ifndef NO_MANIFESTS
 1 RT_MANIFEST "puttytel.mft"

0.76b_My_PuTTY/windows/wincapi.c → 0.76b_My_PuTTY/windows/utils/cryptoapi.c

@@ -9,7 +9,7 @@
 #include "putty.h"
 #include "ssh.h"
 
-#include "wincapi.h"
+#include "cryptoapi.h"
 
 DEF_WINDOWS_FUNCTION(CryptProtectMemory);
 

0.76b_My_PuTTY/windows/window.c

@@ -27,7 +27,7 @@
 #include "putty.h"
 #include "terminal.h"
 #include "storage.h"
-#include "win_res.h"
+#include "putty-rc.h"
 #include "winsecur.h"
 #include "winseat.h"
 #include "tree234.h"

0.76b_My_PuTTY/windows/winhelp.c

@@ -8,7 +8,7 @@
 #include <assert.h>
 
 #include "putty.h"
-#include "win_res.h"
+#include "putty-rc.h"
 
 #ifdef NO_HTMLHELP
 

0.76b_My_PuTTY/windows/winhelp.rc2

@@ -1,4 +1,4 @@
-#include "win_res.h"
+#include "putty-rc.h"
 
 #ifdef EMBED_CHM
 ID_CUSTOM_CHMFILE TYPE_CUSTOM_CHMFILE "../doc/putty.chm"

0.76b_My_PuTTY/windows/winpgnt.c

@@ -14,7 +14,7 @@
 #include "misc.h"
 #include "tree234.h"
 #include "winsecur.h"
-#include "wincapi.h"
+#include "cryptoapi.h"
 #include "pageant.h"
 #include "licence.h"
 #include "pageant-rc.h"

0.76b_My_PuTTY/windows/winpgntc.c

@@ -11,7 +11,7 @@
 
 #ifndef NO_SECURITY
 #include "winsecur.h"
-#include "wincapi.h"
+#include "cryptoapi.h"
 #endif
 
 #define AGENT_COPYDATA_ID 0x804e50ba   /* random goop */

0.76b_My_PuTTY/windows/winshare.c

@@ -13,7 +13,7 @@
 #include "proxy.h"
 #include "ssh.h"
 
-#include "wincapi.h"
+#include "cryptoapi.h"
 #include "winsecur.h"
 
 #define CONNSHARE_PIPE_PREFIX "\\\\.\\pipe\\putty-connshare"

docs/pages/download.md

@@ -38,8 +38,8 @@ You can also get virus analysis from our official CDN [fosshub.com](https://www.
 
 ## KiTTY source code
 * The KiTTY source code is available from
-    * our main subversion repository ```svn checkout http://svn.9bis.com/sandbox/kitty/trunk/```
     * Github.com ```git clone https://github.com/cyd01/KiTTY.git ```
 * or using your browser 
-    * [http://svn.9bis.com/websvn](http://svn.9bis.com/websvn "KiTTY at our svn")
     * [https://github.com/cyd01/KiTTY](https://github.com/cyd01/KiTTY "KiTTY at Github")
+
+> *SVN repository is not available anymore*

kitty.c

@@ -15,7 +15,8 @@
 #include "putty.h"
 #include "terminal.h"
 //#include "ldisc.h"
-#include "win_res.h"
+//#include "win_res.h"
+#include "putty-rc.h"
 
 // Include specifiques Windows (windows.h doit imperativement etre declare en premier)
 #include <windows.h>