Changeset 1769

Timestamp:

2/8/2010 7:29:41 AM (2 years ago)

Author:

lowjoel

Message:

Updated to trunk r1764

Location:

branches/eraser6/CodeReview

Files:

• . (modified) (1 prop)
• Eraser.DefaultPlugins/ErasureMethods/FirstLast16KB.cs (modified) (4 diffs)
• Eraser.Manager/DirectExecutor.cs (modified) (2 diffs)
• Eraser.msbuild (modified) (1 prop)
• Eraser/BlackBoxMainForm.cs (modified) (1 diff)
• Eraser/BlackBoxMainForm.it.resx (modified) (1 prop)
• Eraser/BlackBoxUploadForm.it.resx (modified) (1 prop)
• Eraser/MainForm.cs (modified) (2 diffs)
• Eraser/Program.GuiProgram.cs (modified) (1 diff)
• Eraser/Strings.NL.resx (modified) (2 diffs)
• Eraser/Strings.en.resx (modified) (2 diffs)
• Eraser/Strings.it.resx (modified) (2 diffs)
• Eraser/Strings.resx (modified) (2 diffs)

branches/eraser6/CodeReview/Eraser.DefaultPlugins/ErasureMethods/FirstLast16KB.cs

@@ -86 +86 @@
             if (paths == null)
             {
-                if (targetSize <= dataSize)
+                if (targetSize <= DataSize)
                     amountToWrite = targetSize;
                 else
-                    amountToWrite = dataSize * 2;
+                    amountToWrite = DataSize * 2;
             }
             else
-                amountToWrite = paths.Count * dataSize * 2;
+                amountToWrite = paths.Count * DataSize * 2;
 
             //The final amount has to be multiplied by the number of passes.
@@ -116 +116 @@
             //If the target stream is shorter than or equal to 32kb, just forward it to
             //the default function.
-            if (strm.Length < dataSize * 2)
+            if (strm.Length < DataSize * 2)
             {
                 method.Erase(strm, erasureLength, prng, callback);
@@ -124 +124 @@
             //We need to intercept the callback function as we run the erasure method
             //twice on two parts of the file.
+            long dataSize = method.CalculateEraseDataSize(null, DataSize * 2);
             ErasureMethodProgressFunction customCallback =
                 delegate(long lastWritten, long totalData, int currentPass)
                 {
-                    callback(lastWritten, dataSize * 2, currentPass);
+                    callback(lastWritten, dataSize, currentPass);
                 };
 
@@ -142 +143 @@
         /// The amount of data to be erased from the header and the end of the file.
         /// </summary>
-        private const long dataSize = 16 * 1024;
+        private const long DataSize = 16 * 1024;
 
         private ErasureMethod method;

branches/eraser6/CodeReview/Eraser.Manager/DirectExecutor.cs

@@ -55 +55 @@
                 thread.Abort();
                 schedulerInterrupt.Set();
+
+                //Wait for the executor thread to exit -- we call some event functions
+                //and these events may need invocation on the main thread. So,
+                //pump messages from the main thread until the thread exits.
+                if (System.Windows.Forms.Application.MessageLoop)
+                {
+                    if (!thread.Join(new TimeSpan(0, 0, 0, 0, 100)))
+                        System.Windows.Forms.Application.DoEvents();
+                }
+
+                //If we are disposing on a secondary thread, or a thread without
+                //a message loop, just wait for the thread to exit indefinitely
+                else
+                    thread.Join();
+
                 schedulerInterrupt.Close();
             }
@@ -615 +630 @@
                             "not be erased because the file was either compressed, encrypted or " +
                             "a sparse file.", info.FullName), LogLevel.Error));
+                        continue;
                     }
 

branches/eraser6/CodeReview/Eraser/BlackBoxMainForm.cs

@@ -58 +58 @@
         private void ReportsLv_ItemActivate(object sender, EventArgs e)
         {
+            if (ReportsLv.SelectedItems.Count == 0)
+                return;
+
             Process.Start((ReportsLv.SelectedItems[0].Tag as BlackBoxReport).Path);
         }

branches/eraser6/CodeReview/Eraser/MainForm.cs

@@ -34 +34 @@
 using System.Diagnostics;
 using System.Reflection;
+using System.Runtime.Serialization;
 
 namespace Eraser
@@ -261 +262 @@
                         FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
                     {
-                        Program.eraserClient.Tasks.LoadFromStream(stream);
+                        try
+                        {
+                            Program.eraserClient.Tasks.LoadFromStream(stream);
+                        }
+                        catch (FileLoadException ex)
+                        {
+                            MessageBox.Show(S._("The task list could not be imported. The error " +
+                                "returned was: {0}", ex.Message), S._("Eraser"),
+                                MessageBoxButtons.OK, MessageBoxIcon.Error,
+                                MessageBoxDefaultButton.Button1,
+                                S.IsRightToLeft(null) ? MessageBoxOptions.RtlReading : 0);
+                        }
+                        catch (SerializationException ex)
+                        {
+                            MessageBox.Show(S._("The task list could not be imported. The error " +
+                                "returned was: {0}", ex.Message), S._("Eraser"),
+                                MessageBoxButtons.OK, MessageBoxIcon.Error,
+                                MessageBoxDefaultButton.Button1,
+                                S.IsRightToLeft(null) ? MessageBoxOptions.RtlReading : 0);
+                        }
                     }
                 }

branches/eraser6/CodeReview/Eraser/Program.GuiProgram.cs

