Commit: 13b044809d800141bd342eed396325f460c20d8b - ffftp (git)

Loweynet

Commit MetaInfo

• Revision: 13b044809d800141bd342eed396325f460c20d8b (tree)
• Zeit: 2011-10-14 17:35:34
• Autor: s_kawamoto <s_kawamoto@user...>
• Commiter: s_kawamoto

Log Message

Update to 391e3074b3447b3a0d5f9153eb82cb87c89dfede (1.98a) about bug fixes.

Ändern Zusammenfassung

• modified: FFFTP_Eng_Release/FFFTP.exe
• modified: Release/FFFTP.exe
• modified: getput.c
• modified: socketwrapper.c

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/getput.c
+++ b/getput.c
@@ -2019,7 +2019,10 @@ static void DispDownloadFinishMsg(TRANSPACKET *Pkt, int iRetCode)
 //			else if((Pkt->hWndTrans != NULL) && (TimeStart != 0))
 //				SetTaskMsg(MSGJPN102, TimeStart, Pkt->ExistSize/TimeStart);
 			else if((Pkt->hWndTrans != NULL) && (TimeStart[Pkt->ThreadCount] != 0))
-				SetTaskMsg(MSGJPN102, TimeStart[Pkt->ThreadCount], Pkt->ExistSize/TimeStart[Pkt->ThreadCount]);
+				// "0 B/S"と表示されるバグを修正
+				// 原因は%dにあたる部分に64ビット値が渡されているため
+//				SetTaskMsg(MSGJPN102, TimeStart[Pkt->ThreadCount], Pkt->ExistSize/TimeStart[Pkt->ThreadCount]);
+				SetTaskMsg(MSGJPN102, (LONG)TimeStart[Pkt->ThreadCount], (LONG)(Pkt->ExistSize/TimeStart[Pkt->ThreadCount]));
 			else
 				SetTaskMsg(MSGJPN103, Pkt->ExistSize);
 		}

--- a/socketwrapper.c
+++ b/socketwrapper.c
@@ -198,7 +198,7 @@ BOOL AttachSSL(SOCKET s)
 					while(pSSL_connect(*ppSSL) != 1)
 					{
 						LeaveCriticalSection(&g_OpenSSLLock);
-						if(g_pOpenSSLTimeoutCallback() || timeGetTime() - Time >= g_OpenSSLTimeout)
+						if(g_pOpenSSLTimeoutCallback() || (g_OpenSSLTimeout > 0 && timeGetTime() - Time >= g_OpenSSLTimeout))
 						{
 							DetachSSL(s);
 							r = FALSE;