v3.32

agiudiceandrea · Sep 19, 2017 · ad9ef96 · ad9ef96
1 parent 18bb2ce
commit ad9ef96
Show file tree

Hide file tree

Showing 39 changed files with 1,174 additions and 404 deletions.
diff --git a/FastCopy.sln b/FastCopy.sln
@@ -9,6 +9,11 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FastCopy", "FastCopy.vcxpro
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "install", "src\install\install.vcxproj", "{81F0F7E1-E0A4-4907-9BBD-B13B5B19474A}"
+	ProjectSection(ProjectDependencies) = postProject
+		{D6FF3145-1A10-4739-8E42-C5327BF51584} = {D6FF3145-1A10-4739-8E42-C5327BF51584}
+		{E99EE17D-136C-4C37-B78A-18D324E7119C} = {E99EE17D-136C-4C37-B78A-18D324E7119C}
+		{9CBD28F4-499C-4DCD-B7A3-996ADD4BFF44} = {9CBD28F4-499C-4DCD-B7A3-996ADD4BFF44}
+	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "shellext", "src\shellext\shellext.vcxproj", "{DD8C289F-DDEB-4664-A8CD-65A2B067A1DF}"
 EndProject

diff --git a/FastCopy.vcxproj b/FastCopy.vcxproj
@@ -137,6 +137,7 @@
       <AdditionalLibraryDirectories>lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <DelayLoadDLLs>comctl32.dll;crypt32.dll;winmm.dll;mpr.dll;Shlwapi.dll;</DelayLoadDLLs>
     </Link>
     <Bscmake>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -190,6 +191,7 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
+      <DelayLoadDLLs>comctl32.dll;crypt32.dll;winmm.dll;mpr.dll;Shlwapi.dll;</DelayLoadDLLs>
     </Link>
     <Manifest>
       <AdditionalManifestFiles>src\$(TargetFileName).manifest;%(AdditionalManifestFiles)</AdditionalManifestFiles>

diff --git a/external/xxhash/xxhash.vcxproj b/external/xxhash/xxhash.vcxproj
@@ -116,6 +116,7 @@
       <PreprocessorDefinitions>_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <PrecompiledHeaderOutputFile>$(IntDir)xxhash.pch</PrecompiledHeaderOutputFile>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>

diff --git a/help/fastcopy.hhc b/help/fastcopy.hhc
@@ -112,7 +112,7 @@
 			<param name="Local" value="fastcopy.htm#warning">
 			</OBJECT>
 		<LI> <OBJECT type="text/sitemap">
-			<param name="Name" value="�ŐV��">
+			<param name="Name" value="�T�|�[�g�f�����ŐV��">
 			<param name="Local" value="fastcopy.htm#contact">
 			</OBJECT>
 		<LI> <OBJECT type="text/sitemap">
@@ -225,7 +225,7 @@
 			<param name="Local" value="fastcopy_eng.htm#warning">
 			</OBJECT>
 		<LI> <OBJECT type="text/sitemap">
-			<param name="Name" value="Contact">
+			<param name="Name" value="Support Forum/Latest Version">
 			<param name="Local" value="fastcopy_eng.htm#contact">
 			</OBJECT>
 		<LI> <OBJECT type="text/sitemap">

diff --git a/help/fastcopy.htm b/help/fastcopy.htm
@@ -72,11 +72,11 @@
 <body bgcolor="#eeffff">
 
 <div align="center">
-<h1 class="help_head1">FastCopy ver3.30</h1>
+<h1 class="help_head1">FastCopy ver3.32</h1>
 </div>
 <div class="help_all">
 
-<div align="right">2017/03/06 H.Shirouzu (白水啓章)</div>
+<div align="right">2017/08/07 H.Shirouzu (白水啓章)</div>
 
 <a name="index"/>
 <h2 class="help_head2">Index</h2>
@@ -103,7 +103,7 @@ <h2 class="help_head2">Index</h2>
 		</div>
 	<a href="#cmdline">7. コマンドラインモード</a><br>
 	<a href="#warning">8. 注意（危険なところ）</a><br>
-	<a href="#contact">9. 最新版＆連絡先</a><br>
+	<a href="#contact">9. サポート掲示板＆最新版</a><br>
 	<a href="#misc">10. その他</a><br>
 	<a href="#todo">11. ToDo</a><br>
 	<a href="#history">12. 履歴</a><br>
@@ -754,13 +754,11 @@ <h3 class="help_head3">Source / DestDir</h3>
 
 
 <a name="contact"/>
-<h2 class="help_head2">9. 最新版＆連絡先</h2>
+<h2 class="help_head2">9. サポート掲示板＆最新版</h2>
 <div class="help_section">
