提交: cb7413c6201f109379120f7d11dc37a52b7445dc - ffftp (git)

Loweynet

Commit MetaInfo

• 修订版: cb7413c6201f109379120f7d11dc37a52b7445dc (tree)
• 时间: 2015-02-22 17:17:26
• 作者: s_kawamoto <s_kawamoto@user...>
• Commiter: s_kawamoto

Log Message

Fix bugs of all settings encryption.

更改概述

• modified: FFFTP_Eng_Release/FFFTP.exe
• modified: FFFTP_Eng_Release_64/FFFTP.exe
• modified: Release/FFFTP.exe
• modified: Release_64/FFFTP.exe
• modified: common.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

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

--- a/registry.c
+++ b/registry.c
@@ -959,33 +959,36 @@ int LoadRegistry(void)
 			IniKanjiCode = KANJI_SJIS;
 
 		// 全設定暗号化対応
-		if(GetMasterPasswordStatus() == PASSWORD_OK)
+		if(Version >= 1990)
 		{
-			ReadIntValueFromReg(hKey3, "EncryptAll", &EncryptAllSettings);
-			sprintf(Buf, "%d", EncryptAllSettings);
-			ReadStringFromReg(hKey3, "EncryptAllDetector", Str, 255);
-			DecodePassword(Str, Buf2);
-			EncryptSettings = EncryptAllSettings;
-			memset(&EncryptSettingsChecksum, 0, 20);
-			if(strcmp(Buf, Buf2) != 0)
+			if(GetMasterPasswordStatus() == PASSWORD_OK)
 			{
-				switch(DialogBox(GetFtpInst(), MAKEINTRESOURCE(corruptsettings_dlg), GetMainHwnd(), AnyButtonDialogProc))
+				ReadIntValueFromReg(hKey3, "EncryptAll", &EncryptAllSettings);
+				sprintf(Buf, "%d", EncryptAllSettings);
+				ReadStringFromReg(hKey3, "EncryptAllDetector", Str, 255);
+				DecodePassword(Str, Buf2);
+				EncryptSettings = EncryptAllSettings;
+				memset(&EncryptSettingsChecksum, 0, 20);
+				if(strcmp(Buf, Buf2) != 0)
 				{
-				case IDCANCEL:
-					Terminate();
-					break;
-				case IDABORT:
-					CloseReg(hKey3);
-					ClearRegistry();
-					ClearIni();
-					Restart();
-					Terminate();
-					break;
-				case IDRETRY:
-					EncryptSettingsError = YES;
-					break;
-				case IDIGNORE:
-					break;
+					switch(DialogBox(GetFtpInst(), MAKEINTRESOURCE(corruptsettings_dlg), GetMainHwnd(), AnyButtonDialogProc))
+					{
+					case IDCANCEL:
+						Terminate();
+						break;
+					case IDABORT:
+						CloseReg(hKey3);
+						ClearRegistry();
+						ClearIni();
+						Restart();
+						Terminate();
+						break;
+					case IDRETRY:
+						EncryptSettingsError = YES;
+						break;
+					case IDIGNORE:
+						break;
+					}
 				}
 			}
 		}