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

diff --git a/FFFTP_Eng_Release/FFFTP.exe b/FFFTP_Eng_Release/FFFTP.exe
index 9cd530b..2172f19 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 fb471a7..561b5c8 100644 (file)
Binary files a/Release/FFFTP.exe and b/Release/FFFTP.exe differ

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

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