Index: src/ch/ch.vc140.vcxproj
===================================================================
diff -u -r0d5b67ee96b435d63f7bf075dc8e28603793b187 -r9250a0229add10f4315e76848c755f337a16ae95
--- src/ch/ch.vc140.vcxproj	(.../ch.vc140.vcxproj)	(revision 0d5b67ee96b435d63f7bf075dc8e28603793b187)
+++ src/ch/ch.vc140.vcxproj	(.../ch.vc140.vcxproj)	(revision 9250a0229add10f4315e76848c755f337a16ae95)
@@ -39,53 +39,58 @@
     <ProjectGuid>{4B215B9A-58CA-4987-AC95-7DFC3043E100}</ProjectGuid>
     <RootNamespace>ch</RootNamespace>
     <Keyword>MFCProj</Keyword>
+    <WindowsTargetPlatformVersion>10.0.19041.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v120_xp</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <UseOfMfc>Dynamic</UseOfMfc>
     <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Testing Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v120_xp</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <UseOfMfc>Dynamic</UseOfMfc>
     <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v120_xp</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <UseOfMfc>Dynamic</UseOfMfc>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Testing Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v120_xp</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <UseOfMfc>Dynamic</UseOfMfc>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v120_xp</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <UseOfMfc>Dynamic</UseOfMfc>
     <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Testing Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v120_xp</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <UseOfMfc>Dynamic</UseOfMfc>
     <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v120_xp</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <UseOfMfc>Dynamic</UseOfMfc>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Testing Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v120_xp</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <UseOfMfc>Dynamic</UseOfMfc>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
@@ -176,6 +181,9 @@
     <LinkIncremental>false</LinkIncremental>
     <TargetName>$(ProjectName)64</TargetName>
   </PropertyGroup>
+  <PropertyGroup>
+    <XPDeprecationWarning>false</XPDeprecationWarning>
+  </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Midl>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -188,7 +196,7 @@
     <ClCompile>
       <AdditionalOptions>/Zm150 %(AdditionalOptions)</AdditionalOptions>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_BIND_TO_CURRENT_VCLIBS_VERSION=1;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_BIND_TO_CURRENT_VCLIBS_VERSION=1;_SCL_SECURE_NO_WARNINGS;_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
@@ -197,21 +205,23 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <SDLCheck>true</SDLCheck>
       <MinimalRebuild>false</MinimalRebuild>
-      <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet>
       <DisableSpecificWarnings>4714</DisableSpecificWarnings>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+      <EnforceTypeConversionRules>true</EnforceTypeConversionRules>
+      <ControlFlowGuard>Guard</ControlFlowGuard>
+      <ConformanceMode>true</ConformanceMode>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Culture>0x0409</Culture>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>winmm.lib;imagehlp.lib;version.lib;htmlhelp.lib;Dbghelp.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>winmm.lib;imagehlp.lib;version.lib;Dbghelp.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
       <AdditionalLibraryDirectories>"$(OutDir)"</AdditionalLibraryDirectories>
-      <ImageHasSafeExceptionHandlers>true</ImageHasSafeExceptionHandlers>
     </Link>
     <PostBuildEvent />
   </ItemDefinitionGroup>
@@ -229,7 +239,7 @@
       <AdditionalOptions>/Zm150 %(AdditionalOptions)</AdditionalOptions>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\ext\googletest\googletest\include;..\..\ext\googletest\googlemock\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_BIND_TO_CURRENT_VCLIBS_VERSION=1;_SCL_SECURE_NO_WARNINGS;TESTING;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_BIND_TO_CURRENT_VCLIBS_VERSION=1;_SCL_SECURE_NO_WARNINGS;TESTING;_CONSOLE;_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
@@ -238,21 +248,23 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <SDLCheck>true</SDLCheck>
       <MinimalRebuild>false</MinimalRebuild>
-      <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet>
       <DisableSpecificWarnings>4714</DisableSpecificWarnings>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+      <EnforceTypeConversionRules>true</EnforceTypeConversionRules>
+      <ControlFlowGuard>Guard</ControlFlowGuard>
+      <ConformanceMode>true</ConformanceMode>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Culture>0x0409</Culture>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>winmm.lib;imagehlp.lib;version.lib;htmlhelp.lib;Dbghelp.lib;gmock32d.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>winmm.lib;imagehlp.lib;version.lib;Dbghelp.lib;gmock-dynamic-crt32d.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
       <AdditionalLibraryDirectories>"$(OutDir)"</AdditionalLibraryDirectories>
-      <ImageHasSafeExceptionHandlers>true</ImageHasSafeExceptionHandlers>
     </Link>
     <PostBuildEvent>
       <Command>cd "$(TargetDir)"
@@ -273,7 +285,7 @@
       <AdditionalOptions>/Zm150 %(AdditionalOptions)</AdditionalOptions>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_BIND_TO_CURRENT_VCLIBS_VERSION=1;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_BIND_TO_CURRENT_VCLIBS_VERSION=1;_SCL_SECURE_NO_WARNINGS;_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
@@ -285,18 +297,21 @@
       <SDLCheck>true</SDLCheck>
       <MinimalRebuild>false</MinimalRebuild>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+      <EnforceTypeConversionRules>true</EnforceTypeConversionRules>
+      <ControlFlowGuard>Guard</ControlFlowGuard>
+      <ConformanceMode>true</ConformanceMode>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Culture>0x0409</Culture>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>winmm.lib;imagehlp.lib;version.lib;htmlhelp.lib;Dbghelp.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>winmm.lib;imagehlp.lib;version.lib;Dbghelp.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX64</TargetMachine>
       <AdditionalLibraryDirectories>"$(OutDir)"</AdditionalLibraryDirectories>
-      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
     </Link>
     <PostBuildEvent />
   </ItemDefinitionGroup>
@@ -314,7 +329,7 @@
       <AdditionalOptions>/Zm150 %(AdditionalOptions)</AdditionalOptions>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\ext\googletest\googletest\include;..\..\ext\googletest\googlemock\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_BIND_TO_CURRENT_VCLIBS_VERSION=1;_SCL_SECURE_NO_WARNINGS;TESTING;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_BIND_TO_CURRENT_VCLIBS_VERSION=1;_SCL_SECURE_NO_WARNINGS;TESTING;_CONSOLE;_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
@@ -326,18 +341,21 @@
       <SDLCheck>true</SDLCheck>
       <MinimalRebuild>false</MinimalRebuild>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+      <EnforceTypeConversionRules>true</EnforceTypeConversionRules>
+      <ControlFlowGuard>Guard</ControlFlowGuard>
+      <ConformanceMode>true</ConformanceMode>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Culture>0x0409</Culture>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>winmm.lib;imagehlp.lib;version.lib;htmlhelp.lib;Dbghelp.lib;gmock64d.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>winmm.lib;imagehlp.lib;version.lib;Dbghelp.lib;gmock-dynamic-crt64d.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <TargetMachine>MachineX64</TargetMachine>
       <AdditionalLibraryDirectories>"$(OutDir)"</AdditionalLibraryDirectories>
-      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
     </Link>
     <PostBuildEvent>
       <Command>cd "$(TargetDir)"
@@ -358,7 +376,7 @@
       <AdditionalOptions>/Zm150 %(AdditionalOptions)</AdditionalOptions>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_BIND_TO_CURRENT_VCLIBS_VERSION=1;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_BIND_TO_CURRENT_VCLIBS_VERSION=1;_SCL_SECURE_NO_WARNINGS;_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -367,21 +385,24 @@
       <TreatWarningAsError>true</TreatWarningAsError>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <SDLCheck>true</SDLCheck>
-      <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet>
       <DisableSpecificWarnings>4714</DisableSpecificWarnings>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+      <EnforceTypeConversionRules>true</EnforceTypeConversionRules>
+      <ControlFlowGuard>Guard</ControlFlowGuard>
+      <ConformanceMode>true</ConformanceMode>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Culture>0x0409</Culture>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>winmm.lib;imagehlp.lib;version.lib;htmlhelp.lib;Dbghelp.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>winmm.lib;imagehlp.lib;version.lib;Dbghelp.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
       <AdditionalLibraryDirectories>"$(OutDir)"</AdditionalLibraryDirectories>
-      <ImageHasSafeExceptionHandlers>true</ImageHasSafeExceptionHandlers>
+      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
     </Link>
     <PostBuildEvent />
   </ItemDefinitionGroup>
