From a44970437daddca8350e293ea541ae4ce903d6a6 Mon Sep 17 00:00:00 2001
From: sdottaka <none@none>
Date: Sun, 6 Jan 2013 11:29:25 +0900
Subject: [PATCH] FolderCompare: * Fix build error * Add VC2010 project file *
 Add Dev-C++ project file * Add batch file to profile FolderCompare.exe * Add
 code for memory leak detection

---
 Testing/FolderCompare/FolderCompare.cpp            |    7 +
 Testing/FolderCompare/FolderCompare.dev            | 1412 ++++++++++++++++++++
 Testing/FolderCompare/FolderCompare.vcproj         |   12 +-
 Testing/FolderCompare/FolderCompare.vcxproj        |  293 ++++
 .../FolderCompare/FolderCompare.vcxproj.filters    |  378 ++++++
 Testing/FolderCompare/FolderCompare_vc10.sln       |   25 +
 Testing/FolderCompare/Makefile                     |    2 +-
 Testing/FolderCompare/prof.cmd                     |   11 +
 8 files changed, 2137 insertions(+), 3 deletions(-)
 create mode 100644 Testing/FolderCompare/FolderCompare.dev
 create mode 100644 Testing/FolderCompare/FolderCompare.vcxproj
 create mode 100644 Testing/FolderCompare/FolderCompare.vcxproj.filters
 create mode 100644 Testing/FolderCompare/FolderCompare_vc10.sln
 create mode 100644 Testing/FolderCompare/prof.cmd

diff --git a/Testing/FolderCompare/FolderCompare.cpp b/Testing/FolderCompare/FolderCompare.cpp
index 1d2110439..76a8c1ede 100644
--- a/Testing/FolderCompare/FolderCompare.cpp
+++ b/Testing/FolderCompare/FolderCompare.cpp
@@ -3,10 +3,17 @@
 #include "DiffThread.h"
 #include "DiffWrapper.h"
 #include "FileFilterHelper.h"
+#include <iostream>
 #include <Poco/Thread.h>
