Merge pull request #38 from gandarez/master

Update NPP plugin platform with latest version
wakatime · Oct 10, 2020 · bf3b494 · bf3b494
2 parents c2dcc92 + f54b6d4
commit bf3b494
Show file tree

Hide file tree

Showing 14 changed files with 3,087 additions and 1,942 deletions.
diff --git a/HISTORY.rst b/HISTORY.rst
@@ -3,6 +3,12 @@ History
 -------
 
 
+4.2.0 (2020-10-10)
+++++++++++++++++++
+
+- Update NPP plugin platform with latest version.
+
+
 4.1.0 (2019-04-10)
 ++++++++++++++++++
 

diff --git a/WakaTime/PluginInfrastructure/ClikeStringArray.cs b/WakaTime/PluginInfrastructure/ClikeStringArray.cs
@@ -1,7 +1,9 @@
 // NPP plugin platform for .Net v0.94.00 by Kasper B. Graversen etc.
 using System;
 using System.Collections.Generic;
+using System.Reflection;
 using System.Runtime.InteropServices;
+using System.Windows.Forms;
 
 namespace Kbg.NppPluginNET.PluginInfrastructure
 {
@@ -18,10 +20,10 @@ public ClikeStringArray(int num, int stringCapacity)
             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 * IntPtr.Size), item);
                 _nativeItems.Add(item);
             }
-            Marshal.WriteIntPtr((IntPtr)((int)_nativeArray + (num * IntPtr.Size)), IntPtr.Zero);
+            Marshal.WriteIntPtr(_nativeArray + (num * IntPtr.Size), IntPtr.Zero);
         }
         public ClikeStringArray(List<string> lstStrings)
         {
@@ -30,10 +32,10 @@ public ClikeStringArray(List<string> lstStrings)
             for (int i = 0; i < lstStrings.Count; i++)
             {
                 IntPtr item = Marshal.StringToHGlobalUni(lstStrings[i]);
-                Marshal.WriteIntPtr((IntPtr)((int)_nativeArray + (i * IntPtr.Size)), item);
+                Marshal.WriteIntPtr(_nativeArray + (i * IntPtr.Size), item);
                 _nativeItems.Add(item);
             }
-            Marshal.WriteIntPtr((IntPtr)((int)_nativeArray + (lstStrings.Count * IntPtr.Size)), IntPtr.Zero);
+            Marshal.WriteIntPtr(_nativeArray + (lstStrings.Count * IntPtr.Size), IntPtr.Zero);
         }
 
         public IntPtr NativePointer { get { return _nativeArray; } }
@@ -52,12 +54,19 @@ List<string> _getManagedItems(bool unicode)
 
         public void Dispose()
         {
-            if (!_disposed)
+            try
             {
-                for (int i = 0; i < _nativeItems.Count; i++)
-                    if (_nativeItems[i] != IntPtr.Zero) Marshal.FreeHGlobal(_nativeItems[i]);
-                if (_nativeArray != IntPtr.Zero) Marshal.FreeHGlobal(_nativeArray);
-                _disposed = true;
+                if (!_disposed)
+                {
+                    for (int i = 0; i < _nativeItems.Count; i++)
+                        if (_nativeItems[i] != IntPtr.Zero) Marshal.FreeHGlobal(_nativeItems[i]);
+                    if (_nativeArray != IntPtr.Zero) Marshal.FreeHGlobal(_nativeArray);
+                    _disposed = true;
+                }
+            }
+            catch (Exception e)
+            {
+                MessageBox.Show(MethodBase.GetCurrentMethod().ToString() +": "+ e.Message, this.GetType().Name);
             }
         }
         ~ClikeStringArray()

diff --git a/WakaTime/PluginInfrastructure/DllExport/NppPlugin.DllExport.targets b/WakaTime/PluginInfrastructure/DllExport/NppPlugin.DllExport.targets
@@ -30,17 +30,13 @@
 		On 32 bit windows usually C:\Program Files\
 		On 64 bit windows usually C:\Program Files (x86)\
 		$(ProgramW6432) points to the 64bit Program Files (on 32 bit windows it is blank) -->
-    <MakeDir 
-        Directories="$(MSBuildProgramFiles32)\Notepad++\plugins\$(TargetName)\" 
-        Condition="Exists('$(MSBuildProgramFiles32)\Notepad++\plugins\') AND !Exists('$(MSBuildProgramFiles32)\Notepad++\plugins\$(TargetName)\') AND '$(Platform)'=='x86'" />
+    <MakeDir Directories="$(MSBuildProgramFiles32)\Notepad++\plugins\$(TargetName)\" Condition="Exists('$(MSBuildProgramFiles32)\Notepad++\plugins\') AND !Exists('$(MSBuildProgramFiles32)\Notepad++\plugins\$(TargetName)\') AND '$(Platform)'=='x86'" />
     <Copy 
         SourceFiles="$(TargetPath)" 
         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'" />
+        ContinueOnError="false" />
+    <MakeDir Directories="$(ProgramW6432)\Notepad++\plugins\$(TargetName)\" Condition="Exists('$(ProgramW6432)\Notepad++\plugins\') AND !Exists('$(ProgramW6432)\Notepad++\plugins\$(TargetName)\') AND '$(Platform)'=='x64'" />
     <Copy 
         SourceFiles="$(TargetPath)" 
         DestinationFolder="$(ProgramW6432)\Notepad++\plugins\$(TargetName)\"
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,6 +3,12 @@ History @@
     -------
+.2.0 (2020-10-10)
+    ++++++++++++++++++
+    - Update NPP plugin platform with latest version.
 .1.0 (2019-04-10)
     ++++++++++++++++++
@@ Expand Down @@