diff --git a/0.70_My_PuTTY/windows/MAKEFILE.MINGW b/0.70_My_PuTTY/windows/MAKEFILE.MINGW index 7300aa3..f69d390 100644 --- a/0.70_My_PuTTY/windows/MAKEFILE.MINGW +++ b/0.70_My_PuTTY/windows/MAKEFILE.MINGW @@ -110,6 +110,22 @@ UPX = upx # You may also need to tell windres where to find include files: # RCINC = --include-dir c:\cygwin\include\ +CFLAGS = -Wall -O2 -D_WINDOWS -DWIN32S_COMPAT -D_NO_OLDNAMES -I.././ \ + -I../charset/ -I../windows/ -I../unix/ +LDFLAGS = -s + +RCFLAGS = $(RCINC) --define WIN32=1 --define _WIN32=1 --define WINVER=0x0400 \ + -I.././ -I../charset/ -I../windows/ -I../unix/ -I../macosx/ \ + -I ../../ -DPERSOPORT -D$(FDJFLAG) + +# XXX GNU-ism, but it's probably all right for a Cygwin/MinGW Makefile. +RCFLAGS += $(patsubst -D%,--define %,$(VER)) +# _WIN32_IE is required to expose identifiers that only make sense on +# systems with IE5+ installed, such as some arguments to SHGetFolderPath(). +# WINVER etc perform a similar function for FlashWindowEx(). +CFLAGS += -D_WIN32_IE=0x0500 +CFLAGS += -DWINVER=0x0501 -D_WIN32_WINDOWS=0x0410 -D_WIN32_WINNT=0x0501 + # -DPERSOPORT -DCYGTERMPORT -DIMAGEPORT -DRECONNECTPORT -DHYPERLINKPORT -DZMODEMPORT -DSTARTBUTTON -DLAUNCHERPORT -DSAVEDUMPPORT -DKEYMAPPINGPORT -DWINCRYPTPORT -DTUTTYPORT -DPORTKNOCKINGPORT -DPUTTYXPORT -DWTSPORT -DPRINTCLIPPORT -DRUTTYPORT -DADBPORT \ # Anciens flags: @@ -122,10 +138,8 @@ FDJFLAG = FDJ1 # Ajouter -g -ggdb a CFLAGS pour avoir plus de debug !!! # Ajouter -DNO_PASSWORD \ pour compiler une version sans possibilité de sauvegarder le mot de passe - -CFLAGS = -Wall -O2 -D_WINDOWS -DWIN32S_COMPAT -D$(FDJFLAG) \ - -DAUTO_WINSOCK \ - -DUSE_CAPI -DCOVERITY \ +CFLAGS += -DAUTO_WINSOCK -DUSE_CAPI -DCOVERITY -DNO_MULTIMON -DNO_HTMLHELP +CFLAGS += -Wall -O2 -D_WINDOWS -DWIN32S_COMPAT -D$(FDJFLAG) \ -DPERSOPORT \ -DCYGTERMPORT \ -DIMAGEPORT \ @@ -145,7 +159,7 @@ CFLAGS = -Wall -O2 -D_WINDOWS -DWIN32S_COMPAT -D$(FDJFLAG) \ -DRUTTYPORT \ -DDISABLEALTGRPORT \ -DADBPORT \ - -D_NO_OLDNAMES -DNO_MULTIMON -DNO_HTMLHELP -I.././ -I../../ \ + -I.././ -I../../ \ -I../charset/ -I../windows/ -I../unix/ -I../mac/ \ -I../macosx \ -I../../base64 -I../../bcrypt -I../../md5 -I../../regex -I../../url -I../../wincrypt -I../../rutty @@ -155,19 +169,7 @@ CFLAGS_PLINK = -Wall -O2 -D_WINDOWS -DWIN32S_COMPAT \ -I../charset -I../windows -I../unix -I../mac -I.\ -I../macosx \ -I../../base64 -I../../bcrypt -I../../md5 -I../../regex -I../../url -LDFLAGS = -s -static-libgcc -RCFLAGS = $(RCINC) --define WIN32=1 --define _WIN32=1 --define WINVER=0x0400 \ - -I.././ -I../charset/ -I../windows/ -I../unix/ -I../macosx/ \ - -I ../../ -DPERSOPORT -D$(FDJFLAG) - -# XXX GNU-ism, but it's probably all right for a Cygwin/MinGW Makefile. -RCFLAGS += $(patsubst -D%,--define %,$(VER)) -# _WIN32_IE is required to expose identifiers that only make sense on -# systems with IE5+ installed, such as some arguments to SHGetFolderPath(). -# WINVER etc perform a similar function for FlashWindowEx(). -CFLAGS += -D_WIN32_IE=0x0500 -CFLAGS += -DWINVER=0x0501 -D_WIN32_WINDOWS=0x0410 -D_WIN32_WINNT=0x0501 .SUFFIXES: @@ -417,6 +419,13 @@ testbn.exe: conf.o misc.o sshbn.o testbn.o tree234.o version.o winmisc.o -lcomdlg32 -lgdi32 -limm32 -lole32 -lshell32 -luser32 \ -lwinmm -lwinspool +agentf.o: ../agentf.c ../putty.h ../ssh.h ../pageant.h ../sshchan.h \ + ../defs.h ../puttyps.h ../network.h ../misc.h ../marshal.h \ + ../sshsignals.h ../puttymem.h ../tree234.h ../sshttymodes.h \ + ../windows/winstuff.h ../unix/unix.h ../windows/winhelp.h \ + ../charset/charset.h + $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../agentf.c + aqsync.o: ../aqsync.c ../putty.h ../puttyps.h ../network.h ../misc.h \ ../windows/winstuff.h ../unix/unix.h ../puttymem.h \ ../tree234.h ../windows/winhelp.h ../charset/charset.h diff --git a/0.70_My_PuTTY/windows/version.txt b/0.70_My_PuTTY/windows/version.txt index a78961e..95b71d2 100644 --- a/0.70_My_PuTTY/windows/version.txt +++ b/0.70_My_PuTTY/windows/version.txt @@ -1 +1 @@ -0.70.0.7 \ No newline at end of file +0.70.0.8 \ No newline at end of file diff --git a/0.70_My_PuTTY/windows/version_minor.txt b/0.70_My_PuTTY/windows/version_minor.txt index 7f8f011..45a4fb7 100644 --- a/0.70_My_PuTTY/windows/version_minor.txt +++ b/0.70_My_PuTTY/windows/version_minor.txt @@ -1 +1 @@ -7 +8 diff --git a/0.70_My_PuTTY/windows/window.c b/0.70_My_PuTTY/windows/window.c index 1b358e9..b0b799f 100644 --- a/0.70_My_PuTTY/windows/window.c +++ b/0.70_My_PuTTY/windows/window.c @@ -1519,7 +1519,8 @@ TrayIcone.hWnd = hwnd ; else AppendMenu(m, MF_ENABLED, IDM_VISIBLE, "Always visi&ble"); AppendMenu(m, MF_ENABLED, IDM_PROTECT, "Prote&ct"); - if( !GetWinrolFlag() ) AppendMenu(m, MF_ENABLED, IDM_WINROL, "Roll-u&p"); +//char b[256];sprintf(b,"%d",GetWinrolFlag());MessageBox(NULL,b,"info",MB_OK); + if( GetWinrolFlag() ) AppendMenu(m, MF_ENABLED, IDM_WINROL, "Roll-u&p"); AppendMenu(m, MF_ENABLED, IDM_SCRIPTFILE, "Send scr&ipt file" ) ; if( PSCPPath!=NULL ) AppendMenu(m, MF_ENABLED, IDM_PSCP, "Send wit&h pscp"); else AppendMenu(m, MF_DISABLED|MF_GRAYED, IDM_PSCP, "Send wit&h pscp"); diff --git a/cygterm/cygterm.c b/cygterm/cygterm.c index a02869d..8f960c0 100644 --- a/cygterm/cygterm.c +++ b/cygterm/cygterm.c @@ -326,7 +326,7 @@ cygterm_size(void *handle, int width, int height) Local local = handle; cygterm_debug("top"); cygterm_debug("size=%d,%d (last=%d,%d)", - width, height, local->cfg.width, local->cfg.height); + width, height, conf_get_int(local->conf,CONF_width), conf_get_int(local->conf,CONF_height)); conf_set_int(local->conf,CONF_width,width); conf_set_int(local->conf,CONF_height,height); if (local->s) { diff --git a/kitty.c b/kitty.c index 40a7ea5..eef927f 100644 --- a/kitty.c +++ b/kitty.c @@ -288,7 +288,7 @@ static int TitleBarFlag = 1 ; int GetTitleBarFlag(void) { return TitleBarFlag ; } void SetTitleBarFlag( const int flag ) { TitleBarFlag = flag ; } -// Hauteur de la fenetre pour la fonction winrol +// Hauteur de la fenetre pour la fonction WinHeight static int WinHeight = -1 ; int GetWinHeight(void) { return WinHeight ; } void SetWinHeight( const int num ) { WinHeight = num ; } @@ -1402,7 +1402,7 @@ void CreateDefaultIniFile( void ) { writeINI( KittyIniFile, INIT_SECTION, "#internaldelay", "10" ) ; writeINI( KittyIniFile, INIT_SECTION, "#readonly", "no" ) ; writeINI( KittyIniFile, INIT_SECTION, "slidedelay", "0" ) ; - writeINI( KittyIniFile, INIT_SECTION, "winrol", "yes" ) ; + writeINI( KittyIniFile, INIT_SECTION, "winroll", "yes" ) ; writeINI( KittyIniFile, INIT_SECTION, "wintitle", "yes" ) ; #ifdef ZMODEMPORT writeINI( KittyIniFile, INIT_SECTION, "zmodem", "yes" ) ; @@ -2722,7 +2722,7 @@ void SaveWindowCoord( Conf * conf ) { } } -// Gestion de la fonction winrol +// Gestion de la fonction winroll void ManageWinrol( HWND hwnd, int resize_action ) { RECT rcClient ; int mode = -1 ; @@ -3761,7 +3761,7 @@ int InternalCommand( HWND hwnd, char * st ) { #ifdef LAUNCHERPORT else if( !strcmp( st, "/initlauncher" ) ) { InitLauncherRegistry() ; return 1 ; } #endif - else if( !strcmp( st, "/winrol" ) ) { WinrolFlag = abs(WinrolFlag-1) ; return 1 ; } + else if( !strcmp( st, "/winroll" ) ) { WinrolFlag = abs(WinrolFlag-1) ; return 1 ; } else if( !strcmp( st, "/wintitle" ) ) { TitleBarFlag = abs(TitleBarFlag-1) ; return 1 ; } else if( strstr( st, "/command " ) == st ) { SendCommandAllWindows( hwnd, st+9 ) ; return 1 ; } else if( !strcmp( st, "/sizeall" ) ) { ResizeWinList( hwnd, conf_get_int(conf,CONF_width)/*cfg.width*/, conf_get_int(conf,CONF_height)/*cfg.height*/ ) ; return 1 ; } @@ -4884,7 +4884,7 @@ int ManageShortcuts( HWND hwnd, int key_num, int shift_flag, int control_flag, i if( key == shortcuts_tab.protect ) // Protection { SendMessage( hwnd, WM_COMMAND, IDM_PROTECT, 0 ) ; InvalidateRect( hwnd, NULL, TRUE ) ; return 1 ; } - if( key == shortcuts_tab.rollup ) // Fonction winrol + if( key == shortcuts_tab.rollup ) // Fonction winroll { SendMessage( hwnd, WM_COMMAND, IDM_WINROL, 0 ) ; return 1 ; } if( key == shortcuts_tab.showportforward ) // Fonction show port forward { SendMessage( hwnd, WM_COMMAND, IDM_SHOWPORTFWD, 0 ) ; return 1 ; } @@ -5135,7 +5135,7 @@ void LoadParameters( void ) { PSCPOptions[1023] = '\0' ; } } - if( ReadParameter( INIT_SECTION, "winrol", buffer ) ) { + if( ReadParameter( INIT_SECTION, "winroll", buffer ) ) { if( !stricmp( buffer, "no" ) ) WinrolFlag = 0 ; if( !stricmp( buffer, "yes" ) ) WinrolFlag = 1 ; }