+#ifdef _MSC_VER
+#include <crtdbg.h>
+#endif
 
 int main()
 {
+#ifdef _MSC_VER
+	_CrtSetDbgFlag( _CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF);
+#endif
 	CompareStats cmpstats(2);
 
 	FileFilterHelper filter;
diff --git a/Testing/FolderCompare/FolderCompare.dev b/Testing/FolderCompare/FolderCompare.dev
new file mode 100644
index 000000000..389845890
--- /dev/null
+++ b/Testing/FolderCompare/FolderCompare.dev
@@ -0,0 +1,1412 @@
+[Project]
+FileName=FolderCompare.dev
+Name=FolderCompare
+Type=1
+Ver=2
+ObjFiles=
+Includes=../../Src;../../Src/Common;../../Src/diffutils;../../Src/diffutils/lib;../../Src/diffutils/src;../../Src/CompareEngines;../../Externals/boost;../../Externals/Poco/Foundation/include;../../Externals/Poco/XML/include;../../Externals/Poco/Util/include
+Libs=../../Externals/poco/lib/MinGW/ia32
+PrivateResource=
+ResourceIncludes=
+MakeIncludes=
+Compiler=-DHAVE_CONFIG_H -DREGEX_MALLOC -D__NT__ _@@_
+CppCompiler=
+Linker=-lPocoXML_@@_-lPocoUtil_@@_-lPocoFoundation_@@_-lversion_@@_-lshlwapi_@@_-luuid_@@_-lole32_@@_-loleaut32_@@_-lIphlpapi_@@_
+IsCpp=1
+Icon=
+ExeOutput=
+ObjectOutput=
+LogOutput=
+LogOutputEnabled=0
+OverrideOutput=0
+OverrideOutputName=FolderCompare.exe
+HostApplication=
+Folders=CompareEngines,DiffEngine,"Header Files","Source Files"
+CommandLine=
+UseCustomMakefile=0
+CustomMakefile=
+IncludeVersionInfo=0
+SupportXPThemes=0
+CompilerSet=2
+CompilerSettings=0000000000000000101000000
+UnitCount=136
+
+[VersionInfo]
+Major=1
+Minor=0
+Release=0
+Build=0
+LanguageID=1033
+CharsetID=1252
+CompanyName=
+FileVersion=1.0.0.0
+FileDescription=Developed using the Dev-C++ IDE
+InternalName=
+LegalCopyright=
+LegalTrademarks=
+OriginalFilename=
+ProductName=
+ProductVersion=1.0.0.0
+AutoIncBuildNr=0
+SyncProduct=1
+
+[Unit1]
+FileName=misc.cpp
+CompileCpp=1
+Folder=
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit2]
+FileName=FolderCompare.cpp
+CompileCpp=1
+Folder=
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit3]
+FileName=..\..\Src\CompareEngines\DiffUtils.h
+CompileCpp=1
+Folder=CompareEngines
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit4]
+FileName=..\..\Src\CompareEngines\ByteCompare.h
+CompileCpp=1
+Folder=CompareEngines
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit5]
+FileName=..\..\Src\CompareEngines\ByteCompare.cpp
+CompileCpp=1
+Folder=CompareEngines
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit6]
+FileName=..\..\Src\CompareEngines\TimeSizeCompare.cpp
+CompileCpp=1
+Folder=CompareEngines
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit7]
+FileName=..\..\Src\CompareEngines\ByteComparator.h
+CompileCpp=1
+Folder=CompareEngines
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit8]
+FileName=..\..\Src\CompareEngines\TimeSizeCompare.h
+CompileCpp=1
+Folder=CompareEngines
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit9]
+FileName=..\..\Src\CompareEngines\DiffUtils.cpp
+CompileCpp=1
+Folder=CompareEngines
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit10]
+FileName=..\..\Src\CompareEngines\ByteComparator.cpp
+CompileCpp=1
+Folder=CompareEngines
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit11]
+FileName=..\..\Src\diffutils\lib\regex.c
+CompileCpp=0
+Folder=DiffEngine
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit12]
+FileName=..\..\Src\diffutils\lib\regex.h
+CompileCpp=1
+Folder=DiffEngine
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit13]
+FileName=..\..\Src\diffutils\GnuVersion.c
+CompileCpp=0
+Folder=DiffEngine
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=$(CC) -c GnuVersion.c -o GnuVersion.o $(CFLAGS)
+
+[Unit14]
+FileName=..\..\Src\diffutils\config.h
+CompileCpp=1
+Folder=DiffEngine
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit15]
+FileName=..\..\Src\diffutils\src\analyze.c
+CompileCpp=0
+Folder=DiffEngine
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=$(CC) -c analyze.c -o analyze.o $(CFLAGS)
+
+[Unit16]
+FileName=..\..\Src\diffutils\src\context.c
+CompileCpp=0
+Folder=DiffEngine
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit17]
+FileName=..\..\Src\diffutils\src\Diff.cpp
+CompileCpp=1
+Folder=DiffEngine
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit18]
+FileName=..\..\Src\diffutils\src\diff.h
+CompileCpp=1
+Folder=DiffEngine
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit19]
+FileName=..\..\Src\diffutils\src\ed.c
+CompileCpp=0
+Folder=DiffEngine
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit20]
+FileName=..\..\Src\diffutils\src\ifdef.c
+CompileCpp=0
+Folder=DiffEngine
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit21]
+FileName=..\..\Src\diffutils\src\io.c
+CompileCpp=0
+Folder=DiffEngine
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit22]
+FileName=..\..\Src\diffutils\src\normal.c
+CompileCpp=0
+Folder=DiffEngine
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit23]
+FileName=..\..\Src\diffutils\src\side.c
+CompileCpp=0
+Folder=DiffEngine
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit24]
+FileName=..\..\Src\diffutils\src\system.h
+CompileCpp=1
+Folder=DiffEngine
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit25]
+FileName=..\..\Src\diffutils\src\util.c
+CompileCpp=0
+Folder=DiffEngine
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit26]
+FileName=..\..\Src\charsets.c
+CompileCpp=0
+Folder=Source Files
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=$(CC) -c charsets.c -o charsets.o $(CFLAGS)
+
+[Unit27]
+FileName=..\..\Src\charsets.h
+CompileCpp=1
+Folder=Header Files
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit28]
+FileName=..\..\Src\codepage_detect.cpp
+CompileCpp=1
+Folder=Source Files
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit29]
+FileName=..\..\Src\codepage_detect.h
+CompileCpp=1
+Folder=Header Files
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit30]
+FileName=..\..\Src\CompareOptions.cpp
+CompileCpp=1
+Folder=Source Files
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit31]
+FileName=..\..\Src\CompareOptions.h
+CompileCpp=1
+Folder=Header Files
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit32]
+FileName=..\..\Src\CompareStats.cpp
+CompileCpp=1
+Folder=Source Files
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit33]
+FileName=..\..\Src\CompareStats.h
+CompileCpp=1
+Folder=Header Files
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit34]
+FileName=..\..\Src\ConflictFileParser.cpp
+CompileCpp=1
+Folder=Source Files
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit35]
+FileName=..\..\Src\ConflictFileParser.h
+CompileCpp=1
+Folder=Header Files
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit36]
+FileName=..\..\Src\DiffContext.cpp
+CompileCpp=1
+Folder=Source Files
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit37]
+FileName=..\..\Src\DiffContext.h
+CompileCpp=1
+Folder=Header Files
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit38]
+FileName=..\..\Src\DiffFileData.cpp
+CompileCpp=1
+Folder=Source Files
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit39]
+FileName=..\..\Src\DiffFileData.h
+CompileCpp=1
+Folder=Header Files
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit40]
+FileName=..\..\Src\DiffFileInfo.cpp
+CompileCpp=1
+Folder=Source Files
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit41]
+FileName=..\..\Src\DiffFileInfo.h
+CompileCpp=1
+Folder=Header Files
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit42]
+FileName=..\..\Src\DiffItem.cpp
+CompileCpp=1
+Folder=Source Files
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit43]
+FileName=..\..\Src\DiffItem.h
+CompileCpp=1
+Folder=Header Files
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit44]
+FileName=..\..\Src\DiffItemList.cpp
+CompileCpp=1
+Folder=Source Files
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit45]
+FileName=..\..\Src\DiffItemList.h
+CompileCpp=1
+Folder=Header Files
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit46]
+FileName=..\..\Src\DiffList.cpp
+CompileCpp=1
+Folder=Source Files
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit47]
+FileName=..\..\Src\DiffList.h
+CompileCpp=1
+Folder=Header Files
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit48]
+FileName=..\..\Src\DiffThread.cpp
+CompileCpp=1
+Folder=Source Files
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit49]
+FileName=..\..\Src\DiffThread.h
+CompileCpp=1
+Folder=Header Files
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit50]
+FileName=..\..\Src\DiffWrapper.cpp
+CompileCpp=1
+Folder=Source Files
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit51]
+FileName=..\..\Src\DiffWrapper.h
+CompileCpp=1
+Folder=Header Files
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit52]
+FileName=..\..\Src\DirItem.cpp
+CompileCpp=1
+Folder=Source Files
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit53]
+FileName=..\..\Src\DirItem.h
+CompileCpp=1
+Folder=Header Files
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit54]
+FileName=..\..\Src\DirScan.cpp
+CompileCpp=1
+Folder=Source Files
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit55]
+FileName=..\..\Src\DirScan.h
+CompileCpp=1
+Folder=Header Files
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit56]
+FileName=..\..\Src\DirTravel.cpp
+CompileCpp=1
+Folder=Source Files
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit57]
+FileName=..\..\Src\DirTravel.h
+CompileCpp=1
+Folder=Header Files
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit58]
+FileName=..\..\Src\Environment.cpp
+CompileCpp=1
+Folder=Source Files
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit59]
+FileName=..\..\Src\Environment.h
+CompileCpp=1
+Folder=Header Files
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit60]
+FileName=..\..\Src\FileFilter.cpp
+CompileCpp=1
+Folder=Source Files
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit61]
+FileName=..\..\Src\FileFilter.h
+CompileCpp=1
+Folder=Header Files
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit62]
+FileName=..\..\Src\FileFilterHelper.cpp
+CompileCpp=1
+Folder=Source Files
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit63]
+FileName=..\..\Src\FileFilterHelper.h
+CompileCpp=1
+Folder=Header Files
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit64]
+FileName=..\..\Src\FileFilterMgr.cpp
+CompileCpp=1
+Folder=Source Files
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit65]
+FileName=..\..\Src\FileFilterMgr.h
+CompileCpp=1
+Folder=Header Files
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit66]
+FileName=..\..\Src\FileTextEncoding.cpp
+CompileCpp=1
+Folder=Source Files
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit67]
+FileName=..\..\Src\FileTextEncoding.h
+CompileCpp=1
+Folder=Header Files
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit68]
+FileName=..\..\Src\FileTransform.cpp
+CompileCpp=1
+Folder=Source Files
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit69]
+FileName=..\..\Src\FileTransform.h
+CompileCpp=1
+Folder=Header Files
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit70]
+FileName=..\..\Src\FileVersion.cpp
+CompileCpp=1
+Folder=Source Files
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit71]
+FileName=..\..\Src\FileVersion.h
+CompileCpp=1
+Folder=Header Files
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit72]
+FileName=..\..\Src\FilterList.cpp
+CompileCpp=1
+Folder=Source Files
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit73]
+FileName=..\..\Src\FilterList.h
+CompileCpp=1
+Folder=Header Files
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit74]
+FileName=..\..\Src\FolderCmp.cpp
+CompileCpp=1
+Folder=Source Files
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit75]
+FileName=..\..\Src\FolderCmp.h
+CompileCpp=1
+Folder=Header Files
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit76]
+FileName=..\..\Src\LineFiltersList.cpp
+CompileCpp=1
+Folder=Source Files
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit77]
+FileName=..\..\Src\LineFiltersList.h
+CompileCpp=1
+Folder=Header Files
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit78]
+FileName=..\..\Src\locality.cpp
+CompileCpp=1
+Folder=Source Files
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit79]
+FileName=..\..\Src\locality.h
+CompileCpp=1
+Folder=Header Files
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit80]
+FileName=..\..\Src\markdown.cpp
+CompileCpp=1
+Folder=Source Files
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit81]
+FileName=..\..\Src\markdown.h
+CompileCpp=1
+Folder=Header Files
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit82]
+FileName=..\..\Src\MergeCmdLineInfo.cpp
+CompileCpp=1
+Folder=Source Files
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit83]
+FileName=..\..\Src\MergeCmdLineInfo.h
+CompileCpp=1
+Folder=Header Files
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit84]
+FileName=..\..\Src\MovedBlocks.cpp
+CompileCpp=1
+Folder=Source Files
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit85]
+FileName=..\..\Src\MovedLines.cpp
+CompileCpp=1
+Folder=Source Files
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit86]
+FileName=..\..\Src\MovedLines.h
+CompileCpp=1
+Folder=Header Files
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit87]
+FileName=..\..\Src\PatchHTML.cpp
+CompileCpp=1
+Folder=Source Files
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit88]
+FileName=..\..\Src\PatchHTML.h
+CompileCpp=1
+Folder=Header Files
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit89]
+FileName=..\..\Src\PathContext.cpp
+CompileCpp=1
+Folder=Source Files
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit90]
+FileName=..\..\Src\PathContext.h
+CompileCpp=1
+Folder=Header Files
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit91]
+FileName=..\..\Src\paths.cpp
+CompileCpp=1
+Folder=Source Files
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit92]
+FileName=..\..\Src\paths.h
+CompileCpp=1
+Folder=Header Files
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit93]
+FileName=..\..\Src\PluginManager.cpp
+CompileCpp=1
+Folder=Source Files
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit94]
+FileName=..\..\Src\PluginManager.h
+CompileCpp=1
+Folder=Header Files
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit95]
+FileName=..\..\Src\Plugins.cpp
+CompileCpp=1
+Folder=Source Files
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit96]
+FileName=..\..\Src\Plugins.h
+CompileCpp=1
+Folder=Header Files
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit97]
+FileName=..\..\Src\ProjectFile.cpp
+CompileCpp=1
+Folder=Source Files
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit98]
+FileName=..\..\Src\ProjectFile.h
+CompileCpp=1
+Folder=Header Files
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit99]
+FileName=..\..\Src\stringdiffs.cpp
+CompileCpp=1
+Folder=Source Files
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit100]
+FileName=..\..\Src\stringdiffs.h
+CompileCpp=1
+Folder=Header Files
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit101]
+FileName=..\..\Src\TempFile.cpp
+CompileCpp=1
+Folder=Source Files
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit102]
+FileName=..\..\Src\TempFile.h
+CompileCpp=1
+Folder=Header Files
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit103]
+FileName=..\..\Src\UniMarkdownFile.cpp
+CompileCpp=1
+Folder=Source Files
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit104]
+FileName=..\..\Src\UniMarkdownFile.h
+CompileCpp=1
+Folder=Header Files
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit105]
+FileName=..\..\Src\Common\coretools.cpp
+CompileCpp=1
+Folder=Source Files
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit106]
+FileName=..\..\Src\Common\coretools.h
+CompileCpp=1
+Folder=Header Files
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit107]
+FileName=..\..\Src\Common\ExConverter.cpp
+CompileCpp=1
+Folder=Source Files
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit108]
+FileName=..\..\Src\Common\ExConverter.h
+CompileCpp=1
+Folder=Source Files
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit109]
+FileName=..\..\Src\Common\LogFile.cpp
+CompileCpp=1
+Folder=Source Files
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit110]
+FileName=..\..\Src\Common\LogFile.h
+CompileCpp=1
+Folder=Header Files
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit111]
+FileName=..\..\Src\Common\multiformatText.cpp
+CompileCpp=1
+Folder=Source Files
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit112]
+FileName=..\..\Src\Common\multiformatText.h
+CompileCpp=1
+Folder=Header Files
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit113]
+FileName=..\..\Src\Common\OptionsMgr.cpp
+CompileCpp=1
+Folder=Source Files
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit114]
+FileName=..\..\Src\Common\OptionsMgr.h
+CompileCpp=1
+Folder=Header Files
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit115]
+FileName=..\..\Src\Common\RegOptionsMgr.cpp
+CompileCpp=1
+Folder=Source Files
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit116]
+FileName=..\..\Src\Common\RegOptionsMgr.h
+CompileCpp=1
+Folder=Header Files
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit117]
+FileName=..\..\Src\Common\unicoder.cpp
+CompileCpp=1
+Folder=Source Files
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit118]
+FileName=..\..\Src\Common\unicoder.h
+CompileCpp=1
+Folder=Header Files
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit119]
+FileName=..\..\Src\Common\UnicodeString.cpp
+CompileCpp=1
+Folder=Source Files
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit120]
+FileName=..\..\Src\Common\UnicodeString.h
+CompileCpp=1
+Folder=Header Files
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit121]
+FileName=..\..\Src\Common\UniFile.cpp
+CompileCpp=1
+Folder=Source Files
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit122]
+FileName=..\..\Src\Common\UniFile.h
+CompileCpp=1
+Folder=Header Files
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit123]
+FileName=..\..\Src\Common\varprop.cpp
+CompileCpp=1
+Folder=Source Files
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit124]
+FileName=..\..\Src\Common\varprop.h
+CompileCpp=1
+Folder=Header Files
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit125]
+FileName=..\..\Src\Common\version.cpp
+CompileCpp=1
+Folder=Source Files
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit126]
+FileName=..\..\Src\Common\version.h
+CompileCpp=1
+Folder=Header Files
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit127]
+FileName=..\..\Src\FilterCommentsManager.cpp
+CompileCpp=1
+Folder=Source Files
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit128]
+FileName=..\..\Src\FilterCommentsManager.h
+CompileCpp=1
+Folder=Header Files
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit129]
+FileName=..\..\Src\Common\RegKey.cpp
+CompileCpp=1
+Folder=Source Files
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit130]
+FileName=..\..\Src\Common\RegKey.h
+CompileCpp=1
+Folder=Header Files
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit131]
+FileName=..\..\Src\Common\dllproxy.c
+CompileCpp=0
+Folder=Source Files
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=$(CC) -c dllproxy.c -o dllproxy.o $(CFLAGS)
+
+[Unit132]
+FileName=..\..\Src\Common\dllproxy.h
+CompileCpp=1
+Folder=Header Files
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit133]
+FileName=..\..\Src\diffutils\lib\cmpbuf.c
+CompileCpp=0
+Folder=DiffEngine
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=$(CC) -c cmpbuf.c -o cmpbuf.o $(CFLAGS)
+
+[Unit134]
+FileName=..\..\Src\diffutils\lib\cmpbuf.h
+CompileCpp=1
+Folder=DiffEngine
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit135]
+FileName=..\..\Src\Common\lwdisp.c
+CompileCpp=0
+Folder=Source Files
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=$(CC) -c lwdisp.c -o lwdisp.o $(CFLAGS)
+
+[Unit136]
+FileName=..\..\Src\Common\lwdisp.h
+CompileCpp=1
+Folder=Header Files
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
diff --git a/Testing/FolderCompare/FolderCompare.vcproj b/Testing/FolderCompare/FolderCompare.vcproj
index 22d2eed77..09427292a 100644
--- a/Testing/FolderCompare/FolderCompare.vcproj
+++ b/Testing/FolderCompare/FolderCompare.vcproj
@@ -20,12 +20,13 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\Src;..\..\Src\Common;..\..\Externals\boost;..\..\Externals\poco\Foundation\include;..\..\Externals\poco\XML\include;..\..\Src\diffutils\src;..\..\Src\diffutils\lib;..\..\Src\diffutils\;..\..\Src\CompareEngines"
+				AdditionalIncludeDirectories="..\..\Src;..\..\Src\Common;..\..\Externals\boost;..\..\Externals\poco\Foundation\include;..\..\Externals\poco\XML\include;..\..\Externals\poco\Util\include;..\..\Src\diffutils\src;..\..\Src\diffutils\lib;..\..\Src\diffutils\;..\..\Src\CompareEngines"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;UNICODE;POCO_STATIC;_STATIC_CPPLIB;HAVE_CONFIG_H;REGEX_MALLOC;__NT__"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				TreatWChar_tAsBuiltInType="TRUE"
+				RuntimeTypeInfo="TRUE"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="TRUE"
@@ -71,10 +72,11 @@
 			CharacterSet="1">
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\Src;..\..\Src\Common;..\..\Externals\boost;..\..\Externals\poco\Foundation\include;..\..\Externals\poco\XML\include;..\..\Src\diffutils\src;..\..\Src\diffutils\lib;..\..\Src\diffutils\;..\..\Src\CompareEngines"
+				AdditionalIncludeDirectories="..\..\Src;..\..\Src\Common;..\..\Externals\boost;..\..\Externals\poco\Foundation\include;..\..\Externals\poco\XML\include;..\..\Externals\poco\Util\include;..\..\Src\diffutils\src;..\..\Src\diffutils\lib;..\..\Src\diffutils\;..\..\Src\CompareEngines"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;UNICODE;POCO_STATIC;HAVE_CONFIG_H;_STATIC_CPPLIB;REGEX_MALLOC;__NT__"
 				RuntimeLibrary="2"
 				TreatWChar_tAsBuiltInType="TRUE"