@@ -400,7 +421,7 @@
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
       <AdditionalIncludeDirectories>..\..\ext\googletest\googletest\include;..\..\ext\googletest\googlemock\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_BIND_TO_CURRENT_VCLIBS_VERSION=1;_SCL_SECURE_NO_WARNINGS;TESTING;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_BIND_TO_CURRENT_VCLIBS_VERSION=1;_SCL_SECURE_NO_WARNINGS;TESTING;_CONSOLE;_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -409,21 +430,24 @@
       <TreatWarningAsError>true</TreatWarningAsError>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <SDLCheck>true</SDLCheck>
-      <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet>
       <DisableSpecificWarnings>4714</DisableSpecificWarnings>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+      <EnforceTypeConversionRules>true</EnforceTypeConversionRules>
+      <ControlFlowGuard>Guard</ControlFlowGuard>
+      <ConformanceMode>true</ConformanceMode>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Culture>0x0409</Culture>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>winmm.lib;imagehlp.lib;version.lib;htmlhelp.lib;Dbghelp.lib;gmock32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>winmm.lib;imagehlp.lib;version.lib;Dbghelp.lib;gmock-dynamic-crt32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
       <AdditionalLibraryDirectories>"$(OutDir)"</AdditionalLibraryDirectories>
-      <ImageHasSafeExceptionHandlers>true</ImageHasSafeExceptionHandlers>
+      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
     </Link>
     <PostBuildEvent>
       <Command>cd "$(TargetDir)"
@@ -444,7 +468,7 @@
       <AdditionalOptions>/Zm150 %(AdditionalOptions)</AdditionalOptions>
       <Optimization>Disabled</Optimization>
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_BIND_TO_CURRENT_VCLIBS_VERSION=1;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_BIND_TO_CURRENT_VCLIBS_VERSION=1;_SCL_SECURE_NO_WARNINGS;_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -455,18 +479,22 @@
       <SDLCheck>true</SDLCheck>
       <DisableSpecificWarnings>4714</DisableSpecificWarnings>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+      <EnforceTypeConversionRules>true</EnforceTypeConversionRules>
+      <ControlFlowGuard>Guard</ControlFlowGuard>
+      <ConformanceMode>true</ConformanceMode>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Culture>0x0409</Culture>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>winmm.lib;imagehlp.lib;version.lib;htmlhelp.lib;Dbghelp.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>winmm.lib;imagehlp.lib;version.lib;Dbghelp.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX64</TargetMachine>
       <AdditionalLibraryDirectories>"$(OutDir)"</AdditionalLibraryDirectories>
-      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
+      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
     </Link>
     <PostBuildEvent />
   </ItemDefinitionGroup>
@@ -485,7 +513,7 @@
       <Optimization>Disabled</Optimization>
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
       <AdditionalIncludeDirectories>..\..\ext\googletest\googletest\include;..\..\ext\googletest\googlemock\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_BIND_TO_CURRENT_VCLIBS_VERSION=1;_SCL_SECURE_NO_WARNINGS;TESTING;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_BIND_TO_CURRENT_VCLIBS_VERSION=1;_SCL_SECURE_NO_WARNINGS;TESTING;_CONSOLE;_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -496,18 +524,22 @@
       <SDLCheck>true</SDLCheck>
       <DisableSpecificWarnings>4714</DisableSpecificWarnings>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+      <EnforceTypeConversionRules>true</EnforceTypeConversionRules>
+      <ControlFlowGuard>Guard</ControlFlowGuard>
+      <ConformanceMode>true</ConformanceMode>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Culture>0x0409</Culture>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>winmm.lib;imagehlp.lib;version.lib;htmlhelp.lib;Dbghelp.lib;gmock64.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>winmm.lib;imagehlp.lib;version.lib;Dbghelp.lib;gmock-dynamic-crt64.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <TargetMachine>MachineX64</TargetMachine>
       <AdditionalLibraryDirectories>"$(OutDir)"</AdditionalLibraryDirectories>
-      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
+      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
     </Link>
     <PostBuildEvent>
       <Command>cd "$(TargetDir)"
@@ -518,15 +550,23 @@
   <ItemGroup>
     <ClInclude Include="..\Common\ipcstructs.h" />
     <ClInclude Include="..\common\targetver.h" />
+    <ClInclude Include="..\common\TRegistry.h" />
     <ClInclude Include="..\common\TShellExtIpcConfigDataProvider.h" />
     <ClInclude Include="..\common\TShellExtMenuConfig.h" />
     <ClInclude Include="..\common\version.h" />
+    <ClInclude Include="AppAutorun.h" />
     <ClInclude Include="AsyncHttpFile.h" />
     <ClInclude Include="CDragDropComboEx.h" />
     <ClInclude Include="CDragDropListCtrl.h" />
+    <ClInclude Include="ComboDataWrapper.h" />
     <ClInclude Include="DirectoryChooser.h" />
     <ClInclude Include="FeedbackHandler.h" />
     <ClInclude Include="FeedbackHandlerFactory.h" />
+    <ClInclude Include="FilterTypesMenuWrapper.h" />
+    <ClInclude Include="RuleEditAlreadyExistsDlg.h" />
+    <ClInclude Include="RuleEditDlg.h" />
+    <ClInclude Include="RuleEditErrorDlg.h" />
+    <ClInclude Include="RuleEditNotEnoughSpaceDlg.h" />
     <ClInclude Include="structs.h" />
     <ClInclude Include="AppHelper.h" />
     <ClInclude Include="CfgProperties.h" />
@@ -538,7 +578,6 @@
     <ClInclude Include="TPathProcessor.h" />
     <ClInclude Include="TProgressCtrlEx.h" />
     <ClInclude Include="TRecentPathsTools.h" />
-    <ClInclude Include="TRegistry.h" />
     <ClInclude Include="TShellExtensionConfig.h" />
     <ClInclude Include="TTaskManagerWrapper.h" />
     <ClInclude Include="TWindowMessageFilterHelper.h" />
@@ -547,7 +586,6 @@
     <ClInclude Include="stdafx.h" />
     <ClInclude Include="TCommandLineParser.h" />
     <ClInclude Include="MainWnd.h" />
-    <ClInclude Include="MemDC.h" />
     <ClInclude Include="Theme Helpers.h" />
     <ClInclude Include="TrayIcon.h" />
     <ClInclude Include="DirTreeCtrl.h" />
@@ -579,184 +617,7 @@
     <ClInclude Include="UpdateResponse.h" />
     <ClInclude Include="UpdateVersionInfo.h" />
     <ClInclude Include="WindowsVersion.h" />
