Some bugs corrections

Author: Sébastien Geiser

CSharpRegexTools4Npp/BNpp.cs

@@ -64,13 +64,13 @@ public static List<string> AllOpenedDocuments
             {
                 List<string> result = new List<string>();
                 int nbr = NbrOfOpenedFiles;
-                ClikeStringArray cStringArray = new ClikeStringArray(nbr, PATH_MAX);
 
-                Win32.SendMessage(PluginBase.nppData._nppHandle, (uint) NppMsg.NPPM_GETOPENFILENAMES, cStringArray.NativePointer, nbr);
-
-                result = cStringArray.ManagedStringsUnicode;
+                using (var cStringArray = new ClikeStringArray(nbr, PATH_MAX))
+                {
+                    Win32.SendMessage(PluginBase.nppData._nppHandle, (uint)NppMsg.NPPM_GETOPENFILENAMES, cStringArray.NativePointer, nbr);
 
-                cStringArray.Dispose();
+                    result = cStringArray.ManagedStringsUnicode;
+                }
 
                 return result;
             }

CSharpRegexTools4Npp/PluginInfrastructure/ClikeStringArray.cs

@@ -13,27 +13,29 @@ public class ClikeStringArray : IDisposable
 
         public ClikeStringArray(int num, int stringCapacity)
         {
-            _nativeArray = Marshal.AllocHGlobal((num + 1) * IntPtr.Size);
+            int intPtrSize = IntPtr.Size;
+            _nativeArray = Marshal.AllocHGlobal((num + 1) * (int)intPtrSize);
             _nativeItems = new List<IntPtr>();
             for (int i = 0; i < num; i++)
             {
                 IntPtr item = Marshal.AllocHGlobal(stringCapacity);
-                Marshal.WriteIntPtr((IntPtr)((int)_nativeArray + (i * IntPtr.Size)), item);
+                Marshal.WriteIntPtr(_nativeArray + (i * intPtrSize), item);
                 _nativeItems.Add(item);
             }
-            Marshal.WriteIntPtr((IntPtr)((int)_nativeArray + (num * IntPtr.Size)), IntPtr.Zero);
+            Marshal.WriteIntPtr(_nativeArray + (num * intPtrSize), IntPtr.Zero);
         }
         public ClikeStringArray(List<string> lstStrings)
         {
-            _nativeArray = Marshal.AllocHGlobal((lstStrings.Count + 1) * IntPtr.Size);
+            int intPtrSize = IntPtr.Size;
+            _nativeArray = Marshal.AllocHGlobal((lstStrings.Count + 1) * intPtrSize);
             _nativeItems = new List<IntPtr>();
             for (int i = 0; i < lstStrings.Count; i++)
             {
-                IntPtr item = Marshal.StringToHGlobalUni(lstStrings[i]);
-                Marshal.WriteIntPtr((IntPtr)((int)_nativeArray + (i * IntPtr.Size)), item);
+                IntPtr item = Marshal.StringToHGlobalUni(lstStrings[(int)i]);
+                Marshal.WriteIntPtr(_nativeArray + (i * intPtrSize), item);
                 _nativeItems.Add(item);
             }
-            Marshal.WriteIntPtr((IntPtr)((int)_nativeArray + (lstStrings.Count * IntPtr.Size)), IntPtr.Zero);
+            Marshal.WriteIntPtr(_nativeArray + (lstStrings.Count * intPtrSize), IntPtr.Zero);
         }
 
         public IntPtr NativePointer { get { return _nativeArray; } }

CSharpRegexTools4Npp/PluginInfrastructure/DllExport/NppPlugin.DllExport.targets

@@ -37,7 +37,7 @@
     <MakeDir Directories="$(MSBuildProgramFiles32)\Notepad++\plugins\$(TargetName)\" Condition="Exists('$(MSBuildProgramFiles32)\Notepad++\plugins\') AND !Exists('$(MSBuildProgramFiles32)\Notepad++\plugins\$(TargetName)\') AND '$(Platform)'=='x86'" />
     <Copy 
         SourceFiles="@(ReleaseFiles)" 
-        DestinationFolder="$(MSBuildProgramFiles32)\Notepad++\plugins\$(TargetName)\)" 
+        DestinationFolder="$(MSBuildProgramFiles32)\Notepad++\plugins\$(TargetName)\" 
         Condition="Exists('$(MSBuildProgramFiles32)\Notepad++\plugins\$(TargetName)\') AND '$(Platform)'=='x86'"
         ContinueOnError="false" />
     <MakeDir Directories="$(ProgramW6432)\Notepad++\plugins\$(TargetName)\" Condition="Exists('$(ProgramW6432)\Notepad++\plugins\') AND !Exists('$(ProgramW6432)\Notepad++\plugins\$(TargetName)\') AND '$(Platform)'=='x64'" />

RegexDialog/RegExToolDialog.xaml.cs

@@ -650,21 +650,20 @@ private void ReplaceAllButton_Click(object sender, RoutedEventArgs e)
                                             files++;
                                         }
                                     }
-                                    else
-                                    {
-                                        text = File.ReadAllText(fileName);
-                                        int matchesCount = regex.Matches(text).Count;
-                                        nbrOfElementToReplace += matchesCount;
+                                }
+                                else
+                                {
+                                    text = File.ReadAllText(fileName);
+                                    int matchesCount = regex.Matches(text).Count;
+                                    nbrOfElementToReplace += matchesCount;
 
-                                        if (matchesCount > 0)
-                                        {
-                                            File.WriteAllText(fileName, regex.Replace(text, replaceText));
+                                    if (matchesCount > 0)
+                                    {
+                                        File.WriteAllText(fileName, regex.Replace(text, replaceText));
 
-                                            files++;
-                                        }
+                                        files++;
                                     }
                                 }
-
                             });
 
                             break;