From 8acae386c95faec9eb08ae544017310b5cc2b0da Mon Sep 17 00:00:00 2001
From: cyd01 <cyrildupont71@gmail.com>
Date: Sat, 1 Feb 2020 23:27:00 +0100
Subject: [PATCH] bugfix: issue with the new term_keyinputw funtion usage.
 Replaced by term_keyinput for one-character sending

---
 0.73_My_PuTTY/version.h              |   2 +-
 0.73_My_PuTTY/windows/MAKEFILE.MINGW |   2 +-
 0.73_My_PuTTY/windows/window.c       |   7 +++----
 bcrypt/bcrypt.a                      | Bin 25408 -> 22110 bytes
 bcrypt/license.c                     |   4 ++--
 kitty.c                              |  15 +++++++++------
 6 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/0.73_My_PuTTY/version.h b/0.73_My_PuTTY/version.h
index ba5c06a..7f031ab 100644
--- a/0.73_My_PuTTY/version.h
+++ b/0.73_My_PuTTY/version.h
@@ -1,5 +1,5 @@
 #define RELEASE 0.73
 #define TEXTVER "Release 0.73"
 #define SSHVER "-Release-0.73"
-#define BINARY_VERSION 0,73,2,3
+#define BINARY_VERSION 0,73,2,2
 #define SOURCE_COMMIT "unavailable"
diff --git a/0.73_My_PuTTY/windows/MAKEFILE.MINGW b/0.73_My_PuTTY/windows/MAKEFILE.MINGW
index a0a40c3..1e53992 100644
--- a/0.73_My_PuTTY/windows/MAKEFILE.MINGW
+++ b/0.73_My_PuTTY/windows/MAKEFILE.MINGW
@@ -142,7 +142,7 @@ RCFLAGS += -I ../../ -DMOD_PERSO -D$(FDJFLAG)
 
 CFLAGS += -DNO_SECUREZEROMEMORY -DCOVERITY -DNO_HTMLHELP
 CFLAGS += -D$(FDJFLAG)
-CFLAGS += 	-D__WINE__ \
+CFLAGS += 	 \
 		-DMOD_PERSO \
 		-DMOD_STARTBUTTON \
 		-DMOD_SAVEDUMP \
diff --git a/0.73_My_PuTTY/windows/window.c b/0.73_My_PuTTY/windows/window.c
index 1fb45e4..84debf2 100644
--- a/0.73_My_PuTTY/windows/window.c
+++ b/0.73_My_PuTTY/windows/window.c
@@ -11,10 +11,8 @@
 #include <assert.h>
 
 #ifdef __WINE__
-#ifndef NO_MULTIMON
 #define NO_MULTIMON                    /* winelib doesn't have this */
 #endif
-#endif
 
 #ifndef NO_MULTIMON
 #define COMPILE_MULTIMON_STUBS
@@ -263,9 +261,10 @@ void SendStrToTerminal( const char * str, const int len ) {
 	if( len <= 0 ) return ;
 //	if( term!=NULL ) term_seen_key_event(term) ;
 	for( i=0 ; i<len ; i++ ) {
-		c=(unsigned char)str[i] ;
+		c = (unsigned char)str[i] ;
 		if (ldisc)
-			term_keyinputw(term, (const wchar_t *) &c, 1); //lpage_send(ldisc, CP_ACP, &c, 1, 1);
+			//term_keyinputw(term, (const wchar_t *) &c, 1); //lpage_send(ldisc, CP_ACP, &c, 1, 1);
+			term_keyinput(term, -1, &c, 1) ;
 		}
 	}
 // resize en convertissant en nombre de lignes et colonnes
