提交: dde921b07347803f285758b271dacfa456c4149a - Osdn (git)

Loweynet

Commit MetaInfo

• 修訂: dde921b07347803f285758b271dacfa456c4149a (tree)
• 時間: 2017-10-28 21:08:11
• 作者: s_kawamoto <s_kawamoto@user...>
• Commiter: s_kawamoto

Log Message

Fix bugs of transfer routine.
Add codes for exporting host settings to WinSCP.

Change Summary

• modified: FFFTP_Eng_Release/FFFTP.exe
• modified: FFFTP_Eng_Release_64/FFFTP.exe
• add: Package/make_update.bat
• modified: Release/FFFTP.exe
• modified: Release_64/FFFTP.exe
• modified: common.h
• modified: connect.c
• modified: ftpproc.c
• modified: getput.c
• modified: main.c
• modified: mesg-eng.h
• modified: mesg-jpn.h
• modified: registry.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

--- /dev/null
+++ b/Package/make_update.bat
@@ -0,0 +1,88 @@
+REM;
+REM;  This is batch-file to prepare for creating FFFTP update.
+REM;  Please run in "ffftp\Package" directory.
+REM; 
+
+call installer_config.bat
+
+set PRIVATE_KEY=private.pem
+set /p PRIVATE_KEY_PW=Password:
+set PREFIX_JPN=update.jpn.file.
+set PREFIX_ENG=update.eng.file.
+set PREFIX_AMD64_JPN=update.amd64.jpn.file.
+set PREFIX_AMD64_ENG=update.amd64.eng.file.
+set DESC_JPN="“]‘—Ž¸”sŽž‚ɍĐڑ±‚Å‚«‚È‚¢ê‡‚ª‚ ‚éƒoƒO‚ðC³‚µ‚Ü‚µ‚½B\nØ’fŽž‚Ƀtƒ@ƒCƒ‹‚Ì“]‘—‘Ò‚¿‚ª‰ðœ‚³‚ê‚È‚¢ƒoƒO‚ðC³‚µ‚Ü‚µ‚½B\n“]‘—’†‚Ì‹­§I—¹‚ª‹@”\‚µ‚È‚¢ê‡‚ª‚ ‚éƒoƒO‚ðC³‚µ‚Ü‚µ‚½B\n“]‘—’†‚Ì‹­§I—¹‚ª‹@”\‚µ‚È‚¢ê‡‚ª‚ ‚éƒoƒO‚ðC³‚µ‚Ü‚µ‚½B\nŽóM’†Ž~‚ðƒNƒŠƒbƒN‚µ‚½Œã‚Ì‹““®‚ª‚¨‚©‚µ‚­‚È‚éƒoƒO‚ðC³‚µ‚Ü‚µ‚½B"
+set DESC_ENG="Fixed bugs that sometimes it cannot reconnect after transfer failure.\nFixed bugs that the queue of file transfer is not released on disconnection.\nFixed bugs that sometimes Force Exit does not work while transfer.\nFixed bugs that the behavior is strange after clicking Stop button."
+set DESC_AMD64_JPN=%DESC_JPN%
+set DESC_AMD64_ENG=%DESC_ENG%
+
+set DIR_UPDATE=update
+set DIR_ZIP_JPN=%DIR_UPDATE%\jpn\file
+set DIR_ZIP_ENG=%DIR_UPDATE%\eng\file
+set AMD64_DIR_ZIP_JPN=%DIR_UPDATE%\amd64\jpn\file
+set AMD64_DIR_ZIP_ENG=%DIR_UPDATE%\amd64\eng\file
+
+REM;  copy Japanese files
+mkdir %DIR_ZIP_JPN%
+copy /Y %BIN_JPN% %DIR_ZIP_JPN%
+copy /Y %HTMLHELP% %DIR_ZIP_JPN%
+copy /Y %DIR_JPN_DOC%\*.txt %DIR_ZIP_JPN%
+copy /Y %DIR_DIST%\*.dll %DIR_ZIP_JPN%
+copy /Y %DIR_DIST%\*.manifest %DIR_ZIP_JPN%
+copy /Y %DIR_DIST%\*.pem %DIR_ZIP_JPN%
+
+REM;  copy English files
+mkdir %DIR_ZIP_ENG%
+copy /Y %BIN_ENG% %DIR_ZIP_ENG%
+copy /Y %DIR_ENG_DOC%\*.txt %DIR_ZIP_ENG%
+copy /Y %DIR_DIST%\*.dll %DIR_ZIP_ENG%
+copy /Y %DIR_DIST%\*.manifest %DIR_ZIP_ENG%
+copy /Y %DIR_DIST%\*.pem %DIR_ZIP_ENG%
+
+REM;  copy Japanese files
+mkdir %AMD64_DIR_ZIP_JPN%
+copy /Y %BIN_AMD64_JPN% %AMD64_DIR_ZIP_JPN%
+copy /Y %HTMLHELP% %AMD64_DIR_ZIP_JPN%
+copy /Y %DIR_JPN_DOC%\*.txt %AMD64_DIR_ZIP_JPN%
+copy /Y %DIR_DIST%\amd64\*.dll %AMD64_DIR_ZIP_JPN%
+copy /Y %DIR_DIST%\amd64\*.manifest %AMD64_DIR_ZIP_JPN%
+copy /Y %DIR_DIST%\*.pem %AMD64_DIR_ZIP_JPN%
+
+REM;  copy English files
+mkdir %AMD64_DIR_ZIP_ENG%
+copy /Y %BIN_AMD64_ENG% %AMD64_DIR_ZIP_ENG%
+copy /Y %DIR_ENG_DOC%\*.txt %AMD64_DIR_ZIP_ENG%
+copy /Y %DIR_DIST%\amd64\*.dll %AMD64_DIR_ZIP_ENG%
+copy /Y %DIR_DIST%\amd64\*.manifest %AMD64_DIR_ZIP_ENG%
+copy /Y %DIR_DIST%\*.pem %AMD64_DIR_ZIP_ENG%
+
+"%cd%\%DIR_ZIP_JPN%\FFFTP.exe" --build-software-update "%cd%\%PRIVATE_KEY%" "%PRIVATE_KEY_PW%" "/dl/ffftp/%PREFIX_JPN%" "%cd%\%DIR_UPDATE%\update.jpn.hash" "%cd%\%DIR_UPDATE%\update.jpn.list" %DESC_JPN%
+"%cd%\%DIR_ZIP_ENG%\FFFTP.exe" --build-software-update "%cd%\%PRIVATE_KEY%" "%PRIVATE_KEY_PW%" "/dl/ffftp/%PREFIX_ENG%" "%cd%\%DIR_UPDATE%\update.eng.hash" "%cd%\%DIR_UPDATE%\update.eng.list" %DESC_ENG%
+"%cd%\%AMD64_DIR_ZIP_JPN%\FFFTP.exe" --build-software-update "%cd%\%PRIVATE_KEY%" "%PRIVATE_KEY_PW%" "/dl/ffftp/%PREFIX_AMD64_JPN%" "%cd%\%DIR_UPDATE%\update.amd64.jpn.hash" "%cd%\%DIR_UPDATE%\update.amd64.jpn.list" %DESC_AMD64_JPN%
+"%cd%\%AMD64_DIR_ZIP_ENG%\FFFTP.exe" --build-software-update "%cd%\%PRIVATE_KEY%" "%PRIVATE_KEY_PW%" "/dl/ffftp/%PREFIX_AMD64_ENG%" "%cd%\%DIR_UPDATE%\update.amd64.eng.hash" "%cd%\%DIR_UPDATE%\update.amd64.eng.list" %DESC_AMD64_ENG%
+
+pushd %DIR_ZIP_JPN%
+for %%i in (*) do ren %%i %PREFIX_JPN%%%i
+popd
+pushd %DIR_ZIP_ENG%
+for %%i in (*) do ren %%i %PREFIX_ENG%%%i
+popd
+pushd %AMD64_DIR_ZIP_JPN%
+for %%i in (*) do ren %%i %PREFIX_AMD64_JPN%%%i
+popd
+pushd %AMD64_DIR_ZIP_ENG%
+for %%i in (*) do ren %%i %PREFIX_AMD64_ENG%%%i
+popd
+
+pushd %DIR_UPDATE%
+for /d %%i in (*) do call :sub0 "%%~i"
+popd
+exit /b
+:sub0
+pushd "%~1"
+for /d %%i in (*) do call :sub0 "%%~i"
+for %%i in (*) do move "%%~i" "..\%%~i"
+popd
+rd "%~1"
+exit /b
+

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/common.h
+++ b/common.h
@@ -72,16 +72,16 @@
 //#define PROGRAM_VERSION_NUM		1972		/* バージョン */
 // 64ビット対応
 #ifdef _WIN64
