Commit: ce160b071c64da5e7f06b52d4f7b6a942052f57e - ffftp (git)

FFFTPのソースコードです。

Commit MetaInfo

• Revision: ce160b071c64da5e7f06b52d4f7b6a942052f57e (tree)
• Zeit: 2011-11-04 21:48:33
• Autor: s_kawamoto <s_kawamoto@user...>
• Commiter: s_kawamoto

Log Message

Modify features and documents for 1.98c.

Ändern Zusammenfassung

• modified: FFFTP_Eng_Release/FFFTP.exe
• modified: Release/FFFTP.exe
• modified: Resource/FFFTP.rc
• modified: Resource_eng/FFFTP-eng.rc
• modified: common.h
• modified: connect.c
• modified: doc/eng/FFFTP.txt
• modified: doc/eng/history.txt
• modified: doc/jpn/FFFTP.txt
• modified: doc/jpn/history.txt
• modified: hostman.c
• modified: htmlhelp/FFFTP.CHM
• modified: htmlhelp/HTML/H0000001.HTM

Diff

Binary files a/FFFTP_Eng_Release/FFFTP.exe and b/FFFTP_Eng_Release/FFFTP.exe differ

Binary files a/Release/FFFTP.exe and b/Release/FFFTP.exe differ

--- a/Resource/FFFTP.rc
+++ b/Resource/FFFTP.rc
@@ -235,7 +235,7 @@ FONT 9, "
 BEGIN
     DEFPUSHBUTTON   "OK",IDOK,133,294,50,14
     ICON            ffftp,-1,7,4,20,20
-    CTEXT           "FFFTP  Ver 1.99",-1,113,11,90,8
+    CTEXT           "FFFTP  Ver 1.98c",-1,113,11,90,8
     CTEXT           "FFFTP‚Ífreeware‚Å‚·",-1,7,279,305,8
     CTEXT           "Copyright(C) 1997-2010 Sota & ‚²‹¦—Í‚¢‚½‚¾‚¢‚½•ûX\nCopyright (C) 2011 FFFTP Project (Hiromichi Matsushima, Suguru Kawamoto, IWAMOTO Kouichi, vitamin0x, ‚¤‚ȁ[, Asami, fortran90, tomo1192)",-1,7,25,305,44,SS_NOPREFIX
     CTEXT           "",ABOUT_JRE,7,96,305,8
@@ -2016,8 +2016,8 @@ nodrop_csr              CURSOR                  "nodrop_c.cur"
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,99,0,0
- PRODUCTVERSION 1,99,0,0
+ FILEVERSION 1,98,3,0
+ PRODUCTVERSION 1,98,3,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -2035,12 +2035,12 @@ BEGIN
             VALUE "Comments", "‚±‚ê‚̓tƒŠ[ƒ\ƒtƒgƒEƒGƒA‚Å‚·B"
             VALUE "CompanyName", " "
             VALUE "FileDescription", "FFFTP"
-            VALUE "FileVersion", "1, 99, 0, 0"
+            VALUE "FileVersion", "1, 98, 3, 0"
             VALUE "InternalName", "FFFTP"
             VALUE "LegalCopyright", "Copyright (C) 1997-2010 Sota & ‚²‹¦—Í‚¢‚½‚¾‚¢‚½•ûX\nCopyright (C) 2011 FFFTP Project (Hiromichi Matsushima, Suguru Kawamoto, IWAMOTO Kouichi, vitamin0x, ‚¤‚ȁ[, Asami, fortran90, tomo1192)."
             VALUE "OriginalFilename", "FFFTP.exe"
             VALUE "ProductName", "FFFTP"
-            VALUE "ProductVersion", "1, 99, 0, 0"
+            VALUE "ProductVersion", "1, 98, 3, 0"
         END
     END
     BLOCK "VarFileInfo"

--- a/Resource_eng/FFFTP-eng.rc
+++ b/Resource_eng/FFFTP-eng.rc
@@ -235,7 +235,7 @@ FONT 9, "MS Sans Serif", 0, 0, 0x0
 BEGIN
     DEFPUSHBUTTON   "OK",IDOK,132,296,50,14
     ICON            ffftp,-1,7,4,20,20
-    CTEXT           "FFFTP  Ver 1.99",-1,110,11,90,8
+    CTEXT           "FFFTP  Ver 1.98c",-1,110,11,90,8
     CTEXT           "FFFTP is freeware",-1,7,281,301,8
     CTEXT           "Copyright(C) 1997-2010 Sota && cooperators\nCopyright (C) 2011 FFFTP Project (Hiromichi Matsushima, Suguru Kawamoto, IWAMOTO Kouichi, vitamin0x, unarist, Asami, fortran90, tomo1192)",-1,7,25,301,44
     CTEXT           "",ABOUT_JRE,7,93,301,8
@@ -2038,8 +2038,8 @@ nodrop_csr              CURSOR                  "nodrop_c.cur"
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,99,0,0
- PRODUCTVERSION 1,99,0,0
+ FILEVERSION 1,98,3,0
+ PRODUCTVERSION 1,98,3,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -2057,12 +2057,12 @@ BEGIN
             VALUE "Comments", "This software is Free Software"
             VALUE "CompanyName", " Sota"
             VALUE "FileDescription", "FFFTP"
