Reusing format_xml for cleancbproj + Improving it to handle tags with multi-line text contents (<PostBuildEvent>) and empty lines

To correct indentation in release source code
+ Reporting line number on errors

Source commit: bb86177a42a7f1df004ecf8f18affe8c152ac2d3

source/Console.cbproj

@@ -1,4 +1,4 @@
-	<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 	<PropertyGroup>
 		<ProjectGuid>{838C77E9-8237-4097-964C-EBB952D2E9A8}</ProjectGuid>
 		<ProjectVersion>15.4</ProjectVersion>
@@ -23,78 +23,77 @@
 		<Base>true</Base>
 	</PropertyGroup>
 	<PropertyGroup Condition="'$(Base)'!=''">
-			<_TCHARMapping>wchar_t</_TCHARMapping>
-			<AllPackageLibs>rtl.lib</AllPackageLibs>
-			<BCC_AllWarnings>true</BCC_AllWarnings>
-			<BCC_ExtendedErrorInfo>true</BCC_ExtendedErrorInfo>
-			<BCC_OptimizeForSpeed>true</BCC_OptimizeForSpeed>
-			<DCC_CBuilderOutput>JPHNE</DCC_CBuilderOutput>
-			<DCC_Namespace>System;Xml;Data;Datasnap;Web;Soap;Vcl;$(DCC_Namespace)</DCC_Namespace>
-			<FinalOutputDir>$(FINAL_PATH)\$(Platform)\$(Config)</FinalOutputDir>
-			<ILINK_LibraryPath>console\;$(ILINK_LibraryPath)</ILINK_LibraryPath>
-			<IncludePath>console\;$(BDS)\include;$(BDS)\include\windows\vcl;$(IncludePath)</IncludePath>
-			<IntermediateOutputDir>$(INTERM_PATH)\$(Platform)\$(Config)</IntermediateOutputDir>
-			<LinkPackageStatics>rtl.lib</LinkPackageStatics>
-			<Manifest_File>None</Manifest_File>
-			<Multithreaded>true</Multithreaded>
-			<NoVCL>true</NoVCL>
-			<OutputExt>com</OutputExt>
-			<PackageImports>rtl.bpi;$(PackageImports)</PackageImports>
-			<ProjectType>CppConsoleApplication</ProjectType>
-			<SanitizedProjectName>Console</SanitizedProjectName>
-			<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
-			<VerInfo_Keys>CompanyName=Martin Prikryl;FileDescription=Console interface for WinSCP;FileVersion=4.2.0.0;InternalName=console;LegalCopyright=(c) 2000-2018 Martin Prikryl;LegalTrademarks=;OriginalFilename=winscp.com;ProductName=WinSCP;ProductVersion=5.8.1.0;ReleaseType=stable;WWW=http://winscp.net/</VerInfo_Keys>
-			<VerInfo_Locale>1033</VerInfo_Locale>
-			<VerInfo_MajorVer>4</VerInfo_MajorVer>
-			<VerInfo_MinorVer>2</VerInfo_MinorVer>
-		</PropertyGroup>
+		<_TCHARMapping>wchar_t</_TCHARMapping>
+		<AllPackageLibs>rtl.lib</AllPackageLibs>
+		<BCC_AllWarnings>true</BCC_AllWarnings>
+		<BCC_ExtendedErrorInfo>true</BCC_ExtendedErrorInfo>
+		<BCC_OptimizeForSpeed>true</BCC_OptimizeForSpeed>
+		<DCC_CBuilderOutput>JPHNE</DCC_CBuilderOutput>
+		<DCC_Namespace>System;Xml;Data;Datasnap;Web;Soap;Vcl;$(DCC_Namespace)</DCC_Namespace>
+		<FinalOutputDir>$(FINAL_PATH)\$(Platform)\$(Config)</FinalOutputDir>
+		<ILINK_LibraryPath>console\;$(ILINK_LibraryPath)</ILINK_LibraryPath>
+		<IncludePath>console\;$(BDS)\include;$(BDS)\include\windows\vcl;$(IncludePath)</IncludePath>
+		<IntermediateOutputDir>$(INTERM_PATH)\$(Platform)\$(Config)</IntermediateOutputDir>
+		<LinkPackageStatics>rtl.lib</LinkPackageStatics>
+		<Manifest_File>None</Manifest_File>
+		<Multithreaded>true</Multithreaded>
+		<NoVCL>true</NoVCL>
+		<OutputExt>com</OutputExt>
+		<PackageImports>rtl.bpi;$(PackageImports)</PackageImports>
+		<ProjectType>CppConsoleApplication</ProjectType>
+		<SanitizedProjectName>Console</SanitizedProjectName>
+		<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
+		<VerInfo_Keys>CompanyName=Martin Prikryl;FileDescription=Console interface for WinSCP;FileVersion=4.2.0.0;InternalName=console;LegalCopyright=(c) 2000-2018 Martin Prikryl;LegalTrademarks=;OriginalFilename=winscp.com;ProductName=WinSCP;ProductVersion=5.8.1.0;ReleaseType=stable;WWW=http://winscp.net/</VerInfo_Keys>
+		<VerInfo_Locale>1033</VerInfo_Locale>
+		<VerInfo_MajorVer>4</VerInfo_MajorVer>
+		<VerInfo_MinorVer>2</VerInfo_MinorVer>
+	</PropertyGroup>
 	<PropertyGroup Condition="'$(Cfg_1)'!=''">
-			<BCC_DebugLineNumbers>true</BCC_DebugLineNumbers>
-			<BCC_DisableOptimizations>true</BCC_DisableOptimizations>
-			<BCC_InlineFunctionExpansion>false</BCC_InlineFunctionExpansion>
-			<BCC_OptimizeForSpeed>false</BCC_OptimizeForSpeed>
-			<BCC_SourceDebuggingOn>true</BCC_SourceDebuggingOn>
-			<BCC_StackFrames>true</BCC_StackFrames>
-			<BCC_UseRegisterVariables>None</BCC_UseRegisterVariables>
-			<DCC_DebugInfoInExe>true</DCC_DebugInfoInExe>
-			<DCC_Define>DEBUG</DCC_Define>
-			<DCC_Optimize>false</DCC_Optimize>
-			<Defines>_DEBUG;$(Defines)</Defines>
-			<ILINK_FullDebugInfo>true</ILINK_FullDebugInfo>
-			<TASM_Debugging>Full</TASM_Debugging>
-			<TASM_DisplaySourceLines>true</TASM_DisplaySourceLines>
-		</PropertyGroup>
+		<BCC_DebugLineNumbers>true</BCC_DebugLineNumbers>
+		<BCC_DisableOptimizations>true</BCC_DisableOptimizations>
+		<BCC_InlineFunctionExpansion>false</BCC_InlineFunctionExpansion>
+		<BCC_OptimizeForSpeed>false</BCC_OptimizeForSpeed>
+		<BCC_SourceDebuggingOn>true</BCC_SourceDebuggingOn>
+		<BCC_StackFrames>true</BCC_StackFrames>
+		<BCC_UseRegisterVariables>None</BCC_UseRegisterVariables>
+		<DCC_DebugInfoInExe>true</DCC_DebugInfoInExe>
+		<DCC_Define>DEBUG</DCC_Define>
+		<DCC_Optimize>false</DCC_Optimize>
+		<Defines>_DEBUG;$(Defines)</Defines>
+		<ILINK_FullDebugInfo>true</ILINK_FullDebugInfo>
+		<TASM_Debugging>Full</TASM_Debugging>
+		<TASM_DisplaySourceLines>true</TASM_DisplaySourceLines>
+	</PropertyGroup>
 	<PropertyGroup Condition="'$(Cfg_2)'!=''">
-			<Defines>NDEBUG;$(Defines)</Defines>
-			<TASM_Debugging>None</TASM_Debugging>
-		</PropertyGroup>
+		<Defines>NDEBUG;$(Defines)</Defines>
+		<TASM_Debugging>None</TASM_Debugging>
+	</PropertyGroup>
 	<ItemGroup>
-			
-			<CppCompile Include="console\Main.cpp">
+		<CppCompile Include="console\Main.cpp">
 			<BuildOrder>8</BuildOrder>
 			<BuildOrder>0</BuildOrder>
 		</CppCompile>
-			<BuildConfiguration Include="Base">
+		<BuildConfiguration Include="Base">
 			<Key>Base</Key>
 		</BuildConfiguration>
-			<BuildConfiguration Include="Debug">
+		<BuildConfiguration Include="Debug">
 			<Key>Cfg_1</Key>
 			<CfgParent>Base</CfgParent>
 		</BuildConfiguration>
-			<BuildConfiguration Include="Release">
+		<BuildConfiguration Include="Release">
 			<Key>Cfg_2</Key>
 			<CfgParent>Base</CfgParent>
 		</BuildConfiguration>
-		</ItemGroup>
+	</ItemGroup>
 	<Import Condition="Exists('$(BDS)\Bin\CodeGear.Cpp.Targets')" Project="$(BDS)\Bin\CodeGear.Cpp.Targets"/>
 	<PropertyGroup Condition="'$(FileToCompile)'==''">
