• R/O
  • HTTP
  • SSH
  • HTTPS

ffftp: Commit

FFFTPのソースコードです。


Commit MetaInfo

Revisionfb60b11223517040606aa6b531a1e59102d7704b (tree)
Time2017-10-29 17:30:42
Authors_kawamoto <s_kawamoto@user...>
Commiters_kawamoto

Log Message

Fix bugs of host switching.

Change Summary

Incremental Difference

Binary files a/FFFTP_Eng_Release/FFFTP.exe and b/FFFTP_Eng_Release/FFFTP.exe differ
Binary files a/FFFTP_Eng_Release_64/FFFTP.exe and b/FFFTP_Eng_Release_64/FFFTP.exe differ
--- a/Package/make_update.bat
+++ b/Package/make_update.bat
@@ -11,8 +11,8 @@ set PREFIX_JPN=update.jpn.file.
1111 set PREFIX_ENG=update.eng.file.
1212 set PREFIX_AMD64_JPN=update.amd64.jpn.file.
1313 set PREFIX_AMD64_ENG=update.amd64.eng.file.
14-set DESC_JPN="転送失敗時に再接続できない場合があるバグを修正しました。\n切断時にファイルの転送待ちが解除されないバグを修正しました。\n転送中の強制終了が機能しない場合があるバグを修正しました。\n転送中の強制終了が機能しない場合があるバグを修正しました。\n受信中止をクリックした後の挙動がおかしくなるバグを修正しました。"
15-set DESC_ENG="Fixed bugs that sometimes it cannot reconnect after transfer failure.\nFixed bugs that the queue of file transfer is not released on disconnection.\nFixed bugs that sometimes Force Exit does not work while transfer.\nFixed bugs that the behavior is strange after clicking Stop button."
14+set DESC_JPN="同時接続数が1より大きいホストから切断した直後に別のホストで転送に失敗するバグを修正しました。"
15+set DESC_ENG="Fixed bugs that transfer fails at a host right after disconnection from another host whose number of simultaneous connections is more than 1."
1616 set DESC_AMD64_JPN=%DESC_JPN%
1717 set DESC_AMD64_ENG=%DESC_ENG%
1818
Binary files a/Release/FFFTP.exe and b/Release/FFFTP.exe differ
Binary files a/Release_64/FFFTP.exe and b/Release_64/FFFTP.exe differ
--- a/Resource/FFFTP.rc
+++ b/Resource/FFFTP.rc
@@ -242,7 +242,7 @@ FONT 9, "MS Shell Dlg", 0, 0, 0x0
242242 BEGIN
243243 DEFPUSHBUTTON "OK",IDOK,133,294,50,14
244244 ICON ffftp,-1,7,4,20,20
245- CTEXT "FFFTP Ver 1.99a-20171028",-1,113,11,90,8
245+ CTEXT "FFFTP Ver 1.99a-20171029",-1,113,11,90,8
246246 CTEXT "FFFTPはfreewareです",-1,7,279,305,8
247247 CTEXT "Copyright(C) 1997-2010 Sota & ご協力いただいた方々\nCopyright (C) 2011-2017 FFFTP Project (Hiromichi Matsushima, Suguru Kawamoto, IWAMOTO Kouichi, vitamin0x, うなー, Asami, fortran90, tomo1192, Yuji Tanaka, Moriguchi Hirokazu, ふうせん)",-1,7,25,305,44,SS_NOPREFIX
248248 CTEXT "",ABOUT_JRE,7,96,305,8
@@ -2213,8 +2213,8 @@ nodrop_csr CURSOR "nodrop_c.cur"
22132213 //
22142214
22152215 VS_VERSION_INFO VERSIONINFO
2216- FILEVERSION 1,99,1,17
2217- PRODUCTVERSION 1,99,1,17
2216+ FILEVERSION 1,99,1,18
2217+ PRODUCTVERSION 1,99,1,18
22182218 FILEFLAGSMASK 0x3fL
22192219 #ifdef _DEBUG
22202220 FILEFLAGS 0x1L
@@ -2232,12 +2232,12 @@ BEGIN
22322232 VALUE "Comments", "これはフリーソフトウエアです。"
22332233 VALUE "CompanyName", "Sota, FFFTP Project"
22342234 VALUE "FileDescription", "FFFTP"
2235- VALUE "FileVersion", "1, 99, 1, 17"
2235+ VALUE "FileVersion", "1, 99, 1, 18"
22362236 VALUE "InternalName", "FFFTP"
22372237 VALUE "LegalCopyright", "Copyright (C) 1997-2010 Sota & ご協力いただいた方々\nCopyright (C) 2011-2017 FFFTP Project (Hiromichi Matsushima, Suguru Kawamoto, IWAMOTO Kouichi, vitamin0x, うなー, Asami, fortran90, tomo1192, Yuji Tanaka, Moriguchi Hirokazu, ふうせん)."
22382238 VALUE "OriginalFilename", "FFFTP.exe"
22392239 VALUE "ProductName", "FFFTP"
2240- VALUE "ProductVersion", "1, 99, 1, 17"
2240+ VALUE "ProductVersion", "1, 99, 1, 18"
22412241 END
22422242 END
22432243 BLOCK "VarFileInfo"
--- a/Resource_eng/ffftp.rc
+++ b/Resource_eng/ffftp.rc
@@ -242,7 +242,7 @@ FONT 9, "MS Shell Dlg", 0, 0, 0x0
242242 BEGIN
243243 DEFPUSHBUTTON "OK",IDOK,132,296,50,14
244244 ICON ffftp,-1,7,4,20,20
245- CTEXT "FFFTP Ver 1.99a-20171028",-1,110,11,90,8
245+ CTEXT "FFFTP Ver 1.99a-20171029",-1,110,11,90,8
246246 CTEXT "FFFTP is freeware",-1,7,281,301,8
247247 CTEXT "Copyright(C) 1997-2010 Sota && cooperators\nCopyright (C) 2011-2017 FFFTP Project (Hiromichi Matsushima, Suguru Kawamoto, IWAMOTO Kouichi, vitamin0x, unarist, Asami, fortran90, tomo1192, Yuji Tanaka, Moriguchi Hirokazu, Fu-sen)",-1,7,25,301,44
248248 CTEXT "",ABOUT_JRE,7,93,301,8
@@ -2253,8 +2253,8 @@ nodrop_csr CURSOR "nodrop_c.cur"
22532253 //
22542254
22552255 VS_VERSION_INFO VERSIONINFO
2256- FILEVERSION 1,99,1,17
2257- PRODUCTVERSION 1,99,1,17
2256+ FILEVERSION 1,99,1,18
2257+ PRODUCTVERSION 1,99,1,18
22582258 FILEFLAGSMASK 0x3fL
22592259 #ifdef _DEBUG
22602260 FILEFLAGS 0x1L
@@ -2272,12 +2272,12 @@ BEGIN
22722272 VALUE "Comments", "This software is Free Software"
22732273 VALUE "CompanyName", "Sota, FFFTP Project"
22742274 VALUE "FileDescription", "FFFTP"
2275- VALUE "FileVersion", "1, 99, 1, 17"
2275+ VALUE "FileVersion", "1, 99, 1, 18"
22762276 VALUE "InternalName", "FFFTP"
22772277 VALUE "LegalCopyright", "Copyright (C) 1997-2010 Sota & cooperators\nCopyright (C) 2011-2017 FFFTP Project (Hiromichi Matsushima, Suguru Kawamoto, IWAMOTO Kouichi, vitamin0x, unarist, Asami, fortran90, tomo1192, Yuji Tanaka, Moriguchi Hirokazu, Fu-sen)."
22782278 VALUE "OriginalFilename", "FFFTP.exe"
22792279 VALUE "ProductName", "FFFTP"
2280- VALUE "ProductVersion", "1, 99, 1, 17"
2280+ VALUE "ProductVersion", "1, 99, 1, 18"
22812281 END
22822282 END
22832283 BLOCK "VarFileInfo"
--- a/common.h
+++ b/common.h
@@ -72,16 +72,16 @@
7272 //#define PROGRAM_VERSION_NUM 1972 /* バージョン */
7373 // 64ビット対応
7474 #ifdef _WIN64
75-#define VER_STR "1.99a-20171028 64bit"
75+#define VER_STR "1.99a-20171029 64bit"
7676 #else
77-#define VER_STR "1.99a-20171028"
77+#define VER_STR "1.99a-20171029"
7878 #endif
7979 #define VER_NUM 1990 /* 設定バージョン */
8080 #define PROGRAM_VERSION_NUM 1990 /* バージョン */
8181 // ソフトウェア自動更新
8282 // リリースバージョンはリリース予定年(10進数4桁)+月(2桁)+日(2桁)+通し番号(0スタート2桁)とする
8383 // 2014年7月31日中の30個目のリリースは2014073129
84-#define RELEASE_VERSION_NUM 2017102800 /* リリースバージョン */
84+#define RELEASE_VERSION_NUM 2017102900 /* リリースバージョン */
8585
8686
8787 // SourceForge.JPによるフォーク
--- a/getput.c
+++ b/getput.c
@@ -792,8 +792,7 @@ static ULONG WINAPI TransferThread(void *Dummy)
792792 }
793793 if(AskReuseCmdSkt() == YES && ThreadCount == 0)
794794 {
795- if(TransPacketBase && ThreadCount < AskMaxThreadCount())
796- TrnSkt = AskTrnCtrlSkt();
795+ TrnSkt = AskTrnCtrlSkt();
797796 // セッションあたりの転送量制限対策
798797 if(TrnSkt != INVALID_SOCKET && AskErrorReconnect() == YES && LastError == YES)
799798 {
@@ -859,7 +858,7 @@ static ULONG WINAPI TransferThread(void *Dummy)
859858 {
860859 // 同時ログイン数制限対策
861860 // 60秒間使用されなければログアウト
862- if(timeGetTime() - LastUsed > 60000 || AskConnecting() == NO)
861+ if(timeGetTime() - LastUsed > 60000 || AskConnecting() == NO || ThreadCount >= AskMaxThreadCount())
863862 {
864863 ReleaseMutex(hListAccMutex);
865864 DoQUIT(TrnSkt, &Canceled[ThreadCount]);
Show on old repository browser