Skip to content

Commit

Permalink
10.2.3 Tokyo / VER320 / PKG 250
Browse files Browse the repository at this point in the history
Support added for 10.2.3 Tokyo (Compiler 32.0 / VER320 / Product version 25 / Package Version 250)
Previously at https://github.com/TurboPack-Tokyo/
  • Loading branch information
jimmckeeth committed Dec 12, 2018
1 parent e13b1da commit 3c0111b
Show file tree
Hide file tree
Showing 359 changed files with 648 additions and 511 deletions.
148 changes: 103 additions & 45 deletions packages/CBuilder/AsyncProCD.cbproj

Large diffs are not rendered by default.

160 changes: 109 additions & 51 deletions packages/CBuilder/AsyncProCR.cbproj

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/Delphi/AsyncProDD.dpk
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ package AsyncProDD;
{$DEFINE RELEASE}
{$ENDIF IMPLICITBUILDING}
{$DESCRIPTION 'TurboPack Async Professional Delphi Designtime Package'}
{$LIBSUFFIX '240'}
{$LIBSUFFIX '250'}
{$DESIGNONLY}
{$IMPLICITBUILD OFF}

Expand Down
33 changes: 16 additions & 17 deletions packages/Delphi/AsyncProDD.dproj
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
<Base>true</Base>
</PropertyGroup>
<PropertyGroup Condition="'$(Base)'!=''">
<DllSuffix>240</DllSuffix>
<DllSuffix>250</DllSuffix>
<DCC_HppOutput>..\..\source\hpp\$(Platform)\$(Config)</DCC_HppOutput>
<DCC_DcuOutput>.\$(Platform)\$(Config)</DCC_DcuOutput>
<DCC_CBuilderOutput>All</DCC_CBuilderOutput>
Expand Down Expand Up @@ -179,11 +179,10 @@
<VersionInfoKeys Name="Comments"/>
</VersionInfoKeys>
<Excluded_Packages>
<Excluded_Packages Name="$(BDSBIN)\bcboffice2k240.bpl">Embarcadero C++Builder-Package für Office 2000-Server</Excluded_Packages>
<Excluded_Packages Name="$(BDSBIN)\bcbofficexp240.bpl">Embarcadero C++Builder-Package für Office XP-Server</Excluded_Packages>
<Excluded_Packages Name="$(BDSBIN)\dclIntraweb_140_240.bpl">IntraWeb 14.0 Design Package for RAD Studio XE6</Excluded_Packages>
<Excluded_Packages Name="$(BDSBIN)\dcloffice2k240.bpl">Microsoft Office 2000 Beispiele für gekapselte Komponenten für Automatisierungsserver</Excluded_Packages>
<Excluded_Packages Name="$(BDSBIN)\dclofficexp240.bpl">Microsoft Office XP Beispiele für gekapselte Komponenten für Automation Server</Excluded_Packages>
<Excluded_Packages Name="$(BDSBIN)\bcboffice2k250.bpl">Embarcadero C++Builder-Package für Office 2000-Server</Excluded_Packages>
<Excluded_Packages Name="$(BDSBIN)\bcbofficexp250.bpl">Embarcadero C++Builder-Package für Office XP-Server</Excluded_Packages>
<Excluded_Packages Name="$(BDSBIN)\dcloffice2k250.bpl">Microsoft Office 2000 Beispiele für gekapselte Komponenten für Automatisierungsserver</Excluded_Packages>
<Excluded_Packages Name="$(BDSBIN)\dclofficexp250.bpl">Microsoft Office XP Beispiele für gekapselte Komponenten für Automation Server</Excluded_Packages>
</Excluded_Packages>
</Delphi.Personality>
<Platforms>
Expand Down Expand Up @@ -225,16 +224,7 @@
<Overwrite>true</Overwrite>
</Platform>
</DeployFile>
<DeployClass Name="DependencyModule">
<Platform Name="Win32">
<Operation>0</Operation>
<Extensions>.dll;.bpl</Extensions>
</Platform>
<Platform Name="OSX32">
<Operation>1</Operation>
<Extensions>.dylib</Extensions>
</Platform>
</DeployClass>
<DeployClass Name="ProjectiOSDeviceResourceRules"/>
<DeployClass Name="ProjectOSXResource">
<Platform Name="OSX32">
<RemoteDir>Contents\Resources</RemoteDir>
Expand Down Expand Up @@ -574,7 +564,16 @@
<Operation>1</Operation>
</Platform>
</DeployClass>
<DeployClass Name="ProjectiOSDeviceResourceRules"/>
<DeployClass Name="DependencyModule">
<Platform Name="Win32">
<Operation>0</Operation>
<Extensions>.dll;.bpl</Extensions>
</Platform>
<Platform Name="OSX32">
<Operation>1</Operation>
<Extensions>.dylib</Extensions>
</Platform>
</DeployClass>
<ProjectRoot Platform="iOSDevice64" Name="$(PROJECTNAME).app"/>
<ProjectRoot Platform="Win64" Name="$(PROJECTNAME)"/>
<ProjectRoot Platform="iOSDevice32" Name="$(PROJECTNAME).app"/>
Expand Down
2 changes: 1 addition & 1 deletion packages/Delphi/AsyncProDR.dpk
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ package AsyncProDR;
{$DEFINE RELEASE}
{$ENDIF IMPLICITBUILDING}
{$DESCRIPTION 'TurboPack Async Professional Delphi Runtime Package'}
{$LIBSUFFIX '240'}
{$LIBSUFFIX '250'}
{$RUNONLY}
{$IMPLICITBUILD OFF}

