haeaeae/KiTTY
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Typo

Browse Source
This commit is contained in:
cyd01
2019-05-12 23:20:07 +02:00
parent 890b03c706
commit 689331a4ca
6 changed files with 84 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
0.71_My_PuTTY/windows/MAKEFILE.MINGW
+8 -6
View File
@@ -105,8 +105,10 @@ RC = $(TOOLPATH)windres
# You may also need to tell windres where to find include files:
# RCINC = --include-dir c:\cygwin\include\
CFLAGS = -Wall -O2 -std=gnu99 -Wvla -D_WINDOWS -DWIN32S_COMPAT \
-D_NO_OLDNAMES -D__USE_MINGW_ANSI_STDIO=1 -I.././ \
# CFLAGS = -Wall -O2 -std=gnu99 -Wvla -D_WINDOWS -DWIN32S_COMPAT \
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 \
@@ -120,7 +122,7 @@ CFLAGS += -D_WIN32_IE=0x0500
################################################################################
# BEGIN PERSOPORT
# Ne pas oublier de commenter CFLAGS juste au-dessus (remplacé par en-dessous)
# Ne pas oublier de commenter 2 lignes CFLAGS au-dessus (remplacé par en-dessous)
################################################################################
CFLAGS += -DWINVER=0x0501 -D_WIN32_WINDOWS=0x0410 -D_WIN32_WINNT=0x0501
@@ -137,8 +139,8 @@ FDJFLAG = FDJ1
RCFLAGS += -I ../../ -DPERSOPORT -D$(FDJFLAG)
CFLAGS += -DAUTO_WINSOCK -DUSE_CAPI -DCOVERITY -D_NO_OLDNAMES -DNO_MULTIMON -DNO_HTMLHELP -DNO_SECUREZEROMEMORY
CFLAGS += -Wall -O2 -D_WINDOWS -DWIN32S_COMPAT -D$(FDJFLAG)
CFLAGS += -DAUTO_WINSOCK -DUSE_CAPI -DCOVERITY -DNO_MULTIMON -DNO_HTMLHELP -DNO_SECUREZEROMEMORY
CFLAGS += -D$(FDJFLAG)
CFLAGS += -DPERSOPORT \
-DSTARTBUTTON \
-DSAVEDUMPPORT \
@@ -160,9 +162,9 @@ CFLAGS += -DPERSOPORT \
-I../macosx \
-I../../base64 -I../../bcrypt -I../../md5 -I../../regex -I../../url -I../../wincrypt -I../../rutty
# -DWINCRYPTPORT \
# -DCYGTERMPORT \
# -DIMAGEPORT \
# -DWINCRYPTPORT \
# Autre flag a gérer
0.71_My_PuTTY/windows/putty.mft
+31 -31
View File
@@ -1,31 +1,31 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!-- Do not attempt to do anything clever with this file, as some versions of
Windows are very sensitive to the exact format.
Hence, some facts below are fibs. -->
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
<assemblyIdentity
version="0.0.0.0"
processorArchitecture="*"
name="PuTTY"
type="win32" />
<description>A network client and terminal emulator</description>
<dependency>
<dependentAssembly>
<!-- Load Common Controls 6 instead of 5 to get WinXP native-
looking controls in the client area. -->
<assemblyIdentity type="win32"
name="Microsoft.Windows.Common-Controls"
version="6.0.0.0"
publicKeyToken="6595b64144ccf1df"
language="*"
processorArchitecture="*"/>
</dependentAssembly>
</dependency>
<!-- Declare us to be "DPI-aware". -->
<asmv3:application xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
<asmv3:windowsSettings
xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">
<dpiAware>true</dpiAware>
</asmv3:windowsSettings>
</asmv3:application>
</assembly>
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!-- Do not attempt to do anything clever with this file, as some versions of
Windows are very sensitive to the exact format.
Hence, some facts below are fibs. -->
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
<assemblyIdentity
version="0.0.0.0"
processorArchitecture="*"
name="PuTTY"
type="win32" />
<description>A network client and terminal emulator</description>
<dependency>
<dependentAssembly>
<!-- Load Common Controls 6 instead of 5 to get WinXP native-
looking controls in the client area. -->
<assemblyIdentity type="win32"
name="Microsoft.Windows.Common-Controls"
version="6.0.0.0"
publicKeyToken="6595b64144ccf1df"
language="*"
processorArchitecture="*"/>
</dependentAssembly>
</dependency>
<!-- Declare us to be "DPI-aware". -->
<asmv3:application xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
<asmv3:windowsSettings
xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">
<dpiAware>true</dpiAware>
</asmv3:windowsSettings>
</asmv3:application>
</assembly>
0.71_My_PuTTY/windows/window.c
+1 -1
View File
@@ -1511,7 +1511,7 @@ TrayIcone.hWnd = hwnd ;
#ifdef ZMODEMPORT
if( (!GetPuttyFlag()) && GetZModemFlag() ) {
AppendMenu(m, MF_SEPARATOR, 0, 0);
//AppendMenu(m, term->xyz_transfering?MF_GRAYED:MF_ENABLED, IDM_XYZSTART, "&Zmodem Receive");
// AppendMenu(m, term->xyz_transfering?MF_GRAYED:MF_ENABLED, IDM_XYZSTART, "&Zmodem Receive");
AppendMenu(m, term->xyz_transfering?MF_GRAYED:MF_DISABLED, IDM_XYZSTART, "&Zmodem Receive (broken)");
AppendMenu(m, term->xyz_transfering?MF_GRAYED:MF_ENABLED, IDM_XYZUPLOAD, "Zmodem &Upload");
AppendMenu(m, !term->xyz_transfering?MF_GRAYED:MF_ENABLED, IDM_XYZABORT, "Zmodem &Abort");
kitty.c
+12 -10
View File
@@ -761,11 +761,11 @@ void unmungestr( const char *in, char *out, int outlen ) {
}
#ifdef ZMODEMPORT
void xyz_updateMenuItems(Terminal *term)
{
void xyz_updateMenuItems(Terminal *term) {
if( !ZModemFlag ) return ;
HMENU m = GetSystemMenu(hwnd, FALSE);
EnableMenuItem(m, IDM_XYZSTART, term->xyz_transfering?MF_GRAYED:MF_ENABLED);
// EnableMenuItem(m, IDM_XYZSTART, term->xyz_transfering?MF_GRAYED:MF_ENABLED);
EnableMenuItem(m, IDM_XYZSTART, term->xyz_transfering?MF_GRAYED:MF_DISABLED);
EnableMenuItem(m, IDM_XYZUPLOAD, term->xyz_transfering?MF_GRAYED:MF_ENABLED);
EnableMenuItem(m, IDM_XYZABORT, !term->xyz_transfering?MF_GRAYED:MF_ENABLED);
@@ -1841,7 +1841,7 @@ void SendAutoCommand( HWND hwnd, const char * cmd ) {
buf=(char*)malloc( strlen(cmd)+30 ) ;
strcpy( buf, "Send automatic command" ) ;
if( debug_flag ) { strcat( buf, ": ") ; strcat( buf, cmd ) ; }
if( conf_get_int(conf,CONF_protocol) != PROT_TELNET) logevent(NULL, buf ) ; // On logue que si on est pas en telnet (à cause du password envoyé en clair)
if( conf_get_int(conf,CONF_protocol) != PROT_TELNET ) logevent(NULL, 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])=='\\') ) {
@@ -4935,9 +4935,11 @@ int ManageShortcuts( HWND hwnd, const int* clips_system, int key_num, int shift_
if( NbShortCuts ) {
for( i=0 ; i<NbShortCuts ; i++ )
if( shortcuts_tab2[i].num == key )
{ SendKeyboardPlus( hwnd, shortcuts_tab2[i].st ) ; return 1 ; }
if( shortcuts_tab2[i].num == key ) {
SendKeyboardPlus( hwnd, shortcuts_tab2[i].st ) ;
return 1 ;
}
}
#if (defined IMAGEPORT) && (!defined FDJ)
if( BackgroundImageFlag && ImageViewerFlag ) { // Gestion du mode image
@@ -4946,18 +4948,18 @@ int ManageShortcuts( HWND hwnd, const int* clips_system, int key_num, int shift_
#endif
if( control_flag && shift_flag && (key_num==VK_F12) ) {
ResizeWinList( hwnd, conf_get_int(conf,CONF_width), conf_get_int(conf,CONF_height) ) ; return 1 ;
} // Retaille toutes les autres fenetres a la dimension de celle-ci
} // Retaille toutes les autres fenetres a la dimension de celle-ci
if( key == shortcuts_tab.printall ) {
SendMessage( hwnd, WM_COMMAND, IDM_COPYALL, 0 ) ;
SendMessage( hwnd, WM_COMMAND, IDM_PRINT, 0 ) ;
return 1 ;
}
}
if( ( IniFileFlag != SAVEMODE_DIR ) && shift_flag && control_flag ) {
if( ( key_num >= 'A' ) && ( key_num <= 'Z' ) ) // Raccourci commandes speciales (SpecialMenu) CTRL+SHIFT+'A' ... CTRL+SHIFT+'Z'
{ SendMessage( hwnd, WM_COMMAND, IDM_USERCMD+key_num-'A', 0 ) ; return 1 ; }
}
}
if( key == shortcuts_tab.editor ) { // Lancement d'un putty-ed
if( debug_flag ) { debug_logevent( "Start empty internal editor" ) ; }
@@ -4979,7 +4981,7 @@ int ManageShortcuts( HWND hwnd, const int* clips_system, int key_num, int shift_
if( key == shortcuts_tab.print ) { // Impression presse papier
SendMessage( hwnd, WM_COMMAND, IDM_PRINT, 0 ) ;
return 1 ;
}
}
#ifndef FDJ
if( key == shortcuts_tab.inputm ) // Fenetre de controle
{
wincrypt/wincrypto.c
+7 -1
View File
@@ -8,6 +8,12 @@
#include <wincrypt.h>
#include "ssh.h"
#include "mpint.h"
#include "mpint_i.h"
typedef BignumInt Bignum ;
void SHA_Simple(unsigned char *, int, BYTE* );
/*
* Defines and declarations due to missing declarations in mingw32 and BCC55 headers.
*/
@@ -127,7 +133,7 @@ void capi_select_cert_2(PBYTE pbSHA1, LPWSTR wszCN, PCCERT_CONTEXT *ppCertCtx, H
HCRYPTPROV_OR_NCRYPT_KEY_HANDLE hCryptProvOrNCryptKey;
DWORD dwCertCount = 0, dwKeySpec;
BOOL fCallerFreeProvAlwaysFalse;
if (!(hStoreMY = CertOpenStore(CERT_STORE_PROV_SYSTEM, 0, 0, CERT_SYSTEM_STORE_CURRENT_USER, L"MY"))) {
if (!(hStoreMY = CertOpenStore((LPCSTR)CERT_STORE_PROV_SYSTEM, 0, 0, CERT_SYSTEM_STORE_CURRENT_USER, L"MY"))) {
goto error;
}
if (pbSHA1) {
zmodem/winpzmodem.c
+25 -13
View File
@@ -12,6 +12,9 @@ void xyz_updateMenuItems(Terminal *term);
void xyz_ReceiveInit(Terminal *term);
int xyz_ReceiveData(Terminal *term, const u_char *buffer, int len);
static int xyz_SpawnProcess(Terminal *term, const char *incommand, const char *inparams);
void xyz_Cancel(Terminal *term) ;
int existfile( const char * filename ) ;
#define MAX_UPLOAD_FILES 512
@@ -54,15 +57,13 @@ void xyz_Done(Terminal *term)
}
}
static int xyz_Check(Backend *back, void *backhandle, Terminal *term, int outerr);
static int xyz_Check(Backend *back, void *backhandle, Terminal *term, int outerr) ;
int xyz_Process(Backend *back, void *backhandle, Terminal *term)
{
int xyz_Process(Backend *back, void *backhandle, Terminal *term) {
return xyz_Check(back, backhandle, term, 0) + xyz_Check(back, backhandle, term, 1);
}
static int xyz_Check(Backend *back, void *backhandle, Terminal *term, int outerr)
{
static int xyz_Check(Backend *back, void *backhandle, Terminal *term, int outerr) {
DWORD exitcode = 0;
DWORD bread, avail;
char buf[1024];
@@ -155,8 +156,14 @@ static int xyz_Check(Backend *back, void *backhandle, Terminal *term, int outerr
return 0;
}
void xyz_ReceiveInit(Terminal *term)
{
void xyz_ReceiveInit(Terminal *term) {
if( !existfile( conf_get_filename(term->conf,CONF_rzcommand)->path ) ) {
char b[512] ;
sprintf( b, "Unable to find Zmodem receive program: \n%s", conf_get_filename(term->conf,CONF_rzcommand)->path ) ;
xyz_Cancel( term ) ;
MessageBox( NULL, b, "Error", MB_OK|MB_ICONERROR ) ;
return ;
}
if (xyz_SpawnProcess(term, conf_get_filename(term->conf,CONF_rzcommand)->path, conf_get_str(term->conf,CONF_rzoptions)) == 0) {
term->xyz_transfering = 1;
} else {
@@ -164,8 +171,7 @@ void xyz_ReceiveInit(Terminal *term)
}
}
void xyz_StartSending(Terminal *term)
{
void xyz_StartSending(Terminal *term) {
OPENFILENAME fn;
char filenames[32000];
BOOL res;
@@ -202,6 +208,14 @@ void xyz_StartSending(Terminal *term)
}
}
if( !existfile( conf_get_filename(term->conf,CONF_szcommand)->path ) ) {
char b[512] ;
sprintf( b, "Unable to find Zmodem send program: \n%s", conf_get_filename(term->conf,CONF_szcommand)->path ) ;
xyz_Cancel( term ) ;
MessageBox( NULL, b, "Error", MB_OK|MB_ICONERROR ) ;
return ;
}
if (xyz_SpawnProcess(term, conf_get_filename(term->conf,CONF_szcommand)->path, sz_full_params) == 0) {
term->xyz_transfering = 1;
@@ -335,11 +349,9 @@ static int xyz_SpawnProcess(Terminal *term, const char *incommand, const char *i
}
p--;
}
debug_log("%s %s\n",incommand,inparams);
sprintf(params, "%s %s", p, inparams);
debug_log("%s %s\n",incommand,params);
if (!CreateProcess(incommand,params,NULL, NULL,TRUE,CREATE_NEW_CONSOLE, NULL,conf_get_str(term->conf,CONF_zdownloaddir),&si,&term->xyz_Internals->pi))
{
if (!CreateProcess(incommand,params,NULL, NULL,TRUE,CREATE_NEW_CONSOLE, NULL,conf_get_str(term->conf,CONF_zdownloaddir),&si,&term->xyz_Internals->pi)) {
//DWORD err = GetLastError();
//ErrorMessage("CreateProcess");
CloseHandle(newstdin);