Changeset 1719 for branches/eraser6/6.0

Timestamp:

1/29/2010 12:40:49 AM (3 years ago)

Author:

lowjoel

Message:

Backported changes from trunk.

r1718: Author: lowjoel: When we have problems starting Eraser from the shell extension check the return code for ERROR_ELEVATION_REQUIRED; if we get that, then we should re-run the operation as an administrator.
r1717: Author: lowjoel: If the directory we are deleting does not exist, we should just return -- there's nothing to be deleted.
r1716: Author: lowjoel: Catch IOExceptions when we try to connect to other running instances and show a error message when one occurs.
r1715: Author: lowjoel: Set that files are not meant to be indexed when it is meant for deletion before we even set the file times.
r1714: Author: lowjoel: Fixed race condition potentially created by initialising the remote executor server thread immediately upon construction since Run is not yet called.
r1713: Author: lowjoel: Since we only force the creation of the SchedulerPanel?'s handle in the constructor, InvokeRequired? should be called on the panel itself, and not on subcontrols as they are still delay-constructed. Fixes crash when Eraser is started quietly and a task is created remotely.
r1712: Author: lowjoel: ThreadAbortExceptions? should not trigger BlackBox? report creation.

Location:

branches/eraser6/6.0

Files:

• . (modified) (1 prop)
• Eraser.DefaultPlugins/FileSystems/Windows.cs (modified) (2 diffs)
• Eraser.Manager/DirectExecutor.cs (modified) (1 diff)
• Eraser.Manager/RemoteExecutor.cs (modified) (2 diffs)
• Eraser/Program.cs (modified) (1 diff)
• Eraser/SchedulerPanel.cs (modified) (2 diffs)
• ShellExt/CtxMenu.cpp (modified) (1 diff)

branches/eraser6/6.0/Eraser.DefaultPlugins/FileSystems/Windows.cs

@@ -40 +40 @@
             //Set the date of the file to be invalid to prevent forensic
             //detection
+            info.Attributes = FileAttributes.NotContentIndexed;
             info.CreationTime = info.LastWriteTime = info.LastAccessTime = MinTimestamp;
-            info.Attributes = FileAttributes.Normal;
-            info.Attributes = FileAttributes.NotContentIndexed;
 
             //Rename the file a few times to erase the entry from the file system
@@ -127 +126 @@
                 throw new InvalidOperationException(S._("The folder {0} cannot be deleted as it is " +
                     "not empty."));
+
+            //If the directory does not already exist, we should just return -- there's
+            //nothing to be done.
+            if (!info.Exists)
+                return;
 
             //TODO: check for reparse points

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

@@ -278 +278 @@
                                 throw;
                             }
+                            catch (ThreadAbortException)
+                            {
+                            }
                             catch (Exception e)
                             {

branches/eraser6/6.0/Eraser.Manager/RemoteExecutor.cs

@@ -100 +100 @@
             thread = new Thread(Main);
             serverLock = new Semaphore(maxServerInstances, maxServerInstances);
-
-            thread.Start();
-            Thread.Sleep(0);
         }
 
@@ -125 +122 @@
 
             base.Dispose(disposing);
+        }
+
+        public override void Run()
+        {
+            thread.Start();
+            Thread.Sleep(0);
+            base.Run();
         }
 

branches/eraser6/6.0/Eraser/Program.cs

@@ -392 +392 @@
                         MessageBoxIcon.Information, MessageBoxDefaultButton.Button1,
                         S.IsRightToLeft(null) ? MessageBoxOptions.RtlReading : 0);
+                }
+                catch (IOException ex)
+                {
+                    MessageBox.Show(S._("Another instance of Eraser is already running but " +
+                        "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 : 0));
                 }
                 catch (TimeoutException)

branches/eraser6/6.0/Eraser/SchedulerPanel.cs

@@ -186 +186 @@
         void task_TaskStarted(object sender, TaskEventArgs e)
         {
-            if (scheduler.InvokeRequired)
+            if (InvokeRequired)
             {
                 Invoke(new EventHandler<TaskEventArgs>(task_TaskStarted), sender, e);
@@ -212 +212 @@
             //Make sure we handle the event in the main thread as this requires
             //GUI calls.
-            if (scheduler.InvokeRequired)
+            if (InvokeRequired)
             {
                 Invoke(new EventHandler<TaskProgressEventArgs>(task_ProgressChanged), sender, e);

branches/eraser6/6.0/ShellExt/CtxMenu.cpp

@@ -954 +954 @@
                 NULL, NULL, &startupInfo, &processInfo))
             {
+                //Why did we fail? Is it because we have too many files
                 if (GetLastError() == ERROR_FILENAME_EXCED_RANGE)
                     throw FormatString(LoadString(IDS_ERROR_TOO_MANY_FILES));
+                
+                //Or if elevation is required for this operation
+                else if (GetLastError() == ERROR_ELEVATION_REQUIRED)
+                    return RunEraser(action, parameters, true, parent, show);
+
+                //Or otherwise?
                 else
                     throw FormatString(LoadString(IDS_ERROR_MISC), FormatError().c_str());