Commit: 46cb6ad4eea69835e1aab2d29ed9c8117a6d516b - hiromi (git)

FFFTPのソースコードです。

Commit MetaInfo

• Revision: 46cb6ad4eea69835e1aab2d29ed9c8117a6d516b (tree)
• Zeit: 2011-10-15 16:22:08
• Autor: s_kawamoto <s_kawamoto@user...>
• Commiter: s_kawamoto

Log Message

Fix bugs of asyncronous socket control.
Fix bugs of deadlock around file deletion.
Adjust performance of simultaneous connection.
Fix bugs of UI for Kanji code of filenames.
Change handling timestamp that do not include year.
This version may be nearly stable (not for 1.99 but for 1.98b).

Ändern Zusammenfassung

• modified: FFFTP_Eng_Release/FFFTP.exe
• modified: Release/FFFTP.exe
• modified: Resource_eng/FFFTP-eng.rc
• modified: filelist.c
• modified: ftpproc.c
• modified: getput.c
• modified: socket.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/Resource_eng/FFFTP-eng.rc
+++ b/Resource_eng/FFFTP-eng.rc
@@ -741,8 +741,8 @@ BEGIN
     CONTROL         "UTF-8",HSET_UTF8N_CNV,"Button",BS_AUTORADIOBUTTON,12,69,41,10
     CONTROL         "Hankaku to Zenkaku",HSET_HANCNV,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,12,96,90,10
     GROUPBOX        "&Filename Kanji Code",-1,107,7,97,116,WS_GROUP
-    CONTROL         "Automatic",HSET_FN_AUTO_CNV,"Button",BS_AUTORADIOBUTTON | WS_GROUP,114,21,65,10
-    CONTROL         "Shift_JIS",HSET_FN_SJIS_CNV,"Button",BS_AUTORADIOBUTTON | WS_GROUP,111,33,65,10
+    CONTROL         "Automatic",HSET_FN_AUTO_CNV,"Button",BS_AUTORADIOBUTTON | WS_GROUP,111,21,65,10
+    CONTROL         "Shift_JIS",HSET_FN_SJIS_CNV,"Button",BS_AUTORADIOBUTTON,111,33,65,10
     CONTROL         "JIS",HSET_FN_JIS_CNV,"Button",BS_AUTORADIOBUTTON,111,45,70,10
     CONTROL         "EUC",HSET_FN_EUC_CNV,"Button",BS_AUTORADIOBUTTON,111,57,41,10
     CONTROL         "Samba-HEX",HSET_FN_SMH_CNV,"Button",BS_AUTORADIOBUTTON,111,69,66,10

--- a/filelist.c
+++ b/filelist.c
@@ -4771,9 +4771,11 @@ static int ResolvFileInfo(char *Str, int ListType, char *Fname, LONGLONG *Size,
 
 						/* 年がない */
 						/* 現在の日付から推定 */
-						if((sTimeNow.wMonth == 12) && (sTime.wMonth == 1))
-							sTime.wYear++;
-						else if(sTimeNow.wMonth+1 == sTime.wMonth)
+						// 恐らくホストとローカルの時刻が異なる場合の対処のようだがとりあえず無効にする
+//						if((sTimeNow.wMonth == 12) && (sTime.wMonth == 1))
+//							sTime.wYear++;
+//						else if(sTimeNow.wMonth+1 == sTime.wMonth)
+						if(sTimeNow.wMonth+1 == sTime.wMonth)
 							/* nothing */;
 						else if(sTimeNow.wMonth < sTime.wMonth)
 							sTime.wYear--;

--- a/ftpproc.c
+++ b/ftpproc.c
@@ -1960,6 +1960,8 @@ void DeleteProc(void)
 	char CurDir[FMAX_PATH+1];
 	char Tmp[FMAX_PATH+1];
 
+	// デッドロック対策
+	DisableUserOpe();
 	Sts = YES;
 	AskRemoteCurDir(CurDir, FMAX_PATH);
 	FileListBase = NULL;
@@ -1979,7 +1981,8 @@ void DeleteProc(void)
 
 	if(Sts == YES)
 	{
-		DisableUserOpe();
+		// デッドロック対策
+//		DisableUserOpe();
 
 		DelFlg = NO;
 		Sts = NO;
@@ -2015,8 +2018,11 @@ void DeleteProc(void)
 				GetRemoteDirForWnd(CACHE_REFRESH, &CancelFlg);
 		}
 
-		EnableUserOpe();
+		// デッドロック対策
+//		EnableUserOpe();
 	}
+	// デッドロック対策
+	EnableUserOpe();
 	return;
 }
 