diff --git a/bcrypt/bcrypt.a b/bcrypt/bcrypt.a
index 02a3c155963e4d1fc47c9b98bbd5e2fc1860acdd..422be24bfa98f82bf616fac3056f4f71a176e4f4 100644
GIT binary patch
delta 1043
zcmX?bjPc$Y#tBmO76zu4rp6Wq3JL}aAb?CND3}{rfCLp36cV@?7#QRk7?@?KinTEe
zbaP{1z>YVb31^aKNJ=iMEGW^-*M~aH&=leYbA!!M%u3GjP@WO0hYSr2%*@Ob6if_E
zEg>2cxO^Dd7(n0}4+DcDh{3?Zs8^C&Q37T|hz0Bn3@nTc3=G^5zWU^i%=VLg^@S(v
zx{HcSFfcGI;eg1%NCyUk$@(m!OnW#c7q}}4DljoHJm6qpXybt>;Mly_eLV|5h_{6&
zt<yzC<_50-!{kJtkC<Y<6H&!P7$!6NMao*csCbkWcDtx}v>vF-Y^Y~s=*?#=N!SN+
z=I+Vme#a;83l-bk5gx=;FV4Wg0Ky^+$_xw)Am@rOn8I0}a8^761A`y~0|OgFHUk5L
zBm)D32*Vq=-UW;d3{qgR(~JxZ(qPsNMwpHlj4&Nv85tO4z_N@?U{*bY2m>b*Op63W
zkU@kY5zfkkv#v5RFvx;6-(`Xs{gMf0bR#p&lul*_205_0UCc1geS))iSiq^2L4={1
zg@FO=e-Va>EDQ_^U@a?HU`B6+vl>}p#!O^|t7C<$gR>0TV6q-;FxgNzYYiLBlm~DY
zX9zpYH6ZIjNl1ht0h*XZ7&_prBXE`gBP6MbFr>g)JK(G@AlBsnai=GTISR2(VP{}a
zpPcLHJlP{bg;8SiL1s~=c?^@^I4a4ngd{cwPy%OW1f@ZgR66;0!d9lu43i%?OH9s5
MYMK1VS(K3r0G|qoegFUf

delta 4011
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
Zoh<04#h;s*mtG#9lvtdamzbN%006I5dVv4{

diff --git a/bcrypt/license.c b/bcrypt/license.c
index 79e0bee..1913de9 100644
--- a/bcrypt/license.c
+++ b/bcrypt/license.c
@@ -119,8 +119,9 @@ void license_form( char * license, char sep, int size ) {
 int license_test( char * license, char sep, int modulo, int result ) {
 	if( (int)(license_modulo( license, modulo, sep )) == result ) return 1 ;
 	return 0 ;
-	}
+}
 
+#ifdef MAIN
 void license_usage( char * progname ) {
 	fprintf( stderr, "%s - License generator\n", basename(progname) ) ;
 	fprintf( stderr, "Usage: %s [-b begining] [-g groupsize] [-l] [-m modulo] [-s size] [-t]\n", basename(progname) ) ;
@@ -194,7 +195,6 @@ int license_main( int argc, char *argv[], char *arge[] ){
 	return return_code ;
 	}
 
-#ifdef MAIN
 int main( int argc, char *argv[], char *arge[] ) {
 	return license_main( argc, argv, arge ) ;
 	}
diff --git a/kitty.c b/kitty.c
index fa6a074..3248a54 100644
--- a/kitty.c
+++ b/kitty.c
@@ -1701,16 +1701,19 @@ void SendAutoCommand( HWND hwnd, const char * cmd ) {
 		if( debug_flag ) { strcat( buf, ": ") ; strcat( buf, cmd ) ; }
 		if( conf_get_int(conf,CONF_protocol) != PROT_TELNET ) debug_logevent( buf ) ; // On logue que si on est pas en telnet (à cause du password envoyé en clair)
 		free(buf);
-		if( existfile( cmd ) ) RunScriptFile( hwnd, cmd ) ;
-		else if( (toupper(cmd[0])=='C')&&(toupper(cmd[1])==':')&&(toupper(cmd[2])=='\\') ) {
+		if( existfile( cmd ) ) { 
+			RunScriptFile( hwnd, cmd ) ; 
+		} else if( (toupper(cmd[0])=='C')&&(toupper(cmd[1])==':')&&(toupper(cmd[2])=='\\') ) { 
 			//MessageBox( NULL, cmd,"Info", MB_OK );
 			return ;
-			}
-		else { SendKeyboardPlus( hwnd, cmd ) ; }
+		} else { 
+			SendKeyboardPlus( hwnd, cmd ) ; 
 		}
-	else { if( debug_flag ) debug_logevent( "No automatic command !" ) ; }
+	} else { 
+		if( debug_flag ) debug_logevent( "No automatic command !" ) ; 
 	}
-	
+}
+
 // Command sender (envoi d'une meme commande a toutes les fenetres)
 BOOL CALLBACK SendCommandProc( HWND hwnd, LPARAM lParam ) {
 	char buffer[256] ;