Changeset 2119 for trunk/eraser

Timestamp:

5/15/2010 10:30:48 AM (3 years ago)

Author:

lowjoel

Message:

Implemented initialisation code for Secure Paste. Addresses #60: Eraser Secure Cut.

Location:

trunk/eraser/Eraser.Shell

Files:

• CtxMenu.cpp (modified) (4 diffs)
• CtxMenu.h (modified) (2 diffs)

trunk/eraser/Eraser.Shell/CtxMenu.cpp

@@ -123 +123 @@
         }
 
+        //Check whether pDataObj is NULL: if so, it is a directory background click
+        else if (pDataObj == NULL)
+        {
+            InvokeReason = INVOKEREASON_DIRECTORY_BACKGROUND;
+
+            //Translate the drop path to a location on the filesystem.
+            wchar_t dropTargetPath[MAX_PATH];
+            if (!SHGetPathFromIDList(pidlFolder, dropTargetPath))
+                return E_FAIL;
+
+            DragDropDestinationDirectory = dropTargetPath;
+
+            //We can't do anything else. The data object is null.
+            return S_OK;
+        }
+
         //Check pidlFolder for the drop path, if it exists. This is for drag-and-drop
         //context menus.
@@ -211 +227 @@
         //only items which are applicable.
         Actions applicableActions = GetApplicableActions();
+
+        //If we have no actions that the user can execute, just return an error code.
+        if (!applicableActions)
+            return E_INVALIDARG;
+
         VerbMenuIndices.clear();
         if (applicableActions & ACTION_ERASE)
@@ -596 +617 @@
         case INVOKEREASON_DRAGDROP:
             result |= ACTION_SECURE_MOVE;
+            break;
+        case INVOKEREASON_DIRECTORY_BACKGROUND:
+            result |= ACTION_SECURE_PASTE;
         }
 
@@ -614 +638 @@
             }
         }
+
+        //Check that the clipboard has files for querying.
+        if (OpenClipboard(NULL))
+        {
+            UINT clipboardFormat = 0;
+            while ((clipboardFormat = EnumClipboardFormats(clipboardFormat)) != 0)
+                if (clipboardFormat == CF_HDROP)
+                    break;
+
+            if (clipboardFormat != CF_HDROP)
+                result &= ~ACTION_SECURE_PASTE;
+            CloseClipboard();
+        }
+        else
+            result &= ~ACTION_SECURE_PASTE;
 
         return static_cast<Actions>(result);

trunk/eraser/Eraser.Shell/CtxMenu.h

@@ -50 +50 @@
         {
             INVOKEREASON_FILEFOLDER,
+            INVOKEREASON_DIRECTORY_BACKGROUND,
             INVOKEREASON_DRAGDROP,
             INVOKEREASON_RECYCLEBIN
@@ -62 +63 @@
             ACTION_SEPERATOR_1,
             ACTION_SECURE_MOVE          = 1 << 3,
+            ACTION_SECURE_PASTE         = 1 << 4
         };