-    <CustomBuild Include="resource.h">
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating map file for help compiler...</Message>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Testing Debug|Win32'">Generating map file for help compiler...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">echo // Generated Help Map file.  Used by Copy Handler help files. &gt; "help\HTMLDefines.h"
-echo. &gt; "help\HTMLDefines.h"
-echo // Commands (ID_* and IDM_*) &gt;&gt; "help\HTMLDefines.h"
-makehm /h ID_,HID_,0x10000 IDM_,HIDM_,0x10000 "%(Filename)%(Extension)" &gt;&gt; "help\HTMLDefines.h"
-echo. &gt;&gt; "help\HTMLDefines.h"
-echo // Prompts (IDP_*) &gt;&gt; "help\HTMLDefines.h"
-makehm /h IDP_,HIDP_,0x30000 "%(Filename)%(Extension)" &gt;&gt; "help\HTMLDefines.h"
-echo. &gt;&gt; "help\HTMLDefines.h"
-echo // Resources (IDR_*) &gt;&gt; "help\HTMLDefines.h"
-makehm /h IDR_,HIDR_,0x20000 "%(Filename)%(Extension)" &gt;&gt; "help\HTMLDefines.h"
-echo. &gt;&gt; "help\HTMLDefines.h"
-echo // Dialogs (IDD_*) &gt;&gt; "help\HTMLDefines.h"
-makehm /h IDD_,HIDD_,0x20000 "%(Filename)%(Extension)" &gt;&gt; "help\HTMLDefines.h"
-echo. &gt;&gt; "help\HTMLDefines.h"
-echo // Frame Controls (IDW_*) &gt;&gt; "help\HTMLDefines.h"
-makehm /h /a afxhh.h IDW_,HIDW_,0x50000 "%(Filename)%(Extension)" &gt;&gt; "help\HTMLDefines.h"
-echo. &gt;&gt; "help\HTMLDefines.h"
-echo // Controls (IDC_*) &gt;&gt; "help\HTMLDefines.h"
-makehm /h IDC_,IDH_,0x00000 "%(Filename)%(Extension)" &gt;&gt; "help\HTMLDefines.h"
-</Command>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Testing Debug|Win32'">echo // Generated Help Map file.  Used by Copy Handler help files. &gt; "help\HTMLDefines.h"
-echo. &gt; "help\HTMLDefines.h"
-echo // Commands (ID_* and IDM_*) &gt;&gt; "help\HTMLDefines.h"
-makehm /h ID_,HID_,0x10000 IDM_,HIDM_,0x10000 "%(Filename)%(Extension)" &gt;&gt; "help\HTMLDefines.h"
-echo. &gt;&gt; "help\HTMLDefines.h"
-echo // Prompts (IDP_*) &gt;&gt; "help\HTMLDefines.h"
-makehm /h IDP_,HIDP_,0x30000 "%(Filename)%(Extension)" &gt;&gt; "help\HTMLDefines.h"
-echo. &gt;&gt; "help\HTMLDefines.h"
-echo // Resources (IDR_*) &gt;&gt; "help\HTMLDefines.h"
-makehm /h IDR_,HIDR_,0x20000 "%(Filename)%(Extension)" &gt;&gt; "help\HTMLDefines.h"
-echo. &gt;&gt; "help\HTMLDefines.h"
-echo // Dialogs (IDD_*) &gt;&gt; "help\HTMLDefines.h"
-makehm /h IDD_,HIDD_,0x20000 "%(Filename)%(Extension)" &gt;&gt; "help\HTMLDefines.h"
-echo. &gt;&gt; "help\HTMLDefines.h"
-echo // Frame Controls (IDW_*) &gt;&gt; "help\HTMLDefines.h"
-makehm /h /a afxhh.h IDW_,HIDW_,0x50000 "%(Filename)%(Extension)" &gt;&gt; "help\HTMLDefines.h"
-echo. &gt;&gt; "help\HTMLDefines.h"
-echo // Controls (IDC_*) &gt;&gt; "help\HTMLDefines.h"
-makehm /h IDC_,IDH_,0x00000 "%(Filename)%(Extension)" &gt;&gt; "help\HTMLDefines.h"
-</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">help\HTMLDefines.h;%(Outputs)</Outputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Testing Debug|Win32'">help\HTMLDefines.h;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Generating map file for help compiler...</Message>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Testing Debug|x64'">Generating map file for help compiler...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">echo // Generated Help Map file.  Used by Copy Handler help files. &gt; "help\HTMLDefines.h"
-echo. &gt; "help\HTMLDefines.h"
-echo // Commands (ID_* and IDM_*) &gt;&gt; "help\HTMLDefines.h"
-makehm /h ID_,HID_,0x10000 IDM_,HIDM_,0x10000 "%(Filename)%(Extension)" &gt;&gt; "help\HTMLDefines.h"
-echo. &gt;&gt; "help\HTMLDefines.h"
-echo // Prompts (IDP_*) &gt;&gt; "help\HTMLDefines.h"
-makehm /h IDP_,HIDP_,0x30000 "%(Filename)%(Extension)" &gt;&gt; "help\HTMLDefines.h"
-echo. &gt;&gt; "help\HTMLDefines.h"
-echo // Resources (IDR_*) &gt;&gt; "help\HTMLDefines.h"
-makehm /h IDR_,HIDR_,0x20000 "%(Filename)%(Extension)" &gt;&gt; "help\HTMLDefines.h"
-echo. &gt;&gt; "help\HTMLDefines.h"
-echo // Dialogs (IDD_*) &gt;&gt; "help\HTMLDefines.h"
-makehm /h IDD_,HIDD_,0x20000 "%(Filename)%(Extension)" &gt;&gt; "help\HTMLDefines.h"
-echo. &gt;&gt; "help\HTMLDefines.h"
-echo // Frame Controls (IDW_*) &gt;&gt; "help\HTMLDefines.h"
-makehm /h /a afxhh.h IDW_,HIDW_,0x50000 "%(Filename)%(Extension)" &gt;&gt; "help\HTMLDefines.h"
-echo. &gt;&gt; "help\HTMLDefines.h"
-echo // Controls (IDC_*) &gt;&gt; "help\HTMLDefines.h"
-makehm /h IDC_,IDH_,0x00000 "%(Filename)%(Extension)" &gt;&gt; "help\HTMLDefines.h"
-</Command>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Testing Debug|x64'">echo // Generated Help Map file.  Used by Copy Handler help files. &gt; "help\HTMLDefines.h"
-echo. &gt; "help\HTMLDefines.h"
-echo // Commands (ID_* and IDM_*) &gt;&gt; "help\HTMLDefines.h"
-makehm /h ID_,HID_,0x10000 IDM_,HIDM_,0x10000 "%(Filename)%(Extension)" &gt;&gt; "help\HTMLDefines.h"
-echo. &gt;&gt; "help\HTMLDefines.h"
-echo // Prompts (IDP_*) &gt;&gt; "help\HTMLDefines.h"
-makehm /h IDP_,HIDP_,0x30000 "%(Filename)%(Extension)" &gt;&gt; "help\HTMLDefines.h"
-echo. &gt;&gt; "help\HTMLDefines.h"
-echo // Resources (IDR_*) &gt;&gt; "help\HTMLDefines.h"
-makehm /h IDR_,HIDR_,0x20000 "%(Filename)%(Extension)" &gt;&gt; "help\HTMLDefines.h"
-echo. &gt;&gt; "help\HTMLDefines.h"
-echo // Dialogs (IDD_*) &gt;&gt; "help\HTMLDefines.h"
-makehm /h IDD_,HIDD_,0x20000 "%(Filename)%(Extension)" &gt;&gt; "help\HTMLDefines.h"
-echo. &gt;&gt; "help\HTMLDefines.h"
-echo // Frame Controls (IDW_*) &gt;&gt; "help\HTMLDefines.h"
-makehm /h /a afxhh.h IDW_,HIDW_,0x50000 "%(Filename)%(Extension)" &gt;&gt; "help\HTMLDefines.h"
-echo. &gt;&gt; "help\HTMLDefines.h"
-echo // Controls (IDC_*) &gt;&gt; "help\HTMLDefines.h"
-makehm /h IDC_,IDH_,0x00000 "%(Filename)%(Extension)" &gt;&gt; "help\HTMLDefines.h"
-</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">help\HTMLDefines.h;%(Outputs)</Outputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Testing Debug|x64'">help\HTMLDefines.h;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Generating map file for help compiler...</Message>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Testing Release|Win32'">Generating map file for help compiler...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">echo // Generated Help Map file.  Used by Copy Handler help files. &gt; "help\HTMLDefines.h"
-echo. &gt; "help\HTMLDefines.h"
-echo // Commands (ID_* and IDM_*) &gt;&gt; "help\HTMLDefines.h"
-makehm /h ID_,HID_,0x10000 IDM_,HIDM_,0x10000 "%(Filename)%(Extension)" &gt;&gt; "help\HTMLDefines.h"
-echo. &gt;&gt; "help\HTMLDefines.h"
-echo // Prompts (IDP_*) &gt;&gt; "help\HTMLDefines.h"
-makehm /h IDP_,HIDP_,0x30000 "%(Filename)%(Extension)" &gt;&gt; "help\HTMLDefines.h"
-echo. &gt;&gt; "help\HTMLDefines.h"
-echo // Resources (IDR_*) &gt;&gt; "help\HTMLDefines.h"
-makehm /h IDR_,HIDR_,0x20000 "%(Filename)%(Extension)" &gt;&gt; "help\HTMLDefines.h"
-echo. &gt;&gt; "help\HTMLDefines.h"
-echo // Dialogs (IDD_*) &gt;&gt; "help\HTMLDefines.h"
-makehm /h IDD_,HIDD_,0x20000 "%(Filename)%(Extension)" &gt;&gt; "help\HTMLDefines.h"
-echo. &gt;&gt; "help\HTMLDefines.h"
-echo // Frame Controls (IDW_*) &gt;&gt; "help\HTMLDefines.h"
-makehm /h /a afxhh.h IDW_,HIDW_,0x50000 "%(Filename)%(Extension)" &gt;&gt; "help\HTMLDefines.h"
-echo. &gt;&gt; "help\HTMLDefines.h"
-echo // Controls (IDC_*) &gt;&gt; "help\HTMLDefines.h"
-makehm /h IDC_,IDH_,0x00000 "%(Filename)%(Extension)" &gt;&gt; "help\HTMLDefines.h"
-</Command>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Testing Release|Win32'">echo // Generated Help Map file.  Used by Copy Handler help files. &gt; "help\HTMLDefines.h"
-echo. &gt; "help\HTMLDefines.h"
-echo // Commands (ID_* and IDM_*) &gt;&gt; "help\HTMLDefines.h"
-makehm /h ID_,HID_,0x10000 IDM_,HIDM_,0x10000 "%(Filename)%(Extension)" &gt;&gt; "help\HTMLDefines.h"
-echo. &gt;&gt; "help\HTMLDefines.h"
-echo // Prompts (IDP_*) &gt;&gt; "help\HTMLDefines.h"
-makehm /h IDP_,HIDP_,0x30000 "%(Filename)%(Extension)" &gt;&gt; "help\HTMLDefines.h"
-echo. &gt;&gt; "help\HTMLDefines.h"
-echo // Resources (IDR_*) &gt;&gt; "help\HTMLDefines.h"
-makehm /h IDR_,HIDR_,0x20000 "%(Filename)%(Extension)" &gt;&gt; "help\HTMLDefines.h"
-echo. &gt;&gt; "help\HTMLDefines.h"
-echo // Dialogs (IDD_*) &gt;&gt; "help\HTMLDefines.h"
-makehm /h IDD_,HIDD_,0x20000 "%(Filename)%(Extension)" &gt;&gt; "help\HTMLDefines.h"
-echo. &gt;&gt; "help\HTMLDefines.h"
-echo // Frame Controls (IDW_*) &gt;&gt; "help\HTMLDefines.h"
-makehm /h /a afxhh.h IDW_,HIDW_,0x50000 "%(Filename)%(Extension)" &gt;&gt; "help\HTMLDefines.h"
-echo. &gt;&gt; "help\HTMLDefines.h"
-echo // Controls (IDC_*) &gt;&gt; "help\HTMLDefines.h"
-makehm /h IDC_,IDH_,0x00000 "%(Filename)%(Extension)" &gt;&gt; "help\HTMLDefines.h"
-</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">help\HTMLDefines.h;%(Outputs)</Outputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Testing Release|Win32'">help\HTMLDefines.h;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Generating map file for help compiler...</Message>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Testing Release|x64'">Generating map file for help compiler...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">echo // Generated Help Map file.  Used by Copy Handler help files. &gt; "help\HTMLDefines.h"
-echo. &gt; "help\HTMLDefines.h"
-echo // Commands (ID_* and IDM_*) &gt;&gt; "help\HTMLDefines.h"
-makehm /h ID_,HID_,0x10000 IDM_,HIDM_,0x10000 "%(Filename)%(Extension)" &gt;&gt; "help\HTMLDefines.h"
-echo. &gt;&gt; "help\HTMLDefines.h"
-echo // Prompts (IDP_*) &gt;&gt; "help\HTMLDefines.h"
-makehm /h IDP_,HIDP_,0x30000 "%(Filename)%(Extension)" &gt;&gt; "help\HTMLDefines.h"
-echo. &gt;&gt; "help\HTMLDefines.h"
-echo // Resources (IDR_*) &gt;&gt; "help\HTMLDefines.h"
-makehm /h IDR_,HIDR_,0x20000 "%(Filename)%(Extension)" &gt;&gt; "help\HTMLDefines.h"
-echo. &gt;&gt; "help\HTMLDefines.h"
-echo // Dialogs (IDD_*) &gt;&gt; "help\HTMLDefines.h"
-makehm /h IDD_,HIDD_,0x20000 "%(Filename)%(Extension)" &gt;&gt; "help\HTMLDefines.h"
-echo. &gt;&gt; "help\HTMLDefines.h"
-echo // Frame Controls (IDW_*) &gt;&gt; "help\HTMLDefines.h"
-makehm /h /a afxhh.h IDW_,HIDW_,0x50000 "%(Filename)%(Extension)" &gt;&gt; "help\HTMLDefines.h"
-echo. &gt;&gt; "help\HTMLDefines.h"
-echo // Controls (IDC_*) &gt;&gt; "help\HTMLDefines.h"
-makehm /h IDC_,IDH_,0x00000 "%(Filename)%(Extension)" &gt;&gt; "help\HTMLDefines.h"
-</Command>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Testing Release|x64'">echo // Generated Help Map file.  Used by Copy Handler help files. &gt; "help\HTMLDefines.h"
-echo. &gt; "help\HTMLDefines.h"
-echo // Commands (ID_* and IDM_*) &gt;&gt; "help\HTMLDefines.h"
-makehm /h ID_,HID_,0x10000 IDM_,HIDM_,0x10000 "%(Filename)%(Extension)" &gt;&gt; "help\HTMLDefines.h"
-echo. &gt;&gt; "help\HTMLDefines.h"
-echo // Prompts (IDP_*) &gt;&gt; "help\HTMLDefines.h"
-makehm /h IDP_,HIDP_,0x30000 "%(Filename)%(Extension)" &gt;&gt; "help\HTMLDefines.h"
-echo. &gt;&gt; "help\HTMLDefines.h"
-echo // Resources (IDR_*) &gt;&gt; "help\HTMLDefines.h"
-makehm /h IDR_,HIDR_,0x20000 "%(Filename)%(Extension)" &gt;&gt; "help\HTMLDefines.h"
-echo. &gt;&gt; "help\HTMLDefines.h"
-echo // Dialogs (IDD_*) &gt;&gt; "help\HTMLDefines.h"
-makehm /h IDD_,HIDD_,0x20000 "%(Filename)%(Extension)" &gt;&gt; "help\HTMLDefines.h"
-echo. &gt;&gt; "help\HTMLDefines.h"
-echo // Frame Controls (IDW_*) &gt;&gt; "help\HTMLDefines.h"
-makehm /h /a afxhh.h IDW_,HIDW_,0x50000 "%(Filename)%(Extension)" &gt;&gt; "help\HTMLDefines.h"
-echo. &gt;&gt; "help\HTMLDefines.h"
-echo // Controls (IDC_*) &gt;&gt; "help\HTMLDefines.h"
-makehm /h IDC_,IDH_,0x00000 "%(Filename)%(Extension)" &gt;&gt; "help\HTMLDefines.h"
-</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">help\HTMLDefines.h;%(Outputs)</Outputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Testing Release|x64'">help\HTMLDefines.h;%(Outputs)</Outputs>
-    </CustomBuild>
+    <ClInclude Include="resource.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\tests\tests_shared\TestsExports.cpp">
@@ -773,14 +634,21 @@
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Testing Debug|x64'">NotUsing</PrecompiledHeader>
     </ClCompile>
