コミット: 9f908c1dba09f78b9f0a7c103e68873c5f5d4df9 - ffftp (git)

Loweynet

コミットメタ情報

• リビジョン: 9f908c1dba09f78b9f0a7c103e68873c5f5d4df9 (tree)
• 日時: 2018-04-08 13:59:54
• 作者: s_kawamoto <s_kawamoto@user...>
• コミッター: s_kawamoto

ログメッセージ

Final Fix For This Program.

変更サマリ

• modified: FFFTP_Eng_Release/FFFTP.exe
• modified: FFFTP_Eng_Release_64/FFFTP.exe
• modified: Release/FFFTP.exe
• modified: Release_64/FFFTP.exe
• modified: doc/eng/FFFTP.txt
• modified: doc/eng/history.txt
• modified: doc/jpn/FFFTP.txt
• modified: doc/jpn/history.txt
• modified: src/common.h
• modified: src/main.c
• modified: src/registry.c
• modified: src/socketwrapper.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

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/doc/eng/FFFTP.txt
+++ b/doc/eng/FFFTP.txt
@@ -25,7 +25,7 @@ Password feature.
 When you use this virsion first, please set Master Password from 
 following menu.
 
-File ->@Settings -> Change Master password
+File -> Settings -> Change Master password
 
 
 Changes in Ver.2.00
@@ -33,6 +33,9 @@ Changes in Ver.2.00
 
 This list includes changes applied by automatic software updates.
 
+-- Changed the checking interval of automatic software updates from 7 days to
+   30 days.
+
 -- Added a feature to export settings as WinSCP INI format.
 
 -- Added an option to ignore addresses returned with PASV mode.

--- a/doc/eng/history.txt
+++ b/doc/eng/history.txt
@@ -3,6 +3,11 @@ FFFTP version history.
 Changes in Ver.2.00
 --------------------
 
+This list includes changes applied by automatic software updates.
+
+-- Changed the checking interval of automatic software updates from 7 days to
+   30 days.
+
 -- Added a feature to export settings as WinSCP INI format.
 
 -- Added an option to ignore addresses returned with PASV mode.
@@ -444,12 +449,12 @@ Changes in Ver.1.97
 -------------------
 
 -- Now you can use master password.
-   This function is made by Gengen-san.@Thanks.
+   This function is made by Gengen-san. Thanks.
    When you use this virsion first, set master password from following menu.
-    File ->@Settings -> Change Master password
+    File -> Settings -> Change Master password
 
 -- Now passwords are encrypted with AES.
-   This function is made by Moca-san.@Thanks.
+   This function is made by Moca-san. Thanks.
 
 Changes in Ver.1.96d
 --------------------

--- a/doc/jpn/FFFTP.txt
+++ b/doc/jpn/FFFTP.txt
@@ -32,6 +32,8 @@ Ver 2.00
 
 Ž©“®XV‹@”\‚őΉž‚µ‚½“à—e‚ðŠÜ‚ß‚Ä‹LÚ‚µ‚Ü‚·B
 