-#define VER_STR					"1.99a-20170924 64bit"
+#define VER_STR					"1.99a-20171028 64bit"
 #else
-#define VER_STR					"1.99a-20170924"
+#define VER_STR					"1.99a-20171028"
 #endif
 #define VER_NUM					1990		/* 設定バージョン */
 #define PROGRAM_VERSION_NUM		1990		/* バージョン */
 // ソフトウェア自動更新
 // リリースバージョンはリリース予定年（10進数4桁）+月（2桁）+日（2桁）+通し番号（0スタート2桁）とする
 // 2014年7月31日中の30個目のリリースは2014073129
-#define RELEASE_VERSION_NUM		2017092400	/* リリースバージョン */
+#define RELEASE_VERSION_NUM		2017102800	/* リリースバージョン */
 
 
 // SourceForge.JPによるフォーク
@@ -121,6 +121,9 @@
 #define WM_ADDPORTMAPPING	(WM_USER+9)
 #define WM_REMOVEPORTMAPPING	(WM_USER+10)
 
+// 同時接続対応
+#define WM_RECONNECTSOCKET	(WM_USER+11)
+
 /*===== ホスト番号 =====*/
 /* ホスト番号は 0～ の値を取る */
 
@@ -1698,6 +1701,7 @@ void ReformVMSDirName(char *DirName, int Flg);
 void NoopProc(int Force);
 // 同時接続対応
 void AbortRecoveryProc(void);