+    <ClCompile Include="..\common\TRegistry.cpp" />
     <ClCompile Include="..\common\TShellExtIpcConfigDataProvider.cpp" />
     <ClCompile Include="..\common\TShellExtMenuConfig.cpp" />
+    <ClCompile Include="AppAutorun.cpp" />
     <ClCompile Include="AsyncHttpFile.cpp" />
     <ClCompile Include="CDragDropComboEx.cpp" />
     <ClCompile Include="CDragDropListCtrl.cpp" />
     <ClCompile Include="DirectoryChooser.cpp" />
     <ClCompile Include="FeedbackHandler.cpp" />
     <ClCompile Include="FeedbackHandlerFactory.cpp" />
+    <ClCompile Include="FilterTypesMenuWrapper.cpp" />
+    <ClCompile Include="RuleEditAlreadyExistsDlg.cpp" />
+    <ClCompile Include="RuleEditDlg.cpp" />
+    <ClCompile Include="RuleEditErrorDlg.cpp" />
+    <ClCompile Include="RuleEditNotEnoughSpaceDlg.cpp" />
     <ClCompile Include="structs.cpp" />
     <ClCompile Include="AppHelper.cpp" />
     <ClCompile Include="ClipboardMonitor.cpp" />
@@ -791,7 +659,6 @@
     <ClCompile Include="TPathProcessor.cpp" />
     <ClCompile Include="TProgressCtrlEx.cpp" />
     <ClCompile Include="TRecentPathsTools.cpp" />
-    <ClCompile Include="TRegistry.cpp" />
     <ClCompile Include="TShellExtensionConfig.cpp" />
     <ClCompile Include="TTaskManagerWrapper.cpp" />
     <ClCompile Include="TWindowMessageFilterHelper.cpp" />
@@ -837,24 +704,6 @@
     <ClCompile Include="UpdateMultipleVersionInfo.cpp" />
     <ClCompile Include="UpdaterDlg.cpp" />
     <ClCompile Include="TShellExtensionClient.cpp" />
-    <ClCompile Include="..\chext\chext_i.c">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-      </PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Testing Debug|Win32'">
-      </PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-      </PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Testing Debug|x64'">
-      </PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-      </PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Testing Release|Win32'">
-      </PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-      </PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Testing Release|x64'">
-      </PrecompiledHeader>
-    </ClCompile>
     <ClCompile Include="UpdateResponse.cpp" />
     <ClCompile Include="UpdateVersionInfo.cpp" />
     <ClCompile Include="WindowsVersion.cpp" />
