Changeset 2120 for trunk/eraser

Timestamp:

5/15/2010 11:35:15 AM (3 years ago)

Author:

lowjoel

Message:

Addresses #60: Eraser Secure Cut.

• Implemented the display and the invocation of the Eraser Secure Paste command.
• Only respond to Cut operations, ignore copy operations (otherwise we will be cutting the file, not copying it when we paste)

Location:

trunk/eraser/Eraser.Shell

Files:

• CtxMenu.cpp (modified) (6 diffs)
• CtxMenu.h (modified) (1 diff)

trunk/eraser/Eraser.Shell/CtxMenu.cpp

@@ -170 +170 @@
             return E_INVALIDARG;
 
-        //Sanity check - make sure there is at least one filename.
-        UINT uNumFiles = DragQueryFile(hDrop, 0xFFFFFFFF, NULL, 0);
-        if (!uNumFiles)
-        {
-            GlobalUnlock(stg.hGlobal);
-            ReleaseStgMedium(&stg);
-            return E_INVALIDARG;
-        }
-
-        //Collect all the files which have been selected.
-        HRESULT hr = S_OK;
-        WCHAR buffer[MAX_PATH] = {0};
-        for (UINT i = 0; i < uNumFiles; i++)
-        {
-            UINT charsWritten = DragQueryFile(hDrop, i, buffer, sizeof(buffer) / sizeof(buffer[0]));
-            if (!charsWritten)
-            {
-                hr = E_INVALIDARG;
-                continue;
-            }
-
-            SelectedFiles.push_back(std::wstring(buffer, charsWritten));
-        }
+        //Assign the list of files selected.
+        SelectedFiles.swap(GetHDropPaths(hDrop));
 
         //Clean up.
         GlobalUnlock(stg.hGlobal);
         ReleaseStgMedium(&stg);
-        return hr;
+        return SelectedFiles.empty() ? E_INVALIDARG : S_OK;
     }
 
@@ -303 +282 @@
             VerbMenuIndices.push_back(ACTION_SECURE_MOVE);
         }
+        if (applicableActions & ACTION_SECURE_PASTE)
+        {
+            VerbMenuIndices.push_back(ACTION_SECURE_PASTE);
+        }
 
         //Insert the submenu into the Context menu provided by Explorer.
@@ -308 +291 @@
             MENUITEMINFO mii = { sizeof(MENUITEMINFO) };
             mii.wID = uID++;
-            mii.fMask = MIIM_SUBMENU | MIIM_STRING | MIIM_ID;
-            mii.hSubMenu = hSubmenu;
-            mii.dwTypeData = const_cast<wchar_t*>(MenuTitle);
+            mii.fMask = MIIM_STRING | MIIM_ID;
+            if (InvokeReason != INVOKEREASON_DIRECTORY_BACKGROUND)
+            {
+                mii.fMask |= MIIM_SUBMENU;
+                mii.hSubMenu = hSubmenu;
+                mii.dwTypeData = const_cast<wchar_t*>(MenuTitle);
+            }
+            else
+            {
+                mii.dwTypeData = L"E&raser Secure Paste";
+            }
+            
             MenuID = mii.wID;
 
@@ -567 +559 @@
             break;
 
+        case ACTION_SECURE_PASTE:
+            {
+                //Set the destination for the paste operation.
+                commandLine += L"\"/destination=" + DragDropDestinationDirectory + L"\"";
+
+                //Query the files from the clipboard.
+                std::vector<std::wstring> paths;
+                if (OpenClipboard(NULL))
+                {
+                    HDROP fileHandle = reinterpret_cast<HDROP>(GetClipboardData(CF_HDROP));
+                    if (fileHandle)
+                        SelectedFiles = GetHDropPaths(fileHandle);
+
+                    EmptyClipboard();
+                    CloseClipboard();
+                }
+            }
+            break;
+
         default:
             if (!(pCmdInfo->fMask & CMIC_MASK_FLAG_NO_UI))
@@ -642 +653 @@
         if (OpenClipboard(NULL))
         {
+            const UINT preferredDropEffect = RegisterClipboardFormat(L"Preferred DropEffect");
+            bool hasFiles = false;
+            bool hasDropEffect = false;
+            DWORD dropEffect = DROPEFFECT_NONE;
+
             UINT clipboardFormat = 0;
             while ((clipboardFormat = EnumClipboardFormats(clipboardFormat)) != 0)
+            {
                 if (clipboardFormat == CF_HDROP)
-                    break;
-
-            if (clipboardFormat != CF_HDROP)
+                    hasFiles = true;
+                else if (clipboardFormat == preferredDropEffect)
+                {
+                    hasDropEffect = true;
+                    HGLOBAL hGlobal = GetClipboardData(preferredDropEffect);
+                    DWORD* data = reinterpret_cast<DWORD*>(GlobalLock(hGlobal));
+
+                    if (data)
+                    {
+                        dropEffect = *data;
+                        GlobalUnlock(hGlobal);
+                    }
+                }
+            }
+
+            if (!hasFiles || hasDropEffect && dropEffect != DROPEFFECT_MOVE)
                 result &= ~ACTION_SECURE_PASTE;
             CloseClipboard();
@@ -830 +860 @@
             &buffer.front());
         return keyInfo->Name;
+    }
+
+    std::list<std::wstring> CCtxMenu::GetHDropPaths(HDROP hDrop)
+    {
+        //Sanity check - make sure there is at least one filename.
+        UINT uNumFiles = DragQueryFile(hDrop, 0xFFFFFFFF, NULL, 0);
+        if (!uNumFiles)
+            return std::list<std::wstring>();
+
+        //Collect all the files which have been selected.
+        HRESULT hr = S_OK;
+        WCHAR buffer[MAX_PATH] = {0};
+        std::list<std::wstring> result;
+        for (UINT i = 0; i < uNumFiles; i++)
+        {
+            UINT charsWritten = DragQueryFile(hDrop, i, buffer, sizeof(buffer) / sizeof(buffer[0]));
+            if (!charsWritten)
+            {
+                hr = E_INVALIDARG;
+                continue;
+            }
+
+            result.push_back(std::wstring(buffer, charsWritten));
+        }
+
+        return result;
     }
 

trunk/eraser/Eraser.Shell/CtxMenu.h

@@ -87 +87 @@
         static std::wstring FormatError(DWORD lastError = static_cast<DWORD>(-1));
         static std::wstring GetHKeyPath(HKEY handle);
+        static std::list<std::wstring> GetHDropPaths(HDROP hDrop);
 
         static bool IsUserAdmin();