From e89700003a95ac1ab1974ea9bf4b1c61fd1eaf06 Mon Sep 17 00:00:00 2001
From: Sven Harazim <sven.harazim@landrix.de>
Date: Thu, 4 Feb 2021 11:51:55 +0100
Subject: [PATCH] Delphi 10.4 support

---
 Code/DDevExtensions/Bin/Version.txt           |   2 +-
 .../D_D104/DDevExtensions.dproj               |   8 +-
 .../Installer/DDevExtensionsReg.dproj         | 310 ++++++++++--------
 .../Installer/DDevExtensionsReg.res           | Bin 5796 -> 676 bytes
 Code/DDevExtensions/Source/version.inc        |   2 +-
 Code/DDevExtensions/Version.res               | Bin 864 -> 864 bytes
 Code/DDevExtensions/build.bat                 |   5 +-
 Code/DDevExtensions/version.bat               |   2 +-
 README.md                                     |   6 +-
 Shared/IDE/Options/FrmTreePages.dfm           |   1 -
 Tools/LinkMapFile/ReadMe.md                   |   3 +
 11 files changed, 187 insertions(+), 152 deletions(-)
 create mode 100644 Tools/LinkMapFile/ReadMe.md

diff --git a/Code/DDevExtensions/Bin/Version.txt b/Code/DDevExtensions/Bin/Version.txt
index 6b53e41..26f05b0 100644
--- a/Code/DDevExtensions/Bin/Version.txt
+++ b/Code/DDevExtensions/Bin/Version.txt
@@ -1 +1 @@
-DDevExtensions Version 2.86
+DDevExtensions Version 2.87
diff --git a/Code/DDevExtensions/D_D104/DDevExtensions.dproj b/Code/DDevExtensions/D_D104/DDevExtensions.dproj
index 5623f94..a846b3a 100644
--- a/Code/DDevExtensions/D_D104/DDevExtensions.dproj
+++ b/Code/DDevExtensions/D_D104/DDevExtensions.dproj
@@ -6,7 +6,7 @@
         <DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
         <DCC_DependencyCheckOutputName>..\bin\DDevExtensionsD104.dll</DCC_DependencyCheckOutputName>
         <ProjectVersion>19.1</ProjectVersion>
-        <Config Condition="'$(Config)'==''">Debug</Config>
+        <Config Condition="'$(Config)'==''">Release</Config>
         <Basis>True</Basis>
         <AppType>Library</AppType>
         <FrameworkType>VCL</FrameworkType>
@@ -144,10 +144,8 @@ $(PreBuildEvent)]]></PreBuildEvent>
                     <Source Name="MainSource">DDevExtensions.dpr</Source>
                 </Source>
                 <Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\hgide270.bpl">Embarcadero Mercurial Integration</Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\svnide270.bpl">Embarcadero Subversion Integration</Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\dcloffice2k270.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\dclofficexp270.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\dcloffice2k270.bpl">Microsoft Office 2000 Beispiele für gekapselte Komponenten für Automatisierungsserver</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\dclofficexp270.bpl">Microsoft Office XP Beispiele für gekapselte Komponenten für Automation Server</Excluded_Packages>
                 </Excluded_Packages>
             </Delphi.Personality>
             <ModelSupport>False</ModelSupport>