+Eƒ\ƒtƒgƒEƒFƒAŽ©“®XV‹@”\‚ÌŠm”FŠÔŠu‚ð7“ú‚©‚ç30“ú‚ɕύX‚µ‚Ü‚µ‚½B
+
 EÝ’è‚ðWinSCP INIŒ`Ž®‚ɃGƒNƒXƒ|[ƒg‚·‚é‹@”\‚ð’ljÁ‚µ‚Ü‚µ‚½B
 
 EPASVƒ‚[ƒh‚Å•Ô‚³‚ê‚éƒAƒhƒŒƒX‚𖳎‹‚·‚é‹@”\‚ð’ljÁ‚µ‚Ü‚µ‚½B

--- a/doc/jpn/history.txt
+++ b/doc/jpn/history.txt
@@ -2,6 +2,10 @@ FFFTP
 
 ¡Ver 2.00
 
+Ž©“®XV‹@”\‚őΉž‚µ‚½“à—e‚ðŠÜ‚ß‚Ä‹LÚ‚µ‚Ü‚·B
+
+Eƒ\ƒtƒgƒEƒFƒAŽ©“®XV‹@”\‚ÌŠm”FŠÔŠu‚ð7“ú‚©‚ç30“ú‚ɕύX‚µ‚Ü‚µ‚½B
+
 EÝ’è‚ðWinSCP INIŒ`Ž®‚ɃGƒNƒXƒ|[ƒg‚·‚é‹@”\‚ð’ljÁ‚µ‚Ü‚µ‚½B
 
 EPASVƒ‚[ƒh‚Å•Ô‚³‚ê‚éƒAƒhƒŒƒX‚𖳎‹‚·‚é‹@”\‚ð’ljÁ‚µ‚Ü‚µ‚½B

--- a/src/common.h
+++ b/src/common.h
@@ -81,7 +81,7 @@
 // ソフトウェア自動更新
 // リリースバージョンはリリース予定年（10進数4桁）+月（2桁）+日（2桁）+通し番号（0スタート2桁）とする
 // 2014年7月31日中の30個目のリリースは2014073129
-#define RELEASE_VERSION_NUM		2018010700	/* リリースバージョン */
+#define RELEASE_VERSION_NUM		2018040800	/* リリースバージョン */
 
 
 // SourceForge.JPによるフォーク

--- a/src/main.c
+++ b/src/main.c
@@ -286,7 +286,7 @@ int ReadOnlySettings = NO;
 // ソフトウェア自動更新
 int AutoCheckForUpdates = YES;
 int AutoApplyUpdates = NO;
-int AutoCheckForUptatesInterval = 7;
+int AutoCheckForUptatesInterval = 30;
 time_t LastAutoCheckForUpdates = 0;
 // ファイル一覧バグ修正
 int AbortOnListError = YES;

--- a/src/registry.c
+++ b/src/registry.c
@@ -1459,6 +1459,12 @@ int LoadRegistry(void)
 			ReadIntValueFromReg(hKey4, "UpdCheck", &AutoCheckForUpdates);
 			ReadIntValueFromReg(hKey4, "UpdApply", &AutoApplyUpdates);
 			ReadIntValueFromReg(hKey4, "UpdInterval", &AutoCheckForUptatesInterval);
+			// 今後の緊急リリースとトラフィック軽減を考慮し確認間隔を30日に延長
+			if(Version < 2000)
+			{
+				if(AutoCheckForUptatesInterval < 30)
+					AutoCheckForUptatesInterval = 30;
+			}
 			ReadBinaryFromReg(hKey4, "UpdLastCheck", &LastAutoCheckForUpdates, sizeof(LastAutoCheckForUpdates));
 			// ファイル一覧バグ修正
 			ReadIntValueFromReg(hKey4, "AbortListErr", &AbortOnListError);
@@ -4111,7 +4117,6 @@ void SaveSettingsToWinSCPIni()
 {
 	char Fname[FMAX_PATH+1];
 	FILE* f;
-	TIME_ZONE_INFORMATION tzi;
 	char HostPath[FMAX_PATH+1];
 	int Level;
 	int i;
@@ -4124,7 +4129,6 @@ void SaveSettingsToWinSCPIni()
 	{
 		if((f = fopen(Fname, "at")) != NULL)
 		{
-			GetTimeZoneInformation(&tzi);
 			strcpy(HostPath, "");
 			Level = 0;
 			i = 0;

--- a/src/socketwrapper.c
+++ b/src/socketwrapper.c
@@ -971,7 +971,7 @@ DWORD WINAPI WSAAsyncGetHostByNameIPv6ThreadProc(LPVOID lpParameter)
 	else
 		PostMessage(pData->hWnd, pData->wMsg, (WPARAM)pData->h, (LPARAM)(ERROR_INVALID_FUNCTION << 16));
 	// CreateThreadが返すハンドルが重複するのを回避
-	Sleep(10000);
+	Sleep(1000);
 	CloseHandle(pData->h);
 	free(pData->name);
 	free(pData);
@@ -988,6 +988,7 @@ HANDLE WSAAsyncGetHostByNameIPv6(HWND hWnd, u_int wMsg, const char * name, char
 	hResult = NULL;
 	if(pData = malloc(sizeof(GETHOSTBYNAMEDATA)))
 	{
+		pData->h = NULL;
 		pData->hWnd = hWnd;
 		pData->wMsg = wMsg;
 		if(pData->name = malloc(sizeof(char) * (strlen(name) + 1)))
@@ -998,8 +999,8 @@ HANDLE WSAAsyncGetHostByNameIPv6(HWND hWnd, u_int wMsg, const char * name, char
 			pData->Family = Family;
 			if(pData->h = CreateThread(NULL, 0, WSAAsyncGetHostByNameIPv6ThreadProc, pData, CREATE_SUSPENDED, NULL))
 			{
-				ResumeThread(pData->h);
-				hResult = pData->h;
+				if(ResumeThread(pData->h) != (DWORD)-1)
+					hResult = pData->h;
 			}
 		}
 	}
@@ -1007,6 +1008,11 @@ HANDLE WSAAsyncGetHostByNameIPv6(HWND hWnd, u_int wMsg, const char * name, char
 	{
 		if(pData)
 		{
+			if(pData->h)
+			{
+				TerminateThread(pData->h, 0);
+				CloseHandle(pData->h);
+			}
 			if(pData->name)
 				free(pData->name);
 			free(pData);