提交: 3563717ced0f7e75eb9cec96c254de7a52145ea5 - Jody (git)

Saputra

Commit MetaInfo

• 修订版: 3563717ced0f7e75eb9cec96c254de7a52145ea5 (tree)
• 时间: 2012-02-22 13:44:58
• 作者: s_kawamoto <s_kawamoto@user...>
• Commiter: s_kawamoto

Log Message

Add portable version checks.
Modify documents.
Modify installer settings.

更改概述

• modified: FFFTP_Eng_Release/FFFTP.exe
• modified: Package/installer_config.bat
• modified: Package/make_installer_pre.bat
• add: Package/portable
• modified: Release/FFFTP.exe
• modified: common.h
• modified: doc/eng/FFFTP.txt
• modified: doc/eng/history.txt
• modified: doc/jpn/FFFTP.txt
• modified: doc/jpn/history.txt
• modified: ftpproc.c
• modified: main.c
• modified: option.c

差异

Binary files a/FFFTP_Eng_Release/FFFTP.exe and b/FFFTP_Eng_Release/FFFTP.exe differ

--- a/Package/installer_config.bat
+++ b/Package/installer_config.bat
@@ -17,6 +17,7 @@ set ENG_INST=EXEpress\eng\ffftp.exe
 set HTMLHELP=..\htmlhelp\FFFTP.CHM
 set BIN_JPN=..\Release\FFFTP.exe
 set BIN_ENG=..\FFFTP_Eng_Release\FFFTP.exe
+set PORTABLE_FILE=portable
 
 set DIR_JPN_DOC=..\doc\jpn
 set DIR_ENG_DOC=..\doc\eng

--- a/Package/make_installer_pre.bat
+++ b/Package/make_installer_pre.bat
@@ -27,4 +27,8 @@ REM; copy to installer working directory
 copy /Y %DIR_JPN%\*.* %DIR_JPN_INST%
 copy /Y %DIR_ENG%\*.* %DIR_ENG_INST%
 
+REM; copy a portable indicator file
+copy /Y %PORTABLE_FILE% %DIR_JPN%
+copy /Y %PORTABLE_FILE% %DIR_ENG%
+
 pause

--- /dev/null
+++ b/Package/portable
@@ -0,0 +1 @@
+This file indicates that FFFTP is portable.
\ No newline at end of file

Binary files a/Release/FFFTP.exe and b/Release/FFFTP.exe differ

--- a/common.h
+++ b/common.h
@@ -1308,6 +1308,9 @@ BOOL LoadSSLRootCAFile();
 BOOL IsMainThread();
 // ファイルアイコン表示対応
 int AskDispFileIcon(void);
+// ポータブル版判定
+void CheckPortableVersion();
+int AskPortableVersion(void);
 
 /*===== filelist.c =====*/
 

--- a/doc/eng/FFFTP.txt
+++ b/doc/eng/FFFTP.txt
@@ -69,6 +69,9 @@ Changes in Ver.1.98e
    Name resolution and connection will be performed at same time on IPv4 and
    IPv6, and whichever finished earlier will be used.
 
+-- Disabled saving settings in the registry about ZIP version copies.
+   To save in the registry, please remove "portable" the file.
+
 
 Outline
 -------

--- a/doc/eng/history.txt
+++ b/doc/eng/history.txt
@@ -41,6 +41,9 @@ Changes in Ver.1.98e
    Name resolution and connection will be performed at same time on IPv4 and
    IPv6, and whichever finished earlier will be used.
 
+-- Disabled saving settings in the registry about ZIP version copies.
+   To save in the registry, please remove "portable" the file.
+
 Changes in Ver.1.98d
 --------------------
 

--- a/doc/jpn/FFFTP.txt
+++ b/doc/jpn/FFFTP.txt
@@ -61,7 +61,7 @@ Ver 1.98e
 @iˆÈ‘O‚̐ݒ肪‘¶Ý‚µA“¯ŽžÚ‘±”‚ª1‚æ‚è‘å‚«‚¢ê‡‚Í‚»‚̐ݒ肪“K—p
 @‚³‚ê‚Ü‚·jB
 