-	以下の URL に最新版＆掲示板があります。<br>
-	<a href="http://ipmsg.org/tools/fastcopy.html">
-	http://ipmsg.org/tools/fastcopy.html</a>
-	<br>
-	<a href="http://ipmsg.org/private/">http://ipmsg.org/private/</a>
+	サポート掲示板: <a href="https://groups.google.com/forum/?hl=ja#!forum/fastcopy">https://groups.google.com/forum/?hl=ja#!forum/fastcopy</a><br>
+	最新版: <a href="http://ipmsg.org/tools/fastcopy.html">http://ipmsg.org/tools/fastcopy.html</a><br>
+	個人ページ: <a href="http://ipmsg.org/private/">http://ipmsg.org/private/</a>
 </div>
 
 
@@ -795,24 +793,38 @@ <h2 class="help_head2">11. ToDo</h2>
 
 <table class="help_table" border="4">
 <tr><th>Version</th><th>説明</th></tr>
+<tr><td>v3.32</td><td>
+非日本語環境で、Aboutダイアログを開くと例外が発生していたのを修正<br>
+/srcfile_w= で指定したファイルのBOMを正しく認識できていなかったのを修正
+</td></tr>
+<tr><td>v3.31</td><td>
+メインバッファ初期サイズを拡大（x64:128MB→256MB、x86:64MB→128MB）。<br>
+最大属性バッファを拡大（x64:1GB→8GB）。<br>
+ベリファイ＆移動用パスバッファを拡大（x64:8MB→128MB）＆ini設定可能に(max_movesize/max_digestsize)<br>
+日付判定での許容誤差指定(ms単位)を64bit化（最大23日 → 事実上無制限）<br>
+ネットワークファイルでも、巨大ファイルはNOBUFFERING扱いに。<br>
+/srcfile=, /srcfile_w= でBOMを許容するように。<br>
+転送バッファ分割の改善。<br>
+インストーラにおける、DLLプリロード攻撃対策。
+</td></tr>
 <tr><td>v3.30</td><td>
 ベリファイモード選択にxxHashを追加。<br>
 テスト用ファイル作成モード設定を追加（[読み込みなしでの]非同期I/Oを使った書き込み速度テスト＆ダミーファイル作成）。<br>
 開始パスフィルタで、階層の違うパス指定を複数行うと最も深い指定のみ利用される問題を修正。<br>
 ネットワークドライブの同一判定を間違えることがあったのを修正。<br>
-ジョブ登録では、バッファ設定を個別保存しないポリシーに変更<br>
+ジョブ登録では、バッファ設定を個別保存しないポリシーに変更。<br>
 その他リファイン
 </td></tr>
 <tr><td>v3.27</td><td>
 No UIモード起動（スケジューラ起動等）で、コピー動作前チェック（パス検査等）でエラーが発生した場合に、詳細内容がログに記録されるように。<br>
 その他リファイン。
 </td></tr>
 <tr><td>v3.26</td><td>
-ACL/副次Stream有効時の速度を改善<br>
+ACL/副次Stream有効時の速度を改善。<br>
 シェル拡張にアイコンを表示するように。<br>
 ジョブ管理画面のジョブリスト順をメニューのジョブ順と合わせるように。<br>
 手動（or nouiによる自動）中断の場合、abortをログに記録するように。<br>
-動作環境に Windows Server 2016を追加<br>
+動作環境に Windows Server 2016を追加。<br>
 インストーラ改良。
 </td></tr>
 <tr><td>v3.25</td><td>

diff --git a/help/fastcopy_eng.htm b/help/fastcopy_eng.htm
@@ -72,11 +72,11 @@
 <body bgcolor="#eeffff">
 
 <div align="center">
-<h1 class="help_head1">FastCopy ver3.30</h1>
+<h1 class="help_head1">FastCopy ver3.32</h1>
 </div>
 <div class="help_all">
 
-<div align="right">2017/03/05 H.Shirouzu</div>
+<div align="right">2017/08/07 H.Shirouzu</div>
 
 <center>
 <strong>Warning :</strong> This document was made with the Japanese-English translation software. <br>
@@ -109,7 +109,7 @@ <h2 class="help_head2">Index</h2>
 		</div>
 	<a href="#cmdline">7. CommandLine</a><br>
 	<a href="#warning">8. Warning</a><br>
-	<a href="#contact">9. Latest Version/Contact</a><br>
+	<a href="#contact">9. Support Forum/Latest Version</a><br>
 	<a href="#misc">10. Misc (setting file, etc)</a><br>
 	<a href="#todo">11. ToDo</a><br>
 	<a href="#history">12. History</a><br>
@@ -764,14 +764,11 @@ <h2 class="help_head2">8. Warning</h2>
 
 
 <a name="contact"/>