--- a/getput.c
+++ b/getput.c
@@ -143,6 +143,9 @@ static int MoveToForeground = NO;		/* ウインドウを前面に移動するか
 static char CurDir[FMAX_PATH+1] = { "" };
 static char ErrMsg[ERR_MSG_LEN+7];
 
+// 同時接続対応
+static int WaitForMainThread = NO;
+
 /*===== 外部参照 =====*/
 
 /* 設定値 */
@@ -362,6 +365,7 @@ void AddTransFileList(TRANSPACKET *Pkt)
 //	WaitForSingleObject(hListAccMutex, INFINITE);
 	while(WaitForSingleObject(hListAccMutex, 0) == WAIT_TIMEOUT)
 	{
+		WaitForMainThread = YES;
 		BackgrndMessageProc();
 		Sleep(1);
 	}
@@ -379,6 +383,8 @@ void AddTransFileList(TRANSPACKET *Pkt)
 	if(NextTransPacketBase == NULL)
 		NextTransPacketBase = TransPacketBase;
 	ReleaseMutex(hListAccMutex);
+	// 同時接続対応
+	WaitForMainThread = NO;
 
 	return;
 }
@@ -405,6 +411,7 @@ void AppendTransFileList(TRANSPACKET *Pkt)
 //	WaitForSingleObject(hListAccMutex, INFINITE);
 	while(WaitForSingleObject(hListAccMutex, 0) == WAIT_TIMEOUT)
 	{
+		WaitForMainThread = YES;
 		BackgrndMessageProc();
 		Sleep(1);
 	}
@@ -436,6 +443,8 @@ void AppendTransFileList(TRANSPACKET *Pkt)
 	}
 
 	ReleaseMutex(hListAccMutex);
+	// 同時接続対応
+	WaitForMainThread = NO;
 	return;
 }
 
@@ -492,6 +501,7 @@ static void EraseTransFileList(void)
 //	WaitForSingleObject(hListAccMutex, INFINITE);
 	while(WaitForSingleObject(hListAccMutex, 0) == WAIT_TIMEOUT)
 	{
+		WaitForMainThread = YES;
 		BackgrndMessageProc();
 		Sleep(1);
 	}
@@ -525,6 +535,8 @@ static void EraseTransFileList(void)
 	TransFiles = 0;
 	PostMessage(GetMainHwnd(), WM_CHANGE_COND, 0, 0);
 	ReleaseMutex(hListAccMutex);
+	// 同時接続対応
+	WaitForMainThread = NO;
 
 	strcpy(Pkt.Cmd, "GOQUIT");
 	AddTransFileList(&Pkt);
@@ -649,6 +661,7 @@ static ULONG WINAPI TransferThread(void *Dummy)
 	CmdSkt = INVALID_SOCKET;
 	NewCmdSkt = INVALID_SOCKET;
 	TrnSkt = INVALID_SOCKET;
+	SetThreadPriority(GetCurrentThread(), THREAD_PRIORITY_LOWEST);
 
 	while((TransPacketBase != NULL) ||
 		  (WaitForSingleObject(hRunMutex, 200) == WAIT_TIMEOUT))
@@ -656,6 +669,13 @@ static ULONG WINAPI TransferThread(void *Dummy)
 		if(fTransferThreadExit == TRUE)
 			break;
 
+		if(WaitForMainThread == YES)
+		{
+			BackgrndMessageProc();
+			Sleep(100);
+			continue;
+		}
+
 //		WaitForSingleObject(hListAccMutex, INFINITE);
 		while(WaitForSingleObject(hListAccMutex, 0) == WAIT_TIMEOUT)
 		{
@@ -1089,7 +1109,8 @@ static ULONG WINAPI TransferThread(void *Dummy)
 				}
 			}
 			BackgrndMessageProc();
-			Sleep(1);
+//			Sleep(1);
+			Sleep(100);
 
 			if(GoExit == YES)
 			{
@@ -1116,7 +1137,10 @@ static ULONG WINAPI TransferThread(void *Dummy)
 				hWndTrans = NULL;
 			}
 			BackgrndMessageProc();
-			Sleep(1);
+			if(ThreadCount < AskMaxThreadCount())
+				Sleep(1);
+			else
+				Sleep(100);
 		}
 	}
 	if(TrnSkt != INVALID_SOCKET)

--- a/socket.c
+++ b/socket.c
@@ -484,8 +484,8 @@ static int RegistAsyncTable(SOCKET s)
 		{
 			// 強制的に閉じられたソケットがあると重複する可能性あり
 //			MessageBox(GetMainHwnd(), "Async socket already registerd.", "FFFTP inner error", MB_OK);
+//			break;
 			Signal[Pos].Socket = INVALID_SOCKET;
-			break;
 		}
 	}
 	// スレッド衝突のバグ修正