Skip to content

Commit c34ca1e

Browse files
MWASoftwareMWASoftware
committed
Updated Delphi Project Files for Windows 11 and Delphi 12
1 parent 3d90e91 commit c34ca1e

File tree

6 files changed

+2282
-43
lines changed

6 files changed

+2282
-43
lines changed

‎Test/openssl-client/delphi_openssl_client.dproj‎

Lines changed: 1096 additions & 14 deletions
Large diffs are not rendered by default.

‎Test/openssl-server/delphi_openssl_server.dproj‎

Lines changed: 1085 additions & 11 deletions
Large diffs are not rendered by default.

‎Test/openssl-server/testserver.pas‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ function TOpenSSLServerTest.IsDirectoryEmpty(Path: string): boolean;
239239
var Rslt: TSearchRec;
240240
begin
241241
Result := true;
242-
if FindFirst(Path + DirectorySeparator + '*',faNormal or faSymLink,Rslt) = 0 then
242+
if FindFirst(Path + DirectorySeparator + '*',faNormal {$IFDEF POSIX}or faSymLink{$ENDIF},Rslt) = 0 then
243243
begin
244244
Result := false;
245245
FindClose(Rslt);

‎delphi/IndyTLSOpenSSL290.dproj‎

Lines changed: 96 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,43 @@
22
<PropertyGroup>
33
<ProjectGuid>{34520D67-BF4C-4506-884B-E99D31A6159A}</ProjectGuid>
44
<MainSource>IndyTLSOpenSSL290.dpk</MainSource>
5-
<ProjectVersion>18.1</ProjectVersion>
5+
<ProjectVersion>20.1</ProjectVersion>
66
<FrameworkType>None</FrameworkType>
77
<Base>True</Base>
8-
<Config Condition="'$(Config)'==''">Debug</Config>
9-
<Platform Condition="'$(Platform)'==''">Win32</Platform>
10-
<TargetedPlatforms>1</TargetedPlatforms>
8+
<Config Condition="'$(Config)'==''">Release</Config>
9+
<Platform Condition="'$(Platform)'==''">Win64</Platform>
10+
<TargetedPlatforms>3</TargetedPlatforms>
1111
<AppType>Package</AppType>
12+
<ProjectName Condition="'$(ProjectName)'==''">IndyTLSOpenSSL290</ProjectName>
1213
</PropertyGroup>
1314
<PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
1415
<Base>true</Base>
1516
</PropertyGroup>
17+
<PropertyGroup Condition="('$(Platform)'=='Android' and '$(Base)'=='true') or '$(Base_Android)'!=''">
18+
<Base_Android>true</Base_Android>
19+
<CfgParent>Base</CfgParent>
20+
<Base>true</Base>
21+
</PropertyGroup>
22+
<PropertyGroup Condition="('$(Platform)'=='Android64' and '$(Base)'=='true') or '$(Base_Android64)'!=''">
23+
<Base_Android64>true</Base_Android64>
24+
<CfgParent>Base</CfgParent>
25+
<Base>true</Base>
26+
</PropertyGroup>
1627
<PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Base)'=='true') or '$(Base_Win32)'!=''">
1728
<Base_Win32>true</Base_Win32>
1829
<CfgParent>Base</CfgParent>
1930
<Base>true</Base>
2031
</PropertyGroup>
32+
<PropertyGroup Condition="('$(Platform)'=='Win64' and '$(Base)'=='true') or '$(Base_Win64)'!=''">
33+
<Base_Win64>true</Base_Win64>
34+
<CfgParent>Base</CfgParent>
35+
<Base>true</Base>
36+
</PropertyGroup>
37+
<PropertyGroup Condition="('$(Platform)'=='Win64x' and '$(Base)'=='true') or '$(Base_Win64x)'!=''">
38+
<Base_Win64x>true</Base_Win64x>
39+
<CfgParent>Base</CfgParent>
40+
<Base>true</Base>
41+
</PropertyGroup>
2142
<PropertyGroup Condition="'$(Config)'=='Debug' or '$(Cfg_1)'!=''">
2243
<Cfg_1>true</Cfg_1>
2344
<CfgParent>Base</CfgParent>
@@ -29,31 +50,76 @@
2950
<Cfg_1>true</Cfg_1>
3051
<Base>true</Base>
3152
</PropertyGroup>
53+
<PropertyGroup Condition="('$(Platform)'=='Win64' and '$(Cfg_1)'=='true') or '$(Cfg_1_Win64)'!=''">
54+
<Cfg_1_Win64>true</Cfg_1_Win64>
55+
<CfgParent>Cfg_1</CfgParent>
56+
<Cfg_1>true</Cfg_1>
57+
<Base>true</Base>
58+
</PropertyGroup>
3259
<PropertyGroup Condition="'$(Config)'=='Release' or '$(Cfg_2)'!=''">
3360
<Cfg_2>true</Cfg_2>
3461
<CfgParent>Base</CfgParent>
3562
<Base>true</Base>
3663
</PropertyGroup>
64+
<PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_2)'=='true') or '$(Cfg_2_Win32)'!=''">
65+
<Cfg_2_Win32>true</Cfg_2_Win32>
66+
<CfgParent>Cfg_2</CfgParent>
67+
<Cfg_2>true</Cfg_2>
68+
<Base>true</Base>
69+
</PropertyGroup>
70+
<PropertyGroup Condition="('$(Platform)'=='Win64' and '$(Cfg_2)'=='true') or '$(Cfg_2_Win64)'!=''">
71+
<Cfg_2_Win64>true</Cfg_2_Win64>
72+
<CfgParent>Cfg_2</CfgParent>
73+
<Cfg_2>true</Cfg_2>
74+
<Base>true</Base>
75+
</PropertyGroup>
3776
<PropertyGroup Condition="'$(Base)'!=''">
3877
<GenDll>true</GenDll>
3978
<SanitizedProjectName>IndyTLSOpenSSL290</SanitizedProjectName>
4079
<DCC_CBuilderOutput>All</DCC_CBuilderOutput>
4180
<DCC_Namespace>System;Xml;Data;Datasnap;Web;Soap;$(DCC_Namespace)</DCC_Namespace>
4281
<GenPackage>true</GenPackage>
43-
<DCC_DcuOutput>.\$(Platform)\$(Config)</DCC_DcuOutput>
4482
<DCC_ExeOutput>.\$(Platform)\$(Config)</DCC_ExeOutput>
4583
<DCC_E>false</DCC_E>
4684
<DCC_N>false</DCC_N>
4785
<DCC_S>false</DCC_S>
4886
<DCC_F>false</DCC_F>
4987
<DCC_K>false</DCC_K>
88+
<VerInfo_Locale>2057</VerInfo_Locale>
89+
<DCC_UnitSearchPath>..\src;..\src\opensslHdrs;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
90+
<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>
91+
</PropertyGroup>
92+
<PropertyGroup Condition="'$(Base_Android)'!=''">
93+
<Android_LauncherIcon192>$(BDS)\bin\Artwork\Android\FM_LauncherIcon_192x192.png</Android_LauncherIcon192>
94+
<VerInfo_Keys>package=com.embarcadero.$(MSBuildProjectName);label=$(MSBuildProjectName);versionCode=1;versionName=1.0.0;persistent=False;restoreAnyVersion=False;installLocation=auto;largeHeap=False;theme=TitleBar;hardwareAccelerated=true;apiKey=</VerInfo_Keys>
95+
<BT_BuildType>Debug</BT_BuildType>
96+
<EnabledSysJars>activity-1.7.2.dex.jar;annotation-experimental-1.3.0.dex.jar;annotation-jvm-1.6.0.dex.jar;annotations-13.0.dex.jar;appcompat-1.2.0.dex.jar;appcompat-resources-1.2.0.dex.jar;billing-6.0.1.dex.jar;biometric-1.1.0.dex.jar;browser-1.4.0.dex.jar;cloud-messaging.dex.jar;collection-1.1.0.dex.jar;concurrent-futures-1.1.0.dex.jar;core-1.10.1.dex.jar;core-common-2.2.0.dex.jar;core-ktx-1.10.1.dex.jar;core-runtime-2.2.0.dex.jar;cursoradapter-1.0.0.dex.jar;customview-1.0.0.dex.jar;documentfile-1.0.0.dex.jar;drawerlayout-1.0.0.dex.jar;error_prone_annotations-2.9.0.dex.jar;exifinterface-1.3.6.dex.jar;firebase-annotations-16.2.0.dex.jar;firebase-common-20.3.1.dex.jar;firebase-components-17.1.0.dex.jar;firebase-datatransport-18.1.7.dex.jar;firebase-encoders-17.0.0.dex.jar;firebase-encoders-json-18.0.0.dex.jar;firebase-encoders-proto-16.0.0.dex.jar;firebase-iid-interop-17.1.0.dex.jar;firebase-installations-17.1.3.dex.jar;firebase-installations-interop-17.1.0.dex.jar;firebase-measurement-connector-19.0.0.dex.jar;firebase-messaging-23.1.2.dex.jar;fmx.dex.jar;fragment-1.2.5.dex.jar;google-play-licensing.dex.jar;interpolator-1.0.0.dex.jar;javax.inject-1.dex.jar;kotlin-stdlib-1.8.22.dex.jar;kotlin-stdlib-common-1.8.22.dex.jar;kotlin-stdlib-jdk7-1.8.22.dex.jar;kotlin-stdlib-jdk8-1.8.22.dex.jar;kotlinx-coroutines-android-1.6.4.dex.jar;kotlinx-coroutines-core-jvm-1.6.4.dex.jar;legacy-support-core-utils-1.0.0.dex.jar;lifecycle-common-2.6.1.dex.jar;lifecycle-livedata-2.6.1.dex.jar;lifecycle-livedata-core-2.6.1.dex.jar;lifecycle-runtime-2.6.1.dex.jar;lifecycle-service-2.6.1.dex.jar;lifecycle-viewmodel-2.6.1.dex.jar;lifecycle-viewmodel-savedstate-2.6.1.dex.jar;listenablefuture-1.0.dex.jar;loader-1.0.0.dex.jar;localbroadcastmanager-1.0.0.dex.jar;okio-jvm-3.4.0.dex.jar;play-services-ads-22.2.0.dex.jar;play-services-ads-base-22.2.0.dex.jar;play-services-ads-identifier-18.0.0.dex.jar;play-services-ads-lite-22.2.0.dex.jar;play-services-appset-16.0.1.dex.jar;play-services-base-18.1.0.dex.jar;play-services-basement-18.1.0.dex.jar;play-services-cloud-messaging-17.0.1.dex.jar;play-services-location-21.0.1.dex.jar;play-services-maps-18.1.0.dex.jar;play-services-measurement-base-20.1.2.dex.jar;play-services-measurement-sdk-api-20.1.2.dex.jar;play-services-stats-17.0.2.dex.jar;play-services-tasks-18.0.2.dex.jar;print-1.0.0.dex.jar;profileinstaller-1.3.0.dex.jar;room-common-2.2.5.dex.jar;room-runtime-2.2.5.dex.jar;savedstate-1.2.1.dex.jar;sqlite-2.1.0.dex.jar;sqlite-framework-2.1.0.dex.jar;startup-runtime-1.1.1.dex.jar;tracing-1.0.0.dex.jar;transport-api-3.0.0.dex.jar;transport-backend-cct-3.1.8.dex.jar;transport-runtime-3.1.8.dex.jar;user-messaging-platform-2.0.0.dex.jar;vectordrawable-1.1.0.dex.jar;vectordrawable-animated-1.1.0.dex.jar;versionedparcelable-1.1.1.dex.jar;viewpager-1.0.0.dex.jar;work-runtime-2.7.0.dex.jar</EnabledSysJars>
97+
</PropertyGroup>
98+
<PropertyGroup Condition="'$(Base_Android64)'!=''">
99+
<Android_LauncherIcon192>$(BDS)\bin\Artwork\Android\FM_LauncherIcon_192x192.png</Android_LauncherIcon192>
100+
<VerInfo_Keys>package=com.embarcadero.$(MSBuildProjectName);label=$(MSBuildProjectName);versionCode=1;versionName=1.0.0;persistent=False;restoreAnyVersion=False;installLocation=auto;largeHeap=False;theme=TitleBar;hardwareAccelerated=true;apiKey=</VerInfo_Keys>
101+
<BT_BuildType>Debug</BT_BuildType>
102+
<EnabledSysJars>activity-1.7.2.dex.jar;annotation-experimental-1.3.0.dex.jar;annotation-jvm-1.6.0.dex.jar;annotations-13.0.dex.jar;appcompat-1.2.0.dex.jar;appcompat-resources-1.2.0.dex.jar;billing-6.0.1.dex.jar;biometric-1.1.0.dex.jar;browser-1.4.0.dex.jar;cloud-messaging.dex.jar;collection-1.1.0.dex.jar;concurrent-futures-1.1.0.dex.jar;core-1.10.1.dex.jar;core-common-2.2.0.dex.jar;core-ktx-1.10.1.dex.jar;core-runtime-2.2.0.dex.jar;cursoradapter-1.0.0.dex.jar;customview-1.0.0.dex.jar;documentfile-1.0.0.dex.jar;drawerlayout-1.0.0.dex.jar;error_prone_annotations-2.9.0.dex.jar;exifinterface-1.3.6.dex.jar;firebase-annotations-16.2.0.dex.jar;firebase-common-20.3.1.dex.jar;firebase-components-17.1.0.dex.jar;firebase-datatransport-18.1.7.dex.jar;firebase-encoders-17.0.0.dex.jar;firebase-encoders-json-18.0.0.dex.jar;firebase-encoders-proto-16.0.0.dex.jar;firebase-iid-interop-17.1.0.dex.jar;firebase-installations-17.1.3.dex.jar;firebase-installations-interop-17.1.0.dex.jar;firebase-measurement-connector-19.0.0.dex.jar;firebase-messaging-23.1.2.dex.jar;fmx.dex.jar;fragment-1.2.5.dex.jar;google-play-licensing.dex.jar;interpolator-1.0.0.dex.jar;javax.inject-1.dex.jar;kotlin-stdlib-1.8.22.dex.jar;kotlin-stdlib-common-1.8.22.dex.jar;kotlin-stdlib-jdk7-1.8.22.dex.jar;kotlin-stdlib-jdk8-1.8.22.dex.jar;kotlinx-coroutines-android-1.6.4.dex.jar;kotlinx-coroutines-core-jvm-1.6.4.dex.jar;legacy-support-core-utils-1.0.0.dex.jar;lifecycle-common-2.6.1.dex.jar;lifecycle-livedata-2.6.1.dex.jar;lifecycle-livedata-core-2.6.1.dex.jar;lifecycle-runtime-2.6.1.dex.jar;lifecycle-service-2.6.1.dex.jar;lifecycle-viewmodel-2.6.1.dex.jar;lifecycle-viewmodel-savedstate-2.6.1.dex.jar;listenablefuture-1.0.dex.jar;loader-1.0.0.dex.jar;localbroadcastmanager-1.0.0.dex.jar;okio-jvm-3.4.0.dex.jar;play-services-ads-22.2.0.dex.jar;play-services-ads-base-22.2.0.dex.jar;play-services-ads-identifier-18.0.0.dex.jar;play-services-ads-lite-22.2.0.dex.jar;play-services-appset-16.0.1.dex.jar;play-services-base-18.1.0.dex.jar;play-services-basement-18.1.0.dex.jar;play-services-cloud-messaging-17.0.1.dex.jar;play-services-location-21.0.1.dex.jar;play-services-maps-18.1.0.dex.jar;play-services-measurement-base-20.1.2.dex.jar;play-services-measurement-sdk-api-20.1.2.dex.jar;play-services-stats-17.0.2.dex.jar;play-services-tasks-18.0.2.dex.jar;print-1.0.0.dex.jar;profileinstaller-1.3.0.dex.jar;room-common-2.2.5.dex.jar;room-runtime-2.2.5.dex.jar;savedstate-1.2.1.dex.jar;sqlite-2.1.0.dex.jar;sqlite-framework-2.1.0.dex.jar;startup-runtime-1.1.1.dex.jar;tracing-1.0.0.dex.jar;transport-api-3.0.0.dex.jar;transport-backend-cct-3.1.8.dex.jar;transport-runtime-3.1.8.dex.jar;user-messaging-platform-2.0.0.dex.jar;vectordrawable-1.1.0.dex.jar;vectordrawable-animated-1.1.0.dex.jar;versionedparcelable-1.1.1.dex.jar;viewpager-1.0.0.dex.jar;work-runtime-2.7.0.dex.jar</EnabledSysJars>
50103
</PropertyGroup>
51104
<PropertyGroup Condition="'$(Base_Win32)'!=''">
52105
<DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
53106
<VerInfo_Locale>1033</VerInfo_Locale>
54-
<VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
55107
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
56108
</PropertyGroup>
109+
<PropertyGroup Condition="'$(Base_Win64)'!=''">
110+
<DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;$(DCC_Namespace)</DCC_Namespace>
111+
<BT_BuildType>Debug</BT_BuildType>
112+
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
113+
<VerInfo_Keys>CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
114+
<VerInfo_Locale>1033</VerInfo_Locale>
115+
</PropertyGroup>
116+
<PropertyGroup Condition="'$(Base_Win64x)'!=''">
117+
<DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;$(DCC_Namespace)</DCC_Namespace>
118+
<BT_BuildType>Debug</BT_BuildType>
119+
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
120+
<VerInfo_Keys>CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
121+
<VerInfo_Locale>1033</VerInfo_Locale>
122+
</PropertyGroup>
57123
<PropertyGroup Condition="'$(Cfg_1)'!=''">
58124
<DCC_Define>DEBUG;$(DCC_Define)</DCC_Define>
59125
<DCC_DebugDCUs>true</DCC_DebugDCUs>
@@ -65,18 +131,30 @@
65131
<PropertyGroup Condition="'$(Cfg_1_Win32)'!=''">
66132
<Debugger_CWD>C:\Users\A User\projects\IndyTLS-OpenSSL\Test\openssl-server</Debugger_CWD>
67133
<Debugger_HostApplication>C:\Users\A User\projects\IndyTLS-OpenSSL\Test\openssl-server\delphi_openssl_server.exe</Debugger_HostApplication>
68-
<DCC_DcuOutput>$(Platform)\$(Config)\</DCC_DcuOutput>
69134
<VerInfo_Locale>1033</VerInfo_Locale>
70135
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
71-
<DCC_UnitSearchPath>..\src;..\src\opensslHdrs;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
72136
<DCC_RemoteDebug>false</DCC_RemoteDebug>
73137
</PropertyGroup>
138+
<PropertyGroup Condition="'$(Cfg_1_Win64)'!=''">
139+
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
140+
<VerInfo_Locale>1033</VerInfo_Locale>
141+
<VerInfo_Keys>CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
142+
</PropertyGroup>
74143
<PropertyGroup Condition="'$(Cfg_2)'!=''">
75144
<DCC_LocalDebugSymbols>false</DCC_LocalDebugSymbols>
76145
<DCC_Define>RELEASE;$(DCC_Define)</DCC_Define>
77146
<DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
78147
<DCC_DebugInformation>0</DCC_DebugInformation>
79148
</PropertyGroup>
149+
<PropertyGroup Condition="'$(Cfg_2_Win32)'!=''">
150+
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
151+
<VerInfo_Locale>1033</VerInfo_Locale>
152+
</PropertyGroup>
153+
<PropertyGroup Condition="'$(Cfg_2_Win64)'!=''">
154+
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
155+
<VerInfo_Locale>1033</VerInfo_Locale>
156+
<VerInfo_Keys>CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
157+
</PropertyGroup>
80158
<ItemGroup>
81159
<DelphiCompile Include="$(MainSource)">
82160
<MainSource>MainSource</MainSource>
@@ -94,17 +172,17 @@
94172
<DCCReference Include="..\src\IdSSLOpenSSLUtils.pas"/>
95173
<DCCReference Include="..\src\IdSSLOpenSSLX509.pas"/>
96174
<DCCReference Include="..\src\IdSSLwincrypt.pas"/>
97-
<BuildConfiguration Include="Release">
98-
<Key>Cfg_2</Key>
99-
<CfgParent>Base</CfgParent>
100-
</BuildConfiguration>
101175
<BuildConfiguration Include="Base">
102176
<Key>Base</Key>
103177
</BuildConfiguration>
104178
<BuildConfiguration Include="Debug">
105179
<Key>Cfg_1</Key>
106180
<CfgParent>Base</CfgParent>
107181
</BuildConfiguration>
182+
<BuildConfiguration Include="Release">
183+
<Key>Cfg_2</Key>
184+
<CfgParent>Base</CfgParent>
185+
</BuildConfiguration>
108186
</ItemGroup>
109187
<ProjectExtensions>
110188
<Borland.Personality>Delphi.Personality.12</Borland.Personality>
@@ -115,12 +193,16 @@
115193
<Source Name="MainSource">IndyTLSOpenSSL290.dpk</Source>
116194
</Source>
117195
<Excluded_Packages>
118-
<Excluded_Packages Name="$(BDSBIN)\dclIndyCore240.bpl">Indy 10 Core Design Time</Excluded_Packages>
119-
<Excluded_Packages Name="$(BDSBIN)\dclIndyProtocols240.bpl">Indy 10 Protocols Design Time</Excluded_Packages>
196+
<Excluded_Packages Name="$(BDSBIN)\dcloffice2k290.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
197+
<Excluded_Packages Name="$(BDSBIN)\dclofficexp290.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
120198
</Excluded_Packages>
121199
</Delphi.Personality>
122200
<Platforms>
201+
<Platform value="Android">False</Platform>
202+
<Platform value="Android64">False</Platform>
123203
<Platform value="Win32">True</Platform>
204+
<Platform value="Win64">True</Platform>
205+
<Platform value="Win64x">False</Platform>
124206
</Platforms>
125207
</BorlandProject>
126208
<ProjectFileVersion>12</ProjectFileVersion>

