From 31abc55c8dd6714d8f48ed8c406b3c0e490ae284 Mon Sep 17 00:00:00 2001
From: Ansgar Becker <anse@heidisql.com>
Date: Tue, 17 Jan 2023 20:21:30 +0100
Subject: [PATCH] Disable ASLR and the same flag for 64 bit mode through base
 configuration. Include Vcl.Controls in dpr file, trying to fix some IDE
 explorer errors This version should be built with an updated madExcept 5.1.2,
 including a fix for ASLR.

---
 packages/Delphi11.2/heidisql.dpr   |  1 +
 packages/Delphi11.2/heidisql.dproj | 10 +++-------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/packages/Delphi11.2/heidisql.dpr b/packages/Delphi11.2/heidisql.dpr
index 6f6ad092..914d0efd 100644
--- a/packages/Delphi11.2/heidisql.dpr
+++ b/packages/Delphi11.2/heidisql.dpr
@@ -5,6 +5,7 @@ uses
   Vcl.Forms,
   System.SysUtils,
   Vcl.Dialogs,
+  Vcl.Controls,
   Winapi.Windows,
   main in '..\..\source\main.pas' {MainForm},
   about in '..\..\source\about.pas' {AboutBox},
diff --git a/packages/Delphi11.2/heidisql.dproj b/packages/Delphi11.2/heidisql.dproj
index 6306aa1c..8d1f0cb5 100644
--- a/packages/Delphi11.2/heidisql.dproj
+++ b/packages/Delphi11.2/heidisql.dproj
@@ -3,7 +3,7 @@
         <ProjectGuid>{32493ED6-4F48-45D7-9D50-E4FA13F59063}</ProjectGuid>
         <MainSource>heidisql.dpr</MainSource>
         <Base>True</Base>
-        <Config Condition="'$(Config)'==''">Release</Config>
+        <Config Condition="'$(Config)'==''">Debug</Config>
         <TargetedPlatforms>3</TargetedPlatforms>
         <AppType>Application</AppType>
         <FrameworkType>VCL</FrameworkType>
@@ -75,6 +75,8 @@
         <VerInfo_Locale>1033</VerInfo_Locale>
         <SanitizedProjectName>heidisql</SanitizedProjectName>
         <DCC_Namespace>Vcl;System;Winapi;System.Win;Data;$(DCC_Namespace)</DCC_Namespace>
+        <DCC_DynamicBase>false</DCC_DynamicBase>
+        <DCC_HighEntropyVa>false</DCC_HighEntropyVa>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Base_Win32)'!=''">
         <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
@@ -103,20 +105,15 @@
         <DCC_MapFile>3</DCC_MapFile>
         <DCC_DebugInformation>2</DCC_DebugInformation>
         <DCC_LocalDebugSymbols>true</DCC_LocalDebugSymbols>
-        <DCC_DynamicBase>false</DCC_DynamicBase>
-        <AppDPIAwarenessMode>none</AppDPIAwarenessMode>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_1_Win64)'!=''">
         <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
         <VerInfo_Keys>CompanyName=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName);FileDescription=$(MSBuildProjectName);ProductName=$(MSBuildProjectName)</VerInfo_Keys>
         <BT_BuildType>Debug</BT_BuildType>
-        <AppDPIAwarenessMode>none</AppDPIAwarenessMode>
         <DCC_DebugInformation>2</DCC_DebugInformation>
         <DCC_LocalDebugSymbols>true</DCC_LocalDebugSymbols>
         <DCC_Define>madExcept;$(DCC_Define)</DCC_Define>
         <DCC_MapFile>3</DCC_MapFile>
-        <DCC_HighEntropyVa>false</DCC_HighEntropyVa>
-        <DCC_DynamicBase>false</DCC_DynamicBase>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_2)'!=''">
         <DCC_GenerateStackFrames>true</DCC_GenerateStackFrames>
@@ -137,7 +134,6 @@
         <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
         <VerInfo_Keys>CompanyName=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName);FileDescription=$(MSBuildProjectName);ProductName=$(MSBuildProjectName)</VerInfo_Keys>
         <DCC_MapFile>3</DCC_MapFile>
-        <AppEnableRuntimeThemes>true</AppEnableRuntimeThemes>
         <BT_BuildType>Debug</BT_BuildType>
         <AppDPIAwarenessMode>PerMonitorV2</AppDPIAwarenessMode>
         <DCC_Define>madExcept;$(DCC_Define)</DCC_Define>