-EƒAƒbƒvƒ[ƒhŽž‚ɃzƒXƒg‚ª–¼‘O‚ð•t‚¯‚½ê‡‚É‚·‚Å‚É‘¶Ý‚·‚éƒtƒ@ƒCƒ‹‚Ì
+EƒAƒbƒvƒ[ƒhŽž‚ɃzƒXƒg‚ª–¼‘O‚ð•t‚¯‚½ê‡‚ÉŒ³‚̃tƒ@ƒCƒ‹–¼‚̃tƒ@ƒCƒ‹‚Ì
 @‘®«‚ª•ÏX‚³‚ê‚éƒoƒO‚ðC³‚µ‚Ü‚µ‚½B
 
 EI—¹Žž‚ɃtƒŠ[ƒY‚·‚邱‚Æ‚ª‚ ‚éƒoƒO‚ðC³‚µ‚Ü‚µ‚½B
@@ -73,6 +73,9 @@ Ver 1.98e
 @IPv4‚ÆIPv6‚Ì—¼•û‚Å–¼‘O‰ðŒˆ‚Ɛڑ±‚𓯎ž‚ɍs‚¢Aæ‚ɐڑ±‚ªŠ®—¹‚µ‚½•û‚ð
 @Žg—p‚µ‚Ü‚·B
 
+EZIP”łł̓ŒƒWƒXƒgƒŠ‚ɐݒè‚ðˆêØ•Û‘¶‚µ‚È‚¢‚悤‚ɕύX‚µ‚Ü‚µ‚½B
+@ƒŒƒWƒXƒgƒŠ‚ðŽg—p‚·‚é‚ɂ̓tƒ@ƒCƒ‹"portable"‚ðíœ‚µ‚Ä‚­‚¾‚³‚¢B
+
 
 Ver 1.96dˆÈ‘O‚Ö–ß‚·ê‡
 -----------------------

--- a/doc/jpn/history.txt
+++ b/doc/jpn/history.txt
@@ -45,6 +45,9 @@ FFFTP
 @IPv4‚ÆIPv6‚Ì—¼•û‚Å–¼‘O‰ðŒˆ‚Ɛڑ±‚𓯎ž‚ɍs‚¢Aæ‚ɐڑ±‚ªŠ®—¹‚µ‚½•û‚ð
 @Žg—p‚µ‚Ü‚·B
 
+EZIP”łł̓ŒƒWƒXƒgƒŠ‚ɐݒè‚ðˆêØ•Û‘¶‚µ‚È‚¢‚悤‚ɕύX‚µ‚Ü‚µ‚½B
+@ƒŒƒWƒXƒgƒŠ‚ðŽg—p‚·‚é‚ɂ̓tƒ@ƒCƒ‹"portable"‚ðíœ‚µ‚Ä‚­‚¾‚³‚¢B
+
 ¡Ver 1.98d
 
 EMLSDƒRƒ}ƒ“ƒh‚ɑΉž‚µ‚½ƒzƒXƒg‚Å‚ÍMLSDƒRƒ}ƒ“ƒh‚ð—p‚¢‚ătƒ@ƒCƒ‹ˆê——‚ð

--- a/ftpproc.c
+++ b/ftpproc.c
@@ -335,6 +335,8 @@ void DownloadProc(int ChName, int ForceFile, int All)
 void DirectDownloadProc(char *Fname)
 {
 	TRANSPACKET Pkt;
+	// ディレクトリ自動作成
+	char Tmp[FMAX_PATH+1];
 
 	// 同時接続対応
 	CancelFlg = NO;
@@ -400,9 +402,17 @@ void DirectDownloadProc(char *Fname)
 				Pkt.KanjiCodeDesired = AskLocalKanjiCode();
 				Pkt.KanaCnv = AskHostKanaCnv();
 
+				// ディレクトリ自動作成
+				strcpy(Tmp, Pkt.LocalFile);
 				Pkt.Mode = CheckLocalFile(&Pkt);	/* Pkt.ExistSize がセットされる */
 				if((Pkt.Mode != EXIST_ABORT) && (Pkt.Mode != EXIST_IGNORE))
+				// ディレクトリ自動作成
+//					AddTransFileList(&Pkt);
+				{
+					if(MakeAllDir == YES)
+						MakeDirFromLocalPath(Pkt.LocalFile, Tmp);
 					AddTransFileList(&Pkt);
+				}
 			}
 		}
 