Expand Down
34 changes: 17 additions & 17 deletions packages/Delphi/AsyncProDR.dproj
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
<Base>true</Base>
</PropertyGroup>
<PropertyGroup Condition="'$(Base)'!=''">
<DllSuffix>240</DllSuffix>
<DllSuffix>250</DllSuffix>
<DCC_HppOutput>..\..\source\hpp\$(Platform)\$(Config)</DCC_HppOutput>
<RuntimeOnlyPackage>true</RuntimeOnlyPackage>
<VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
Expand Down Expand Up @@ -146,6 +146,7 @@
<DCC_DebugInformation>0</DCC_DebugInformation>
</PropertyGroup>
<PropertyGroup Condition="'$(Cfg_2_Win32)'!=''">
<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>
<VerInfo_Locale>1033</VerInfo_Locale>
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
</PropertyGroup>
Expand Down Expand Up @@ -261,11 +262,10 @@
<Source Name="MainSource">AsyncProDR.dpk</Source>
</Source>
<Excluded_Packages>
<Excluded_Packages Name="$(BDSBIN)\dclIntraweb_140_240.bpl">IntraWeb 14.0 Design Package for RAD Studio XE6</Excluded_Packages>
<Excluded_Packages Name="$(BDSBIN)\bcboffice2k240.bpl">Embarcadero C++Builder-Package für Office 2000-Server</Excluded_Packages>
<Excluded_Packages Name="$(BDSBIN)\bcbofficexp240.bpl">Embarcadero C++Builder-Package für Office XP-Server</Excluded_Packages>
<Excluded_Packages Name="$(BDSBIN)\dcloffice2k240.bpl">Microsoft Office 2000 Beispiele für gekapselte Komponenten für Automatisierungsserver</Excluded_Packages>
<Excluded_Packages Name="$(BDSBIN)\dclofficexp240.bpl">Microsoft Office XP Beispiele für gekapselte Komponenten für Automation Server</Excluded_Packages>
<Excluded_Packages Name="$(BDSBIN)\bcboffice2k250.bpl">Embarcadero C++Builder-Package für Office 2000-Server</Excluded_Packages>
<Excluded_Packages Name="$(BDSBIN)\bcbofficexp250.bpl">Embarcadero C++Builder-Package für Office XP-Server</Excluded_Packages>
<Excluded_Packages Name="$(BDSBIN)\dcloffice2k250.bpl">Microsoft Office 2000 Beispiele für gekapselte Komponenten für Automatisierungsserver</Excluded_Packages>
<Excluded_Packages Name="$(BDSBIN)\dclofficexp250.bpl">Microsoft Office XP Beispiele für gekapselte Komponenten für Automation Server</Excluded_Packages>
</Excluded_Packages>
</Delphi.Personality>
<Deployment Version="3">
Expand Down Expand Up @@ -300,16 +300,7 @@
<Overwrite>true</Overwrite>
</Platform>
</DeployFile>
<DeployClass Name="DependencyModule">
<Platform Name="Win32">
<Operation>0</Operation>
<Extensions>.dll;.bpl</Extensions>
</Platform>
<Platform Name="OSX32">
<Operation>1</Operation>
<Extensions>.dylib</Extensions>
</Platform>
</DeployClass>
<DeployClass Name="ProjectiOSDeviceResourceRules"/>
<DeployClass Name="ProjectOSXResource">
<Platform Name="OSX32">
<RemoteDir>Contents\Resources</RemoteDir>
Expand Down Expand Up @@ -649,7 +640,16 @@
<Operation>1</Operation>
</Platform>
</DeployClass>
<DeployClass Name="ProjectiOSDeviceResourceRules"/>
<DeployClass Name="DependencyModule">
<Platform Name="Win32">
<Operation>0</Operation>
<Extensions>.dll;.bpl</Extensions>
</Platform>
<Platform Name="OSX32">
<Operation>1</Operation>
<Extensions>.dylib</Extensions>
</Platform>
</DeployClass>
<ProjectRoot Platform="iOSDevice64" Name="$(PROJECTNAME).app"/>
<ProjectRoot Platform="Win64" Name="$(PROJECTNAME)"/>
<ProjectRoot Platform="iOSDevice32" Name="$(PROJECTNAME).app"/>
Expand Down
1 change: 0 additions & 1 deletion source/AdMdm.pas
Original file line number Diff line number Diff line change
Expand Up @@ -1453,7 +1453,6 @@ function TAdCustomModem.SelectDevice: Boolean;
{ display the modem selection dialog }
begin
try
Result := False; {!!.06}
if not SysUtils.DirectoryExists(FModemCapFolder) then {!!.06}
raise EInOutError.CreateFmt( {!!.06}
'Modemcap folder not found'#13#10'(%s)', [FModemCapFolder]); {!!.06}
Expand Down
6 changes: 2 additions & 4 deletions source/AdXLbMdm.pas
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,6 @@ function TApdModemCapDetail.AddModem(const ModemDetailFile: string;
begin
DetailStream := nil;
try
Result := ecFileNotFound;
DetailStream := TFileStream.Create(ModemDetailFile, fmOpenReadWrite);
{ find the space between the last </Modem> and the final </ModemList> }
I := DetailStream.Size;
Expand All @@ -124,7 +123,8 @@ function TApdModemCapDetail.AddModem(const ModemDetailFile: string;
Found := Pos('</ModemList>', S) > 0;
until Found or (I = 0);
DetailStream.Position := I - 1;
if not Found then begin
if not Found then
begin
Result := ecInvalidFile;
Exit;
end;
Expand Down Expand Up @@ -225,7 +225,6 @@ function TApdModemCapDetail.DeleteModem(const ModemDetailFile,
DetailStream := nil;
MemStream := nil;
try
Result := ecOK;
ModemStart := 0;
ModemEnd := 0;
if not FileExists(ModemDetailFile) then begin
Expand Down Expand Up @@ -297,7 +296,6 @@ function TApdModemCapDetail.DeleteModemRecord(
if FileExists(ModemCapIndex) then begin
List := nil;
try
Result := ecInvalidFile;
List := TStringList.Create;
List.LoadFromFile(ModemCapIndex);
{ find the modem }
Expand Down
41 changes: 19 additions & 22 deletions source/AwFaxCvt.pas
Original file line number Diff line number Diff line change
Expand Up @@ -6632,55 +6632,52 @@ function upUnpackPageToDcx(Unpack: PUnpackFax; FName, OutName: string; Page: Car
function upUnpackFileToDcx(Unpack: PUnpackFax; FName, OutName: string): Integer;
{ -Unpack an APF file to a DCX file }
var
Code: Integer;
I: Cardinal;
Data: PDcxUnpackData;

begin
with Unpack^ do begin
Code:= ecOK; { !!.04 }
Result := ecOK;
with Unpack^ do
begin
try { !!.04 }
{ read the fax file header }
Code:= upGetFaxHeader(Unpack, FName, FaxHeader);
if (Code < ecOK) then begin
upUnpackFileToDcx:= Code;
Result := upGetFaxHeader(Unpack, FName, FaxHeader);
if Result < ecOK then
Exit;
end;

{ create the output file }
Code:= CreateDCXFile(Unpack, FName, OutName, Data);
if (Code < ecOK) then begin
upUnpackFileToDcx:= Code;
Result := CreateDCXFile(Unpack, FName, OutName, Data);
if Result < ecOK then
Exit;
end;

Code:= upInitFileUnpack(Unpack, FName);
if (Code < ecOK) then begin
Result:= upInitFileUnpack(Unpack, FName);
if Result < ecOK then
begin
FreeMem(Data, SizeOf(TDcxUnpackData));
upUnpackFileToDcx:= Code;
Exit;
end;

{ output each page as a PCX image }
for I:= 1 to FaxHeader.PageCount do begin
Code:= upUnpackPageToBuffer(Unpack, FName, I, True);
if (Code = ecOK) then Code:= OutputPageToDcx(Unpack, Data);
for I:= 1 to FaxHeader.PageCount do
begin
Result := upUnpackPageToBuffer(Unpack, FName, I, True);
if Result = ecOK then
Result := OutputPageToDcx(Unpack, Data);

if (Code < ecOK) then begin
if Result < ecOK then
begin
FreeMem(Data, SizeOf(TDcxUnpackData));
upUnpackFileToDcx:= Code;
Exit;
end;
end;

finally { !!.04 }
{ close the output file }
if Code = ecOK then { !!.04 }
Code:= CloseDcxFile(Unpack, Data) { !!.04 }
if Result = ecOK then { !!.04 }
Result := CloseDcxFile(Unpack, Data) { !!.04 }
else { !!.04 }
{ an error occured, preserve the return value }
CloseDcxFile(Unpack, Data); { !!.04 }
upUnpackFileToDcx:= Code; { !!.04 }
end; { !!.04 }
end;
end;
Expand Down
2 changes: 1 addition & 1 deletion source/hpp/Win32/Debug/ADEXCEPT.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Copyright (c) 1995, 2016 by Embarcadero Technologies, Inc.
// All rights reserved

// (DO NOT EDIT: machine generated header) 'AdExcept.pas' rev: 31.00 (Windows)
// (DO NOT EDIT: machine generated header) 'AdExcept.pas' rev: 32.00 (Windows)

#ifndef AdexceptHPP
#define AdexceptHPP
Expand Down
2 changes: 1 addition & 1 deletion source/hpp/Win32/Debug/ADFAXCTL.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Copyright (c) 1995, 2016 by Embarcadero Technologies, Inc.
// All rights reserved

// (DO NOT EDIT: machine generated header) 'AdFaxCtl.pas' rev: 31.00 (Windows)
// (DO NOT EDIT: machine generated header) 'AdFaxCtl.pas' rev: 32.00 (Windows)

#ifndef AdfaxctlHPP
#define AdfaxctlHPP
Expand Down
2 changes: 1 addition & 1 deletion source/hpp/Win32/Debug/ADPSTAT.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Copyright (c) 1995, 2016 by Embarcadero Technologies, Inc.
// All rights reserved

// (DO NOT EDIT: machine generated header) 'AdPStat.pas' rev: 31.00 (Windows)
// (DO NOT EDIT: machine generated header) 'AdPStat.pas' rev: 32.00 (Windows)

#ifndef AdpstatHPP
#define AdpstatHPP
Expand Down
2 changes: 1 addition & 1 deletion source/hpp/Win32/Debug/ADTrmBuf.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Copyright (c) 1995, 2016 by Embarcadero Technologies, Inc.
// All rights reserved

// (DO NOT EDIT: machine generated header) 'ADTrmBuf.pas' rev: 31.00 (Windows)
// (DO NOT EDIT: machine generated header) 'ADTrmBuf.pas' rev: 32.00 (Windows)

#ifndef AdtrmbufHPP
#define AdtrmbufHPP
Expand Down
2 changes: 1 addition & 1 deletion source/hpp/Win32/Debug/ADTrmEmu.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Copyright (c) 1995, 2016 by Embarcadero Technologies, Inc.
// All rights reserved

// (DO NOT EDIT: machine generated header) 'ADTrmEmu.pas' rev: 31.00 (Windows)
// (DO NOT EDIT: machine generated header) 'ADTrmEmu.pas' rev: 32.00 (Windows)

#ifndef AdtrmemuHPP
#define AdtrmemuHPP
Expand Down
2 changes: 1 addition & 1 deletion source/hpp/Win32/Debug/ADTrmMap.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Copyright (c) 1995, 2016 by Embarcadero Technologies, Inc.
// All rights reserved

// (DO NOT EDIT: machine generated header) 'ADTrmMap.pas' rev: 31.00 (Windows)
// (DO NOT EDIT: machine generated header) 'ADTrmMap.pas' rev: 32.00 (Windows)

#ifndef AdtrmmapHPP
#define AdtrmmapHPP
Expand Down
2 changes: 1 addition & 1 deletion source/hpp/Win32/Debug/ADTrmPsr.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Copyright (c) 1995, 2016 by Embarcadero Technologies, Inc.
// All rights reserved

// (DO NOT EDIT: machine generated header) 'ADTrmPsr.pas' rev: 31.00 (Windows)
// (DO NOT EDIT: machine generated header) 'ADTrmPsr.pas' rev: 32.00 (Windows)

#ifndef AdtrmpsrHPP
#define AdtrmpsrHPP
Expand Down
2 changes: 1 addition & 1 deletion source/hpp/Win32/Debug/APROREG.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Copyright (c) 1995, 2016 by Embarcadero Technologies, Inc.
// All rights reserved

// (DO NOT EDIT: machine generated header) 'APROReg.pas' rev: 31.00 (Windows)
// (DO NOT EDIT: machine generated header) 'APROReg.pas' rev: 32.00 (Windows)

#ifndef AproregHPP
#define AproregHPP
Expand Down
2 changes: 1 addition & 1 deletion source/hpp/Win32/Debug/AWABSPCL.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Copyright (c) 1995, 2016 by Embarcadero Technologies, Inc.
// All rights reserved

// (DO NOT EDIT: machine generated header) 'AwAbsPcl.pas' rev: 31.00 (Windows)
// (DO NOT EDIT: machine generated header) 'AwAbsPcl.pas' rev: 32.00 (Windows)

#ifndef AwabspclHPP
#define AwabspclHPP
Expand Down
2 changes: 1 addition & 1 deletion source/hpp/Win32/Debug/AdAnsiStrings.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Copyright (c) 1995, 2016 by Embarcadero Technologies, Inc.
// All rights reserved

// (DO NOT EDIT: machine generated header) 'AdAnsiStrings.pas' rev: 31.00 (Windows)
// (DO NOT EDIT: machine generated header) 'AdAnsiStrings.pas' rev: 32.00 (Windows)

#ifndef AdansistringsHPP
#define AdansistringsHPP
Expand Down
2 changes: 1 addition & 1 deletion source/hpp/Win32/Debug/AdFIDlg.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Copyright (c) 1995, 2016 by Embarcadero Technologies, Inc.
// All rights reserved

// (DO NOT EDIT: machine generated header) 'AdFIDlg.pas' rev: 31.00 (Windows)
// (DO NOT EDIT: machine generated header) 'AdFIDlg.pas' rev: 32.00 (Windows)

#ifndef AdfidlgHPP
#define AdfidlgHPP
Expand Down
2 changes: 1 addition & 1 deletion source/hpp/Win32/Debug/AdFax.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Copyright (c) 1995, 2016 by Embarcadero Technologies, Inc.
// All rights reserved

// (DO NOT EDIT: machine generated header) 'AdFax.pas' rev: 31.00 (Windows)
// (DO NOT EDIT: machine generated header) 'AdFax.pas' rev: 32.00 (Windows)

#ifndef AdfaxHPP
#define AdfaxHPP
Expand Down
2 changes: 1 addition & 1 deletion source/hpp/Win32/Debug/AdFaxCvt.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Copyright (c) 1995, 2016 by Embarcadero Technologies, Inc.
// All rights reserved

// (DO NOT EDIT: machine generated header) 'AdFaxCvt.pas' rev: 31.00 (Windows)
// (DO NOT EDIT: machine generated header) 'AdFaxCvt.pas' rev: 32.00 (Windows)

#ifndef AdfaxcvtHPP
#define AdfaxcvtHPP
Expand Down
2 changes: 1 addition & 1 deletion source/hpp/Win32/Debug/AdFaxPrn.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Copyright (c) 1995, 2016 by Embarcadero Technologies, Inc.
// All rights reserved

// (DO NOT EDIT: machine generated header) 'AdFaxPrn.pas' rev: 31.00 (Windows)
// (DO NOT EDIT: machine generated header) 'AdFaxPrn.pas' rev: 32.00 (Windows)

#ifndef AdfaxprnHPP
#define AdfaxprnHPP
Expand Down
2 changes: 1 addition & 1 deletion source/hpp/Win32/Debug/AdFaxSrv.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Copyright (c) 1995, 2016 by Embarcadero Technologies, Inc.
// All rights reserved

// (DO NOT EDIT: machine generated header) 'AdFaxSrv.pas' rev: 31.00 (Windows)
// (DO NOT EDIT: machine generated header) 'AdFaxSrv.pas' rev: 32.00 (Windows)

#ifndef AdfaxsrvHPP
#define AdfaxsrvHPP
Expand Down
Loading

0 comments on commit 3c0111b

Please sign in to comment.