Release version 2.0.2

Reflects Notepad++ v8.2.2 and above Scintilla changes.
No functional changes to the plugin.

README.md

@@ -10,12 +10,12 @@ A very useful diff plugin to show the difference between:
 Build Status
 ------------
 
-- AppVeyor `VS2013` and `VS2015`  [![Build status](https://ci.appveyor.com/api/projects/status/github/pnedev/compare-plugin?svg=true)](https://ci.appveyor.com/project/pnedev/compare-plugin)
+- AppVeyor `VS2015`  [![Build status](https://ci.appveyor.com/api/projects/status/github/pnedev/compare-plugin?svg=true)](https://ci.appveyor.com/project/pnedev/compare-plugin)
 
 Build Compare plugin for Notepad++ from source:
 -------------------------------
 
- 1. Open [`plugin_compare\compare-plugin\projects\2013\Compare.vcxproj`](https://github.com/pnedev/compare-plugin/blob/master/projects/2013/Compare.vcxproj)
+ 1. Open [`plugin_compare\compare-plugin\projects\2015\Compare.vcxproj`](https://github.com/pnedev/compare-plugin/blob/master/projects/2015/Compare.vcxproj)
  2. Build Compare plugin [like a normal Visual Studio project](https://msdn.microsoft.com/en-us/library/7s88b19e.aspx). Available platforms are x86 win32 and x64 for Unicode Release and Debug.
  3. CMake config is available and tested for the generators MinGW Makefiles, Visual Studio and NMake Makefiles
 

appveyor.yml

@@ -3,8 +3,7 @@ image: Visual Studio 2015
 
 environment:
     matrix:
-        - PlatformToolset: v140_xp
-        - PlatformToolset: v120_xp
+        - PlatformToolset: v140
 
 platform:
     - x64
@@ -24,7 +23,7 @@ build:
     verbosity: minimal
 
 build_script:
-    - cd "%APPVEYOR_BUILD_FOLDER%"\projects\2013\
+    - cd "%APPVEYOR_BUILD_FOLDER%"\projects\2015\
     - msbuild Compare.vcxproj /p:configuration="%configuration%" /p:platform="%platform%" /p:PlatformToolset="%PlatformToolset%"
 
 after_build:
@@ -33,7 +32,7 @@ after_build:
 
         Push-AppveyorArtifact "Notepad++\plugins\ComparePlugin.dll" -FileName ComparePlugin.dll
 
-        if ($($env:APPVEYOR_REPO_TAG) -eq "true" -and $env:CONFIGURATION -eq "Release Unicode" -and $env:PLATFORMTOOLSET -eq "v120_xp") {
+        if ($($env:APPVEYOR_REPO_TAG) -eq "true" -and $env:CONFIGURATION -eq "Release Unicode" -and $env:PLATFORMTOOLSET -eq "v140") {
             $ZipFileName = "ComparePlugin_$($env:APPVEYOR_REPO_TAG_NAME)_$env:PLATFORM.zip"
             Remove-Item .\Notepad++\plugins\*.pdb
             7z a $ZipFileName .\Notepad++\plugins\*
@@ -43,15 +42,15 @@ artifacts:
   - path: ComparePlugin_*.zip
     name: releases
 
-deploy:
-    provider: GitHub
-    auth_token:
-        secure: 7/ifzsk2Tk/V63jr6/WyA4HdmukWhg2PD7pCgJma7f/QYuZCsyE6RZ5M3RIr6JVc
-    artifact: releases
-    draft: false
-    prerelease: false
-    force_update: true
-    on:
-        appveyor_repo_tag: true
-        PlatformToolset: v120_xp
-        configuration: Release Unicode
+# deploy:
+    # provider: GitHub
+    # auth_token:
+        # secure: 
+    # artifact: releases
+    # draft: false
+    # prerelease: false
+    # force_update: true
+    # on:
+        # appveyor_repo_tag: true
+        # PlatformToolset: v140
+        # configuration: Release Unicode

projects/2015/Compare.vcxproj

@@ -27,22 +27,22 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v140_xp</PlatformToolset>
+    <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Unicode|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v140_xp</PlatformToolset>
+    <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v140_xp</PlatformToolset>
+    <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v140_xp</PlatformToolset>
+    <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

src/Compare.cpp

@@ -516,7 +516,7 @@ toolbarIcons  tbLast;
 toolbarIcons  tbNavBar;
 
 HINSTANCE hInstance;
-FuncItem funcItem[NB_MENU_COMMANDS] = { 0 };
+FuncItem funcItem[NB_MENU_COMMANDS];
 
 // Declare local functions that appear before they are defined
 void First();
@@ -1883,21 +1883,21 @@ void onToolBarReady()
 	tbNavBar.hToolbarBmp =
 			(HBITMAP)::LoadImage(hInstance, MAKEINTRESOURCE(IDB_NAVBAR), IMAGE_BITMAP, 0, 0, style);
 
-	::SendMessage(nppData._nppHandle, NPPM_ADDTOOLBARICON,
+	::SendMessage(nppData._nppHandle, NPPM_ADDTOOLBARICON_DEPRECATED,
 			(WPARAM)funcItem[CMD_SET_FIRST]._cmdID,		(LPARAM)&tbSetFirst);
-	::SendMessage(nppData._nppHandle, NPPM_ADDTOOLBARICON,
+	::SendMessage(nppData._nppHandle, NPPM_ADDTOOLBARICON_DEPRECATED,
 			(WPARAM)funcItem[CMD_COMPARE]._cmdID,		(LPARAM)&tbCompare);
-	::SendMessage(nppData._nppHandle, NPPM_ADDTOOLBARICON,
+	::SendMessage(nppData._nppHandle, NPPM_ADDTOOLBARICON_DEPRECATED,
 			(WPARAM)funcItem[CMD_CLEAR_ACTIVE]._cmdID,	(LPARAM)&tbClearCompare);
-	::SendMessage(nppData._nppHandle, NPPM_ADDTOOLBARICON,
+	::SendMessage(nppData._nppHandle, NPPM_ADDTOOLBARICON_DEPRECATED,
 			(WPARAM)funcItem[CMD_FIRST]._cmdID,			(LPARAM)&tbFirst);
-	::SendMessage(nppData._nppHandle, NPPM_ADDTOOLBARICON,
+	::SendMessage(nppData._nppHandle, NPPM_ADDTOOLBARICON_DEPRECATED,
 			(WPARAM)funcItem[CMD_PREV]._cmdID,			(LPARAM)&tbPrev);
-	::SendMessage(nppData._nppHandle, NPPM_ADDTOOLBARICON,
+	::SendMessage(nppData._nppHandle, NPPM_ADDTOOLBARICON_DEPRECATED,
 			(WPARAM)funcItem[CMD_NEXT]._cmdID,			(LPARAM)&tbNext);
-	::SendMessage(nppData._nppHandle, NPPM_ADDTOOLBARICON,
+	::SendMessage(nppData._nppHandle, NPPM_ADDTOOLBARICON_DEPRECATED,
 			(WPARAM)funcItem[CMD_LAST]._cmdID,			(LPARAM)&tbLast);
-	::SendMessage(nppData._nppHandle, NPPM_ADDTOOLBARICON,
+	::SendMessage(nppData._nppHandle, NPPM_ADDTOOLBARICON_DEPRECATED,
 			(WPARAM)funcItem[CMD_NAV_BAR]._cmdID,		(LPARAM)&tbNavBar);
 
 	NppSettings::get().updatePluginMenu();