Changeset 687

Timestamp:

12/2/2008 1:45:04 AM (4 years ago)

Author:

lowjoel

Message:

Code cleanups; removed unused/unreferenced types

Location:

branches/erasershellext/cpp

Files:

• CtxMenu.cpp (modified) (4 diffs)
• CtxMenu.h (modified) (6 diffs)
• EraserCtxMenu_i.c (modified) (1 diff)
• EraserCtxMenu_i.h (modified) (1 diff)
• EraserCtxMenu_p.c (deleted)
• dlldata.c (deleted)

branches/erasershellext/cpp/CtxMenu.cpp

@@ -8 +8 @@
 
 namespace Eraser {
-HRESULT CCtxMenu::Initialize(
-                                                            LPCITEMIDLIST   pidlFolder,
-                                                            LPDATAOBJECT    pDataObj,
-                                                            HKEY            hProgID )
+HRESULT CCtxMenu::Initialize(LPCITEMIDLIST /*pidlFolder*/, LPDATAOBJECT pDataObj,
+                             HKEY /*hProgID*/)
 {
     FORMATETC fmt = { CF_HDROP, NULL, DVASPECT_CONTENT, -1, TYMED_HGLOBAL };
@@ -295 +293 @@
     HRESULT result = E_INVALIDARG;
     // final eraser command to call
-    string_type command(S("eraser "));
-    string_type files(S("")), directories(S("")), unuseds(S(""));
+    string_type command(L"eraser ");
+    string_type files, directories, unuseds;
 
     // compile the eraser command syntax
-    foreach(file, m_szSelectedFiles)                            files       += S("\"") + *file + S("\" ");
-    foreach(unused, m_szSelectedUnused)                     unuseds     += S("--unused=\"") + *unused + S("\"");
-    foreach(directory, m_szSelectedDirectories)     directories += S("--dir=\"") + *directory + S("\" ");
+    for (string_list::const_iterator i = m_szSelectedFiles.begin();
+        i != m_szSelectedFiles.end(); ++i)
+    {
+        files       += L"\"" + *i + L"\" ";
+    }
+    for (string_list::const_iterator i = m_szSelectedUnused.begin();
+        i != m_szSelectedUnused.end(); ++i)
+    {
+        unuseds     += L"--unused=\"" + *i + L"\" ";
+    }
+    for (string_list::const_iterator i = m_szSelectedDirectories.begin();
+        i != m_szSelectedUnused.end(); ++i)
+    {
+        directories += L"--dir=\"" + *i + L"\" ";
+    }
 
     // Get the command index.
@@ -308 +318 @@
     case CERASER_ERASE:
         {
-            command += S("addtask ") + files + unuseds + directories;
+            command += L"addtask " + files + unuseds + directories;
             //result = system(command.c_str());
             break;
@@ -334 +344 @@
             break;
         }
-    case CERASER_ENUM(CEraserLPVERBS::CERASER_CONSOLE):
+    case CERASER_CONSOLE:
         {
             // interactive eraser console

branches/erasershellext/cpp/CtxMenu.h

@@ -1 +1 @@
 // CtxMenu.h : Declaration of the CCtxMenu
-
 #pragma once
 
-#include "resource.h"       // main symbols
-
+#include "resource.h"
 #include "EraserCtxMenu_i.h"
 
@@ -15 +13 @@
 #include <fstream>
 
-#define CERASER_ENUM_TYPE       unsigned int
-#define CERASER_ENUM(x)         ((CERASER_ENUM_TYPE)x)
-#define foreach(iter, container) \
-    for(string_list::iterator iter = container.begin(); \
-    iter != container.end(); iter++)
-
-#define GCNEW(object_type,...)  \
-    *(CCtxMenu::GCNew(new object_type(__VA_ARGS__)))
-
-#define S(str) L ## str
-
-#ifdef _DEBUG
-#define DebugMessageBox(...) MessageBox(__VA_ARGS__)
-static HWND DebugHWND =
-CreateWindow(0, _T("Eraser Debug Windows"), 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL);
-#else
-#define DebugMessageBox(...) ;;;;;;;;;;;;;;;;;;;;;;;
-#endif
-
 namespace Eraser 
 {
-    typedef std::wstring                            string_type;
-    typedef std::list<string_type  >    string_list;
-    typedef std::list<void*>                    gc;
-
+    typedef std::wstring                string_type;
+    typedef std::list<string_type>      string_list;
 
     enum CEraserSecureMove
@@ -60 +37 @@
         //  );
 
-        if(!CopyFile(src.c_str(), dst.c_str(), FALSE))
+        if (!CopyFile(src.c_str(), dst.c_str(), FALSE))
         {
             //file.Close();
@@ -67 +44 @@
 
         // successfull copy, add for erasure
-
     }
 
-    // CCtxMenu
     class ATL_NO_VTABLE CCtxMenu :
         public CComObjectRootEx<CComSingleThreadModel>,
@@ -103 +78 @@
 
     protected:
-        gc          m_GC;
         string_list m_szSelectedFiles;
         string_list m_szSelectedDirectories;
-        string_list m_szSelectedUnused;
-        HBITMAP         m_szEraserIcon;
-
-        
-        template<typename T>
-        T* GCNew(T* pointer)
-        {
-            this->m_GC.push_back(reinterpret_cast<void*>(pointer));
-            return pointer;
-        }
-
+        string_list m_szSelectedUnused;
+        HBITMAP     m_szEraserIcon;
 
     public:
@@ -125 +90 @@
             COM_INTERFACE_ENTRY(IContextMenu)
         END_COM_MAP()
+
         DECLARE_PROTECT_FINAL_CONSTRUCT()
         HRESULT FinalConstruct()
         {
             return S_OK;
-        }
-
-        void FinalRelease()
-        {
-            for(gc::iterator i = m_GC.begin(); i != m_GC.end(); i++)
-                delete *i;
         }
     };

branches/erasershellext/cpp/EraserCtxMenu_i.c

@@ -7 +7 @@
 
  /* File created by MIDL compiler version 7.00.0500 */
-/* at Tue Dec 02 08:53:43 2008
+/* at Tue Dec 02 09:39:06 2008
  */
 /* Compiler settings for .\EraserCtxMenu.idl:

branches/erasershellext/cpp/EraserCtxMenu_i.h

@@ -5 +5 @@
 
  /* File created by MIDL compiler version 7.00.0500 */
-/* at Tue Dec 02 08:53:43 2008
+/* at Tue Dec 02 09:39:06 2008
  */
 /* Compiler settings for .\EraserCtxMenu.idl: