Changeset 36

Timestamp:

10/11/2007 2:02:40 PM (6 years ago)

Author:

lowjoel

Message:

Fixed the case of the duplicate menu items in the explorer context menu. This closes ​http://bbs.heidi.ie/viewtopic.php?t=2475.

File:

• trunk/Erasext/ErasextMenu.cpp (modified) (2 diffs)

trunk/Erasext/ErasextMenu.cpp

@@ -1 +1 @@
 // ErasextMenu.cpp
+// $Id$
 //
 // Eraser. Secure data removal. For Windows.
 // Copyright © 1997-2001  Sami Tolvanen (sami@tolvanen.com).
+// Copyright © 2007 The Eraser Project.
 //
 // This program is free software; you can redistribute it and/or
@@ -192 +194 @@
 STDMETHODIMP CErasextMenu::XMenuExt::QueryContextMenu(HMENU hMenu, UINT nIndex, UINT idCmdFirst, UINT /*idCmdLast*/, UINT uFlags)
 {
-    METHOD_PROLOGUE(CErasextMenu, MenuExt);
-
-    // do not show menu for shortcuts or when the shell
-    // wants only the default item, or if the user has disabled
-    // the shell extension
-
-    CKey kReg;
-    BOOL bEnabled = TRUE;
-    
-    if (kReg.Open(HKEY_CURRENT_USER, ERASER_REGISTRY_BASE))
-    {
-        kReg.GetValue(bEnabled, ERASEXT_REGISTRY_ENABLED, TRUE);
-        kReg.Close();
-    }
-
-    if (bEnabled && (uFlags & CMF_VERBSONLY) == 0 && (uFlags & CMF_DEFAULTONLY) == 0)
-    {
-        CString str;
-
-        try
-        {
-            if (pThis->m_bDragMenu)
-            {
-                if (pThis->m_bUseFiles)
-                    str.LoadString(IDS_MENU_TEXT_DRAG);
-                else
-                    return ResultFromShort(0);
-            }
-            else
-            {
-                if (!pThis->m_bUseFiles)
-                    str.LoadString(IDS_MENU_TEXT_DRIVE);
-                else
-                    str.LoadString(IDS_MENU_TEXT_FILE);
-            }
-
-            if (!InsertMenu(hMenu, nIndex++, MF_SEPARATOR| MF_BYPOSITION, idCmdFirst, ""))
+    METHOD_PROLOGUE(CErasextMenu, MenuExt);
+
+    // do not show menu for shortcuts or when the shell
+    // wants only the default item, or if the user has disabled
+    // the shell extension
+
+    CKey kReg;
+    BOOL bEnabled = TRUE;
+
+    if (kReg.Open(HKEY_CURRENT_USER, ERASER_REGISTRY_BASE))
+    {
+        kReg.GetValue(bEnabled, ERASEXT_REGISTRY_ENABLED, TRUE);
+        kReg.Close();
+    }
+
+    if (bEnabled && (uFlags & CMF_VERBSONLY) == 0 && (uFlags & CMF_DEFAULTONLY) == 0)
+    {
+        CString str;
+
+        try
+        {
+            UINT startIndex = nIndex;
+            if (!pThis->m_bDragMenu)
+            {
+                if (!InsertMenu(hMenu, nIndex++, MF_SEPARATOR | MF_BYPOSITION, idCmdFirst , ""))
+                    return ResultFromShort(0);
+
+                if (!pThis->m_bUseFiles)
+                    str.LoadString(IDS_MENU_TEXT_DRIVE);
+                else
+                    str.LoadString(IDS_MENU_TEXT_FILE);
+
+                str = setShortcut(str);
+                if (!InsertMenu(hMenu, nIndex++ , MF_STRING | MF_BYPOSITION, idCmdFirst + CMD_ERASE, str))
+                    return ResultFromShort(0);
+            }
+
+            if (pThis->m_bUseFiles)
+            {
+                str.LoadString(IDS_MENU_TEXT_DRAG);
+                str = setShortcut(str);
+                if (!InsertMenu(hMenu, nIndex++ , MF_STRING | MF_BYPOSITION, idCmdFirst + CMD_MOVE, str))
+                    return ResultFromShort(0);
+            }
+
+            if (!InsertMenu(hMenu, nIndex++, MF_SEPARATOR | MF_BYPOSITION, idCmdFirst , ""))
                 return ResultFromShort(0);
 
-            
-            str = setShortcut(str);
-            if (!InsertMenu(hMenu, nIndex++ , MF_STRING | MF_BYPOSITION , idCmdFirst + CMD_ERASE, str))
-                return ResultFromShort(0);
-
-            CString moveStr;
-            //ASSERT(moveStr.LoadString(IDS_MENU_TEXT_DRAG));
-            moveStr.LoadString(IDS_MENU_TEXT_DRAG);
-            
-            moveStr = setShortcut(moveStr);
-            if (!InsertMenu(hMenu, nIndex++, MF_STRING | MF_BYPOSITION, idCmdFirst + CMD_MOVE, moveStr))
-                return ResultFromShort(0);
-
-
-            if (!InsertMenu(hMenu, nIndex++, MF_SEPARATOR| MF_BYPOSITION, idCmdFirst , ""))
-                return ResultFromShort(0);
-
-            return MAKE_HRESULT(SEVERITY_SUCCESS, 0, CMD_MOVE + 1);
-        }
-        catch (CException *e)
-        {
-            ASSERT(FALSE);
-
-            e->ReportError(MB_ICONERROR);
-            e->Delete();
-        }
-        catch (...)
-        {
-            ASSERT(FALSE);
-        }
-    }
-
-    return ResultFromShort(0);
+            return MAKE_HRESULT(SEVERITY_SUCCESS, 0, nIndex - startIndex);
+        }
+        catch (CException *e)
+        {
+            ASSERT(FALSE);
+
+            e->ReportError(MB_ICONERROR);
+            e->Delete();
+        }
+        catch (...)
+        {
+            ASSERT(FALSE);
+        }
+    }
+
+    return ResultFromShort(0);
 }