+void ReconnectProc(void);
 
 /*===== local.c =====*/
 
@@ -1759,6 +1763,8 @@ int ChangeFnameLocal2Remote(char *Fname, int Max);
 
 int MakeTransferThread(void);
 void CloseTransferThread(void);
+// 同時接続対応
+void AbortAllTransfer();
 int AddTmpTransFileList(TRANSPACKET *Pkt, TRANSPACKET **Base);
 void EraseTmpTransFileList(TRANSPACKET **Base);
 int RemoveTmpTransFileListItem(TRANSPACKET **Base, int Num);
@@ -1865,6 +1871,8 @@ int IsIniAvailable();
 int ReadSettingsVersion();
 // FileZilla XML形式エクスポート対応
 void SaveSettingsToFileZillaXml();
+// WinSCP INI形式エクスポート対応
+void SaveSettingsToWinSCPIni();
 
 /*===== lvtips.c =====*/
 

--- a/connect.c
+++ b/connect.c
@@ -1208,10 +1208,17 @@ int ReConnectCmdSkt(void)
 //	if(CmdCtrlSocket != TrnCtrlSocket)
 //		do_closesocket(TrnCtrlSocket);
 //	TrnCtrlSocket = INVALID_SOCKET;
-	if(CmdCtrlSocket == TrnCtrlSocket)
-		TrnCtrlSocket = INVALID_SOCKET;
 
-	Sts = ReConnectSkt(&CmdCtrlSocket);
+	// 同時接続対応
+//	Sts = ReConnectSkt(&CmdCtrlSocket);
+	if(AskShareProh() == YES && AskTransferNow() == YES)
+		SktShareProh();
+	else
+	{
+		if(CmdCtrlSocket == TrnCtrlSocket)
+			TrnCtrlSocket = INVALID_SOCKET;
+		Sts = ReConnectSkt(&CmdCtrlSocket);
+	}
 
 	// 同時接続対応
 //	TrnCtrlSocket = CmdCtrlSocket;
@@ -1427,6 +1434,9 @@ void DisconnectProc(void)
 
 //SetTaskMsg("############### Disconnect Cmd=%x, Trn=%x", CmdCtrlSocket,TrnCtrlSocket);
 