-            VALUE "FileVersion", "1, 99, 0, 0"
+            VALUE "FileVersion", "1, 98, 3, 0"
             VALUE "InternalName", "FFFTP"
             VALUE "LegalCopyright", "Copyright (C) 1997-2010 Sota & cooperators\nCopyright (C) 2011 FFFTP Project (Hiromichi Matsushima, Suguru Kawamoto, IWAMOTO Kouichi, vitamin0x, unarist, Asami, fortran90, tomo1192)."
             VALUE "OriginalFilename", "FFFTP.exe"
             VALUE "ProductName", "FFFTP"
-            VALUE "ProductVersion", "1, 99, 0, 0"
+            VALUE "ProductVersion", "1, 98, 3, 0"
         END
     END
     BLOCK "VarFileInfo"

--- a/common.h
+++ b/common.h
@@ -70,9 +70,9 @@
 //#define VER_STR					"1.97b"
 //#define VER_NUM					1921		/* 設定バージョン */
 //#define PROGRAM_VERSION_NUM		1972		/* バージョン */
-#define VER_STR					"1.99"
-#define VER_NUM					1990		/* 設定バージョン */
-#define PROGRAM_VERSION_NUM		1990		/* バージョン */
+#define VER_STR					"1.98c"
+#define VER_NUM					1983		/* 設定バージョン */
+#define PROGRAM_VERSION_NUM		1983		/* バージョン */
 
 
 #define MYWEB_URL	"http://www2.biglobe.ne.jp/~sota/ffftp-qa.html"

--- a/connect.c
+++ b/connect.c
@@ -1553,11 +1553,11 @@ static SOCKET DoConnectCrypt(int CryptMode, HOSTDATA* HostData, char *Host, char
 				if(strstr(Reply, " UTF8 "))
 					HostData->Feature |= FEATURE_UTF8;
 				// MLST対応
-				if(strstr(Reply, " MLST ") || strstr(Reply, " MLSD "))
-					HostData->Feature |= FEATURE_MLSD;
+//				if(strstr(Reply, " MLST ") || strstr(Reply, " MLSD "))
+//					HostData->Feature |= FEATURE_MLSD;
 				// IPv6対応
-				if(strstr(Reply, " EPRT ") || strstr(Reply, " EPSV "))
-					HostData->Feature |= FEATURE_EPRT | FEATURE_EPSV;
+//				if(strstr(Reply, " EPRT ") || strstr(Reply, " EPSV "))
+//					HostData->Feature |= FEATURE_EPRT | FEATURE_EPSV;
 			}
 			// UTF-8対応
 			if(HostData->NameKanjiCode == KANJI_AUTO && (HostData->Feature & FEATURE_UTF8))

--- a/doc/eng/FFFTP.txt
+++ b/doc/eng/FFFTP.txt
@@ -1,5 +1,5 @@
 ============================================================
-[Software Name]  FFFTP Ver.1.99 (FTP Client software)
+[Software Name]  FFFTP Ver.1.98c (FTP Client software)
 [Copyright]      Copyright(C) 1997-2010 Sota & cooperators
                  Copyright(C) 2011 FFFTP Project (Hiromichi Matsushima, Suguru Kawamoto, IWAMOTO Kouichi, vitamin0x, unarist, Asami, fortran90, tomo1192).
 [Environment]    Windows 7, Vista, XP, 2000
@@ -28,12 +28,9 @@ following menu.
 File ->@Settings -> Change Master password
 
 
-Changes in Ver.1.99
+Changes in Ver.1.98c
 --------------------
 
--- MLSD command became used for retrieving filenames on appropriate hosts.
-   That is helpful for hosts that do not return filenames properly.
-
 -- Changed to connect to hosts with Punycode if their names contain
    international characters.
 

--- a/doc/eng/history.txt
+++ b/doc/eng/history.txt
@@ -1,11 +1,8 @@
 FFFTP version history.
 
-Changes in Ver.1.99
+Changes in Ver.1.98c
 --------------------
 
--- MLSD command became used for retrieving filenames on appropriate hosts.
-   That is helpful for hosts that do not return filenames properly.
-
 -- Changed to connect to hosts with Punycode if their names contain
    international characters.
 

--- a/doc/jpn/FFFTP.txt
+++ b/doc/jpn/FFFTP.txt
@@ -1,5 +1,5 @@
 ============================================================