@@ -863,292 +712,56 @@
     <CustomBuild Include="ch.rc">
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Compiling resources %(FullPath)</Message>
       <Message Condition="'$(Configuration)|$(Platform)'=='Testing Debug|Win32'">Compiling resources %(FullPath)</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(SolutionDir)\tools\rc2lng.exe" "%(FullPath)" "$(InputDir)scripts\header.lng" "$(IntDir)\chtmp.rc" "$(OutDir)langs\english.lng" "$(InputDir)resource.h" "$(VCInstallDir)atlmfc\include\afxres.h"
-rc.exe /l 0x409 /d "NDEBUG" /d "_AFXDLL" /fo"$(OutDir)\%(Filename).res" "$(IntDir)\chtmp.rc"
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(SolutionDir)tools\rc2lng.exe" "%(FullPath)" "$(InputDir)scripts\header.lng" "$(IntDir)chtmp.rc" "$(OutDir)langs\english.lng" "$(InputDir)resource.h" "$(VCToolsInstallDir)atlmfc\include\afxres.h"
+rc.exe /l 0x409 /d "NDEBUG" /d "_AFXDLL" /fo"$(OutDir)%(Filename).res" "$(IntDir)chtmp.rc"
 </Command>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Testing Debug|Win32'">"$(SolutionDir)\tools\rc2lng.exe" "%(FullPath)" "$(InputDir)scripts\header.lng" "$(IntDir)\chtmp.rc" "$(OutDir)langs\english.lng" "$(InputDir)resource.h" "$(VCInstallDir)atlmfc\include\afxres.h"
-rc.exe /l 0x409 /d "NDEBUG" /d "_AFXDLL" /fo"$(OutDir)\%(Filename).res" "$(IntDir)\chtmp.rc"
+      <Command Condition="'$(Configuration)|$(Platform)'=='Testing Debug|Win32'">"$(SolutionDir)tools\rc2lng.exe" "%(FullPath)" "$(InputDir)scripts\header.lng" "$(IntDir)chtmp.rc" "$(OutDir)langs\english.lng" "$(InputDir)resource.h" "$(VCToolsInstallDir)atlmfc\include\afxres.h"
+rc.exe /l 0x409 /d "NDEBUG" /d "_AFXDLL" /fo"$(OutDir)%(Filename).res" "$(IntDir)chtmp.rc"
 </Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">res/ch.rc2;version.h</AdditionalInputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Testing Debug|Win32'">res/ch.rc2;version.h</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">res/ch.rc2;../common/version.h</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Testing Debug|Win32'">res/ch.rc2;../common/version.h</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)%(Filename).res;%(Outputs)</Outputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Testing Debug|Win32'">$(OutDir)%(Filename).res;%(Outputs)</Outputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Compiling resources %(FullPath)</Message>
       <Message Condition="'$(Configuration)|$(Platform)'=='Testing Debug|x64'">Compiling resources %(FullPath)</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(SolutionDir)\tools\rc2lng.exe" "%(FullPath)" "$(InputDir)scripts\header.lng" "$(IntDir)\chtmp.rc" "$(OutDir)langs\english.lng" "$(InputDir)resource.h" "$(VCInstallDir)atlmfc\include\afxres.h"
-rc.exe /l 0x409 /d "NDEBUG" /d "_AFXDLL" /fo"$(OutDir)\%(Filename).res" "$(IntDir)\chtmp.rc"
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(SolutionDir)tools\rc2lng.exe" "%(FullPath)" "$(InputDir)scripts\header.lng" "$(IntDir)chtmp.rc" "$(OutDir)langs\english.lng" "$(InputDir)resource.h" "$(VCToolsInstallDir)atlmfc\include\afxres.h"
+rc.exe /l 0x409 /d "NDEBUG" /d "_AFXDLL" /fo"$(OutDir)%(Filename).res" "$(IntDir)chtmp.rc"
 </Command>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Testing Debug|x64'">"$(SolutionDir)\tools\rc2lng.exe" "%(FullPath)" "$(InputDir)scripts\header.lng" "$(IntDir)\chtmp.rc" "$(OutDir)langs\english.lng" "$(InputDir)resource.h" "$(VCInstallDir)atlmfc\include\afxres.h"
-rc.exe /l 0x409 /d "NDEBUG" /d "_AFXDLL" /fo"$(OutDir)\%(Filename).res" "$(IntDir)\chtmp.rc"
+      <Command Condition="'$(Configuration)|$(Platform)'=='Testing Debug|x64'">"$(SolutionDir)tools\rc2lng.exe" "%(FullPath)" "$(InputDir)scripts\header.lng" "$(IntDir)chtmp.rc" "$(OutDir)langs\english.lng" "$(InputDir)resource.h" "$(VCToolsInstallDir)atlmfc\include\afxres.h"
+rc.exe /l 0x409 /d "NDEBUG" /d "_AFXDLL" /fo"$(OutDir)%(Filename).res" "$(IntDir)chtmp.rc"
 </Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">res/ch.rc2;version.h</AdditionalInputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Testing Debug|x64'">res/ch.rc2;version.h</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">res/ch.rc2;../common/version.h</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Testing Debug|x64'">res/ch.rc2;../common/version.h</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)%(Filename).res;%(Outputs)</Outputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Testing Debug|x64'">$(OutDir)%(Filename).res;%(Outputs)</Outputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Compiling resources %(FullPath)</Message>
       <Message Condition="'$(Configuration)|$(Platform)'=='Testing Release|Win32'">Compiling resources %(FullPath)</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"$(SolutionDir)\tools\rc2lng.exe" "%(FullPath)" "$(InputDir)scripts\header.lng" "$(IntDir)\chtmp.rc" "$(OutDir)langs\english.lng" "$(InputDir)resource.h" "$(VCInstallDir)atlmfc\include\afxres.h"
-rc.exe /l 0x409 /d "NDEBUG" /d "_AFXDLL" /fo"$(OutDir)\%(Filename).res" "$(IntDir)\chtmp.rc"
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"$(SolutionDir)tools\rc2lng.exe" "%(FullPath)" "$(InputDir)scripts\header.lng" "$(IntDir)chtmp.rc" "$(OutDir)langs\english.lng" "$(InputDir)resource.h" "$(VCToolsInstallDir)atlmfc\include\afxres.h"
+rc.exe /l 0x409 /d "NDEBUG" /d "_AFXDLL" /fo"$(OutDir)%(Filename).res" "$(IntDir)chtmp.rc"
 </Command>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Testing Release|Win32'">"$(SolutionDir)\tools\rc2lng.exe" "%(FullPath)" "$(InputDir)scripts\header.lng" "$(IntDir)\chtmp.rc" "$(OutDir)langs\english.lng" "$(InputDir)resource.h" "$(VCInstallDir)atlmfc\include\afxres.h"
-rc.exe /l 0x409 /d "NDEBUG" /d "_AFXDLL" /fo"$(OutDir)\%(Filename).res" "$(IntDir)\chtmp.rc"
+      <Command Condition="'$(Configuration)|$(Platform)'=='Testing Release|Win32'">"$(SolutionDir)tools\rc2lng.exe" "%(FullPath)" "$(InputDir)scripts\header.lng" "$(IntDir)chtmp.rc" "$(OutDir)langs\english.lng" "$(InputDir)resource.h" "$(VCToolsInstallDir)atlmfc\include\afxres.h"
+rc.exe /l 0x409 /d "NDEBUG" /d "_AFXDLL" /fo"$(OutDir)%(Filename).res" "$(IntDir)chtmp.rc"
 </Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">res/ch.rc2;version.h</AdditionalInputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Testing Release|Win32'">res/ch.rc2;version.h</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">res/ch.rc2;../common/version.h</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Testing Release|Win32'">res/ch.rc2;../common/version.h</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)%(Filename).res;%(Outputs)</Outputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Testing Release|Win32'">$(OutDir)%(Filename).res;%(Outputs)</Outputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Compiling resources %(FullPath)</Message>
       <Message Condition="'$(Configuration)|$(Platform)'=='Testing Release|x64'">Compiling resources %(FullPath)</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(SolutionDir)\tools\rc2lng.exe" "%(FullPath)" "$(InputDir)scripts\header.lng" "$(IntDir)\chtmp.rc" "$(OutDir)langs\english.lng" "$(InputDir)resource.h" "$(VCInstallDir)atlmfc\include\afxres.h"