‎src/IdSSLOpenSSLUtils.pas‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,6 @@ function UTC_Time_Decode(UTCtime : PASN1_UTCTIME; var year, month, day, hour, mi
141141

142142
// Note that I define UTCtime as PASN1_STRING
143143
function UTCTime2DateTime(UTCtime: PASN1_UTCTIME): TDateTime;
144-
{$IFDEF USE_INLINE} inline; {$ENDIF}
145144
var
146145
year: Word;
147146
month: Word;

‎src/opensslHdrs/IdSSLOpenSSLAPI.pas‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -475,8 +475,8 @@ function TOpenSSLDynamicLibProvider.FindLibrary(LibName , LibVersions : string;
475475
var LibVersionsList: TStringList;
476476
i: integer;
477477
begin
478-
Result := DoLoadLibrary(OpenSSLPath + LibName);
479-
if (Result = NilHandle) and (LibVersions <> '') then
478+
Result := NilHandle;
479+
if LibVersions <> '' then
480480
begin
481481
LibVersionsList := TStringList.Create;
482482
try
@@ -493,6 +493,8 @@ function TOpenSSLDynamicLibProvider.FindLibrary(LibName , LibVersions : string;
493493
LibVersionsList.Free;
494494
end;
495495
end;
496+
if Result = NilHandle then
497+
DoLoadLibrary(OpenSSLPath + LibName);
496498
end;
497499

498500
constructor TOpenSSLDynamicLibProvider.Create;

0 commit comments

Comments
 (0)