-yƒ\ƒtƒg–¼z@FTPƒNƒ‰ƒCƒAƒ“ƒg FFFTPisf.jp”Łj Ver 1.99
+yƒ\ƒtƒg–¼z@FTPƒNƒ‰ƒCƒAƒ“ƒg FFFTPisf.jp”Łj Ver 1.98c
 y“®ìŠm”FŠÂ‹«z@Windows 7AVistaAXPA2000
 yƒTƒ|[ƒgz@http://sourceforge.jp/projects/ffftp/
 ============================================================
@@ -27,13 +27,9 @@ FFFTP Ver.1.96d+009
 ƒ}ƒXƒ^[ƒpƒXƒ[ƒh‚Ì“ü—Í‚ª‹‚ß‚ç‚ê‚Ü‚·‚̂ŁA“ü—Í‚µ‚Ä‚­‚¾‚³‚¢B
 
 
-Ver 1.99‚ł̕ύX“_
+Ver 1.98c‚ł̕ύX“_
 -------------------
 
-EMLSDƒRƒ}ƒ“ƒh‚ɑΉž‚µ‚½ƒzƒXƒg‚Å‚ÍMLSDƒRƒ}ƒ“ƒh‚ð—p‚¢‚ătƒ@ƒCƒ‹ˆê——‚ð
-@Žæ“¾‚·‚é‚悤‚É‚µ‚Ü‚µ‚½BLISTƒRƒ}ƒ“ƒh‚̉ž“š‚É“Á’è‚̃tƒ@ƒCƒ‹‚ª
-@ŠÜ‚Ü‚ê‚È‚¢ˆê•”‚̃zƒXƒg‚Å‚à³‚µ‚­—ñ‹“‚Å‚«‚é‰Â”\«‚ª‚‚­‚È‚è‚Ü‚·B
-
 E“ú–{ŒêƒhƒƒCƒ“–¼‚̃zƒXƒg‚ւ̐ڑ±Žž‚ɃAƒhƒŒƒX‚ðPunycode‚Ö•ÏŠ·‚µ‚Ä‚©‚ç
 @Ú‘±‚·‚é‚悤‚ɕύX‚µ‚Ü‚µ‚½B
 

--- a/doc/jpn/history.txt
+++ b/doc/jpn/history.txt
@@ -1,10 +1,6 @@
 FFFTP@‰ü”ŃŠƒXƒg
 
-¡Ver 1.99
-
-EMLSDƒRƒ}ƒ“ƒh‚ɑΉž‚µ‚½ƒzƒXƒg‚Å‚ÍMLSDƒRƒ}ƒ“ƒh‚ð—p‚¢‚ătƒ@ƒCƒ‹ˆê——‚ð
-@Žæ“¾‚·‚é‚悤‚É‚µ‚Ü‚µ‚½BLISTƒRƒ}ƒ“ƒh‚̉ž“š‚É“Á’è‚̃tƒ@ƒCƒ‹‚ª
-@ŠÜ‚Ü‚ê‚È‚¢ˆê•”‚̃zƒXƒg‚Å‚à³‚µ‚­—ñ‹“‚Å‚«‚é‰Â”\«‚ª‚‚­‚È‚è‚Ü‚·B
+¡Ver 1.98c
 
 E“ú–{ŒêƒhƒƒCƒ“–¼‚̃zƒXƒg‚ւ̐ڑ±Žž‚ɃAƒhƒŒƒX‚ðPunycode‚Ö•ÏŠ·‚µ‚Ä‚©‚ç
 @Ú‘±‚·‚é‚悤‚ɕύX‚µ‚Ü‚µ‚½B

--- a/hostman.c
+++ b/hostman.c
@@ -2166,6 +2166,8 @@ static BOOL CALLBACK CryptSettingProc(HWND hDlg, UINT iMessage, WPARAM wParam, L
 			// TODO: SFTP対応
 			SendDlgItemMessage(hDlg, HSET_SFTP, BM_SETCHECK, BST_UNCHECKED, 0);
 			EnableWindow(GetDlgItem(hDlg, HSET_SFTP), FALSE);
+			EnableWindow(GetDlgItem(hDlg, PKEY_FILE_BR), FALSE);
+			EnableWindow(GetDlgItem(hDlg, HSET_PRIVATE_KEY), FALSE);
 			return(TRUE);
 
 		case WM_NOTIFY:

Binary files a/htmlhelp/FFFTP.CHM and b/htmlhelp/FFFTP.CHM differ

--- a/htmlhelp/HTML/H0000001.HTM
+++ b/htmlhelp/HTML/H0000001.HTM
@@ -4,7 +4,7 @@
 <META name=GENERATOR content="MSHTML 8.00.7600.16490"></HEAD>
 <BODY>
 <P align=center><FONT face="‚l‚r ƒSƒVƒbƒN">&nbsp;<FONT color=#0000ff 
-size=6>‚e‚e‚e‚s‚o</FONT>@Ver 1.99</FONT><FONT face="‚l‚r ƒSƒVƒbƒN"><BR></FONT>(“®ìŠm”FŠÂ‹« 
+size=6>‚e‚e‚e‚s‚o</FONT>@Ver 1.98c</FONT><FONT face="‚l‚r ƒSƒVƒbƒN"><BR></FONT>(“®ìŠm”FŠÂ‹« 
 <STRONG>Windows 7, </STRONG><STRONG>Vista, XP, 2000</STRONG>)</P>
 <P><BR>‚f‚t‚h‚È‚e‚s‚oƒNƒ‰ƒCƒAƒ“ƒgƒc[ƒ‹‚Å‚·B</P><STRONG>
 <P style="MARGIN-RIGHT: 0px" dir=ltr><STRONG><FONT