common: make npp_debug common and add to Scintilla

- Make the features of npp_debug available to Scintilla as they are
  to PowerEditor without creating extra files to maintain.  This
  does create a higher level common link between the projects that
  has not existed before, the alternative (at this stage) is to have
  the npp_debug and CommonGenerics code duplicated.

[#32]

Signed-off-by: Thell Fowler <git@tbfowler.name>

.gitignore

@@ -23,6 +23,8 @@ Thumbs.db
 [Bb]in
 [Dd]ebug*/
 !PowerEditor/src/MISC/Debug/
+!scintilla/src/MISC/Debug/
+!common/MISC/Debug/
 *.lib
 *.sbr
 obj/

PowerEditor/visual.net/notepadPlus.8.vcproj

@@ -44,7 +44,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				FavorSizeOrSpeed="0"
-				AdditionalIncludeDirectories="..\..\scintilla\include;..\src"
+				AdditionalIncludeDirectories="..\..\common;..\..\scintilla\include;..\src"
 				PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;TIXML_USE_STL;TIXMLA_USE_STL"
 				MinimalRebuild="true"
 				ExceptionHandling="2"
@@ -123,7 +123,7 @@
 			<Tool
 				Name="VCPreBuildEventTool"
 				Description="Runtime build and version generation."
-				CommandLine="CALL $(SolutionDir)\scripts\GIT-VS-VERSION-GEN.bat &quot;$(IntDir)\&quot; &quot;$(SolutionDir)PowerEditor\src\gen-versioninfo.h&quot;&#x0D;&#x0A;IF NOT EXIST &quot;$(ProjectDir)..\src\MISC\Debug\FuncGuards.h&quot; copy &quot;$(ProjectDir)..\src\MISC\Debug\FuncGuards_skel.h&quot; &quot;$(ProjectDir)..\src\MISC\Debug\FuncGuards.h&quot;"
+				CommandLine="CALL $(SolutionDir)\scripts\GIT-VS-VERSION-GEN.bat &quot;$(IntDir)\&quot; &quot;$(SolutionDir)PowerEditor\src\gen-versioninfo.h&quot;&#x0D;&#x0A;IF NOT EXIST &quot;$(ProjectDir)..\src\MISC\Debug\FuncGuards.h&quot; copy &quot;$(ProjectDir)..\src\MISC\Debug\FuncGuards_skel.h&quot; &quot;$(ProjectDir)..\src\MISC\Debug\FuncGuards.h&quot;&#x0D;&#x0A;"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -144,7 +144,7 @@
 				FavorSizeOrSpeed="1"
 				OmitFramePointers="true"
 				WholeProgramOptimization="true"
-				AdditionalIncludeDirectories="..\..\scintilla\include;..\src"
+				AdditionalIncludeDirectories="..\..\common;..\..\scintilla\include;..\src"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;TIXML_USE_STL;TIXMLA_USE_STL;_CRT_SECURE_NO_DEPRECATE"
 				StringPooling="true"
 				ExceptionHandling="2"
@@ -244,7 +244,7 @@
 				FavorSizeOrSpeed="1"
 				OmitFramePointers="true"
 				WholeProgramOptimization="true"
-				AdditionalIncludeDirectories="..\..\scintilla\include;..\src"
+				AdditionalIncludeDirectories="..\..\common;..\..\scintilla\include;..\src"
 				PreprocessorDefinitions="WIN32;NDEBUG;SHIPPING;_WINDOWS;TIXML_USE_STL;TIXMLA_USE_STL;_CRT_SECURE_NO_DEPRECATE"
 				StringPooling="true"
 				ExceptionHandling="2"
@@ -551,7 +551,7 @@
 						</FileConfiguration>
 					</File>
 					<File
-						RelativePath="..\src\MISC\Debug\npp_debug.cpp"
+						RelativePath="..\..\common\MISC\Debug\npp_debug.cpp"
 						>
 					</File>
 				</Filter>
@@ -968,7 +968,7 @@
 						>
 					</File>
 					<File
-						RelativePath="..\src\MISC\Debug\npp_debug.h"
+						RelativePath="..\..\common\MISC\Debug\npp_debug.h"
 						>
 					</File>
 				</Filter>

PowerEditor/visual.net/notepadPlus.9.vcproj

@@ -45,7 +45,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\scintilla\include;..\src"
+				AdditionalIncludeDirectories="..\..\common;..\..\scintilla\include;..\src"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;TIXML_USE_STL;TIXMLA_USE_STL"
 				MinimalRebuild="true"
 				ExceptionHandling="2"
@@ -126,7 +126,7 @@
 			<Tool
 				Name="VCPreBuildEventTool"
 				Description="Runtime build and version generation."
-				CommandLine="CALL $(SolutionDir)\scripts\GIT-VS-VERSION-GEN.bat &quot;$(IntDir)\&quot; &quot;$(SolutionDir)PowerEditor\src\gen-versioninfo.h&quot;&#x0D;&#x0A;IF NOT EXIST &quot;$(ProjectDir)..\src\MISC\Debug\FuncGuards.h&quot; copy &quot;$(ProjectDir)..\src\MISC\Debug\FuncGuards_skel.h&quot; &quot;$(ProjectDir)..\src\MISC\Debug\FuncGuards.h&quot;"
+				CommandLine="CALL $(SolutionDir)\scripts\GIT-VS-VERSION-GEN.bat &quot;$(IntDir)\&quot; &quot;$(SolutionDir)PowerEditor\src\gen-versioninfo.h&quot;&#x0D;&#x0A;IF NOT EXIST &quot;$(ProjectDir)..\src\MISC\Debug\FuncGuards.h&quot; copy &quot;$(ProjectDir)..\src\MISC\Debug\FuncGuards_skel.h&quot; &quot;$(ProjectDir)..\src\MISC\Debug\FuncGuards.h&quot;&#x0D;&#x0A;"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -146,7 +146,7 @@
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="1"
 				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\..\scintilla\include;..\src"
+				AdditionalIncludeDirectories="..\..\common;..\..\scintilla\include;..\src"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;TIXML_USE_STL;TIXMLA_USE_STL"
 				StringPooling="true"
 				ExceptionHandling="2"
@@ -243,7 +243,7 @@
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="1"
 				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\..\scintilla\include;..\src"
+				AdditionalIncludeDirectories="..\..\common;..\..\scintilla\include;..\src"
 				PreprocessorDefinitions="WIN32;NDEBUG;SHIPPING;_WINDOWS;TIXML_USE_STL;TIXMLA_USE_STL"
 				StringPooling="true"
 				ExceptionHandling="2"
@@ -436,7 +436,7 @@
 						>
 					</File>
 					<File
-						RelativePath="..\src\MISC\Common\CommonGenerics.h"
+						RelativePath="..\..\common\MISC\Common\CommonGenerics.h"
 						>
 					</File>
 					<File
@@ -472,7 +472,7 @@
 						>
 					</File>
 					<File
-						RelativePath="..\src\MISC\Debug\npp_debug.h"
+						RelativePath="..\..\common\MISC\Debug\npp_debug.h"
 						>
 					</File>
 				</Filter>
@@ -1487,7 +1487,7 @@
 						</FileConfiguration>
 					</File>
 					<File
-						RelativePath="..\src\MISC\Debug\npp_debug.cpp"
+						RelativePath="..\..\common\MISC\Debug\npp_debug.cpp"
 						>
 					</File>
 				</Filter>

scintilla/src/MISC/Debug/.gitignore

@@ -0,0 +1,4 @@
+FuncGuards.h
+# Ignore developer's private funcguards templates
+Templates/
+*.tmp

scintilla/src/precompiled_headers.h

@@ -30,6 +30,7 @@
 #include <stdlib.h>
 #include <crtdbg.h>
 
+#include <tchar.h>
 #include <string.h>
 #include <ctype.h>
 #include <stdio.h>
@@ -66,6 +67,10 @@
 #include <zmouse.h>
 #include <ole2.h>
 
+// NPPCR
+#include "MISC/Common/CommonGenerics.h"
+#include "MISC/Debug/npp_debug.h"
+
 // Scintilla specific
 #include "ILexer.h"
 #include "Scintilla.h"

scintilla/vcbuild/SciLexer.8.vcproj

@@ -50,7 +50,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\src;..\lexlib"
+				AdditionalIncludeDirectories="..\..\common;..\include;..\src;..\lexlib"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SCILEXER7_EXPORTS;SCI_LEXER;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -159,7 +159,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="1"
-				AdditionalIncludeDirectories="..\include;..\src;..\lexlib"
+				AdditionalIncludeDirectories="..\..\common;..\include;..\src;..\lexlib"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SCILEXER7_EXPORTS;SCI_LEXER;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE"
 				StringPooling="true"
 				RuntimeLibrary="0"
@@ -230,7 +230,7 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="xcopy /Y $(TargetPath) ..\..\PowerEditor\bin&#x0D;&#x0A;SETLOCAL&#x0D;&#x0A;set PATH=%PATH%;%ENV_LIB_PATHS%;%SM_LIB_PATHS%&#x0D;&#x0A;gtest_runner.exe &quot;$(TargetPath)&quot;"
+				CommandLine="xcopy /Y $(TargetPath) ..\..\PowerEditor\bin&#x0D;&#x0A;SETLOCAL&#x0D;&#x0A;set PATH=%PATH%;%ENV_LIB_PATHS%;%SM_LIB_PATHS%&#x0D;&#x0A;gtest_runner.exe &quot;$(TargetPath)&quot;&#x0D;&#x0A;"
 			/>
 		</Configuration>
 		<Configuration
@@ -271,7 +271,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="1"
-				AdditionalIncludeDirectories="..\include;..\src;..\lexlib"
+				AdditionalIncludeDirectories="..\..\common;..\include;..\src;..\lexlib"
 				PreprocessorDefinitions="WIN32;NDEBUG;SHIPPING;_WINDOWS;_USRDLL;SCILEXER7_EXPORTS;SCI_LEXER;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE"
 				StringPooling="true"
 				RuntimeLibrary="0"

scintilla/vcbuild/SciLexer.9.vcproj

@@ -44,7 +44,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\include;..\src;..\lexlib"
+				AdditionalIncludeDirectories="..\..\common;..\include;..\src;..\lexlib"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SCILEXER7_EXPORTS;SCI_LEXER;_CRT_SECURE_NO_WARNINGS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -134,7 +134,7 @@
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="1"
-				AdditionalIncludeDirectories="..\include;..\src;..\lexlib"
+				AdditionalIncludeDirectories="..\..\common;..\include;..\src;..\lexlib"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SCILEXER7_EXPORTS;SCI_LEXER;_CRT_SECURE_NO_WARNINGS"
 				StringPooling="true"
 				RuntimeLibrary="0"
@@ -224,7 +224,7 @@
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="2"
 				FavorSizeOrSpeed="1"
-				AdditionalIncludeDirectories="..\include;..\src;..\lexlib"
+				AdditionalIncludeDirectories="..\..\common;..\include;..\src;..\lexlib"
 				PreprocessorDefinitions="WIN32;NDEBUG;SHIPPING;_WINDOWS;_USRDLL;SCILEXER7_EXPORTS;SCI_LEXER;_CRT_SECURE_NO_WARNINGS"
 				StringPooling="true"
 				RuntimeLibrary="0"
@@ -798,6 +798,18 @@
 					>
 				</File>
 			</Filter>
+			<Filter
+				Name="MISC"
+				>
+				<Filter
+					Name="Debug"
+					>
+					<File
+						RelativePath="..\..\common\MISC\Debug\npp_debug.cpp"
+						>
+					</File>
+				</Filter>
+			</Filter>
 		</Filter>
 		<Filter
 			Name="Header Files"
@@ -1000,6 +1012,26 @@
 					>
 				</File>
 			</Filter>
+			<Filter
+				Name="MISC"
+				>
+				<Filter
+					Name="Common"
+					>
+					<File
+						RelativePath="..\..\common\MISC\Common\CommonGenerics.h"
+						>
+					</File>
+				</Filter>
+				<Filter
+					Name="Debug"
+					>
+					<File
+						RelativePath="..\..\common\MISC\Debug\npp_debug.h"
+						>
+					</File>
+				</Filter>
+			</Filter>
 		</Filter>
 		<Filter
 			Name="Resource Files"