Commit: 37269d46eda5e8abda8a42ed8854e1f2dc968b7a - ffftp (git)

FFFTPのソースコードです。

Commit MetaInfo

• Revision: 37269d46eda5e8abda8a42ed8854e1f2dc968b7a (tree)
• Zeit: 2017-11-11 10:32:52
• Autor: t.masuda <masuda@moon...>
• Commiter: t.masuda

Log Message

FtpWndProc を仮呼び出し

Ändern Zusammenfassung

• modified: src/FFFTP2/FFFTP2.rc
• modified: src/FFFTP2/FFFTP2View.cpp
• modified: src/FFFTP2/FFFTP2View.h
• modified: src/FFFTP2/MainFrm.cpp
• modified: src/FFFTP2/MainFrm.h
• modified: src/FFFTP2/Resource.h
• modified: src/FFFTP2/common.h
• modified: src/FFFTP2/connect_w.c
• modified: src/FFFTP2/filelist_w.c
• modified: src/FFFTP2/getput_w.c
• modified: src/FFFTP2/main_w.c
• modified: src/FFFTP2/toolmenu_w.c

Diff

--- a/src/FFFTP2/FFFTP2.rc
+++ b/src/FFFTP2/FFFTP2.rc
@@ -469,12 +469,12 @@ FONT 9, "MS UI Gothic", 0, 0, 0x1
 BEGIN
     PUSHBUTTON      "上",IDC_BUTTON_LOCAL_UP,7,7,17,14,BS_BITMAP | BS_CENTER
     PUSHBUTTON      "開",IDC_BUTTON_LOCAL_OPEN,26,7,17,14,BS_BITMAP | BS_CENTER
-    CONTROL         "",IDC_COMBOBOX_LOCAL,"ComboBoxEx32",CBS_DROPDOWN | CBS_SORT | WS_VSCROLL | WS_TABSTOP,48,7,74,30
-    CONTROL         "",IDC_LIST_REMOTE,"SysListView32",LVS_REPORT | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP,130,32,115,129
+    CONTROL         "",IDC_LIST_REMOTE,"SysListView32",LVS_REPORT | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP,130,32,115,129,WS_EX_ACCEPTFILES
     PUSHBUTTON      "上",IDC_BUTTON_REMOTE_UP,128,7,17,14,BS_BITMAP
     PUSHBUTTON      "開",IDC_BUTTON_REMOTE_OPEN,151,7,17,14,BS_BITMAP
-    CONTROL         "",IDC_COMBOBOX_REMOTE,"ComboBoxEx32",CBS_DROPDOWN | CBS_SORT | WS_VSCROLL | WS_TABSTOP,171,7,74,30
-    CONTROL         "",IDC_LIST_LOCAL,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP,7,32,115,129
+    CONTROL         "",IDC_LIST_LOCAL,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP,7,32,115,129,WS_EX_ACCEPTFILES
+    COMBOBOX        IDC_COMBOBOX_LOCAL,49,7,72,30,CBS_DROPDOWN | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX        IDC_COMBOBOX_REMOTE,174,7,70,30,CBS_DROPDOWN | CBS_SORT | WS_VSCROLL | WS_TABSTOP
 END
 
 about_dlg DIALOGEX 0, 0, 319, 315

--- a/src/FFFTP2/FFFTP2View.cpp
+++ b/src/FFFTP2/FFFTP2View.cpp
@@ -14,6 +14,11 @@
 
 extern "C" {
 #include "common.h"
+
+void SetWndDirLocal(HWND hwnd);
+void SetWndDirRemote(HWND hwnd);
+void SetWndDirLocalEdit(HWND hwnd);
+void SetWndDirRemoteEdit(HWND hwnd);
 }
 
 #ifdef _DEBUG
@@ -85,6 +90,11 @@ void CFFFTP2View::OnInitialUpdate()
 	SetWndListRemote(m_lvRemote.GetSafeHwnd());
 	SetWndListLocal(m_lvLocal.GetSafeHwnd());
 
+	SetWndDirLocal(m_cbLocal.GetSafeHwnd());
+	SetWndDirRemote(m_cbRemote.GetSafeHwnd());
+	// SetWndDirLocalEdit(m_cbLocal.GetEditCtrl()->GetSafeHwnd());
+	// SetWndDirRemoteEdit(m_cbRemote.GetEditCtrl()->GetSafeHwnd());
+
 	m_imageList.Create(dirattr_bmp, 16, 5, RGB(255, 0, 0));
 	m_lvLocal.SetImageList(&m_imageList, LVSIL_SMALL);
 	m_lvRemote.SetImageList(&m_imageList, LVSIL_SMALL);
@@ -206,7 +216,7 @@ void CFFFTP2View::OnItemactivateListRemote(NMHDR *pNMHDR, LRESULT *pResult)
 void CFFFTP2View::OnDblclkListRemote(NMHDR *pNMHDR, LRESULT *pResult)
 {
 	LPNMITEMACTIVATE pNMItemActivate = reinterpret_cast<LPNMITEMACTIVATE>(pNMHDR);
-	DoubleClickProc(WIN_REMOTE, YES, -1);
+	DoubleClickProc(WIN_REMOTE, NO, -1);
 	*pResult = 0;
 }
 