-rc.exe /l 0x409 /d "NDEBUG" /d "_AFXDLL" /fo"$(OutDir)\%(Filename).res" "$(IntDir)\chtmp.rc"
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(SolutionDir)tools\rc2lng.exe" "%(FullPath)" "$(InputDir)scripts\header.lng" "$(IntDir)chtmp.rc" "$(OutDir)langs\english.lng" "$(InputDir)resource.h" "$(VCToolsInstallDir)atlmfc\include\afxres.h"
+rc.exe /l 0x409 /d "NDEBUG" /d "_AFXDLL" /fo"$(OutDir)%(Filename).res" "$(IntDir)chtmp.rc"
 </Command>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Testing Release|x64'">"$(SolutionDir)\tools\rc2lng.exe" "%(FullPath)" "$(InputDir)scripts\header.lng" "$(IntDir)\chtmp.rc" "$(OutDir)langs\english.lng" "$(InputDir)resource.h" "$(VCInstallDir)atlmfc\include\afxres.h"
-rc.exe /l 0x409 /d "NDEBUG" /d "_AFXDLL" /fo"$(OutDir)\%(Filename).res" "$(IntDir)\chtmp.rc"
+      <Command Condition="'$(Configuration)|$(Platform)'=='Testing Release|x64'">"$(SolutionDir)tools\rc2lng.exe" "%(FullPath)" "$(InputDir)scripts\header.lng" "$(IntDir)chtmp.rc" "$(OutDir)langs\english.lng" "$(InputDir)resource.h" "$(VCToolsInstallDir)atlmfc\include\afxres.h"
+rc.exe /l 0x409 /d "NDEBUG" /d "_AFXDLL" /fo"$(OutDir)%(Filename).res" "$(IntDir)chtmp.rc"
 </Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">res/ch.rc2;version.h</AdditionalInputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Testing Release|x64'">res/ch.rc2;version.h</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">res/ch.rc2;../common/version.h</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Testing Release|x64'">res/ch.rc2;../common/version.h</AdditionalInputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)%(Filename).res;%(Outputs)</Outputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Testing Release|x64'">$(OutDir)%(Filename).res;%(Outputs)</Outputs>
     </CustomBuild>
   </ItemGroup>
   <ItemGroup>
     <None Include="res\ch.rc2" />
-    <None Include="resource.hm" />
-    <None Include="help\english\advmenu.htm">
-      <DeploymentContent>true</DeploymentContent>
-    </None>
-    <None Include="help\english\buffersize.htm">
-      <DeploymentContent>true</DeploymentContent>
-    </None>
-    <None Include="help\english\bugs.htm">
-      <DeploymentContent>true</DeploymentContent>
-    </None>
-    <None Include="help\english\customcopy.htm">
-      <DeploymentContent>true</DeploymentContent>
-    </None>
-    <None Include="help\english\explorermenu.htm">
-      <DeploymentContent>true</DeploymentContent>
-    </None>
-    <None Include="help\english\faq.htm">
-      <DeploymentContent>true</DeploymentContent>
-    </None>
-    <None Include="help\english\feeddstfile.htm">
-      <DeploymentContent>true</DeploymentContent>
-    </None>
-    <None Include="help\english\feediwr.htm">
-      <DeploymentContent>true</DeploymentContent>
-    </None>
-    <None Include="help\english\feednotenoughroom.htm">
-      <DeploymentContent>true</DeploymentContent>
-    </None>
-    <None Include="help\english\feedreplacefiles.htm">
-      <DeploymentContent>true</DeploymentContent>
-    </None>
-    <None Include="help\english\feedsmallreplace.htm">
-      <DeploymentContent>true</DeploymentContent>
-    </None>
-    <None Include="help\english\filterdlg.htm">
-      <DeploymentContent>true</DeploymentContent>
-    </None>
-    <None Include="help\english\folderdlg.htm">
-      <DeploymentContent>true</DeploymentContent>
-    </None>
-    <None Include="help\english\headfoot.js" />
-    <None Include="help\english\help.hhc" />
-    <None Include="help\english\help.hhk" />
-    <CustomBuild Include="help\english\help.hhp">
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Making help file...</Message>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Testing Debug|Win32'">Making help file...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy "help\HTMLDefines.h" "%(RootDir)%(Directory)HTMLDefines.h"
-SET PATH=%PATH%;$(VS_ExecutablePath)
-hhc "%(FullPath)"
-if not exist "%(RootDir)%(Directory)english.chm" goto :HelpError
-mkdir "$(OutDir)help" &gt;nul 2&gt;nul
-copy "%(RootDir)%(Directory)english.chm" "$(OutDir)help\english.chm"
-goto :HelpDone
-:HelpError
-echo %(FullPath)(1) : error:Problem encountered creating help file
-echo.
-exit 1
-:HelpDone
-echo.
-</Command>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Testing Debug|Win32'">copy "help\HTMLDefines.h" "%(RootDir)%(Directory)HTMLDefines.h"
-SET PATH=%PATH%;$(VS_ExecutablePath)
-hhc "%(FullPath)"
-if not exist "%(RootDir)%(Directory)english.chm" goto :HelpError
-mkdir "$(OutDir)help" &gt;nul 2&gt;nul
-copy "%(RootDir)%(Directory)english.chm" "$(OutDir)help\english.chm"
-goto :HelpDone
-:HelpError
-echo %(FullPath)(1) : error:Problem encountered creating help file
-echo.
-exit 1
-:HelpDone
-echo.
-</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">help\HTMLDefines.h;%(AdditionalInputs)</AdditionalInputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Testing Debug|Win32'">help\HTMLDefines.h;%(AdditionalInputs)</AdditionalInputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">help\english\english.chm;%(Outputs)</Outputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Testing Debug|Win32'">help\english\english.chm;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Making help file...</Message>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Testing Debug|x64'">Making help file...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">copy "help\HTMLDefines.h" "%(RootDir)%(Directory)HTMLDefines.h"
-SET PATH=%PATH%;$(VS_ExecutablePath)
-hhc "%(FullPath)"
-if not exist "%(RootDir)%(Directory)english.chm" goto :HelpError
-mkdir "$(OutDir)help" &gt;nul 2&gt;nul
-copy "%(RootDir)%(Directory)english.chm" "$(OutDir)help\english.chm"
-goto :HelpDone
-:HelpError
-echo %(FullPath)(1) : error:Problem encountered creating help file
-echo.
-exit 1
-:HelpDone
-echo.
-</Command>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Testing Debug|x64'">copy "help\HTMLDefines.h" "%(RootDir)%(Directory)HTMLDefines.h"
-SET PATH=%PATH%;$(VS_ExecutablePath)
-hhc "%(FullPath)"
-if not exist "%(RootDir)%(Directory)english.chm" goto :HelpError
-mkdir "$(OutDir)help" &gt;nul 2&gt;nul
-copy "%(RootDir)%(Directory)english.chm" "$(OutDir)help\english.chm"
-goto :HelpDone
-:HelpError
-echo %(FullPath)(1) : error:Problem encountered creating help file
-echo.
-exit 1
-:HelpDone
-echo.
-</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">help\HTMLDefines.h;%(AdditionalInputs)</AdditionalInputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Testing Debug|x64'">help\HTMLDefines.h;%(AdditionalInputs)</AdditionalInputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">help\english\english.chm;%(Outputs)</Outputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Testing Debug|x64'">help\english\english.chm;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Making help file...</Message>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Testing Release|Win32'">Making help file...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">copy "help\HTMLDefines.h" "%(RootDir)%(Directory)HTMLDefines.h"
-SET PATH=%PATH%;$(VS_ExecutablePath)
-hhc "%(FullPath)"
-if not exist "%(RootDir)%(Directory)english.chm" goto :HelpError
-mkdir "$(OutDir)help" &gt;nul 2&gt;nul
-copy "%(RootDir)%(Directory)english.chm" "$(OutDir)help\english.chm"
-goto :HelpDone
-:HelpError
-echo %(FullPath)(1) : error:Problem encountered creating help file
-echo.
-exit 1
-:HelpDone
-echo.
-</Command>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Testing Release|Win32'">copy "help\HTMLDefines.h" "%(RootDir)%(Directory)HTMLDefines.h"
-SET PATH=%PATH%;$(VS_ExecutablePath)
-hhc "%(FullPath)"
-if not exist "%(RootDir)%(Directory)english.chm" goto :HelpError
-mkdir "$(OutDir)help" &gt;nul 2&gt;nul
-copy "%(RootDir)%(Directory)english.chm" "$(OutDir)help\english.chm"
-goto :HelpDone
-:HelpError
-echo %(FullPath)(1) : error:Problem encountered creating help file
-echo.
-exit 1
-:HelpDone
-echo.
-</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">help\HTMLDefines.h;%(AdditionalInputs)</AdditionalInputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Testing Release|Win32'">help\HTMLDefines.h;%(AdditionalInputs)</AdditionalInputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">help\english\english.chm;%(Outputs)</Outputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Testing Release|Win32'">help\english\english.chm;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Making help file...</Message>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Testing Release|x64'">Making help file...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">copy "help\HTMLDefines.h" "%(RootDir)%(Directory)HTMLDefines.h"
-SET PATH=%PATH%;$(VS_ExecutablePath)
-hhc "%(FullPath)"
-if not exist "%(RootDir)%(Directory)english.chm" goto :HelpError
-mkdir "$(OutDir)help" &gt;nul 2&gt;nul
-copy "%(RootDir)%(Directory)english.chm" "$(OutDir)help\english.chm"
-goto :HelpDone
-:HelpError
-echo %(FullPath)(1) : error:Problem encountered creating help file
-echo.
-exit 1
-:HelpDone
-echo.
-</Command>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Testing Release|x64'">copy "help\HTMLDefines.h" "%(RootDir)%(Directory)HTMLDefines.h"
-SET PATH=%PATH%;$(VS_ExecutablePath)
-hhc "%(FullPath)"
-if not exist "%(RootDir)%(Directory)english.chm" goto :HelpError
-mkdir "$(OutDir)help" &gt;nul 2&gt;nul
-copy "%(RootDir)%(Directory)english.chm" "$(OutDir)help\english.chm"
-goto :HelpDone
-:HelpError
-echo %(FullPath)(1) : error:Problem encountered creating help file
-echo.
-exit 1
-:HelpDone
-echo.
-</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">help\HTMLDefines.h;%(AdditionalInputs)</AdditionalInputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Testing Release|x64'">help\HTMLDefines.h;%(AdditionalInputs)</AdditionalInputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">help\english\english.chm;%(Outputs)</Outputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Testing Release|x64'">help\english\english.chm;%(Outputs)</Outputs>
-    </CustomBuild>
-    <None Include="help\english\history.htm">
-      <DeploymentContent>true</DeploymentContent>
-    </None>
-    <None Include="help\english\installation.htm">
-      <DeploymentContent>true</DeploymentContent>
-    </None>
-    <None Include="help\english\license.htm">
-      <DeploymentContent>true</DeploymentContent>
-    </None>
-    <None Include="help\english\mainmenu.htm">
-      <DeploymentContent>true</DeploymentContent>
-    </None>
-    <None Include="help\english\miniview.htm">
-      <DeploymentContent>true</DeploymentContent>
-    </None>
-    <None Include="help\english\options.htm">
-      <DeploymentContent>true</DeploymentContent>
-    </None>
-    <None Include="help\english\recentdlg.htm">
-      <DeploymentContent>true</DeploymentContent>
-    </None>
-    <None Include="help\english\replacepaths.htm">
-      <DeploymentContent>true</DeploymentContent>
-    </None>
-    <None Include="help\english\reporting.htm">
-      <DeploymentContent>true</DeploymentContent>
-    </None>
-    <None Include="help\english\requirements.htm">
-      <DeploymentContent>true</DeploymentContent>
-    </None>
-    <None Include="help\english\shortcutsdlg.htm">
-      <DeploymentContent>true</DeploymentContent>
-    </None>
-    <None Include="help\english\shutdowndlg.htm">
-      <DeploymentContent>true</DeploymentContent>
-    </None>
-    <None Include="help\english\status.htm">
-      <DeploymentContent>true</DeploymentContent>
-    </None>
-    <None Include="help\english\style.css" />
-    <None Include="help\english\support.htm">
-      <DeploymentContent>true</DeploymentContent>
-    </None>
-    <None Include="help\english\template.htm">
-      <DeploymentContent>true</DeploymentContent>
-    </None>
-    <None Include="help\english\thanks.htm">
-      <DeploymentContent>true</DeploymentContent>
-    </None>
-    <None Include="help\english\using.htm">
-      <DeploymentContent>true</DeploymentContent>
-    </None>
-    <None Include="help\english\welcome.htm">
-      <DeploymentContent>true</DeploymentContent>
-    </None>
     <CustomBuild Include="langs\bulgarian.lng">
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Copying language file %(Filename)%(Extension)...</Message>
       <Message Condition="'$(Configuration)|$(Platform)'=='Testing Debug|Win32'">Copying language file %(Filename)%(Extension)...</Message>