@@ -162 +162 @@
                     {
                         MessageBox.Show(S._("Another instance of Eraser is already running but " +
-                            "cannot be connected to.\n\nThe error returned was: {0}", ex.Message,
+                            "cannot be connected to.\n\nThe error returned was: {0}", ex.Message),
                             S._("Eraser"), MessageBoxButtons.OK, MessageBoxIcon.Error,
                             MessageBoxDefaultButton.Button1,
                             S.IsRightToLeft(null) ?
-                                MessageBoxOptions.RtlReading | MessageBoxOptions.RightAlign : 0));
+                                MessageBoxOptions.RtlReading | MessageBoxOptions.RightAlign : 0);
                     }
                     catch (TimeoutException)

branches/eraser6/CodeReview/Eraser/Strings.NL.resx

@@ -163 +163 @@
     <value>(Untranslated)</value>
   </data>
+  <data name="The task list could not be imported. The error returned was: {0}" xml:space="preserve">
+    <value>(Untranslated)</value>
+  </data>
   <data name="The Eraser documentation file could not be opened. Check that Adobe Reader installed and that your Eraser install is not corrupt.\n\nThe error returned was: {0}" xml:space="preserve">
     <value>(Untranslated)</value>
@@ -175 +178 @@
     <value>(Untranslated)</value>
   </data>
-  <data name="Another instance of Eraser is already running but cannot be connected to.\n\nThe error returned was: {0}Eraser" xml:space="preserve">
+  <data name="Another instance of Eraser is already running but cannot be connected to.\n\nThe error returned was: {0}" xml:space="preserve">
     <value>(Untranslated)</value>
   </data>

branches/eraser6/CodeReview/Eraser/Strings.en.resx

@@ -163 +163 @@
     <value>Session: {0:F}</value>
   </data>
+  <data name="The task list could not be imported. The error returned was: {0}" xml:space="preserve">
+    <value>The task list could not be imported. The error returned was: {0}</value>
+  </data>
   <data name="The Eraser documentation file could not be opened. Check that Adobe Reader installed and that your Eraser install is not corrupt.\n\nThe error returned was: {0}" xml:space="preserve">
     <value>The Eraser documentation file could not be opened. Check that Adobe Reader installed and that your Eraser install is not corrupt.\n\nThe error returned was: {0}</value>
@@ -175 +178 @@
     <value>Another instance of Eraser is already running but it is running with higher privileges than this instance of Eraser.\n\nEraser will now exit.</value>
   </data>
-  <data name="Another instance of Eraser is already running but cannot be connected to.\n\nThe error returned was: {0}Eraser" xml:space="preserve">
-    <value>(Untranslated)</value>
+  <data name="Another instance of Eraser is already running but cannot be connected to.\n\nThe error returned was: {0}" xml:space="preserve">
+    <value>Another instance of Eraser is already running but cannot be connected to.\n\nThe error returned was: {0}</value>
   </data>
   <data name="Total: {0,2:#0.00%}" xml:space="preserve">

branches/eraser6/CodeReview/Eraser/Strings.it.resx

@@ -163 +163 @@
     <value>Sessione: {0:F}</value>
   </data>
+  <data name="The task list could not be imported. The error returned was: {0}" xml:space="preserve">
+    <value>(Untranslated)</value>
+  </data>
   <data name="The Eraser documentation file could not be opened. Check that Adobe Reader installed and that your Eraser install is not corrupt.\n\nThe error returned was: {0}" xml:space="preserve">
     <value>La documentazione di Eraser non può essere aperta. Verificare che Adobe Acrobat Reader sia installato e che la vostra installazione di Eraser non sia corrotta.\n\nL'errore è stato: {0}</value>
@@ -175 +178 @@
     <value>Un'altra occorrenza di Eraser è già in esecuzione, ma con privilegi più elevati di questa.\n\nEraser adesso si chiuderà.</value>
   </data>
-  <data name="Another instance of Eraser is already running but cannot be connected to.\n\nThe error returned was: {0}Eraser" xml:space="preserve">
+  <data name="Another instance of Eraser is already running but cannot be connected to.\n\nThe error returned was: {0}" xml:space="preserve">
     <value>(Untranslated)</value>
   </data>

branches/eraser6/CodeReview/Eraser/Strings.resx

@@ -163 +163 @@
     <value>Session: {0:F}</value>
   </data>
+  <data name="The task list could not be imported. The error returned was: {0}" xml:space="preserve">
+    <value>The task list could not be imported. The error returned was: {0}</value>
+  </data>
   <data name="The Eraser documentation file could not be opened. Check that Adobe Reader installed and that your Eraser install is not corrupt.\n\nThe error returned was: {0}" xml:space="preserve">
     <value>The Eraser documentation file could not be opened. Check that Adobe Reader installed and that your Eraser install is not corrupt.\n\nThe error returned was: {0}</value>
@@ -175 +178 @@
     <value>Another instance of Eraser is already running but it is running with higher privileges than this instance of Eraser.\n\nEraser will now exit.</value>
   </data>
-  <data name="Another instance of Eraser is already running but cannot be connected to.\n\nThe error returned was: {0}Eraser" xml:space="preserve">
-    <value>Another instance of Eraser is already running but cannot be connected to.\n\nThe error returned was: {0}Eraser</value>
+  <data name="Another instance of Eraser is already running but cannot be connected to.\n\nThe error returned was: {0}" xml:space="preserve">
+    <value>Another instance of Eraser is already running but cannot be connected to.\n\nThe error returned was: {0}</value>
   </data>
   <data name="Total: {0,2:#0.00%}" xml:space="preserve">