@@ -230,7 +240,7 @@ void CFFFTP2View::OnItemactivateListLocal(NMHDR *pNMHDR, LRESULT *pResult)
 void CFFFTP2View::OnDblclkListLocal(NMHDR *pNMHDR, LRESULT *pResult)
 {
 	LPNMITEMACTIVATE pNMItemActivate = reinterpret_cast<LPNMITEMACTIVATE>(pNMHDR);
-	DoubleClickProc(WIN_LOCAL, YES, -1);
+	DoubleClickProc(WIN_LOCAL, NO, -1);
 	*pResult = 0;
 }
 

--- a/src/FFFTP2/FFFTP2View.h
+++ b/src/FFFTP2/FFFTP2View.h
@@ -51,11 +51,11 @@ protected:
 public:
 	CButton m_btnLocalUp;
 	CButton m_btnLocalOpen;
-	CComboBoxEx m_cbLocal;
+	CComboBox m_cbLocal;
 	CListCtrl m_lvLocal;
 	CButton m_btnRemoteUp;
 	CButton m_btnRemoteOpen;
-	CComboBoxEx m_cbRemote;
+	CComboBox m_cbRemote;
 	CListCtrl m_lvRemote;
 
 	CImageList m_imageList, m_imageBtn;

--- a/src/FFFTP2/MainFrm.cpp
+++ b/src/FFFTP2/MainFrm.cpp
@@ -12,6 +12,8 @@
 extern "C" {
 #include "common.h"
 #include "ui.h"
+
+extern int InitApp(LPSTR lpszCmdLine, int cmdShow);
 }
 
 #include "HostnameDlg.h"
@@ -37,7 +39,7 @@ BEGIN_MESSAGE_MAP(CMainFrame, CMDIFrameWndEx)
 	ON_COMMAND_RANGE(ID_VIEW_APPLOOK_WIN_2000, ID_VIEW_APPLOOK_WINDOWS_7, &CMainFrame::OnApplicationLook)
 	ON_UPDATE_COMMAND_UI_RANGE(ID_VIEW_APPLOOK_WIN_2000, ID_VIEW_APPLOOK_WINDOWS_7, &CMainFrame::OnUpdateApplicationLook)
 	ON_WM_SETTINGCHANGE()
-
+	ON_WM_COPYDATA()
 	// menu
 	ON_COMMAND(MENU_CONNECT, &CMainFrame::OnMenuConnect)
 	ON_COMMAND(MENU_QUICK, &CMainFrame::OnMenuQuick)
@@ -146,21 +148,28 @@ static UINT indicators[] =
 
 // CMainFrame コンストラクション/デストラクション
 
+static HWND _mainHwnd;
 
 void uiSetOutput(const char *fmt, va_list args)
 {
 	static char buf[10 * 1024 + 3];
 	vsprintf(buf, fmt, args);
-	auto frame = (CMainFrame*)AfxGetMainWnd();
-	TRACE1("%s\n", buf);
-	frame->SetOutput(buf);
+	COPYDATASTRUCT data;
+	data.dwData = 0;
+	data.cbData = 10 * 1024 + 3;
+	data.lpData = buf;
+	SendMessageA(_mainHwnd, WM_COPYDATA, (WPARAM)_mainHwnd, (LPARAM)&data);
+	// frame->SetOutput(buf);
 }
 void uiSetStatusBar(const char *fmt, va_list args) {
 
 	static char buf[1024 + 3];
 	vsprintf(buf, fmt, args);
-	auto frame = (CMainFrame*)AfxGetMainWnd();
-	frame->SetStatusBar(buf);
+	COPYDATASTRUCT data;
+	data.dwData = 1;
+	data.cbData = 10 * 1024 + 3;
+	data.lpData = buf;
+	SendMessageA(_mainHwnd, WM_COPYDATA, (WPARAM)_mainHwnd, (LPARAM)&data);
 }
 
 void CMainFrame::SetOutput(const char *s) { 
@@ -308,12 +317,57 @@ int CMainFrame::OnCreate(LPCREATESTRUCT lpCreateStruct)
 	OnApplicationLook(ID_VIEW_APPLOOK_VS_2008);
 	m_wndMenuBar.SetShowAllCommands(TRUE);
 
+	_mainHwnd = this->GetSafeHwnd();
+
+	// 初期化
+	InitApp("", 0);
 	// ソケットウィンドウを作成
 	int StsSocket = MakeSocketWin(m_hWnd, AfxGetInstanceHandle());
+	// 転送スレッドを起動
+	// FtpWndProc の設定
+	SetMainHwnd(this->GetSafeHwnd());
 	
 	return 0;
 }
 
