Commit: 564d244d7a0347b127bc0549cd31206a29f25d8f - ffftp (git)

FFFTPのソースコードです。

Commit MetaInfo

• Revision: 564d244d7a0347b127bc0549cd31206a29f25d8f (tree)
• Time: 2012-02-23 00:56:27
• Author: s_kawamoto <s_kawamoto@user...>
• Commiter: s_kawamoto

Log Message

Add support for importing settings from registry.

Change Summary

• modified: FFFTP_Eng_Release/FFFTP.exe
• modified: Release/FFFTP.exe
• modified: Resource/FFFTP.rc
• modified: Resource/resource.h
• modified: Resource_eng/FFFTP-eng.rc
• modified: Resource_eng/resource.h
• modified: common.h
• modified: main.c
• modified: mbswrapper.c
• modified: mbswrapper.h
• modified: registry.c

Incremental Difference

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/FFFTP.rc
+++ b/Resource/FFFTP.rc
@@ -1423,6 +1423,16 @@ BEGIN
     PUSHBUTTON      "中止(&S)",UPDOWNAS_STOP,101,66,50,14
 END
 
+ini_from_reg_dlg DIALOG  0, 0, 211, 64
+STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION
+CAPTION "レジストリの設定のインポート"
+FONT 9, "MS Shell Dlg"
+BEGIN
+    LTEXT           "INIファイルを使用するように設定されていますが、INIファイルではなくレジストリに設定が存在することを検出しました。\r\nレジストリの設定をインポートしますか。",-1,7,7,196,36
+    DEFPUSHBUTTON   "はい",IDOK,48,42,50,14
+    PUSHBUTTON      "いいえ",IDCANCEL,112,42,50,14
+END
+
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -1578,9 +1588,9 @@ BEGIN
     forcepasschange_dlg, DIALOG
     BEGIN
         LEFTMARGIN, 7
-        RIGHTMARGIN, 139
+        RIGHTMARGIN, 204
         TOPMARGIN, 7
-        BOTTOMMARGIN, 43
+        BOTTOMMARGIN, 57
     END
 
     opt_trmode2_dlg, DIALOG
@@ -2066,9 +2076,9 @@ BEGIN
     updatesslroot_dlg, DIALOG
     BEGIN
         LEFTMARGIN, 7
-        RIGHTMARGIN, 139
+        RIGHTMARGIN, 204
         TOPMARGIN, 7
-        BOTTOMMARGIN, 43
+        BOTTOMMARGIN, 57
     END
 
     updown_as_with_ext_dlg, DIALOG
@@ -2076,7 +2086,15 @@ BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 180
         TOPMARGIN, 7
-        BOTTOMMARGIN, 87
+        BOTTOMMARGIN, 82
+    END
+
+    ini_from_reg_dlg, DIALOG
+    BEGIN
+        LEFTMARGIN, 7
+        RIGHTMARGIN, 204
+        TOPMARGIN, 7
+        BOTTOMMARGIN, 57
     END
 END
 #endif    // APSTUDIO_INVOKED

--- a/Resource/resource.h
+++ b/Resource/resource.h
@@ -114,6 +114,7 @@
 #define savecrypt_dlg                   191
 #define updatesslroot_dlg               192
 #define updown_as_with_ext_dlg          193
+#define ini_from_reg_dlg                194
 #define TRANS_TIME_BAR                  1002
 #define TRANS_TEXT                      1003
 #define TRANS_REMOTE                    1003
@@ -629,7 +630,7 @@
 // 
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        193
+#define _APS_NEXT_RESOURCE_VALUE        195
 #define _APS_NEXT_COMMAND_VALUE         40177
 #define _APS_NEXT_CONTROL_VALUE         1213
 #define _APS_NEXT_SYMED_VALUE           101

--- a/Resource_eng/FFFTP-eng.rc
+++ b/Resource_eng/FFFTP-eng.rc
@@ -1452,6 +1452,16 @@ BEGIN
     PUSHBUTTON      "Cancel",UPDOWNAS_STOP,101,66,50,14
 END
 
+ini_from_reg_dlg DIALOG  0, 0, 211, 64
+STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION
+CAPTION "Import settings from registry"
+FONT 9, "MS Shell Dlg"
+BEGIN
+    LTEXT           "The INI file that will be used was not found, but settings are detected in the registry.\r\nImport settings from the registry to the INI file?",-1,7,7,196,36
+    DEFPUSHBUTTON   "Yes",IDOK,48,42,50,14
+    PUSHBUTTON      "No",IDCANCEL,112,42,50,14
+END
+
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -1607,9 +1617,9 @@ BEGIN
     forcepasschange_dlg, DIALOG
     BEGIN
         LEFTMARGIN, 7