--- a/main.c
+++ b/main.c
@@ -136,6 +136,9 @@ static DWORD dwCookie;
 static char SSLRootCAFilePath[FMAX_PATH+1];
 // マルチコアCPUの特定環境下でファイル通信中にクラッシュするバグ対策
 static DWORD MainThreadId;
+// ポータブル版判定
+static char PortableFilePath[FMAX_PATH+1];
+int PortableVersion;
 
 
 /*===== グローバルなワーク =====*/
@@ -441,6 +444,15 @@ static int InitApp(LPSTR lpszCmdLine, int cmdShow)
 			ForceIni = YES;
 			RegType = REGTYPE_INI;
 		}
+		// ポータブル版判定
+		GetModuleFileName(NULL, PortableFilePath, FMAX_PATH);
+		strcpy(GetFileName(PortableFilePath), "portable");
+		CheckPortableVersion();
+		if(PortableVersion == YES)
+		{
+			ForceIni = YES;
+			RegType = REGTYPE_INI;
+		}
 
 //		AllocConsole();
 
@@ -3122,3 +3134,21 @@ int AskDispFileIcon(void)
 	return(DispFileIcon);
 }
 
+// ポータブル版判定
+void CheckPortableVersion()
+{
+	HANDLE hFile;
+	if((hFile = CreateFile(PortableFilePath, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL)) != INVALID_HANDLE_VALUE)
+	{
+		PortableVersion = YES;
+		CloseHandle(hFile);
+	}
+	else
+		PortableVersion = NO;
+}
+
+int AskPortableVersion(void)
+{
+	return(PortableVersion);
+}
+

--- a/option.c
+++ b/option.c
@@ -1481,6 +1481,9 @@ static INT_PTR CALLBACK MiscSettingProc(HWND hDlg, UINT message, WPARAM wParam,
 			SendDlgItemMessage(hDlg, MISC_WINPOS, BM_SETCHECK, SaveWinPos, 0);
 			SendDlgItemMessage(hDlg, MISC_DEBUG, BM_SETCHECK, DebugConsole, 0);
 			SendDlgItemMessage(hDlg, MISC_REGTYPE, BM_SETCHECK, RegType, 0);
+			// ポータブル版判定
+			if(AskForceIni() == YES)
+				EnableWindow(GetDlgItem(hDlg, MISC_REGTYPE), FALSE);
 
 			SendDlgItemMessage(hDlg, MISC_CACHE_SAVE, BM_SETCHECK, CacheSave, 0);
 			SendDlgItemMessage(hDlg, MISC_BUFNUM, EM_LIMITTEXT, (WPARAM)2, 0);
@@ -1510,7 +1513,10 @@ static INT_PTR CALLBACK MiscSettingProc(HWND hDlg, UINT message, WPARAM wParam,
 				case PSN_APPLY :
 					SaveWinPos = SendDlgItemMessage(hDlg, MISC_WINPOS, BM_GETCHECK, 0, 0);
 					DebugConsole = SendDlgItemMessage(hDlg, MISC_DEBUG, BM_GETCHECK, 0, 0);
-					RegType = SendDlgItemMessage(hDlg, MISC_REGTYPE, BM_GETCHECK, 0, 0);
+					// ポータブル版判定
+//					RegType = SendDlgItemMessage(hDlg, MISC_REGTYPE, BM_GETCHECK, 0, 0);
+					if(AskForceIni() == NO)
+						RegType = SendDlgItemMessage(hDlg, MISC_REGTYPE, BM_GETCHECK, 0, 0);
 
 					CacheSave = SendDlgItemMessage(hDlg, MISC_CACHE_SAVE, BM_GETCHECK, 0, 0);
 					CacheEntry = GetDecimalText(hDlg, MISC_BUFNUM);