+
+extern "C" LRESULT CALLBACK FtpWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam);
+
+
+LRESULT CMainFrame::WindowProc(UINT message, WPARAM wParam, LPARAM lParam)
+{
+	switch ( wParam)
+	{
+	default:
+		FtpWndProc(this->m_hWnd, message, wParam, lParam);
+		break;
+	}
+	return CMDIFrameWndEx::WindowProc(message, wParam, lParam);
+}
+
+BOOL CMainFrame::OnCopyData(CWnd *wnd, COPYDATASTRUCT *data)
+{
+	switch (data->dwData) {
+	case 0:
+	{
+		/// 出力メッセージ
+		auto frame = (CMainFrame*)AfxGetMainWnd();
+		frame->SetOutput((const char *)data->lpData);
+	}
+	break;
+	case 1:
+	{
+		/// ステータスバーへ表示
+		auto frame = (CMainFrame*)AfxGetMainWnd();
+		frame->SetStatusBar((const char *)data->lpData);
+	}
+	break;
+	}
+	return TRUE;
+}
+
+
+
 BOOL CMainFrame::PreCreateWindow(CREATESTRUCT& cs)
 {
 	if( !CMDIFrameWndEx::PreCreateWindow(cs) )
@@ -547,12 +601,14 @@ void CMainFrame::OnMenuConnect()
 /// クイック接続
 void CMainFrame::OnMenuQuick()
 {
+	/*
 	CHostnameDlg dlg;
 	if (dlg.DoModal() == IDOK) {
 		QuickConnectProc2((LPCSTR)dlg.Hostname, (LPCSTR)dlg.User, (LPCSTR)dlg.Pass);
 		int CancelFlg = 0;
 		GetRemoteDirForWnd(CACHE_NORMAL, &CancelFlg);
 	}
+	*/
 }
 /// 切断
 void CMainFrame::OnMenuDisconnect()

--- a/src/FFFTP2/MainFrm.h
+++ b/src/FFFTP2/MainFrm.h
@@ -141,6 +141,7 @@ protected:
 	afx_msg void OnUpdateMenuReport(CCmdUI *pCmdUI);
 	afx_msg void OnUpdateMenuSync(CCmdUI *pCmdUI);
 
+	afx_msg BOOL OnCopyData(CWnd*, COPYDATASTRUCT*);
 
 	DECLARE_MESSAGE_MAP()
 
@@ -148,6 +149,7 @@ protected:
 	void SetDockingWindowIcons(BOOL bHiColorIcons);
 
 	virtual void OnUpdateFrameTitle(BOOL bAddToTitle);
+	virtual LRESULT WindowProc(UINT message, WPARAM wParam, LPARAM lParam);
 
 protected:
 	// ツールバーのボタン制御

--- a/src/FFFTP2/Resource.h
+++ b/src/FFFTP2/Resource.h
@@ -504,6 +504,7 @@
 #define HOST_SET_DEFAULT                1350
 #define TRMODE_LISTERROR                1351
 #define MIRROR_NO_TRANSFER              1352
+#define IDC_COMBOBOX_R                  1354
 #define MENU_END                        40000
 #define MENU_EXIT                       40001
 #define MENU_CONNECT                    40002
@@ -708,9 +709,9 @@
 // 
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        214
+#define _APS_NEXT_RESOURCE_VALUE        215
 #define _APS_NEXT_COMMAND_VALUE         40198
-#define _APS_NEXT_CONTROL_VALUE         1353
+#define _APS_NEXT_CONTROL_VALUE         1355
 #define _APS_NEXT_SYMED_VALUE           101
 #endif
 #endif

--- a/src/FFFTP2/common.h
+++ b/src/FFFTP2/common.h
@@ -2047,7 +2047,7 @@ void SaveUpdateBellInfo(void);
 void ChangeDir(int Win, char *Path);
 void SetWndSocket(HWND h);
 void QuickConnectProc2(const char *Host, const char *User, const char *Pass);
-
+void SetMainHwnd(HWND);
 #ifndef SUCCESS
 #define SUCCESS 0
 #endif // !SUCCESS

--- a/src/FFFTP2/connect_w.c
+++ b/src/FFFTP2/connect_w.c
@@ -3404,6 +3404,7 @@ int AskMaxThreadCount(void)
 
 int AskReuseCmdSkt(void)
 {
+	// return YES; // by masuda
 	return(CurHost.ReuseCmdSkt);
 }
 

--- a/src/FFFTP2/filelist_w.c
+++ b/src/FFFTP2/filelist_w.c
@@ -164,11 +164,18 @@ extern int DispPermissionsNumber;
 
 static HWND hWndListLocal = NULL;
 static HWND hWndListRemote = NULL;
-void SetWndListLocal(HWND h) { hWndListLocal = h; }
-void SetWndListRemote(HWND h) { hWndListRemote = h; }
-
 static WNDPROC LocalProcPtr;
 static WNDPROC RemoteProcPtr;
+void SetWndListLocal(HWND h) {
+	hWndListLocal = h; 
+	LocalProcPtr = (WNDPROC)SetWindowLongPtr(h, GWLP_WNDPROC, (LONG_PTR)LocalWndProc);
+
+}
+void SetWndListRemote(HWND h) { 
+	hWndListRemote = h; 
+	RemoteProcPtr = (WNDPROC)SetWindowLongPtr(h, GWLP_WNDPROC, (LONG_PTR)RemoteWndProc);
+}
+
 
 static HIMAGELIST ListImg = NULL;
 void SetListImg(HIMAGELIST h) { ListImg = h; }

--- a/src/FFFTP2/getput_w.c
+++ b/src/FFFTP2/getput_w.c
@@ -724,7 +724,8 @@ void InitTransCurDir(void)
 *	Return Value
 *		なし
 *----------------------------------------------------------------------------*/
-
+// by masuda
+#if 0
 static ULONG WINAPI TransferThread(void *Dummy)
 {
 	TRANSPACKET *Pos;
@@ -755,7 +756,7 @@ static ULONG WINAPI TransferThread(void *Dummy)
 	ThreadCount = (int)Dummy;
 	TrnSkt = INVALID_SOCKET;
 	LastError = NO;
-	SetThreadPriority(GetCurrentThread(), THREAD_PRIORITY_LOWEST);
+	// SetThreadPriority(GetCurrentThread(), THREAD_PRIORITY_LOWEST);
 
 	while((TransPacketBase != NULL) ||
 		  (WaitForSingleObject(hRunMutex, 200) == WAIT_TIMEOUT))
@@ -1359,6 +1360,487 @@ static ULONG WINAPI TransferThread(void *Dummy)
 	}
 	return 0;
 }
