削除完了時に例外が発生することがある点を修正した

wchat_tのサイズが正しく求められていないバグを修正した

diff --git a/CompleteEraser/MainForm.cs b/CompleteEraser/MainForm.cs
index 9b8a869..3a6461f 100644 (file)
--- a/CompleteEraser/MainForm.cs
+++ b/CompleteEraser/MainForm.cs
@@ -77,7 +77,7 @@ namespace CompleteEraser
             if (e.fileName == null)\r
                 this.label2.Text = Resources.FINAL_PROCESS;\r
             else\r
-                this.label2.Text = string.Format(Resources.FILE_PROCESS, this.TrimFullPath(e.fileName));\r
+                this.label2.Text = string.Format(Resources.FILE_PROCESS, Path.GetFileName(e.fileName));\r
         }\r
 \r
         void op_Progressed(object sender, ProgressedEventArgs e)\r
@@ -133,21 +133,5 @@ namespace CompleteEraser
                 this.info.Dispose();\r
         }\r
 \r
-        public string TrimFullPath(string filepath)\r
-        {\r
-            if (filepath == null || filepath == "")\r
-                return string.Empty;\r
-            string DirectoryPart = Path.GetDirectoryName(filepath);\r
-            string FilenamePart = Path.GetFileName(filepath);\r
-            string[] slice = DirectoryPart.Split('\\');\r
-            if (slice.Length > 3)\r
-            {\r
-                DirectoryPart = slice[0] + "\\..\\" + slice[slice.Length - 1];\r
-                return DirectoryPart + "\\" + FilenamePart;\r
-            }\r
-            else\r
-                return filepath;\r
-        }\r
-\r
     }\r
 }\r

diff --git a/CompleteEraser/SharedInfo.cs b/CompleteEraser/SharedInfo.cs
index 820cb99..1bd5d6c 100644 (file)
--- a/CompleteEraser/SharedInfo.cs
+++ b/CompleteEraser/SharedInfo.cs
@@ -23,7 +23,8 @@ namespace CompleteEraser
                 while (sr.EndOfStream == false)\r
                 {\r
                     string s = sr.ReadLine();\r
-                    yield return s;\r
+                    if(s != string.Empty && s[0] != '\0')\r
+                        yield return s;\r
                 }\r
             }\r
             finally\r

diff --git a/ShellExtension/ContextMenu.cpp b/ShellExtension/ContextMenu.cpp
index 3c9f007..61a9c85 100644 (file)
--- a/ShellExtension/ContextMenu.cpp
+++ b/ShellExtension/ContextMenu.cpp
@@ -150,7 +150,7 @@ STDMETHODIMP CContextMenu::InvokeCommand(LPCMINVOKECOMMANDINFO pici)
 \r
        if (menutype == ClearFileNames)\r
        {\r
-               UINT mapSize = this->strs.length() * 2;\r
+               UINT mapSize = this->strs.length() * sizeof(wchar_t);\r
 \r
                m_hMapping = ::CreateFileMappingW(INVALID_HANDLE_VALUE,\r
                        NULL,\r