From: konekoneko <jbh03215@gmail.com>
Date: Sun, 29 Jul 2012 20:22:02 +0000 (+0900)
Subject: 一部ツールで復元できてしまう不具合を修正した
X-Git-Url: http://git.sourceforge.jp/view?p=completeeraser%2FCompleteEraser.git;a=commitdiff_plain;h=6ec07859c63bff0a0ebc31b46434d2bc78a1a50f

一部ツールで復元できてしまう不具合を修正した
---

diff --git a/CompleteEraser/FileBreaker.cs b/CompleteEraser/FileBreaker.cs
index 901bd7b..8a49470 100644
--- a/CompleteEraser/FileBreaker.cs
+++ b/CompleteEraser/FileBreaker.cs
@@ -12,6 +12,7 @@ namespace CompleteEraser
 {
     class FileBreaker
     {
+        const long ShirnkLength = 1;
 
         public static void BreakFileOrFolder(string path)
         {
@@ -54,33 +55,23 @@ namespace CompleteEraser
 
         private static void BreakFileSlowSpeed(FileStream fs)
         {
-            if (BreakFileInMFTArea(fs))
-                return;
             fs.Seek(0, SeekOrigin.Begin);
             byte[] data = new byte[Settings.Default.FillLengthAtHiSpeed];
             for (long i = 0; i < fs.Length; i += data.Length)
                 fs.Write(data,0,data.Length);
+            fs.Flush(true);
+            fs.SetLength(ShirnkLength);
         }
 
         private static void BreakFileHiSpeed(FileStream fs)
         {
-            if (BreakFileInMFTArea(fs))
-                return;
             fs.Seek(0, SeekOrigin.Begin);
             byte[] data = new byte[Settings.Default.FillLengthAtHiSpeed];
             fs.Write(data, 0, data.Length);
             fs.Seek(-data.Length, SeekOrigin.End);
             fs.Write(data, 0, data.Length);
-        }
-
-        private static bool BreakFileInMFTArea(FileStream fs)
-        {
-            if (fs.Length >= 1024)  //MFTのレコードサイズ以上か
-                return false;
-            fs.Seek(0, SeekOrigin.Begin);
-            byte[] data = new byte[fs.Length];
-            fs.Write(data, 0, data.Length);
-            return true;
+            fs.Flush(true);
+            fs.SetLength(ShirnkLength);
         }
 
         public static void BreakFolder(string folder)
diff --git a/CompleteEraser/Properties/AssemblyInfo.cs b/CompleteEraser/Properties/AssemblyInfo.cs
index 849473e..dfdb4f7 100644
--- a/CompleteEraser/Properties/AssemblyInfo.cs
+++ b/CompleteEraser/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // すべての値を指定するか、下のように '*' を使ってビルドおよびリビジョン番号を 
 // 既定値にすることができます:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.15.0.0")]
-[assembly: AssemblyFileVersion("1.15.0.0")]
+[assembly: AssemblyVersion("1.16.0.0")]
+[assembly: AssemblyFileVersion("1.16.0.0")]
diff --git a/Installer/installer.xml b/Installer/installer.xml
index 413241a..604b253 100644
--- a/Installer/installer.xml
+++ b/Installer/installer.xml
@@ -4,10 +4,10 @@
 
   <!-- バージョンアップ時にはProductVersionとProductのId属性を更新すること -->
   <?define UpgradeCode = "ABE07AF2-98D1-44B2-A05F-E2A94271F7A7"?>
-  <?define ProductVersion = "1.15.0"?>
+  <?define ProductVersion = "1.16.0"?>
 
   <Product Name="CompleteEraser"
-           Id="07A584E0-0A63-49B7-838C-71D664FC2093"
+           Id="1DE24257-0DE6-4097-ADDF-2CECB70AE443"
            UpgradeCode="$(var.UpgradeCode)"
            Language="1041" Codepage="932"
            Version="$(var.ProductVersion)" Manufacturer="FooProject">