+#else
+static ULONG WINAPI TransferThread(void *Dummy)
+{
+	TRANSPACKET *Pos;
+	HWND hWndTrans;
+	char Tmp[FMAX_PATH + 1];
+	int CwdSts;
+	int GoExit;
+	//	int Down;
+	//	int Up;
+	static int Down;
+	static int Up;
+	int DelNotify;
+	int ThreadCount;
+	SOCKET TrnSkt;
+	RECT WndRect;
+	int i;
+	DWORD LastUsed;
+	int LastError;
+	int Sts;
+
+	hWndTrans = NULL;
+	Down = NO;
+	Up = NO;
+	GoExit = NO;
+	DelNotify = NO;
+	// 同時接続対応
+	// ソケットは各転送スレッドが管理
+	ThreadCount = (int)Dummy;
+	TrnSkt = INVALID_SOCKET;
+	LastError = NO;
+	// SetThreadPriority(GetCurrentThread(), THREAD_PRIORITY_LOWEST);
+
+	while ((TransPacketBase != NULL) ||
+		(WaitForSingleObject(hRunMutex, 200) == WAIT_TIMEOUT))
+	{
+		if (fTransferThreadExit == TRUE)
+			break;
+
+		if (WaitForMainThread == YES)
+		{
+			Sleep(100);
+			continue;
+		}
+
+		WaitForSingleObject(hListAccMutex, INFINITE);
+		memset(GetErrMsg(), NUL, ERR_MSG_LEN + 7);
+		Canceled[ThreadCount] = NO;
+
+		while (TransPacketBase != NULL && strcmp(TransPacketBase->Cmd, "") == 0)
+		{
+			Pos = TransPacketBase;
+			TransPacketBase = TransPacketBase->Next;
+			free(Pos);
+			if (TransPacketBase == NULL)
+				GoExit = YES;
+		}
+		if (AskReuseCmdSkt() == YES && ThreadCount == 0)
+		{
+			TrnSkt = AskTrnCtrlSkt();
+			// セッションあたりの転送量制限対策
+			if (TrnSkt != INVALID_SOCKET && AskErrorReconnect() == YES && LastError == YES)
+			{
+				ReleaseMutex(hListAccMutex);
+				PostMessage(GetMainHwnd(), WM_RECONNECTSOCKET, 0, 0);
+				Sleep(100);
+				TrnSkt = INVALID_SOCKET;
+				WaitForSingleObject(hListAccMutex, INFINITE);
+			}
+		}
+		else
+		{
+			// セッションあたりの転送量制限対策
+			if (TrnSkt != INVALID_SOCKET && AskErrorReconnect() == YES && LastError == YES)
+			{
+				ReleaseMutex(hListAccMutex);
+				DoQUIT(TrnSkt, &Canceled[ThreadCount]);
+				DoClose(TrnSkt);
+				TrnSkt = INVALID_SOCKET;
+				WaitForSingleObject(hListAccMutex, INFINITE);
+			}
+			if (TransPacketBase && AskConnecting() == YES && ThreadCount < AskMaxThreadCount())
+			{
+				ReleaseMutex(hListAccMutex);
+				if (TrnSkt == INVALID_SOCKET)
+					ReConnectTrnSkt(&TrnSkt, &Canceled[ThreadCount]);
+				else
+					CheckClosedAndReconnectTrnSkt(&TrnSkt, &Canceled[ThreadCount]);
+				// 同時ログイン数制限対策
+				if (TrnSkt == INVALID_SOCKET)
+				{
+					// 同時ログイン数制限に引っかかった可能性あり
+					// 負荷を下げるために約10秒間待機
+					Sleep(10 * 1000);
+				}
+				LastUsed = timeGetTime();
+				WaitForSingleObject(hListAccMutex, INFINITE);
+			}
+			else
+			{
+				if (TrnSkt != INVALID_SOCKET)
+				{
+					// 同時ログイン数制限対策
+					// 60秒間使用されなければログアウト
+					if (timeGetTime() - LastUsed > 60000 || AskConnecting() == NO || ThreadCount >= AskMaxThreadCount())
+					{
+						ReleaseMutex(hListAccMutex);
+						DoQUIT(TrnSkt, &Canceled[ThreadCount]);
+						DoClose(TrnSkt);
+						TrnSkt = INVALID_SOCKET;
+						WaitForSingleObject(hListAccMutex, INFINITE);
+					}
+				}
+			}
+		}
+		LastError = NO;
+		if (TrnSkt != INVALID_SOCKET && NextTransPacketBase != NULL)
+		{
+			Pos = NextTransPacketBase;
+			NextTransPacketBase = NextTransPacketBase->Next;
+			// ディレクトリ操作は非同期で行わない
+			//			ReleaseMutex(hListAccMutex);
+			if (hWndTrans == NULL)
+			{
+				if ((strncmp(Pos->Cmd, "RETR", 4) == 0) ||
+					(strncmp(Pos->Cmd, "STOR", 4) == 0) ||
+					(strncmp(Pos->Cmd, "MKD", 3) == 0) ||
+					(strncmp(Pos->Cmd, "L-", 2) == 0) ||
+					(strncmp(Pos->Cmd, "R-", 2) == 0))
+				{
+					hWndTrans = CreateDialog(GetFtpInst(), MAKEINTRESOURCE(transfer_dlg), HWND_DESKTOP, (DLGPROC)TransDlgProc);
+					if (MoveToForeground == YES)
+						SetForegroundWindow(hWndTrans);
+					ShowWindow(hWndTrans, SW_SHOWNOACTIVATE);
+					GetWindowRect(hWndTrans, &WndRect);
+					SetWindowPos(hWndTrans, NULL, WndRect.left, WndRect.top + (WndRect.bottom - WndRect.top) * ThreadCount - (WndRect.bottom - WndRect.top) * (AskMaxThreadCount() - 1) / 2, 0, 0, SWP_NOSIZE | SWP_NOZORDER);
+				}
+			}
+			Pos->hWndTrans = hWndTrans;
+			Pos->ctrl_skt = TrnSkt;
+			Pos->Abort = ABORT_NONE;
+			Pos->ThreadCount = ThreadCount;
+
+			if (hWndTrans != NULL)
+			{
+				if (MoveToForeground == YES)
+				{
+					SetForegroundWindow(hWndTrans);
+					MoveToForeground = NO;
+				}
+			}
+
+			if (hWndTrans != NULL)
+				SendMessage(hWndTrans, WM_SET_PACKET, 0, (LPARAM)Pos);
+
+			// 中断後に受信バッファに応答が残っていると次のコマンドの応答が正しく処理できない
+			RemoveReceivedData(TrnSkt);
+
+			/* ダウンロード */
+			if (strncmp(Pos->Cmd, "RETR", 4) == 0)
+			{
+				// 一部TYPE、STOR(RETR)、PORT(PASV)を並列に処理できないホストがあるため
+				/* 不正なパスを検出 */
+				if (CheckPathViolation(Pos) == NO)
+				{
+					/* フルパスを使わないための処理 */
+					if (MakeNonFullPath(Pos, CurDir[Pos->ThreadCount], Tmp) == FFFTP_SUCCESS)
+					{
+						if (strncmp(Pos->Cmd, "RETR-S", 6) == 0)
+						{
+							/* サイズと日付を取得 */
+							DoSIZE(TrnSkt, Pos->RemoteFile, &Pos->Size, &Canceled[Pos->ThreadCount]);
+							DoMDTM(TrnSkt, Pos->RemoteFile, &Pos->Time, &Canceled[Pos->ThreadCount]);
+							strcpy(Pos->Cmd, "RETR ");
+						}
+
+						Down = YES;
+						// ミラーリング設定追加
+						if (Pos->NoTransfer == NO)
+						{
+							Sts = DoDownload(TrnSkt, Pos, NO, &Canceled[Pos->ThreadCount]) / 100;
+							if (Sts != FTP_COMPLETE)
+								LastError = YES;
+						}
+
+						// ミラーリング設定追加
+						if ((SaveTimeStamp == YES) &&
+							((Pos->Time.dwLowDateTime != 0) || (Pos->Time.dwHighDateTime != 0)))
+						{
+							SetDownloadedFileTime(Pos);
+						}
+					}
+				}
+				// 一部TYPE、STOR(RETR)、PORT(PASV)を並列に処理できないホストがあるため
+				ReleaseMutex(hListAccMutex);
+			}
+			/* アップロード */
+			else if (strncmp(Pos->Cmd, "STOR", 4) == 0)
+			{
+				// 一部TYPE、STOR(RETR)、PORT(PASV)を並列に処理できないホストがあるため
+				/* フルパスを使わないための処理 */
+				if (MakeNonFullPath(Pos, CurDir[Pos->ThreadCount], Tmp) == FFFTP_SUCCESS)
+				{
+					Up = YES;
+					// ミラーリング設定追加
+					if (Pos->NoTransfer == NO)
+					{
+						Sts = DoUpload(TrnSkt, Pos) / 100;
+						if (Sts != FTP_COMPLETE)
+							LastError = YES;
+					}
+
+					// ホスト側の日時設定
+					/* ファイルのタイムスタンプを合わせる */
+					if ((SaveTimeStamp == YES) &&
+						((Pos->Time.dwLowDateTime != 0) || (Pos->Time.dwHighDateTime != 0)))
+					{
+						DoMFMT(TrnSkt, Pos->RemoteFile, &Pos->Time, &Canceled[Pos->ThreadCount]);
+					}
+				}
+				// 一部TYPE、STOR(RETR)、PORT(PASV)を並列に処理できないホストがあるため
+				ReleaseMutex(hListAccMutex);
+			}
+			/* フォルダ作成（ローカルまたはホスト） */
+			else if (strncmp(Pos->Cmd, "MKD", 3) == 0)
+			{
+				DispTransFileInfo(Pos, MSGJPN078, FALSE, YES);
+
+				if (strlen(Pos->RemoteFile) > 0)
+				{
+					/* フルパスを使わないための処理 */
+					CwdSts = FTP_COMPLETE;
+					strcpy(Tmp, Pos->RemoteFile);
+					if (ProcForNonFullpath(TrnSkt, Tmp, CurDir[Pos->ThreadCount], hWndTrans, &Canceled[Pos->ThreadCount]) == FFFTP_FAIL)
+					{
+						ClearAll = YES;
+						CwdSts = FTP_ERROR;
+					}
+
+					if (CwdSts == FTP_COMPLETE)
+					{
+						Up = YES;
+						CommandProcTrn(TrnSkt, NULL, &Canceled[Pos->ThreadCount], "MKD %s", Tmp);
+						/* すでにフォルダがある場合もあるので、 */
+						/* ここではエラーチェックはしない */
+
+						if (FolderAttr)
+							CommandProcTrn(TrnSkt, NULL, &Canceled[Pos->ThreadCount], "%s %03d %s", AskHostChmodCmd(), FolderAttrNum, Tmp);
+					}
+				}
+				else if (strlen(Pos->LocalFile) > 0)
+				{
+					Down = YES;
+					DoLocalMKD(Pos->LocalFile);
+				}
+				ReleaseMutex(hListAccMutex);
+			}
+			/* ディレクトリ作成（常にホスト側） */
+			else if (strncmp(Pos->Cmd, "R-MKD", 5) == 0)
+			{
+				DispTransFileInfo(Pos, MSGJPN079, FALSE, YES);
+
+				/* フルパスを使わないための処理 */
+				if (MakeNonFullPath(Pos, CurDir[Pos->ThreadCount], Tmp) == FFFTP_SUCCESS)
+				{
+					Up = YES;
+					CommandProcTrn(TrnSkt, NULL, &Canceled[Pos->ThreadCount], "%s%s", Pos->Cmd + 2, Pos->RemoteFile);
+					if (FolderAttr)
+						CommandProcTrn(TrnSkt, NULL, &Canceled[Pos->ThreadCount], "%s %03d %s", AskHostChmodCmd(), FolderAttrNum, Pos->RemoteFile);
+				}
+				ReleaseMutex(hListAccMutex);
+			}
+			/* ディレクトリ削除（常にホスト側） */
+			else if (strncmp(Pos->Cmd, "R-RMD", 5) == 0)
+			{
+				DispTransFileInfo(Pos, MSGJPN080, FALSE, YES);
+				DelNotify = MirrorDelNotify(WIN_REMOTE, DelNotify, Pos);
+				if ((DelNotify == YES) || (DelNotify == YES_ALL))
+				{
+					/* フルパスを使わないための処理 */
+					if (MakeNonFullPath(Pos, CurDir[Pos->ThreadCount], Tmp) == FFFTP_SUCCESS)
+					{
+						Up = YES;
+						CommandProcTrn(TrnSkt, NULL, &Canceled[Pos->ThreadCount], "%s%s", Pos->Cmd + 2, Pos->RemoteFile);
+					}
+				}
+				ReleaseMutex(hListAccMutex);
+			}
+			/* ファイル削除（常にホスト側） */
+			else if (strncmp(Pos->Cmd, "R-DELE", 6) == 0)
+			{
+				DispTransFileInfo(Pos, MSGJPN081, FALSE, YES);
+				DelNotify = MirrorDelNotify(WIN_REMOTE, DelNotify, Pos);
+				if ((DelNotify == YES) || (DelNotify == YES_ALL))
+				{
+					/* フルパスを使わないための処理 */
+					if (MakeNonFullPath(Pos, CurDir[Pos->ThreadCount], Tmp) == FFFTP_SUCCESS)
+					{
+						Up = YES;
+						CommandProcTrn(TrnSkt, NULL, &Canceled[Pos->ThreadCount], "%s%s", Pos->Cmd + 2, Pos->RemoteFile);
+					}
+				}
+				ReleaseMutex(hListAccMutex);
+			}
+			/* ディレクトリ作成（常にローカル側） */
+			else if (strncmp(Pos->Cmd, "L-MKD", 5) == 0)
+			{
+				DispTransFileInfo(Pos, MSGJPN082, FALSE, YES);
+				Down = YES;
+				DoLocalMKD(Pos->LocalFile);
+				ReleaseMutex(hListAccMutex);
+			}
+			/* ディレクトリ削除（常にローカル側） */
+			else if (strncmp(Pos->Cmd, "L-RMD", 5) == 0)
+			{
+				DispTransFileInfo(Pos, MSGJPN083, FALSE, YES);
+				DelNotify = MirrorDelNotify(WIN_LOCAL, DelNotify, Pos);
+				if ((DelNotify == YES) || (DelNotify == YES_ALL))
+				{
+					Down = YES;
+					DoLocalRMD(Pos->LocalFile);
+				}
+				ReleaseMutex(hListAccMutex);
+			}
+			/* ファイル削除（常にローカル側） */
+			else if (strncmp(Pos->Cmd, "L-DELE", 6) == 0)
+			{
+				DispTransFileInfo(Pos, MSGJPN084, FALSE, YES);
+				DelNotify = MirrorDelNotify(WIN_LOCAL, DelNotify, Pos);
+				if ((DelNotify == YES) || (DelNotify == YES_ALL))
+				{
+					Down = YES;
+					DoLocalDELE(Pos->LocalFile);
+				}
+				ReleaseMutex(hListAccMutex);
+			}
+			/* カレントディレクトリを設定 */
+			else if (strcmp(Pos->Cmd, "SETCUR") == 0)
+			{
+				//				if(AskShareProh() == YES)
+				if (AskReuseCmdSkt() == NO || AskShareProh() == YES)
+				{
+					if (strcmp(CurDir[Pos->ThreadCount], Pos->RemoteFile) != 0)
+					{
+						if (CommandProcTrn(TrnSkt, NULL, &Canceled[Pos->ThreadCount], "CWD %s", Pos->RemoteFile) / 100 != FTP_COMPLETE)
+						{
+							DispCWDerror(hWndTrans);
+							ClearAll = YES;
+						}
+					}
+				}
+				strcpy(CurDir[Pos->ThreadCount], Pos->RemoteFile);
+				ReleaseMutex(hListAccMutex);
+			}
+			/* カレントディレクトリを戻す */
+			else if (strcmp(Pos->Cmd, "BACKCUR") == 0)
+			{
+				if (AskReuseCmdSkt() == YES && AskShareProh() == NO)
+				{
+					if (strcmp(CurDir[Pos->ThreadCount], Pos->RemoteFile) != 0)
+						CommandProcTrn(TrnSkt, NULL, &Canceled[Pos->ThreadCount], "CWD %s", Pos->RemoteFile);
+					strcpy(CurDir[Pos->ThreadCount], Pos->RemoteFile);
+				}
+				ReleaseMutex(hListAccMutex);
+			}
+			/* 自動終了のための通知 */
+			else if (strcmp(Pos->Cmd, "NULL") == 0)
+			{
+				Sleep(0);
+				Sleep(100);
+				ReleaseMutex(hListAccMutex);
+			}
+			else
+				ReleaseMutex(hListAccMutex);
+
+			/*===== １つの処理終わり =====*/
+
+			if (ForceAbort == NO)
+			{
+				WaitForSingleObject(hListAccMutex, INFINITE);
+				if (ClearAll == YES)
+					//					EraseTransFileList();
+				{
+					for (i = 0; i < MAX_DATA_CONNECTION; i++)
+						Canceled[i] = YES;
+					if (Pos != NULL)
+						strcpy(Pos->Cmd, "");
+					Pos = NULL;
+					EraseTransFileList();
+					GoExit = YES;
+				}
+				else
+				{
+					if ((strncmp(Pos->Cmd, "RETR", 4) == 0) ||
+						(strncmp(Pos->Cmd, "STOR", 4) == 0) ||
+						(strncmp(Pos->Cmd, "STOU", 4) == 0))
+					{
+						//						TransFiles--;
+						if (TransFiles > 0)
+							TransFiles--;
+						// タスクバー進捗表示
+						if (TransferSizeLeft > 0)
+							TransferSizeLeft -= Pos->Size;
+						if (TransferSizeLeft < 0)
+							TransferSizeLeft = 0;
+						if (TransFiles == 0)
+							TransferSizeTotal = 0;
+						PostMessage(GetMainHwnd(), WM_CHANGE_COND, 0, 0);
+					}
+				}
+				ReleaseMutex(hListAccMutex);
+			}
+			if (hWndTrans != NULL)
+				SendMessage(hWndTrans, WM_SET_PACKET, 0, 0);
+			if (Pos != NULL)
+				strcpy(Pos->Cmd, "");
+			LastUsed = timeGetTime();
+		}
+		//		else
+		else if (TransPacketBase == NULL)
+		{
+			ClearAll = NO;
+			DelNotify = NO;
+
+			if (GoExit == YES)
+			{
+				SoundPlay(SND_TRANS);
+				if (AskAutoExit() == NO)
+				{
+					if (Down == YES)
+						PostMessage(GetMainHwnd(), WM_REFRESH_LOCAL_FLG, 0, 0);
+					if (Up == YES)
+						PostMessage(GetMainHwnd(), WM_REFRESH_REMOTE_FLG, 0, 0);
+				}
+				Down = NO;
+				Up = NO;
+				PostMessage(GetMainHwnd(), WM_COMMAND, MAKEWPARAM(MENU_AUTO_EXIT, 0), 0);
+				GoExit = NO;
+			}
+
+			ReleaseMutex(hListAccMutex);
+			if (KeepDlg == NO)
+			{
+				if (hWndTrans != NULL)
+				{
+					DestroyWindow(hWndTrans);
+					hWndTrans = NULL;
+				}
+			}
+			Sleep(100);
+
+			// 再転送対応
+			TransferErrorMode = AskTransferErrorMode();
+			TransferErrorNotify = AskTransferErrorNotify();
+		}
+		else
+		{
+			ReleaseMutex(hListAccMutex);
+			if (hWndTrans != NULL)
+			{
+				DestroyWindow(hWndTrans);
+				hWndTrans = NULL;
+			}
+			if (ThreadCount < AskMaxThreadCount())
+				Sleep(1);
+			else
+				Sleep(100);
+		}
+	}
+	if (AskReuseCmdSkt() == NO || ThreadCount > 0)
+	{
+		if (TrnSkt != INVALID_SOCKET)
+		{
+			SendData(TrnSkt, "QUIT\r\n", 6, 0, &Canceled[ThreadCount]);
+			DoClose(TrnSkt);
+		}
+	}
+	return 0;
+}
+
+#endif
 
 
 /*----- フルパスを使わないファイルアクセスの準備 ------------------------------

--- a/src/FFFTP2/main_w.c
+++ b/src/FFFTP2/main_w.c
@@ -76,10 +76,10 @@
 
 /*===== プロトタイプ =====*/
 
