Modify features and documents for 1.98c.

diff --git a/FFFTP_Eng_Release/FFFTP.exe b/FFFTP_Eng_Release/FFFTP.exe
index dac5ae6..e6a7d9a 100644 (file)
Binary files a/FFFTP_Eng_Release/FFFTP.exe and b/FFFTP_Eng_Release/FFFTP.exe differ

diff --git a/Release/FFFTP.exe b/Release/FFFTP.exe
index 5317d74..3d9ac67 100644 (file)
Binary files a/Release/FFFTP.exe and b/Release/FFFTP.exe differ

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

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

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

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

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

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

diff --git a/doc/jpn/FFFTP.txt b/doc/jpn/FFFTP.txt
index 59775cb..204564f 100644 (file)
--- a/doc/jpn/FFFTP.txt
+++ b/doc/jpn/FFFTP.txt
@@ -1,5 +1,5 @@
 ============================================================\r
-\81y\83\\83t\83g\96¼\81z\81@FTP\83N\83\89\83C\83A\83\93\83g FFFTP\81isf.jp\94Å\81j Ver 1.99\r
+\81y\83\\83t\83g\96¼\81z\81@FTP\83N\83\89\83C\83A\83\93\83g FFFTP\81isf.jp\94Å\81j Ver 1.98c\r
 \81y\93®\8dì\8am\94F\8aÂ\8b«\81z\81@Windows 7\81AVista\81AXP\81A2000\r
 \81y\83T\83|\81[\83g\81z\81@http://sourceforge.jp/projects/ffftp/\r
 ============================================================\r
@@ -27,13 +27,9 @@ FFFTP Ver.1.96d+009
 \83}\83X\83^\81[\83p\83X\83\8f\81[\83h\82Ì\93ü\97Í\82ª\8b\81\82ß\82ç\82ê\82Ü\82·\82Ì\82Å\81A\93ü\97Í\82µ\82Ä\82­\82¾\82³\82¢\81B\r
 \r
 \r
-Ver 1.99\82Å\82Ì\95Ï\8dX\93_\r
+Ver 1.98c\82Å\82Ì\95Ï\8dX\93_\r
 -------------------\r
 \r
-\81EMLSD\83R\83}\83\93\83h\82É\91Î\89\9e\82µ\82½\83z\83X\83g\82Å\82ÍMLSD\83R\83}\83\93\83h\82ð\97p\82¢\82Ä\83t\83@\83C\83\8b\88ê\97\97\82ð\r
-\81@\8eæ\93¾\82·\82é\82æ\82¤\82É\82µ\82Ü\82µ\82½\81BLIST\83R\83}\83\93\83h\82Ì\89\9e\93\9a\82É\93Á\92è\82Ì\83t\83@\83C\83\8b\82ª\r
-\81@\8aÜ\82Ü\82ê\82È\82¢\88ê\95\94\82Ì\83z\83X\83g\82Å\82à\90³\82µ\82­\97ñ\8b\93\82Å\82«\82é\89Â\94\\90«\82ª\8d\82\82­\82È\82è\82Ü\82·\81B\r
-\r
 \81E\93ú\96{\8cê\83h\83\81\83C\83\93\96¼\82Ì\83z\83X\83g\82Ö\82Ì\90Ú\91±\8e\9e\82É\83A\83h\83\8c\83X\82ðPunycode\82Ö\95Ï\8a·\82µ\82Ä\82©\82ç\r
 \81@\90Ú\91±\82·\82é\82æ\82¤\82É\95Ï\8dX\82µ\82Ü\82µ\82½\81B\r
 \r

diff --git a/doc/jpn/history.txt b/doc/jpn/history.txt
index 81546d1..6952a81 100644 (file)
--- a/doc/jpn/history.txt
+++ b/doc/jpn/history.txt
@@ -1,10 +1,6 @@
 FFFTP\81@\89ü\94Å\83\8a\83X\83g\r
 \r
-\81¡Ver 1.99\r
-\r
-\81EMLSD\83R\83}\83\93\83h\82É\91Î\89\9e\82µ\82½\83z\83X\83g\82Å\82ÍMLSD\83R\83}\83\93\83h\82ð\97p\82¢\82Ä\83t\83@\83C\83\8b\88ê\97\97\82ð\r
-\81@\8eæ\93¾\82·\82é\82æ\82¤\82É\82µ\82Ü\82µ\82½\81BLIST\83R\83}\83\93\83h\82Ì\89\9e\93\9a\82É\93Á\92è\82Ì\83t\83@\83C\83\8b\82ª\r
-\81@\8aÜ\82Ü\82ê\82È\82¢\88ê\95\94\82Ì\83z\83X\83g\82Å\82à\90³\82µ\82­\97ñ\8b\93\82Å\82«\82é\89Â\94\\90«\82ª\8d\82\82­\82È\82è\82Ü\82·\81B\r
+\81¡Ver 1.98c\r
 \r
 \81E\93ú\96{\8cê\83h\83\81\83C\83\93\96¼\82Ì\83z\83X\83g\82Ö\82Ì\90Ú\91±\8e\9e\82É\83A\83h\83\8c\83X\82ðPunycode\82Ö\95Ï\8a·\82µ\82Ä\82©\82ç\r
 \81@\90Ú\91±\82·\82é\82æ\82¤\82É\95Ï\8dX\82µ\82Ü\82µ\82½\81B\r

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

diff --git a/htmlhelp/FFFTP.CHM b/htmlhelp/FFFTP.CHM
index 6f4becb..6c0445f 100644 (file)
Binary files a/htmlhelp/FFFTP.CHM and b/htmlhelp/FFFTP.CHM differ

diff --git a/htmlhelp/HTML/H0000001.HTM b/htmlhelp/HTML/H0000001.HTM
index 902b71f..95255e6 100644 (file)
--- a/htmlhelp/HTML/H0000001.HTM
+++ b/htmlhelp/HTML/H0000001.HTM
@@ -4,7 +4,7 @@
 <META name=GENERATOR content="MSHTML 8.00.7600.16490"></HEAD>\r
 <BODY>\r
 <P align=center><FONT face="\82l\82r \83S\83V\83b\83N">&nbsp;<FONT color=#0000ff \r
-size=6>\82e\82e\82e\82s\82o</FONT>\81@Ver 1.99</FONT><FONT face="\82l\82r \83S\83V\83b\83N"><BR></FONT>(\93®\8dì\8am\94F\8aÂ\8b« \r
+size=6>\82e\82e\82e\82s\82o</FONT>\81@Ver 1.98c</FONT><FONT face="\82l\82r \83S\83V\83b\83N"><BR></FONT>(\93®\8dì\8am\94F\8aÂ\8b« \r
 <STRONG>Windows 7, </STRONG><STRONG>Vista, XP, 2000</STRONG>)</P>\r
 <P><BR>\82f\82t\82h\82È\82e\82s\82o\83N\83\89\83C\83A\83\93\83g\83c\81[\83\8b\82Å\82·\81B</P><STRONG>\r
 <P style="MARGIN-RIGHT: 0px" dir=ltr><STRONG><FONT \r