diff --git a/Code/DDevExtensions/Installer/DDevExtensionsReg.dproj b/Code/DDevExtensions/Installer/DDevExtensionsReg.dproj
index 0d37598..38d84d2 100644
--- a/Code/DDevExtensions/Installer/DDevExtensionsReg.dproj
+++ b/Code/DDevExtensions/Installer/DDevExtensionsReg.dproj
@@ -1,137 +1,173 @@
-	<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-		<PropertyGroup>
-			<ProjectGuid>{2BAF01A7-5596-444B-89D1-47A1A4550C45}</ProjectGuid>
-			<MainSource>DDevExtensionsReg.dpr</MainSource>
-			<Config Condition="'$(Config)'==''">Debug</Config>
-			<DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
-			<ProjectVersion>14.4</ProjectVersion>
-			<Basis>True</Basis>
-			<AppType>Application</AppType>
-			<FrameworkType>VCL</FrameworkType>
-			<Base>True</Base>
-			<Platform Condition="'$(Platform)'==''">Win32</Platform>
-			<TargetedPlatforms>1</TargetedPlatforms>
-			<Platform>Win32</Platform>
-		</PropertyGroup>
-		<PropertyGroup Condition="'$(Config)'=='Basis' or '$(Base)'!=''">
-			<Base>true</Base>
-		</PropertyGroup>
-		<PropertyGroup Condition="'$(Config)'=='Release' or '$(Cfg_1)'!=''">
-			<Cfg_1>true</Cfg_1>
-			<CfgParent>Base</CfgParent>
-			<Base>true</Base>
-		</PropertyGroup>
-		<PropertyGroup Condition="'$(Config)'=='Debug' or '$(Cfg_2)'!=''">
-			<Cfg_2>true</Cfg_2>
-			<CfgParent>Base</CfgParent>
-			<Base>true</Base>
-		</PropertyGroup>
-		<PropertyGroup Condition="'$(Base)'!=''">
-			<VerInfo_Build>575</VerInfo_Build>
-			<VerInfo_Locale>1031</VerInfo_Locale>
-			<VerInfo_Keys>CompanyName=Andreas Hausladen;FileVersion=2.7.0.575;InternalName=;LegalCopyright=(C) 2006-2013 Andreas Hausladen;LegalTrademarks=;OriginalFilename=;ProductName=DDevExtensions;ProductVersion=2.7;Comments=</VerInfo_Keys>
-			<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
-			<DCC_Namespace>Vcl;Vcl.Imaging;Vcl.Touch;Vcl.Samples;Vcl.Shell;System;Xml;Data;Datasnap;Web;Soap;Winapi;System.Win;$(DCC_Namespace)</DCC_Namespace>
-			<VerInfo_MajorVer>2</VerInfo_MajorVer>
-			<VerInfo_MinorVer>7</VerInfo_MinorVer>
-			<DCC_ImageBase>00400000</DCC_ImageBase>
-			<DCC_DependencyCheckOutputName>..\bin\InstallDDevExtensions.exe</DCC_DependencyCheckOutputName>
-			<DCC_MapFile>3</DCC_MapFile>
-			<DCC_GenerateStackFrames>true</DCC_GenerateStackFrames>
-			<DCC_UsePackage>vcl;rtl;vclx;$(DCC_UsePackage)</DCC_UsePackage>
-			<DCC_RangeChecking>true</DCC_RangeChecking>
-			<DCC_Platform>x86</DCC_Platform>
-			<DCC_ExeOutput>..\bin</DCC_ExeOutput>
-			<DCC_F>false</DCC_F>
-			<DCC_E>false</DCC_E>
-			<DCC_K>false</DCC_K>
-			<DCC_S>false</DCC_S>
-			<DCC_N>true</DCC_N>
-			<DCC_SymbolReferenceInfo>1</DCC_SymbolReferenceInfo>
-			<DCC_IntegerOverflowCheck>true</DCC_IntegerOverflowCheck>
-			<DCC_DcuOutput>.</DCC_DcuOutput>
-		</PropertyGroup>
-		<PropertyGroup Condition="'$(Cfg_1)'!=''">
-			<DCC_LocalDebugSymbols>false</DCC_LocalDebugSymbols>
-			<DCC_Define>RELEASE;$(DCC_Define)</DCC_Define>
-			<DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
-			<DCC_DebugInformation>false</DCC_DebugInformation>
-		</PropertyGroup>
-		<PropertyGroup Condition="'$(Cfg_2)'!=''">
-			<VerInfo_MinorVer>7</VerInfo_MinorVer>
-			<VerInfo_Keys>CompanyName=Andreas Hausladen;FileVersion=2.7.0.575;InternalName=;LegalCopyright=(C) 2006-2013 Andreas Hausladen;LegalTrademarks=;OriginalFilename=;ProductName=DDevExtensions;ProductVersion=2.7;Comments=</VerInfo_Keys>
-			<DCC_Define>DEBUG;$(DCC_Define)</DCC_Define>
-		</PropertyGroup>
-		<ItemGroup>
-			<DelphiCompile Include="DDevExtensionsReg.dpr">
-				<MainSource>MainSource</MainSource>
-			</DelphiCompile>
-			<DCCReference Include="Main.pas">
-				<Form>FormMain</Form>
-			</DCCReference>
-			<DCCReference Include="..\Source\AppConsts.pas"/>
-			<BuildConfiguration Include="Debug">
-				<Key>Cfg_2</Key>
-				<CfgParent>Base</CfgParent>
-			</BuildConfiguration>
-			<BuildConfiguration Include="Basis">
-				<Key>Base</Key>
-			</BuildConfiguration>
-			<BuildConfiguration Include="Release">
-				<Key>Cfg_1</Key>
-				<CfgParent>Base</CfgParent>
-			</BuildConfiguration>
-		</ItemGroup>
-		<Import Condition="Exists('$(BDS)\Bin\CodeGear.Delphi.Targets')" Project="$(BDS)\Bin\CodeGear.Delphi.Targets"/>
-		<Import Condition="Exists('$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj')" Project="$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj"/>
-		<ProjectExtensions>
-			<Borland.Personality>Delphi.Personality.12</Borland.Personality>
-			<Borland.ProjectType>VCLApplication</Borland.ProjectType>
-			<BorlandProject>
-				<Delphi.Personality>
-					<Source>
-						<Source Name="MainSource">DDevExtensionsReg.dpr</Source>
-					</Source>
-					<Parameters/>
-					<VersionInfo>
-						<VersionInfo Name="IncludeVerInfo">False</VersionInfo>
-						<VersionInfo Name="AutoIncBuild">False</VersionInfo>
-						<VersionInfo Name="MajorVer">2</VersionInfo>
-						<VersionInfo Name="MinorVer">5</VersionInfo>
-						<VersionInfo Name="Release">0</VersionInfo>
-						<VersionInfo Name="Build">95</VersionInfo>
-						<VersionInfo Name="Debug">False</VersionInfo>
-						<VersionInfo Name="PreRelease">False</VersionInfo>
-						<VersionInfo Name="Special">False</VersionInfo>
-						<VersionInfo Name="Private">False</VersionInfo>
-						<VersionInfo Name="DLL">False</VersionInfo>
-						<VersionInfo Name="Locale">1031</VersionInfo>
-						<VersionInfo Name="CodePage">1252</VersionInfo>
-					</VersionInfo>
-					<VersionInfoKeys>
-						<VersionInfoKeys Name="CompanyName">Andreas Hausladen</VersionInfoKeys>
-						<VersionInfoKeys Name="FileDescription"/>
-						<VersionInfoKeys Name="FileVersion">2.5.0.95</VersionInfoKeys>
-						<VersionInfoKeys Name="InternalName"/>
-						<VersionInfoKeys Name="LegalCopyright">(C) 2006-2011 Andreas Hausladen</VersionInfoKeys>
-						<VersionInfoKeys Name="LegalTrademarks"/>
-						<VersionInfoKeys Name="OriginalFilename"/>
-						<VersionInfoKeys Name="ProductName">DDevExtensions</VersionInfoKeys>
-						<VersionInfoKeys Name="ProductVersion">2.5</VersionInfoKeys>
-						<VersionInfoKeys Name="Comments"/>
-					</VersionInfoKeys>
-					<Excluded_Packages>
-						<Excluded_Packages Name="$(BDSBIN)\bcboffice2k160.bpl">Embarcadero C++Builder-Package für Office 2000-Server</Excluded_Packages>
-						<Excluded_Packages Name="$(BDSBIN)\bcbofficexp160.bpl">Embarcadero C++Builder-Package für Office XP-Server</Excluded_Packages>
-						<Excluded_Packages Name="$(BDSBIN)\dcloffice2k160.bpl">Microsoft Office 2000 Beispiele für gekapselte Komponenten für Automatisierungsserver</Excluded_Packages>
-						<Excluded_Packages Name="$(BDSBIN)\dclofficexp160.bpl">Microsoft Office XP Beispiele für gekapselte Komponenten für Automation Server</Excluded_Packages>
-					</Excluded_Packages>
-				</Delphi.Personality>
-				<Platforms>
-					<Platform value="Win64">False</Platform>
-					<Platform value="Win32">True</Platform>
-				</Platforms>
-			</BorlandProject>
-			<ProjectFileVersion>12</ProjectFileVersion>
-		</ProjectExtensions>
-	</Project>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+    <PropertyGroup>
+        <ProjectGuid>{2BAF01A7-5596-444B-89D1-47A1A4550C45}</ProjectGuid>
+        <MainSource>DDevExtensionsReg.dpr</MainSource>
+        <Config Condition="'$(Config)'==''">Release</Config>
+        <DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
+        <ProjectVersion>19.1</ProjectVersion>
+        <Basis>True</Basis>
+        <AppType>Application</AppType>
+        <FrameworkType>VCL</FrameworkType>
+        <Base>True</Base>
+        <Platform Condition="'$(Platform)'==''">Win32</Platform>
+        <TargetedPlatforms>1</TargetedPlatforms>
+        <Platform>Win32</Platform>
+    </PropertyGroup>
+    <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
+        <Base>true</Base>
+    </PropertyGroup>
+    <PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Base)'=='true') or '$(Base_Win32)'!=''">
+        <Base_Win32>true</Base_Win32>
+        <CfgParent>Base</CfgParent>
+        <Base>true</Base>
+    </PropertyGroup>
+    <PropertyGroup Condition="('$(Platform)'=='Win64' and '$(Base)'=='true') or '$(Base_Win64)'!=''">
+        <Base_Win64>true</Base_Win64>
+        <CfgParent>Base</CfgParent>
+        <Base>true</Base>
+    </PropertyGroup>
+    <PropertyGroup Condition="'$(Config)'=='Release' or '$(Cfg_1)'!=''">
+        <Cfg_1>true</Cfg_1>
+        <CfgParent>Base</CfgParent>
+        <Base>true</Base>
+    </PropertyGroup>
+    <PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_1)'=='true') or '$(Cfg_1_Win32)'!=''">
+        <Cfg_1_Win32>true</Cfg_1_Win32>
+        <CfgParent>Cfg_1</CfgParent>
+        <Cfg_1>true</Cfg_1>
+        <Base>true</Base>
+    </PropertyGroup>
+    <PropertyGroup Condition="'$(Config)'=='Debug' or '$(Cfg_2)'!=''">
+        <Cfg_2>true</Cfg_2>
+        <CfgParent>Base</CfgParent>
+        <Base>true</Base>
+    </PropertyGroup>
+    <PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_2)'=='true') or '$(Cfg_2_Win32)'!=''">
+        <Cfg_2_Win32>true</Cfg_2_Win32>
+        <CfgParent>Cfg_2</CfgParent>
+        <Cfg_2>true</Cfg_2>
+        <Base>true</Base>
+    </PropertyGroup>
+    <PropertyGroup Condition="'$(Base)'!=''">
+        <VerInfo_Build>575</VerInfo_Build>
+        <VerInfo_Locale>1031</VerInfo_Locale>
+        <VerInfo_Keys>CompanyName=Andreas Hausladen;FileVersion=2.7.0.575;InternalName=;LegalCopyright=(C) 2006-2013 Andreas Hausladen;LegalTrademarks=;OriginalFilename=;ProductName=DDevExtensions;ProductVersion=2.7;Comments=</VerInfo_Keys>
+        <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
+        <DCC_Namespace>Vcl;Vcl.Imaging;Vcl.Touch;Vcl.Samples;Vcl.Shell;System;Xml;Data;Datasnap;Web;Soap;Winapi;System.Win;$(DCC_Namespace)</DCC_Namespace>
+        <VerInfo_MajorVer>2</VerInfo_MajorVer>
+        <VerInfo_MinorVer>7</VerInfo_MinorVer>
+        <DCC_ImageBase>00400000</DCC_ImageBase>
+        <DCC_DependencyCheckOutputName>..\bin\InstallDDevExtensions.exe</DCC_DependencyCheckOutputName>
+        <DCC_MapFile>3</DCC_MapFile>
+        <DCC_GenerateStackFrames>true</DCC_GenerateStackFrames>
+        <DCC_UsePackage>vcl;rtl;vclx;$(DCC_UsePackage)</DCC_UsePackage>
+        <DCC_RangeChecking>true</DCC_RangeChecking>
+        <DCC_Platform>x86</DCC_Platform>
+        <DCC_ExeOutput>..\bin</DCC_ExeOutput>
+        <DCC_F>false</DCC_F>
+        <DCC_E>false</DCC_E>
+        <DCC_K>false</DCC_K>
+        <DCC_S>false</DCC_S>
+        <DCC_N>true</DCC_N>
+        <DCC_SymbolReferenceInfo>1</DCC_SymbolReferenceInfo>
+        <DCC_IntegerOverflowCheck>true</DCC_IntegerOverflowCheck>
+        <DCC_DcuOutput>.</DCC_DcuOutput>
+        <SanitizedProjectName>DDevExtensionsReg</SanitizedProjectName>
+    </PropertyGroup>
+    <PropertyGroup Condition="'$(Base_Win32)'!=''">
+        <UWP_DelphiLogo44>$(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_44.png</UWP_DelphiLogo44>
+        <UWP_DelphiLogo150>$(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_150.png</UWP_DelphiLogo150>
+    </PropertyGroup>
+    <PropertyGroup Condition="'$(Base_Win64)'!=''">
+        <UWP_DelphiLogo44>$(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_44.png</UWP_DelphiLogo44>
+        <UWP_DelphiLogo150>$(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_150.png</UWP_DelphiLogo150>
+    </PropertyGroup>
+    <PropertyGroup Condition="'$(Cfg_1)'!=''">
+        <DCC_LocalDebugSymbols>false</DCC_LocalDebugSymbols>
+        <DCC_Define>RELEASE;$(DCC_Define)</DCC_Define>
+        <DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
+        <DCC_DebugInformation>0</DCC_DebugInformation>
+    </PropertyGroup>
+    <PropertyGroup Condition="'$(Cfg_1_Win32)'!=''">
+        <BT_BuildType>Debug</BT_BuildType>
+        <Manifest_File>(Ohne)</Manifest_File>
+    </PropertyGroup>
+    <PropertyGroup Condition="'$(Cfg_2)'!=''">
+        <VerInfo_MinorVer>7</VerInfo_MinorVer>
+        <DCC_Define>DEBUG;$(DCC_Define)</DCC_Define>
+    </PropertyGroup>
+    <PropertyGroup Condition="'$(Cfg_2_Win32)'!=''">
+        <BT_BuildType>Debug</BT_BuildType>
+        <Manifest_File>(Ohne)</Manifest_File>
+    </PropertyGroup>
+    <ItemGroup>
+        <DelphiCompile Include="$(MainSource)">
+            <MainSource>MainSource</MainSource>
+        </DelphiCompile>
+        <DCCReference Include="Main.pas">
+            <Form>FormMain</Form>
+        </DCCReference>
+        <DCCReference Include="..\Source\AppConsts.pas"/>
+        <BuildConfiguration Include="Debug">
+            <Key>Cfg_2</Key>
+            <CfgParent>Base</CfgParent>
+        </BuildConfiguration>
+        <BuildConfiguration Include="Base">
+            <Key>Base</Key>
+        </BuildConfiguration>
+        <BuildConfiguration Include="Release">
+            <Key>Cfg_1</Key>
+            <CfgParent>Base</CfgParent>
+        </BuildConfiguration>
+    </ItemGroup>
+    <Import Condition="Exists('$(BDS)\Bin\CodeGear.Delphi.Targets')" Project="$(BDS)\Bin\CodeGear.Delphi.Targets"/>
+    <Import Condition="Exists('$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj')" Project="$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj"/>
+    <ProjectExtensions>
+        <Borland.Personality>Delphi.Personality.12</Borland.Personality>
+        <Borland.ProjectType>VCLApplication</Borland.ProjectType>
+        <BorlandProject>
+            <Delphi.Personality>
+                <Source>
+                    <Source Name="MainSource">DDevExtensionsReg.dpr</Source>
+                </Source>
+                <Parameters/>
+                <VersionInfo>
+                    <VersionInfo Name="IncludeVerInfo">False</VersionInfo>
+                    <VersionInfo Name="AutoIncBuild">False</VersionInfo>
+                    <VersionInfo Name="MajorVer">2</VersionInfo>
+                    <VersionInfo Name="MinorVer">5</VersionInfo>
+                    <VersionInfo Name="Release">0</VersionInfo>
+                    <VersionInfo Name="Build">95</VersionInfo>
+                    <VersionInfo Name="Debug">False</VersionInfo>
+                    <VersionInfo Name="PreRelease">False</VersionInfo>
+                    <VersionInfo Name="Special">False</VersionInfo>
+                    <VersionInfo Name="Private">False</VersionInfo>
+                    <VersionInfo Name="DLL">False</VersionInfo>
+                    <VersionInfo Name="Locale">1031</VersionInfo>
+                    <VersionInfo Name="CodePage">1252</VersionInfo>
+                </VersionInfo>
+                <VersionInfoKeys>
+                    <VersionInfoKeys Name="CompanyName">Andreas Hausladen</VersionInfoKeys>
+                    <VersionInfoKeys Name="FileDescription"/>
+                    <VersionInfoKeys Name="FileVersion">2.5.0.95</VersionInfoKeys>
+                    <VersionInfoKeys Name="InternalName"/>
+                    <VersionInfoKeys Name="LegalCopyright">(C) 2006-2011 Andreas Hausladen</VersionInfoKeys>
+                    <VersionInfoKeys Name="LegalTrademarks"/>
+                    <VersionInfoKeys Name="OriginalFilename"/>
+                    <VersionInfoKeys Name="ProductName">DDevExtensions</VersionInfoKeys>
+                    <VersionInfoKeys Name="ProductVersion">2.5</VersionInfoKeys>
+                    <VersionInfoKeys Name="Comments"/>
+                </VersionInfoKeys>
+                <Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\dcloffice2k270.bpl">Microsoft Office 2000 Beispiele für gekapselte Komponenten für Automatisierungsserver</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\dclofficexp270.bpl">Microsoft Office XP Beispiele für gekapselte Komponenten für Automation Server</Excluded_Packages>
+                </Excluded_Packages>
+            </Delphi.Personality>
+            <Platforms>
+                <Platform value="Win32">True</Platform>
+                <Platform value="Win64">False</Platform>
+            </Platforms>
+        </BorlandProject>
+        <ProjectFileVersion>12</ProjectFileVersion>
+    </ProjectExtensions>
+</Project>
diff --git a/Code/DDevExtensions/Installer/DDevExtensionsReg.res b/Code/DDevExtensions/Installer/DDevExtensionsReg.res
index 52a79b65c221a755886ec4f2743b422253954599..e2653050b8eccc7fabe2b5e22e08b08b162e8964 100644
GIT binary patch
literal 676
zcma))$xZ@66h&{7PKazYegO*>nkZ?p(T$N1aUj7VNZ2Zo7D*5YgVDXe<=?pX4{Xn?
zwiQ`fNmaeN@78@ol_cevahy!dKckRI{cCVM=L@vrr=&tA#BA$YH>}5MV%2r23(j@c
z6KorA{>P`}DXWYsXxeV0;#SE76ZLO^?G?a7Z>EX*8mfm{Ujs!b4|T5*oLk2U6e`d@
zGb9JgsHS!99>ICkSRME;WYggkxd2s=F1iueRC%4T&#?yVUC<${P&qWxm~GGrj6Ry?
zl}aiSvq;pU%2;KvE?S-%aC;~XTn1xeTLnEmP>Zwyx(Tnu%|LtFcGiw|!Tyuip;n1;
zh31HObKRl3SX+(iBR$cHXFOI*n)TGu))w7fzQ0^uQk(VB-k?n_lb=rfc3&#Emuum*
t9w+^qE%Yeszx(#m2h2Fmk#&O_Tkc;pb&gf#&zzELi<eHu;{Wo1z5wsPTfzVU

literal 5796
zcmeI0U2Gd!6~~V^L6e2Twl5VAl^FcAMQT2nrjRPxZfZVM(Lfcpkf-gs&P;1zdyL14
zos?BZLaL_<tE@n(80|w=2oO|4tol^dsn!CChwVJKR3ciUYPHBQvg;RH&C<*N+?lZ_
zZCY01fd_i*-`sodIrrXk&mGU)gosE5LinJ%OJ0tJ_5t`nf$ZO}42DiGvkp`cBfq(Z
z`krDF;Y&7OxQ2@Spsdwu2ta;iEWRSpgbxQtq~!TxlX&ZGE=y}y94^bwi&a^!66>u?
zs~^g;QvI;&*h<TJ^RG(DR`N~>Vy|?Zvg0^;rBp7&<0E-egkMrAD5>x(ZYL^SyY@#e
zS1^D6XJ10NF99V2(qY3P1XWr8JIWULB*MkdMDzFpEYHg0khH(*r(4#e7n>Da?4V)?
z3g@u)w;KKSgBA@A4${!j5bfKyj}9C-KnD*Vq(g@eQ9K@}!-o&k*|TS9W@d&?o;*nt
z6B8tUg2bLVLwD#G<TV5}@BD>6{`e04;rDNohUpC80uOM51`OZ=4+y|c8ZdwhJRksf
z)PMn8-~j=6Fbx>M1s)KrW4m48$!*s#ora+`45OiohC2e2Api{+zy%%<fP>P20bJk#
z0XR?%7{CP{5P*Z%fB{_K0Rc2D$N(<zfB+aAGaK^b;_3kbc+na#fD1ez04G8N25^A~
zI58S9fD1ez04GZWF7SW=oIDM<zyks^dbn~DT_lu09w(PG109~2+l2?(kZcVY?1$0=
z0(A|24ek#-AOLTO1`Ihr+EEw5CTZ9x19car2Sl)O$c)SYTIGi~Si@!-zy%%<fHzkI
z2IhBBdO)Dg8?FHZxWEGf@J*lr1GvBg0^ovNpdItOC_Ny!4YPA*5ShH0Gz~ifT;Kr#
z_=eJefw^6j9uTNwAjE)n-~tZ_fWZ+1+JOr^Ab^JFkbyZ}lpYYgx4bXFkYlo4&~NC=
zbne_a!t;hMU%pINuU@6ww{O$+>(}Y--Mh58xk>l$-=})LP7fYDpl-KIVy8v#zWZzZ
zrfpsc){AdY!Aw#Ko`Y=dO9Kz2h7ii5hkhIMhN1}Np#lTM*A;rWvlG!#5AA{)JIc-@
z(btv64s-zzId;#pA?Ip9Zv=w5gurz8N@-v|h|(~ZXUAqv3+OVshWQaU_&U3oA8|vV
z!^K?YhKPQerLVVqY0!WB9R3F$y()qdg5PHY9N!b~GZk&Gg7AH2`;Tk1JSMjPybqtl
z*gQOm@j>}1-e)|RQrb17QhsX_FE^HQ7q5_&HD}ZH8&=lryi)1@>z<3Zn{Tfu<rU}N
zFMS>Ma;Z}3-g8#p3+?4{Isf8nRqBDAsCvWh*&Vz&;ln!H%hfCIDV2(}uZULV(v5d+
ziO?=u<<gbvt!}5n?szM<DwTJtn`>+3AqOEqcbrSNHXV-J$@{wU<|bajrBbNB)G3wt
zbt>}sapWBbCMgI(>T+bh*oqLHAxFWhnx(?OC3HZm6b=D>hm<znXLyavkl>)SZ~Rm{
ze$Ch6th9F=O$&6MqWwNQ_;wzny~7R>{e5<b=&S4y(H(Y(>g*8FBk}O~k$9n!Tm~<N
z#3M!2x-n79lc=e*QbPv837<DmGNDcbsK)?3j?K3z=mMNKVvhix7BSI%2A|Nt?{LIW
z(b4}M45Id|-vOK<w(lnE(TmLrF1YPw#SWC`=aJ{<k>}?ToC*Ga&LcR|BoYaJ4D2QK
zdbPUsr@66R9*qsLArCrKR}|kqx*i##0rLjoBvEhTj8Wa18yj6;k2v`KI}O@y!lAmw
z=61V3K+wNaZ$dD^D6Ej4L)gE*AsvWdM6GZ4=kL@vHsHa_!ucg?m+^NR^`En_z14!p
zll|N6_4T<qqGm_5qW$?DLFnIxb=I<OHam)FwIco5-hcy}%Ud^_?9emw2~76y)aPbr
zt*xz_7@(sh<ata+>)Sh>PF;3~z1fl7l_sChg8s16_BMuxJ(0iyaEwzPvkUQ0$o4jm
zC`H=YmC(H-&wi|hBFD!qfpf03b2z)C`8j`jAszVOx=S#8Fq9l2@C_#yGCUry;ZFg3
zEFyh-;K25s<>fI5{`8GS?Ec7X|MTmi!!ElY2Z`A0J%`<Pxh&Z~blBUD{(-~Z_T`?#
zQ|vv5r`e?gmbtfm@B9RtB5#FWdZYOX9JU`5oFD$j=a^Rz*(ea=3p7L1bc((U67)Tk
zp+x^*g`*J-;>5pSmi*tX7&N{P5&w_o1yWVt#(yacK=W;UUgG1=>;MJlrY~YnbcaO8
zpFB~{X4FN!V5QC6RD5iBG_LBolsTWyU6_iWeeGLEz8+VtVlp?M%$PZSD!!y!@e{9n
z{<D)w%hI#wGfOH4$XQeIg+lJQmAa^Blh%=JI#n<&(<mNEnc3q>D?7Y67FV;$T-wmB
z;t!&;VJKDY4R&f?&lS_fC2myJ;!++nmeM)xt8u?2m&~FiVb1H{){_NwcKRFY_lpbj
zX*00*7cxFPI;>5MYs1?3*w-+*-#=e4Q@UlDh3P`-V!EiOiVFn{_?7sGAIH3&*K>#=
zwIp>!7Pb_pgY^c6rv|-u;N0p5KNIF=_=oA-yjik_6J|DR=8h!HT(MwgtY9hJqqm%6
zSPecAQ-0xmCY}0@zVw>;BON<;Y<yz;{IR2BM~|jb#@M_Oam^%i7Z#Ei<U0K{@Yw$$
z6<FWM-fQo-2U(gd78b1HshnYc%6mbJhuO9C)ItIK-A`&k|M3Fu5q<tlA-$N+=ofUW
zXGBar^Eb=rTEtCzT3^&N{bi|Yh8w2hN$XT@5xFTuGNGyq>FE^T0aI}!nX&X>-#H(=
b;NIv@Og=fXE7Zx6-kK5J<Vg5qfI{?dNZ7m2

diff --git a/Code/DDevExtensions/Source/version.inc b/Code/DDevExtensions/Source/version.inc
index 6df04f9..a801d44 100644
--- a/Code/DDevExtensions/Source/version.inc
+++ b/Code/DDevExtensions/Source/version.inc
@@ -1 +1 @@
-VersionNumber = '2.86'; 
+VersionNumber = '2.87'; 
diff --git a/Code/DDevExtensions/Version.res b/Code/DDevExtensions/Version.res
index 95d11fd46ed3e64182c0751082d12c8100f5c6f8..093ed95d74a375ad555d2d80506b31fb1c409953 100644
GIT binary patch
delta 33
lcmaFB_JD0d0cSV^69Wi@Z>$t#WHjI0&Dag3CW|wB0sxY`2lD^`

delta 33
lcmaFB_JD0d0cRKk69Wi@ZLAbzWHj5{&Dag3CW|wB0sxYJ2k!s?

diff --git a/Code/DDevExtensions/build.bat b/Code/DDevExtensions/build.bat
index 5308c20..00ef599 100644
--- a/Code/DDevExtensions/build.bat
+++ b/Code/DDevExtensions/build.bat
@@ -4,7 +4,7 @@ SETLOCAL
 :: *************************
 :: * rebuild with Delphi 2009 (much smaller file). XE2 is required for the .res file
 REM Set BuildInstallerWith="C:\CodeGear\RAD Studio\6.0\bin\rsvars.bat"
-Set BuildInstallerWith="C:\Program Files (x86)\Embarcadero\Studio\18.0\bin\rsvars.bat"
+Set BuildInstallerWith="C:\Program Files (x86)\Embarcadero\Studio\21.0\bin\rsvars.bat"
 
 SET curdir=%CD%
 cd /d "%~dp0"
@@ -34,7 +34,7 @@ del version.h
 
 :: **********************************************************************************************
 
-SET LINKMAPFILE=C:\CodeGear\Tools\linkmapfile.exe
+SET LINKMAPFILE=..\..\Tools\LinkMapFile\linkmapfile.exe
 
 :: Delete intermediate files
 del /Q D_2009\lib\*.dcu >NUL
@@ -53,7 +53,6 @@ del /Q D_D102\lib\*.dcu >NUL
 del /Q D_D103\lib\*.dcu >NUL
 del /Q D_D104\lib\*.dcu >NUL
 
-
 echo.
 echo === Installer ==============================
 cd Installer
diff --git a/Code/DDevExtensions/version.bat b/Code/DDevExtensions/version.bat
index 0d92287..fba071e 100644
--- a/Code/DDevExtensions/version.bat
+++ b/Code/DDevExtensions/version.bat
@@ -1,2 +1,2 @@
 @SET majorversion=2
-@SET minorversion=86
+@SET minorversion=87
diff --git a/README.md b/README.md
index f07af0d..0b651e7 100644
--- a/README.md
+++ b/README.md
@@ -3,14 +3,14 @@ Homepage: https://www.idefixpack.de/ddev
 
 DDevExtensions adds new features to RAD Studio.
 
-Supported Delphi Versions 10.2 and 10.3
+Supported Delphi Versions 10.2, 10.3 and 10.4
 
 ## Compile
 
-Requires: jedi\jedi.inc file in the IDE's source path.
+Requires: jedi\jedi.inc file (from https://github.com/project-jedi/jedi) in the IDE's source path.
 
 In the `Code\DDevExtensions folder` open the `DDevExtensions.groupproj` file in the Delphi IDE.
-The file is in the D_D102 (Delphi 10.2), D_D103 (Delphi 10.3), ... folder.
+The file is in the D_D102 (Delphi 10.2), D_D103 (Delphi 10.3), D_D104 (Delphi 10.4), ... folder.
 
 
 ## How to install
diff --git a/Shared/IDE/Options/FrmTreePages.dfm b/Shared/IDE/Options/FrmTreePages.dfm
index a685e30..9a2a08e 100644
--- a/Shared/IDE/Options/FrmTreePages.dfm
+++ b/Shared/IDE/Options/FrmTreePages.dfm
@@ -5,7 +5,6 @@ inherited FormTreePages: TFormTreePages
   Caption = 'TreePages'
   ClientHeight = 440
   ClientWidth = 701
-  Font.Name = 'Tahoma'
   OldCreateOrder = True
   Position = poScreenCenter
   OnCreate = FormCreate
diff --git a/Tools/LinkMapFile/ReadMe.md b/Tools/LinkMapFile/ReadMe.md
new file mode 100644
index 0000000..49df114
--- /dev/null
+++ b/Tools/LinkMapFile/ReadMe.md
@@ -0,0 +1,3 @@
+linkmapfile.exe created from
+
+https://github.com/project-jedi/jvcl/tree/master/jvcl/packages/bin
\ No newline at end of file