-<h2 class="help_head2">9. Latest Version/Contact</h2>
+<h2 class="help_head2">9. Support Forum/Latest Version</h2>
 <div class="help_section">
-	There is latest version & bulletin board in following URL. <br>
-	<a href="http://ipmsg.org/tools/fastcopy.html">
-	http://ipmsg.org/tools/fastcopy.html</a>
-	<br>
-	<a href="http://ipmsg.org/private/">http://ipmsg.org/private/</a>
-	<br>email: <img src="email2.png"/>
+	Support Forum: <a href="https://groups.google.com/forum/#!forum/fastcopy-bb-eng">https://groups.google.com/forum/#!forum/fastcopy-bb-eng</a><br>
+	Lastest Version: <a href="http://ipmsg.org/tools/fastcopy.html">http://ipmsg.org/tools/fastcopy.html</a><br>
+	Personal Page: <a href="http://ipmsg.org/private/">http://ipmsg.org/private/</a>
 </div>
 
 
@@ -804,6 +801,21 @@ <h2 class="help_head2">12. History</h2>
 <table class="help_table" border="4">
 <tr><th>Version</th><th>Detail</th></tr>
 
+<tr><td>v3.32</td><td>
+Fix an exception occurred when opening the AboutDialog.<br>
+Fix to interpret BOM that is specified by /srcfile_w option.
+</td></tr>
+<tr><td>v3.31</td><td>
+Increase initial main buffer size(x64:128MB -&gt; 256MB, x86:64MB -&gt; 128MB).<br>
+Increase maximum attributes buffer size (x64:1GB -&gt; 8GB).<br>
+Increase path buffer size for verify/move (x64:8MB -&gt; 128MB) and it can be changed in fastcopy2.ini (max_movesize/max_digestsize).<br>
+Change Grace period of compare timestamp(ms) to 64bit (max 23days -&gt; unlimit)<br>
+Use NOBUFFERING flag evenif it is a network file when the file is big.<br>
+Allow BOM in the specified files by /srcfile= or /srcfile_w= options.<br>
+Improve buffer separation policy.<br>
+Take a measure for DLL preload attack.
+</td></tr>
+
 <tr><td>v3.30</td><td>
 Add xxHash option for verify.<br>
 Add file creation mode (experimental).<br>

diff --git a/readme.txt b/readme.txt
@@ -1,5 +1,5 @@
 ======================================================================
-                     FastCopy  ver3.30                 2017/03/06
+                     FastCopy  ver3.32                 2017/08/07
                                             H.Shirouzu（白水啓章）
 ======================================================================
 

diff --git a/readme_eng.txt b/readme_eng.txt
@@ -1,5 +1,5 @@
 ======================================================================
-                   FastCopy  ver3.30                   2017/03/06
+                   FastCopy  ver3.32                   2017/08/07
                                                  SHIROUZU Hiroaki
 ======================================================================
 

diff --git a/src/cfg.cpp b/src/cfg.cpp
@@ -1,9 +1,9 @@
 static char *cfg_id = 
-	"@(#)Copyright (C) 2004-2017 H.Shirouzu		cfg.cpp	ver3.30";
+	"@(#)Copyright (C) 2004-2017 H.Shirouzu		cfg.cpp	ver3.31";
 /* ========================================================================
 	Project  Name			: Fast/Force copy file and directory
 	Create					: 2004-09-15(Wed)
-	Update					: 2017-03-06(Mon)
+	Update					: 2017-07-30(Sun)
 	Copyright				: H.Shirouzu
 	License					: GNU General Public License version 3
 	======================================================================== */
@@ -65,6 +65,8 @@
 #define MAXDIRSIZEOLD_KEY		"max_dirsize"
 #define MAXDIRSIZE_KEY			"max_dirsize2"
 #define MINSECTOR_KEY			"min_sectorsize"
+#define MAXMOVESIZE_KEY			"max_movesize"
+#define MAXDIGESTSIZE_KEY		"max_digestsize"
 //#define SHEXTAUTOCLOSE_KEY	"shext_autoclose"
 //#define SHEXTTASKTRAY_KEY		"shext_tasktray"
 //#define SHEXTNOCONFIRM_KEY	"shext_dd_noconfirm"
@@ -138,15 +140,23 @@
 #define DEFAULT_MAXRUNNUM		3
 #define DEFAULT_MAXOVLNUM		4
 #ifdef _WIN64
-#define DEFAULT_BUFSIZE			128
+#define DEFAULT_BUFSIZE			256
 #define DEFAULT_MAXTRANSSIZE	16
