Commit: fb60b11223517040606aa6b531a1e59102d7704b - ffftp (git)

Loweynet

Commit MetaInfo

• Revision: fb60b11223517040606aa6b531a1e59102d7704b (tree)
• Time: 2017-10-29 17:30:42
• Author: s_kawamoto <s_kawamoto@user...>
• Commiter: s_kawamoto

Log Message

Fix bugs of host switching.

Change Summary

• modified: FFFTP_Eng_Release/FFFTP.exe
• modified: FFFTP_Eng_Release_64/FFFTP.exe
• modified: Package/make_update.bat
• modified: Release/FFFTP.exe
• modified: Release_64/FFFTP.exe
• modified: Resource/FFFTP.rc
• modified: Resource_eng/ffftp.rc
• modified: common.h
• modified: getput.c

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.
 set PREFIX_ENG=update.eng.file.
 set PREFIX_AMD64_JPN=update.amd64.jpn.file.
 set PREFIX_AMD64_ENG=update.amd64.eng.file.
-set DESC_JPN="“]‘—Ž¸”sŽž‚ɍĐڑ±‚Å‚«‚È‚¢ê‡‚ª‚ ‚éƒoƒO‚ðC³‚µ‚Ü‚µ‚½B\nØ’fŽž‚Ƀtƒ@ƒCƒ‹‚Ì“]‘—‘Ò‚¿‚ª‰ðœ‚³‚ê‚È‚¢ƒoƒO‚ðC³‚µ‚Ü‚µ‚½B\n“]‘—’†‚Ì‹­§I—¹‚ª‹@”\‚µ‚È‚¢ê‡‚ª‚ ‚éƒoƒO‚ðC³‚µ‚Ü‚µ‚½B\n“]‘—’†‚Ì‹­§I—¹‚ª‹@”\‚µ‚È‚¢ê‡‚ª‚ ‚éƒoƒO‚ðC³‚µ‚Ü‚µ‚½B\nŽóM’†Ž~‚ðƒNƒŠƒbƒN‚µ‚½Œã‚Ì‹““®‚ª‚¨‚©‚µ‚­‚È‚éƒoƒO‚ðC³‚µ‚Ü‚µ‚½B"
-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."
+set DESC_JPN="“¯ŽžÚ‘±”‚ª1‚æ‚è‘å‚«‚¢ƒzƒXƒg‚©‚çØ’f‚µ‚½’¼Œã‚ɕʂ̃zƒXƒg‚Å“]‘—‚ÉŽ¸”s‚·‚éƒoƒO‚ðC³‚µ‚Ü‚µ‚½B"
+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."
 set DESC_AMD64_JPN=%DESC_JPN%
 set DESC_AMD64_ENG=%DESC_ENG%
 

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
 BEGIN
     DEFPUSHBUTTON   "OK",IDOK,133,294,50,14
     ICON            ffftp,-1,7,4,20,20
-    CTEXT           "FFFTP Ver 1.99a-20171028",-1,113,11,90,8
+    CTEXT           "FFFTP Ver 1.99a-20171029",-1,113,11,90,8
     CTEXT           "FFFTP‚Ífreeware‚Å‚·",-1,7,279,305,8
     CTEXT           "Copyright(C) 1997-2010 Sota & ‚²‹¦—Í‚¢‚½‚¾‚¢‚½•ûX\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
     CTEXT           "",ABOUT_JRE,7,96,305,8
@@ -2213,8 +2213,8 @@ nodrop_csr              CURSOR                  "nodrop_c.cur"
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,99,1,17
- PRODUCTVERSION 1,99,1,17
+ FILEVERSION 1,99,1,18
+ PRODUCTVERSION 1,99,1,18
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -2232,12 +2232,12 @@ BEGIN
             VALUE "Comments", "‚±‚ê‚̓tƒŠ[ƒ\ƒtƒgƒEƒGƒA‚Å‚·B"
             VALUE "CompanyName", "Sota, FFFTP Project"
             VALUE "FileDescription", "FFFTP"
-            VALUE "FileVersion", "1, 99, 1, 17"
+            VALUE "FileVersion", "1, 99, 1, 18"
             VALUE "InternalName", "FFFTP"
             VALUE "LegalCopyright", "Copyright (C) 1997-2010 Sota & ‚²‹¦—Í‚¢‚½‚¾‚¢‚½•ûX\nCopyright (C) 2011-2017 FFFTP Project (Hiromichi Matsushima, Suguru Kawamoto, IWAMOTO Kouichi, vitamin0x, ‚¤‚ȁ[, Asami, fortran90, tomo1192, Yuji Tanaka, Moriguchi Hirokazu, ‚Ó‚¤‚¹‚ñ)."
             VALUE "OriginalFilename", "FFFTP.exe"
             VALUE "ProductName", "FFFTP"