@@ -1693,241 +1306,6 @@
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)langs\%(Filename)%(Extension);%(Outputs)</Outputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Testing Release|x64'">$(OutDir)langs\%(Filename)%(Extension);%(Outputs)</Outputs>
     </CustomBuild>
-    <None Include="help\polish\advmenu.htm">
-      <DeploymentContent>true</DeploymentContent>
-    </None>
-    <None Include="help\polish\buffersize.htm">
-      <DeploymentContent>true</DeploymentContent>
-    </None>
-    <None Include="help\polish\bugs.htm">
-      <DeploymentContent>true</DeploymentContent>
-    </None>
-    <None Include="help\polish\customcopy.htm">
-      <DeploymentContent>true</DeploymentContent>
-    </None>
-    <None Include="help\polish\explorermenu.htm">
-      <DeploymentContent>true</DeploymentContent>
-    </None>
-    <None Include="help\polish\faq.htm">
-      <DeploymentContent>true</DeploymentContent>
-    </None>
-    <None Include="help\polish\feeddstfile.htm">
-      <DeploymentContent>true</DeploymentContent>
-    </None>
-    <None Include="help\polish\feediwr.htm">
-      <DeploymentContent>true</DeploymentContent>
-    </None>
-    <None Include="help\polish\feednotenoughroom.htm">
-      <DeploymentContent>true</DeploymentContent>
-    </None>
-    <None Include="help\polish\feedreplacefiles.htm">
-      <DeploymentContent>true</DeploymentContent>
-    </None>
-    <None Include="help\polish\feedsmallreplace.htm">
-      <DeploymentContent>true</DeploymentContent>
-    </None>
-    <None Include="help\polish\filterdlg.htm">
-      <DeploymentContent>true</DeploymentContent>
-    </None>
-    <None Include="help\polish\folderdlg.htm">
-      <DeploymentContent>true</DeploymentContent>
-    </None>
-    <None Include="help\polish\headfoot.js" />
-    <None Include="help\polish\help.hhc" />
-    <None Include="help\polish\help.hhk" />
-    <CustomBuild Include="help\polish\help.hhp">
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Making help file...</Message>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Testing Debug|Win32'">Making help file...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy "help\HTMLDefines.h" "%(RootDir)%(Directory)HTMLDefines.h"
-SET PATH=%PATH%;$(VS_ExecutablePath)
-hhc "%(FullPath)"
-if not exist "%(RootDir)%(Directory)polish.chm" goto :HelpError
-mkdir "$(OutDir)help" &gt;nul 2&gt;nul
-copy "%(RootDir)%(Directory)polish.chm" "$(OutDir)help\polish.chm"
-goto :HelpDone
-:HelpError
-echo %(FullPath)(1) : error:Problem encountered creating help file
-echo.
-exit 1
-:HelpDone
-echo.
-</Command>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Testing Debug|Win32'">copy "help\HTMLDefines.h" "%(RootDir)%(Directory)HTMLDefines.h"
-SET PATH=%PATH%;$(VS_ExecutablePath)
-hhc "%(FullPath)"
-if not exist "%(RootDir)%(Directory)polish.chm" goto :HelpError
-mkdir "$(OutDir)help" &gt;nul 2&gt;nul
-copy "%(RootDir)%(Directory)polish.chm" "$(OutDir)help\polish.chm"
-goto :HelpDone
-:HelpError
-echo %(FullPath)(1) : error:Problem encountered creating help file
-echo.
-exit 1
-:HelpDone
-echo.
-</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">help\HTMLDefines.h;%(AdditionalInputs)</AdditionalInputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Testing Debug|Win32'">help\HTMLDefines.h;%(AdditionalInputs)</AdditionalInputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">help\polish\polish.chm;%(Outputs)</Outputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Testing Debug|Win32'">help\polish\polish.chm;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Making help file...</Message>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Testing Debug|x64'">Making help file...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">copy "help\HTMLDefines.h" "%(RootDir)%(Directory)HTMLDefines.h"
-SET PATH=%PATH%;$(VS_ExecutablePath)
-hhc "%(FullPath)"
-if not exist "%(RootDir)%(Directory)polish.chm" goto :HelpError
-mkdir "$(OutDir)help" &gt;nul 2&gt;nul
-copy "%(RootDir)%(Directory)polish.chm" "$(OutDir)help\polish.chm"
-goto :HelpDone
-:HelpError
-echo %(FullPath)(1) : error:Problem encountered creating help file
-echo.
-exit 1
-:HelpDone
-echo.
-</Command>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Testing Debug|x64'">copy "help\HTMLDefines.h" "%(RootDir)%(Directory)HTMLDefines.h"
-SET PATH=%PATH%;$(VS_ExecutablePath)
-hhc "%(FullPath)"
-if not exist "%(RootDir)%(Directory)polish.chm" goto :HelpError
-mkdir "$(OutDir)help" &gt;nul 2&gt;nul
-copy "%(RootDir)%(Directory)polish.chm" "$(OutDir)help\polish.chm"
-goto :HelpDone
-:HelpError
-echo %(FullPath)(1) : error:Problem encountered creating help file
-echo.
-exit 1
-:HelpDone
-echo.
-</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">help\HTMLDefines.h;%(AdditionalInputs)</AdditionalInputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Testing Debug|x64'">help\HTMLDefines.h;%(AdditionalInputs)</AdditionalInputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">help\polish\polish.chm;%(Outputs)</Outputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Testing Debug|x64'">help\polish\polish.chm;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Making help file...</Message>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Testing Release|Win32'">Making help file...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">copy "help\HTMLDefines.h" "%(RootDir)%(Directory)HTMLDefines.h"
-SET PATH=%PATH%;$(VS_ExecutablePath)
-hhc "%(FullPath)"
-if not exist "%(RootDir)%(Directory)polish.chm" goto :HelpError
-mkdir "$(OutDir)help" &gt;nul 2&gt;nul
-copy "%(RootDir)%(Directory)polish.chm" "$(OutDir)help\polish.chm"
-goto :HelpDone
-:HelpError
-echo %(FullPath)(1) : error:Problem encountered creating help file
-echo.
-exit 1
-:HelpDone
-echo.
-</Command>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Testing Release|Win32'">copy "help\HTMLDefines.h" "%(RootDir)%(Directory)HTMLDefines.h"
-SET PATH=%PATH%;$(VS_ExecutablePath)
-hhc "%(FullPath)"
-if not exist "%(RootDir)%(Directory)polish.chm" goto :HelpError
-mkdir "$(OutDir)help" &gt;nul 2&gt;nul
-copy "%(RootDir)%(Directory)polish.chm" "$(OutDir)help\polish.chm"
-goto :HelpDone
-:HelpError
-echo %(FullPath)(1) : error:Problem encountered creating help file
-echo.
-exit 1
-:HelpDone
-echo.
-</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">help\HTMLDefines.h;%(AdditionalInputs)</AdditionalInputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Testing Release|Win32'">help\HTMLDefines.h;%(AdditionalInputs)</AdditionalInputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">help\polish\polish.chm;%(Outputs)</Outputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Testing Release|Win32'">help\polish\polish.chm;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Making help file...</Message>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Testing Release|x64'">Making help file...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">copy "help\HTMLDefines.h" "%(RootDir)%(Directory)HTMLDefines.h"
-SET PATH=%PATH%;$(VS_ExecutablePath)
-hhc "%(FullPath)"
-if not exist "%(RootDir)%(Directory)polish.chm" goto :HelpError
-mkdir "$(OutDir)help" &gt;nul 2&gt;nul
-copy "%(RootDir)%(Directory)polish.chm" "$(OutDir)help\polish.chm"
-goto :HelpDone
-:HelpError
-echo %(FullPath)(1) : error:Problem encountered creating help file
-echo.
-exit 1
-:HelpDone
-echo.
-</Command>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Testing Release|x64'">copy "help\HTMLDefines.h" "%(RootDir)%(Directory)HTMLDefines.h"
-SET PATH=%PATH%;$(VS_ExecutablePath)
-hhc "%(FullPath)"
-if not exist "%(RootDir)%(Directory)polish.chm" goto :HelpError
-mkdir "$(OutDir)help" &gt;nul 2&gt;nul
-copy "%(RootDir)%(Directory)polish.chm" "$(OutDir)help\polish.chm"
-goto :HelpDone
-:HelpError
-echo %(FullPath)(1) : error:Problem encountered creating help file
-echo.
-exit 1
-:HelpDone
-echo.
-</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">help\HTMLDefines.h;%(AdditionalInputs)</AdditionalInputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Testing Release|x64'">help\HTMLDefines.h;%(AdditionalInputs)</AdditionalInputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">help\polish\polish.chm;%(Outputs)</Outputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Testing Release|x64'">help\polish\polish.chm;%(Outputs)</Outputs>
-    </CustomBuild>
-    <None Include="help\polish\history.htm">
-      <DeploymentContent>true</DeploymentContent>
-    </None>
-    <None Include="help\polish\installation.htm">
-      <DeploymentContent>true</DeploymentContent>
-    </None>
-    <None Include="help\polish\license.htm">
-      <DeploymentContent>true</DeploymentContent>
-    </None>
-    <None Include="help\polish\mainmenu.htm">
-      <DeploymentContent>true</DeploymentContent>
-    </None>
-    <None Include="help\polish\miniview.htm">
-      <DeploymentContent>true</DeploymentContent>
-    </None>
-    <None Include="help\polish\options.htm">
-      <DeploymentContent>true</DeploymentContent>
-    </None>
-    <None Include="help\polish\recentdlg.htm">
-      <DeploymentContent>true</DeploymentContent>
-    </None>
-    <None Include="help\polish\replacepaths.htm">
-      <DeploymentContent>true</DeploymentContent>
-    </None>
-    <None Include="help\polish\reporting.htm">
-      <DeploymentContent>true</DeploymentContent>
-    </None>
-    <None Include="help\polish\requirements.htm">
-      <DeploymentContent>true</DeploymentContent>
-    </None>
-    <None Include="help\polish\shortcutsdlg.htm">
-      <DeploymentContent>true</DeploymentContent>
-    </None>
-    <None Include="help\polish\shutdowndlg.htm">
-      <DeploymentContent>true</DeploymentContent>
-    </None>
-    <None Include="help\polish\status.htm">
-      <DeploymentContent>true</DeploymentContent>
-    </None>
-    <None Include="help\polish\style.css" />
-    <None Include="help\polish\support.htm">
-      <DeploymentContent>true</DeploymentContent>
-    </None>
-    <None Include="help\polish\template.htm">
-      <DeploymentContent>true</DeploymentContent>
-    </None>
-    <None Include="help\polish\thanks.htm">
-      <DeploymentContent>true</DeploymentContent>
-    </None>
-    <None Include="help\polish\using.htm">
-      <DeploymentContent>true</DeploymentContent>
-    </None>
-    <None Include="help\polish\welcome.htm">
-      <DeploymentContent>true</DeploymentContent>
-    </None>
   </ItemGroup>
   <ItemGroup>
     <Image Include="res\main_toolbar.bmp" />