-			<PostBuildEvent>if exist "$(FinalOutputDir)\Console.com" (
+		<PostBuildEvent>if exist "$(FinalOutputDir)\Console.com" (
 copy /y "$(FinalOutputDir)\Console.com" "$(FinalOutputDir)\WinSCP.com"
 ) else (
 exit 0
 )</PostBuildEvent>
-		</PropertyGroup>
-		<ProjectExtensions>
+	</PropertyGroup>
+	<ProjectExtensions>
 		<Borland.Personality>CPlusPlusBuilder.Personality.12</Borland.Personality>
 		<Borland.ProjectType>CppConsoleApplication</Borland.ProjectType>
 		<BorlandProject>
@@ -114,4 +113,4 @@ exit 0
 		<ProjectFileVersion>12</ProjectFileVersion>
 	</ProjectExtensions>
 	<Import Condition="Exists('$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj')" Project="$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj"/>
-</Project>
+</Project>

source/DScpComp.cbproj

@@ -1,4 +1,4 @@
-	<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 	<PropertyGroup>
 		<ProjectGuid>{EE6BA6C0-E60A-47E4-95EA-87E1EB520276}</ProjectGuid>
 		<ProjectVersion>15.4</ProjectVersion>
@@ -35,113 +35,112 @@
 		<Base>true</Base>
 	</PropertyGroup>
 	<PropertyGroup Condition="'$(Base)'!=''">
-			<_TCHARMapping>wchar_t</_TCHARMapping>
-			<AllPackageLibs>rtl.lib;vcl.lib;vclx.lib</AllPackageLibs>
-			<BCC_AllWarnings>true</BCC_AllWarnings>
-			<BCC_ExtendedErrorInfo>true</BCC_ExtendedErrorInfo>
-			<BCC_OptimizeForSpeed>true</BCC_OptimizeForSpeed>
-			<BPILibOutputDir>$(INTERM_PATH)\$(Platform)\$(Config)</BPILibOutputDir>
-			<DCC_CBuilderOutput>JPHNE</DCC_CBuilderOutput>
-			<DCC_Namespace>Vcl;Vcl.Imaging;Vcl.Touch;Vcl.Samples;Vcl.Shell;System;Xml;Data;Datasnap;Web;Soap;Vcl;$(DCC_Namespace)</DCC_Namespace>
-			<Defines>DESIGN_ONLY;$(Defines)</Defines>
-			<DesignOnlyPackage>true</DesignOnlyPackage>
-			<FinalOutputDir>$(INTERM_PATH)\$(Platform)\$(Config)</FinalOutputDir>
-			<ILINK_Description>WinSCP components</ILINK_Description>
-			<ILINK_GenerateImportLibrary>true</ILINK_GenerateImportLibrary>
-			<ILINK_GenerateLibFile>true</ILINK_GenerateLibFile>
-			<ILINK_LibraryPath>components\;$(ILINK_LibraryPath)</ILINK_LibraryPath>
-			<IncludePath>components\;core;packages\filemng;packages\dragndrop;packages\my;$(BDS)\include;$(BDS)\include\windows\vcl;$(IncludePath)</IncludePath>
-			<IntermediateOutputDir>$(INTERM_PATH)\$(Platform)\$(Config)</IntermediateOutputDir>
-			<LinkPackageStatics>rtl.lib;vcl.lib;vclx.lib</LinkPackageStatics>
-			<Multithreaded>true</Multithreaded>
-			<OutputExt>bpl</OutputExt>
-			<ProjectType>CppPackage</ProjectType>
-			<SanitizedProjectName>DScpComp</SanitizedProjectName>
-			<TLIB_PageSize>64</TLIB_PageSize>
-			<VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
-			<VerInfo_Locale>1033</VerInfo_Locale>
-		</PropertyGroup>
+		<_TCHARMapping>wchar_t</_TCHARMapping>
+		<AllPackageLibs>rtl.lib;vcl.lib;vclx.lib</AllPackageLibs>
+		<BCC_AllWarnings>true</BCC_AllWarnings>
+		<BCC_ExtendedErrorInfo>true</BCC_ExtendedErrorInfo>
+		<BCC_OptimizeForSpeed>true</BCC_OptimizeForSpeed>
+		<BPILibOutputDir>$(INTERM_PATH)\$(Platform)\$(Config)</BPILibOutputDir>
+		<DCC_CBuilderOutput>JPHNE</DCC_CBuilderOutput>
+		<DCC_Namespace>Vcl;Vcl.Imaging;Vcl.Touch;Vcl.Samples;Vcl.Shell;System;Xml;Data;Datasnap;Web;Soap;Vcl;$(DCC_Namespace)</DCC_Namespace>
+		<Defines>DESIGN_ONLY;$(Defines)</Defines>
+		<DesignOnlyPackage>true</DesignOnlyPackage>
+		<FinalOutputDir>$(INTERM_PATH)\$(Platform)\$(Config)</FinalOutputDir>
+		<ILINK_Description>WinSCP components</ILINK_Description>
+		<ILINK_GenerateImportLibrary>true</ILINK_GenerateImportLibrary>
+		<ILINK_GenerateLibFile>true</ILINK_GenerateLibFile>
+		<ILINK_LibraryPath>components\;$(ILINK_LibraryPath)</ILINK_LibraryPath>
+		<IncludePath>components\;core;packages\filemng;packages\dragndrop;packages\my;$(BDS)\include;$(BDS)\include\windows\vcl;$(IncludePath)</IncludePath>
+		<IntermediateOutputDir>$(INTERM_PATH)\$(Platform)\$(Config)</IntermediateOutputDir>
+		<LinkPackageStatics>rtl.lib;vcl.lib;vclx.lib</LinkPackageStatics>
+		<Multithreaded>true</Multithreaded>
+		<OutputExt>bpl</OutputExt>
+		<ProjectType>CppPackage</ProjectType>
+		<SanitizedProjectName>DScpComp</SanitizedProjectName>
+		<TLIB_PageSize>64</TLIB_PageSize>
+		<VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
+		<VerInfo_Locale>1033</VerInfo_Locale>
+	</PropertyGroup>
 	<PropertyGroup Condition="'$(Base_Win32)'!=''">
-			<DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
-			<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
-		</PropertyGroup>
+		<DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
+		<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
+	</PropertyGroup>
 	<PropertyGroup Condition="'$(Cfg_1)'!=''">
-			<BCC_DebugLineNumbers>true</BCC_DebugLineNumbers>
-			<BCC_DisableOptimizations>true</BCC_DisableOptimizations>
-			<BCC_InlineFunctionExpansion>false</BCC_InlineFunctionExpansion>
-			<BCC_OptimizeForSpeed>false</BCC_OptimizeForSpeed>
-			<BCC_SourceDebuggingOn>true</BCC_SourceDebuggingOn>
-			<BCC_StackFrames>true</BCC_StackFrames>
-			<BCC_UseRegisterVariables>None</BCC_UseRegisterVariables>
-			<DCC_DebugInfoInExe>true</DCC_DebugInfoInExe>
-			<DCC_Optimize>false</DCC_Optimize>
-			<Defines>NDEBUG;$(Defines)</Defines>
-			<ILINK_FullDebugInfo>true</ILINK_FullDebugInfo>
-			<TASM_Debugging>Full</TASM_Debugging>
-			<TASM_DisplaySourceLines>true</TASM_DisplaySourceLines>
-		</PropertyGroup>
+		<BCC_DebugLineNumbers>true</BCC_DebugLineNumbers>
+		<BCC_DisableOptimizations>true</BCC_DisableOptimizations>
+		<BCC_InlineFunctionExpansion>false</BCC_InlineFunctionExpansion>
+		<BCC_OptimizeForSpeed>false</BCC_OptimizeForSpeed>
+		<BCC_SourceDebuggingOn>true</BCC_SourceDebuggingOn>
+		<BCC_StackFrames>true</BCC_StackFrames>
+		<BCC_UseRegisterVariables>None</BCC_UseRegisterVariables>
+		<DCC_DebugInfoInExe>true</DCC_DebugInfoInExe>
+		<DCC_Optimize>false</DCC_Optimize>
+		<Defines>NDEBUG;$(Defines)</Defines>
+		<ILINK_FullDebugInfo>true</ILINK_FullDebugInfo>
+		<TASM_Debugging>Full</TASM_Debugging>
+		<TASM_DisplaySourceLines>true</TASM_DisplaySourceLines>
+	</PropertyGroup>
 	<PropertyGroup Condition="'$(Cfg_2)'!=''">
-			<Defines>NDEBUG;$(Defines)</Defines>
-			<TASM_Debugging>None</TASM_Debugging>
-		</PropertyGroup>
+		<Defines>NDEBUG;$(Defines)</Defines>
+		<TASM_Debugging>None</TASM_Debugging>
+	</PropertyGroup>
 	<ItemGroup>
-			<CppCompile Include="components\LogMemo.cpp">
+		<CppCompile Include="components\LogMemo.cpp">
 			<BuildOrder>4</BuildOrder>
 			<DependentOn>components\LogMemo.h</DependentOn>
 			<BuildOrder>29</BuildOrder>
 		</CppCompile>
-			<CppCompile Include="components\ThemePageControl.cpp">
+		<CppCompile Include="components\ThemePageControl.cpp">
 			<DependentOn>components\ThemePageControl.h</DependentOn>
 			<BuildOrder>11</BuildOrder>
 		</CppCompile>
-			<CppCompile Include="components\UnixDirView.cpp">
+		<CppCompile Include="components\UnixDirView.cpp">
 			<BuildOrder>5</BuildOrder>
 			<DependentOn>components\UnixDirView.h</DependentOn>
 			<BuildOrder>17</BuildOrder>
 		</CppCompile>
-			<CppCompile Include="components\UnixDriveView.cpp">
+		<CppCompile Include="components\UnixDriveView.cpp">
 			<BuildOrder>32</BuildOrder>
 			<DependentOn>components\UnixDriveView.h</DependentOn>
 			<BuildOrder>3</BuildOrder>
 		</CppCompile>
-			<CppCompile Include="DScpComp.cpp">
+		<CppCompile Include="DScpComp.cpp">
 			<BuildOrder>7</BuildOrder>
 			<BuildOrder>2</BuildOrder>
 		</CppCompile>
-			
-			<PackageImport Include="DragDropP.bpi">
+		<PackageImport Include="DragDropP.bpi">
 			<BuildOrder>8</BuildOrder>
 		</PackageImport>
-			<PackageImport Include="DriveDir.bpi">
+		<PackageImport Include="DriveDir.bpi">
 			<BuildOrder>9</BuildOrder>
 		</PackageImport>
-			<PackageImport Include="Moje.bpi">
+		<PackageImport Include="Moje.bpi">
 			<BuildOrder>10</BuildOrder>
 		</PackageImport>
-			<PackageImport Include="rtl.bpi">
+		<PackageImport Include="rtl.bpi">
 			<BuildOrder>20</BuildOrder>
 			<BuildOrder>1</BuildOrder>
 		</PackageImport>
-			<PackageImport Include="vcl.bpi">
+		<PackageImport Include="vcl.bpi">
 			<BuildOrder>23</BuildOrder>
 			<BuildOrder>0</BuildOrder>
 		</PackageImport>
-			<PackageImport Include="vclx.bpi">
+		<PackageImport Include="vclx.bpi">
 			<BuildOrder>26</BuildOrder>
 			<BuildOrder>2</BuildOrder>
 		</PackageImport>
-			<BuildConfiguration Include="Base">
+		<BuildConfiguration Include="Base">
 			<Key>Base</Key>
 		</BuildConfiguration>
-			<BuildConfiguration Include="Debug">
+		<BuildConfiguration Include="Debug">
 			<Key>Cfg_1</Key>
 			<CfgParent>Base</CfgParent>
 		</BuildConfiguration>
-			<BuildConfiguration Include="Release">
+		<BuildConfiguration Include="Release">
 			<Key>Cfg_2</Key>
 			<CfgParent>Base</CfgParent>
 		</BuildConfiguration>
-		</ItemGroup>
+	</ItemGroup>
 	<Import Condition="Exists('$(BDS)\Bin\CodeGear.Cpp.Targets')" Project="$(BDS)\Bin\CodeGear.Cpp.Targets"/>
 	<ProjectExtensions>
 		<Borland.Personality>CPlusPlusBuilder.Personality.12</Borland.Personality>
@@ -166,4 +165,4 @@
 		<ProjectFileVersion>12</ProjectFileVersion>
 	</ProjectExtensions>
 	<Import Condition="Exists('$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj')" Project="$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj"/>
-</Project>
+</Project>

source/DragDropP.cbproj

@@ -1,4 +1,4 @@
-	<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 	<PropertyGroup>
 		<ProjectGuid>{FC08225B-2B31-4129-939D-B75C1F099FFB}</ProjectGuid>
 		<ProjectVersion>15.4</ProjectVersion>
@@ -40,98 +40,97 @@
 		<Base>true</Base>
 	</PropertyGroup>
 	<PropertyGroup Condition="'$(Base)'!=''">
-			<_TCHARMapping>wchar_t</_TCHARMapping>
-			<BCC_ExtendedErrorInfo>true</BCC_ExtendedErrorInfo>
-			<BCC_OptimizeForSpeed>true</BCC_OptimizeForSpeed>
-			<BPILibOutputDir>$(INTERM_PATH)\$(Platform)\$(Config)</BPILibOutputDir>
-			<DCC_CBuilderOutput>JPHNE</DCC_CBuilderOutput>
-			<DCC_CVT_ACHAR_TO_WCHAR>true</DCC_CVT_ACHAR_TO_WCHAR>
-			<DCC_CVT_WIDENING_STRING_LOST>true</DCC_CVT_WIDENING_STRING_LOST>
-			<DCC_EXPLICIT_STRING_CAST>true</DCC_EXPLICIT_STRING_CAST>
-			<DCC_EXPLICIT_STRING_CAST_LOSS>true</DCC_EXPLICIT_STRING_CAST_LOSS>
-			<DCC_Namespace>System;Xml;Data;Datasnap;Web;Soap;Vcl;$(DCC_Namespace)</DCC_Namespace>
-			<DCC_UNSAFE_TYPE>true</DCC_UNSAFE_TYPE>
-			<FinalOutputDir>$(INTERM_PATH)\$(Platform)\$(Config)</FinalOutputDir>
-			<ILINK_Description>Drag and Drop Components</ILINK_Description>
-			<ILINK_GenerateImportLibrary>true</ILINK_GenerateImportLibrary>
-			<ILINK_GenerateLibFile>true</ILINK_GenerateLibFile>
-			<ILINK_LibraryPath>packages\dragndrop\;$(BDS)\lib;$(BDS)\lib\obj;$(BDS)\lib\psdk;$(ILINK_LibraryPath)</ILINK_LibraryPath>
-			<IncludePath>packages\dragndrop\;$(BDS)\include;$(BDS)\include\windows\vcl;$(IncludePath)</IncludePath>
-			<IntermediateOutputDir>$(INTERM_PATH)\$(Platform)\$(Config)</IntermediateOutputDir>
-			<Multithreaded>true</Multithreaded>
-			<OutputExt>bpl</OutputExt>
-			<ProjectType>CppPackage</ProjectType>
-			<SanitizedProjectName>DragDropP</SanitizedProjectName>
-			<VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
-			<VerInfo_Locale>1033</VerInfo_Locale>
-		</PropertyGroup>
+		<_TCHARMapping>wchar_t</_TCHARMapping>
+		<BCC_ExtendedErrorInfo>true</BCC_ExtendedErrorInfo>
+		<BCC_OptimizeForSpeed>true</BCC_OptimizeForSpeed>
+		<BPILibOutputDir>$(INTERM_PATH)\$(Platform)\$(Config)</BPILibOutputDir>
+		<DCC_CBuilderOutput>JPHNE</DCC_CBuilderOutput>
+		<DCC_CVT_ACHAR_TO_WCHAR>true</DCC_CVT_ACHAR_TO_WCHAR>
+		<DCC_CVT_WIDENING_STRING_LOST>true</DCC_CVT_WIDENING_STRING_LOST>
+		<DCC_EXPLICIT_STRING_CAST>true</DCC_EXPLICIT_STRING_CAST>
+		<DCC_EXPLICIT_STRING_CAST_LOSS>true</DCC_EXPLICIT_STRING_CAST_LOSS>
+		<DCC_Namespace>System;Xml;Data;Datasnap;Web;Soap;Vcl;$(DCC_Namespace)</DCC_Namespace>
+		<DCC_UNSAFE_TYPE>true</DCC_UNSAFE_TYPE>
+		<FinalOutputDir>$(INTERM_PATH)\$(Platform)\$(Config)</FinalOutputDir>
+		<ILINK_Description>Drag and Drop Components</ILINK_Description>
+		<ILINK_GenerateImportLibrary>true</ILINK_GenerateImportLibrary>
+		<ILINK_GenerateLibFile>true</ILINK_GenerateLibFile>
+		<ILINK_LibraryPath>packages\dragndrop\;$(BDS)\lib;$(BDS)\lib\obj;$(BDS)\lib\psdk;$(ILINK_LibraryPath)</ILINK_LibraryPath>
+		<IncludePath>packages\dragndrop\;$(BDS)\include;$(BDS)\include\windows\vcl;$(IncludePath)</IncludePath>
+		<IntermediateOutputDir>$(INTERM_PATH)\$(Platform)\$(Config)</IntermediateOutputDir>
+		<Multithreaded>true</Multithreaded>
+		<OutputExt>bpl</OutputExt>
+		<ProjectType>CppPackage</ProjectType>
+		<SanitizedProjectName>DragDropP</SanitizedProjectName>
+		<VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
+		<VerInfo_Locale>1033</VerInfo_Locale>
+	</PropertyGroup>
 	<PropertyGroup Condition="'$(Base_Win32)'!=''">
-			<DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
-			<Defines>IDE;$(Defines)</Defines>
-			<Manifest_File>$(BDS)\bin\default_app.manifest</Manifest_File>
-			<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
-		</PropertyGroup>
+		<DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
+		<Defines>IDE;$(Defines)</Defines>
+		<Manifest_File>$(BDS)\bin\default_app.manifest</Manifest_File>
+		<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
+	</PropertyGroup>
 	<PropertyGroup Condition="'$(Base_Win64)'!=''">
-			<Defines>IDE;$(Defines)</Defines>
-		</PropertyGroup>
+		<Defines>IDE;$(Defines)</Defines>
+	</PropertyGroup>
 	<PropertyGroup Condition="'$(Cfg_1)'!=''">
-			<BCC_DebugLineNumbers>true</BCC_DebugLineNumbers>
-			<BCC_DisableOptimizations>true</BCC_DisableOptimizations>
-			<BCC_InlineFunctionExpansion>false</BCC_InlineFunctionExpansion>
-			<BCC_OptimizeForSpeed>false</BCC_OptimizeForSpeed>
-			<BCC_SourceDebuggingOn>true</BCC_SourceDebuggingOn>
-			<BCC_StackFrames>true</BCC_StackFrames>
-			<BCC_UseRegisterVariables>None</BCC_UseRegisterVariables>
-			<DCC_DebugInfoInExe>true</DCC_DebugInfoInExe>
-			<DCC_Define>DEBUG</DCC_Define>
-			<DCC_Optimize>false</DCC_Optimize>
-			<Defines>_DEBUG;$(Defines)</Defines>
-			<ILINK_FullDebugInfo>true</ILINK_FullDebugInfo>
-			<TASM_Debugging>Full</TASM_Debugging>
-			<TASM_DisplaySourceLines>true</TASM_DisplaySourceLines>
-		</PropertyGroup>
+		<BCC_DebugLineNumbers>true</BCC_DebugLineNumbers>
+		<BCC_DisableOptimizations>true</BCC_DisableOptimizations>
+		<BCC_InlineFunctionExpansion>false</BCC_InlineFunctionExpansion>
+		<BCC_OptimizeForSpeed>false</BCC_OptimizeForSpeed>
+		<BCC_SourceDebuggingOn>true</BCC_SourceDebuggingOn>
+		<BCC_StackFrames>true</BCC_StackFrames>
+		<BCC_UseRegisterVariables>None</BCC_UseRegisterVariables>
+		<DCC_DebugInfoInExe>true</DCC_DebugInfoInExe>
+		<DCC_Define>DEBUG</DCC_Define>
+		<DCC_Optimize>false</DCC_Optimize>
+		<Defines>_DEBUG;$(Defines)</Defines>
+		<ILINK_FullDebugInfo>true</ILINK_FullDebugInfo>
+		<TASM_Debugging>Full</TASM_Debugging>
+		<TASM_DisplaySourceLines>true</TASM_DisplaySourceLines>
+	</PropertyGroup>
 	<PropertyGroup Condition="'$(Cfg_2)'!=''">
-			<Defines>NDEBUG;$(Defines)</Defines>
-			<TASM_Debugging>None</TASM_Debugging>
-		</PropertyGroup>
+		<Defines>NDEBUG;$(Defines)</Defines>
+		<TASM_Debugging>None</TASM_Debugging>
+	</PropertyGroup>
 	<ItemGroup>
-			<CppCompile Include="DragDropP.cpp">
+		<CppCompile Include="DragDropP.cpp">
 			<BuildOrder>0</BuildOrder>
 		</CppCompile>
-			
-			<ResFiles Include="packages\dragndrop\DragDrop.dcr">
+		<ResFiles Include="packages\dragndrop\DragDrop.dcr">
 			<BuildOrder>4</BuildOrder>
 		</ResFiles>
-			<DelphiCompile Include="packages\dragndrop\DragDrop.pas">
+		<DelphiCompile Include="packages\dragndrop\DragDrop.pas">
 			<BuildOrder>3</BuildOrder>
 		</DelphiCompile>
-			<ResFiles Include="packages\dragndrop\DragDropFilesEx.dcr">
+		<ResFiles Include="packages\dragndrop\DragDropFilesEx.dcr">
 			<BuildOrder>6</BuildOrder>
 		</ResFiles>
-			<DelphiCompile Include="packages\dragndrop\DragDropFilesEx.pas">
+		<DelphiCompile Include="packages\dragndrop\DragDropFilesEx.pas">
 			<BuildOrder>5</BuildOrder>
 		</DelphiCompile>
-			<DelphiCompile Include="packages\dragndrop\PIDL.pas">
+		<DelphiCompile Include="packages\dragndrop\PIDL.pas">
 			<BuildOrder>7</BuildOrder>
 		</DelphiCompile>
-			<PackageImport Include="rtl.bpi">
+		<PackageImport Include="rtl.bpi">
 			<BuildOrder>1</BuildOrder>
 		</PackageImport>
-			<PackageImport Include="vcl.bpi">
+		<PackageImport Include="vcl.bpi">
 			<BuildOrder>8</BuildOrder>
 		</PackageImport>
-			<BuildConfiguration Include="Base">
+		<BuildConfiguration Include="Base">
 			<Key>Base</Key>
 		</BuildConfiguration>
-			<BuildConfiguration Include="Debug">
+		<BuildConfiguration Include="Debug">
 			<Key>Cfg_1</Key>
 			<CfgParent>Base</CfgParent>
 		</BuildConfiguration>
-			<BuildConfiguration Include="Release">
+		<BuildConfiguration Include="Release">
 			<Key>Cfg_2</Key>
 			<CfgParent>Base</CfgParent>
 		</BuildConfiguration>
-		</ItemGroup>
+	</ItemGroup>
 	<Import Condition="Exists('$(BDS)\Bin\CodeGear.Cpp.Targets')" Project="$(BDS)\Bin\CodeGear.Cpp.Targets"/>
 	<ProjectExtensions>
 		<Borland.Personality>CPlusPlusBuilder.Personality.12</Borland.Personality>
@@ -156,4 +155,4 @@
 		<ProjectFileVersion>12</ProjectFileVersion>
 	</ProjectExtensions>
 	<Import Condition="Exists('$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj')" Project="$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj"/>
-</Project>
+</Project>

source/DragExt.cbproj

@@ -1,4 +1,4 @@
-	<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 	<PropertyGroup>
 		<ProjectGuid>{414309A3-9B7C-4261-9989-4BC118D3A1C0}</ProjectGuid>
 		<ProjectVersion>15.4</ProjectVersion>
@@ -28,72 +28,71 @@
 		<Base>true</Base>
 	</PropertyGroup>
 	<PropertyGroup Condition="'$(Base)'!=''">
-			<_TCHARMapping>wchar_t</_TCHARMapping>
-			<BCC_AllWarnings>true</BCC_AllWarnings>
-			<BCC_ExtendedErrorInfo>true</BCC_ExtendedErrorInfo>
-			<BCC_OptimizeForSpeed>true</BCC_OptimizeForSpeed>
-			<BCC_wdlx>false</BCC_wdlx>
-			<DCC_CBuilderOutput>JPHNE</DCC_CBuilderOutput>
-			<DCC_Namespace>System;Xml;Data;Datasnap;Web;Soap;Vcl;$(DCC_Namespace)</DCC_Namespace>
-			<FinalOutputDir>$(FINAL_PATH)\$(Platform)\$(Config)</FinalOutputDir>
-			<ILINK_GenerateImportLibrary>true</ILINK_GenerateImportLibrary>
-			<ILINK_LibraryPath>dragext\;$(BDS)\lib;$(BDS)\lib\obj;$(BDS)\lib\psdk;$(ILINK_LibraryPath)</ILINK_LibraryPath>
-			<IncludePath>dragext\;$(BDS)\include;$(BDS)\include\windows\vcl;$(IncludePath)</IncludePath>
-			<IntermediateOutputDir>$(INTERM_PATH)\$(Platform)\$(Config)</IntermediateOutputDir>
-			<Manifest_File>None</Manifest_File>
-			<Multithreaded>true</Multithreaded>
-			<NoVCL>true</NoVCL>
-			<OutputExt>dll</OutputExt>
-			<PackageImports>rtl.bpi;$(PackageImports)</PackageImports>
-			<ProjectType>CppDynamicLibrary</ProjectType>
-			<SanitizedProjectName>DragExt</SanitizedProjectName>
-			<VerInfo_DLL>true</VerInfo_DLL>
-			<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
-			<VerInfo_Keys>CompanyName=Martin Prikryl;FileDescription=Drag&amp;Drop shell extension for WinSCP ($(Platform));FileVersion=1.3.0.0;InternalName=dragext;LegalCopyright=(c) 2000-2018 Martin Prikryl;LegalTrademarks=;OriginalFilename=dragext.dll;ProductName=WinSCP;ProductVersion=5.8.1.0;ReleaseType=stable;WWW=http://winscp.net/</VerInfo_Keys>
-			<VerInfo_Locale>1033</VerInfo_Locale>
-			<VerInfo_MinorVer>3</VerInfo_MinorVer>
-		</PropertyGroup>
+		<_TCHARMapping>wchar_t</_TCHARMapping>
+		<BCC_AllWarnings>true</BCC_AllWarnings>
+		<BCC_ExtendedErrorInfo>true</BCC_ExtendedErrorInfo>
+		<BCC_OptimizeForSpeed>true</BCC_OptimizeForSpeed>
+		<BCC_wdlx>false</BCC_wdlx>
+		<DCC_CBuilderOutput>JPHNE</DCC_CBuilderOutput>
+		<DCC_Namespace>System;Xml;Data;Datasnap;Web;Soap;Vcl;$(DCC_Namespace)</DCC_Namespace>
+		<FinalOutputDir>$(FINAL_PATH)\$(Platform)\$(Config)</FinalOutputDir>
+		<ILINK_GenerateImportLibrary>true</ILINK_GenerateImportLibrary>
+		<ILINK_LibraryPath>dragext\;$(BDS)\lib;$(BDS)\lib\obj;$(BDS)\lib\psdk;$(ILINK_LibraryPath)</ILINK_LibraryPath>
+		<IncludePath>dragext\;$(BDS)\include;$(BDS)\include\windows\vcl;$(IncludePath)</IncludePath>
+		<IntermediateOutputDir>$(INTERM_PATH)\$(Platform)\$(Config)</IntermediateOutputDir>
+		<Manifest_File>None</Manifest_File>
+		<Multithreaded>true</Multithreaded>
+		<NoVCL>true</NoVCL>
+		<OutputExt>dll</OutputExt>
+		<PackageImports>rtl.bpi;$(PackageImports)</PackageImports>
+		<ProjectType>CppDynamicLibrary</ProjectType>
+		<SanitizedProjectName>DragExt</SanitizedProjectName>
+		<VerInfo_DLL>true</VerInfo_DLL>
+		<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
+		<VerInfo_Keys>CompanyName=Martin Prikryl;FileDescription=Drag&amp;Drop shell extension for WinSCP ($(Platform));FileVersion=1.3.0.0;InternalName=dragext;LegalCopyright=(c) 2000-2018 Martin Prikryl;LegalTrademarks=;OriginalFilename=dragext.dll;ProductName=WinSCP;ProductVersion=5.8.1.0;ReleaseType=stable;WWW=http://winscp.net/</VerInfo_Keys>
+		<VerInfo_Locale>1033</VerInfo_Locale>
+		<VerInfo_MinorVer>3</VerInfo_MinorVer>
+	</PropertyGroup>
 	<PropertyGroup Condition="'$(Base_Win64)'!=''">
-			<OutputName>DragExt64</OutputName>
-		</PropertyGroup>
+		<OutputName>DragExt64</OutputName>
+	</PropertyGroup>
 	<PropertyGroup Condition="'$(Cfg_1)'!=''">
-			<BCC_DebugLineNumbers>true</BCC_DebugLineNumbers>
-			<BCC_DisableOptimizations>true</BCC_DisableOptimizations>
-			<BCC_InlineFunctionExpansion>false</BCC_InlineFunctionExpansion>
-			<BCC_OptimizeForSpeed>false</BCC_OptimizeForSpeed>
-			<BCC_SourceDebuggingOn>true</BCC_SourceDebuggingOn>
-			<BCC_StackFrames>true</BCC_StackFrames>
-			<BCC_UseRegisterVariables>None</BCC_UseRegisterVariables>
-			<DCC_DebugInfoInExe>true</DCC_DebugInfoInExe>
-			<DCC_Define>DEBUG</DCC_Define>
-			<DCC_Optimize>false</DCC_Optimize>
-			<Defines>_DEBUG;$(Defines)</Defines>
-			<ILINK_FullDebugInfo>true</ILINK_FullDebugInfo>
-			<TASM_Debugging>Full</TASM_Debugging>
-			<TASM_DisplaySourceLines>true</TASM_DisplaySourceLines>
-		</PropertyGroup>
+		<BCC_DebugLineNumbers>true</BCC_DebugLineNumbers>
+		<BCC_DisableOptimizations>true</BCC_DisableOptimizations>
+		<BCC_InlineFunctionExpansion>false</BCC_InlineFunctionExpansion>
+		<BCC_OptimizeForSpeed>false</BCC_OptimizeForSpeed>
+		<BCC_SourceDebuggingOn>true</BCC_SourceDebuggingOn>
+		<BCC_StackFrames>true</BCC_StackFrames>
+		<BCC_UseRegisterVariables>None</BCC_UseRegisterVariables>
+		<DCC_DebugInfoInExe>true</DCC_DebugInfoInExe>
+		<DCC_Define>DEBUG</DCC_Define>
+		<DCC_Optimize>false</DCC_Optimize>
+		<Defines>_DEBUG;$(Defines)</Defines>
+		<ILINK_FullDebugInfo>true</ILINK_FullDebugInfo>
+		<TASM_Debugging>Full</TASM_Debugging>
+		<TASM_DisplaySourceLines>true</TASM_DisplaySourceLines>
+	</PropertyGroup>
 	<PropertyGroup Condition="'$(Cfg_2)'!=''">
-			<Defines>NDEBUG;$(Defines)</Defines>
-			<TASM_Debugging>None</TASM_Debugging>
-		</PropertyGroup>
+		<Defines>NDEBUG;$(Defines)</Defines>
+		<TASM_Debugging>None</TASM_Debugging>
+	</PropertyGroup>
 	<ItemGroup>
-			
-			<CppCompile Include="dragext\DragExt.cpp">
+		<CppCompile Include="dragext\DragExt.cpp">
 			<BuildOrder>5</BuildOrder>
 			<BuildOrder>1</BuildOrder>
 		</CppCompile>
-			<BuildConfiguration Include="Base">
+		<BuildConfiguration Include="Base">
 			<Key>Base</Key>
 		</BuildConfiguration>
-			<BuildConfiguration Include="Debug">
+		<BuildConfiguration Include="Debug">
 			<Key>Cfg_1</Key>
 			<CfgParent>Base</CfgParent>
 		</BuildConfiguration>
-			<BuildConfiguration Include="Release">
+		<BuildConfiguration Include="Release">
 			<Key>Cfg_2</Key>
 			<CfgParent>Base</CfgParent>
 		</BuildConfiguration>
-		</ItemGroup>
+	</ItemGroup>
 	<Import Condition="Exists('$(BDS)\Bin\CodeGear.Cpp.Targets')" Project="$(BDS)\Bin\CodeGear.Cpp.Targets"/>
 	<ProjectExtensions>
 		<Borland.Personality>CPlusPlusBuilder.Personality.12</Borland.Personality>
@@ -115,4 +114,4 @@
 		<ProjectFileVersion>12</ProjectFileVersion>
 	</ProjectExtensions>
 	<Import Condition="Exists('$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj')" Project="$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj"/>
-</Project>
+</Project>

source/DriveDir.cbproj

@@ -1,4 +1,4 @@
-	<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 	<PropertyGroup>
 		<ProjectGuid>{7AE7C7E2-1A28-4AC5-B8CF-15D1B12AEB41}</ProjectGuid>
 		<ProjectVersion>15.4</ProjectVersion>
@@ -34,175 +34,174 @@
 		<Base>true</Base>
 	</PropertyGroup>
 	<PropertyGroup Condition="'$(Base)'!=''">
-			<_TCHARMapping>wchar_t</_TCHARMapping>
-			<BCC_ExtendedErrorInfo>true</BCC_ExtendedErrorInfo>
-			<BCC_OptimizeForSpeed>true</BCC_OptimizeForSpeed>
-			<BPILibOutputDir>$(INTERM_PATH)\$(Platform)\$(Config)</BPILibOutputDir>
-			<DCC_CBuilderOutput>JPHNE</DCC_CBuilderOutput>
-			<DCC_CVT_ACHAR_TO_WCHAR>true</DCC_CVT_ACHAR_TO_WCHAR>
-			<DCC_CVT_WIDENING_STRING_LOST>true</DCC_CVT_WIDENING_STRING_LOST>
-			<DCC_EXPLICIT_STRING_CAST>true</DCC_EXPLICIT_STRING_CAST>
-			<DCC_EXPLICIT_STRING_CAST_LOSS>true</DCC_EXPLICIT_STRING_CAST_LOSS>
-			<DCC_Namespace>Vcl;Vcl.Imaging;Vcl.Touch;Vcl.Samples;Vcl.Shell;System;Xml;Data;Datasnap;Web;Soap;Vcl;$(DCC_Namespace)</DCC_Namespace>
-			<DCC_TYPEINFO_IMPLICITLY_ADDED>false</DCC_TYPEINFO_IMPLICITLY_ADDED>
-			<DCC_UnitSearchPath>packages\my;packages\dragndrop;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
-			<DCC_UNSAFE_TYPE>true</DCC_UNSAFE_TYPE>
-			<FinalOutputDir>$(INTERM_PATH)\$(Platform)\$(Config)</FinalOutputDir>
-			<ILINK_Description>Filemanager Toolset</ILINK_Description>
-			<ILINK_GenerateImportLibrary>true</ILINK_GenerateImportLibrary>
-			<ILINK_GenerateLibFile>true</ILINK_GenerateLibFile>
-			<ILINK_LibraryPath>packages\filemng\;packages\my;packages\dragndrop;$(ILINK_LibraryPath)</ILINK_LibraryPath>
-			<IncludePath>packages\filemng\;packages\my;packages\dragndrop;$(BDS)\include;$(BDS)\include\windows\vcl;$(IncludePath)</IncludePath>
-			<IntermediateOutputDir>$(INTERM_PATH)\$(Platform)\$(Config)</IntermediateOutputDir>
-			<Multithreaded>true</Multithreaded>
-			<OutputExt>bpl</OutputExt>
-			<ProjectType>CppPackage</ProjectType>
-			<SanitizedProjectName>DriveDir</SanitizedProjectName>
-			<VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
-			<VerInfo_Locale>1033</VerInfo_Locale>
-		</PropertyGroup>
+		<_TCHARMapping>wchar_t</_TCHARMapping>
+		<BCC_ExtendedErrorInfo>true</BCC_ExtendedErrorInfo>
+		<BCC_OptimizeForSpeed>true</BCC_OptimizeForSpeed>
+		<BPILibOutputDir>$(INTERM_PATH)\$(Platform)\$(Config)</BPILibOutputDir>
+		<DCC_CBuilderOutput>JPHNE</DCC_CBuilderOutput>
+		<DCC_CVT_ACHAR_TO_WCHAR>true</DCC_CVT_ACHAR_TO_WCHAR>
+		<DCC_CVT_WIDENING_STRING_LOST>true</DCC_CVT_WIDENING_STRING_LOST>
+		<DCC_EXPLICIT_STRING_CAST>true</DCC_EXPLICIT_STRING_CAST>
+		<DCC_EXPLICIT_STRING_CAST_LOSS>true</DCC_EXPLICIT_STRING_CAST_LOSS>
+		<DCC_Namespace>Vcl;Vcl.Imaging;Vcl.Touch;Vcl.Samples;Vcl.Shell;System;Xml;Data;Datasnap;Web;Soap;Vcl;$(DCC_Namespace)</DCC_Namespace>
+		<DCC_TYPEINFO_IMPLICITLY_ADDED>false</DCC_TYPEINFO_IMPLICITLY_ADDED>
+		<DCC_UnitSearchPath>packages\my;packages\dragndrop;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
+		<DCC_UNSAFE_TYPE>true</DCC_UNSAFE_TYPE>
+		<FinalOutputDir>$(INTERM_PATH)\$(Platform)\$(Config)</FinalOutputDir>
+		<ILINK_Description>Filemanager Toolset</ILINK_Description>
+		<ILINK_GenerateImportLibrary>true</ILINK_GenerateImportLibrary>
+		<ILINK_GenerateLibFile>true</ILINK_GenerateLibFile>
+		<ILINK_LibraryPath>packages\filemng\;packages\my;packages\dragndrop;$(ILINK_LibraryPath)</ILINK_LibraryPath>
+		<IncludePath>packages\filemng\;packages\my;packages\dragndrop;$(BDS)\include;$(BDS)\include\windows\vcl;$(IncludePath)</IncludePath>
+		<IntermediateOutputDir>$(INTERM_PATH)\$(Platform)\$(Config)</IntermediateOutputDir>
+		<Multithreaded>true</Multithreaded>
+		<OutputExt>bpl</OutputExt>
+		<ProjectType>CppPackage</ProjectType>
+		<SanitizedProjectName>DriveDir</SanitizedProjectName>
+		<VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
+		<VerInfo_Locale>1033</VerInfo_Locale>
+	</PropertyGroup>
 	<PropertyGroup Condition="'$(Base_Win32)'!=''">
-			<DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
-			<Defines>IDE;$(Defines)</Defines>
-		</PropertyGroup>
+		<DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
+		<Defines>IDE;$(Defines)</Defines>
+	</PropertyGroup>
 	<PropertyGroup Condition="'$(Base_Win64)'!=''">
-			<Defines>IDE;$(Defines)</Defines>
-		</PropertyGroup>
+		<Defines>IDE;$(Defines)</Defines>
+	</PropertyGroup>
 	<PropertyGroup Condition="'$(Cfg_1)'!=''">
-			<BCC_DebugLineNumbers>true</BCC_DebugLineNumbers>
-			<BCC_DisableOptimizations>true</BCC_DisableOptimizations>
-			<BCC_InlineFunctionExpansion>false</BCC_InlineFunctionExpansion>
-			<BCC_OptimizeForSpeed>false</BCC_OptimizeForSpeed>
-			<BCC_SourceDebuggingOn>true</BCC_SourceDebuggingOn>
-			<BCC_StackFrames>true</BCC_StackFrames>
-			<BCC_UseRegisterVariables>None</BCC_UseRegisterVariables>
-			<DCC_DebugInfoInExe>true</DCC_DebugInfoInExe>
-			<DCC_Define>DEBUG</DCC_Define>
-			<DCC_Optimize>false</DCC_Optimize>
-			<Defines>_DEBUG;$(Defines)</Defines>
-			<ILINK_FullDebugInfo>true</ILINK_FullDebugInfo>
-			<TASM_Debugging>Full</TASM_Debugging>
-			<TASM_DisplaySourceLines>true</TASM_DisplaySourceLines>
-		</PropertyGroup>
+		<BCC_DebugLineNumbers>true</BCC_DebugLineNumbers>
+		<BCC_DisableOptimizations>true</BCC_DisableOptimizations>
+		<BCC_InlineFunctionExpansion>false</BCC_InlineFunctionExpansion>
+		<BCC_OptimizeForSpeed>false</BCC_OptimizeForSpeed>
+		<BCC_SourceDebuggingOn>true</BCC_SourceDebuggingOn>
+		<BCC_StackFrames>true</BCC_StackFrames>
+		<BCC_UseRegisterVariables>None</BCC_UseRegisterVariables>
+		<DCC_DebugInfoInExe>true</DCC_DebugInfoInExe>
+		<DCC_Define>DEBUG</DCC_Define>
+		<DCC_Optimize>false</DCC_Optimize>
+		<Defines>_DEBUG;$(Defines)</Defines>
+		<ILINK_FullDebugInfo>true</ILINK_FullDebugInfo>
+		<TASM_Debugging>Full</TASM_Debugging>
+		<TASM_DisplaySourceLines>true</TASM_DisplaySourceLines>
+	</PropertyGroup>
 	<PropertyGroup Condition="'$(Cfg_2)'!=''">
-			<Defines>NDEBUG;$(Defines)</Defines>
-			<TASM_Debugging>None</TASM_Debugging>
-		</PropertyGroup>
+		<Defines>NDEBUG;$(Defines)</Defines>
+		<TASM_Debugging>None</TASM_Debugging>
+	</PropertyGroup>
 	<ItemGroup>
-			<CppCompile Include="DriveDir.cpp">
+		<CppCompile Include="DriveDir.cpp">
 			<BuildOrder>2</BuildOrder>
 			<BuildOrder>16</BuildOrder>
 		</CppCompile>
-			
-			<DelphiCompile Include="packages\filemng\BaseUtils.pas">
+		<DelphiCompile Include="packages\filemng\BaseUtils.pas">
 			<BuildOrder>32</BuildOrder>
 			<BuildOrder>20</BuildOrder>
 		</DelphiCompile>
-			<DelphiCompile Include="packages\filemng\CustomDirView.pas">
+		<DelphiCompile Include="packages\filemng\CustomDirView.pas">
 			<BuildOrder>5</BuildOrder>
 			<BuildOrder>47</BuildOrder>
 		</DelphiCompile>
-			<DelphiCompile Include="packages\filemng\CustomDriveView.pas">
+		<DelphiCompile Include="packages\filemng\CustomDriveView.pas">
 			<BuildOrder>9</BuildOrder>
 			<BuildOrder>77</BuildOrder>
 		</DelphiCompile>
-			<DelphiCompile Include="packages\filemng\CustomUnixDirView.pas">
+		<DelphiCompile Include="packages\filemng\CustomUnixDirView.pas">
 			<BuildOrder>50</BuildOrder>
 			<BuildOrder>0</BuildOrder>
 		</DelphiCompile>
-			<ResFiles Include="packages\filemng\DirView.dcr">
+		<ResFiles Include="packages\filemng\DirView.dcr">
 			<BuildOrder>-1</BuildOrder>
 			<BuildOrder>11</BuildOrder>
 		</ResFiles>
-			<DelphiCompile Include="packages\filemng\DirView.pas">
+		<DelphiCompile Include="packages\filemng\DirView.pas">
 			<BuildOrder>8</BuildOrder>
 			<BuildOrder>18</BuildOrder>
 		</DelphiCompile>
-			<DelphiCompile Include="packages\filemng\DirViewColProperties.pas">
+		<DelphiCompile Include="packages\filemng\DirViewColProperties.pas">
 			<BuildOrder>44</BuildOrder>
 			<BuildOrder>4</BuildOrder>
 		</DelphiCompile>
-			<ResFiles Include="packages\filemng\DriveView.dcr">
+		<ResFiles Include="packages\filemng\DriveView.dcr">
 			<BuildOrder>-1</BuildOrder>
 			<BuildOrder>17</BuildOrder>
 		</ResFiles>
-			<DelphiCompile Include="packages\filemng\DriveView.pas">
+		<DelphiCompile Include="packages\filemng\DriveView.pas">
 			<BuildOrder>14</BuildOrder>
 		</DelphiCompile>
-			<DelphiCompile Include="packages\filemng\FileChanges.pas">
+		<DelphiCompile Include="packages\filemng\FileChanges.pas">
 			<BuildOrder>35</BuildOrder>
 			<BuildOrder>21</BuildOrder>
 		</DelphiCompile>
-			<ResFiles Include="packages\filemng\FileOperator.dcr">
+		<ResFiles Include="packages\filemng\FileOperator.dcr">
 			<BuildOrder>-1</BuildOrder>
 			<BuildOrder>23</BuildOrder>
 		</ResFiles>
-			<DelphiCompile Include="packages\filemng\FileOperator.pas">
+		<DelphiCompile Include="packages\filemng\FileOperator.pas">
 			<BuildOrder>20</BuildOrder>
 			<BuildOrder>19</BuildOrder>
 		</DelphiCompile>
-			<ResFiles Include="packages\filemng\IEComboBox.dcr">
+		<ResFiles Include="packages\filemng\IEComboBox.dcr">
 			<BuildOrder>-1</BuildOrder>
 			<BuildOrder>29</BuildOrder>
 		</ResFiles>
-			<DelphiCompile Include="packages\filemng\IEComboBox.pas">
+		<DelphiCompile Include="packages\filemng\IEComboBox.pas">
 			<BuildOrder>26</BuildOrder>
 			<BuildOrder>24</BuildOrder>
 		</DelphiCompile>
-			<DelphiCompile Include="packages\filemng\IEDriveInfo.pas">
+		<DelphiCompile Include="packages\filemng\IEDriveInfo.pas">
 			<BuildOrder>38</BuildOrder>
 			<BuildOrder>22</BuildOrder>
 		</DelphiCompile>
-			<DelphiCompile Include="packages\filemng\ListExt.pas">
+		<DelphiCompile Include="packages\filemng\ListExt.pas">
 			<BuildOrder>56</BuildOrder>
 			<BuildOrder>2</BuildOrder>
 		</DelphiCompile>
-			<DelphiCompile Include="packages\filemng\ShellDialogs.pas">
+		<DelphiCompile Include="packages\filemng\ShellDialogs.pas">
 			<BuildOrder>41</BuildOrder>
 			<BuildOrder>3</BuildOrder>
 		</DelphiCompile>
-			<DelphiCompile Include="packages\filemng\UnixDirViewColProperties.pas">
+		<DelphiCompile Include="packages\filemng\UnixDirViewColProperties.pas">
 			<BuildOrder>53</BuildOrder>
 			<BuildOrder>1</BuildOrder>
 		</DelphiCompile>
-			<LibFiles Include="shlwapi.lib" Condition="'$(Platform)'=='Win32'">
+		<LibFiles Include="shlwapi.lib" Condition="'$(Platform)'=='Win32'">
 			<BuildOrder>26</BuildOrder>
 			<IgnorePath>true</IgnorePath>
 		</LibFiles>
-			<PackageImport Include="bcbie.bpi">
+		<PackageImport Include="bcbie.bpi">
 			<BuildOrder>68</BuildOrder>
 			<BuildOrder>12</BuildOrder>
 		</PackageImport>
-			<PackageImport Include="DragDropP.bpi">
+		<PackageImport Include="DragDropP.bpi">
 			<BuildOrder>25</BuildOrder>
 		</PackageImport>
-			<PackageImport Include="Moje.bpi">
+		<PackageImport Include="Moje.bpi">
 			<BuildOrder>24</BuildOrder>
 		</PackageImport>
-			<PackageImport Include="rtl.bpi">
+		<PackageImport Include="rtl.bpi">
 			<BuildOrder>6</BuildOrder>
 			<BuildOrder>59</BuildOrder>
 		</PackageImport>
-			<PackageImport Include="vcl.bpi">
+		<PackageImport Include="vcl.bpi">
 			<BuildOrder>62</BuildOrder>
 			<BuildOrder>10</BuildOrder>
 		</PackageImport>
-			<PackageImport Include="vclx.bpi">
+		<PackageImport Include="vclx.bpi">
 			<BuildOrder>65</BuildOrder>
 			<BuildOrder>11</BuildOrder>
 		</PackageImport>
-			<BuildConfiguration Include="Base">
+		<BuildConfiguration Include="Base">
 			<Key>Base</Key>
 		</BuildConfiguration>
-			<BuildConfiguration Include="Debug">
+		<BuildConfiguration Include="Debug">
 			<Key>Cfg_1</Key>
 			<CfgParent>Base</CfgParent>
 		</BuildConfiguration>
-			<BuildConfiguration Include="Release">
+		<BuildConfiguration Include="Release">
 			<Key>Cfg_2</Key>
 			<CfgParent>Base</CfgParent>
 		</BuildConfiguration>
-		</ItemGroup>
+	</ItemGroup>
 	<Import Condition="Exists('$(BDS)\Bin\CodeGear.Cpp.Targets')" Project="$(BDS)\Bin\CodeGear.Cpp.Targets"/>
 	<ProjectExtensions>
 		<Borland.Personality>CPlusPlusBuilder.Personality.12</Borland.Personality>
@@ -227,4 +226,4 @@
 		<ProjectFileVersion>12</ProjectFileVersion>
 	</ProjectExtensions>
 	<Import Condition="Exists('$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj')" Project="$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj"/>
-</Project>
+</Project>

source/FileZilla.cbproj

@@ -1,4 +1,4 @@
-	<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 	<PropertyGroup>
 		<ProjectGuid>{152D1B4E-7546-4C2B-80C5-F0D9D5F6D9D7}</ProjectGuid>
 		<ProjectVersion>15.4</ProjectVersion>
@@ -28,124 +28,124 @@
 		<Base>true</Base>
 	</PropertyGroup>
 	<PropertyGroup Condition="'$(Base)'!=''">
-			<_TCHARMapping>wchar_t</_TCHARMapping>
-			<BCC_ExtendedErrorInfo>true</BCC_ExtendedErrorInfo>
-			<BCC_OptimizeForSpeed>true</BCC_OptimizeForSpeed>
-			<BCC_waus>false</BCC_waus>
-			<BCC_wccc>false</BCC_wccc>
-			<BCC_wcom>false</BCC_wcom>
-			<BCC_wcpt>false</BCC_wcpt>
-			<BCC_wcsu>false</BCC_wcsu>
-			<BCC_whid>false</BCC_whid>
-			<BCC_wovf>false</BCC_wovf>
-			<BCC_wpar>false</BCC_wpar>
-			<BCC_wpia>false</BCC_wpia>
-			<BCC_wrch>false</BCC_wrch>
-			<DCC_CBuilderOutput>JPHNE</DCC_CBuilderOutput>
-			<DCC_Namespace>System;Xml;Data;Datasnap;Web;Soap;Vcl;$(DCC_Namespace)</DCC_Namespace>
-			<Defines>_WIN32;$(Defines)</Defines>
-			<FinalOutputDir>$(INTERM_PATH)\$(Platform)\$(Config)</FinalOutputDir>
-			<ILINK_LibraryPath>$(BDS)\lib;$(BDS)\lib\obj;$(BDS)\lib\psdk;$(ILINK_LibraryPath)</ILINK_LibraryPath>
-			<IncludePath>filezilla\misc\;filezilla\;resource;core;..\libs\openssl;$(BDS)\include;$(BDS)\include\windows\vcl;$(BDS)\include\mfc;$(IncludePath)</IncludePath>
-			<IntermediateOutputDir>$(INTERM_PATH)\$(Platform)\$(Config)</IntermediateOutputDir>
-			<Manifest_File>None</Manifest_File>
-			<Multithreaded>true</Multithreaded>
-			<OutputExt>lib</OutputExt>
-			<ProjectType>CppStaticLibrary</ProjectType>
-			<SanitizedProjectName>FileZilla</SanitizedProjectName>
-			<TLIB_PageSize>128</TLIB_PageSize>
-			<VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
-			<VerInfo_Locale>1033</VerInfo_Locale>
-		</PropertyGroup>
+		<_TCHARMapping>wchar_t</_TCHARMapping>
+		<BCC_ExtendedErrorInfo>true</BCC_ExtendedErrorInfo>
+		<BCC_OptimizeForSpeed>true</BCC_OptimizeForSpeed>
+		<BCC_waus>false</BCC_waus>
+		<BCC_wccc>false</BCC_wccc>
+		<BCC_wcom>false</BCC_wcom>
+		<BCC_wcpt>false</BCC_wcpt>
+		<BCC_wcsu>false</BCC_wcsu>
+		<BCC_whid>false</BCC_whid>
+		<BCC_wovf>false</BCC_wovf>
+		<BCC_wpar>false</BCC_wpar>
+		<BCC_wpia>false</BCC_wpia>
+		<BCC_wrch>false</BCC_wrch>
+		<DCC_CBuilderOutput>JPHNE</DCC_CBuilderOutput>
+		<DCC_Namespace>System;Xml;Data;Datasnap;Web;Soap;Vcl;$(DCC_Namespace)</DCC_Namespace>
+		<Defines>_WIN32;$(Defines)</Defines>
+		<FinalOutputDir>$(INTERM_PATH)\$(Platform)\$(Config)</FinalOutputDir>
+		<ILINK_LibraryPath>$(BDS)\lib;$(BDS)\lib\obj;$(BDS)\lib\psdk;$(ILINK_LibraryPath)</ILINK_LibraryPath>
+		<IncludePath>filezilla\misc\;filezilla\;resource;core;..\libs\openssl;$(BDS)\include;$(BDS)\include\windows\vcl;$(BDS)\include\mfc;$(IncludePath)</IncludePath>
+		<IntermediateOutputDir>$(INTERM_PATH)\$(Platform)\$(Config)</IntermediateOutputDir>
+		<Manifest_File>None</Manifest_File>
+		<Multithreaded>true</Multithreaded>
+		<OutputExt>lib</OutputExt>
+		<ProjectType>CppStaticLibrary</ProjectType>
+		<SanitizedProjectName>FileZilla</SanitizedProjectName>
+		<TLIB_PageSize>128</TLIB_PageSize>
+		<VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
+		<VerInfo_Locale>1033</VerInfo_Locale>
+	</PropertyGroup>
 	<PropertyGroup Condition="'$(Base_Win32)'!=''">
-			<DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
-		</PropertyGroup>
+		<DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
+	</PropertyGroup>
 	<PropertyGroup Condition="'$(Cfg_1)'!=''">
-			<BCC_DebugLineNumbers>true</BCC_DebugLineNumbers>
-			<BCC_DisableOptimizations>true</BCC_DisableOptimizations>
-			<BCC_InlineFunctionExpansion>false</BCC_InlineFunctionExpansion>
-			<BCC_MonitorGlobalAndStackData>true</BCC_MonitorGlobalAndStackData>
-			<BCC_MonitorInlinePtrAccess>true</BCC_MonitorInlinePtrAccess>
-			<BCC_MonitorThis>true</BCC_MonitorThis>
-			<BCC_OptimizeForSpeed>false</BCC_OptimizeForSpeed>
-			<BCC_SourceDebuggingOn>true</BCC_SourceDebuggingOn>
-			<BCC_StackFrames>true</BCC_StackFrames>
-			<BCC_UseRegisterVariables>None</BCC_UseRegisterVariables>
-			<DCC_DebugInfoInExe>true</DCC_DebugInfoInExe>
-			<DCC_Define>DEBUG</DCC_Define>
-			<DCC_Optimize>false</DCC_Optimize>
-			<Defines>_DEBUG;$(Defines)</Defines>
-			<ILINK_FullDebugInfo>true</ILINK_FullDebugInfo>
-			<TASM_Debugging>Full</TASM_Debugging>
-			<TASM_DisplaySourceLines>true</TASM_DisplaySourceLines>
-		</PropertyGroup>
+		<BCC_DebugLineNumbers>true</BCC_DebugLineNumbers>
+		<BCC_DisableOptimizations>true</BCC_DisableOptimizations>
+		<BCC_InlineFunctionExpansion>false</BCC_InlineFunctionExpansion>
+		<BCC_MonitorGlobalAndStackData>true</BCC_MonitorGlobalAndStackData>
+		<BCC_MonitorInlinePtrAccess>true</BCC_MonitorInlinePtrAccess>
+		<BCC_MonitorThis>true</BCC_MonitorThis>
+		<BCC_OptimizeForSpeed>false</BCC_OptimizeForSpeed>
+		<BCC_SourceDebuggingOn>true</BCC_SourceDebuggingOn>
+		<BCC_StackFrames>true</BCC_StackFrames>
+		<BCC_UseRegisterVariables>None</BCC_UseRegisterVariables>
+		<DCC_DebugInfoInExe>true</DCC_DebugInfoInExe>
+		<DCC_Define>DEBUG</DCC_Define>
+		<DCC_Optimize>false</DCC_Optimize>
+		<Defines>_DEBUG;$(Defines)</Defines>
+		<ILINK_FullDebugInfo>true</ILINK_FullDebugInfo>
+		<TASM_Debugging>Full</TASM_Debugging>
+		<TASM_DisplaySourceLines>true</TASM_DisplaySourceLines>
+	</PropertyGroup>
 	<PropertyGroup Condition="'$(Cfg_2)'!=''">
-			<Defines>NDEBUG;$(Defines)</Defines>
-			<TASM_Debugging>None</TASM_Debugging>
-		</PropertyGroup>
+		<Defines>NDEBUG;$(Defines)</Defines>
+		<TASM_Debugging>None</TASM_Debugging>
+	</PropertyGroup>
 	<ItemGroup>
-			<CppCompile Include="filezilla\ApiLog.cpp">
+		<CppCompile Include="filezilla\ApiLog.cpp">
 			<BuildOrder>0</BuildOrder>
 		</CppCompile>
-			<CppCompile Include="filezilla\AsyncProxySocketLayer.cpp">
+		<CppCompile Include="filezilla\AsyncProxySocketLayer.cpp">
 			<BuildOrder>1</BuildOrder>
 		</CppCompile>
-			<CppCompile Include="filezilla\AsyncSocketEx.cpp">
+		<CppCompile Include="filezilla\AsyncSocketEx.cpp">
 			<BuildOrder>2</BuildOrder>
 		</CppCompile>
-			<CppCompile Include="filezilla\AsyncSocketExLayer.cpp">
+		<CppCompile Include="filezilla\AsyncSocketExLayer.cpp">
 			<BuildOrder>3</BuildOrder>
 		</CppCompile>
-			<CppCompile Include="filezilla\AsyncSslSocketLayer.cpp">
+		<CppCompile Include="filezilla\AsyncSslSocketLayer.cpp">
 			<BuildOrder>4</BuildOrder>
 		</CppCompile>
-			<CppCompile Include="filezilla\FileZillaApi.cpp">
+		<CppCompile Include="filezilla\FileZillaApi.cpp">
 			<BuildOrder>7</BuildOrder>
 		</CppCompile>
-			<CppCompile Include="filezilla\FileZillaIntern.cpp">
+		<CppCompile Include="filezilla\FileZillaIntern.cpp">
 			<DependentOn>filezilla\FileZillaIntern.h</DependentOn>
 			<BuildOrder>8</BuildOrder>
 		</CppCompile>
-			<CppCompile Include="filezilla\FileZillaIntf.cpp">
+		<CppCompile Include="filezilla\FileZillaIntf.cpp">
 			<DependentOn>filezilla\FileZillaIntf.h</DependentOn>
 			<BuildOrder>9</BuildOrder>
 		</CppCompile>
-			<CppCompile Include="filezilla\FtpControlSocket.cpp">
+		<CppCompile Include="filezilla\FtpControlSocket.cpp">
 			<BuildOrder>10</BuildOrder>
 		</CppCompile>
-			<CppCompile Include="filezilla\FtpListResult.cpp">
+		<CppCompile Include="filezilla\FtpListResult.cpp">
 			<BuildOrder>11</BuildOrder>
 		</CppCompile>
-			<CppCompile Include="filezilla\FzApiStructures.cpp">
+		<CppCompile Include="filezilla\FzApiStructures.cpp">
 			<BuildOrder>12</BuildOrder>
 		</CppCompile>
-			<CppCompile Include="filezilla\MainThread.cpp">
+		<CppCompile Include="filezilla\MainThread.cpp">
 			<BuildOrder>13</BuildOrder>
 		</CppCompile>
-			<CppCompile Include="filezilla\MFC64bitFix.cpp">
+		<CppCompile Include="filezilla\MFC64bitFix.cpp">
 			<BuildOrder>14</BuildOrder>
 		</CppCompile>
-			<CppCompile Include="filezilla\ServerPath.cpp">
+		<CppCompile Include="filezilla\ServerPath.cpp">
 			<BuildOrder>17</BuildOrder>
 		</CppCompile>
-			<CppCompile Include="filezilla\structures.cpp">
+		<CppCompile Include="filezilla\structures.cpp">
 			<BuildOrder>18</BuildOrder>
 		</CppCompile>
-			<CppCompile Include="filezilla\TransferSocket.cpp">
+		<CppCompile Include="filezilla\TransferSocket.cpp">
 			<BuildOrder>19</BuildOrder>
 		</CppCompile>
-			<BuildConfiguration Include="Base">
+		<BuildConfiguration Include="Base">
 			<Key>Base</Key>
 		</BuildConfiguration>
-			<BuildConfiguration Include="Debug">
+		<BuildConfiguration Include="Debug">
 			<Key>Cfg_1</Key>
 			<CfgParent>Base</CfgParent>
 		</BuildConfiguration>
-			<BuildConfiguration Include="Release">
+		<BuildConfiguration Include="Release">
 			<Key>Cfg_2</Key>
 			<CfgParent>Base</CfgParent>
 		</BuildConfiguration>
-		</ItemGroup>
+	</ItemGroup>
 	<Import Condition="Exists('$(BDS)\Bin\CodeGear.Cpp.Targets')" Project="$(BDS)\Bin\CodeGear.Cpp.Targets"/>
 	<ProjectExtensions>
 		<Borland.Personality>CPlusPlusBuilder.Personality.12</Borland.Personality>
@@ -167,4 +167,4 @@
 		<ProjectFileVersion>12</ProjectFileVersion>
 	</ProjectExtensions>
 	<Import Condition="Exists('$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj')" Project="$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj"/>
-</Project>
+</Project>

source/Jcl.cbproj

@@ -1,4 +1,4 @@
-	<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 	<PropertyGroup>
 		<ProjectGuid>{BABF1FFA-834C-44BA-8CE2-BA19AAC5C459}</ProjectGuid>
 		<ProjectVersion>15.4</ProjectVersion>
@@ -40,113 +40,113 @@
 		<Base>true</Base>
 	</PropertyGroup>
 	<PropertyGroup Condition="'$(Base)'!=''">
-			<_TCHARMapping>char</_TCHARMapping>
-			<BCC_ExtendedErrorInfo>true</BCC_ExtendedErrorInfo>
-			<BCC_OptimizeForSpeed>true</BCC_OptimizeForSpeed>
-			<BCC_wpar>false</BCC_wpar>
-			<BPILibOutputDir>$(INTERM_PATH)\$(Platform)\$(Config)</BPILibOutputDir>
-			<DCC_CBuilderOutput>JPHNE</DCC_CBuilderOutput>
-			<DCC_Namespace>System;Xml;Data;Datasnap;Web;Soap;$(DCC_Namespace)</DCC_Namespace>
-			<DCC_UnitSearchPath>packages\jcl;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
-			<Defines>WINSCP;$(Defines)</Defines>
-			<DynamicRTL>true</DynamicRTL>
-			<FinalOutputDir>$(INTERM_PATH)\$(Platform)\$(Config)</FinalOutputDir>
-			<ILINK_GenerateImportLibrary>true</ILINK_GenerateImportLibrary>
-			<ILINK_GenerateLibFile>true</ILINK_GenerateLibFile>
-			<ILINK_LibraryPath>packages\jcl\;$(ILINK_LibraryPath)</ILINK_LibraryPath>
-			<IncludePath>packages\jcl\;$(IncludePath)</IncludePath>
-			<IntermediateOutputDir>$(INTERM_PATH)\$(Platform)\$(Config)</IntermediateOutputDir>
-			<Multithreaded>true</Multithreaded>
-			<ProjectType>CppPackage</ProjectType>
-			<RuntimeOnlyPackage>true</RuntimeOnlyPackage>
-			<SanitizedProjectName>Jcl</SanitizedProjectName>
-			<TLIB_PageSize>64</TLIB_PageSize>
-			<UsePackages>true</UsePackages>
-		</PropertyGroup>
+		<_TCHARMapping>char</_TCHARMapping>
+		<BCC_ExtendedErrorInfo>true</BCC_ExtendedErrorInfo>
+		<BCC_OptimizeForSpeed>true</BCC_OptimizeForSpeed>
+		<BCC_wpar>false</BCC_wpar>
+		<BPILibOutputDir>$(INTERM_PATH)\$(Platform)\$(Config)</BPILibOutputDir>
+		<DCC_CBuilderOutput>JPHNE</DCC_CBuilderOutput>
+		<DCC_Namespace>System;Xml;Data;Datasnap;Web;Soap;$(DCC_Namespace)</DCC_Namespace>
+		<DCC_UnitSearchPath>packages\jcl;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
+		<Defines>WINSCP;$(Defines)</Defines>
+		<DynamicRTL>true</DynamicRTL>
+		<FinalOutputDir>$(INTERM_PATH)\$(Platform)\$(Config)</FinalOutputDir>
+		<ILINK_GenerateImportLibrary>true</ILINK_GenerateImportLibrary>
+		<ILINK_GenerateLibFile>true</ILINK_GenerateLibFile>
+		<ILINK_LibraryPath>packages\jcl\;$(ILINK_LibraryPath)</ILINK_LibraryPath>
+		<IncludePath>packages\jcl\;$(IncludePath)</IncludePath>
+		<IntermediateOutputDir>$(INTERM_PATH)\$(Platform)\$(Config)</IntermediateOutputDir>
+		<Multithreaded>true</Multithreaded>
+		<ProjectType>CppPackage</ProjectType>
+		<RuntimeOnlyPackage>true</RuntimeOnlyPackage>
+		<SanitizedProjectName>Jcl</SanitizedProjectName>
+		<TLIB_PageSize>64</TLIB_PageSize>
+		<UsePackages>true</UsePackages>
+	</PropertyGroup>
 	<PropertyGroup Condition="'$(Base_Win32)'!=''">
-			<DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
-			<PackageImports>vcldbx;vclib;inetdbbde;tbxp;ibxpress;vclimg;vclactnband;vcldb;vcldsnap;bindcompvcl;vclie;vcltouch;bcbsmp;websnap;vclribbon;Moje;vcl;DriveDir;CloudService;CodeSiteExpressPkg;dsnapcon;vclx;webdsnap;tb2k;bdertl;DragDropP;bcbie;adortl;$(PackageImports)</PackageImports>
-			<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
-			<VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
-		</PropertyGroup>
+		<DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
+		<PackageImports>vcldbx;vclib;inetdbbde;tbxp;ibxpress;vclimg;vclactnband;vcldb;vcldsnap;bindcompvcl;vclie;vcltouch;bcbsmp;websnap;vclribbon;Moje;vcl;DriveDir;CloudService;CodeSiteExpressPkg;dsnapcon;vclx;webdsnap;tb2k;bdertl;DragDropP;bcbie;adortl;$(PackageImports)</PackageImports>
+		<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
+		<VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
+	</PropertyGroup>
 	<PropertyGroup Condition="'$(Base_Win64)'!=''">
-			<PackageImports>vcldbx;vclib;inetdbbde;tbxp;ibxpress;vclimg;vclactnband;vcldb;vcldsnap;bindcompvcl;vclie;vcltouch;bcbsmp;websnap;vclribbon;Moje;vcl;DriveDir;CloudService;CodeSiteExpressPkg;dsnapcon;vclx;webdsnap;tb2k;bdertl;DragDropP;bcbie;adortl;$(PackageImports)</PackageImports>
-		</PropertyGroup>
+		<PackageImports>vcldbx;vclib;inetdbbde;tbxp;ibxpress;vclimg;vclactnband;vcldb;vcldsnap;bindcompvcl;vclie;vcltouch;bcbsmp;websnap;vclribbon;Moje;vcl;DriveDir;CloudService;CodeSiteExpressPkg;dsnapcon;vclx;webdsnap;tb2k;bdertl;DragDropP;bcbie;adortl;$(PackageImports)</PackageImports>
+	</PropertyGroup>
 	<PropertyGroup Condition="'$(Cfg_1)'!=''">
-			<BCC_DebugLineNumbers>true</BCC_DebugLineNumbers>
-			<BCC_DisableOptimizations>true</BCC_DisableOptimizations>
-			<BCC_InlineFunctionExpansion>false</BCC_InlineFunctionExpansion>
-			<BCC_OptimizeForSpeed>false</BCC_OptimizeForSpeed>
-			<BCC_SourceDebuggingOn>true</BCC_SourceDebuggingOn>
-			<BCC_StackFrames>true</BCC_StackFrames>
-			<BCC_UseRegisterVariables>None</BCC_UseRegisterVariables>
-			<DCC_DebugInfoInExe>true</DCC_DebugInfoInExe>
-			<DCC_Define>DEBUG</DCC_Define>
-			<DCC_Optimize>false</DCC_Optimize>
-			<Defines>_DEBUG;$(Defines)</Defines>
-			<ILINK_FullDebugInfo>true</ILINK_FullDebugInfo>
-			<TASM_Debugging>Full</TASM_Debugging>
-			<TASM_DisplaySourceLines>true</TASM_DisplaySourceLines>
-		</PropertyGroup>
+		<BCC_DebugLineNumbers>true</BCC_DebugLineNumbers>
+		<BCC_DisableOptimizations>true</BCC_DisableOptimizations>
+		<BCC_InlineFunctionExpansion>false</BCC_InlineFunctionExpansion>
+		<BCC_OptimizeForSpeed>false</BCC_OptimizeForSpeed>
+		<BCC_SourceDebuggingOn>true</BCC_SourceDebuggingOn>
+		<BCC_StackFrames>true</BCC_StackFrames>
+		<BCC_UseRegisterVariables>None</BCC_UseRegisterVariables>
+		<DCC_DebugInfoInExe>true</DCC_DebugInfoInExe>
+		<DCC_Define>DEBUG</DCC_Define>
+		<DCC_Optimize>false</DCC_Optimize>
+		<Defines>_DEBUG;$(Defines)</Defines>
+		<ILINK_FullDebugInfo>true</ILINK_FullDebugInfo>
+		<TASM_Debugging>Full</TASM_Debugging>
+		<TASM_DisplaySourceLines>true</TASM_DisplaySourceLines>
+	</PropertyGroup>
 	<PropertyGroup Condition="'$(Cfg_2)'!=''">
-			<Defines>NDEBUG;$(Defines)</Defines>
-			<TASM_Debugging>None</TASM_Debugging>
-		</PropertyGroup>
+		<Defines>NDEBUG;$(Defines)</Defines>
+		<TASM_Debugging>None</TASM_Debugging>
+	</PropertyGroup>
 	<ItemGroup>
-			<CppCompile Include="Jcl.cpp">
+		<CppCompile Include="Jcl.cpp">
 			<BuildOrder>0</BuildOrder>
 		</CppCompile>
-			<DelphiCompile Include="packages\jcl\JclBase.pas">
+		<DelphiCompile Include="packages\jcl\JclBase.pas">
 			<BuildOrder>3</BuildOrder>
 		</DelphiCompile>
-			<DelphiCompile Include="packages\jcl\JclDebug.pas">
+		<DelphiCompile Include="packages\jcl\JclDebug.pas">
 			<BuildOrder>3</BuildOrder>
 		</DelphiCompile>
-			<DelphiCompile Include="packages\jcl\JclFileUtils.pas">
+		<DelphiCompile Include="packages\jcl\JclFileUtils.pas">
 			<BuildOrder>4</BuildOrder>
 		</DelphiCompile>
-			<DelphiCompile Include="packages\jcl\JclHookExcept.pas">
+		<DelphiCompile Include="packages\jcl\JclHookExcept.pas">
 			<BuildOrder>5</BuildOrder>
 		</DelphiCompile>
-			<DelphiCompile Include="packages\jcl\JclPeImage.pas">
+		<DelphiCompile Include="packages\jcl\JclPeImage.pas">
 			<BuildOrder>6</BuildOrder>
 		</DelphiCompile>
-			<DelphiCompile Include="packages\jcl\JclResources.pas">
+		<DelphiCompile Include="packages\jcl\JclResources.pas">
 			<BuildOrder>7</BuildOrder>
 		</DelphiCompile>
-			<DelphiCompile Include="packages\jcl\JclStreams.pas">
+		<DelphiCompile Include="packages\jcl\JclStreams.pas">
 			<BuildOrder>8</BuildOrder>
 		</DelphiCompile>
-			<DelphiCompile Include="packages\jcl\JclStrings.pas">
+		<DelphiCompile Include="packages\jcl\JclStrings.pas">
 			<BuildOrder>9</BuildOrder>
 		</DelphiCompile>
-			<DelphiCompile Include="packages\jcl\JclSynch.pas">
+		<DelphiCompile Include="packages\jcl\JclSynch.pas">
 			<BuildOrder>10</BuildOrder>
 		</DelphiCompile>
-			<DelphiCompile Include="packages\jcl\JclSysInfo.pas">
+		<DelphiCompile Include="packages\jcl\JclSysInfo.pas">
 			<BuildOrder>11</BuildOrder>
 		</DelphiCompile>
-			<DelphiCompile Include="packages\jcl\JclSysUtils.pas">
+		<DelphiCompile Include="packages\jcl\JclSysUtils.pas">
 			<BuildOrder>12</BuildOrder>
 		</DelphiCompile>
-			<DelphiCompile Include="packages\jcl\JclWin32.pas">
+		<DelphiCompile Include="packages\jcl\JclWin32.pas">
 			<BuildOrder>13</BuildOrder>
 		</DelphiCompile>
-			<PackageImport Include="rtl.bpi">
+		<PackageImport Include="rtl.bpi">
 			<BuildOrder>1</BuildOrder>
 		</PackageImport>
-			<BuildConfiguration Include="Base">
+		<BuildConfiguration Include="Base">
 			<Key>Base</Key>
 		</BuildConfiguration>
-			<BuildConfiguration Include="Debug">
+		<BuildConfiguration Include="Debug">
 			<Key>Cfg_1</Key>
 			<CfgParent>Base</CfgParent>
 		</BuildConfiguration>
-			<BuildConfiguration Include="Release">
+		<BuildConfiguration Include="Release">
 			<Key>Cfg_2</Key>
 			<CfgParent>Base</CfgParent>
 		</BuildConfiguration>
-		</ItemGroup>
+	</ItemGroup>
 	<ProjectExtensions>
 		<Borland.Personality>CPlusPlusBuilder.Personality.12</Borland.Personality>
 		<Borland.ProjectType>CppPackage</Borland.ProjectType>
@@ -172,4 +172,4 @@
 	</ProjectExtensions>
 	<Import Condition="Exists('$(BDS)\Bin\CodeGear.Cpp.Targets')" Project="$(BDS)\Bin\CodeGear.Cpp.Targets"/>
 	<Import Condition="Exists('$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj')" Project="$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj"/>
-</Project>
+</Project>

source/Moje.cbproj

@@ -1,4 +1,4 @@
-	<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 	<PropertyGroup>
 		<ProjectGuid>{BA755114-5DC2-43F1-88A1-D52A7E4100A8}</ProjectGuid>
 		<ProjectVersion>15.4</ProjectVersion>
@@ -35,137 +35,135 @@
 		<Base>true</Base>
 	</PropertyGroup>
 	<PropertyGroup Condition="'$(Base)'!=''">
-			<_TCHARMapping>wchar_t</_TCHARMapping>
-			<BCC_ExtendedErrorInfo>true</BCC_ExtendedErrorInfo>
-			<BCC_OptimizeForSpeed>true</BCC_OptimizeForSpeed>
-			<BPILibOutputDir>$(INTERM_PATH)\$(Platform)\$(Config)</BPILibOutputDir>
-			<DCC_CBuilderOutput>JPHNE</DCC_CBuilderOutput>
-			<DCC_CVT_ACHAR_TO_WCHAR>true</DCC_CVT_ACHAR_TO_WCHAR>
-			<DCC_CVT_WIDENING_STRING_LOST>true</DCC_CVT_WIDENING_STRING_LOST>
-			<DCC_EXPLICIT_STRING_CAST>true</DCC_EXPLICIT_STRING_CAST>
-			<DCC_EXPLICIT_STRING_CAST_LOSS>true</DCC_EXPLICIT_STRING_CAST_LOSS>
-			<DCC_Namespace>System;Xml;Data;Datasnap;Web;Soap;Vcl;$(DCC_Namespace)</DCC_Namespace>
-			<DCC_UNSAFE_TYPE>true</DCC_UNSAFE_TYPE>
-			<FinalOutputDir>$(INTERM_PATH)\$(Platform)\$(Config)</FinalOutputDir>
-			<ILINK_Description>Martin's components</ILINK_Description>
-			<ILINK_GenerateImportLibrary>true</ILINK_GenerateImportLibrary>
-			<ILINK_GenerateLibFile>true</ILINK_GenerateLibFile>
-			<ILINK_LibraryPath>packages\my\;$(ILINK_LibraryPath)</ILINK_LibraryPath>
-			<IncludePath>packages\my\;$(BDS)\include;$(BDS)\include\windows\vcl;$(IncludePath)</IncludePath>
-			<IntermediateOutputDir>$(INTERM_PATH)\$(Platform)\$(Config)</IntermediateOutputDir>
-			<Multithreaded>true</Multithreaded>
-			<OutputExt>bpl</OutputExt>
-			<ProjectType>CppPackage</ProjectType>
-			<SanitizedProjectName>Moje</SanitizedProjectName>
-			<VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
-			<VerInfo_Locale>1033</VerInfo_Locale>
-		</PropertyGroup>
+		<_TCHARMapping>wchar_t</_TCHARMapping>
+		<BCC_ExtendedErrorInfo>true</BCC_ExtendedErrorInfo>
+		<BCC_OptimizeForSpeed>true</BCC_OptimizeForSpeed>
+		<BPILibOutputDir>$(INTERM_PATH)\$(Platform)\$(Config)</BPILibOutputDir>
+		<DCC_CBuilderOutput>JPHNE</DCC_CBuilderOutput>
+		<DCC_CVT_ACHAR_TO_WCHAR>true</DCC_CVT_ACHAR_TO_WCHAR>
+		<DCC_CVT_WIDENING_STRING_LOST>true</DCC_CVT_WIDENING_STRING_LOST>
+		<DCC_EXPLICIT_STRING_CAST>true</DCC_EXPLICIT_STRING_CAST>
+		<DCC_EXPLICIT_STRING_CAST_LOSS>true</DCC_EXPLICIT_STRING_CAST_LOSS>
+		<DCC_Namespace>System;Xml;Data;Datasnap;Web;Soap;Vcl;$(DCC_Namespace)</DCC_Namespace>
+		<DCC_UNSAFE_TYPE>true</DCC_UNSAFE_TYPE>
+		<FinalOutputDir>$(INTERM_PATH)\$(Platform)\$(Config)</FinalOutputDir>
+		<ILINK_Description>Martin's components</ILINK_Description>
+		<ILINK_GenerateImportLibrary>true</ILINK_GenerateImportLibrary>
+		<ILINK_GenerateLibFile>true</ILINK_GenerateLibFile>
+		<ILINK_LibraryPath>packages\my\;$(ILINK_LibraryPath)</ILINK_LibraryPath>
+		<IncludePath>packages\my\;$(BDS)\include;$(BDS)\include\windows\vcl;$(IncludePath)</IncludePath>
+		<IntermediateOutputDir>$(INTERM_PATH)\$(Platform)\$(Config)</IntermediateOutputDir>
+		<Multithreaded>true</Multithreaded>
+		<OutputExt>bpl</OutputExt>
+		<ProjectType>CppPackage</ProjectType>
+		<SanitizedProjectName>Moje</SanitizedProjectName>
+		<VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
+		<VerInfo_Locale>1033</VerInfo_Locale>
+	</PropertyGroup>
 	<PropertyGroup Condition="'$(Base_Win32)'!=''">
-			<DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
-			<Manifest_File>$(BDS)\bin\default_app.manifest</Manifest_File>
-			<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
-		</PropertyGroup>
+		<DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
+		<Manifest_File>$(BDS)\bin\default_app.manifest</Manifest_File>
+		<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
+	</PropertyGroup>
 	<PropertyGroup Condition="'$(Cfg_1)'!=''">
-			<BCC_DebugLineNumbers>true</BCC_DebugLineNumbers>
-			<BCC_DisableOptimizations>true</BCC_DisableOptimizations>
-			<BCC_InlineFunctionExpansion>false</BCC_InlineFunctionExpansion>
-			<BCC_OptimizeForSpeed>false</BCC_OptimizeForSpeed>
-			<BCC_SourceDebuggingOn>true</BCC_SourceDebuggingOn>
-			<BCC_StackFrames>true</BCC_StackFrames>
-			<BCC_UseRegisterVariables>None</BCC_UseRegisterVariables>
-			<DCC_DebugInfoInExe>true</DCC_DebugInfoInExe>
-			<DCC_Define>DEBUG</DCC_Define>
-			<DCC_Optimize>false</DCC_Optimize>
-			<Defines>_DEBUG;$(Defines)</Defines>
-			<ILINK_FullDebugInfo>true</ILINK_FullDebugInfo>
-			<TASM_Debugging>Full</TASM_Debugging>
-			<TASM_DisplaySourceLines>true</TASM_DisplaySourceLines>
-		</PropertyGroup>
+		<BCC_DebugLineNumbers>true</BCC_DebugLineNumbers>
+		<BCC_DisableOptimizations>true</BCC_DisableOptimizations>
+		<BCC_InlineFunctionExpansion>false</BCC_InlineFunctionExpansion>
+		<BCC_OptimizeForSpeed>false</BCC_OptimizeForSpeed>
+		<BCC_SourceDebuggingOn>true</BCC_SourceDebuggingOn>
+		<BCC_StackFrames>true</BCC_StackFrames>
+		<BCC_UseRegisterVariables>None</BCC_UseRegisterVariables>
+		<DCC_DebugInfoInExe>true</DCC_DebugInfoInExe>
+		<DCC_Define>DEBUG</DCC_Define>
+		<DCC_Optimize>false</DCC_Optimize>
+		<Defines>_DEBUG;$(Defines)</Defines>
+		<ILINK_FullDebugInfo>true</ILINK_FullDebugInfo>
+		<TASM_Debugging>Full</TASM_Debugging>
+		<TASM_DisplaySourceLines>true</TASM_DisplaySourceLines>
+	</PropertyGroup>
 	<PropertyGroup Condition="'$(Cfg_2)'!=''">
-			<Defines>NDEBUG;$(Defines)</Defines>
-			<TASM_Debugging>None</TASM_Debugging>
-		</PropertyGroup>
+		<Defines>NDEBUG;$(Defines)</Defines>
+		<TASM_Debugging>None</TASM_Debugging>
+	</PropertyGroup>
 	<ItemGroup>
-			<CppCompile Include="Moje.cpp">
+		<CppCompile Include="Moje.cpp">
 			<BuildOrder>0</BuildOrder>
 		</CppCompile>
-			
-			<DelphiCompile Include="packages\my\ComboEdit.pas">
+		<DelphiCompile Include="packages\my\ComboEdit.pas">
 			<BuildOrder>3</BuildOrder>
 		</DelphiCompile>
-			<DelphiCompile Include="packages\my\CompThread.pas">
+		<DelphiCompile Include="packages\my\CompThread.pas">
 			<BuildOrder>4</BuildOrder>
 		</DelphiCompile>
-			<ResFiles Include="packages\my\DiscMon.dcr">
+		<ResFiles Include="packages\my\DiscMon.dcr">
 			<BuildOrder>6</BuildOrder>
 		</ResFiles>
-			<DelphiCompile Include="packages\my\DiscMon.pas">
+		<DelphiCompile Include="packages\my\DiscMon.pas">
 			<BuildOrder>5</BuildOrder>
 		</DelphiCompile>
-			<DelphiCompile Include="packages\my\GrayedCheckBox.pas">
+		<DelphiCompile Include="packages\my\GrayedCheckBox.pas">
 			<BuildOrder>7</BuildOrder>
 		</DelphiCompile>
-			<ResFiles Include="packages\my\HistoryComboBox.dcr">
+		<ResFiles Include="packages\my\HistoryComboBox.dcr">
 			<BuildOrder>9</BuildOrder>
 		</ResFiles>
-			<DelphiCompile Include="packages\my\HistoryComboBox.pas">
+		<DelphiCompile Include="packages\my\HistoryComboBox.pas">
 			<BuildOrder>8</BuildOrder>
 		</DelphiCompile>
-			<DelphiCompile Include="packages\my\IEListView.pas">
+		<DelphiCompile Include="packages\my\IEListView.pas">
 			<BuildOrder>10</BuildOrder>
 		</DelphiCompile>
-			<DelphiCompile Include="packages\my\ListViewColProperties.pas">
+		<DelphiCompile Include="packages\my\ListViewColProperties.pas">
 			<BuildOrder>12</BuildOrder>
 		</DelphiCompile>
-			<ResFiles Include="packages\my\NortonLikeListView.dcr">
+		<ResFiles Include="packages\my\NortonLikeListView.dcr">
 			<BuildOrder>14</BuildOrder>
 		</ResFiles>
-			<DelphiCompile Include="packages\my\NortonLikeListView.pas">
+		<DelphiCompile Include="packages\my\NortonLikeListView.pas">
 			<BuildOrder>13</BuildOrder>
 		</DelphiCompile>
-			<DelphiCompile Include="packages\my\PasswordEdit.pas">
+		<DelphiCompile Include="packages\my\PasswordEdit.pas">
 			<BuildOrder>15</BuildOrder>
 		</DelphiCompile>
-			<DelphiCompile Include="packages\my\PasTools.pas">
+		<DelphiCompile Include="packages\my\PasTools.pas">
 			<BuildOrder>16</BuildOrder>
 		</DelphiCompile>
-			<ResFiles Include="packages\my\PathLabel.dcr">
+		<ResFiles Include="packages\my\PathLabel.dcr">
 			<BuildOrder>18</BuildOrder>
 		</ResFiles>
-			<DelphiCompile Include="packages\my\PathLabel.pas">
+		<DelphiCompile Include="packages\my\PathLabel.pas">
 			<BuildOrder>17</BuildOrder>
 		</DelphiCompile>
-			
-			<ResFiles Include="packages\my\UnixPathComboBox.dcr">
+		<ResFiles Include="packages\my\UnixPathComboBox.dcr">
 			<BuildOrder>23</BuildOrder>
 		</ResFiles>
-			<DelphiCompile Include="packages\my\UnixPathComboBox.pas">
+		<DelphiCompile Include="packages\my\UnixPathComboBox.pas">
 			<BuildOrder>22</BuildOrder>
 		</DelphiCompile>
-			<DelphiCompile Include="packages\my\UpDownEdit.pas">
+		<DelphiCompile Include="packages\my\UpDownEdit.pas">
 			<BuildOrder>24</BuildOrder>
 		</DelphiCompile>
-			<PackageImport Include="rtl.bpi">
+		<PackageImport Include="rtl.bpi">
 			<BuildOrder>1</BuildOrder>
 		</PackageImport>
-			<PackageImport Include="vcl.bpi">
+		<PackageImport Include="vcl.bpi">
 			<BuildOrder>26</BuildOrder>
 		</PackageImport>
-			<PackageImport Include="vclx.bpi">
+		<PackageImport Include="vclx.bpi">
 			<BuildOrder>27</BuildOrder>
 		</PackageImport>
-			<BuildConfiguration Include="Base">
+		<BuildConfiguration Include="Base">
 			<Key>Base</Key>
 		</BuildConfiguration>
-			<BuildConfiguration Include="Debug">
+		<BuildConfiguration Include="Debug">
 			<Key>Cfg_1</Key>
 			<CfgParent>Base</CfgParent>
 		</BuildConfiguration>
-			<BuildConfiguration Include="Release">
+		<BuildConfiguration Include="Release">
 			<Key>Cfg_2</Key>
 			<CfgParent>Base</CfgParent>
 		</BuildConfiguration>
-		</ItemGroup>
+	</ItemGroup>
 	<Import Condition="Exists('$(BDS)\Bin\CodeGear.Cpp.Targets')" Project="$(BDS)\Bin\CodeGear.Cpp.Targets"/>
 	<ProjectExtensions>
 		<Borland.Personality>CPlusPlusBuilder.Personality.12</Borland.Personality>
@@ -190,4 +188,4 @@
 		<ProjectFileVersion>12</ProjectFileVersion>
 	</ProjectExtensions>
 	<Import Condition="Exists('$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj')" Project="$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj"/>
-</Project>
+</Project>

source/PngComponents.cbproj

@@ -1,4 +1,4 @@
-	<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 	<PropertyGroup>
 		<ProjectGuid>{FDCD9EE5-6451-4405-ADEF-8E997ADEE3F0}</ProjectGuid>
 		<ProjectVersion>15.4</ProjectVersion>
@@ -40,121 +40,121 @@
 		<Base>true</Base>
 	</PropertyGroup>
 	<PropertyGroup Condition="'$(Base)'!=''">
-			<_TCHARMapping>char</_TCHARMapping>
-			<BCC_ExtendedErrorInfo>true</BCC_ExtendedErrorInfo>
-			<BCC_OptimizeForSpeed>true</BCC_OptimizeForSpeed>
-			<BCC_wpar>false</BCC_wpar>
-			<BPILibOutputDir>$(INTERM_PATH)\$(Platform)\$(Config)</BPILibOutputDir>
-			<DCC_AdditionalSwitches>-LUDesignIDE</DCC_AdditionalSwitches>
-			<DCC_CBuilderOutput>JPHNE</DCC_CBuilderOutput>
-			<DCC_Namespace>System;Xml;Data;Datasnap;Web;Soap;Vcl;Vcl.Imaging;Vcl.Touch;Vcl.Samples;Vcl.Shell;$(DCC_Namespace)</DCC_Namespace>
-			<DCC_UnitSearchPath>packages\png;packages\my;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
-			<DynamicRTL>true</DynamicRTL>
-			<FinalOutputDir>$(INTERM_PATH)\$(Platform)\$(Config)</FinalOutputDir>
-			<ILINK_Description>Png Components</ILINK_Description>
-			<ILINK_GenerateImportLibrary>true</ILINK_GenerateImportLibrary>
-			<ILINK_GenerateLibFile>true</ILINK_GenerateLibFile>
-			<ILINK_LibraryPath>packages\png\;packages\my;$(BDS)\lib;$(BDS)\source\toolsapi\;$(ILINK_LibraryPath)</ILINK_LibraryPath>
-			<IncludePath>packages\png\;packages\my;$(IncludePath)</IncludePath>
-			<IntermediateOutputDir>$(INTERM_PATH)\$(Platform)\$(Config)</IntermediateOutputDir>
-			<Multithreaded>true</Multithreaded>
-			<ProjectType>CppPackage</ProjectType>
-			<SanitizedProjectName>PngComponents</SanitizedProjectName>
-			<UsePackages>true</UsePackages>
-		</PropertyGroup>
+		<_TCHARMapping>char</_TCHARMapping>
+		<BCC_ExtendedErrorInfo>true</BCC_ExtendedErrorInfo>
+		<BCC_OptimizeForSpeed>true</BCC_OptimizeForSpeed>
+		<BCC_wpar>false</BCC_wpar>
+		<BPILibOutputDir>$(INTERM_PATH)\$(Platform)\$(Config)</BPILibOutputDir>
+		<DCC_AdditionalSwitches>-LUDesignIDE</DCC_AdditionalSwitches>
+		<DCC_CBuilderOutput>JPHNE</DCC_CBuilderOutput>
+		<DCC_Namespace>System;Xml;Data;Datasnap;Web;Soap;Vcl;Vcl.Imaging;Vcl.Touch;Vcl.Samples;Vcl.Shell;$(DCC_Namespace)</DCC_Namespace>
+		<DCC_UnitSearchPath>packages\png;packages\my;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
+		<DynamicRTL>true</DynamicRTL>
+		<FinalOutputDir>$(INTERM_PATH)\$(Platform)\$(Config)</FinalOutputDir>
+		<ILINK_Description>Png Components</ILINK_Description>
+		<ILINK_GenerateImportLibrary>true</ILINK_GenerateImportLibrary>
+		<ILINK_GenerateLibFile>true</ILINK_GenerateLibFile>
+		<ILINK_LibraryPath>packages\png\;packages\my;$(BDS)\lib;$(BDS)\source\toolsapi\;$(ILINK_LibraryPath)</ILINK_LibraryPath>
+		<IncludePath>packages\png\;packages\my;$(IncludePath)</IncludePath>
+		<IntermediateOutputDir>$(INTERM_PATH)\$(Platform)\$(Config)</IntermediateOutputDir>
+		<Multithreaded>true</Multithreaded>
+		<ProjectType>CppPackage</ProjectType>
+		<SanitizedProjectName>PngComponents</SanitizedProjectName>
+		<UsePackages>true</UsePackages>
+	</PropertyGroup>
 	<PropertyGroup Condition="'$(Base_Win32)'!=''">
-			<DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
-			<PackageImports>vcldbx;vclib;inetdbbde;tbxp;ibxpress;vclimg;vclactnband;vcldb;vcldsnap;bindcompvcl;vclie;vcltouch;bcbsmp;websnap;vclribbon;Moje;vcl;DriveDir;CloudService;CodeSiteExpressPkg;dsnapcon;vclx;webdsnap;tb2k;bdertl;DragDropP;bcbie;adortl;$(PackageImports)</PackageImports>
-			<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
-			<VerInfo_Keys>CompanyName=;FileDescription=Png Components Runtime;FileVersion=1.2.0.0;InternalName=PngComponents;LegalCopyright=;LegalTrademarks=;OriginalFilename=PngComponents;ProductName=Png Components;ProductVersion=1.0;Comments=</VerInfo_Keys>
-		</PropertyGroup>
+		<DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
+		<PackageImports>vcldbx;vclib;inetdbbde;tbxp;ibxpress;vclimg;vclactnband;vcldb;vcldsnap;bindcompvcl;vclie;vcltouch;bcbsmp;websnap;vclribbon;Moje;vcl;DriveDir;CloudService;CodeSiteExpressPkg;dsnapcon;vclx;webdsnap;tb2k;bdertl;DragDropP;bcbie;adortl;$(PackageImports)</PackageImports>
+		<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
+		<VerInfo_Keys>CompanyName=;FileDescription=Png Components Runtime;FileVersion=1.2.0.0;InternalName=PngComponents;LegalCopyright=;LegalTrademarks=;OriginalFilename=PngComponents;ProductName=Png Components;ProductVersion=1.0;Comments=</VerInfo_Keys>
+	</PropertyGroup>
 	<PropertyGroup Condition="'$(Base_Win64)'!=''">
-			<PackageImports>vcldbx;vclib;inetdbbde;tbxp;ibxpress;vclimg;vclactnband;vcldb;vcldsnap;bindcompvcl;vclie;vcltouch;bcbsmp;websnap;vclribbon;Moje;vcl;DriveDir;CloudService;CodeSiteExpressPkg;dsnapcon;vclx;webdsnap;tb2k;bdertl;DragDropP;bcbie;adortl;$(PackageImports)</PackageImports>
-		</PropertyGroup>
+		<PackageImports>vcldbx;vclib;inetdbbde;tbxp;ibxpress;vclimg;vclactnband;vcldb;vcldsnap;bindcompvcl;vclie;vcltouch;bcbsmp;websnap;vclribbon;Moje;vcl;DriveDir;CloudService;CodeSiteExpressPkg;dsnapcon;vclx;webdsnap;tb2k;bdertl;DragDropP;bcbie;adortl;$(PackageImports)</PackageImports>
+	</PropertyGroup>
 	<PropertyGroup Condition="'$(Cfg_1)'!=''">
-			<BCC_DebugLineNumbers>true</BCC_DebugLineNumbers>
-			<BCC_DisableOptimizations>true</BCC_DisableOptimizations>
-			<BCC_InlineFunctionExpansion>false</BCC_InlineFunctionExpansion>
-			<BCC_OptimizeForSpeed>false</BCC_OptimizeForSpeed>
-			<BCC_SourceDebuggingOn>true</BCC_SourceDebuggingOn>
-			<BCC_StackFrames>true</BCC_StackFrames>
-			<BCC_UseRegisterVariables>None</BCC_UseRegisterVariables>
-			<DCC_DebugInfoInExe>true</DCC_DebugInfoInExe>
-			<DCC_Define>DEBUG</DCC_Define>
-			<DCC_Optimize>false</DCC_Optimize>
-			<Defines>_DEBUG;$(Defines)</Defines>
-			<ILINK_FullDebugInfo>true</ILINK_FullDebugInfo>
-			<TASM_Debugging>Full</TASM_Debugging>
-			<TASM_DisplaySourceLines>true</TASM_DisplaySourceLines>
-		</PropertyGroup>
+		<BCC_DebugLineNumbers>true</BCC_DebugLineNumbers>
+		<BCC_DisableOptimizations>true</BCC_DisableOptimizations>
+		<BCC_InlineFunctionExpansion>false</BCC_InlineFunctionExpansion>
+		<BCC_OptimizeForSpeed>false</BCC_OptimizeForSpeed>
+		<BCC_SourceDebuggingOn>true</BCC_SourceDebuggingOn>
+		<BCC_StackFrames>true</BCC_StackFrames>
+		<BCC_UseRegisterVariables>None</BCC_UseRegisterVariables>
+		<DCC_DebugInfoInExe>true</DCC_DebugInfoInExe>
+		<DCC_Define>DEBUG</DCC_Define>
+		<DCC_Optimize>false</DCC_Optimize>
+		<Defines>_DEBUG;$(Defines)</Defines>
+		<ILINK_FullDebugInfo>true</ILINK_FullDebugInfo>
+		<TASM_Debugging>Full</TASM_Debugging>
+		<TASM_DisplaySourceLines>true</TASM_DisplaySourceLines>
+	</PropertyGroup>
 	<PropertyGroup Condition="'$(Cfg_2)'!=''">
-			<Defines>NDEBUG;$(Defines)</Defines>
-			<TASM_Debugging>None</TASM_Debugging>
-		</PropertyGroup>
+		<Defines>NDEBUG;$(Defines)</Defines>
+		<TASM_Debugging>None</TASM_Debugging>
+	</PropertyGroup>
 	<ItemGroup>
-			<DelphiCompile Include="packages\png\PngBitBtn.pas">
+		<DelphiCompile Include="packages\png\PngBitBtn.pas">
 			<BuildOrder>2</BuildOrder>
 		</DelphiCompile>
-			<DelphiCompile Include="packages\png\PngButtonFunctions.pas">
+		<DelphiCompile Include="packages\png\PngButtonFunctions.pas">
 			<BuildOrder>3</BuildOrder>
 		</DelphiCompile>
-			<DelphiCompile Include="packages\png\PngCheckListBox.pas">
+		<DelphiCompile Include="packages\png\PngCheckListBox.pas">
 			<BuildOrder>7</BuildOrder>
 		</DelphiCompile>
-			<DelphiCompile Include="packages\png\PngComponentEditors.pas">
+		<DelphiCompile Include="packages\png\PngComponentEditors.pas">
 			<BuildOrder>4</BuildOrder>
 		</DelphiCompile>
-			<DelphiCompile Include="packages\png\PngComponentsRegister.pas">
+		<DelphiCompile Include="packages\png\PngComponentsRegister.pas">
 			<BuildOrder>5</BuildOrder>
 		</DelphiCompile>
-			<DelphiCompile Include="packages\png\PngFunctions.pas">
+		<DelphiCompile Include="packages\png\PngFunctions.pas">
 			<BuildOrder>6</BuildOrder>
 		</DelphiCompile>
-			<DelphiCompile Include="packages\png\PngImageList.pas">
+		<DelphiCompile Include="packages\png\PngImageList.pas">
 			<BuildOrder>8</BuildOrder>
 		</DelphiCompile>
-			<DelphiCompile Include="packages\png\PngImageListEditor.pas">
+		<DelphiCompile Include="packages\png\PngImageListEditor.pas">
 			<BuildOrder>9</BuildOrder>
 		</DelphiCompile>
-			<DelphiCompile Include="packages\png\PngSpeedButton.pas">
+		<DelphiCompile Include="packages\png\PngSpeedButton.pas">
 			<BuildOrder>10</BuildOrder>
 		</DelphiCompile>
-			<CppCompile Include="PngComponents.cpp">
+		<CppCompile Include="PngComponents.cpp">
 			<BuildOrder>0</BuildOrder>
 		</CppCompile>
-			<PackageImport Include="designide.bpi">
+		<PackageImport Include="designide.bpi">
 			<BuildOrder>11</BuildOrder>
 		</PackageImport>
-			<PackageImport Include="rtl.bpi">
+		<PackageImport Include="rtl.bpi">
 			<BuildOrder>1</BuildOrder>
 		</PackageImport>
-			<PackageImport Include="vcl.bpi">
+		<PackageImport Include="vcl.bpi">
 			<BuildOrder>15</BuildOrder>
 		</PackageImport>
-			<PackageImport Include="vclactnband.bpi">
+		<PackageImport Include="vclactnband.bpi">
 			<BuildOrder>13</BuildOrder>
 		</PackageImport>
-			<PackageImport Include="vclimg.bpi">
+		<PackageImport Include="vclimg.bpi">
 			<BuildOrder>16</BuildOrder>
 		</PackageImport>
-			<PackageImport Include="vclx.bpi">
+		<PackageImport Include="vclx.bpi">
 			<BuildOrder>14</BuildOrder>
 		</PackageImport>
-			<PackageImport Include="xmlrtl.bpi">
+		<PackageImport Include="xmlrtl.bpi">
 			<BuildOrder>12</BuildOrder>
 		</PackageImport>
-			<BuildConfiguration Include="Base">
+		<BuildConfiguration Include="Base">
 			<Key>Base</Key>
 		</BuildConfiguration>
-			<BuildConfiguration Include="Debug">
+		<BuildConfiguration Include="Debug">
 			<Key>Cfg_1</Key>
 			<CfgParent>Base</CfgParent>
 		</BuildConfiguration>
-			<BuildConfiguration Include="Release">
+		<BuildConfiguration Include="Release">
 			<Key>Cfg_2</Key>
 			<CfgParent>Base</CfgParent>
 		</BuildConfiguration>
-		</ItemGroup>
+	</ItemGroup>
 	<ProjectExtensions>
 		<Borland.Personality>CPlusPlusBuilder.Personality.12</Borland.Personality>
 		<Borland.ProjectType>CppPackage</Borland.ProjectType>
@@ -180,4 +180,4 @@
 	</ProjectExtensions>
 	<Import Condition="Exists('$(BDS)\Bin\CodeGear.Cpp.Targets')" Project="$(BDS)\Bin\CodeGear.Cpp.Targets"/>
 	<Import Condition="Exists('$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj')" Project="$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj"/>
-</Project>
+</Project>

source/Putty.cbproj

@@ -1,4 +1,4 @@
-	<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 	<PropertyGroup>
 		<ProjectGuid>{E82E93A5-709F-4C7A-918F-811A5F660941}</ProjectGuid>
 		<ProjectVersion>15.4</ProjectVersion>
@@ -28,261 +28,261 @@
 		<Base>true</Base>
 	</PropertyGroup>
 	<PropertyGroup Condition="'$(Base)'!=''">
-			<AllPackageLibs>rtl.lib</AllPackageLibs>
-			<BCC_ExtendedErrorInfo>true</BCC_ExtendedErrorInfo>
-			<BCC_OptimizeForSpeed>true</BCC_OptimizeForSpeed>
-			<BCC_wamb>true</BCC_wamb>
-			<BCC_wamp>true</BCC_wamp>
-			<BCC_wasm>true</BCC_wasm>
-			<BCC_waus>false</BCC_waus>
-			<BCC_wbbf>true</BCC_wbbf>
-			<BCC_wccc>false</BCC_wccc>
-			<BCC_wcln>true</BCC_wcln>
-			<BCC_wcsu>false</BCC_wcsu>
-			<BCC_wdef>true</BCC_wdef>
-			<BCC_weff>false</BCC_weff>
-			<BCC_wexc>true</BCC_wexc>
-			<BCC_wimp>true</BCC_wimp>
-			<BCC_wnak>true</BCC_wnak>
-			<BCC_wnod>true</BCC_wnod>
-			<BCC_wntn>true</BCC_wntn>
-			<BCC_wpad>true</BCC_wpad>
-			<BCC_wpar>false</BCC_wpar>
-			<BCC_wpch>false</BCC_wpch>
-			<BCC_wpia>false</BCC_wpia>
-			<BCC_wrch>false</BCC_wrch>
-			<BCC_wrvl>false</BCC_wrvl>
-			<BCC_wstl>true</BCC_wstl>
-			<BCC_wstv>true</BCC_wstv>
-			<BCC_wsus>false</BCC_wsus>
-			<DCC_CBuilderOutput>JPHNE</DCC_CBuilderOutput>
-			<DCC_Namespace>System;Xml;Data;Datasnap;Web;Soap;Vcl;$(DCC_Namespace)</DCC_Namespace>
-			<Defines>SECURITY_WIN32;MPEXT;_WINDOWS;$(Defines)</Defines>
-			<FinalOutputDir>$(INTERM_PATH)\$(Platform)\$(Config)</FinalOutputDir>
-			<IncludePath>putty\;putty\windows\;$(BDS)\include;$(IncludePath)</IncludePath>
-			<IntermediateOutputDir>$(INTERM_PATH)\$(Platform)\$(Config)</IntermediateOutputDir>
-			<Manifest_File>None</Manifest_File>
-			<Multithreaded>true</Multithreaded>
-			<OutputExt>lib</OutputExt>
-			<ProjectType>CppStaticLibrary</ProjectType>
-			<SanitizedProjectName>Putty</SanitizedProjectName>
-			<TLIB_PageSize>64</TLIB_PageSize>
-			<VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
-			<VerInfo_Locale>1033</VerInfo_Locale>
-		</PropertyGroup>
+		<AllPackageLibs>rtl.lib</AllPackageLibs>
+		<BCC_ExtendedErrorInfo>true</BCC_ExtendedErrorInfo>
+		<BCC_OptimizeForSpeed>true</BCC_OptimizeForSpeed>
+		<BCC_wamb>true</BCC_wamb>
+		<BCC_wamp>true</BCC_wamp>
+		<BCC_wasm>true</BCC_wasm>
+		<BCC_waus>false</BCC_waus>
+		<BCC_wbbf>true</BCC_wbbf>
+		<BCC_wccc>false</BCC_wccc>
+		<BCC_wcln>true</BCC_wcln>
+		<BCC_wcsu>false</BCC_wcsu>
+		<BCC_wdef>true</BCC_wdef>
+		<BCC_weff>false</BCC_weff>
+		<BCC_wexc>true</BCC_wexc>
+		<BCC_wimp>true</BCC_wimp>
+		<BCC_wnak>true</BCC_wnak>
+		<BCC_wnod>true</BCC_wnod>
+		<BCC_wntn>true</BCC_wntn>
+		<BCC_wpad>true</BCC_wpad>
+		<BCC_wpar>false</BCC_wpar>
+		<BCC_wpch>false</BCC_wpch>
+		<BCC_wpia>false</BCC_wpia>
+		<BCC_wrch>false</BCC_wrch>
+		<BCC_wrvl>false</BCC_wrvl>
+		<BCC_wstl>true</BCC_wstl>
+		<BCC_wstv>true</BCC_wstv>
+		<BCC_wsus>false</BCC_wsus>
+		<DCC_CBuilderOutput>JPHNE</DCC_CBuilderOutput>
+		<DCC_Namespace>System;Xml;Data;Datasnap;Web;Soap;Vcl;$(DCC_Namespace)</DCC_Namespace>
+		<Defines>SECURITY_WIN32;MPEXT;_WINDOWS;$(Defines)</Defines>
+		<FinalOutputDir>$(INTERM_PATH)\$(Platform)\$(Config)</FinalOutputDir>
+		<IncludePath>putty\;putty\windows\;$(BDS)\include;$(IncludePath)</IncludePath>
+		<IntermediateOutputDir>$(INTERM_PATH)\$(Platform)\$(Config)</IntermediateOutputDir>
+		<Manifest_File>None</Manifest_File>
+		<Multithreaded>true</Multithreaded>
+		<OutputExt>lib</OutputExt>
+		<ProjectType>CppStaticLibrary</ProjectType>
+		<SanitizedProjectName>Putty</SanitizedProjectName>
+		<TLIB_PageSize>64</TLIB_PageSize>
+		<VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
+		<VerInfo_Locale>1033</VerInfo_Locale>
+	</PropertyGroup>
 	<PropertyGroup Condition="'$(Base_Win32)'!=''">
-			<DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
-		</PropertyGroup>
+		<DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
+	</PropertyGroup>
 	<PropertyGroup Condition="'$(Cfg_1)'!=''">
-			<BCC_DebugLineNumbers>true</BCC_DebugLineNumbers>
-			<BCC_DisableOptimizations>true</BCC_DisableOptimizations>
-			<BCC_InlineFunctionExpansion>false</BCC_InlineFunctionExpansion>
-			<BCC_OptimizeForSpeed>false</BCC_OptimizeForSpeed>
-			<BCC_SourceDebuggingOn>true</BCC_SourceDebuggingOn>
-			<BCC_StackFrames>true</BCC_StackFrames>
-			<BCC_UseRegisterVariables>None</BCC_UseRegisterVariables>
-			<DCC_DebugInfoInExe>true</DCC_DebugInfoInExe>
-			<DCC_Define>DEBUG</DCC_Define>
-			<DCC_Optimize>false</DCC_Optimize>
-			<Defines>_DEBUG;$(Defines)</Defines>
-			<ILINK_FullDebugInfo>true</ILINK_FullDebugInfo>
-			<TASM_Debugging>Full</TASM_Debugging>
-			<TASM_DisplaySourceLines>true</TASM_DisplaySourceLines>
-		</PropertyGroup>
+		<BCC_DebugLineNumbers>true</BCC_DebugLineNumbers>
+		<BCC_DisableOptimizations>true</BCC_DisableOptimizations>
+		<BCC_InlineFunctionExpansion>false</BCC_InlineFunctionExpansion>
+		<BCC_OptimizeForSpeed>false</BCC_OptimizeForSpeed>
+		<BCC_SourceDebuggingOn>true</BCC_SourceDebuggingOn>
+		<BCC_StackFrames>true</BCC_StackFrames>
+		<BCC_UseRegisterVariables>None</BCC_UseRegisterVariables>
+		<DCC_DebugInfoInExe>true</DCC_DebugInfoInExe>
+		<DCC_Define>DEBUG</DCC_Define>
+		<DCC_Optimize>false</DCC_Optimize>
+		<Defines>_DEBUG;$(Defines)</Defines>
+		<ILINK_FullDebugInfo>true</ILINK_FullDebugInfo>
+		<TASM_Debugging>Full</TASM_Debugging>
+		<TASM_DisplaySourceLines>true</TASM_DisplaySourceLines>
+	</PropertyGroup>
 	<PropertyGroup Condition="'$(Cfg_2)'!=''">
-			<Defines>NDEBUG;$(Defines)</Defines>
-			<TASM_Debugging>None</TASM_Debugging>
-		</PropertyGroup>
+		<Defines>NDEBUG;$(Defines)</Defines>
+		<TASM_Debugging>None</TASM_Debugging>
+	</PropertyGroup>
 	<ItemGroup>
-			<CppCompile Include="putty\callback.c">
+		<CppCompile Include="putty\callback.c">
 			<BuildOrder>5</BuildOrder>
 			<BuildOrder>25</BuildOrder>
 		</CppCompile>
-			<CppCompile Include="putty\conf.c">
+		<CppCompile Include="putty\conf.c">
 			<BuildOrder>5</BuildOrder>
 			<BuildOrder>25</BuildOrder>
 		</CppCompile>
-			<CppCompile Include="putty\cproxy.c">
+		<CppCompile Include="putty\cproxy.c">
 			<BuildOrder>5</BuildOrder>
 			<BuildOrder>25</BuildOrder>
 		</CppCompile>
-			<CppCompile Include="putty\errsock.c">
+		<CppCompile Include="putty\errsock.c">
 			<BuildOrder>44</BuildOrder>
 		</CppCompile>
-			<CppCompile Include="putty\import.c">
+		<CppCompile Include="putty\import.c">
 			<BuildOrder>46</BuildOrder>
 		</CppCompile>
-			<CppCompile Include="putty\int64.c">
+		<CppCompile Include="putty\int64.c">
 			<BuildOrder>8</BuildOrder>
 			<BuildOrder>24</BuildOrder>
 		</CppCompile>
-			<CppCompile Include="putty\logging.c">
+		<CppCompile Include="putty\logging.c">
 			<BuildOrder>27</BuildOrder>
 			<BuildOrder>11</BuildOrder>
 		</CppCompile>
-			<CppCompile Include="putty\misc.c">
+		<CppCompile Include="putty\misc.c">
 			<BuildOrder>26</BuildOrder>
 			<BuildOrder>14</BuildOrder>
 		</CppCompile>
-			<CppCompile Include="putty\noshare.c">
+		<CppCompile Include="putty\noshare.c">
 			<BuildOrder>41</BuildOrder>
 		</CppCompile>
-			<CppCompile Include="putty\pgssapi.c">
+		<CppCompile Include="putty\pgssapi.c">
 			<BuildOrder>37</BuildOrder>
 		</CppCompile>
-			<CppCompile Include="putty\portfwd.c">
+		<CppCompile Include="putty\portfwd.c">
 			<BuildOrder>23</BuildOrder>
 			<BuildOrder>17</BuildOrder>
 		</CppCompile>
-			<CppCompile Include="putty\proxy.c">
+		<CppCompile Include="putty\proxy.c">
 			<BuildOrder>20</BuildOrder>
 		</CppCompile>
-			<CppCompile Include="putty\ssh.c">
+		<CppCompile Include="putty\ssh.c">
 			<BuildOrder>23</BuildOrder>
 			<BuildOrder>19</BuildOrder>
 		</CppCompile>
-			<CppCompile Include="putty\sshaes.c">
+		<CppCompile Include="putty\sshaes.c">
 			<BuildOrder>26</BuildOrder>
 			<BuildOrder>22</BuildOrder>
 		</CppCompile>
-			<CppCompile Include="putty\ssharcf.c">
+		<CppCompile Include="putty\ssharcf.c">
 			<BuildOrder>29</BuildOrder>
 			<BuildOrder>21</BuildOrder>
 		</CppCompile>
-			<CppCompile Include="putty\sshblowf.c">
+		<CppCompile Include="putty\sshblowf.c">
 			<BuildOrder>34</BuildOrder>
 			<BuildOrder>32</BuildOrder>
 		</CppCompile>
-			<CppCompile Include="putty\sshbn.c">
+		<CppCompile Include="putty\sshbn.c">
 			<BuildOrder>35</BuildOrder>
 			<BuildOrder>33</BuildOrder>
 		</CppCompile>
-			<CppCompile Include="putty\sshcrc.c">
+		<CppCompile Include="putty\sshcrc.c">
 			<BuildOrder>38</BuildOrder>
 			<BuildOrder>36</BuildOrder>
 		</CppCompile>
-			<CppCompile Include="putty\sshcrcda.c">
+		<CppCompile Include="putty\sshcrcda.c">
 			<BuildOrder>41</BuildOrder>
 			<BuildOrder>35</BuildOrder>
 		</CppCompile>
-			<CppCompile Include="putty\sshdes.c">
+		<CppCompile Include="putty\sshdes.c">
 			<BuildOrder>44</BuildOrder>
 			<BuildOrder>32</BuildOrder>
 		</CppCompile>
-			<CppCompile Include="putty\sshdh.c">
+		<CppCompile Include="putty\sshdh.c">
 			<BuildOrder>47</BuildOrder>
 			<BuildOrder>29</BuildOrder>
 		</CppCompile>
-			<CppCompile Include="putty\sshdss.c">
+		<CppCompile Include="putty\sshdss.c">
 			<BuildOrder>50</BuildOrder>
 			<BuildOrder>28</BuildOrder>
 		</CppCompile>
-			<CppCompile Include="putty\sshgssc.c">
+		<CppCompile Include="putty\sshgssc.c">
 			<BuildOrder>38</BuildOrder>
 		</CppCompile>
-			<CppCompile Include="putty\sshmd5.c">
+		<CppCompile Include="putty\sshmd5.c">
 			<BuildOrder>53</BuildOrder>
 			<BuildOrder>31</BuildOrder>
 		</CppCompile>
-			<CppCompile Include="putty\sshpubk.c">
+		<CppCompile Include="putty\sshpubk.c">
 			<BuildOrder>56</BuildOrder>
 			<BuildOrder>30</BuildOrder>
 		</CppCompile>
-			<CppCompile Include="putty\sshrand.c">
+		<CppCompile Include="putty\sshrand.c">
 			<BuildOrder>59</BuildOrder>
 			<BuildOrder>18</BuildOrder>
 		</CppCompile>
-			<CppCompile Include="putty\sshrsa.c">
+		<CppCompile Include="putty\sshrsa.c">
 			<BuildOrder>62</BuildOrder>
 			<BuildOrder>6</BuildOrder>
 		</CppCompile>
-			<CppCompile Include="putty\sshsh256.c">
+		<CppCompile Include="putty\sshsh256.c">
 			<BuildOrder>65</BuildOrder>
 			<BuildOrder>5</BuildOrder>
 		</CppCompile>
-			<CppCompile Include="putty\sshsh512.c">
+		<CppCompile Include="putty\sshsh512.c">
 			<BuildOrder>8</BuildOrder>
 			<BuildOrder>68</BuildOrder>
 		</CppCompile>
-			<CppCompile Include="putty\sshsha.c">
+		<CppCompile Include="putty\sshsha.c">
 			<BuildOrder>71</BuildOrder>
 			<BuildOrder>7</BuildOrder>
 		</CppCompile>
-			<CppCompile Include="putty\sshshare.c">
+		<CppCompile Include="putty\sshshare.c">
 			<BuildOrder>42</BuildOrder>
 		</CppCompile>
-			<CppCompile Include="putty\sshzlib.c">
+		<CppCompile Include="putty\sshzlib.c">
 			<BuildOrder>74</BuildOrder>
 			<BuildOrder>4</BuildOrder>
 		</CppCompile>
-			<CppCompile Include="putty\tree234.c">
+		<CppCompile Include="putty\tree234.c">
 			<BuildOrder>77</BuildOrder>
 			<BuildOrder>1</BuildOrder>
 		</CppCompile>
-			<CppCompile Include="putty\wildcard.c">
+		<CppCompile Include="putty\wildcard.c">
 			<BuildOrder>83</BuildOrder>
 			<BuildOrder>3</BuildOrder>
 		</CppCompile>
-			<CppCompile Include="putty\windows\wingss.c">
+		<CppCompile Include="putty\windows\wingss.c">
 			<BuildOrder>86</BuildOrder>
 			<BuildOrder>2</BuildOrder>
 		</CppCompile>
-			<CppCompile Include="putty\windows\winhandl.c">
+		<CppCompile Include="putty\windows\winhandl.c">
 			<BuildOrder>43</BuildOrder>
 		</CppCompile>
-			<CppCompile Include="putty\windows\winhsock.c">
+		<CppCompile Include="putty\windows\winhsock.c">
 			<BuildOrder>45</BuildOrder>
 		</CppCompile>
-			<CppCompile Include="putty\windows\winmisc.c">
+		<CppCompile Include="putty\windows\winmisc.c">
 			<BuildOrder>92</BuildOrder>
 			<BuildOrder>14</BuildOrder>
 		</CppCompile>
-			<CppCompile Include="putty\windows\winnet.c">
+		<CppCompile Include="putty\windows\winnet.c">
 			<BuildOrder>95</BuildOrder>
 			<BuildOrder>17</BuildOrder>
 		</CppCompile>
-			<CppCompile Include="putty\windows\winnoise.c">
+		<CppCompile Include="putty\windows\winnoise.c">
 			<BuildOrder>98</BuildOrder>
 			<BuildOrder>16</BuildOrder>
 		</CppCompile>
-			<CppCompile Include="putty\windows\winnojmp.c">
+		<CppCompile Include="putty\windows\winnojmp.c">
 			<BuildOrder>39</BuildOrder>
 		</CppCompile>
-			<CppCompile Include="putty\windows\winpgntc.c">
+		<CppCompile Include="putty\windows\winpgntc.c">
 			<BuildOrder>13</BuildOrder>
 			<BuildOrder>101</BuildOrder>
 		</CppCompile>
-			<CppCompile Include="putty\windows\winproxy.c">
+		<CppCompile Include="putty\windows\winproxy.c">
 			<BuildOrder>104</BuildOrder>
 			<BuildOrder>10</BuildOrder>
 		</CppCompile>
-			<CppCompile Include="putty\windows\winsecur.c">
+		<CppCompile Include="putty\windows\winsecur.c">
 			<BuildOrder>43</BuildOrder>
 		</CppCompile>
-			<CppCompile Include="putty\windows\winstore.c">
+		<CppCompile Include="putty\windows\winstore.c">
 			<BuildOrder>9</BuildOrder>
 			<BuildOrder>107</BuildOrder>
 		</CppCompile>
-			<CppCompile Include="putty\windows\wintime.c">
+		<CppCompile Include="putty\windows\wintime.c">
 			<BuildOrder>12</BuildOrder>
 			<BuildOrder>110</BuildOrder>
 		</CppCompile>
-			<CppCompile Include="putty\x11fwd.c">
+		<CppCompile Include="putty\x11fwd.c">
 			<BuildOrder>113</BuildOrder>
 			<BuildOrder>11</BuildOrder>
 		</CppCompile>
-			<BuildConfiguration Include="Base">
+		<BuildConfiguration Include="Base">
 			<Key>Base</Key>
 		</BuildConfiguration>
-			<BuildConfiguration Include="Debug">
+		<BuildConfiguration Include="Debug">
 			<Key>Cfg_1</Key>
 			<CfgParent>Base</CfgParent>
 		</BuildConfiguration>
-			<BuildConfiguration Include="Release">
+		<BuildConfiguration Include="Release">
 			<Key>Cfg_2</Key>
 			<CfgParent>Base</CfgParent>
 		</BuildConfiguration>
-		</ItemGroup>
+	</ItemGroup>
 	<Import Condition="Exists('$(BDS)\Bin\CodeGear.Cpp.Targets')" Project="$(BDS)\Bin\CodeGear.Cpp.Targets"/>
 	<ProjectExtensions>
 		<Borland.Personality>CPlusPlusBuilder.Personality.12</Borland.Personality>
@@ -304,4 +304,4 @@
 		<ProjectFileVersion>12</ProjectFileVersion>
 	</ProjectExtensions>
 	<Import Condition="Exists('$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj')" Project="$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj"/>
-</Project>
+</Project>

source/RScpComp.cbproj

@@ -1,4 +1,4 @@
-	<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 	<PropertyGroup>
 		<ProjectGuid>{D87E3096-EFE3-47F7-A35B-04FE6FB138CC}</ProjectGuid>
 		<ProjectVersion>15.4</ProjectVersion>
@@ -28,86 +28,86 @@
 		<Base>true</Base>
 	</PropertyGroup>
 	<PropertyGroup Condition="'$(Base)'!=''">
-			<_TCHARMapping>wchar_t</_TCHARMapping>
-			<AllPackageLibs>vclx.lib;vcl.lib;rtl.lib;DriveDir.lib;Moje.lib;DragDropP.lib</AllPackageLibs>
-			<BCC_AllWarnings>true</BCC_AllWarnings>
-			<BCC_ExtendedErrorInfo>true</BCC_ExtendedErrorInfo>
-			<BCC_OptimizeForSpeed>true</BCC_OptimizeForSpeed>
-			<BCC_wdiu>false</BCC_wdiu>
-			<DCC_CBuilderOutput>JPHNE</DCC_CBuilderOutput>
-			<DCC_Namespace>System;Xml;Data;Datasnap;Web;Soap;Vcl;$(DCC_Namespace)</DCC_Namespace>
-			<FinalOutputDir>$(INTERM_PATH)\$(Platform)\$(Config)</FinalOutputDir>
-			<ILINK_LibraryPath>$(BDS)\lib;$(ILINK_LibraryPath)</ILINK_LibraryPath>
-			<IncludePath>components\;core;windows;packages\filemng;packages\dragndrop;packages\my;$(BDS)\include;$(BDS)\include\windows\vcl;$(IncludePath)</IncludePath>
-			<IntermediateOutputDir>$(INTERM_PATH)\$(Platform)\$(Config)</IntermediateOutputDir>
-			<Manifest_File>None</Manifest_File>
-			<Multithreaded>true</Multithreaded>
-			<OutputExt>lib</OutputExt>
-			<ProjectType>CppStaticLibrary</ProjectType>
-			<SanitizedProjectName>RScpComp</SanitizedProjectName>
-			<TLIB_PageSize>64</TLIB_PageSize>
-			<UsingDelphiRTL>true</UsingDelphiRTL>
-			<VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
-			<VerInfo_Locale>1033</VerInfo_Locale>
-		</PropertyGroup>
+		<_TCHARMapping>wchar_t</_TCHARMapping>
+		<AllPackageLibs>vclx.lib;vcl.lib;rtl.lib;DriveDir.lib;Moje.lib;DragDropP.lib</AllPackageLibs>
+		<BCC_AllWarnings>true</BCC_AllWarnings>
+		<BCC_ExtendedErrorInfo>true</BCC_ExtendedErrorInfo>
+		<BCC_OptimizeForSpeed>true</BCC_OptimizeForSpeed>
+		<BCC_wdiu>false</BCC_wdiu>
+		<DCC_CBuilderOutput>JPHNE</DCC_CBuilderOutput>
+		<DCC_Namespace>System;Xml;Data;Datasnap;Web;Soap;Vcl;$(DCC_Namespace)</DCC_Namespace>
+		<FinalOutputDir>$(INTERM_PATH)\$(Platform)\$(Config)</FinalOutputDir>
+		<ILINK_LibraryPath>$(BDS)\lib;$(ILINK_LibraryPath)</ILINK_LibraryPath>
+		<IncludePath>components\;core;windows;packages\filemng;packages\dragndrop;packages\my;$(BDS)\include;$(BDS)\include\windows\vcl;$(IncludePath)</IncludePath>
+		<IntermediateOutputDir>$(INTERM_PATH)\$(Platform)\$(Config)</IntermediateOutputDir>
+		<Manifest_File>None</Manifest_File>
+		<Multithreaded>true</Multithreaded>
+		<OutputExt>lib</OutputExt>
+		<ProjectType>CppStaticLibrary</ProjectType>
+		<SanitizedProjectName>RScpComp</SanitizedProjectName>
+		<TLIB_PageSize>64</TLIB_PageSize>
+		<UsingDelphiRTL>true</UsingDelphiRTL>
+		<VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
+		<VerInfo_Locale>1033</VerInfo_Locale>
+	</PropertyGroup>
 	<PropertyGroup Condition="'$(Base_Win32)'!=''">
-			<DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
-		</PropertyGroup>
+		<DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
+	</PropertyGroup>
 	<PropertyGroup Condition="'$(Cfg_1)'!=''">
-			<BCC_DebugLineNumbers>true</BCC_DebugLineNumbers>
-			<BCC_DisableOptimizations>true</BCC_DisableOptimizations>
-			<BCC_InlineFunctionExpansion>false</BCC_InlineFunctionExpansion>
-			<BCC_MonitorGlobalAndStackData>true</BCC_MonitorGlobalAndStackData>
-			<BCC_MonitorInlinePtrAccess>true</BCC_MonitorInlinePtrAccess>
-			<BCC_MonitorThis>true</BCC_MonitorThis>
-			<BCC_OptimizeForSpeed>false</BCC_OptimizeForSpeed>
-			<BCC_SourceDebuggingOn>true</BCC_SourceDebuggingOn>
-			<BCC_StackFrames>true</BCC_StackFrames>
-			<BCC_UseRegisterVariables>None</BCC_UseRegisterVariables>
-			<DCC_DebugInfoInExe>true</DCC_DebugInfoInExe>
-			<DCC_Define>DEBUG</DCC_Define>
-			<DCC_Optimize>false</DCC_Optimize>
-			<Defines>_DEBUG;$(Defines)</Defines>
-			<ILINK_FullDebugInfo>true</ILINK_FullDebugInfo>
-			<TASM_Debugging>Full</TASM_Debugging>
-			<TASM_DisplaySourceLines>true</TASM_DisplaySourceLines>
-		</PropertyGroup>
+		<BCC_DebugLineNumbers>true</BCC_DebugLineNumbers>
+		<BCC_DisableOptimizations>true</BCC_DisableOptimizations>
+		<BCC_InlineFunctionExpansion>false</BCC_InlineFunctionExpansion>
+		<BCC_MonitorGlobalAndStackData>true</BCC_MonitorGlobalAndStackData>
+		<BCC_MonitorInlinePtrAccess>true</BCC_MonitorInlinePtrAccess>
+		<BCC_MonitorThis>true</BCC_MonitorThis>
+		<BCC_OptimizeForSpeed>false</BCC_OptimizeForSpeed>
+		<BCC_SourceDebuggingOn>true</BCC_SourceDebuggingOn>
+		<BCC_StackFrames>true</BCC_StackFrames>
+		<BCC_UseRegisterVariables>None</BCC_UseRegisterVariables>
+		<DCC_DebugInfoInExe>true</DCC_DebugInfoInExe>
+		<DCC_Define>DEBUG</DCC_Define>
+		<DCC_Optimize>false</DCC_Optimize>
+		<Defines>_DEBUG;$(Defines)</Defines>
+		<ILINK_FullDebugInfo>true</ILINK_FullDebugInfo>
+		<TASM_Debugging>Full</TASM_Debugging>
+		<TASM_DisplaySourceLines>true</TASM_DisplaySourceLines>
+	</PropertyGroup>
 	<PropertyGroup Condition="'$(Cfg_2)'!=''">
-			<Defines>NDEBUG;$(BCC_Defines);$(Defines)</Defines>
-			<TASM_Debugging>None</TASM_Debugging>
-		</PropertyGroup>
+		<Defines>NDEBUG;$(BCC_Defines);$(Defines)</Defines>
+		<TASM_Debugging>None</TASM_Debugging>
+	</PropertyGroup>
 	<ItemGroup>
-			<CppCompile Include="components\LogMemo.cpp">
+		<CppCompile Include="components\LogMemo.cpp">
 			<BuildOrder>5</BuildOrder>
 			<DependentOn>components\LogMemo.h</DependentOn>
 			<BuildOrder>2</BuildOrder>
 		</CppCompile>
-			<CppCompile Include="components\ThemePageControl.cpp">
+		<CppCompile Include="components\ThemePageControl.cpp">
 			<DependentOn>components\ThemePageControl.h</DependentOn>
 			<BuildOrder>3</BuildOrder>
 		</CppCompile>
-			<CppCompile Include="components\UnixDirView.cpp">
+		<CppCompile Include="components\UnixDirView.cpp">
 			<BuildOrder>8</BuildOrder>
 			<DependentOn>components\UnixDirView.h</DependentOn>
 			<BuildOrder>1</BuildOrder>
 		</CppCompile>
-			<CppCompile Include="components\UnixDriveView.cpp">
+		<CppCompile Include="components\UnixDriveView.cpp">
 			<BuildOrder>11</BuildOrder>
 			<DependentOn>components\UnixDriveView.h</DependentOn>
 			<BuildOrder>0</BuildOrder>
 		</CppCompile>
-			<BuildConfiguration Include="Base">
+		<BuildConfiguration Include="Base">
 			<Key>Base</Key>
 		</BuildConfiguration>
-			<BuildConfiguration Include="Debug">
+		<BuildConfiguration Include="Debug">
 			<Key>Cfg_1</Key>
 			<CfgParent>Base</CfgParent>
 		</BuildConfiguration>
-			<BuildConfiguration Include="Release">
+		<BuildConfiguration Include="Release">
 			<Key>Cfg_2</Key>
 			<CfgParent>Base</CfgParent>
 		</BuildConfiguration>
-		</ItemGroup>
+	</ItemGroup>
 	<Import Condition="Exists('$(BDS)\Bin\CodeGear.Cpp.Targets')" Project="$(BDS)\Bin\CodeGear.Cpp.Targets"/>
 	<ProjectExtensions>
 		<Borland.Personality>CPlusPlusBuilder.Personality.12</Borland.Personality>
@@ -129,4 +129,4 @@
 		<ProjectFileVersion>12</ProjectFileVersion>
 	</ProjectExtensions>
 	<Import Condition="Exists('$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj')" Project="$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj"/>
-</Project>
+</Project>

source/ScpCore.cbproj

@@ -1,4 +1,4 @@
-	<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 	<PropertyGroup>
 		<ProjectGuid>{E0BF1CDA-E75F-4F22-8190-70A30CBE74EE}</ProjectGuid>
 		<ProjectVersion>15.4</ProjectVersion>
@@ -28,192 +28,192 @@
 		<Base>true</Base>
 	</PropertyGroup>
 	<PropertyGroup Condition="'$(Base)'!=''">
-			<_TCHARMapping>wchar_t</_TCHARMapping>
-			<AllPackageLibs>rtl.lib;vclx.lib;vcl.lib;xmlrtl.lib</AllPackageLibs>
-			<BCC_AllWarnings>true</BCC_AllWarnings>
-			<BCC_ExtendedErrorInfo>true</BCC_ExtendedErrorInfo>
-			<BCC_OptimizeForSpeed>true</BCC_OptimizeForSpeed>
-			<BCC_wdiu>false</BCC_wdiu>
-			<DCC_CBuilderOutput>JPHNE</DCC_CBuilderOutput>
-			<DCC_Namespace>System;Xml;Data;Datasnap;Web;Soap;Vcl;$(DCC_Namespace)</DCC_Namespace>
-			<Defines>USE_COMPATIBLE_THREAD;_WINDOWS;WIN32;WINNT;_CRTIMP=;_LIB;$(BUILD_TYPE);$(Defines)</Defines>
-			<FinalOutputDir>$(INTERM_PATH)\$(Platform)\$(Config)</FinalOutputDir>
-			<ILINK_LibraryPath>$(BDS)\lib;$(ILINK_LibraryPath)</ILINK_LibraryPath>
-			<IncludePath>core\;putty;putty\windows;filezilla;resource;..\libs\openssl;..\libs\expat\lib;..\libs\neon\src;$(BDS)\include;$(BDS)\include\windows\vcl;$(BDS)\include\Mfc;$(IncludePath)</IncludePath>
-			<IntermediateOutputDir>$(INTERM_PATH)\$(Platform)\$(Config)</IntermediateOutputDir>
-			<Manifest_File>None</Manifest_File>
-			<Multithreaded>true</Multithreaded>
-			<OutputExt>lib</OutputExt>
-			<ProjectType>CppStaticLibrary</ProjectType>
-			<SanitizedProjectName>ScpCore</SanitizedProjectName>
-			<TLIB_PageSize>512</TLIB_PageSize>
-			<UsingDelphiRTL>true</UsingDelphiRTL>
-			<VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
-			<VerInfo_Locale>1033</VerInfo_Locale>
-		</PropertyGroup>
+		<_TCHARMapping>wchar_t</_TCHARMapping>
+		<AllPackageLibs>rtl.lib;vclx.lib;vcl.lib;xmlrtl.lib</AllPackageLibs>
+		<BCC_AllWarnings>true</BCC_AllWarnings>
+		<BCC_ExtendedErrorInfo>true</BCC_ExtendedErrorInfo>
+		<BCC_OptimizeForSpeed>true</BCC_OptimizeForSpeed>
+		<BCC_wdiu>false</BCC_wdiu>
+		<DCC_CBuilderOutput>JPHNE</DCC_CBuilderOutput>
+		<DCC_Namespace>System;Xml;Data;Datasnap;Web;Soap;Vcl;$(DCC_Namespace)</DCC_Namespace>
+		<Defines>USE_COMPATIBLE_THREAD;_WINDOWS;WIN32;WINNT;_CRTIMP=;_LIB;$(BUILD_TYPE);$(Defines)</Defines>
+		<FinalOutputDir>$(INTERM_PATH)\$(Platform)\$(Config)</FinalOutputDir>
+		<ILINK_LibraryPath>$(BDS)\lib;$(ILINK_LibraryPath)</ILINK_LibraryPath>
+		<IncludePath>core\;putty;putty\windows;filezilla;resource;..\libs\openssl;..\libs\expat\lib;..\libs\neon\src;$(BDS)\include;$(BDS)\include\windows\vcl;$(BDS)\include\Mfc;$(IncludePath)</IncludePath>
+		<IntermediateOutputDir>$(INTERM_PATH)\$(Platform)\$(Config)</IntermediateOutputDir>
+		<Manifest_File>None</Manifest_File>
+		<Multithreaded>true</Multithreaded>
+		<OutputExt>lib</OutputExt>
+		<ProjectType>CppStaticLibrary</ProjectType>
+		<SanitizedProjectName>ScpCore</SanitizedProjectName>
+		<TLIB_PageSize>512</TLIB_PageSize>
+		<UsingDelphiRTL>true</UsingDelphiRTL>
+		<VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
+		<VerInfo_Locale>1033</VerInfo_Locale>
+	</PropertyGroup>
 	<PropertyGroup Condition="'$(Base_Win32)'!=''">
-			<DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
-		</PropertyGroup>
+		<DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
+	</PropertyGroup>
 	<PropertyGroup Condition="'$(Cfg_1)'!=''">
-			<BCC_DebugLineNumbers>true</BCC_DebugLineNumbers>
-			<BCC_DisableOptimizations>true</BCC_DisableOptimizations>
-			<BCC_InlineFunctionExpansion>false</BCC_InlineFunctionExpansion>
-			<BCC_MonitorGlobalAndStackData>true</BCC_MonitorGlobalAndStackData>
-			<BCC_MonitorInlinePtrAccess>true</BCC_MonitorInlinePtrAccess>
-			<BCC_MonitorThis>true</BCC_MonitorThis>
-			<BCC_OptimizeForSpeed>false</BCC_OptimizeForSpeed>
-			<BCC_SourceDebuggingOn>true</BCC_SourceDebuggingOn>
-			<BCC_StackFrames>true</BCC_StackFrames>
-			<BCC_UseRegisterVariables>None</BCC_UseRegisterVariables>
-			<DCC_DebugInfoInExe>true</DCC_DebugInfoInExe>
-			<DCC_Define>DEBUG</DCC_Define>
-			<DCC_Optimize>false</DCC_Optimize>
-			<Defines>_DEBUG;$(Defines)</Defines>
-			<ILINK_FullDebugInfo>true</ILINK_FullDebugInfo>
-			<TASM_Debugging>Full</TASM_Debugging>
-			<TASM_DisplaySourceLines>true</TASM_DisplaySourceLines>
-		</PropertyGroup>
+		<BCC_DebugLineNumbers>true</BCC_DebugLineNumbers>
+		<BCC_DisableOptimizations>true</BCC_DisableOptimizations>
+		<BCC_InlineFunctionExpansion>false</BCC_InlineFunctionExpansion>
+		<BCC_MonitorGlobalAndStackData>true</BCC_MonitorGlobalAndStackData>
+		<BCC_MonitorInlinePtrAccess>true</BCC_MonitorInlinePtrAccess>
+		<BCC_MonitorThis>true</BCC_MonitorThis>
+		<BCC_OptimizeForSpeed>false</BCC_OptimizeForSpeed>
+		<BCC_SourceDebuggingOn>true</BCC_SourceDebuggingOn>
+		<BCC_StackFrames>true</BCC_StackFrames>
+		<BCC_UseRegisterVariables>None</BCC_UseRegisterVariables>
+		<DCC_DebugInfoInExe>true</DCC_DebugInfoInExe>
+		<DCC_Define>DEBUG</DCC_Define>
+		<DCC_Optimize>false</DCC_Optimize>
+		<Defines>_DEBUG;$(Defines)</Defines>
+		<ILINK_FullDebugInfo>true</ILINK_FullDebugInfo>
+		<TASM_Debugging>Full</TASM_Debugging>
+		<TASM_DisplaySourceLines>true</TASM_DisplaySourceLines>
+	</PropertyGroup>
 	<PropertyGroup Condition="'$(Cfg_2)'!=''">
-			<Defines>NDEBUG;$(Defines)</Defines>
-			<TASM_Debugging>None</TASM_Debugging>
-		</PropertyGroup>
+		<Defines>NDEBUG;$(Defines)</Defines>
+		<TASM_Debugging>None</TASM_Debugging>
+	</PropertyGroup>
 	<ItemGroup>
-			<CppCompile Include="core\Bookmarks.cpp">
+		<CppCompile Include="core\Bookmarks.cpp">
 			<BuildOrder>5</BuildOrder>
 			<BuildOrder>17</BuildOrder>
 		</CppCompile>
-			<CppCompile Include="core\Common.cpp">
+		<CppCompile Include="core\Common.cpp">
 			<BuildOrder>8</BuildOrder>
 			<BuildOrder>18</BuildOrder>
 		</CppCompile>
-			<CppCompile Include="core\Configuration.cpp">
+		<CppCompile Include="core\Configuration.cpp">
 			<BuildOrder>19</BuildOrder>
 			<BuildOrder>11</BuildOrder>
 		</CppCompile>
-			<CppCompile Include="core\CopyParam.cpp">
+		<CppCompile Include="core\CopyParam.cpp">
 			<BuildOrder>14</BuildOrder>
 		</CppCompile>
-			<CppCompile Include="core\CoreMain.cpp">
+		<CppCompile Include="core\CoreMain.cpp">
 			<BuildOrder>17</BuildOrder>
 			<BuildOrder>15</BuildOrder>
 		</CppCompile>
-			<CppCompile Include="core\Cryptography.cpp">
+		<CppCompile Include="core\Cryptography.cpp">
 			<BuildOrder>20</BuildOrder>
 			<BuildOrder>16</BuildOrder>
 		</CppCompile>
-			<CppCompile Include="core\Exceptions.cpp">
+		<CppCompile Include="core\Exceptions.cpp">
 			<BuildOrder>23</BuildOrder>
 			<BuildOrder>20</BuildOrder>
 		</CppCompile>
-			<CppCompile Include="core\FileBuffer.cpp">
+		<CppCompile Include="core\FileBuffer.cpp">
 			<BuildOrder>26</BuildOrder>
 			<BuildOrder>24</BuildOrder>
 		</CppCompile>
-			<CppCompile Include="core\FileInfo.cpp">
+		<CppCompile Include="core\FileInfo.cpp">
 			<BuildOrder>29</BuildOrder>
 			<BuildOrder>25</BuildOrder>
 		</CppCompile>
-			<CppCompile Include="core\FileMasks.cpp">
+		<CppCompile Include="core\FileMasks.cpp">
 			<BuildOrder>32</BuildOrder>
 			<BuildOrder>26</BuildOrder>
 		</CppCompile>
-			<CppCompile Include="core\FileOperationProgress.cpp">
+		<CppCompile Include="core\FileOperationProgress.cpp">
 			<BuildOrder>35</BuildOrder>
 			<BuildOrder>21</BuildOrder>
 		</CppCompile>
-			<CppCompile Include="core\FileSystems.cpp">
+		<CppCompile Include="core\FileSystems.cpp">
 			<BuildOrder>38</BuildOrder>
 			<BuildOrder>22</BuildOrder>
 		</CppCompile>
-			<CppCompile Include="core\FtpFileSystem.cpp">
+		<CppCompile Include="core\FtpFileSystem.cpp">
 			<BuildOrder>41</BuildOrder>
 			<BuildOrder>23</BuildOrder>
 		</CppCompile>
-			<CppCompile Include="core\Global.cpp">
+		<CppCompile Include="core\Global.cpp">
 			<BuildOrder>29</BuildOrder>
 		</CppCompile>
-			<CppCompile Include="core\HierarchicalStorage.cpp">
+		<CppCompile Include="core\HierarchicalStorage.cpp">
 			<BuildOrder>44</BuildOrder>
 			<BuildOrder>13</BuildOrder>
 		</CppCompile>
-			<CppCompile Include="core\Http.cpp">
+		<CppCompile Include="core\Http.cpp">
 			<BuildOrder>4</BuildOrder>
 		</CppCompile>
-			<CppCompile Include="core\NamedObjs.cpp">
+		<CppCompile Include="core\NamedObjs.cpp">
 			<BuildOrder>47</BuildOrder>
 			<BuildOrder>3</BuildOrder>
 		</CppCompile>
-			<CppCompile Include="core\NeonIntf.cpp">
+		<CppCompile Include="core\NeonIntf.cpp">
 			<BuildOrder>47</BuildOrder>
 			<BuildOrder>3</BuildOrder>
 		</CppCompile>
-			<CppCompile Include="core\Option.cpp">
+		<CppCompile Include="core\Option.cpp">
 			<BuildOrder>50</BuildOrder>
 			<BuildOrder>4</BuildOrder>
 		</CppCompile>
-			<CppCompile Include="core\PuttyIntf.cpp">
+		<CppCompile Include="core\PuttyIntf.cpp">
 			<BuildOrder>53</BuildOrder>
 			<BuildOrder>5</BuildOrder>
 		</CppCompile>
-			<CppCompile Include="core\Queue.cpp">
+		<CppCompile Include="core\Queue.cpp">
 			<BuildOrder>56</BuildOrder>
 			<BuildOrder>0</BuildOrder>
 		</CppCompile>
-			<CppCompile Include="core\RemoteFiles.cpp">
+		<CppCompile Include="core\RemoteFiles.cpp">
 			<BuildOrder>59</BuildOrder>
 			<BuildOrder>1</BuildOrder>
 		</CppCompile>
-			<CppCompile Include="core\ScpFileSystem.cpp">
+		<CppCompile Include="core\ScpFileSystem.cpp">
 			<BuildOrder>62</BuildOrder>
 			<BuildOrder>2</BuildOrder>
 		</CppCompile>
-			<CppCompile Include="core\Script.cpp">
+		<CppCompile Include="core\Script.cpp">
 			<BuildOrder>65</BuildOrder>
 			<BuildOrder>6</BuildOrder>
 		</CppCompile>
-			<CppCompile Include="core\SecureShell.cpp">
+		<CppCompile Include="core\SecureShell.cpp">
 			<BuildOrder>68</BuildOrder>
 			<BuildOrder>10</BuildOrder>
 		</CppCompile>
-			<CppCompile Include="core\Security.cpp">
+		<CppCompile Include="core\Security.cpp">
 			<BuildOrder>71</BuildOrder>
 			<BuildOrder>11</BuildOrder>
 		</CppCompile>
-			<CppCompile Include="core\SessionData.cpp">
+		<CppCompile Include="core\SessionData.cpp">
 			<BuildOrder>74</BuildOrder>
 			<BuildOrder>12</BuildOrder>
 		</CppCompile>
-			<CppCompile Include="core\SessionInfo.cpp">
+		<CppCompile Include="core\SessionInfo.cpp">
 			<BuildOrder>77</BuildOrder>
 			<BuildOrder>7</BuildOrder>
 		</CppCompile>
-			<CppCompile Include="core\SftpFileSystem.cpp">
+		<CppCompile Include="core\SftpFileSystem.cpp">
 			<BuildOrder>80</BuildOrder>
 			<BuildOrder>8</BuildOrder>
 		</CppCompile>
-			<CppCompile Include="core\Terminal.cpp">
+		<CppCompile Include="core\Terminal.cpp">
 			<BuildOrder>9</BuildOrder>
 			<BuildOrder>83</BuildOrder>
 		</CppCompile>
-			<CppCompile Include="core\Usage.cpp">
+		<CppCompile Include="core\Usage.cpp">
 			<BuildOrder>27</BuildOrder>
 		</CppCompile>
-			<CppCompile Include="core\WebDAVFileSystem.cpp">
+		<CppCompile Include="core\WebDAVFileSystem.cpp">
 			<BuildOrder>42</BuildOrder>
 			<BuildOrder>23</BuildOrder>
 		</CppCompile>
-			<BuildConfiguration Include="Base">
+		<BuildConfiguration Include="Base">
 			<Key>Base</Key>
 		</BuildConfiguration>
-			<BuildConfiguration Include="Debug">
+		<BuildConfiguration Include="Debug">
 			<Key>Cfg_1</Key>
 			<CfgParent>Base</CfgParent>
 		</BuildConfiguration>
-			<BuildConfiguration Include="Release">
+		<BuildConfiguration Include="Release">
 			<Key>Cfg_2</Key>
 			<CfgParent>Base</CfgParent>
 		</BuildConfiguration>
-		</ItemGroup>
+	</ItemGroup>
 	<Import Condition="Exists('$(BDS)\Bin\CodeGear.Cpp.Targets')" Project="$(BDS)\Bin\CodeGear.Cpp.Targets"/>
 	<ProjectExtensions>
 		<Borland.Personality>CPlusPlusBuilder.Personality.12</Borland.Personality>
@@ -235,4 +235,4 @@
 		<ProjectFileVersion>12</ProjectFileVersion>
 	</ProjectExtensions>
 	<Import Condition="Exists('$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj')" Project="$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj"/>
-</Project>
+</Project>

source/ScpForms.cbproj

@@ -1,4 +1,4 @@
-	<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 	<PropertyGroup>
 		<ProjectGuid>{58677B04-A1B8-4709-A590-464869E7397E}</ProjectGuid>
 		<ProjectVersion>15.4</ProjectVersion>
@@ -23,330 +23,330 @@
 		<Base>true</Base>
 	</PropertyGroup>
 	<PropertyGroup Condition="'$(Base)'!=''">
-			<_TCHARMapping>wchar_t</_TCHARMapping>
-			<AllPackageLibs>vcl.lib;rtl.lib;Moje.lib;vclx.lib;DriveDir.lib;DragDropP.lib;tb2k.lib;tbxp.lib;bcbie.lib;PngComponents.lib;xmlrtl.lib;vclactnband.lib;vclimg.lib;vclie.lib</AllPackageLibs>
-			<BCC_AllWarnings>true</BCC_AllWarnings>
-			<BCC_ExtendedErrorInfo>true</BCC_ExtendedErrorInfo>
-			<BCC_OptimizeForSpeed>true</BCC_OptimizeForSpeed>
-			<BCC_wdiu>false</BCC_wdiu>
-			<DCC_CBuilderOutput>JPHNE</DCC_CBuilderOutput>
-			<DCC_Namespace>System;Xml;Data;Datasnap;Web;Soap;Vcl;$(DCC_Namespace)</DCC_Namespace>
-			<FinalOutputDir>$(INTERM_PATH)\$(Platform)\$(Config)</FinalOutputDir>
-			<IncludePath>windows\;forms\;core;components;resource;packages\filemng;packages\dragndrop;packages\my;packages\tb2k;packages\tbx;packages\png;packages\jcl;$(BDS)\include\windows;$(BDS)\include\windows\vcl;$(IncludePath)</IncludePath>
-			<IntermediateOutputDir>$(INTERM_PATH)\$(Platform)\$(Config)</IntermediateOutputDir>
-			<Manifest_File>None</Manifest_File>
-			<Multithreaded>true</Multithreaded>
-			<OutputExt>lib</OutputExt>
-			<PackageImports>vcl.bpi;rtl.bpi;vclx.bpi;DragDrop.bpi;Moje.bpi;DriveDir.bpi;$(PackageImports)</PackageImports>
-			<ProjectType>CppStaticLibrary</ProjectType>
-			<SanitizedProjectName>ScpForms</SanitizedProjectName>
-			<TLIB_PageSize>512</TLIB_PageSize>
-			<UsingDelphiRTL>true</UsingDelphiRTL>
-			<VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
-			<VerInfo_Locale>1033</VerInfo_Locale>
-		</PropertyGroup>
+		<_TCHARMapping>wchar_t</_TCHARMapping>
+		<AllPackageLibs>vcl.lib;rtl.lib;Moje.lib;vclx.lib;DriveDir.lib;DragDropP.lib;tb2k.lib;tbxp.lib;bcbie.lib;PngComponents.lib;xmlrtl.lib;vclactnband.lib;vclimg.lib;vclie.lib</AllPackageLibs>
+		<BCC_AllWarnings>true</BCC_AllWarnings>
+		<BCC_ExtendedErrorInfo>true</BCC_ExtendedErrorInfo>
+		<BCC_OptimizeForSpeed>true</BCC_OptimizeForSpeed>
+		<BCC_wdiu>false</BCC_wdiu>
+		<DCC_CBuilderOutput>JPHNE</DCC_CBuilderOutput>
+		<DCC_Namespace>System;Xml;Data;Datasnap;Web;Soap;Vcl;$(DCC_Namespace)</DCC_Namespace>
+		<FinalOutputDir>$(INTERM_PATH)\$(Platform)\$(Config)</FinalOutputDir>
+		<IncludePath>windows\;forms\;core;components;resource;packages\filemng;packages\dragndrop;packages\my;packages\tb2k;packages\tbx;packages\png;packages\jcl;$(BDS)\include\windows;$(BDS)\include\windows\vcl;$(IncludePath)</IncludePath>
+		<IntermediateOutputDir>$(INTERM_PATH)\$(Platform)\$(Config)</IntermediateOutputDir>
+		<Manifest_File>None</Manifest_File>
+		<Multithreaded>true</Multithreaded>
+		<OutputExt>lib</OutputExt>
+		<PackageImports>vcl.bpi;rtl.bpi;vclx.bpi;DragDrop.bpi;Moje.bpi;DriveDir.bpi;$(PackageImports)</PackageImports>
+		<ProjectType>CppStaticLibrary</ProjectType>
+		<SanitizedProjectName>ScpForms</SanitizedProjectName>
+		<TLIB_PageSize>512</TLIB_PageSize>
+		<UsingDelphiRTL>true</UsingDelphiRTL>
+		<VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
+		<VerInfo_Locale>1033</VerInfo_Locale>
+	</PropertyGroup>
 	<PropertyGroup Condition="'$(Cfg_1)'!=''">
-			<BCC_DebugLineNumbers>true</BCC_DebugLineNumbers>
-			<BCC_DisableOptimizations>true</BCC_DisableOptimizations>
-			<BCC_InlineFunctionExpansion>false</BCC_InlineFunctionExpansion>
-			<BCC_MonitorGlobalAndStackData>true</BCC_MonitorGlobalAndStackData>
-			<BCC_MonitorInlinePtrAccess>true</BCC_MonitorInlinePtrAccess>
-			<BCC_MonitorThis>true</BCC_MonitorThis>
-			<BCC_OptimizeForSpeed>false</BCC_OptimizeForSpeed>
-			<BCC_SourceDebuggingOn>true</BCC_SourceDebuggingOn>
-			<BCC_StackFrames>true</BCC_StackFrames>
-			<BCC_UseRegisterVariables>None</BCC_UseRegisterVariables>
-			<DCC_DebugInfoInExe>true</DCC_DebugInfoInExe>
-			<DCC_Define>DEBUG</DCC_Define>
-			<DCC_Optimize>false</DCC_Optimize>
-			<Defines>_DEBUG;$(Defines)</Defines>
-			<ILINK_FullDebugInfo>true</ILINK_FullDebugInfo>
-			<TASM_Debugging>Full</TASM_Debugging>
-			<TASM_DisplaySourceLines>true</TASM_DisplaySourceLines>
-		</PropertyGroup>
+		<BCC_DebugLineNumbers>true</BCC_DebugLineNumbers>
+		<BCC_DisableOptimizations>true</BCC_DisableOptimizations>
+		<BCC_InlineFunctionExpansion>false</BCC_InlineFunctionExpansion>
+		<BCC_MonitorGlobalAndStackData>true</BCC_MonitorGlobalAndStackData>
+		<BCC_MonitorInlinePtrAccess>true</BCC_MonitorInlinePtrAccess>
+		<BCC_MonitorThis>true</BCC_MonitorThis>
+		<BCC_OptimizeForSpeed>false</BCC_OptimizeForSpeed>
+		<BCC_SourceDebuggingOn>true</BCC_SourceDebuggingOn>
+		<BCC_StackFrames>true</BCC_StackFrames>
+		<BCC_UseRegisterVariables>None</BCC_UseRegisterVariables>
+		<DCC_DebugInfoInExe>true</DCC_DebugInfoInExe>
+		<DCC_Define>DEBUG</DCC_Define>
+		<DCC_Optimize>false</DCC_Optimize>
+		<Defines>_DEBUG;$(Defines)</Defines>
+		<ILINK_FullDebugInfo>true</ILINK_FullDebugInfo>
+		<TASM_Debugging>Full</TASM_Debugging>
+		<TASM_DisplaySourceLines>true</TASM_DisplaySourceLines>
+	</PropertyGroup>
 	<PropertyGroup Condition="'$(Cfg_2)'!=''">
-			<Defines>NDEBUG;$(Defines)</Defines>
-			<TASM_Debugging>None</TASM_Debugging>
-		</PropertyGroup>
+		<Defines>NDEBUG;$(Defines)</Defines>
+		<TASM_Debugging>None</TASM_Debugging>
+	</PropertyGroup>
 	<ItemGroup>
-			<CppCompile Include="forms\About.cpp">
+		<CppCompile Include="forms\About.cpp">
 			<BuildOrder>27</BuildOrder>
 			<Form>AboutDialog</Form>
 			<DependentOn>forms\About.h</DependentOn>
 			<BuildOrder>14</BuildOrder>
 		</CppCompile>
-			<FormResources Include="forms\About.dfm"/>
-			<CppCompile Include="forms\Authenticate.cpp">
+		<FormResources Include="forms\About.dfm"/>
+		<CppCompile Include="forms\Authenticate.cpp">
 			<BuildOrder>24</BuildOrder>
 			<Form>AuthenticateForm</Form>
 			<DependentOn>forms\Authenticate.h</DependentOn>
 			<BuildOrder>17</BuildOrder>
 		</CppCompile>
-			<FormResources Include="forms\Authenticate.dfm"/>
-			<CppCompile Include="forms\Cleanup.cpp">
+		<FormResources Include="forms\Authenticate.dfm"/>
+		<CppCompile Include="forms\Cleanup.cpp">
 			<BuildOrder>21</BuildOrder>
 			<Form>CleanupDialog</Form>
 			<DependentOn>forms\Cleanup.h</DependentOn>
 			<BuildOrder>20</BuildOrder>
 		</CppCompile>
-			<FormResources Include="forms\Cleanup.dfm"/>
-			<CppCompile Include="forms\Console.cpp">
+		<FormResources Include="forms\Cleanup.dfm"/>
+		<CppCompile Include="forms\Console.cpp">
 			<BuildOrder>23</BuildOrder>
 			<Form>ConsoleDialog</Form>
 			<DependentOn>forms\Console.h</DependentOn>
 			<BuildOrder>20</BuildOrder>
 		</CppCompile>
-			<FormResources Include="forms\Console.dfm"/>
-			<CppCompile Include="forms\Copy.cpp">
+		<FormResources Include="forms\Console.dfm"/>
+		<CppCompile Include="forms\Copy.cpp">
 			<BuildOrder>26</BuildOrder>
 			<Form>CopyDialog</Form>
 			<DependentOn>forms\Copy.h</DependentOn>
 			<BuildOrder>23</BuildOrder>
 		</CppCompile>
-			<FormResources Include="forms\Copy.dfm"/>
-			<CppCompile Include="forms\CopyParamCustom.cpp">
+		<FormResources Include="forms\Copy.dfm"/>
+		<CppCompile Include="forms\CopyParamCustom.cpp">
 			<BuildOrder>32</BuildOrder>
 			<Form>CopyParamCustomDialog</Form>
 			<DependentOn>forms\CopyParamCustom.h</DependentOn>
 			<BuildOrder>29</BuildOrder>
 		</CppCompile>
-			<FormResources Include="forms\CopyParamCustom.dfm"/>
-			<CppCompile Include="forms\CopyParamPreset.cpp">
+		<FormResources Include="forms\CopyParamCustom.dfm"/>
+		<CppCompile Include="forms\CopyParamPreset.cpp">
 			<BuildOrder>36</BuildOrder>
 			<Form>CopyParamPresetDialog</Form>
 			<DependentOn>forms\CopyParamPreset.h</DependentOn>
 			<BuildOrder>35</BuildOrder>
 		</CppCompile>
-			<FormResources Include="forms\CopyParamPreset.dfm"/>
-			<CppCompile Include="forms\CopyParams.cpp">
+		<FormResources Include="forms\CopyParamPreset.dfm"/>
+		<CppCompile Include="forms\CopyParams.cpp">
 			<BuildOrder>29</BuildOrder>
 			<Form>CopyParamsFrame</Form>
 			<DesignClass>TFrame</DesignClass>
 			<DependentOn>forms\CopyParams.h</DependentOn>
 			<BuildOrder>22</BuildOrder>
 		</CppCompile>
-			<FormResources Include="forms\CopyParams.dfm"/>
-			<CppCompile Include="forms\CreateDirectory.cpp">
+		<FormResources Include="forms\CopyParams.dfm"/>
+		<CppCompile Include="forms\CreateDirectory.cpp">
 			<BuildOrder>38</BuildOrder>
 			<Form>CreateDirectoryDialog</Form>
 			<DependentOn>forms\CreateDirectory.h</DependentOn>
 			<BuildOrder>35</BuildOrder>
 		</CppCompile>
-			<FormResources Include="forms\CreateDirectory.dfm"/>
-			<CppCompile Include="forms\Custom.cpp">
+		<FormResources Include="forms\CreateDirectory.dfm"/>
+		<CppCompile Include="forms\Custom.cpp">
 			<BuildOrder>44</BuildOrder>
 			<Form>CustomDialog</Form>
 			<DependentOn>forms\Custom.h</DependentOn>
 			<BuildOrder>37</BuildOrder>
 		</CppCompile>
-			<FormResources Include="forms\Custom.dfm"/>
-			<CppCompile Include="forms\CustomCommand.cpp">
+		<FormResources Include="forms\Custom.dfm"/>
+		<CppCompile Include="forms\CustomCommand.cpp">
 			<BuildOrder>41</BuildOrder>
 			<Form>CustomCommandDialog</Form>
 			<DependentOn>forms\CustomCommand.h</DependentOn>
 			<BuildOrder>38</BuildOrder>
 		</CppCompile>
-			<FormResources Include="forms\CustomCommand.dfm"/>
-			<CppCompile Include="forms\EditMask.cpp">
+		<FormResources Include="forms\CustomCommand.dfm"/>
+		<CppCompile Include="forms\EditMask.cpp">
 			<Form>EditMaskDialog</Form>
 			<DependentOn>forms\EditMask.h</DependentOn>
 			<BuildOrder>39</BuildOrder>
 		</CppCompile>
-			<FormResources Include="forms\EditMask.dfm"/>
-			<CppCompile Include="forms\Editor.cpp">
+		<FormResources Include="forms\EditMask.dfm"/>
+		<CppCompile Include="forms\Editor.cpp">
 			<BuildOrder>47</BuildOrder>
 			<Form>EditorForm</Form>
 			<DependentOn>forms\Editor.h</DependentOn>
 			<BuildOrder>34</BuildOrder>
 		</CppCompile>
-			<FormResources Include="forms\Editor.dfm"/>
-			<CppCompile Include="forms\EditorPreferences.cpp">
+		<FormResources Include="forms\Editor.dfm"/>
+		<CppCompile Include="forms\EditorPreferences.cpp">
 			<BuildOrder>50</BuildOrder>
 			<Form>EditorPreferencesDialog</Form>
 			<DependentOn>forms\EditorPreferences.h</DependentOn>
 			<BuildOrder>31</BuildOrder>
 		</CppCompile>
-			<FormResources Include="forms\EditorPreferences.dfm"/>
-			<CppCompile Include="forms\FileFind.cpp">
+		<FormResources Include="forms\EditorPreferences.dfm"/>
+		<CppCompile Include="forms\FileFind.cpp">
 			<BuildOrder>56</BuildOrder>
 			<Form>FileFindDialog</Form>
 			<DependentOn>forms\FileFind.h</DependentOn>
 			<BuildOrder>33</BuildOrder>
 		</CppCompile>
-			<FormResources Include="forms\FileFind.dfm"/>
-			<CppCompile Include="forms\FileSystemInfo.cpp">
+		<FormResources Include="forms\FileFind.dfm"/>
+		<CppCompile Include="forms\FileSystemInfo.cpp">
 			<BuildOrder>53</BuildOrder>
 			<Form>FileSystemInfoDialog</Form>
 			<DependentOn>forms\FileSystemInfo.h</DependentOn>
 			<BuildOrder>30</BuildOrder>
 		</CppCompile>
-			<FormResources Include="forms\FileSystemInfo.dfm"/>
-			<CppCompile Include="forms\FullSynchronize.cpp">
+		<FormResources Include="forms\FileSystemInfo.dfm"/>
+		<CppCompile Include="forms\FullSynchronize.cpp">
 			<BuildOrder>59</BuildOrder>
 			<Form>FullSynchronizeDialog</Form>
 			<DependentOn>forms\FullSynchronize.h</DependentOn>
 			<BuildOrder>32</BuildOrder>
 		</CppCompile>
-			<FormResources Include="forms\FullSynchronize.dfm"/>
-			<CppCompile Include="forms\GenerateUrl.cpp">
+		<FormResources Include="forms\FullSynchronize.dfm"/>
+		<CppCompile Include="forms\GenerateUrl.cpp">
 			<Form>GenerateUrlDialog</Form>
 			<FormType>dfm</FormType>
 			<DependentOn>forms\GenerateUrl.h</DependentOn>
 			<BuildOrder>38</BuildOrder>
 		</CppCompile>
-			<FormResources Include="forms\GenerateUrl.dfm"/>
-			<CppCompile Include="forms\ImportSessions.cpp">
+		<FormResources Include="forms\GenerateUrl.dfm"/>
+		<CppCompile Include="forms\ImportSessions.cpp">
 			<BuildOrder>68</BuildOrder>
 			<Form>ImportSessionsDialog</Form>
 			<DependentOn>forms\ImportSessions.h</DependentOn>
 			<BuildOrder>5</BuildOrder>
 		</CppCompile>
-			<FormResources Include="forms\ImportSessions.dfm"/>
-			<CppCompile Include="forms\InputDlg.cpp">
+		<FormResources Include="forms\ImportSessions.dfm"/>
+		<CppCompile Include="forms\InputDlg.cpp">
 			<BuildOrder>5</BuildOrder>
 			<BuildOrder>26</BuildOrder>
 		</CppCompile>
-			<CppCompile Include="forms\License.cpp">
+		<CppCompile Include="forms\License.cpp">
 			<BuildOrder>8</BuildOrder>
 			<Form>LicenseDialog</Form>
 			<DependentOn>forms\License.h</DependentOn>
 			<BuildOrder>71</BuildOrder>
 		</CppCompile>
-			<FormResources Include="forms\License.dfm"/>
-			<CppCompile Include="forms\LocationProfiles.cpp">
+		<FormResources Include="forms\License.dfm"/>
+		<CppCompile Include="forms\LocationProfiles.cpp">
 			<BuildOrder>74</BuildOrder>
 			<Form>LocationProfilesDialog</Form>
 			<DependentOn>forms\LocationProfiles.h</DependentOn>
 			<BuildOrder>7</BuildOrder>
 		</CppCompile>
-			<FormResources Include="forms\LocationProfiles.dfm"/>
-			<CppCompile Include="forms\Log.cpp">
+		<FormResources Include="forms\LocationProfiles.dfm"/>
+		<CppCompile Include="forms\Log.cpp">
 			<BuildOrder>77</BuildOrder>
 			<Form>LogForm</Form>
 			<DependentOn>forms\Log.h</DependentOn>
 			<BuildOrder>4</BuildOrder>
 		</CppCompile>
-			<FormResources Include="forms\Log.dfm"/>
-			<CppCompile Include="forms\Login.cpp">
+		<FormResources Include="forms\Log.dfm"/>
+		<CppCompile Include="forms\Login.cpp">
 			<BuildOrder>80</BuildOrder>
 			<Form>LoginDialog</Form>
 			<DependentOn>forms\Login.h</DependentOn>
 			<BuildOrder>1</BuildOrder>
 		</CppCompile>
-			<FormResources Include="forms\Login.dfm"/>
-			<CppCompile Include="forms\MessageDlg.cpp">
+		<FormResources Include="forms\Login.dfm"/>
+		<CppCompile Include="forms\MessageDlg.cpp">
 			<BuildOrder>8</BuildOrder>
 			<BuildOrder>25</BuildOrder>
 		</CppCompile>
-			<CppCompile Include="forms\OpenDirectory.cpp">
+		<CppCompile Include="forms\OpenDirectory.cpp">
 			<BuildOrder>86</BuildOrder>
 			<Form>OpenDirectoryDialog</Form>
 			<DependentOn>forms\OpenDirectory.h</DependentOn>
 			<BuildOrder>3</BuildOrder>
 		</CppCompile>
-			<FormResources Include="forms\OpenDirectory.dfm"/>
-			<CppCompile Include="forms\Preferences.cpp">
+		<FormResources Include="forms\OpenDirectory.dfm"/>
+		<CppCompile Include="forms\Preferences.cpp">
 			<BuildOrder>89</BuildOrder>
 			<Form>PreferencesDialog</Form>
 			<DependentOn>forms\Preferences.h</DependentOn>
 			<BuildOrder>2</BuildOrder>
 		</CppCompile>
-			<FormResources Include="forms\Preferences.dfm"/>
-			<CppCompile Include="forms\Progress.cpp">
+		<FormResources Include="forms\Preferences.dfm"/>
+		<CppCompile Include="forms\Progress.cpp">
 			<BuildOrder>92</BuildOrder>
 			<Form>ProgressForm</Form>
 			<DependentOn>forms\Progress.h</DependentOn>
 			<BuildOrder>9</BuildOrder>
 		</CppCompile>
-			<FormResources Include="forms\Progress.dfm"/>
-			<CppCompile Include="forms\Properties.cpp">
+		<FormResources Include="forms\Progress.dfm"/>
+		<CppCompile Include="forms\Properties.cpp">
 			<BuildOrder>95</BuildOrder>
 			<Form>PropertiesDialog</Form>
 			<DependentOn>forms\Properties.h</DependentOn>
 			<BuildOrder>16</BuildOrder>
 		</CppCompile>
-			<FormResources Include="forms\Properties.dfm"/>
-			<CppCompile Include="forms\RemoteTransfer.cpp">
+		<FormResources Include="forms\Properties.dfm"/>
+		<CppCompile Include="forms\RemoteTransfer.cpp">
 			<BuildOrder>98</BuildOrder>
 			<Form>RemoteTransferDialog</Form>
 			<DependentOn>forms\RemoteTransfer.h</DependentOn>
 			<BuildOrder>15</BuildOrder>
 		</CppCompile>
-			<FormResources Include="forms\RemoteTransfer.dfm"/>
-			<CppCompile Include="forms\Rights.cpp">
+		<FormResources Include="forms\RemoteTransfer.dfm"/>
+		<CppCompile Include="forms\Rights.cpp">
 			<BuildOrder>18</BuildOrder>
 			<Form>RightsFrame</Form>
 			<DesignClass>TFrame</DesignClass>
 			<DependentOn>forms\Rights.h</DependentOn>
 			<BuildOrder>101</BuildOrder>
 		</CppCompile>
-			<FormResources Include="forms\Rights.dfm"/>
-			<CppCompile Include="forms\RightsExt.cpp">
+		<FormResources Include="forms\Rights.dfm"/>
+		<CppCompile Include="forms\RightsExt.cpp">
 			<BuildOrder>17</BuildOrder>
 			<Form>RightsExtFrame</Form>
 			<DesignClass>TFrame</DesignClass>
 			<DependentOn>forms\RightsExt.h</DependentOn>
 			<BuildOrder>104</BuildOrder>
 		</CppCompile>
-			<FormResources Include="forms\RightsExt.dfm"/>
-			<CppCompile Include="forms\SelectMask.cpp">
+		<FormResources Include="forms\RightsExt.dfm"/>
+		<CppCompile Include="forms\SelectMask.cpp">
 			<BuildOrder>14</BuildOrder>
 			<Form>SelectMaskDialog</Form>
 			<DependentOn>forms\SelectMask.h</DependentOn>
 			<BuildOrder>107</BuildOrder>
 		</CppCompile>
-			<FormResources Include="forms\SelectMask.dfm"/>
-			<CppCompile Include="forms\SiteAdvanced.cpp">
+		<FormResources Include="forms\SelectMask.dfm"/>
+		<CppCompile Include="forms\SiteAdvanced.cpp">
 			<BuildOrder>80</BuildOrder>
 			<Form>SiteAdvancedDialog</Form>
 			<DependentOn>forms\SiteAdvanced.h</DependentOn>
 			<BuildOrder>1</BuildOrder>
 		</CppCompile>
-			<FormResources Include="forms\SiteAdvanced.dfm"/>
-			<CppCompile Include="forms\Symlink.cpp">
+		<FormResources Include="forms\SiteAdvanced.dfm"/>
+		<CppCompile Include="forms\Symlink.cpp">
 			<BuildOrder>110</BuildOrder>
 			<Form>SymlinkDialog</Form>
 			<DependentOn>forms\Symlink.h</DependentOn>
 			<BuildOrder>11</BuildOrder>
 		</CppCompile>
-			<FormResources Include="forms\Symlink.dfm"/>
-			<CppCompile Include="forms\Synchronize.cpp">
+		<FormResources Include="forms\Symlink.dfm"/>
+		<CppCompile Include="forms\Synchronize.cpp">
 			<BuildOrder>113</BuildOrder>
 			<Form>SynchronizeDialog</Form>
 			<DependentOn>forms\Synchronize.h</DependentOn>
 			<BuildOrder>10</BuildOrder>
 		</CppCompile>
-			<FormResources Include="forms\Synchronize.dfm"/>
-			<CppCompile Include="forms\SynchronizeChecklist.cpp">
+		<FormResources Include="forms\Synchronize.dfm"/>
+		<CppCompile Include="forms\SynchronizeChecklist.cpp">
 			<BuildOrder>13</BuildOrder>
 			<Form>SynchronizeChecklistDialog</Form>
 			<DependentOn>forms\SynchronizeChecklist.h</DependentOn>
 			<BuildOrder>116</BuildOrder>
 		</CppCompile>
-			<FormResources Include="forms\SynchronizeChecklist.dfm"/>
-			<CppCompile Include="forms\SynchronizeProgress.cpp">
+		<FormResources Include="forms\SynchronizeChecklist.dfm"/>
+		<CppCompile Include="forms\SynchronizeProgress.cpp">
 			<BuildOrder>12</BuildOrder>
 			<Form>SynchronizeProgressForm</Form>
 			<DependentOn>forms\SynchronizeProgress.h</DependentOn>
 			<BuildOrder>119</BuildOrder>
 		</CppCompile>
-			<FormResources Include="forms\SynchronizeProgress.dfm"/>
-			<CppCompile Include="windows\VCLCommon.cpp">
+		<FormResources Include="forms\SynchronizeProgress.dfm"/>
+		<CppCompile Include="windows\VCLCommon.cpp">
 			<BuildOrder>28</BuildOrder>
 			<BuildOrder>11</BuildOrder>
 		</CppCompile>
-			<BuildConfiguration Include="Base">
+		<BuildConfiguration Include="Base">
 			<Key>Base</Key>
 		</BuildConfiguration>
-			<BuildConfiguration Include="Debug">
+		<BuildConfiguration Include="Debug">
 			<Key>Cfg_1</Key>
 			<CfgParent>Base</CfgParent>
 		</BuildConfiguration>
-			<BuildConfiguration Include="Release">
+		<BuildConfiguration Include="Release">
 			<Key>Cfg_2</Key>
 			<CfgParent>Base</CfgParent>
 		</BuildConfiguration>
-		</ItemGroup>
+	</ItemGroup>
 	<Import Condition="Exists('$(BDS)\Bin\CodeGear.Cpp.Targets')" Project="$(BDS)\Bin\CodeGear.Cpp.Targets"/>
 	<ProjectExtensions>
 		<Borland.Personality>CPlusPlusBuilder.Personality.12</Borland.Personality>
@@ -368,4 +368,4 @@
 		<ProjectFileVersion>12</ProjectFileVersion>
 	</ProjectExtensions>
 	<Import Condition="Exists('$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj')" Project="$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj"/>
-</Project>
+</Project>

source/ScpResources.cbproj

@@ -1,4 +1,4 @@
-	<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 	<PropertyGroup>
 		<ProjectGuid>{F3609D87-2D06-465B-8878-353EAF3E894F}</ProjectGuid>
 		<ProjectVersion>15.4</ProjectVersion>
@@ -23,130 +23,130 @@
 		<Base>true</Base>
 	</PropertyGroup>
 	<PropertyGroup Condition="'$(Base)'!=''">
-			<_TCHARMapping>wchar_t</_TCHARMapping>
-			<BCC_AllWarnings>true</BCC_AllWarnings>
-			<BCC_ExtendedErrorInfo>true</BCC_ExtendedErrorInfo>
-			<BCC_OptimizeForSpeed>true</BCC_OptimizeForSpeed>
-			<DCC_CBuilderOutput>JPHNE</DCC_CBuilderOutput>
-			<DCC_Namespace>System;Xml;Data;Datasnap;Web;Soap;$(DCC_Namespace)</DCC_Namespace>
-			<FinalOutputDir>$(INTERM_PATH)\$(Platform)\$(Config)</FinalOutputDir>
-			<IncludePath>core\;forms\;windows\;packages\png;packages\tb2k;packages\tbx;$(BDS)\include\windows;$(BDS)\include\windows\vcl;$(IncludePath)</IncludePath>
-			<IntermediateOutputDir>$(INTERM_PATH)\$(Platform)\$(Config)</IntermediateOutputDir>
-			<Manifest_File>None</Manifest_File>
-			<Multithreaded>true</Multithreaded>
-			<ProjectType>CppStaticLibrary</ProjectType>
-			<SanitizedProjectName>ScpResources</SanitizedProjectName>
-			<TLIB_PageSize>64</TLIB_PageSize>
-			<VerInfo_Locale>1033</VerInfo_Locale>
-		</PropertyGroup>
+		<_TCHARMapping>wchar_t</_TCHARMapping>
+		<BCC_AllWarnings>true</BCC_AllWarnings>
+		<BCC_ExtendedErrorInfo>true</BCC_ExtendedErrorInfo>
+		<BCC_OptimizeForSpeed>true</BCC_OptimizeForSpeed>
+		<DCC_CBuilderOutput>JPHNE</DCC_CBuilderOutput>
+		<DCC_Namespace>System;Xml;Data;Datasnap;Web;Soap;$(DCC_Namespace)</DCC_Namespace>
+		<FinalOutputDir>$(INTERM_PATH)\$(Platform)\$(Config)</FinalOutputDir>
+		<IncludePath>core\;forms\;windows\;packages\png;packages\tb2k;packages\tbx;$(BDS)\include\windows;$(BDS)\include\windows\vcl;$(IncludePath)</IncludePath>
+		<IntermediateOutputDir>$(INTERM_PATH)\$(Platform)\$(Config)</IntermediateOutputDir>
+		<Manifest_File>None</Manifest_File>
+		<Multithreaded>true</Multithreaded>
+		<ProjectType>CppStaticLibrary</ProjectType>
+		<SanitizedProjectName>ScpResources</SanitizedProjectName>
+		<TLIB_PageSize>64</TLIB_PageSize>
+		<VerInfo_Locale>1033</VerInfo_Locale>
+	</PropertyGroup>
 	<PropertyGroup Condition="'$(Cfg_1)'!=''">
-			<BCC_DebugLineNumbers>true</BCC_DebugLineNumbers>
-			<BCC_DisableOptimizations>true</BCC_DisableOptimizations>
-			<BCC_InlineFunctionExpansion>false</BCC_InlineFunctionExpansion>
-			<BCC_MonitorGlobalAndStackData>true</BCC_MonitorGlobalAndStackData>
-			<BCC_MonitorInlinePtrAccess>true</BCC_MonitorInlinePtrAccess>
-			<BCC_MonitorThis>true</BCC_MonitorThis>
-			<BCC_OptimizeForSpeed>false</BCC_OptimizeForSpeed>
-			<BCC_SourceDebuggingOn>true</BCC_SourceDebuggingOn>
-			<BCC_StackFrames>true</BCC_StackFrames>
-			<BCC_UseRegisterVariables>None</BCC_UseRegisterVariables>
-			<DCC_DebugInfoInExe>true</DCC_DebugInfoInExe>
-			<DCC_Define>DEBUG</DCC_Define>
-			<DCC_Optimize>false</DCC_Optimize>
-			<Defines>_DEBUG;$(Defines)</Defines>
-			<ILINK_FullDebugInfo>true</ILINK_FullDebugInfo>
-			<TASM_Debugging>Full</TASM_Debugging>
-			<TASM_DisplaySourceLines>true</TASM_DisplaySourceLines>
-		</PropertyGroup>
+		<BCC_DebugLineNumbers>true</BCC_DebugLineNumbers>
+		<BCC_DisableOptimizations>true</BCC_DisableOptimizations>
+		<BCC_InlineFunctionExpansion>false</BCC_InlineFunctionExpansion>
+		<BCC_MonitorGlobalAndStackData>true</BCC_MonitorGlobalAndStackData>
+		<BCC_MonitorInlinePtrAccess>true</BCC_MonitorInlinePtrAccess>
+		<BCC_MonitorThis>true</BCC_MonitorThis>
+		<BCC_OptimizeForSpeed>false</BCC_OptimizeForSpeed>
+		<BCC_SourceDebuggingOn>true</BCC_SourceDebuggingOn>
+		<BCC_StackFrames>true</BCC_StackFrames>
+		<BCC_UseRegisterVariables>None</BCC_UseRegisterVariables>
+		<DCC_DebugInfoInExe>true</DCC_DebugInfoInExe>
+		<DCC_Define>DEBUG</DCC_Define>
+		<DCC_Optimize>false</DCC_Optimize>
+		<Defines>_DEBUG;$(Defines)</Defines>
+		<ILINK_FullDebugInfo>true</ILINK_FullDebugInfo>
+		<TASM_Debugging>Full</TASM_Debugging>
+		<TASM_DisplaySourceLines>true</TASM_DisplaySourceLines>
+	</PropertyGroup>
 	<PropertyGroup Condition="'$(Cfg_2)'!=''">
-			<Defines>NDEBUG;$(Defines)</Defines>
-			<TASM_Debugging>None</TASM_Debugging>
-		</PropertyGroup>
+		<Defines>NDEBUG;$(Defines)</Defines>
+		<TASM_Debugging>None</TASM_Debugging>
+	</PropertyGroup>
 	<ItemGroup>
-			<CppCompile Include="forms\Animations.cpp">
+		<CppCompile Include="forms\Animations.cpp">
 			<Form>AnimationsModule</Form>
 			<FormType>dfm</FormType>
 			<DesignClass>TDataModule</DesignClass>
 			<DependentOn>forms\Animations.h</DependentOn>
 			<BuildOrder>1</BuildOrder>
 		</CppCompile>
-			<FormResources Include="forms\Animations.dfm"/>
-			<CppCompile Include="forms\Animations120.cpp">
+		<FormResources Include="forms\Animations.dfm"/>
+		<CppCompile Include="forms\Animations120.cpp">
 			<Form>Animations120Module</Form>
 			<FormType>dfm</FormType>
 			<DesignClass>TDataModule</DesignClass>
 			<DependentOn>forms\Animations120.h</DependentOn>
 			<BuildOrder>3</BuildOrder>
 		</CppCompile>
-			<FormResources Include="forms\Animations120.dfm"/>
-			<CppCompile Include="forms\Animations144.cpp">
+		<FormResources Include="forms\Animations120.dfm"/>
+		<CppCompile Include="forms\Animations144.cpp">
 			<Form>Animations144Module</Form>
 			<FormType>dfm</FormType>
 			<DesignClass>TDataModule</DesignClass>
 			<DependentOn>forms\Animations144.h</DependentOn>
 			<BuildOrder>2</BuildOrder>
 		</CppCompile>
-			<FormResources Include="forms\Animations144.dfm"/>
-			<CppCompile Include="forms\Animations192.cpp">
+		<FormResources Include="forms\Animations144.dfm"/>
+		<CppCompile Include="forms\Animations192.cpp">
 			<Form>Animations192Module</Form>
 			<FormType>dfm</FormType>
 			<DesignClass>TDataModule</DesignClass>
 			<DependentOn>forms\Animations192.h</DependentOn>
 			<BuildOrder>8</BuildOrder>
 		</CppCompile>
-			<FormResources Include="forms\Animations192.dfm"/>
-			<CppCompile Include="forms\Animations96.cpp">
+		<FormResources Include="forms\Animations192.dfm"/>
+		<CppCompile Include="forms\Animations96.cpp">
 			<Form>Animations96Module</Form>
 			<FormType>dfm</FormType>
 			<DesignClass>TDataModule</DesignClass>
 			<DependentOn>forms\Animations96.h</DependentOn>
 			<BuildOrder>5</BuildOrder>
 		</CppCompile>
-			<FormResources Include="forms\Animations96.dfm"/>
-			<CppCompile Include="forms\Glyphs.cpp">
+		<FormResources Include="forms\Animations96.dfm"/>
+		<CppCompile Include="forms\Glyphs.cpp">
 			<Form>GlyphsModule</Form>
 			<FormType>dfm</FormType>
 			<DesignClass>TDataModule</DesignClass>
 			<DependentOn>forms\Glyphs.h</DependentOn>
 			<BuildOrder>0</BuildOrder>
 		</CppCompile>
-			<FormResources Include="forms\Glyphs.dfm"/>
-			<CppCompile Include="forms\Glyphs120.cpp">
+		<FormResources Include="forms\Glyphs.dfm"/>
+		<CppCompile Include="forms\Glyphs120.cpp">
 			<Form>Glyphs120Module</Form>
 			<FormType>dfm</FormType>
 			<DesignClass>TDataModule</DesignClass>
 			<DependentOn>forms\Glyphs120.h</DependentOn>
 			<BuildOrder>7</BuildOrder>
 		</CppCompile>
-			<FormResources Include="forms\Glyphs120.dfm"/>
-			<CppCompile Include="forms\Glyphs144.cpp">
+		<FormResources Include="forms\Glyphs120.dfm"/>
+		<CppCompile Include="forms\Glyphs144.cpp">
 			<Form>Glyphs144Module</Form>
 			<FormType>dfm</FormType>
 			<DesignClass>TDataModule</DesignClass>
 			<DependentOn>forms\Glyphs144.h</DependentOn>
 			<BuildOrder>8</BuildOrder>
 		</CppCompile>
-			<FormResources Include="forms\Glyphs144.dfm"/>
-			<CppCompile Include="forms\Glyphs192.cpp">
+		<FormResources Include="forms\Glyphs144.dfm"/>
+		<CppCompile Include="forms\Glyphs192.cpp">
 			<Form>Glyphs192Module</Form>
 			<FormType>dfm</FormType>
 			<DesignClass>TDataModule</DesignClass>
 			<DependentOn>forms\Glyphs192.h</DependentOn>
 			<BuildOrder>9</BuildOrder>
 		</CppCompile>
-			<FormResources Include="forms\Glyphs192.dfm"/>
-			<BuildConfiguration Include="Base">
+		<FormResources Include="forms\Glyphs192.dfm"/>
+		<BuildConfiguration Include="Base">
 			<Key>Base</Key>
 		</BuildConfiguration>
-			<BuildConfiguration Include="Debug">
+		<BuildConfiguration Include="Debug">
 			<Key>Cfg_1</Key>
 			<CfgParent>Base</CfgParent>
 		</BuildConfiguration>
-			<BuildConfiguration Include="Release">
+		<BuildConfiguration Include="Release">
 			<Key>Cfg_2</Key>
 			<CfgParent>Base</CfgParent>
 		</BuildConfiguration>
-		</ItemGroup>
+	</ItemGroup>
 	<Import Condition="Exists('$(BDS)\Bin\CodeGear.Cpp.Targets')" Project="$(BDS)\Bin\CodeGear.Cpp.Targets"/>
 	<ProjectExtensions>
 		<Borland.Personality>CPlusPlusBuilder.Personality.12</Borland.Personality>
@@ -168,4 +168,4 @@
 		<ProjectFileVersion>12</ProjectFileVersion>
 	</ProjectExtensions>
 	<Import Condition="Exists('$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj')" Project="$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj"/>
-</Project>
+</Project>

source/WinSCP.cbproj

@@ -1,4 +1,4 @@
-	<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 	<PropertyGroup>
 		<ProjectGuid>{0B0C5EC6-5DCB-4F16-9504-1E6D37FFBB77}</ProjectGuid>
 		<ProjectVersion>15.4</ProjectVersion>
@@ -48,239 +48,238 @@
 		<Base>true</Base>
 	</PropertyGroup>
 	<PropertyGroup Condition="'$(Base)'!=''">
-			<_TCHARMapping>wchar_t</_TCHARMapping>
-			<AllPackageLibs>vcl.lib;rtl.lib;vclx.lib;ws2_32.lib;secur32.lib;Moje.lib;DriveDir.lib;DragDropP.lib;tb2k.lib;tbxp.lib;bcbie.lib;Crypt32.lib;PngComponents.lib;xmlrtl.lib;vclactnband.lib;vclimg.lib;winhttp.lib;jcl.lib;vclie.lib;urlmon.lib;shlwapi.lib;powrprof.lib;soaprtl.lib;fmx.lib</AllPackageLibs>
-			<BCC_AllWarnings>true</BCC_AllWarnings>
-			<BCC_ExtendedErrorInfo>true</BCC_ExtendedErrorInfo>
-			<BCC_OptimizeForSpeed>true</BCC_OptimizeForSpeed>
-			<BCC_wdiu>false</BCC_wdiu>
-			<BRCC_CodePage>65001</BRCC_CodePage>
-			<DCC_CBuilderOutput>JPHNE</DCC_CBuilderOutput>
-			<DCC_Namespace>Vcl;Vcl.Imaging;Vcl.Touch;Vcl.Samples;Vcl.Shell;System;Xml;Data;Datasnap;Web;Soap;Vcl;$(DCC_Namespace)</DCC_Namespace>
-			<DCC_SYMBOL_DEPRECATED>false</DCC_SYMBOL_DEPRECATED>
-			<DCC_SYMBOL_PLATFORM>false</DCC_SYMBOL_PLATFORM>
-			<DCC_UNSUPPORTED_CONSTRUCT>false</DCC_UNSUPPORTED_CONSTRUCT>
-			<Defines>IDE;STRICT;$(Defines)</Defines>
-			<FinalOutputDir>$(FINAL_PATH)\$(Platform)\$(Config)</FinalOutputDir>
-			<Icon_MainIcon>resource\Application.ico</Icon_MainIcon>
-			<ILINK_GenerateDRC>true</ILINK_GenerateDRC>
-			<ILINK_LibraryPath>windows\;forms\;packages\filemng;packages\tbx;packages\png;..\libs\lib;$(LIB_PATH);$(ILINK_LibraryPath)</ILINK_LibraryPath>
-			<ILINK_MapFileType>DetailedSegments</ILINK_MapFileType>
-			<IncludePath>console;windows\;forms\;core;resource;components;dragext;packages\filemng;packages\dragndrop;packages\my;packages\tb2k;packages\tbx;packages\png;packages\jcl;$(BDS)\include\mfc;$(BDS)\include\windows;$(BDS)\include\windows\sdk;$(BDS)\include\windows\vcl;$(IncludePath)</IncludePath>
-			<IntermediateOutputDir>$(INTERM_PATH)\$(Platform)\$(Config)</IntermediateOutputDir>
-			<LinkPackageStatics>vcl.lib;rtl.lib;vclx.lib;ws2_32.lib;secur32.lib;Moje.lib;DriveDir.lib;DragDropP.lib;tb2k.lib;tbxp.lib;bcbie.lib;Crypt32.lib;PngComponents.lib;xmlrtl.lib;vclactnband.lib;vclimg.lib;winhttp.lib;jcl.lib;vclie.lib;urlmon.lib;shlwapi.lib;powrprof.lib;soaprtl.lib</LinkPackageStatics>
-			<Manifest_File>windows\WinSCP.exe.manifest</Manifest_File>
-			<Multithreaded>true</Multithreaded>
-			<OutputExt>exe</OutputExt>
-			<ProjectType>CppVCLApplication</ProjectType>
-			<SanitizedProjectName>WinSCP</SanitizedProjectName>
-			<UsingDelphiRTL>true</UsingDelphiRTL>
-			<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
-			<VerInfo_Keys>CompanyName=Martin Prikryl;FileDescription=WinSCP: SFTP, FTP, WebDAV and SCP client;FileVersion=5.8.1.0;InternalName=winscp;LegalCopyright=(c) 2000-2018 Martin Prikryl;LegalTrademarks=;OriginalFilename=winscp.exe;ProductName=WinSCP;ProductVersion=5.8.1.0;ReleaseType=stable;WWW=http://winscp.net/</VerInfo_Keys>
-			<VerInfo_Locale>1033</VerInfo_Locale>
-			<VerInfo_MajorVer>5</VerInfo_MajorVer>
-			<VerInfo_MinorVer>8</VerInfo_MinorVer>
-			<VerInfo_Release>1</VerInfo_Release>
-		</PropertyGroup>
+		<_TCHARMapping>wchar_t</_TCHARMapping>
+		<AllPackageLibs>vcl.lib;rtl.lib;vclx.lib;ws2_32.lib;secur32.lib;Moje.lib;DriveDir.lib;DragDropP.lib;tb2k.lib;tbxp.lib;bcbie.lib;Crypt32.lib;PngComponents.lib;xmlrtl.lib;vclactnband.lib;vclimg.lib;winhttp.lib;jcl.lib;vclie.lib;urlmon.lib;shlwapi.lib;powrprof.lib;soaprtl.lib;fmx.lib</AllPackageLibs>
+		<BCC_AllWarnings>true</BCC_AllWarnings>
+		<BCC_ExtendedErrorInfo>true</BCC_ExtendedErrorInfo>
+		<BCC_OptimizeForSpeed>true</BCC_OptimizeForSpeed>
+		<BCC_wdiu>false</BCC_wdiu>
+		<BRCC_CodePage>65001</BRCC_CodePage>
+		<DCC_CBuilderOutput>JPHNE</DCC_CBuilderOutput>
+		<DCC_Namespace>Vcl;Vcl.Imaging;Vcl.Touch;Vcl.Samples;Vcl.Shell;System;Xml;Data;Datasnap;Web;Soap;Vcl;$(DCC_Namespace)</DCC_Namespace>
+		<DCC_SYMBOL_DEPRECATED>false</DCC_SYMBOL_DEPRECATED>
+		<DCC_SYMBOL_PLATFORM>false</DCC_SYMBOL_PLATFORM>
+		<DCC_UNSUPPORTED_CONSTRUCT>false</DCC_UNSUPPORTED_CONSTRUCT>
+		<Defines>IDE;STRICT;$(Defines)</Defines>
+		<FinalOutputDir>$(FINAL_PATH)\$(Platform)\$(Config)</FinalOutputDir>
+		<Icon_MainIcon>resource\Application.ico</Icon_MainIcon>
+		<ILINK_GenerateDRC>true</ILINK_GenerateDRC>
+		<ILINK_LibraryPath>windows\;forms\;packages\filemng;packages\tbx;packages\png;..\libs\lib;$(LIB_PATH);$(ILINK_LibraryPath)</ILINK_LibraryPath>
+		<ILINK_MapFileType>DetailedSegments</ILINK_MapFileType>
+		<IncludePath>console;windows\;forms\;core;resource;components;dragext;packages\filemng;packages\dragndrop;packages\my;packages\tb2k;packages\tbx;packages\png;packages\jcl;$(BDS)\include\mfc;$(BDS)\include\windows;$(BDS)\include\windows\sdk;$(BDS)\include\windows\vcl;$(IncludePath)</IncludePath>
+		<IntermediateOutputDir>$(INTERM_PATH)\$(Platform)\$(Config)</IntermediateOutputDir>
+		<LinkPackageStatics>vcl.lib;rtl.lib;vclx.lib;ws2_32.lib;secur32.lib;Moje.lib;DriveDir.lib;DragDropP.lib;tb2k.lib;tbxp.lib;bcbie.lib;Crypt32.lib;PngComponents.lib;xmlrtl.lib;vclactnband.lib;vclimg.lib;winhttp.lib;jcl.lib;vclie.lib;urlmon.lib;shlwapi.lib;powrprof.lib;soaprtl.lib</LinkPackageStatics>
+		<Manifest_File>windows\WinSCP.exe.manifest</Manifest_File>
+		<Multithreaded>true</Multithreaded>
+		<OutputExt>exe</OutputExt>
+		<ProjectType>CppVCLApplication</ProjectType>
+		<SanitizedProjectName>WinSCP</SanitizedProjectName>
+		<UsingDelphiRTL>true</UsingDelphiRTL>
+		<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
+		<VerInfo_Keys>CompanyName=Martin Prikryl;FileDescription=WinSCP: SFTP, FTP, WebDAV and SCP client;FileVersion=5.8.1.0;InternalName=winscp;LegalCopyright=(c) 2000-2018 Martin Prikryl;LegalTrademarks=;OriginalFilename=winscp.exe;ProductName=WinSCP;ProductVersion=5.8.1.0;ReleaseType=stable;WWW=http://winscp.net/</VerInfo_Keys>
+		<VerInfo_Locale>1033</VerInfo_Locale>
+		<VerInfo_MajorVer>5</VerInfo_MajorVer>
+		<VerInfo_MinorVer>8</VerInfo_MinorVer>
+		<VerInfo_Release>1</VerInfo_Release>
+	</PropertyGroup>
 	<PropertyGroup Condition="'$(Cfg_1)'!=''">
-			<BCC_AllCodeguardOptions>true</BCC_AllCodeguardOptions>
-			<BCC_DebugLineNumbers>true</BCC_DebugLineNumbers>
-			<BCC_DisableOptimizations>true</BCC_DisableOptimizations>
-			<BCC_InlineFunctionExpansion>false</BCC_InlineFunctionExpansion>
-			<BCC_MonitorGlobalAndStackData>true</BCC_MonitorGlobalAndStackData>
-			<BCC_MonitorInlinePtrAccess>true</BCC_MonitorInlinePtrAccess>
-			<BCC_MonitorThis>true</BCC_MonitorThis>
-			<BCC_OptimizeForSpeed>false</BCC_OptimizeForSpeed>
-			<BCC_SourceDebuggingOn>true</BCC_SourceDebuggingOn>
-			<BCC_StackFrames>true</BCC_StackFrames>
-			<BCC_UseRegisterVariables>None</BCC_UseRegisterVariables>
-			<DCC_DebugDCUs>true</DCC_DebugDCUs>
-			<DCC_DebugInfoInExe>true</DCC_DebugInfoInExe>
-			<DCC_Define>DEBUG</DCC_Define>
-			<DCC_Optimize>false</DCC_Optimize>
-			<Debugger_DebugSourcePath>packages\my;packages\filemng;packages\jcl;..\libs\openssl\crypto\bio;..\libs\openssl\ssl;..\libs\openssl\crypto\stack;..\libs\openssl\crypto\x509;..\libs\openssl\crypto\evp;..\libs\openssl\crypto\pkcs12;..\libs\openssl\crypto\pem;..\libs\openssl\crypto\asn1;..\libs\openssl\crypto\err;..\libs\neon\src;$(Debugger_DebugSourcePath)</Debugger_DebugSourcePath>
-			<Defines>_DEBUG;$(Defines)</Defines>
-			<ILINK_FullDebugInfo>true</ILINK_FullDebugInfo>
-			<TASM_Debugging>Full</TASM_Debugging>
-			<TASM_DisplaySourceLines>true</TASM_DisplaySourceLines>
-		</PropertyGroup>
+		<BCC_AllCodeguardOptions>true</BCC_AllCodeguardOptions>
+		<BCC_DebugLineNumbers>true</BCC_DebugLineNumbers>
+		<BCC_DisableOptimizations>true</BCC_DisableOptimizations>
+		<BCC_InlineFunctionExpansion>false</BCC_InlineFunctionExpansion>
+		<BCC_MonitorGlobalAndStackData>true</BCC_MonitorGlobalAndStackData>
+		<BCC_MonitorInlinePtrAccess>true</BCC_MonitorInlinePtrAccess>
+		<BCC_MonitorThis>true</BCC_MonitorThis>
+		<BCC_OptimizeForSpeed>false</BCC_OptimizeForSpeed>
+		<BCC_SourceDebuggingOn>true</BCC_SourceDebuggingOn>
+		<BCC_StackFrames>true</BCC_StackFrames>
+		<BCC_UseRegisterVariables>None</BCC_UseRegisterVariables>
+		<DCC_DebugDCUs>true</DCC_DebugDCUs>
+		<DCC_DebugInfoInExe>true</DCC_DebugInfoInExe>
+		<DCC_Define>DEBUG</DCC_Define>
+		<DCC_Optimize>false</DCC_Optimize>
+		<Debugger_DebugSourcePath>packages\my;packages\filemng;packages\jcl;..\libs\openssl\crypto\bio;..\libs\openssl\ssl;..\libs\openssl\crypto\stack;..\libs\openssl\crypto\x509;..\libs\openssl\crypto\evp;..\libs\openssl\crypto\pkcs12;..\libs\openssl\crypto\pem;..\libs\openssl\crypto\asn1;..\libs\openssl\crypto\err;..\libs\neon\src;$(Debugger_DebugSourcePath)</Debugger_DebugSourcePath>
+		<Defines>_DEBUG;$(Defines)</Defines>
+		<ILINK_FullDebugInfo>true</ILINK_FullDebugInfo>
+		<TASM_Debugging>Full</TASM_Debugging>
+		<TASM_DisplaySourceLines>true</TASM_DisplaySourceLines>
+	</PropertyGroup>
 	<PropertyGroup Condition="'$(Cfg_1_Win32)'!=''">
-			<ILINK_DisableIncrementalLinking>true</ILINK_DisableIncrementalLinking>
-			<ILINK_LibraryPath>$(INTERM_PATH)\Win32\Debug\;$(BDS)\lib\Win32\Debug\;$(BDS)\lib\Win32\Release\;$(BDS)\lib\Win32\Release\psdk\;$(ILINK_LibraryPath)</ILINK_LibraryPath>
-			<LinkPackageStatics>vcl.lib;rtl.lib;vclx.lib;ws2_32.lib;secur32.lib;Moje.lib;DriveDir.lib;DragDropP.lib;tb2k.lib;tbxp.lib;bcbie.lib;Crypt32.lib;PngComponents.lib;xmlrtl.lib;vclactnband.lib;vclimg.lib;winhttp.lib;jcl.lib;vclie.lib;urlmon.lib;shlwapi.lib;powrprof.lib;soaprtl.lib;fmx.lib</LinkPackageStatics>
-		</PropertyGroup>
+		<ILINK_DisableIncrementalLinking>true</ILINK_DisableIncrementalLinking>
+		<ILINK_LibraryPath>$(INTERM_PATH)\Win32\Debug\;$(BDS)\lib\Win32\Debug\;$(BDS)\lib\Win32\Release\;$(BDS)\lib\Win32\Release\psdk\;$(ILINK_LibraryPath)</ILINK_LibraryPath>
+		<LinkPackageStatics>vcl.lib;rtl.lib;vclx.lib;ws2_32.lib;secur32.lib;Moje.lib;DriveDir.lib;DragDropP.lib;tb2k.lib;tbxp.lib;bcbie.lib;Crypt32.lib;PngComponents.lib;xmlrtl.lib;vclactnband.lib;vclimg.lib;winhttp.lib;jcl.lib;vclie.lib;urlmon.lib;shlwapi.lib;powrprof.lib;soaprtl.lib;fmx.lib</LinkPackageStatics>
+	</PropertyGroup>
 	<PropertyGroup Condition="'$(Cfg_1_Win64)'!=''">
-			<ILINK_LibraryPath>$(INTERM_PATH)\Win64\Debug\;$(BDS)\lib\Win64\Debug\;$(BDS)\lib\Win64\Release\;$(BDS)\lib\Win64\Release\psdk\;$(ILINK_LibraryPath)</ILINK_LibraryPath>
-		</PropertyGroup>
+		<ILINK_LibraryPath>$(INTERM_PATH)\Win64\Debug\;$(BDS)\lib\Win64\Debug\;$(BDS)\lib\Win64\Release\;$(BDS)\lib\Win64\Release\psdk\;$(ILINK_LibraryPath)</ILINK_LibraryPath>
+	</PropertyGroup>
 	<PropertyGroup Condition="'$(Cfg_2)'!=''">
-			<Defines>NDEBUG;$(Defines)</Defines>
-			<TASM_Debugging>None</TASM_Debugging>
-		</PropertyGroup>
+		<Defines>NDEBUG;$(Defines)</Defines>
+		<TASM_Debugging>None</TASM_Debugging>
+	</PropertyGroup>
 	<PropertyGroup Condition="'$(Cfg_2_Win32)'!=''">
-			<ILINK_LibraryPath>$(INTERM_PATH)\Win32\Release\;$(BDS)\lib\Win32\Release\;$(BDS)\lib\Win32\Release\psdk\;$(ILINK_LibraryPath)</ILINK_LibraryPath>
-		</PropertyGroup>
+		<ILINK_LibraryPath>$(INTERM_PATH)\Win32\Release\;$(BDS)\lib\Win32\Release\;$(BDS)\lib\Win32\Release\psdk\;$(ILINK_LibraryPath)</ILINK_LibraryPath>
+	</PropertyGroup>
 	<PropertyGroup Condition="'$(Cfg_2_Win64)'!=''">
-			<ILINK_LibraryPath>$(INTERM_PATH)\Win64\Release\;$(BDS)\lib\Win64\Release\;$(BDS)\lib\Win64\Release\psdk\;$(ILINK_LibraryPath)</ILINK_LibraryPath>
-		</PropertyGroup>
+		<ILINK_LibraryPath>$(INTERM_PATH)\Win64\Release\;$(BDS)\lib\Win64\Release\;$(BDS)\lib\Win64\Release\psdk\;$(ILINK_LibraryPath)</ILINK_LibraryPath>
+	</PropertyGroup>
 	<ItemGroup>
-			<CppCompile Include="forms\CustomScpExplorer.cpp">
+		<CppCompile Include="forms\CustomScpExplorer.cpp">
 			<BuildOrder>8</BuildOrder>
 			<Form>CustomScpExplorerForm</Form>
 			<DependentOn>forms\CustomScpExplorer.h</DependentOn>
 			<BuildOrder>21</BuildOrder>
 		</CppCompile>
-			<FormResources Include="forms\CustomScpExplorer.dfm"/>
-			<CppCompile Include="forms\NonVisual.cpp">
+		<FormResources Include="forms\CustomScpExplorer.dfm"/>
+		<CppCompile Include="forms\NonVisual.cpp">
 			<BuildOrder>23</BuildOrder>
 			<Form>NonVisualDataModule</Form>
 			<DesignClass>TDataModule</DesignClass>
 			<DependentOn>forms\NonVisual.h</DependentOn>
 			<BuildOrder>22</BuildOrder>
 		</CppCompile>
-			<FormResources Include="forms\NonVisual.dfm"/>
-			<CppCompile Include="forms\ScpCommander.cpp">
+		<FormResources Include="forms\NonVisual.dfm"/>
+		<CppCompile Include="forms\ScpCommander.cpp">
 			<BuildOrder>38</BuildOrder>
 			<Form>ScpCommanderForm</Form>
 			<DependentOn>forms\ScpCommander.h</DependentOn>
 			<BuildOrder>23</BuildOrder>
 		</CppCompile>
-			<FormResources Include="forms\ScpCommander.dfm"/>
-			<CppCompile Include="forms\ScpExplorer.cpp">
+		<FormResources Include="forms\ScpCommander.dfm"/>
+		<CppCompile Include="forms\ScpExplorer.cpp">
 			<BuildOrder>41</BuildOrder>
 			<Form>ScpExplorerForm</Form>
 			<DependentOn>forms\ScpExplorer.h</DependentOn>
 			<BuildOrder>24</BuildOrder>
 		</CppCompile>
-			<FormResources Include="forms\ScpExplorer.dfm"/>
-			<CppCompile Include="windows\ConsoleRunner.cpp">
+		<FormResources Include="forms\ScpExplorer.dfm"/>
+		<CppCompile Include="windows\ConsoleRunner.cpp">
 			<BuildOrder>27</BuildOrder>
 			<BuildOrder>26</BuildOrder>
 		</CppCompile>
-			<CppCompile Include="windows\CustomWinConfiguration.cpp">
+		<CppCompile Include="windows\CustomWinConfiguration.cpp">
 			<BuildOrder>18</BuildOrder>
 			<BuildOrder>11</BuildOrder>
 		</CppCompile>
-			<CppCompile Include="windows\EditorManager.cpp">
+		<CppCompile Include="windows\EditorManager.cpp">
 			<BuildOrder>15</BuildOrder>
 			<BuildOrder>14</BuildOrder>
 		</CppCompile>
-			<CppCompile Include="windows\GUIConfiguration.cpp">
+		<CppCompile Include="windows\GUIConfiguration.cpp">
 			<BuildOrder>17</BuildOrder>
 			<BuildOrder>16</BuildOrder>
 		</CppCompile>
-			<CppCompile Include="windows\GUITools.cpp">
+		<CppCompile Include="windows\GUITools.cpp">
 			<BuildOrder>20</BuildOrder>
 			<BuildOrder>17</BuildOrder>
 		</CppCompile>
-			<CppCompile Include="windows\ProgParams.cpp">
+		<CppCompile Include="windows\ProgParams.cpp">
 			<BuildOrder>29</BuildOrder>
 			<BuildOrder>28</BuildOrder>
 		</CppCompile>
-			<CppCompile Include="windows\QueueController.cpp">
+		<CppCompile Include="windows\QueueController.cpp">
 			<BuildOrder>32</BuildOrder>
 			<BuildOrder>29</BuildOrder>
 		</CppCompile>
-			<CppCompile Include="windows\Setup.cpp">
+		<CppCompile Include="windows\Setup.cpp">
 			<BuildOrder>35</BuildOrder>
 			<BuildOrder>26</BuildOrder>
 		</CppCompile>
-			<CppCompile Include="windows\SynchronizeController.cpp">
+		<CppCompile Include="windows\SynchronizeController.cpp">
 			<BuildOrder>44</BuildOrder>
 			<BuildOrder>25</BuildOrder>
 		</CppCompile>
-			<CppCompile Include="windows\TerminalManager.cpp">
+		<CppCompile Include="windows\TerminalManager.cpp">
 			<BuildOrder>47</BuildOrder>
 			<BuildOrder>4</BuildOrder>
 		</CppCompile>
-			<CppCompile Include="windows\Tools.cpp">
+		<CppCompile Include="windows\Tools.cpp">
 			<BuildOrder>50</BuildOrder>
 			<BuildOrder>5</BuildOrder>
 		</CppCompile>
-			<CppCompile Include="windows\UserInterface.cpp">
+		<CppCompile Include="windows\UserInterface.cpp">
 			<BuildOrder>6</BuildOrder>
 			<BuildOrder>53</BuildOrder>
 		</CppCompile>
-			<CppCompile Include="windows\WinConfiguration.cpp">
+		<CppCompile Include="windows\WinConfiguration.cpp">
 			<BuildOrder>56</BuildOrder>
 			<BuildOrder>3</BuildOrder>
 		</CppCompile>
-			<ResourceCompile Include="windows\Windows.rc">
+		<ResourceCompile Include="windows\Windows.rc">
 			<BuildOrder>5</BuildOrder>
 			<BuildOrder>20</BuildOrder>
 		</ResourceCompile>
-			<CppCompile Include="windows\WinHelp.cpp">
+		<CppCompile Include="windows\WinHelp.cpp">
 			<BuildOrder>59</BuildOrder>
 			<BuildOrder>0</BuildOrder>
 		</CppCompile>
-			<CppCompile Include="windows\WinInterface.cpp">
+		<CppCompile Include="windows\WinInterface.cpp">
 			<BuildOrder>62</BuildOrder>
 			<BuildOrder>1</BuildOrder>
 		</CppCompile>
-			<CppCompile Include="windows\WinMain.cpp">
+		<CppCompile Include="windows\WinMain.cpp">
 			<BuildOrder>65</BuildOrder>
 			<BuildOrder>2</BuildOrder>
 		</CppCompile>
-			<CppCompile Include="WinSCP.cpp">
+		<CppCompile Include="WinSCP.cpp">
 			<BuildOrder>2</BuildOrder>
 			<BuildOrder>19</BuildOrder>
 		</CppCompile>
-			
-			<LibFiles Include="FileZilla.lib">
+		<LibFiles Include="FileZilla.lib">
 			<BuildOrder>27</BuildOrder>
 			<IgnorePath>true</IgnorePath>
 		</LibFiles>
-			<LibFiles Include="libeay32.lib">
+		<LibFiles Include="libeay32.lib">
 			<BuildOrder>28</BuildOrder>
 			<IgnorePath>true</IgnorePath>
 		</LibFiles>
-			<LibFiles Include="libexpats_mtd.lib">
+		<LibFiles Include="libexpats_mtd.lib">
 			<BuildOrder>31</BuildOrder>
 			<IgnorePath>true</IgnorePath>
 		</LibFiles>
-			<LibFiles Include="neon.lib">
+		<LibFiles Include="neon.lib">
 			<BuildOrder>33</BuildOrder>
 			<IgnorePath>true</IgnorePath>
 		</LibFiles>
-			<LibFiles Include="Putty.lib">
+		<LibFiles Include="Putty.lib">
 			<BuildOrder>23</BuildOrder>
 			<IgnorePath>true</IgnorePath>
 		</LibFiles>
-			<LibFiles Include="PuTTYVS.lib">
+		<LibFiles Include="PuTTYVS.lib">
 			<BuildOrder>33</BuildOrder>
 			<IgnorePath>true</IgnorePath>
 		</LibFiles>
-			<LibFiles Include="RScpComp.lib">
+		<LibFiles Include="RScpComp.lib">
 			<BuildOrder>24</BuildOrder>
 			<IgnorePath>true</IgnorePath>
 		</LibFiles>
-			<LibFiles Include="ScpCore.lib">
+		<LibFiles Include="ScpCore.lib">
 			<BuildOrder>25</BuildOrder>
 			<IgnorePath>true</IgnorePath>
 		</LibFiles>
-			<LibFiles Include="ScpForms.lib">
+		<LibFiles Include="ScpForms.lib">
 			<BuildOrder>26</BuildOrder>
 			<IgnorePath>true</IgnorePath>
 		</LibFiles>
-			<LibFiles Include="ScpResources.lib">
+		<LibFiles Include="ScpResources.lib">
 			<BuildOrder>26</BuildOrder>
 			<IgnorePath>true</IgnorePath>
 		</LibFiles>
-			<LibFiles Include="ssleay32.lib">
+		<LibFiles Include="ssleay32.lib">
 			<BuildOrder>29</BuildOrder>
 			<IgnorePath>true</IgnorePath>
 		</LibFiles>
-			<BuildConfiguration Include="Base">
+		<BuildConfiguration Include="Base">
 			<Key>Base</Key>
 		</BuildConfiguration>
-			<BuildConfiguration Include="Debug">
+		<BuildConfiguration Include="Debug">
 			<Key>Cfg_1</Key>
 			<CfgParent>Base</CfgParent>
 		</BuildConfiguration>
-			<BuildConfiguration Include="Release">
+		<BuildConfiguration Include="Release">
 			<Key>Cfg_2</Key>
 			<CfgParent>Base</CfgParent>
 		</BuildConfiguration>
-		</ItemGroup>
+	</ItemGroup>
 	<Import Condition="Exists('$(BDS)\Bin\CodeGear.Cpp.Targets')" Project="$(BDS)\Bin\CodeGear.Cpp.Targets"/>
 	<ProjectExtensions>
 		<Borland.Personality>CPlusPlusBuilder.Personality.12</Borland.Personality>
@@ -305,4 +304,4 @@
 		<ProjectFileVersion>12</ProjectFileVersion>
 	</ProjectExtensions>
 	<Import Condition="Exists('$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj')" Project="$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj"/>
-</Project>
+</Project>

source/tb2k.cbproj

@@ -1,4 +1,4 @@
-	<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 	<PropertyGroup>
 		<ProjectGuid>{040AEB47-CE64-41D5-8776-BD824E5F3763}</ProjectGuid>
 		<ProjectVersion>15.4</ProjectVersion>
@@ -35,120 +35,120 @@
 		<Base>true</Base>
 	</PropertyGroup>
 	<PropertyGroup Condition="'$(Base)'!=''">
-			<_TCHARMapping>wchar_t</_TCHARMapping>
-			<BCC_ExtendedErrorInfo>true</BCC_ExtendedErrorInfo>
-			<BCC_OptimizeForSpeed>true</BCC_OptimizeForSpeed>
-			<BPILibOutputDir>$(INTERM_PATH)\$(Platform)\$(Config)</BPILibOutputDir>
-			<DCC_CBuilderOutput>JPHNE</DCC_CBuilderOutput>
-			<DCC_CVT_ACHAR_TO_WCHAR>true</DCC_CVT_ACHAR_TO_WCHAR>
-			<DCC_CVT_WIDENING_STRING_LOST>true</DCC_CVT_WIDENING_STRING_LOST>
-			<DCC_EXPLICIT_STRING_CAST>true</DCC_EXPLICIT_STRING_CAST>
-			<DCC_EXPLICIT_STRING_CAST_LOSS>true</DCC_EXPLICIT_STRING_CAST_LOSS>
-			<DCC_Namespace>Vcl;Vcl.Imaging;Vcl.Touch;Vcl.Samples;Vcl.Shell;System;Xml;Data;Datasnap;Web;Soap;Vcl;$(DCC_Namespace)</DCC_Namespace>
-			<Defines>MPEXCLUDE;$(Define);$(Defines)</Defines>
-			<FinalOutputDir>$(INTERM_PATH)\$(Platform)\$(Config)</FinalOutputDir>
-			<ILINK_Description>Toolbar2000 Components (Jordan Russell)</ILINK_Description>
-			<ILINK_GenerateImportLibrary>true</ILINK_GenerateImportLibrary>
-			<ILINK_GenerateLibFile>true</ILINK_GenerateLibFile>
-			<ILINK_LibraryPath>packages\;packages\tb2k\;$(ILINK_LibraryPath)</ILINK_LibraryPath>
-			<IncludePath>packages\;packages\tb2k\;$(BDS)\include;$(BDS)\include\windows\vcl;$(IncludePath)</IncludePath>
-			<IntermediateOutputDir>$(INTERM_PATH)\$(Platform)\$(Config)</IntermediateOutputDir>
-			<Multithreaded>true</Multithreaded>
-			<OutputExt>bpl</OutputExt>
-			<ProjectType>CppPackage</ProjectType>
-			<SanitizedProjectName>tb2k</SanitizedProjectName>
-			<VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
-			<VerInfo_Locale>1033</VerInfo_Locale>
-		</PropertyGroup>
+		<_TCHARMapping>wchar_t</_TCHARMapping>
+		<BCC_ExtendedErrorInfo>true</BCC_ExtendedErrorInfo>
+		<BCC_OptimizeForSpeed>true</BCC_OptimizeForSpeed>
+		<BPILibOutputDir>$(INTERM_PATH)\$(Platform)\$(Config)</BPILibOutputDir>
+		<DCC_CBuilderOutput>JPHNE</DCC_CBuilderOutput>
+		<DCC_CVT_ACHAR_TO_WCHAR>true</DCC_CVT_ACHAR_TO_WCHAR>
+		<DCC_CVT_WIDENING_STRING_LOST>true</DCC_CVT_WIDENING_STRING_LOST>
+		<DCC_EXPLICIT_STRING_CAST>true</DCC_EXPLICIT_STRING_CAST>
+		<DCC_EXPLICIT_STRING_CAST_LOSS>true</DCC_EXPLICIT_STRING_CAST_LOSS>
+		<DCC_Namespace>Vcl;Vcl.Imaging;Vcl.Touch;Vcl.Samples;Vcl.Shell;System;Xml;Data;Datasnap;Web;Soap;Vcl;$(DCC_Namespace)</DCC_Namespace>
+		<Defines>MPEXCLUDE;$(Define);$(Defines)</Defines>
+		<FinalOutputDir>$(INTERM_PATH)\$(Platform)\$(Config)</FinalOutputDir>
+		<ILINK_Description>Toolbar2000 Components (Jordan Russell)</ILINK_Description>
+		<ILINK_GenerateImportLibrary>true</ILINK_GenerateImportLibrary>
+		<ILINK_GenerateLibFile>true</ILINK_GenerateLibFile>
+		<ILINK_LibraryPath>packages\;packages\tb2k\;$(ILINK_LibraryPath)</ILINK_LibraryPath>
+		<IncludePath>packages\;packages\tb2k\;$(BDS)\include;$(BDS)\include\windows\vcl;$(IncludePath)</IncludePath>
+		<IntermediateOutputDir>$(INTERM_PATH)\$(Platform)\$(Config)</IntermediateOutputDir>
+		<Multithreaded>true</Multithreaded>
+		<OutputExt>bpl</OutputExt>
+		<ProjectType>CppPackage</ProjectType>
+		<SanitizedProjectName>tb2k</SanitizedProjectName>
+		<VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
+		<VerInfo_Locale>1033</VerInfo_Locale>
+	</PropertyGroup>
 	<PropertyGroup Condition="'$(Base_Win32)'!=''">
-			<DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
-			<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
-		</PropertyGroup>
+		<DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
+		<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
+	</PropertyGroup>
 	<PropertyGroup Condition="'$(Cfg_1)'!=''">
-			<BCC_DebugLineNumbers>true</BCC_DebugLineNumbers>
-			<BCC_DisableOptimizations>true</BCC_DisableOptimizations>
-			<BCC_InlineFunctionExpansion>false</BCC_InlineFunctionExpansion>
-			<BCC_OptimizeForSpeed>false</BCC_OptimizeForSpeed>
-			<BCC_SourceDebuggingOn>true</BCC_SourceDebuggingOn>
-			<BCC_StackFrames>true</BCC_StackFrames>
-			<BCC_UseRegisterVariables>None</BCC_UseRegisterVariables>
-			<DCC_DebugInfoInExe>true</DCC_DebugInfoInExe>
-			<DCC_Define>DEBUG</DCC_Define>
-			<DCC_Optimize>false</DCC_Optimize>
-			<Defines>_DEBUG;$(Defines)</Defines>
-			<ILINK_FullDebugInfo>true</ILINK_FullDebugInfo>
-			<TASM_Debugging>Full</TASM_Debugging>
-			<TASM_DisplaySourceLines>true</TASM_DisplaySourceLines>
-		</PropertyGroup>
+		<BCC_DebugLineNumbers>true</BCC_DebugLineNumbers>
+		<BCC_DisableOptimizations>true</BCC_DisableOptimizations>
+		<BCC_InlineFunctionExpansion>false</BCC_InlineFunctionExpansion>
+		<BCC_OptimizeForSpeed>false</BCC_OptimizeForSpeed>
+		<BCC_SourceDebuggingOn>true</BCC_SourceDebuggingOn>
+		<BCC_StackFrames>true</BCC_StackFrames>
+		<BCC_UseRegisterVariables>None</BCC_UseRegisterVariables>
+		<DCC_DebugInfoInExe>true</DCC_DebugInfoInExe>
+		<DCC_Define>DEBUG</DCC_Define>
+		<DCC_Optimize>false</DCC_Optimize>
+		<Defines>_DEBUG;$(Defines)</Defines>
+		<ILINK_FullDebugInfo>true</ILINK_FullDebugInfo>
+		<TASM_Debugging>Full</TASM_Debugging>
+		<TASM_DisplaySourceLines>true</TASM_DisplaySourceLines>
+	</PropertyGroup>
 	<PropertyGroup Condition="'$(Cfg_2)'!=''">
-			<Defines>NDEBUG;$(Defines)</Defines>
-			<TASM_Debugging>None</TASM_Debugging>
-		</PropertyGroup>
+		<Defines>NDEBUG;$(Defines)</Defines>
+		<TASM_Debugging>None</TASM_Debugging>
+	</PropertyGroup>
 	<ItemGroup>
-			<DelphiCompile Include="packages\tb2k\TB2Acc.pas">
+		<DelphiCompile Include="packages\tb2k\TB2Acc.pas">
 			<BuildOrder>5</BuildOrder>
 			<BuildOrder>32</BuildOrder>
 		</DelphiCompile>
-			<DelphiCompile Include="packages\tb2k\TB2Anim.pas">
+		<DelphiCompile Include="packages\tb2k\TB2Anim.pas">
 			<BuildOrder>29</BuildOrder>
 			<BuildOrder>0</BuildOrder>
 		</DelphiCompile>
-			<DelphiCompile Include="packages\tb2k\TB2Common.pas">
+		<DelphiCompile Include="packages\tb2k\TB2Common.pas">
 			<BuildOrder>8</BuildOrder>
 			<BuildOrder>5</BuildOrder>
 		</DelphiCompile>
-			<DelphiCompile Include="packages\tb2k\TB2Consts.pas">
+		<DelphiCompile Include="packages\tb2k\TB2Consts.pas">
 			<BuildOrder>8</BuildOrder>
 			<BuildOrder>7</BuildOrder>
 		</DelphiCompile>
-			<DelphiCompile Include="packages\tb2k\TB2Dock.pas">
+		<DelphiCompile Include="packages\tb2k\TB2Dock.pas">
 			<BuildOrder>12</BuildOrder>
 			<BuildOrder>11</BuildOrder>
 		</DelphiCompile>
-			<DelphiCompile Include="packages\tb2k\TB2ExtItems.pas">
+		<DelphiCompile Include="packages\tb2k\TB2ExtItems.pas">
 			<BuildOrder>14</BuildOrder>
 			<BuildOrder>11</BuildOrder>
 		</DelphiCompile>
-			<DelphiCompile Include="packages\tb2k\TB2Hook.pas">
+		<DelphiCompile Include="packages\tb2k\TB2Hook.pas">
 			<BuildOrder>26</BuildOrder>
 			<BuildOrder>1</BuildOrder>
 		</DelphiCompile>
-			<DelphiCompile Include="packages\tb2k\TB2Item.pas">
+		<DelphiCompile Include="packages\tb2k\TB2Item.pas">
 			<BuildOrder>17</BuildOrder>
 			<BuildOrder>10</BuildOrder>
 		</DelphiCompile>
-			<DelphiCompile Include="packages\tb2k\TB2Toolbar.pas">
+		<DelphiCompile Include="packages\tb2k\TB2Toolbar.pas">
 			<BuildOrder>6</BuildOrder>
 			<BuildOrder>20</BuildOrder>
 		</DelphiCompile>
-			<DelphiCompile Include="packages\tb2k\TB2Version.pas">
+		<DelphiCompile Include="packages\tb2k\TB2Version.pas">
 			<BuildOrder>23</BuildOrder>
 			<BuildOrder>2</BuildOrder>
 		</DelphiCompile>
-			<CppCompile Include="tb2k.cpp">
+		<CppCompile Include="tb2k.cpp">
 			<BuildOrder>9</BuildOrder>
 			<BuildOrder>2</BuildOrder>
 		</CppCompile>
-			<PackageImport Include="rtl.bpi">
+		<PackageImport Include="rtl.bpi">
 			<BuildOrder>4</BuildOrder>
 			<BuildOrder>35</BuildOrder>
 		</PackageImport>
-			<PackageImport Include="vcl.bpi">
+		<PackageImport Include="vcl.bpi">
 			<BuildOrder>38</BuildOrder>
 			<BuildOrder>3</BuildOrder>
 		</PackageImport>
-			<BuildConfiguration Include="Base">
+		<BuildConfiguration Include="Base">
 			<Key>Base</Key>
 		</BuildConfiguration>
-			<BuildConfiguration Include="Debug">
+		<BuildConfiguration Include="Debug">
 			<Key>Cfg_1</Key>
 			<CfgParent>Base</CfgParent>
 		</BuildConfiguration>
-			<BuildConfiguration Include="Release">
+		<BuildConfiguration Include="Release">
 			<Key>Cfg_2</Key>
 			<CfgParent>Base</CfgParent>
 		</BuildConfiguration>
-		</ItemGroup>
+	</ItemGroup>
 	<Import Condition="Exists('$(BDS)\Bin\CodeGear.Cpp.Targets')" Project="$(BDS)\Bin\CodeGear.Cpp.Targets"/>
 	<ProjectExtensions>
 		<Borland.Personality>CPlusPlusBuilder.Personality.12</Borland.Personality>
@@ -173,4 +173,4 @@
 		<ProjectFileVersion>12</ProjectFileVersion>
 	</ProjectExtensions>
 	<Import Condition="Exists('$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj')" Project="$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj"/>
-</Project>
+</Project>

source/tbxp.cbproj

@@ -1,4 +1,4 @@
-	<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 	<PropertyGroup>
 		<ProjectGuid>{44DD0CE6-BAA9-4655-925A-94E7F438BC93}</ProjectGuid>
 		<ProjectVersion>15.4</ProjectVersion>
@@ -29,114 +29,114 @@
 		<Base>true</Base>
 	</PropertyGroup>
 	<PropertyGroup Condition="'$(Base)'!=''">
-			<_TCHARMapping>wchar_t</_TCHARMapping>
-			<BCC_ExtendedErrorInfo>true</BCC_ExtendedErrorInfo>
-			<BCC_OptimizeForSpeed>true</BCC_OptimizeForSpeed>
-			<BPILibOutputDir>$(INTERM_PATH)\$(Platform)\$(Config)</BPILibOutputDir>
-			<DCC_CBuilderOutput>JPHNE</DCC_CBuilderOutput>
-			<DCC_CVT_ACHAR_TO_WCHAR>true</DCC_CVT_ACHAR_TO_WCHAR>
-			<DCC_CVT_WIDENING_STRING_LOST>true</DCC_CVT_WIDENING_STRING_LOST>
-			<DCC_EXPLICIT_STRING_CAST>true</DCC_EXPLICIT_STRING_CAST>
-			<DCC_EXPLICIT_STRING_CAST_LOSS>true</DCC_EXPLICIT_STRING_CAST_LOSS>
-			<DCC_Namespace>Vcl;Vcl.Imaging;Vcl.Touch;Vcl.Samples;Vcl.Shell;System;Xml;Data;Datasnap;Web;Soap;Vcl;$(DCC_Namespace)</DCC_Namespace>
-			<DCC_UnitSearchPath>packages\tbx;packages\tb2k;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
-			<Defines>MPEXCLUDE;TBX_UNICODE;$(Defines)</Defines>
-			<FinalOutputDir>$(INTERM_PATH)\$(Platform)\$(Config)</FinalOutputDir>
-			<ILINK_Description>Toolbar2000 -- TBX Extensions (Alex Denisov)</ILINK_Description>
-			<ILINK_GenerateImportLibrary>true</ILINK_GenerateImportLibrary>
-			<ILINK_GenerateLibFile>true</ILINK_GenerateLibFile>
-			<ILINK_LibraryPath>packages\tbx\;packages\tb2k;$(BDS)\lib\obj;$(ILINK_LibraryPath)</ILINK_LibraryPath>
-			<IncludePath>packages\tbx\;packages\tb2k;$(BDS)\include;$(BDS)\include\windows\vcl;$(IncludePath)</IncludePath>
-			<IntermediateOutputDir>$(INTERM_PATH)\$(Platform)\$(Config)</IntermediateOutputDir>
-			<Multithreaded>true</Multithreaded>
-			<OutputExt>bpl</OutputExt>
-			<ProjectType>CppPackage</ProjectType>
-			<SanitizedProjectName>tbxp</SanitizedProjectName>
-			<TLIB_PageSize>32</TLIB_PageSize>
-			<VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
-			<VerInfo_Locale>1033</VerInfo_Locale>
-		</PropertyGroup>
+		<_TCHARMapping>wchar_t</_TCHARMapping>
+		<BCC_ExtendedErrorInfo>true</BCC_ExtendedErrorInfo>
+		<BCC_OptimizeForSpeed>true</BCC_OptimizeForSpeed>
+		<BPILibOutputDir>$(INTERM_PATH)\$(Platform)\$(Config)</BPILibOutputDir>
+		<DCC_CBuilderOutput>JPHNE</DCC_CBuilderOutput>
+		<DCC_CVT_ACHAR_TO_WCHAR>true</DCC_CVT_ACHAR_TO_WCHAR>
+		<DCC_CVT_WIDENING_STRING_LOST>true</DCC_CVT_WIDENING_STRING_LOST>
+		<DCC_EXPLICIT_STRING_CAST>true</DCC_EXPLICIT_STRING_CAST>
+		<DCC_EXPLICIT_STRING_CAST_LOSS>true</DCC_EXPLICIT_STRING_CAST_LOSS>
+		<DCC_Namespace>Vcl;Vcl.Imaging;Vcl.Touch;Vcl.Samples;Vcl.Shell;System;Xml;Data;Datasnap;Web;Soap;Vcl;$(DCC_Namespace)</DCC_Namespace>
+		<DCC_UnitSearchPath>packages\tbx;packages\tb2k;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
+		<Defines>MPEXCLUDE;TBX_UNICODE;$(Defines)</Defines>
+		<FinalOutputDir>$(INTERM_PATH)\$(Platform)\$(Config)</FinalOutputDir>
+		<ILINK_Description>Toolbar2000 -- TBX Extensions (Alex Denisov)</ILINK_Description>
+		<ILINK_GenerateImportLibrary>true</ILINK_GenerateImportLibrary>
+		<ILINK_GenerateLibFile>true</ILINK_GenerateLibFile>
+		<ILINK_LibraryPath>packages\tbx\;packages\tb2k;$(BDS)\lib\obj;$(ILINK_LibraryPath)</ILINK_LibraryPath>
+		<IncludePath>packages\tbx\;packages\tb2k;$(BDS)\include;$(BDS)\include\windows\vcl;$(IncludePath)</IncludePath>
+		<IntermediateOutputDir>$(INTERM_PATH)\$(Platform)\$(Config)</IntermediateOutputDir>
+		<Multithreaded>true</Multithreaded>
+		<OutputExt>bpl</OutputExt>
+		<ProjectType>CppPackage</ProjectType>
+		<SanitizedProjectName>tbxp</SanitizedProjectName>
+		<TLIB_PageSize>32</TLIB_PageSize>
+		<VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
+		<VerInfo_Locale>1033</VerInfo_Locale>
+	</PropertyGroup>
 	<PropertyGroup Condition="'$(Base_Win32)'!=''">
-			<DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
-			<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
-		</PropertyGroup>
+		<DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
+		<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
+	</PropertyGroup>
 	<PropertyGroup Condition="'$(Cfg_1)'!=''">
-			<BCC_DebugLineNumbers>true</BCC_DebugLineNumbers>
-			<BCC_DisableOptimizations>true</BCC_DisableOptimizations>
-			<BCC_InlineFunctionExpansion>false</BCC_InlineFunctionExpansion>
-			<BCC_OptimizeForSpeed>false</BCC_OptimizeForSpeed>
-			<BCC_SourceDebuggingOn>true</BCC_SourceDebuggingOn>
-			<BCC_StackFrames>true</BCC_StackFrames>
-			<BCC_UseRegisterVariables>None</BCC_UseRegisterVariables>
-			<DCC_DebugInfoInExe>true</DCC_DebugInfoInExe>
-			<DCC_Define>DEBUG</DCC_Define>
-			<DCC_Optimize>false</DCC_Optimize>
-			<Defines>_DEBUG;$(Defines)</Defines>
-			<ILINK_FullDebugInfo>true</ILINK_FullDebugInfo>
-			<TASM_Debugging>Full</TASM_Debugging>
-			<TASM_DisplaySourceLines>true</TASM_DisplaySourceLines>
-		</PropertyGroup>
+		<BCC_DebugLineNumbers>true</BCC_DebugLineNumbers>
+		<BCC_DisableOptimizations>true</BCC_DisableOptimizations>
+		<BCC_InlineFunctionExpansion>false</BCC_InlineFunctionExpansion>
+		<BCC_OptimizeForSpeed>false</BCC_OptimizeForSpeed>
+		<BCC_SourceDebuggingOn>true</BCC_SourceDebuggingOn>
+		<BCC_StackFrames>true</BCC_StackFrames>
+		<BCC_UseRegisterVariables>None</BCC_UseRegisterVariables>
+		<DCC_DebugInfoInExe>true</DCC_DebugInfoInExe>
+		<DCC_Define>DEBUG</DCC_Define>
+		<DCC_Optimize>false</DCC_Optimize>
+		<Defines>_DEBUG;$(Defines)</Defines>
+		<ILINK_FullDebugInfo>true</ILINK_FullDebugInfo>
+		<TASM_Debugging>Full</TASM_Debugging>
+		<TASM_DisplaySourceLines>true</TASM_DisplaySourceLines>
+	</PropertyGroup>
 	<PropertyGroup Condition="'$(Cfg_2)'!=''">
-			<Defines>NDEBUG;$(Defines)</Defines>
-			<TASM_Debugging>None</TASM_Debugging>
-		</PropertyGroup>
+		<Defines>NDEBUG;$(Defines)</Defines>
+		<TASM_Debugging>None</TASM_Debugging>
+	</PropertyGroup>
 	<ItemGroup>
-			<DelphiCompile Include="packages\tbx\TBX.pas">
+		<DelphiCompile Include="packages\tbx\TBX.pas">
 			<BuildOrder>11</BuildOrder>
 		</DelphiCompile>
-			<DelphiCompile Include="packages\tbx\TBXExtItems.pas">
+		<DelphiCompile Include="packages\tbx\TBXExtItems.pas">
 			<BuildOrder>17</BuildOrder>
 			<BuildOrder>13</BuildOrder>
 		</DelphiCompile>
-			<DelphiCompile Include="packages\tbx\TBXLists.pas">
+		<DelphiCompile Include="packages\tbx\TBXLists.pas">
 			<BuildOrder>6</BuildOrder>
 			<BuildOrder>38</BuildOrder>
 		</DelphiCompile>
-			<DelphiCompile Include="packages\tbx\TBXOfficeXPTheme.pas">
+		<DelphiCompile Include="packages\tbx\TBXOfficeXPTheme.pas">
 			<BuildOrder>8</BuildOrder>
 		</DelphiCompile>
-			<DelphiCompile Include="packages\tbx\TBXStatusBars.pas">
+		<DelphiCompile Include="packages\tbx\TBXStatusBars.pas">
 			<BuildOrder>7</BuildOrder>
 			<BuildOrder>23</BuildOrder>
 		</DelphiCompile>
-			<DelphiCompile Include="packages\tbx\TBXThemes.pas">
+		<DelphiCompile Include="packages\tbx\TBXThemes.pas">
 			<BuildOrder>26</BuildOrder>
 			<BuildOrder>2</BuildOrder>
 		</DelphiCompile>
-			<DelphiCompile Include="packages\tbx\TBXToolPals.pas">
+		<DelphiCompile Include="packages\tbx\TBXToolPals.pas">
 			<BuildOrder>44</BuildOrder>
 			<BuildOrder>4</BuildOrder>
 		</DelphiCompile>
-			<DelphiCompile Include="packages\tbx\TBXUtils.pas">
+		<DelphiCompile Include="packages\tbx\TBXUtils.pas">
 			<BuildOrder>14</BuildOrder>
 		</DelphiCompile>
-			<CppCompile Include="tbxp.cpp">
+		<CppCompile Include="tbxp.cpp">
 			<BuildOrder>2</BuildOrder>
 			<BuildOrder>10</BuildOrder>
 		</CppCompile>
-			<PackageImport Include="rtl.bpi">
+		<PackageImport Include="rtl.bpi">
 			<BuildOrder>32</BuildOrder>
 			<BuildOrder>0</BuildOrder>
 		</PackageImport>
-			<PackageImport Include="tb2k.bpi">
+		<PackageImport Include="tb2k.bpi">
 			<BuildOrder>14</BuildOrder>
 		</PackageImport>
-			<PackageImport Include="vcl.bpi">
+		<PackageImport Include="vcl.bpi">
 			<BuildOrder>29</BuildOrder>
 			<BuildOrder>1</BuildOrder>
 		</PackageImport>
-			<BuildConfiguration Include="Base">
+		<BuildConfiguration Include="Base">
 			<Key>Base</Key>
 		</BuildConfiguration>
-			<BuildConfiguration Include="Debug">
+		<BuildConfiguration Include="Debug">
 			<Key>Cfg_1</Key>
 			<CfgParent>Base</CfgParent>
 		</BuildConfiguration>
-			<BuildConfiguration Include="Release">
+		<BuildConfiguration Include="Release">
 			<Key>Cfg_2</Key>
 			<CfgParent>Base</CfgParent>
 		</BuildConfiguration>
-		</ItemGroup>
+	</ItemGroup>
 	<Import Condition="Exists('$(BDS)\Bin\CodeGear.Cpp.Targets')" Project="$(BDS)\Bin\CodeGear.Cpp.Targets"/>
 	<ProjectExtensions>
 		<Borland.Personality>CPlusPlusBuilder.Personality.12</Borland.Personality>
@@ -161,4 +161,4 @@
 		<ProjectFileVersion>12</ProjectFileVersion>
 	</ProjectExtensions>
 	<Import Condition="Exists('$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj')" Project="$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj"/>
-</Project>
+</Project>