提交: ea2078360ebe7fcb9d0335ff815da6f6852de641 - Osdn (git)

Loweynet

Commit MetaInfo

• 修訂: ea2078360ebe7fcb9d0335ff815da6f6852de641 (tree)
• 時間: 2017-10-28 22:11:13
• 作者: s_kawamoto <s_kawamoto@user...>
• Commiter: s_kawamoto

Log Message

Fix bugs of error recovery routine.

Change Summary

• modified: FFFTP_Eng_Release/FFFTP.exe
• modified: FFFTP_Eng_Release_64/FFFTP.exe
• modified: Release/FFFTP.exe
• modified: Release_64/FFFTP.exe
• modified: Resource/FFFTP.rc
• modified: Resource_eng/ffftp.rc
• modified: ftpproc.c
• modified: main.c

差異

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

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-20170924",-1,113,11,90,8
+    CTEXT           "FFFTP Ver 1.99a-20171028",-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,16
- PRODUCTVERSION 1,99,1,16
+ FILEVERSION 1,99,1,17
+ PRODUCTVERSION 1,99,1,17
  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, 16"
+            VALUE "FileVersion", "1, 99, 1, 17"
             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, 16"
+            VALUE "ProductVersion", "1, 99, 1, 17"
         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-20170924",-1,110,11,90,8
+    CTEXT           "FFFTP Ver 1.99a-20171028",-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,16
- PRODUCTVERSION 1,99,1,16
+ FILEVERSION 1,99,1,17
+ PRODUCTVERSION 1,99,1,17
  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, 16"
+            VALUE "FileVersion", "1, 99, 1, 17"
             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, 16"
+            VALUE "ProductVersion", "1, 99, 1, 17"
         END
     END
     BLOCK "VarFileInfo"

--- a/ftpproc.c
+++ b/ftpproc.c
@@ -3867,11 +3867,12 @@ static int RenameUnuseableName(char *Fname)
 // NOOPコマンドでは効果が無いホストが多いためLISTコマンドを使用
 void NoopProc(int Force)
 {
-//	CancelFlg = NO;
 	if(Force == YES || (AskConnecting() == YES && AskUserOpeDisabled() == NO))
 	{
-		if(AskReuseCmdSkt() == NO || AskShareProh() == YES || AskTransferNow() == NO)
+		if(AskReuseCmdSkt() == NO || (AskShareProh() == YES && AskTransferNow() == NO))
 		{
+			if(Force == NO)
+				CancelFlg = NO;
 			DisableUserOpe();
 			DoDirListCmdSkt("", "", 999, &CancelFlg);
 			EnableUserOpe();
@@ -3884,9 +3885,9 @@ void AbortRecoveryProc(void)
 {
 	if(AskConnecting() == YES && AskUserOpeDisabled() == NO)
 	{
-		CancelFlg = NO;
 		if(AskReuseCmdSkt() == NO || AskShareProh() == YES || AskTransferNow() == NO)
 		{
+			CancelFlg = NO;
 			if(AskErrorReconnect() == YES)
 			{
 				DisableUserOpe();

--- a/main.c
+++ b/main.c
@@ -1166,6 +1166,8 @@ static LRESULT CALLBACK FtpWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARA
 						}
 					}
 				}
+				if(CancelFlg == YES)
+					AbortRecoveryProc();
 				if(NoopEnable == YES && AskNoopInterval() > 0 && time(NULL) - LastDataConnectionTime >= AskNoopInterval())
 				{
 					NoopProc(NO);