Changeset 716

Timestamp:

12/5/2008 12:58:12 PM (4 years ago)

Author:

lowjoel

Message:

-Replaced the CEraserLPVERBS constants with an Actions enumeration
-Only display relevant actions when a recycle bin context menu is requested (unused space is irrelevant here)

Location:

branches/eraser6/ShellExt

Files:

• CtxMenu.cpp (modified) (11 diffs)
• CtxMenu.h (modified) (3 diffs)

branches/eraser6/ShellExt/CtxMenu.cpp

@@ -46 +46 @@
     };
 
+    struct KEY_NODE_INFORMATION
+    {
+        LARGE_INTEGER LastWriteTime;
+        ULONG TitleIndex;
+        ULONG ClassOffset;
+        ULONG ClassLength;
+        ULONG NameLength;
+        WCHAR Name[1];
+    };
+
     typedef NTSTATUS (*pZwQueryKey)(HANDLE KeyHandle, KEY_INFORMATION_CLASS KeyInformationClass,
         PVOID KeyInformation, ULONG Length, PULONG ResultLength);
@@ -116 +126 @@
         if (FAILED(pDataObj->GetData(&fmt, &stg)))
             //Nope! Return an "invalid argument" error back to Explorer.
-            return S_OK;
+            return E_INVALIDARG;
 
         //Get a pointer to the actual data.
@@ -166 +176 @@
         //Create the submenu, following the order defined in the CEraserLPVERB enum, creating
         //only items which are applicable.
-        CEraserLPVERBS applicableVerbs = GetApplicableActions();
+        Actions applicableActions = GetApplicableActions();
         VerbMenuIndices.clear();
-        if (applicableVerbs & CERASER_ERASE)
-        {
-            InsertMenu    (hSubmenu, CERASER_ERASE, MF_BYPOSITION, uID++,               _T("&Erase"));
-            VerbMenuIndices.push_back(CERASER_ERASE);
-        }
-        if (applicableVerbs & CERASER_ERASE_ON_RESTART)
-        {
-            InsertMenu    (hSubmenu, CERASER_ERASE_ON_RESTART, MF_BYPOSITION, uID++,    _T("Erase on &Restart"));
-            VerbMenuIndices.push_back(CERASER_ERASE_ON_RESTART);
-        }
-        if (applicableVerbs & CERASER_ERASE_UNUSED_SPACE)
-        {
-            InsertMenu    (hSubmenu, CERASER_ERASE_UNUSED_SPACE, MF_BYPOSITION, uID++,  _T("Erase &Unused Space"));
-            VerbMenuIndices.push_back(CERASER_ERASE_UNUSED_SPACE);
+        if (applicableActions & ACTION_ERASE)
+        {
+            InsertMenu    (hSubmenu, ACTION_ERASE, MF_BYPOSITION, uID++,                _T("&Erase"));
+            VerbMenuIndices.push_back(ACTION_ERASE);
+        }
+        if (applicableActions & ACTION_ERASE_ON_RESTART)
+        {
+            InsertMenu    (hSubmenu, ACTION_ERASE_ON_RESTART, MF_BYPOSITION, uID++, _T("Erase on &Restart"));
+            VerbMenuIndices.push_back(ACTION_ERASE_ON_RESTART);
+        }
+        if (applicableActions & ACTION_ERASE_UNUSED_SPACE)
+        {
+            InsertMenu    (hSubmenu, ACTION_ERASE_UNUSED_SPACE, MF_BYPOSITION, uID++,   _T("Erase &Unused Space"));
+            VerbMenuIndices.push_back(ACTION_ERASE_UNUSED_SPACE);
         }
         //-------------------------------------------------------------------------
-        if (applicableVerbs & CERASER_SECURE_MOVE)
+        if (applicableActions & ACTION_SECURE_MOVE)
         {
             if (uID - uidFirstCmd > 0)
-                InsertMenuItem(hSubmenu, CERASER_SEPERATOR_1, TRUE, GetSeparator());
-            InsertMenu    (hSubmenu, CERASER_SECURE_MOVE, MF_BYPOSITION, uID++,         _T("Secure &Move"));
-            VerbMenuIndices.push_back(CERASER_SECURE_MOVE);
+                InsertMenuItem(hSubmenu, 0, FALSE, GetSeparator());
+            InsertMenu    (hSubmenu, ACTION_SECURE_MOVE, MF_BYPOSITION, uID++,          _T("Secure &Move"));
+            VerbMenuIndices.push_back(ACTION_SECURE_MOVE);
         }
 
@@ -319 +329 @@
             return false;
 
-        /*Handle<HFONT> font = CreateFontIndirect(&logFont);
-        SelectObject(hdc, font);*/
         SIZE textSize;
         if (!GetTextExtentPoint32(hdc, m_szMenuTitle, static_cast<DWORD>(wcslen(m_szMenuTitle)), &textSize))
@@ -342 +350 @@
 
         //Check idCmd, it must be 0 or 1 since we have two menu items.
-        if ( idCmd > 2 )
+        if (idCmd > 2)
             return E_INVALIDARG;
 
@@ -413 +421 @@
         switch (VerbMenuIndices[LOWORD(pCmdInfo->lpVerb)])
         {
-        case CERASER_ERASE:
+        case ACTION_ERASE:
             {
                 //Add Task command.
@@ -446 +454 @@
             }
             // NOT IMPLEMENTED METHODS
-            case CERASER_ERASE_ON_RESTART:
+            case ACTION_ERASE_ON_RESTART:
             {
                 MessageBox (pCmdInfo->hwnd, szMsg, _T("Eraser v6 - Shell Extention Query"), MB_ICONINFORMATION );
@@ -534 +542 @@
     }
 
-    CCtxMenu::CEraserLPVERBS CCtxMenu::GetApplicableActions()
-    {
-        unsigned result = CERASER_ERASE | CERASER_ERASE_ON_RESTART | CERASER_SECURE_MOVE |
-            CERASER_ERASE_UNUSED_SPACE;
-
-        //Check if this is a context menu (as in, user-invoked) or a drag-and-drop
-        //operation. The latter only allows for Secure Move.
-        if (!m_szDestinationDirectory.empty())
-            result = CERASER_SECURE_MOVE;
-
+    CCtxMenu::Actions CCtxMenu::GetApplicableActions()
+    {
+        unsigned result = 0;
+        
+        //First decide the actions which are applicable to the current invocation
+        //reason.
+        switch (InvokeReason)
+        {
+        case INVOKEREASON_RECYCLEBIN:
+            result |= ACTION_ERASE | ACTION_ERASE_ON_RESTART;
+            break;
+        case INVOKEREASON_FILEFOLDER:
+            result |= ACTION_ERASE | ACTION_ERASE_ON_RESTART | ACTION_ERASE_UNUSED_SPACE;
+        case INVOKEREASON_DRAGDROP:
+            result |= ACTION_SECURE_MOVE;
+        }
+
+        //Remove actions that don't apply to the current invocation reason.
         for (std::list<std::wstring>::const_iterator i = m_szSelectedFiles.begin();
             i != m_szSelectedFiles.end(); ++i)
@@ -556 +572 @@
                 sizeof(volumeName) / sizeof(volumeName[0])))
             {
-                result &= ~CERASER_ERASE_UNUSED_SPACE;
-            }
-        }
-
-        return static_cast<CEraserLPVERBS>(result);
+                result &= ~ACTION_ERASE_UNUSED_SPACE;
+            }
+        }
+
+        return static_cast<Actions>(result);
     }
 