-        RIGHTMARGIN, 139
+        RIGHTMARGIN, 204
         TOPMARGIN, 7
-        BOTTOMMARGIN, 43
+        BOTTOMMARGIN, 57
     END
 
     opt_trmode2_dlg, DIALOG
@@ -2092,9 +2102,9 @@ BEGIN
     updatesslroot_dlg, DIALOG
     BEGIN
         LEFTMARGIN, 7
-        RIGHTMARGIN, 139
+        RIGHTMARGIN, 204
         TOPMARGIN, 7
-        BOTTOMMARGIN, 43
+        BOTTOMMARGIN, 57
     END
 
     updown_as_with_ext_dlg, DIALOG
@@ -2102,7 +2112,15 @@ BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 180
         TOPMARGIN, 7
-        BOTTOMMARGIN, 87
+        BOTTOMMARGIN, 82
+    END
+
+    ini_from_reg_dlg, DIALOG
+    BEGIN
+        LEFTMARGIN, 7
+        RIGHTMARGIN, 204
+        TOPMARGIN, 7
+        BOTTOMMARGIN, 57
     END
 END
 #endif    // APSTUDIO_INVOKED

--- a/Resource_eng/resource.h
+++ b/Resource_eng/resource.h
@@ -114,6 +114,7 @@
 #define savecrypt_dlg                   191
 #define updatesslroot_dlg               192
 #define updown_as_with_ext_dlg          193
+#define ini_from_reg_dlg                194
 #define TRANS_TIME_BAR                  1002
 #define TRANS_TEXT                      1003
 #define TRANS_REMOTE                    1003
@@ -629,7 +630,7 @@
 // 
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        193
+#define _APS_NEXT_RESOURCE_VALUE        195
 #define _APS_NEXT_COMMAND_VALUE         40177
 #define _APS_NEXT_CONTROL_VALUE         1213
 #define _APS_NEXT_SYMED_VALUE           101

--- a/common.h
+++ b/common.h
@@ -1704,12 +1704,17 @@ int CheckFname(char *str, char *regexp);
 void SaveRegistry(void);
 int LoadRegistry(void);
 void ClearRegistry(void);
+// ポータブル版判定
+void ClearIni(void);
 void SetMasterPassword( const char* );
 int GetMasterPasswordStatus(void);
 int ValidateMasterPassword(void);
 DWORD LoadHideDriveListRegistry(void);
 void SaveSettingsToFile(void);
 int LoadSettingsFromFile(void);
+// ポータブル版判定
+int IsRegAvailable();
+int IsIniAvailable();
 
 /*===== lvtips.c =====*/
 

--- a/main.c
+++ b/main.c
@@ -407,6 +407,8 @@ static int InitApp(LPSTR lpszCmdLine, int cmdShow)
 	char PwdBuf[FMAX_PATH+1];
 	int useDefautPassword = 0; /* 警告文表示用 */
 	int masterpass;
+	// ポータブル版判定
+	int ImportPortable;
 
 	sts = FFFTP_FAIL;
 
@@ -448,10 +450,20 @@ static int InitApp(LPSTR lpszCmdLine, int cmdShow)
 		GetModuleFileName(NULL, PortableFilePath, FMAX_PATH);
 		strcpy(GetFileName(PortableFilePath), "portable");
 		CheckPortableVersion();
+		ImportPortable = NO;
 		if(PortableVersion == YES)
 		{
 			ForceIni = YES;
 			RegType = REGTYPE_INI;
+			if(IsRegAvailable() == YES && IsIniAvailable() == NO)
+			{
+				if(DialogBox(GetFtpInst(), MAKEINTRESOURCE(ini_from_reg_dlg), GetMainHwnd(), ExeEscDialogProc) == YES)
+				{
+					ImportPortable = YES;
+					ForceIni = NO;
+					RegType = REGTYPE_REG;
+				}
+			}
 		}
 
 //		AllocConsole();
