Skip to content

Commit 1daf104

Browse files
joachimmardermodersohn
joachimmarder
authored and
modersohn
committed
Remainiung chnage for issue JAM-Software#1007 
1 parent 867ef8f commit 1daf104

File tree

3 files changed

+62
-73
lines changed

3 files changed

+62
-73
lines changed

‎Demos/Advanced/Advanced.dproj

Lines changed: 28 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
22
<PropertyGroup>
3-
<ProjectGuid>{E5FD8257-AE07-4A8D-AB79-44170493F9A2}</ProjectGuid>
4-
<MainSource>Advanced.dpr</MainSource>
53
<Base>True</Base>
6-
<Config Condition="'$(Config)'==''">Debug</Config>
7-
<TargetedPlatforms>1</TargetedPlatforms>
84
<AppType>Application</AppType>
5+
<Config Condition="'$(Config)'==''">Debug</Config>
96
<FrameworkType>VCL</FrameworkType>
10-
<ProjectVersion>19.0</ProjectVersion>
7+
<MainSource>Advanced.dpr</MainSource>
118
<Platform Condition="'$(Platform)'==''">Win32</Platform>
9+
<ProjectGuid>{E5FD8257-AE07-4A8D-AB79-44170493F9A2}</ProjectGuid>
10+
<ProjectVersion>19.1</ProjectVersion>
11+
<TargetedPlatforms>1</TargetedPlatforms>
1212
</PropertyGroup>
1313
<PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
1414
<Base>true</Base>
@@ -36,48 +36,43 @@
3636
</PropertyGroup>
3737
<PropertyGroup Condition="'$(Base)'!=''">
3838
<SanitizedProjectName>Advanced</SanitizedProjectName>
39-
<DCC_F>false</DCC_F>
40-
<DCC_RangeChecking>true</DCC_RangeChecking>
41-
<VerInfo_Keys>FileVersion=1.0.0.0</VerInfo_Keys>
42-
<VerInfo_Locale>1031</VerInfo_Locale>
43-
<DCC_E>false</DCC_E>
44-
<DCC_UsePackage>C:\windows\microsoft.net\framework\v1.1.4322\system.dll;C:\windows\microsoft.net\framework\v1.1.4322\system.data.dll;C:\windows\microsoft.net\framework\v1.1.4322\system.drawing.dll;C:\windows\microsoft.net\framework\v1.1.4322\system.windows.forms.dll;C:\windows\microsoft.net\framework\v1.1.4322\system.xml.dll;vcl;rtl;$(DCC_UsePackage)</DCC_UsePackage>
45-
<DCC_MinStackSize>4096</DCC_MinStackSize>
46-
<DCC_IntegerOverflowCheck>true</DCC_IntegerOverflowCheck>
4739
<DCC_ImageBase>00400000</DCC_ImageBase>
48-
<DCC_N>true</DCC_N>
49-
<DCC_K>false</DCC_K>
40+
<DCC_IntegerOverflowCheck>true</DCC_IntegerOverflowCheck>
41+
<DCC_MinStackSize>4096</DCC_MinStackSize>
5042
<DCC_Namespace>Vcl;Vcl.Imaging;Vcl.Touch;Vcl.Samples;Vcl.Shell;System;Xml;Data;Datasnap;Web;Soap;Winapi;$(DCC_Namespace)</DCC_Namespace>
51-
<DCC_S>false</DCC_S>
5243
<DCC_Optimize>false</DCC_Optimize>
44+
<DCC_RangeChecking>true</DCC_RangeChecking>
5345
<DCC_UnitSearchPath>..\..\Source;..\..\Common;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
46+
<DCC_UsePackage>C:\windows\microsoft.net\framework\v1.1.4322\system.dll;C:\windows\microsoft.net\framework\v1.1.4322\system.data.dll;C:\windows\microsoft.net\framework\v1.1.4322\system.drawing.dll;C:\windows\microsoft.net\framework\v1.1.4322\system.windows.forms.dll;C:\windows\microsoft.net\framework\v1.1.4322\system.xml.dll;vcl;rtl;$(DCC_UsePackage)</DCC_UsePackage>
47+
<VerInfo_Keys>FileVersion=1.0.0.0</VerInfo_Keys>
48+
<VerInfo_Locale>1031</VerInfo_Locale>
5449
</PropertyGroup>
5550
<PropertyGroup Condition="'$(Base_Win32)'!=''">
56-
<VerInfo_Locale>1033</VerInfo_Locale>
57-
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
51+
<AppEnableRuntimeThemes>true</AppEnableRuntimeThemes>
5852
<DCC_Namespace>System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
5953
<Manifest_File>$(BDS)\bin\default_app.manifest</Manifest_File>
60-
<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>
61-
<AppEnableRuntimeThemes>true</AppEnableRuntimeThemes>
62-
<UWP_DelphiLogo44>$(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_44.png</UWP_DelphiLogo44>
6354
<UWP_DelphiLogo150>$(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_150.png</UWP_DelphiLogo150>
55+
<UWP_DelphiLogo44>$(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_44.png</UWP_DelphiLogo44>
56+
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
57+
<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>
58+
<VerInfo_Locale>1033</VerInfo_Locale>
6459
</PropertyGroup>
6560
<PropertyGroup Condition="'$(Cfg_1)'!=''">
66-
<DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
67-
<DCC_LocalDebugSymbols>false</DCC_LocalDebugSymbols>
6861
<DCC_Define>RELEASE;$(DCC_Define)</DCC_Define>
62+
<DCC_LocalDebugSymbols>false</DCC_LocalDebugSymbols>
63+
<DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
6964
</PropertyGroup>
7065
<PropertyGroup Condition="'$(Cfg_2)'!=''">
71-
<DCC_GenerateStackFrames>true</DCC_GenerateStackFrames>
7266
<DCC_Define>DEBUG;$(DCC_Define)</DCC_Define>
67+
<DCC_GenerateStackFrames>true</DCC_GenerateStackFrames>
7368
</PropertyGroup>
7469
<PropertyGroup Condition="'$(Cfg_2_Win32)'!=''">
75-
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
76-
<VerInfo_Locale>1033</VerInfo_Locale>
77-
<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>
78-
<AppEnableRuntimeThemes>true</AppEnableRuntimeThemes>
7970
<AppDPIAwarenessMode>PerMonitorV2</AppDPIAwarenessMode>
71+
<AppEnableRuntimeThemes>true</AppEnableRuntimeThemes>
8072
<BT_BuildType>Debug</BT_BuildType>
73+
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
74+
<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>
75+
<VerInfo_Locale>1033</VerInfo_Locale>
8176
</PropertyGroup>
8277
<ItemGroup>
8378
<DelphiCompile Include="$(MainSource)">
@@ -123,17 +118,17 @@
123118
<DCCReference Include="States.pas">
124119
<Form>StateForm</Form>
125120
</DCCReference>
126-
<BuildConfiguration Include="Debug">
127-
<Key>Cfg_2</Key>
128-
<CfgParent>Base</CfgParent>
129-
</BuildConfiguration>
130121
<BuildConfiguration Include="Base">
131122
<Key>Base</Key>
132123
</BuildConfiguration>
133124
<BuildConfiguration Include="Release">
134125
<Key>Cfg_1</Key>
135126
<CfgParent>Base</CfgParent>
136127
</BuildConfiguration>
128+
<BuildConfiguration Include="Debug">
129+
<Key>Cfg_2</Key>
130+
<CfgParent>Base</CfgParent>
131+
</BuildConfiguration>
137132
</ItemGroup>
138133
<ProjectExtensions>
139134
<Borland.Personality>Delphi.Personality.12</Borland.Personality>
@@ -143,6 +138,7 @@
143138
<Source>
144139
<Source Name="MainSource">Advanced.dpr</Source>
145140
</Source>
141+
<Excluded_Packages/>
146142
<VersionInfo>
147143
<VersionInfo Name="IncludeVerInfo">False</VersionInfo>
148144
<VersionInfo Name="AutoIncBuild">False</VersionInfo>
@@ -161,11 +157,6 @@
161157
<VersionInfoKeys>
162158
<VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys>
163159
</VersionInfoKeys>
164-
<Excluded_Packages>
165-
<Excluded_Packages Name="$(BDSBIN)\DataExplorerDBXPluginEnt260.bpl">DBExpress Enterprise Data Explorer Integration</Excluded_Packages>
166-
<Excluded_Packages Name="$(BDSBIN)\dcloffice2k260.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
167-
<Excluded_Packages Name="$(BDSBIN)\dclofficexp260.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
168-
</Excluded_Packages>
169160
</Delphi.Personality>
170161
<Platforms>
171162
<Platform value="Win32">True</Platform>

‎Demos/Minimal/Minimal.dproj

Lines changed: 33 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
22
<PropertyGroup>
3-
<ProjectGuid>{9ED56071-1730-40BE-A992-27309A7C55CB}</ProjectGuid>
4-
<MainSource>Minimal.dpr</MainSource>
53
<Base>True</Base>
6-
<Config Condition="'$(Config)'==''">Debug</Config>
7-
<TargetedPlatforms>1</TargetedPlatforms>
84
<AppType>Application</AppType>
5+
<Config Condition="'$(Config)'==''">Debug</Config>
96
<FrameworkType>VCL</FrameworkType>
10-
<ProjectVersion>14.4</ProjectVersion>
7+
<MainSource>Minimal.dpr</MainSource>
118
<Platform Condition="'$(Platform)'==''">Win32</Platform>
9+
<ProjectGuid>{9ED56071-1730-40BE-A992-27309A7C55CB}</ProjectGuid>
10+
<ProjectVersion>18.8</ProjectVersion>
11+
<TargetedPlatforms>1</TargetedPlatforms>
1212
</PropertyGroup>
1313
<PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
1414
<Base>true</Base>
@@ -18,11 +18,6 @@
1818
<CfgParent>Base</CfgParent>
1919
<Base>true</Base>
2020
</PropertyGroup>
21-
<PropertyGroup Condition="('$(Platform)'=='Win64' and '$(Base)'=='true') or '$(Base_Win64)'!=''">
22-
<Base_Win64>true</Base_Win64>
23-
<CfgParent>Base</CfgParent>
24-
<Base>true</Base>
25-
</PropertyGroup>
2621
<PropertyGroup Condition="'$(Config)'=='Release' or '$(Cfg_1)'!=''">
2722
<Cfg_1>true</Cfg_1>
2823
<CfgParent>Base</CfgParent>
@@ -33,43 +28,46 @@
3328
<CfgParent>Base</CfgParent>
3429
<Base>true</Base>
3530
</PropertyGroup>
31+
<PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_2)'=='true') or '$(Cfg_2_Win32)'!=''">
32+
<Cfg_2_Win32>true</Cfg_2_Win32>
33+
<CfgParent>Cfg_2</CfgParent>
34+
<Cfg_2>true</Cfg_2>
35+
<Base>true</Base>
36+
</PropertyGroup>
3637
<PropertyGroup Condition="'$(Base)'!=''">
3738
<SanitizedProjectName>Minimal</SanitizedProjectName>
38-
<DCC_SymbolReferenceInfo>1</DCC_SymbolReferenceInfo>
39-
<DCC_F>false</DCC_F>
40-
<VerInfo_Locale>1031</VerInfo_Locale>
41-
<DCC_UsePackage>vcl;rtl;vclx;$(DCC_UsePackage)</DCC_UsePackage>
42-
<DCC_E>false</DCC_E>
43-
<DCC_MapFile>3</DCC_MapFile>
44-
<VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
4539
<DCC_ImageBase>00400000</DCC_ImageBase>
40+
<DCC_MapFile>3</DCC_MapFile>
4641
<DCC_Namespace>Vcl;Vcl.Imaging;Vcl.Touch;Vcl.Samples;Vcl.Shell;System;Xml;Data;Datasnap;Web;Soap;Winapi;$(DCC_Namespace)</DCC_Namespace>
47-
<DCC_K>false</DCC_K>
48-
<DCC_S>false</DCC_S>
42+
<DCC_SymbolReferenceInfo>1</DCC_SymbolReferenceInfo>
4943
<DCC_UnitSearchPath>..\..\Source;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
50-
<DCC_N>true</DCC_N>
44+
<DCC_UsePackage>vcl;rtl;vclx;$(DCC_UsePackage)</DCC_UsePackage>
45+
<VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
46+
<VerInfo_Locale>1031</VerInfo_Locale>
5147
</PropertyGroup>
5248
<PropertyGroup Condition="'$(Base_Win32)'!=''">
53-
<AppEnableHighDPI>true</AppEnableHighDPI>
49+
<AppDPIAwarenessMode>PerMonitor</AppDPIAwarenessMode>
5450
<AppEnableRuntimeThemes>true</AppEnableRuntimeThemes>
55-
<VerInfo_Locale>1033</VerInfo_Locale>
56-
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
57-
<DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
51+
<DCC_Namespace>System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
5852
<Manifest_File>$(BDS)\bin\default_app.manifest</Manifest_File>
59-
</PropertyGroup>
60-
<PropertyGroup Condition="'$(Base_Win64)'!=''">
61-
<Icon_MainIcon>Minimal_Icon.ico</Icon_MainIcon>
53+
<UWP_DelphiLogo150>$(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_150.png</UWP_DelphiLogo150>
54+
<UWP_DelphiLogo44>$(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_44.png</UWP_DelphiLogo44>
55+
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
56+
<VerInfo_Locale>1033</VerInfo_Locale>
6257
</PropertyGroup>
6358
<PropertyGroup Condition="'$(Cfg_1)'!=''">
64-
<DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
65-
<DCC_LocalDebugSymbols>false</DCC_LocalDebugSymbols>
59+
<DCC_DebugInformation>0</DCC_DebugInformation>
6660
<DCC_Define>RELEASE;$(DCC_Define)</DCC_Define>
67-
<DCC_DebugInformation>false</DCC_DebugInformation>
61+
<DCC_LocalDebugSymbols>false</DCC_LocalDebugSymbols>
62+
<DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
6863
</PropertyGroup>
6964
<PropertyGroup Condition="'$(Cfg_2)'!=''">
65+
<DCC_Define>DEBUG;$(DCC_Define)</DCC_Define>
7066
<DCC_GenerateStackFrames>true</DCC_GenerateStackFrames>
7167
<DCC_Optimize>false</DCC_Optimize>
72-
<DCC_Define>DEBUG;$(DCC_Define)</DCC_Define>
68+
</PropertyGroup>
69+
<PropertyGroup Condition="'$(Cfg_2_Win32)'!=''">
70+
<BT_BuildType>Debug</BT_BuildType>
7371
</PropertyGroup>
7472
<ItemGroup>
7573
<DelphiCompile Include="$(MainSource)">
@@ -78,17 +76,17 @@
7876
<DCCReference Include="Main.pas">
7977
<Form>MainForm</Form>
8078
</DCCReference>
81-
<BuildConfiguration Include="Debug">
82-
<Key>Cfg_2</Key>
83-
<CfgParent>Base</CfgParent>
84-
</BuildConfiguration>
8579
<BuildConfiguration Include="Base">
8680
<Key>Base</Key>
8781
</BuildConfiguration>
8882
<BuildConfiguration Include="Release">
8983
<Key>Cfg_1</Key>
9084
<CfgParent>Base</CfgParent>
9185
</BuildConfiguration>
86+
<BuildConfiguration Include="Debug">
87+
<Key>Cfg_2</Key>
88+
<CfgParent>Base</CfgParent>
89+
</BuildConfiguration>
9290
</ItemGroup>
9391
<ProjectExtensions>
9492
<Borland.Personality>Delphi.Personality.12</Borland.Personality>

‎Source/VirtualTrees.WorkerThread.pas

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ class procedure TWorkerThread.AddTree(Tree: TBaseVirtualTree);
202202
WorkerThread.FWaiterList.UnlockList;
203203
end;
204204

205-
SetEvent(WorkEvent);
205+
SetEvent(WorkerThread.FWorkEvent);
206206
end;
207207

208208
//----------------------------------------------------------------------------------------------------------------------

0 commit comments

Comments
 (0)