-static int InitApp(LPSTR lpszCmdLine, int cmdShow);
+int InitApp(LPSTR lpszCmdLine, int cmdShow);
 static int MakeAllWindows(int cmdShow);
 static void DeleteAllObject(void);
-static LRESULT CALLBACK FtpWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam);
+LRESULT CALLBACK FtpWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam);
 static void StartupProc(char *Cmd);
 static int AnalyzeComLine(char *Str, int *AutoConnect, int *CmdOption, char *unc, int Max);
 static int CheckIniFileName(char *Str, char *Ini);
@@ -568,7 +568,7 @@ int PASCAL _WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpszCmdL
 *			FFFTP_SUCCESS/FFFTP_FAIL
 *----------------------------------------------------------------------------*/
 
-static int InitApp(LPSTR lpszCmdLine, int cmdShow)
+int InitApp(LPSTR lpszCmdLine, int cmdShow)
 {
 	int sts;
 	int Err;
@@ -749,7 +749,8 @@ static int InitApp(LPSTR lpszCmdLine, int cmdShow)
 
 			CountPrevFfftpWindows();
 
-			if(MakeAllWindows(cmdShow) == FFFTP_SUCCESS)
+			// by masuda
+			// if(MakeAllWindows(cmdShow) == FFFTP_SUCCESS)
 			{
 				hWndCurFocus = GetLocalHwnd();
 
@@ -1056,6 +1057,9 @@ HWND GetMainHwnd(void)
 {
 	return(hWndFtp);
 }
+void SetMainHwnd(HWND hwnd) {
+	hWndFtp = hwnd;
+}
 
 
 /*----- 現在フォーカスがあるウインドウのウインドウハンドルを返す --------------
@@ -1115,8 +1119,8 @@ HINSTANCE GetFtpInst(void)
 *	Return Value
 *		メッセージに対応する戻り値
 *----------------------------------------------------------------------------*/
-
-static LRESULT CALLBACK FtpWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
+#define DefWindowProc 
+LRESULT CALLBACK FtpWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
 {
 	PAINTSTRUCT ps;
 	LPTOOLTIPTEXT lpttt;
@@ -2132,6 +2136,7 @@ static LRESULT CALLBACK FtpWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARA
 	}
 	return(0L);
 }
+#define DefWindowProc DefWindowProcM
 
 
 /*----- プログラム開始時の処理 ------------------------------------------------

--- a/src/FFFTP2/toolmenu_w.c
+++ b/src/FFFTP2/toolmenu_w.c
@@ -86,6 +86,12 @@ static HWND hWndDirLocal = NULL;
 static HWND hWndDirRemote = NULL;
 static HWND hWndDirLocalEdit = NULL;
 static HWND hWndDirRemoteEdit = NULL;
+// by masuda
+void SetWndDirLocal(HWND hwnd) { hWndDirLocal = hwnd; }
+void SetWndDirRemote(HWND hwnd) { hWndDirRemote = hwnd; }
+void SetWndDirLocalEdit(HWND hwnd) { hWndDirLocalEdit = hwnd; }
+void SetWndDirRemoteEdit(HWND hwnd) { hWndDirRemoteEdit = hwnd; }
+
 
 static WNDPROC HistEditBoxProcPtr;