@@ -567 +583 @@
         ZwQueryKey = reinterpret_cast<pZwQueryKey>(GetProcAddress(
             LoadLibrary(L"Ntdll.dll"), "ZwQueryKey"));
-        ULONG keyInfoSize = sizeof(KEY_BASIC_INFORMATION);
-        KEY_BASIC_INFORMATION* keyInfo = NULL;
+        ULONG keyInfoSize = sizeof(KEY_NODE_INFORMATION);
+        KEY_NODE_INFORMATION* keyInfo = NULL;
         NTSTATUS queryResult = ERROR_MORE_DATA;
 
@@ -574 +590 @@
         {
             delete[] keyInfo;
-            keyInfo = reinterpret_cast<KEY_BASIC_INFORMATION*>(
+            keyInfo = reinterpret_cast<KEY_NODE_INFORMATION*>(
                 new char[keyInfoSize += 512]);
             ::ZeroMemory(keyInfo, keyInfoSize);
-            queryResult = ZwQueryKey(handle, KeyBasicInformation, keyInfo,
+            queryResult = ZwQueryKey(handle, KeyNodeInformation, keyInfo,
                 keyInfoSize, &keyInfoSize);
         }
 
-        std::wstring result(keyInfo->Name, keyInfoSize -
-            sizeof(KEY_BASIC_INFORMATION) + 1);
+        std::wstring result(keyInfo->Name);
         delete[] keyInfo;
         return result;

branches/eraser6/ShellExt/CtxMenu.h

@@ -57 +57 @@
         };
 
-        enum CEraserLPVERBS
+        enum Actions
         {
-            CERASER_ERASE               = 1 << 0,
-            CERASER_ERASE_ON_RESTART    = 1 << 1,
-            CERASER_ERASE_UNUSED_SPACE  = 1 << 2,
-            CERASER_SEPERATOR_1,
-            CERASER_SECURE_MOVE         = 1 << 3,
+            ACTION_ERASE                = 1 << 0,
+            ACTION_ERASE_ON_RESTART     = 1 << 1,
+            ACTION_ERASE_UNUSED_SPACE   = 1 << 2,
+            ACTION_SEPERATOR_1,
+            ACTION_SECURE_MOVE          = 1 << 3,
         };
 
@@ -81 +81 @@
         bool OnDrawItem(HDC hdc, RECT rect, UINT action, UINT state);
 
-        CEraserLPVERBS GetApplicableActions();
+        Actions GetApplicableActions();
 
         static std::wstring GetHKeyPath(HKEY handle);
@@ -95 +95 @@
         string_list m_szSelectedFiles;
         string_type m_szDestinationDirectory;
-        std::vector<CEraserLPVERBS> VerbMenuIndices;
+        std::vector<Actions> VerbMenuIndices;
 
         static const wchar_t* m_szMenuTitle;