Changeset 2062 for trunk/eraser

Timestamp:

05/04/10 08:54:59 (3 years ago)

Author:

lowjoel

Message:

Implemented the Context menu half of the Secure Move function.

Location:

trunk/eraser

Files:

• Eraser.Shell/CtxMenu.cpp (modified) (4 diffs)
• Eraser.Shell/Eraser.Shell.rc (modified) (1 diff)
• Eraser.Shell/resource.h (modified) (2 diffs)
• Eraser/Program.cs (modified) (2 diffs)

trunk/eraser/Eraser.Shell/CtxMenu.cpp

@@ -274 +274 @@
         if (applicableActions & ACTION_SECURE_MOVE)
         {
-            InsertSeparator(hSubmenu);
+            //Insert the separator if we aren't the only menu item
+            if (applicableActions != ACTION_SECURE_MOVE)
+                InsertSeparator(hSubmenu);
+
             InsertMenu(hSubmenu, ACTION_SECURE_MOVE, MF_BYPOSITION, uID++,
                 LoadString(IDS_ACTION_SECUREMOVE).c_str());         //Secure Move
@@ -511 +514 @@
             break;
 
+        case ACTION_SECURE_MOVE:
+            //Securely move the file/folder. If the DragDropDestinationDirectory member
+            //is blank, query the user for a path to copy the items to
+            if (DragDropDestinationDirectory.empty())
+            {
+                BROWSEINFO info;
+                ::ZeroMemory(&info, sizeof(info));
+
+                //Set the title of the dialog.
+                std::wstring title(LoadString(IDS_MESSAGE_SELECT_MOVE_DESTINATION));
+                std::vector<wchar_t> titleBuffer(title.length() + 1);
+                wcscpy_s(&titleBuffer.front(), title.length() + 1, title.c_str());
+
+                //Then set the display settings.
+                info.lpszTitle = &titleBuffer.front();
+                info.ulFlags = BIF_RETURNONLYFSDIRS | BIF_RETURNFSANCESTORS | BIF_USENEWUI | BIF_SHAREABLE;
+
+                //Display the dialog.
+                PIDLIST_ABSOLUTE pidl = SHBrowseForFolder(&info);
+
+                wchar_t buffer[MAX_PATH];
+                bool pathSucceeded = SHGetPathFromIDList(pidl, buffer);
+                ILFree(pidl);
+                if (pathSucceeded)
+                    DragDropDestinationDirectory = buffer;
+                else
+                    return E_ABORT;
+            }
+
+            commandLine += L"\"/destination=" + DragDropDestinationDirectory + L"\"";
+            break;
+
         default:
             if (!(pCmdInfo->fMask & CMIC_MASK_FLAG_NO_UI))
@@ -559 +594 @@
         case INVOKEREASON_FILEFOLDER:
             result |= ACTION_ERASE | ACTION_ERASE_ON_RESTART | ACTION_ERASE_UNUSED_SPACE;
-#if 0
         case INVOKEREASON_DRAGDROP:
             result |= ACTION_SECURE_MOVE;
-#endif
         }
 
@@ -815 +848 @@
             finalParameters += L"/action=EraseUnusedSpace ";
             break;
+        case ACTION_SECURE_MOVE:
+            finalParameters += L"/action=SecureMove ";
+            break;
         default:
             return;

trunk/eraser/Eraser.Shell/Eraser.Shell.rc

@@ -221 +221 @@
 END
 
+STRINGTABLE 
+BEGIN
+    IDS_MESSAGE_SELECT_MOVE_DESTINATION 
+                            "Select the destination of the selected items"
+END
+
 #endif    // English (Neutral) resources
 /////////////////////////////////////////////////////////////////////////////

trunk/eraser/Eraser.Shell/resource.h

@@ -1 +1 @@
 //{{NO_DEPENDENCIES}}
 // Microsoft Visual C++ generated include file.
-// Used by ShellExt.rc
+// Used by Eraser.Shell.rc
 //
 #define IDS_PROJNAME                    100
@@ -22 +22 @@
 #define IDS_ERROR_MISC                  405
 #define IDS_ERROR_CANNOT_GENERATE_TEMP_FILE 406
+#define IDS_MESSAGE_SELECT_MOVE_DESTINATION 500
 
 // Next default values for new objects

trunk/eraser/Eraser/Program.cs

@@ -115 +115 @@
             [Arg("recycleBin", "The recycle bin as an erasure target", typeof(string), false, null, null)]
             public bool RecycleBin { get; set; }
+
+            /// <summary>
+            /// The destination for secure move operations, only valid when
+            /// <see cref="ShellAction"/> is <see cref="ShellActions.SecureMove"/>
+            /// </summary>
+            [Arg("destination", "The destination for secure move operations", typeof(string), false, null, null)]
+            public string Destination { get; set; }
         }
 
@@ -132 +139 @@
             /// Erase the unused space on the drive.
             /// </summary>
-            EraseUnusedSpace
+            EraseUnusedSpace,
+
+            /// <summary>
+            /// Securely moves a file from one drive to another (simple rename if the source and
+            /// destination drives are the same)
+            /// </summary>
+            SecureMove
         }