+	// 同時接続対応
+	AbortAllTransfer();
+
 	if((CmdCtrlSocket != INVALID_SOCKET) && (CmdCtrlSocket != TrnCtrlSocket))
 	{
 		// 同時接続対応

--- a/ftpproc.c
+++ b/ftpproc.c
@@ -3882,9 +3882,9 @@ void NoopProc(int Force)
 // 同時接続対応
 void AbortRecoveryProc(void)
 {
-	CancelFlg = NO;
 	if(AskConnecting() == YES && AskUserOpeDisabled() == NO)
 	{
+		CancelFlg = NO;
 		if(AskReuseCmdSkt() == NO || AskShareProh() == YES || AskTransferNow() == NO)
 		{
 			if(AskErrorReconnect() == YES)
@@ -3901,3 +3901,16 @@ void AbortRecoveryProc(void)
 	return;
 }
 
+void ReconnectProc(void)
+{
+	if(AskConnecting() == YES && AskUserOpeDisabled() == NO)
+	{
+		CancelFlg = NO;
+		DisableUserOpe();
+		ReConnectCmdSkt();
+		GetRemoteDirForWnd(CACHE_REFRESH, &CancelFlg);
+		EnableUserOpe();
+	}
+	return;
+}
+

--- a/getput.c
+++ b/getput.c
@@ -249,7 +249,8 @@ void CloseTransferThread(void)
 	for(i = 0; i < MAX_DATA_CONNECTION; i++)
 		Canceled[i] = YES;
 	ClearAll = YES;
-	ForceAbort = YES;
+	// 同時接続対応
+//	ForceAbort = YES;
 
 	fTransferThreadExit = TRUE;
 	// 同時接続対応
@@ -279,6 +280,22 @@ void CloseTransferThread(void)
 }
 
 
+// 同時接続対応
+void AbortAllTransfer()
+{
+	int i;
+	while(TransPacketBase != NULL)
+	{
+		for(i = 0; i < MAX_DATA_CONNECTION; i++)
+			Canceled[i] = YES;
+		ClearAll = YES;
+		if(BackgrndMessageProc() == YES)
+			break;
+		Sleep(10);
+	}
+	ClearAll = NO;
+}
+
 /*----- 転送するファイル情報をリストに追加する --------------------------------
 *
 *	Parameter
@@ -721,8 +738,6 @@ static ULONG WINAPI TransferThread(void *Dummy)
 	static int Up;
 	int DelNotify;
 	int ThreadCount;
-	SOCKET CmdSkt;
-	SOCKET NewCmdSkt;
 	SOCKET TrnSkt;
 	RECT WndRect;
 	int i;
@@ -738,8 +753,6 @@ static ULONG WINAPI TransferThread(void *Dummy)
 	// 同時接続対応
 	// ソケットは各転送スレッドが管理
 	ThreadCount = (int)Dummy;
-	CmdSkt = INVALID_SOCKET;
-	NewCmdSkt = INVALID_SOCKET;
 	TrnSkt = INVALID_SOCKET;
 	LastError = NO;
 	SetThreadPriority(GetCurrentThread(), THREAD_PRIORITY_LOWEST);
@@ -777,16 +790,29 @@ static ULONG WINAPI TransferThread(void *Dummy)
 			if(TransPacketBase == NULL)
 				GoExit = YES;
 		}
-		NewCmdSkt = AskCmdCtrlSkt();
 		if(AskReuseCmdSkt() == YES && ThreadCount == 0)
 		{
 			if(TransPacketBase && ThreadCount < AskMaxThreadCount())
 				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);
+				while(WaitForSingleObject(hListAccMutex, 0) == WAIT_TIMEOUT)
+				{
+					BackgrndMessageProc();
+					Sleep(1);
+				}
+			}
 		}
 		else
 		{
 			// セッションあたりの転送量制限対策
-			if(AskErrorReconnect() == YES && LastError == YES)
+			if(TrnSkt != INVALID_SOCKET && AskErrorReconnect() == YES && LastError == YES)
 			{
 				ReleaseMutex(hListAccMutex);
 				DoQUIT(TrnSkt, &Canceled[ThreadCount]);
@@ -799,10 +825,10 @@ static ULONG WINAPI TransferThread(void *Dummy)
 					Sleep(1);
 				}
 			}
-			if(TransPacketBase && NewCmdSkt != INVALID_SOCKET && ThreadCount < AskMaxThreadCount())
+			if(TransPacketBase && AskConnecting() == YES && ThreadCount < AskMaxThreadCount())
 			{
 				ReleaseMutex(hListAccMutex);
-				if(TrnSkt == INVALID_SOCKET || NewCmdSkt != CmdSkt)
+				if(TrnSkt == INVALID_SOCKET)
 					ReConnectTrnSkt(&TrnSkt, &Canceled[ThreadCount]);
 				else
 					CheckClosedAndReconnectTrnSkt(&TrnSkt, &Canceled[ThreadCount]);
@@ -812,7 +838,7 @@ static ULONG WINAPI TransferThread(void *Dummy)
 					// 同時ログイン数制限に引っかかった可能性あり
 					// 負荷を下げるために約10秒間待機
 					i = 1000;
-					while(NewCmdSkt != CmdSkt && i > 0)
+					while(i > 0)
 					{
 						BackgrndMessageProc();
 						Sleep(10);
@@ -833,7 +859,7 @@ static ULONG WINAPI TransferThread(void *Dummy)
 				{
 					// 同時ログイン数制限対策
 					// 60秒間使用されなければログアウト
-					if(timeGetTime() - LastUsed > 60000 || NewCmdSkt == INVALID_SOCKET)
+					if(timeGetTime() - LastUsed > 60000 || AskConnecting() == NO)
 					{
 						ReleaseMutex(hListAccMutex);
 						DoQUIT(TrnSkt, &Canceled[ThreadCount]);
@@ -849,7 +875,6 @@ static ULONG WINAPI TransferThread(void *Dummy)
 				}
 			}
 		}
-		CmdSkt = NewCmdSkt;
 		LastError = NO;
 //		if(TransPacketBase != NULL)
 		if(TrnSkt != INVALID_SOCKET && NextTransPacketBase != NULL)

--- a/main.c
+++ b/main.c
@@ -2087,6 +2087,11 @@ static LRESULT CALLBACK FtpWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARA
 			SetEvent(((REMOVEPORTMAPPINGDATA*)lParam)->h);
 			break;
 
+		// 同時接続対応
+		case WM_RECONNECTSOCKET :
+			ReconnectProc();
+			break;
+
 		case WM_PAINT :
 			BeginPaint(hWnd, (LPPAINTSTRUCT) &ps);
 			EndPaint(hWnd, (LPPAINTSTRUCT) &ps);

--- a/mesg-eng.h
+++ b/mesg-eng.h
@@ -363,6 +363,7 @@
 #define MSGJPN362		_Tu8("Failed to update the software.\nCannot connect to the server or the data is corrupted.", "Failed to update the software.\nCannot connect to the server or the data is corrupted.")
 #define MSGJPN363		_Tu8("Your version is already up-to-date.", "Your version is already up-to-date.")
 #define MSGJPN364		_Tu8("Preparing for the software update has been completed.\nIt will be applied on exit.", "Preparing for the software update has been completed.\nIt will be applied on exit.")
+#define MSGJPN365		_Tu8("The all settings will be lost after loading an INI file newly created with this feature into WinSCP.\nPlease choose an existing WinSCP.ini if you already use WinSCP and want to migrate hosts settings only.", "The all settings will be lost after loading an INI file newly created with this feature into WinSCP.\nPlease choose an existing WinSCP.ini if you already use WinSCP and want to migrate hosts settings only.")
 #if defined(HAVE_TANDEM)
 #define MSGJPN2000		_Tu8("NonStop Server", "NonStop Server")
 #define MSGJPN2001		_Tu8("OSS<->GUARDIAN Switch(&O)", "OSS<->GUARDIAN Switch(&O)")

--- a/mesg-jpn.h
+++ b/mesg-jpn.h
@@ -363,6 +363,7 @@
 #define MSGJPN362		_Tu8("ソフトウェアの更新に失敗しました.\nサーバーに接続できないかデータが破損しています.", "\xE3\x82\xBD\xE3\x83\x95\xE3\x83\x88\xE3\x82\xA6\xE3\x82\xA7\xE3\x82\xA2\xE3\x81\xAE\xE6\x9B\xB4\xE6\x96\xB0\xE3\x81\xAB\xE5\xA4\xB1\xE6\x95\x97\xE3\x81\x97\xE3\x81\xBE\xE3\x81\x97\xE3\x81\x9F.\n\xE3\x82\xB5\xE3\x83\xBC\xE3\x83\x90\xE3\x83\xBC\xE3\x81\xAB\xE6\x8E\xA5\xE7\xB6\x9A\xE3\x81\xA7\xE3\x81\x8D\xE3\x81\xAA\xE3\x81\x84\xE3\x81\x8B\xE3\x83\x87\xE3\x83\xBC\xE3\x82\xBF\xE3\x81\x8C\xE7\xA0\xB4\xE6\x90\x8D\xE3\x81\x97\xE3\x81\xA6\xE3\x81\x84\xE3\x81\xBE\xE3\x81\x99.")
 #define MSGJPN363		_Tu8("お使いのバージョンはすでに最新です.", "\xE3\x81\x8A\xE4\xBD\xBF\xE3\x81\x84\xE3\x81\xAE\xE3\x83\x90\xE3\x83\xBC\xE3\x82\xB8\xE3\x83\xA7\xE3\x83\xB3\xE3\x81\xAF\xE3\x81\x99\xE3\x81\xA7\xE3\x81\xAB\xE6\x9C\x80\xE6\x96\xB0\xE3\x81\xA7\xE3\x81\x99.")
 #define MSGJPN364		_Tu8("ソフトウェアの更新の準備が完了しました.\nFFFTPの終了時に更新が適用されます.", "\xE3\x82\xBD\xE3\x83\x95\xE3\x83\x88\xE3\x82\xA6\xE3\x82\xA7\xE3\x82\xA2\xE3\x81\xAE\xE6\x9B\xB4\xE6\x96\xB0\xE3\x81\xAE\xE6\xBA\x96\xE5\x82\x99\xE3\x81\x8C\xE5\xAE\x8C\xE4\xBA\x86\xE3\x81\x97\xE3\x81\xBE\xE3\x81\x97\xE3\x81\x9F.\nFFFTP\xE3\x81\xAE\xE7\xB5\x82\xE4\xBA\x86\xE6\x99\x82\xE3\x81\xAB\xE6\x9B\xB4\xE6\x96\xB0\xE3\x81\x8C\xE9\x81\xA9\xE7\x94\xA8\xE3\x81\x95\xE3\x82\x8C\xE3\x81\xBE\xE3\x81\x99.")
+#define MSGJPN365		_Tu8("この機能で新規作成したINIファイルをWinSCPで読み込むと全ての設定が失われます.\nすでにWinSCPをお使いでありホストの設定のみ移行したい場合は既存のWinSCP.iniを選択してください.", "\xE3\x81\x93\xE3\x81\xAE\xE6\xA9\x9F\xE8\x83\xBD\xE3\x81\xA7\xE6\x96\xB0\xE8\xA6\x8F\xE4\xBD\x9C\xE6\x88\x90\xE3\x81\x97\xE3\x81\x9FINI\xE3\x83\x95\xE3\x82\xA1\xE3\x82\xA4\xE3\x83\xAB\xE3\x82\x92WinSCP\xE3\x81\xA7\xE8\xAA\xAD\xE3\x81\xBF\xE8\xBE\xBC\xE3\x82\x80\xE3\x81\xA8\xE5\x85\xA8\xE3\x81\xA6\xE3\x81\xAE\xE8\xA8\xAD\xE5\xAE\x9A\xE3\x81\x8C\xE5\xA4\xB1\xE3\x82\x8F\xE3\x82\x8C\xE3\x81\xBE\xE3\x81\x99.\n\xE3\x81\x99\xE3\x81\xA7\xE3\x81\xABWinSCP\xE3\x82\x92\xE3\x81\x8A\xE4\xBD\xBF\xE3\x81\x84\xE3\x81\xA7\xE3\x81\x82\xE3\x82\x8A\xE3\x83\x9B\xE3\x82\xB9\xE3\x83\x88\xE3\x81\xAE\xE8\xA8\xAD\xE5\xAE\x9A\xE3\x81\xAE\xE3\x81\xBF\xE7\xA7\xBB\xE8\xA1\x8C\xE3\x81\x97\xE3\x81\x9F\xE3\x81\x84\xE5\xA0\xB4\xE5\x90\x88\xE3\x81\xAF\xE6\x97\xA2\xE5\xAD\x98\xE3\x81\xAEWinSCP.ini\xE3\x82\x92\xE9\x81\xB8\xE6\x8A\x9E\xE3\x81\x97\xE3\x81\xA6\xE3\x81\x8F\xE3\x81\xA0\xE3\x81\x95\xE3\x81\x84.")
 #if defined(HAVE_TANDEM)
 #define MSGJPN2000		_Tu8("NonStop Server", "NonStop Server")
 #define MSGJPN2001		_Tu8("OSS<->GUARDIAN 切り替え(&O)", "OSS<->GUARDIAN \xE5\x88\x87\xE3\x82\x8A\xE6\x9B\xBF\xE3\x81\x88(&O)")

--- a/registry.c
+++ b/registry.c
@@ -4032,3 +4032,283 @@ void SaveSettingsToFileZillaXml()
 	}
 }
 
+// WinSCP INI形式エクスポート対応
+void WriteWinSCPString(FILE* f, const char* s)
+{
+	const char* p;
+	p = s;
+	while(*p != '\0')
+	{
+		if(*p & 0x80)
+		{
+			p = NULL;
+			break;
+		}
+		p++;
+	}
+	if(!p)
+		fputs("%EF%BB%BF", f);
+	while(*s != '\0')
+	{
+		switch(*s)
+		{
+		case '\t':
+		case '\n':
+		case '\r':
+		case ' ':
+		case '%':
+		case '*':
+		case '?':
+		case '\\':
+			fprintf(f, "%%%02X", *s & 0xff);
+			break;
+		default:
+			if(*s & 0x80)
+				fprintf(f, "%%%02X", *s & 0xff);
+			else
+				fputc(*s, f);
+			break;
+		}
+		s++;
+	}
+}
+
+void WriteWinSCPPassword(FILE* f, const char* UserName, const char* HostName, const char* Password)
+{
+	char Tmp[256];
+	strcpy(Tmp, UserName);
+	strcat(Tmp, HostName);
+	strcat(Tmp, Password);
+	fprintf(f, "%02X", ~(0xff ^ 0xa3) & 0xff);
+	fprintf(f, "%02X", ~(0x00 ^ 0xa3) & 0xff);
+	fprintf(f, "%02X", ~((unsigned char)strlen(Tmp) ^ 0xa3) & 0xff);
+	fprintf(f, "%02X", ~(0x00 ^ 0xa3) & 0xff);
+	Password = Tmp;
+	while(*Password != '\0')
+	{
+		fprintf(f, "%02X", ~(*Password ^ 0xa3) & 0xff);
+		Password++;
+	}
+}
+
+void SaveSettingsToWinSCPIni()
+{
+	char Fname[FMAX_PATH+1];
+	FILE* f;
+	TIME_ZONE_INFORMATION tzi;
+	char HostPath[FMAX_PATH+1];
+	int Level;
+	int i;
+	HOSTDATA Host;
+	char Tmp[FMAX_PATH+1];
+	char* p1;
+	MessageBox(GetMainHwnd(), MSGJPN365, "FFFTP", MB_OK);
+	strcpy(Fname, "WinSCP.ini");
+	if(SelectFile(GetMainHwnd(), Fname, MSGJPN286, MSGJPN288, "ini", OFN_EXTENSIONDIFFERENT | OFN_OVERWRITEPROMPT, 1) == TRUE)
+	{
+		if((f = fopen(Fname, "at")) != NULL)
+		{
+			GetTimeZoneInformation(&tzi);
+			strcpy(HostPath, "");
+			Level = 0;
+			i = 0;
+			while(CopyHostFromList(i, &Host) == FFFTP_SUCCESS)
+			{
+				while((Host.Level & SET_LEVEL_MASK) < Level)
+				{
+					if((p1 = strrchr(HostPath, '/')) != NULL)
+						*p1 = '\0';
+					if((p1 = strrchr(HostPath, '/')) != NULL)
+						p1++;
+					else
+						p1 = HostPath;
+					*p1 = '\0';
+					Level--;
+				}
+				if(Host.Level & SET_LEVEL_GROUP)
+				{
+					strcat(HostPath, Host.HostName);
+					strcat(HostPath, "/");
+					Level++;
+				}
+				else
+				{
+					fputs("[Sessions\\", f);
+					strcpy(Tmp, HostPath);
+					strcat(Tmp, Host.HostName);
+					WriteWinSCPString(f, Tmp);
+					fputs("]\n", f);
+					fputs("HostName=", f);
+					WriteWinSCPString(f, Host.HostAdrs);
+					fputs("\n", f);
+					fprintf(f, "PortNumber=%d\n", Host.Port);
+					switch(Host.NetType)
+					{
+					case NTYPE_AUTO:
+						break;
+					case NTYPE_IPV4:
+						fprintf(f, "AddressFamily=%s\n", "1");
+						break;
+					case NTYPE_IPV6:
+						fprintf(f, "AddressFamily=%s\n", "2");
+						break;
+					default:
+						break;
+					}
+					fputs("UserName=", f);
+					WriteWinSCPString(f, Host.UserName);
+					fputs("\n", f);
+					fprintf(f, "FSProtocol=%s\n", "5");
+					fputs("LocalDirectory=", f);
+					WriteWinSCPString(f, Host.LocalInitDir);
+					fputs("\n", f);
+					fputs("RemoteDirectory=", f);
+					WriteWinSCPString(f, Host.RemoteInitDir);
+					fputs("\n", f);
+					if(Host.SyncMove == YES)
+						fprintf(f, "SynchronizeBrowsing=%s\n", "1");
+					else
+						fprintf(f, "SynchronizeBrowsing=%s\n", "0");
+					fputs("PostLoginCommands=", f);
+					WriteWinSCPString(f, Host.InitCmd);
+					fputs("\n", f);
+					if(Host.FireWall == YES)
+					{
+						switch(FwallType)
+						{
+						case FWALL_NONE:
+							break;
+						case FWALL_FU_FP_SITE:
+							break;
+						case FWALL_FU_FP_USER:
+							break;
+						case FWALL_USER:
+							break;
+						case FWALL_OPEN:
+							break;
+						case FWALL_SOCKS4:
+							fprintf(f, "ProxyMethod=%s\n", "1");
+							break;
+						case FWALL_SOCKS5_NOAUTH:
+							break;
+						case FWALL_SOCKS5_USER:
+							fprintf(f, "ProxyMethod=%s\n", "2");
+							break;
+						case FWALL_FU_FP:
+							break;
+						case FWALL_SIDEWINDER:
+							break;
+						default:
+							break;
+						}
+						fputs("ProxyHost=", f);
+						WriteWinSCPString(f, FwallHost);
+						fputs("\n", f);
+						fprintf(f, "ProxyPort=%d\n", FwallPort);
+						fputs("ProxyUsername=", f);
+						WriteWinSCPString(f, FwallUser);
+						fputs("\n", f);
+					}
+					switch(Host.NameKanjiCode)
+					{
+					case KANJI_SJIS:
+						fprintf(f, "Utf=%s\n", "0");
+						break;
+					case KANJI_JIS:
+						// 非対応
+						break;
+					case KANJI_EUC:
+						// 非対応
+						break;
+					case KANJI_SMB_HEX:
+						// 非対応
+						break;
+					case KANJI_SMB_CAP:
+						// 非対応
+						break;
+					case KANJI_UTF8N:
+						fprintf(f, "Utf=%s\n", "1");
+						break;
+					case KANJI_UTF8HFSX:
+						// 非対応
+						break;
+					default:
+						break;
+					}
+					if(Host.Pasv == YES)
+						fprintf(f, "FtpPasvMode=%s\n", "1");
+					else
+						fprintf(f, "FtpPasvMode=%s\n", "0");
+					if(Host.ListCmdOnly == YES && Host.UseMLSD == NO)
+						fprintf(f, "FtpUseMlsd=%s\n", "0");
+					fputs("FtpAccount=", f);
+					WriteWinSCPString(f, Host.Account);
+					fputs("\n", f);
+					if(Host.NoopInterval > 0)
+						fprintf(f, "FtpPingInterval=%d\n", Host.NoopInterval);
+					else
+						fprintf(f, "FtpPingType=%s\n", "0");
+					if(Host.UseNoEncryption == YES)
+						fprintf(f, "Ftps=%s\n", "0");
+					else if(Host.UseFTPES == YES)
+						fprintf(f, "Ftps=%s\n", "3");
+					else if(Host.UseFTPIS == YES)
+						fprintf(f, "Ftps=%s\n", "1");
+					else
+						fprintf(f, "Ftps=%s\n", "0");
+					if(Host.FireWall == YES)
+					{
+						switch(FwallType)
+						{
+						case FWALL_NONE:
+							break;
+						case FWALL_FU_FP_SITE:
+							fprintf(f, "FtpProxyLogonType=%s\n", "1");
+							break;
+						case FWALL_FU_FP_USER:
+							fprintf(f, "FtpProxyLogonType=%s\n", "2");
+							break;
+						case FWALL_USER:
+							fprintf(f, "FtpProxyLogonType=%s\n", "5");
+							break;
+						case FWALL_OPEN:
+							fprintf(f, "FtpProxyLogonType=%s\n", "3");
+							break;
+						case FWALL_SOCKS4:
+							break;
+						case FWALL_SOCKS5_NOAUTH:
+							break;
+						case FWALL_SOCKS5_USER:
+							break;
+						case FWALL_FU_FP:
+							break;
+						case FWALL_SIDEWINDER:
+							break;
+						default:
+							break;
+						}
+					}
+					if(Host.NoWeakEncryption == YES)
+						fprintf(f, "MinTlsVersion=%s\n", "10");
+					else
+						fprintf(f, "MinTlsVersion=%s\n", "3");
+					fputs("Password=", f);
+					WriteWinSCPPassword(f, Host.UserName, Host.HostAdrs, Host.PassWord);
+					fputs("\n", f);
+					if(Host.FireWall == YES)
+					{
+						fputs("ProxyPasswordEnc=", f);
+						WriteWinSCPPassword(f, FwallUser, FwallHost, FwallPass);
+						fputs("\n", f);
+					}
+					fputs("\n", f);
+				}
+				i++;
+			}
+			fclose(f);
+		}
+		else
+			MessageBox(GetMainHwnd(), MSGJPN357, "FFFTP", MB_OK | MB_ICONERROR);
+	}
+}
+