@@ -506,6 +518,13 @@ static int InitApp(LPSTR lpszCmdLine, int cmdShow)
 		{
 			LoadRegistry();
 
+			// ポータブル版判定
+			if(ImportPortable == YES)
+			{
+				ForceIni = YES;
+				RegType = REGTYPE_INI;
+			}
+
 			// 暗号化通信対応
 			SetSSLTimeoutCallback(TimeOut * 1000, SSLTimeoutCallback);
 			SetSSLConfirmCallback(SSLConfirmCallback);
@@ -1387,6 +1406,8 @@ static LRESULT CALLBACK FtpWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARA
 					if(DialogBox(hInstFtp, MAKEINTRESOURCE(reginit_dlg), hWnd, ExeEscDialogProc) == YES)
 					{
 						ClearRegistry();
+						// ポータブル版判定
+						ClearIni();
 						SaveExit = NO;
 						PostMessage(hWnd, WM_CLOSE, 0, 0L);
 					}
@@ -2094,6 +2115,9 @@ static void ExitProc(HWND hWnd)
 	{
 		GetListTabWidth();
 		SaveRegistry();
+		// ポータブル版判定
+		if(RegType == REGTYPE_REG)
+			ClearIni();
 
 		if((CacheEntry > 0) && (CacheSave == YES))
 			SaveCache();

--- a/mbswrapper.c
+++ b/mbswrapper.c
@@ -2156,6 +2156,18 @@ END_ROUTINE
 	return r;
 }
 
+BOOL DeleteFileM(LPCSTR lpFileName)
+{
+	BOOL r = FALSE;
+	wchar_t* pw0 = NULL;
+START_ROUTINE
+	pw0 = DuplicateMtoW(lpFileName, -1);
+	r = DeleteFileW(pw0);
+END_ROUTINE
+	FreeDuplicatedString(pw0);
+	return r;
+}
+
 int mkdirM(const char * _Path)
 {
 	int r = -1;

--- a/mbswrapper.h
+++ b/mbswrapper.h
@@ -176,6 +176,9 @@ BOOL CopyFileM(LPCSTR lpExistingFileName, LPCSTR lpNewFileName, BOOL bFailIfExis
 #undef MoveFile
 #define MoveFile MoveFileM
 BOOL MoveFileM(LPCSTR lpExistingFileName, LPCSTR lpNewFileName);
+#undef DeleteFile
+#define DeleteFile DeleteFileM
+BOOL DeleteFileM(LPCSTR lpFileName);
 #undef mkdir
 #define mkdir _mkdirM
 int mkdirM(const char * _Path);

--- a/registry.c
+++ b/registry.c
@@ -1130,6 +1130,20 @@ void ClearRegistry(void)
 }
 
 
+// ポータブル版判定
+void ClearIni(void)
+{
+//	FILE *Strm;
+//	if((Strm = fopen(AskIniFilePath(), "rt")) != NULL)
+//	{
+//		fclose(Strm);
+//		MoveFileToTrashCan(AskIniFilePath());
+//	}
+	DeleteFile(AskIniFilePath());
+	return;
+}
+
+
 /*----- 設定をファイルに保存 --------------------------------------------------
 *
 *	Parameter
@@ -1966,18 +1980,20 @@ static int CloseReg(void *Handle)
 {
 	REGDATATBL *Pos;
 	REGDATATBL *Next;
-	FILE *Strm;
+	// ポータブル版判定
+//	FILE *Strm;
 
 	if(TmpRegType == REGTYPE_REG)
 	{
 		RegCloseKey(Handle);
 
 		/* INIファイルを削除 */
-		if((Strm = fopen(AskIniFilePath(), "rt")) != NULL)
-		{
-			fclose(Strm);
-			MoveFileToTrashCan(AskIniFilePath());
-		}
+		// ポータブル版判定
+//		if((Strm = fopen(AskIniFilePath(), "rt")) != NULL)
+//		{
+//			fclose(Strm);
+//			MoveFileToTrashCan(AskIniFilePath());
+//		}
 	}
 	else
 	{
@@ -2927,3 +2943,33 @@ DWORD GetRandamDWRODValue(void)
 	}
 	return rndValue;
 }
+
+// ポータブル版判定
+int IsRegAvailable()
+{
+	int Sts;
+	void* h;
+	Sts = NO;
+	SetRegType(REGTYPE_REG);
+	if(OpenReg("FFFTP", &h) == FFFTP_SUCCESS)
+	{
+		CloseReg(h);
+		Sts = YES;
+	}
+	return Sts;
+}
+
+int IsIniAvailable()
+{
+	int Sts;
+	void* h;
+	Sts = NO;
+	SetRegType(REGTYPE_INI);
+	if(OpenReg("FFFTP", &h) == FFFTP_SUCCESS)
+	{
+		CloseReg(h);
+		Sts = YES;
+	}
+	return Sts;
+}
+