-            VALUE "ProductVersion", "1, 99, 1, 17"
+            VALUE "ProductVersion", "1, 99, 1, 18"
         END
     END
     BLOCK "VarFileInfo"

--- a/Resource_eng/ffftp.rc
+++ b/Resource_eng/ffftp.rc
@@ -242,7 +242,7 @@ FONT 9, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     DEFPUSHBUTTON   "OK",IDOK,132,296,50,14
     ICON            ffftp,-1,7,4,20,20
-    CTEXT           "FFFTP Ver 1.99a-20171028",-1,110,11,90,8
+    CTEXT           "FFFTP Ver 1.99a-20171029",-1,110,11,90,8
     CTEXT           "FFFTP is freeware",-1,7,281,301,8
     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
     CTEXT           "",ABOUT_JRE,7,93,301,8
@@ -2253,8 +2253,8 @@ nodrop_csr              CURSOR                  "nodrop_c.cur"
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,99,1,17
- PRODUCTVERSION 1,99,1,17
+ FILEVERSION 1,99,1,18
+ PRODUCTVERSION 1,99,1,18
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -2272,12 +2272,12 @@ BEGIN
             VALUE "Comments", "This software is Free Software"
             VALUE "CompanyName", "Sota, FFFTP Project"
             VALUE "FileDescription", "FFFTP"
-            VALUE "FileVersion", "1, 99, 1, 17"
+            VALUE "FileVersion", "1, 99, 1, 18"
             VALUE "InternalName", "FFFTP"
             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)."
             VALUE "OriginalFilename", "FFFTP.exe"
             VALUE "ProductName", "FFFTP"
-            VALUE "ProductVersion", "1, 99, 1, 17"
+            VALUE "ProductVersion", "1, 99, 1, 18"
         END
     END
     BLOCK "VarFileInfo"

--- a/common.h
+++ b/common.h
@@ -72,16 +72,16 @@
 //#define PROGRAM_VERSION_NUM		1972		/* バージョン */
 // 64ビット対応
 #ifdef _WIN64
-#define VER_STR					"1.99a-20171028 64bit"
+#define VER_STR					"1.99a-20171029 64bit"
 #else
-#define VER_STR					"1.99a-20171028"
+#define VER_STR					"1.99a-20171029"
 #endif
 #define VER_NUM					1990		/* 設定バージョン */
 #define PROGRAM_VERSION_NUM		1990		/* バージョン */
 // ソフトウェア自動更新
 // リリースバージョンはリリース予定年（10進数4桁）+月（2桁）+日（2桁）+通し番号（0スタート2桁）とする
 // 2014年7月31日中の30個目のリリースは2014073129
-#define RELEASE_VERSION_NUM		2017102800	/* リリースバージョン */
+#define RELEASE_VERSION_NUM		2017102900	/* リリースバージョン */
 
 
 // SourceForge.JPによるフォーク

--- a/getput.c
+++ b/getput.c
@@ -792,8 +792,7 @@ static ULONG WINAPI TransferThread(void *Dummy)
 		}
 		if(AskReuseCmdSkt() == YES && ThreadCount == 0)
 		{
-			if(TransPacketBase && ThreadCount < AskMaxThreadCount())
-				TrnSkt = AskTrnCtrlSkt();
+			TrnSkt = AskTrnCtrlSkt();
 			// セッションあたりの転送量制限対策
 			if(TrnSkt != INVALID_SOCKET && AskErrorReconnect() == YES && LastError == YES)
 			{
@@ -859,7 +858,7 @@ static ULONG WINAPI TransferThread(void *Dummy)
 				{
 					// 同時ログイン数制限対策
 					// 60秒間使用されなければログアウト
-					if(timeGetTime() - LastUsed > 60000 || AskConnecting() == NO)
+					if(timeGetTime() - LastUsed > 60000 || AskConnecting() == NO || ThreadCount >= AskMaxThreadCount())
 					{
 						ReleaseMutex(hListAccMutex);
 						DoQUIT(TrnSkt, &Canceled[ThreadCount]);