@@ -1956,40 +1334,8 @@
     <Image Include="res\waiting.ico" />
     <Image Include="res\warning.ico" />
     <Image Include="res\working.ico" />
-    <Image Include="help\english\ch.gif" />
-    <Image Include="help\polish\ch.gif" />
   </ItemGroup>
   <ItemGroup>
-    <Text Include="help\english\0.txt" />
-    <Text Include="help\english\100.txt" />
-    <Text Include="help\english\131.txt" />
-    <Text Include="help\english\137.txt" />
-    <Text Include="help\english\144.txt" />
-    <Text Include="help\english\145.txt" />
-    <Text Include="help\english\149.txt" />
-    <Text Include="help\english\161.txt" />
-    <Text Include="help\english\167.txt" />
-    <Text Include="help\english\173.txt" />
-    <Text Include="help\english\182.txt" />
-    <Text Include="help\english\195.txt" />
-    <Text Include="help\english\208.txt" />
-    <Text Include="help\english\209.txt" />
-    <Text Include="help\polish\0.txt" />
-    <Text Include="help\polish\100.txt" />
-    <Text Include="help\polish\131.txt" />
-    <Text Include="help\polish\137.txt" />
-    <Text Include="help\polish\144.txt" />
-    <Text Include="help\polish\145.txt" />
-    <Text Include="help\polish\149.txt" />
-    <Text Include="help\polish\161.txt" />
-    <Text Include="help\polish\167.txt" />
-    <Text Include="help\polish\173.txt" />
-    <Text Include="help\polish\182.txt" />
-    <Text Include="help\polish\195.txt" />
-    <Text Include="help\polish\208.txt" />
-    <Text Include="help\polish\209.txt" />
-  </ItemGroup>
-  <ItemGroup>
     <ProjectReference Include="..\libchcore\libchcore.vc140.vcxproj">
       <Project>{cbbf380b-7b16-4a1e-8194-758dad7d8011}</Project>
     </ProjectReference>