+				RuntimeTypeInfo="TRUE"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="TRUE"
@@ -176,6 +178,9 @@
 				RelativePath="..\..\Src\Environment.cpp">
 			</File>
 			<File
+				RelativePath="..\..\Src\Common\ExConverter.cpp">
+			</File>
+			<File
 				RelativePath="..\..\Src\FileFilter.cpp">
 			</File>
 			<File
@@ -313,6 +318,9 @@
 				RelativePath="..\..\Src\Environment.h">
 			</File>
 			<File
+				RelativePath="..\..\Src\Common\ExConverter.h">
+			</File>
+			<File
 				RelativePath="..\..\Src\FileFilter.h">
 			</File>
 			<File
diff --git a/Testing/FolderCompare/FolderCompare.vcxproj b/Testing/FolderCompare/FolderCompare.vcxproj
new file mode 100644
index 000000000..67de4cc39
--- /dev/null
+++ b/Testing/FolderCompare/FolderCompare.vcxproj
@@ -0,0 +1,293 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{733E7C0B-AC3D-47AC-A8DA-E13644D6294D}</ProjectGuid>
+    <RootNamespace>FolderCompare</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\Src;..\..\Src\Common;..\..\Externals\boost;..\..\Externals\poco\Foundation\include;..\..\Externals\poco\XML\include;..\..\Externals\poco\Util\include;..\..\Src\diffutils\src;..\..\Src\diffutils\lib;..\..\Src\diffutils\;..\..\Src\CompareEngines;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;UNICODE;POCO_STATIC;_STATIC_CPPLIB;HAVE_CONFIG_H;REGEX_MALLOC;__NT__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalOptions>/profile %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalDependencies>shlwapi.lib;Iphlpapi.lib;version.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(ProjectName).exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\Externals\poco\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(OutDir)ProjectFile.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+      <Profile>true</Profile>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\Src;..\..\Src\Common;..\..\Externals\boost;..\..\Externals\poco\Foundation\include;..\..\Externals\poco\XML\include;..\..\Externals\poco\Util\include;..\..\Src\diffutils\src;..\..\Src\diffutils\lib;..\..\Src\diffutils\;..\..\Src\CompareEngines;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;UNICODE;POCO_STATIC;_STATIC_CPPLIB;HAVE_CONFIG_H;REGEX_MALLOC;__NT__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalOptions>/profile %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalDependencies>shlwapi.lib;Iphlpapi.lib;version.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(ProjectName).exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\Externals\poco\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(OutDir)ProjectFile.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <Profile>true</Profile>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\..\Src;..\..\Src\Common;..\..\Externals\boost;..\..\Externals\poco\Foundation\include;..\..\Externals\poco\XML\include;..\..\Externals\poco\Util\include;..\..\Src\diffutils\src;..\..\Src\diffutils\lib;..\..\Src\diffutils\;..\..\Src\CompareEngines;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;UNICODE;POCO_STATIC;HAVE_CONFIG_H;_STATIC_CPPLIB;REGEX_MALLOC;__NT__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>shlwapi.lib;Iphlpapi.lib;version.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(ProjectName).exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\Externals\poco\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX86</TargetMachine>
+      <Profile>true</Profile>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\..\Src;..\..\Src\Common;..\..\Externals\boost;..\..\Externals\poco\Foundation\include;..\..\Externals\poco\XML\include;..\..\Externals\poco\Util\include;..\..\Src\diffutils\src;..\..\Src\diffutils\lib;..\..\Src\diffutils\;..\..\Src\CompareEngines;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;UNICODE;POCO_STATIC;HAVE_CONFIG_H;_STATIC_CPPLIB;REGEX_MALLOC;__NT__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>shlwapi.lib;Iphlpapi.lib;version.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(ProjectName).exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\Externals\poco\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <Profile>true</Profile>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\Src\charsets.c" />
+    <ClCompile Include="..\..\Src\codepage_detect.cpp" />
+    <ClCompile Include="..\..\Src\Common\ExConverter.cpp" />
+    <ClCompile Include="..\..\Src\CompareOptions.cpp" />
+    <ClCompile Include="..\..\Src\CompareStats.cpp" />
+    <ClCompile Include="..\..\Src\Common\coretools.cpp" />
+    <ClCompile Include="..\..\Src\DiffContext.cpp" />
+    <ClCompile Include="..\..\Src\DiffFileData.cpp" />
+    <ClCompile Include="..\..\Src\DiffFileInfo.cpp" />
+    <ClCompile Include="..\..\Src\DiffItem.cpp" />
+    <ClCompile Include="..\..\Src\DiffItemList.cpp" />
+    <ClCompile Include="..\..\Src\DiffList.cpp" />
+    <ClCompile Include="..\..\Src\DiffThread.cpp" />
+    <ClCompile Include="..\..\Src\DiffWrapper.cpp" />
+    <ClCompile Include="..\..\Src\DirItem.cpp" />
+    <ClCompile Include="..\..\Src\DirScan.cpp" />
+    <ClCompile Include="..\..\Src\DirTravel.cpp" />
+    <ClCompile Include="..\..\Src\Common\dllproxy.c" />
+    <ClCompile Include="..\..\Src\Environment.cpp" />
+    <ClCompile Include="..\..\Src\FileFilter.cpp" />
+    <ClCompile Include="..\..\Src\FileFilterHelper.cpp" />
+    <ClCompile Include="..\..\Src\FileFilterMgr.cpp" />
+    <ClCompile Include="..\..\Src\FileTextEncoding.cpp" />
+    <ClCompile Include="..\..\Src\FileTransform.cpp" />
+    <ClCompile Include="..\..\Src\FileVersion.cpp" />
+    <ClCompile Include="..\..\Src\FilterCommentsManager.cpp" />
+    <ClCompile Include="..\..\Src\FilterList.cpp" />
+    <ClCompile Include="..\..\Src\FolderCmp.cpp" />
+    <ClCompile Include="..\..\Src\Common\LogFile.cpp" />
+    <ClCompile Include="..\..\Src\Common\lwdisp.c" />
+    <ClCompile Include="..\..\Src\markdown.cpp" />
+    <ClCompile Include="..\..\Src\MovedBlocks.cpp" />
+    <ClCompile Include="..\..\Src\MovedLines.cpp" />
+    <ClCompile Include="..\..\Src\Common\multiformatText.cpp" />
+    <ClCompile Include="..\..\Src\PatchHTML.cpp" />
+    <ClCompile Include="..\..\Src\PathContext.cpp" />
+    <ClCompile Include="..\..\Src\paths.cpp" />
+    <ClCompile Include="..\..\Src\PluginManager.cpp" />
+    <ClCompile Include="..\..\Src\Plugins.cpp" />
+    <ClCompile Include="..\..\Src\Common\RegKey.cpp" />
+    <ClCompile Include="..\..\Src\Common\unicoder.cpp" />
+    <ClCompile Include="..\..\Src\Common\UnicodeString.cpp" />
+    <ClCompile Include="..\..\Src\Common\UniFile.cpp" />
+    <ClCompile Include="..\..\Src\UniMarkdownFile.cpp" />
+    <ClCompile Include="..\..\Src\Common\varprop.cpp" />
+    <ClCompile Include="..\..\Src\Common\version.cpp" />
+    <ClCompile Include="..\..\Src\CompareEngines\ByteComparator.cpp" />
+    <ClCompile Include="..\..\Src\CompareEngines\ByteCompare.cpp" />
+    <ClCompile Include="..\..\Src\CompareEngines\DiffUtils.cpp" />
+    <ClCompile Include="..\..\Src\CompareEngines\TimeSizeCompare.cpp" />
+    <ClCompile Include="..\..\Src\diffutils\src\analyze.c" />
+    <ClCompile Include="..\..\Src\diffutils\lib\cmpbuf.c" />
+    <ClCompile Include="..\..\Src\diffutils\src\context.c" />
+    <ClCompile Include="..\..\Src\diffutils\src\Diff.cpp" />
+    <ClCompile Include="..\..\Src\diffutils\src\ed.c" />
+    <ClCompile Include="..\..\Src\diffutils\GnuVersion.c" />
+    <ClCompile Include="..\..\Src\diffutils\src\ifdef.c" />
+    <ClCompile Include="..\..\Src\diffutils\src\io.c" />
+    <ClCompile Include="..\..\Src\diffutils\src\normal.c" />
+    <ClCompile Include="..\..\Src\diffutils\lib\regex.c" />
+    <ClCompile Include="..\..\Src\diffutils\src\side.c" />
+    <ClCompile Include="..\..\Src\diffutils\src\util.c" />
+    <ClCompile Include="FolderCompare.cpp" />
+    <ClCompile Include="misc.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\Src\codepage_detect.h" />
+    <ClInclude Include="..\..\Src\Common\ExConverter.h" />
+    <ClInclude Include="..\..\Src\CompareOptions.h" />
+    <ClInclude Include="..\..\Src\CompareStats.h" />
+    <ClInclude Include="..\..\Src\Common\coretools.h" />
+    <ClInclude Include="..\..\Src\DiffContext.h" />
+    <ClInclude Include="..\..\Src\DiffFileData.h" />
+    <ClInclude Include="..\..\Src\DiffFileInfo.h" />
+    <ClInclude Include="..\..\Src\DiffItem.h" />
+    <ClInclude Include="..\..\Src\DiffItemList.h" />
+    <ClInclude Include="..\..\Src\DiffList.h" />
+    <ClInclude Include="..\..\Src\DiffThread.h" />
+    <ClInclude Include="..\..\Src\DiffWrapper.h" />
+    <ClInclude Include="..\..\Src\DirItem.h" />
+    <ClInclude Include="..\..\Src\DirScan.h" />
+    <ClInclude Include="..\..\Src\DirTravel.h" />
+    <ClInclude Include="..\..\Src\Common\dllproxy.h" />
+    <ClInclude Include="..\..\Src\Environment.h" />
+    <ClInclude Include="..\..\Src\FileFilter.h" />
+    <ClInclude Include="..\..\Src\FileFilterHelper.h" />
+    <ClInclude Include="..\..\Src\FileFilterMgr.h" />
+    <ClInclude Include="..\..\Src\FileTextEncoding.h" />
+    <ClInclude Include="..\..\Src\FileTransform.h" />
+    <ClInclude Include="..\..\Src\FileVersion.h" />
+    <ClInclude Include="..\..\Src\FilterCommentsManager.h" />
+    <ClInclude Include="..\..\Src\FilterList.h" />
+    <ClInclude Include="..\..\Src\FolderCmp.h" />
+    <ClInclude Include="..\..\Src\Common\LogFile.h" />
+    <ClInclude Include="..\..\Src\Common\lwdisp.h" />
+    <ClInclude Include="..\..\Src\markdown.h" />
+    <ClInclude Include="..\..\Src\MovedLines.h" />
+    <ClInclude Include="..\..\Src\Common\multiformatText.h" />
+    <ClInclude Include="..\..\Src\PatchHTML.h" />
+    <ClInclude Include="..\..\Src\PathContext.h" />
+    <ClInclude Include="..\..\Src\paths.h" />
+    <ClInclude Include="..\..\Src\PluginManager.h" />
+    <ClInclude Include="..\..\Src\Plugins.h" />
+    <ClInclude Include="..\..\Src\Common\RegKey.h" />
+    <ClInclude Include="..\..\Src\Common\unicoder.h" />
+    <ClInclude Include="..\..\Src\Common\UnicodeString.h" />
+    <ClInclude Include="..\..\Src\Common\UniFile.h" />
+    <ClInclude Include="..\..\Src\UniMarkdownFile.h" />
+    <ClInclude Include="..\..\Src\Common\varprop.h" />
+    <ClInclude Include="..\..\Src\Common\version.h" />
+    <ClInclude Include="..\..\Src\CompareEngines\ByteComparator.h" />
+    <ClInclude Include="..\..\Src\CompareEngines\ByteCompare.h" />
+    <ClInclude Include="..\..\Src\CompareEngines\DiffUtils.h" />
+    <ClInclude Include="..\..\Src\CompareEngines\TimeSizeCompare.h" />
+    <ClInclude Include="..\..\Src\diffutils\lib\cmpbuf.h" />
+    <ClInclude Include="..\..\Src\diffutils\config.h" />
+    <ClInclude Include="..\..\Src\diffutils\src\diff.h" />
+    <ClInclude Include="..\..\Src\diffutils\lib\regex.h" />
+    <ClInclude Include="..\..\Src\diffutils\src\system.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/Testing/FolderCompare/FolderCompare.vcxproj.filters b/Testing/FolderCompare/FolderCompare.vcxproj.filters
new file mode 100644
index 000000000..c2957f515
--- /dev/null
+++ b/Testing/FolderCompare/FolderCompare.vcxproj.filters
@@ -0,0 +1,378 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx</Extensions>
+    </Filter>
+    <Filter Include="CompareEngines">
+      <UniqueIdentifier>{c716718e-5537-47bd-b1d3-2c5e910438ab}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="DiffEngine">
+      <UniqueIdentifier>{9b7f7771-f083-4ab3-9a5f-8017293e75e2}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\Src\charsets.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Src\codepage_detect.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Src\CompareOptions.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Src\CompareStats.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Src\Common\coretools.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Src\DiffContext.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Src\DiffFileData.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Src\DiffFileInfo.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Src\DiffItem.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Src\DiffItemList.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Src\DiffList.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Src\DiffThread.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Src\DiffWrapper.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Src\DirItem.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Src\DirScan.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Src\DirTravel.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Src\Common\dllproxy.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Src\Environment.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Src\FileFilter.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Src\FileFilterHelper.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Src\FileFilterMgr.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Src\FileTextEncoding.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Src\FileTransform.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Src\FileVersion.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Src\FilterCommentsManager.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Src\FilterList.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Src\FolderCmp.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Src\Common\LogFile.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Src\Common\lwdisp.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Src\markdown.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Src\MovedBlocks.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Src\MovedLines.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Src\Common\multiformatText.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Src\PatchHTML.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Src\PathContext.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Src\paths.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Src\PluginManager.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Src\Plugins.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Src\Common\RegKey.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Src\Common\unicoder.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Src\Common\UnicodeString.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Src\Common\UniFile.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Src\UniMarkdownFile.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Src\Common\varprop.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Src\Common\version.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Src\CompareEngines\ByteComparator.cpp">
+      <Filter>CompareEngines</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Src\CompareEngines\ByteCompare.cpp">
+      <Filter>CompareEngines</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Src\CompareEngines\DiffUtils.cpp">
+      <Filter>CompareEngines</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Src\CompareEngines\TimeSizeCompare.cpp">
+      <Filter>CompareEngines</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Src\diffutils\src\analyze.c">
+      <Filter>DiffEngine</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Src\diffutils\lib\cmpbuf.c">
+      <Filter>DiffEngine</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Src\diffutils\src\context.c">
+      <Filter>DiffEngine</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Src\diffutils\src\Diff.cpp">
+      <Filter>DiffEngine</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Src\diffutils\src\ed.c">
+      <Filter>DiffEngine</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Src\diffutils\GnuVersion.c">
+      <Filter>DiffEngine</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Src\diffutils\src\ifdef.c">
+      <Filter>DiffEngine</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Src\diffutils\src\io.c">
+      <Filter>DiffEngine</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Src\diffutils\src\normal.c">
+      <Filter>DiffEngine</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Src\diffutils\lib\regex.c">
+      <Filter>DiffEngine</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Src\diffutils\src\side.c">
+      <Filter>DiffEngine</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Src\diffutils\src\util.c">
+      <Filter>DiffEngine</Filter>
+    </ClCompile>
+    <ClCompile Include="FolderCompare.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="misc.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Src\Common\ExConverter.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\Src\codepage_detect.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Src\CompareOptions.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Src\CompareStats.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Src\Common\coretools.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Src\DiffContext.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Src\DiffFileData.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Src\DiffFileInfo.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Src\DiffItem.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Src\DiffItemList.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Src\DiffList.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Src\DiffThread.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Src\DiffWrapper.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Src\DirItem.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Src\DirScan.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Src\DirTravel.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Src\Common\dllproxy.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Src\Environment.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Src\FileFilter.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Src\FileFilterHelper.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Src\FileFilterMgr.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Src\FileTextEncoding.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Src\FileTransform.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Src\FileVersion.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Src\FilterCommentsManager.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Src\FilterList.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Src\FolderCmp.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Src\Common\LogFile.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Src\Common\lwdisp.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Src\markdown.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Src\MovedLines.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Src\Common\multiformatText.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Src\PatchHTML.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Src\PathContext.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Src\paths.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Src\PluginManager.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Src\Plugins.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Src\Common\RegKey.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Src\Common\unicoder.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Src\Common\UnicodeString.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Src\Common\UniFile.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Src\UniMarkdownFile.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Src\Common\varprop.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Src\Common\version.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Src\CompareEngines\ByteComparator.h">
+      <Filter>CompareEngines</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Src\CompareEngines\ByteCompare.h">
+      <Filter>CompareEngines</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Src\CompareEngines\DiffUtils.h">
+      <Filter>CompareEngines</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Src\CompareEngines\TimeSizeCompare.h">
+      <Filter>CompareEngines</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Src\diffutils\lib\cmpbuf.h">
+      <Filter>DiffEngine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Src\diffutils\config.h">
+      <Filter>DiffEngine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Src\diffutils\src\diff.h">
+      <Filter>DiffEngine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Src\diffutils\lib\regex.h">
+      <Filter>DiffEngine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Src\diffutils\src\system.h">
+      <Filter>DiffEngine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Src\Common\ExConverter.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/Testing/FolderCompare/FolderCompare_vc10.sln b/Testing/FolderCompare/FolderCompare_vc10.sln
new file mode 100644
index 000000000..b8a5189f3
--- /dev/null
+++ b/Testing/FolderCompare/FolderCompare_vc10.sln
@@ -0,0 +1,25 @@
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FolderCompare", "FolderCompare.vcxproj", "{733E7C0B-AC3D-47AC-A8DA-E13644D6294D}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Debug|x64 = Debug|x64
+		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{733E7C0B-AC3D-47AC-A8DA-E13644D6294D}.Debug|Win32.ActiveCfg = Debug|Win32
+		{733E7C0B-AC3D-47AC-A8DA-E13644D6294D}.Debug|Win32.Build.0 = Debug|Win32
+		{733E7C0B-AC3D-47AC-A8DA-E13644D6294D}.Debug|x64.ActiveCfg = Debug|x64
+		{733E7C0B-AC3D-47AC-A8DA-E13644D6294D}.Debug|x64.Build.0 = Debug|x64
+		{733E7C0B-AC3D-47AC-A8DA-E13644D6294D}.Release|Win32.ActiveCfg = Release|Win32
+		{733E7C0B-AC3D-47AC-A8DA-E13644D6294D}.Release|Win32.Build.0 = Release|Win32
+		{733E7C0B-AC3D-47AC-A8DA-E13644D6294D}.Release|x64.ActiveCfg = Release|x64
+		{733E7C0B-AC3D-47AC-A8DA-E13644D6294D}.Release|x64.Build.0 = Release|x64
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/Testing/FolderCompare/Makefile b/Testing/FolderCompare/Makefile
index 24973b6e7..d86839ad8 100644
--- a/Testing/FolderCompare/Makefile
+++ b/Testing/FolderCompare/Makefile
@@ -1,4 +1,4 @@
-INCLUDES=-I../../Src -I../../Src/Common -I../../Src/diffutils -I../../Src/diffutils/lib -I../../Src/diffutils/src -I../../Src/CompareEngines -I../../Externals/boost -I../../Externals/Poco/Foundation/include -I../../Externals/Poco/XML/include
+INCLUDES=-I../../Src -I../../Src/Common -I../../Src/diffutils -I../../Src/diffutils/lib -I../../Src/diffutils/src -I../../Src/CompareEngines -I../../Externals/boost -I../../Externals/Poco/Foundation/include -I../../Externals/Poco/XML/include -I../../Externals/Poco/Util/include
 
 CFLAGS=-g -pg -DHAVE_CONFIG_H -DREGEX_MALLOC -D__NT__ $(INCLUDES)
 CXXFLAGS=-g -pg $(INCLUDES)
diff --git a/Testing/FolderCompare/prof.cmd b/Testing/FolderCompare/prof.cmd
new file mode 100644
index 000000000..9f1a4f76c
--- /dev/null
+++ b/Testing/FolderCompare/prof.cmd
@@ -0,0 +1,11 @@
+cd /d "%~dp0"
+set PATH=C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Performance Tools;%PATH%
+rem set PATH=C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Performance Tools\x64;%PATH%
+
+rem VSInstr Release\FolderCompare.exe
+VSPerfCmd /start:sample /output:FolderCompare.vsp
+VSPerfCmd /launch:%~dp0\Release\FolderCompare.exe
+VSPerfCmd /shutdown
+VSPerfReport FolderCompare.vsp /summary:all
+
+pause
-- 
2.11.0