-#define DEFAULT_MAXATTRSIZE		(32768)
-#define DEFAULT_MAXDIRSIZE		(32768)
+#define DEFAULT_MAXATTRSIZE		(8192)
+#define DEFAULT_MAXDIRSIZE		(8192)
+#define DEFAULT_MAXMOVESIZE		(128)
+#define DEFAULT_MAXDIGESTSIZE	(128)
+#define DEFAULT_MOVESIZE		(16)
+#define DEFAULT_DIGESTSIZE		(16)
 #else
-#define DEFAULT_BUFSIZE			64
+#define DEFAULT_BUFSIZE			128
 #define DEFAULT_MAXTRANSSIZE	8
 #define DEFAULT_MAXATTRSIZE		(128)
 #define DEFAULT_MAXDIRSIZE		(128)
+#define DEFAULT_MAXMOVESIZE		(16)
+#define DEFAULT_MAXDIGESTSIZE	(16)
+#define DEFAULT_MOVESIZE		(8)
+#define DEFAULT_DIGESTSIZE		(8)
 #endif
 #define DEFAULT_MAXOPENFILES	256
 #define DEFAULT_NBMINSIZE_NTFS	64		// nbMinSize 参照
@@ -491,14 +501,23 @@ BOOL Cfg::ReadIni(WCHAR *user_dir, WCHAR *virtual_dir)
 		maxDirSize = DEFAULT_MAXDIRSIZE;
 	}
 
+	maxMoveSize = ini.GetInt(MAXMOVESIZE_KEY, DEFAULT_MAXMOVESIZE);
+	if (maxMoveSize < DEFAULT_MOVESIZE) {
+		maxMoveSize = DEFAULT_MOVESIZE;
+	}
+	maxDigestSize = ini.GetInt(MAXDIGESTSIZE_KEY, DEFAULT_MAXDIGESTSIZE);
+	if (maxDigestSize < DEFAULT_DIGESTSIZE) {
+		maxDigestSize = DEFAULT_DIGESTSIZE;
+	}
+
 	minSectorSize	= ini.GetInt(MINSECTOR_KEY, 0);
 	if (minSectorSize % 512) {
 		minSectorSize = 0;
 	}
 
 	nbMinSizeNtfs	= ini.GetInt(NONBUFMINSIZENTFS_KEY, DEFAULT_NBMINSIZE_NTFS);
 	nbMinSizeFat	= ini.GetInt(NONBUFMINSIZEFAT_KEY, DEFAULT_NBMINSIZE_FAT);
-	timeDiffGrace	= ini.GetInt(TIMEDIFFGRACE_KEY, 0);
+	timeDiffGrace	= ini.GetInt64(TIMEDIFFGRACE_KEY, 0);
 
 	isReadOsBuf		= ini.GetInt(ISREADOSBUF_KEY, FALSE);
 	isWShareOpen	= ini.GetInt(WRITESHAREOPEN_KEY, FALSE);
@@ -751,7 +770,7 @@ BOOL Cfg::WriteIni(void)
 //	ini.SetInt(MAXOPENFILES_KEY, maxOpenFiles);
 	ini.SetInt(NONBUFMINSIZENTFS_KEY, nbMinSizeNtfs);
 	ini.SetInt(NONBUFMINSIZEFAT_KEY, nbMinSizeFat);
-	ini.SetInt(TIMEDIFFGRACE_KEY, timeDiffGrace);
+	ini.SetInt64(TIMEDIFFGRACE_KEY, timeDiffGrace);
 
 	ini.SetInt(ISREADOSBUF_KEY, isReadOsBuf);
 	//ini.SetInt(WRITESHAREOPEN_KEY, isWShareOpen);

diff --git a/src/cfg.h b/src/cfg.h
@@ -1,9 +1,9 @@
 /* static char *cfg_id = 
-	"@(#)Copyright (C) 2005-2017 H.Shirouzu		cfg.h	Ver3.30"; */
+	"@(#)Copyright (C) 2005-2017 H.Shirouzu		cfg.h	Ver3.31"; */
 /* ========================================================================
 	Project  Name			: Fast/Force copy file and directory
 	Create					: 2005-01-23(Sun)
-	Update					: 2017-03-06(Mon)
+	Update					: 2017-07-30(Sun)
 	Copyright				: H.Shirouzu
 	License					: GNU General Public License version 3
 	======================================================================== */
@@ -139,10 +139,12 @@ class Cfg {
 	int		maxOpenFiles;
 	int		maxAttrSize;	// MB
 	int		maxDirSize;		// MB
+	int		maxMoveSize;	// MB
+	int		maxDigestSize;	// MB
 	int		minSectorSize;
 	int		nbMinSizeNtfs;
 	int		nbMinSizeFat;
-	int		timeDiffGrace;
+	int64	timeDiffGrace;
 	BOOL	isReadOsBuf;
 	BOOL	isWShareOpen;
 	int		maxHistory;