From 810e62b7c9ab3e56f6c49e4a2a5b2b297dfbfd0e Mon Sep 17 00:00:00 2001
From: marcus <marcus@idefix.freepascal.org>
Date: Fri, 18 Jun 2021 16:35:05 +0000
Subject: [PATCH] Amiga, MorphOS, AROS: unified function results to LongBool in
amigados unit, correct type for GFXBase
git-svn-id: trunk@49515 -
---
packages/amunits/src/coreunits/agraphics.pas | 14 +++----
packages/amunits/src/coreunits/amigados.pas | 14 +++----
packages/arosunits/src/amigados.pas | 42 ++++++++++----------
packages/morphunits/src/agraphics.pas | 6 +--
packages/morphunits/src/amigados.pas | 26 ++++++------
packages/os4units/src/amigados.pas | 4 +-
packages/rtl-console/src/amicommon/crt.pp | 4 --
7 files changed, 53 insertions(+), 57 deletions(-)
diff --git a/packages/amunits/src/coreunits/agraphics.pas b/packages/amunits/src/coreunits/agraphics.pas
index 8c8883bc5c..5bca70fb7b 100644
--- a/packages/amunits/src/coreunits/agraphics.pas
+++ b/packages/amunits/src/coreunits/agraphics.pas
@@ -383,12 +383,12 @@ type
);
1:(
DestAddr: SmallInt; // destination Pointer
- DestData: SmallInt; // data to send
+ DestData: SmallInt; // data to send
);
2:(
VWaitPos: SmallInt; // vertical wait position
- HWaitPos: SmallInt; // horizontal wait position
- );
+ HWaitPos: SmallInt; // horizontal wait position
+ );
end;
{ structure of cprlist that points to list that hardware actually executes }
@@ -400,7 +400,7 @@ type
MaxCount : smallint; { number of long instructions }
end;
-
+
tCopList = record
Next : pCopList; { next block for this copper list }
_CopList : pCopList; { system use }
@@ -2248,7 +2248,7 @@ const
var
- GfxBase : pLibrary = nil;
+ GfxBase : PGfxBase = nil;
PROCEDURE AddAnimOb(anOb : pAnimOb location 'a0'; anKey : ppAnimOb location 'a1'; rp : pRastPort location 'a2'); syscall GfxBase 156;
PROCEDURE AddBob(bob : pBob location 'a0'; rp : pRastPort location 'a1'); syscall GfxBase 096;
@@ -2617,10 +2617,10 @@ const
LIBVERSION : longword = 0;
initialization
- GfxBase := OpenLibrary(GRAPHICSNAME,LIBVERSION);
+ GfxBase := PGFXBase(OpenLibrary(GRAPHICSNAME,LIBVERSION));
finalization
if Assigned(GfxBase) then
- CloseLibrary(GfxBase);
+ CloseLibrary(PLibrary(GfxBase));
END. (* UNIT GRAPHICS *)
diff --git a/packages/amunits/src/coreunits/amigados.pas b/packages/amunits/src/coreunits/amigados.pas
index e3576cbd8c..e40e5adec1 100644
--- a/packages/amunits/src/coreunits/amigados.pas
+++ b/packages/amunits/src/coreunits/amigados.pas
@@ -1601,8 +1601,8 @@ FUNCTION CreateProc(const name : pCHAR location 'd1'; pri : LONGINT location 'd2
FUNCTION CurrentDir(lock : BPTR location 'd1') : BPTR; syscall _DOSBase 126;
PROCEDURE DateStamp(date : pDateStamp location 'd1'); syscall _DOSBase 192;
FUNCTION DOSDateToStr(datetime : _PDateTime location 'd1') : LongBool; syscall _DOSBase 744;
-FUNCTION DOSDeleteFile(const name : pCHAR location 'd1') : LongBool; syscall _DOSBase 072;
-FUNCTION DeleteVar(const name : pCHAR location 'd1'; flags : ULONG location 'd2') : LongBool; syscall _DOSBase 912;
+FUNCTION DOSDeleteFile(const name : STRPTR location 'd1') : LongBool; syscall _DOSBase 072;
+FUNCTION DeleteVar(const name : STRPTR location 'd1'; flags : ULONG location 'd2') : LongBool; syscall _DOSBase 912;
FUNCTION DeviceProc(const name : pCHAR location 'd1') : pMsgPort; syscall _DOSBase 174;
FUNCTION DoPkt(port : pMsgPort location 'd1'; action : LONGINT location 'd2'; arg1 : LONGINT location 'd3'; arg2 : LONGINT location 'd4'; arg3 : LONGINT location 'd5'; arg4 : LONGINT location 'd6'; arg5 : LONGINT location 'd7') : LONGINT; syscall _DOSBase 240;
FUNCTION DoPkt0(port : pMsgPort location 'd1'; action : LONGINT location 'd2') : LONGINT; syscall _DOSBase 240;
@@ -1618,7 +1618,7 @@ FUNCTION DOSInput : BPTR; syscall _DOSBase 054;
FUNCTION DOSOpen(const name : pCHAR location 'd1'; accessMode : LONGINT location 'd2') : BPTR; syscall _DOSBase 030;
FUNCTION DOSOutput : BPTR; syscall _DOSBase 060;
FUNCTION DOSRead(file_ : BPTR location 'd1'; buffer : POINTER location 'd2'; length : LONGINT location 'd3') : LONGINT; syscall _DOSBase 042;
-FUNCTION DOSRename(const oldName : pCHAR location 'd1';const newName : pCHAR location 'd2') : LongBool; syscall _DOSBase 078;
+FUNCTION DOSRename(const oldName : STRPTR location 'd1';const newName : STRPTR location 'd2') : LongBool; syscall _DOSBase 078;
FUNCTION DOSSeek(file_ : BPTR location 'd1'; position : LONGINT location 'd2'; offset : LONGINT location 'd3') : LONGINT; syscall _DOSBase 066;
FUNCTION DOSWrite(file_ : BPTR location 'd1'; buffer : POINTER location 'd2'; length : LONGINT location 'd3') : LONGINT; syscall _DOSBase 048;
FUNCTION DupLock(lock : BPTR location 'd1') : BPTR; syscall _DOSBase 096;
@@ -1629,7 +1629,7 @@ FUNCTION ExAll(lock : BPTR location 'd1'; buffer : pExAllData location 'd2'; siz
PROCEDURE ExAllEnd(lock : BPTR location 'd1'; buffer : pExAllData location 'd2'; size : LONGINT location 'd3'; data : LONGINT location 'd4'; control : pExAllControl location 'd5'); syscall _DOSBase 990;
FUNCTION Examine(lock : BPTR location 'd1'; fileInfoBlock : pFileInfoBlock location 'd2') : LongBool; syscall _DOSBase 102;
FUNCTION ExamineFH(fh : BPTR location 'd1'; fib : pFileInfoBlock location 'd2') : LongBool; syscall _DOSBase 390;
-FUNCTION Execute(const string_ : pCHAR location 'd1'; file_ : LONGINT location 'd2'; file2 : LONGINT location 'd3') : LongBool; syscall _DOSBase 222;
+FUNCTION Execute(const string_ : pCHAR location 'd1'; file_ : BPTR location 'd2'; file2 : BPTR location 'd3') : LongBool; syscall _DOSBase 222;
FUNCTION ExNext(lock : BPTR location 'd1'; fileInfoBlock : pFileInfoBlock location 'd2') : LongBool; syscall _DOSBase 108;
FUNCTION Fault(code : LONGINT location 'd1'; header : pCHAR location 'd2'; buffer : pCHAR location 'd3'; len : LONGINT location 'd4') : LongBool; syscall _DOSBase 468;
FUNCTION FGetC(fh : BPTR location 'd1') : LONGINT; syscall _DOSBase 306;
@@ -1690,7 +1690,7 @@ FUNCTION ParsePattern(const pat : pCHAR location 'd1'; buf : pCHAR location 'd2'
FUNCTION ParsePatternNoCase(const pat : pCHAR location 'd1'; buf : pCHAR location 'd2'; buflen : LONGINT location 'd3') : LONGINT; syscall _DOSBase 966;
FUNCTION PathPart(const path : pCHAR location 'd1') : pCHAR; syscall _DOSBase 876;
FUNCTION PrintFault(code : LONGINT location 'd1';const header : pCHAR location 'd2') : LongBool; syscall _DOSBase 474;
-FUNCTION PutStr(const str : pCHAR location 'd1') : LongBool; syscall _DOSBase 948;
+FUNCTION PutStr(const str : pCHAR location 'd1') : LongInt; syscall _DOSBase 948;
FUNCTION ReadArgs(const arg_template : pCHAR location 'd1'; arra : pLONGINT location 'd2'; args : pRDArgs location 'd3') : pRDArgs; syscall _DOSBase 798;
FUNCTION ReadItem(const name : pCHAR location 'd1'; maxchars : LONGINT location 'd2'; cSource : pCSource location 'd3') : LONGINT; syscall _DOSBase 810;
FUNCTION ReadLink(port : pMsgPort location 'd1'; lock : LONGINT location 'd2';const path : pCHAR location 'd3'; buffer : pCHAR location 'd4'; size : ULONG location 'd5') : LongBool; syscall _DOSBase 438;
@@ -1797,7 +1797,7 @@ FUNCTION NewLoadSeg(const file_ : string;const tags : pTagItem) : LONGINT;
FUNCTION NewLoadSegTagList(const file_ : string;const tags : pTagItem) : LONGINT;
FUNCTION PathPart(const path : string) : pCHAR;
FUNCTION PrintFault(code : LONGINT;const header : string) : BOOLEAN;
-FUNCTION PutStr(const str : string) : BOOLEAN;
+FUNCTION PutStr(const str : string) : LongInt;
FUNCTION ReadArgs(const arg_template : string; arra : pLONGINT; args : pRDArgs) : pRDArgs;
FUNCTION ReadLink(port : pMsgPort; lock : LONGINT;const path : string; buffer : pCHAR; size : ULONG) : BOOLEAN;
FUNCTION Relabel(const drive : string;const newname : pCHAR) : BOOLEAN;
@@ -2083,7 +2083,7 @@ begin
PrintFault := PrintFault(code,PChar(RawByteString(header)));
end;
-FUNCTION PutStr(const str : string) : BOOLEAN;
+FUNCTION PutStr(const str : string) : LongInt;
begin
PutStr := PutStr(PChar(RawByteString(str)));
end;
diff --git a/packages/arosunits/src/amigados.pas b/packages/arosunits/src/amigados.pas
index ae475f8ba2..1c6c997229 100644
--- a/packages/arosunits/src/amigados.pas
+++ b/packages/arosunits/src/amigados.pas
@@ -2210,13 +2210,13 @@ function DOSInput: BPTR; syscall AOS_DOSBase 9;
function DOSOutput : BPTR; syscall AOS_DOSBase 10;
function DOSSeek(File_: BPTR; Position: LongInt; Mode: LongInt): LongInt; syscall AOS_DOSBase 11;
function DOSDeleteFile(const Name: STRPTR): LongBool; syscall AOS_DOSBase 12;
-function DOSRename(const OldName: STRPTR; const NewName: STRPTR): LongInt; syscall AOS_DOSBase 13;
+function DOSRename(const OldName: STRPTR; const NewName: STRPTR): LongBool; syscall AOS_DOSBase 13;
function Lock(const Name: STRPTR; AccessMode: LongInt): BPTR; syscall AOS_DOSBase 14;
function UnLock(Lock: BPTR): LongBool; syscall AOS_DOSBase 15;
function DupLock(Lock: BPTR): BPTR; syscall AOS_DOSBase 16;
-function Examine(Lock: BPTR; FileInfoBlock: PFileInfoBlock): LongInt; syscall AOS_DOSBase 17;
-function ExNext(Lock: BPTR; FileInfoBlock: PFileInfoBlock): LongInt; syscall AOS_DOSBase 18;
-function Info(Lock: BPTR; ParameterBlock: PInfoData): LongInt; syscall AOS_DOSBase 19;
+function Examine(Lock: BPTR; FileInfoBlock: PFileInfoBlock): LongBool; syscall AOS_DOSBase 17;
+function ExNext(Lock: BPTR; FileInfoBlock: PFileInfoBlock): LongBool; syscall AOS_DOSBase 18;
+function Info(Lock: BPTR; ParameterBlock: PInfoData): LongBool; syscall AOS_DOSBase 19;
function DOSCreateDir(const Name: STRPTR): BPTR; syscall AOS_DOSBase 20;
function CurrentDir(Lock: BPTR): BPTR; syscall AOS_DOSBase 21;
function IoErr: LongInt; syscall AOS_DOSBase 22;
@@ -2225,14 +2225,14 @@ procedure DOSExit(ReturnCode: LongInt); syscall AOS_DOSBase 24;
function LoadSeg(const Name: STRPTR): BPTR; syscall AOS_DOSBase 25;
procedure UnLoadSeg(Seglist: BPTR); syscall AOS_DOSBase 26;
function DeviceProc(const Name: STRPTR): PMsgPort; syscall AOS_DOSBase 29;
-function SetComment(const Name: STRPTR; const Comment: STRPTR): LongInt; syscall AOS_DOSBase 30;
-function SetProtection(const Name: STRPTR; Protect: LongWord): LongInt; syscall AOS_DOSBase 31;
+function SetComment(const Name: STRPTR; const Comment: STRPTR): LongBool; syscall AOS_DOSBase 30;
+function SetProtection(const Name: STRPTR; Protect: LongWord): LongBool; syscall AOS_DOSBase 31;
function DateStamp(Date: PDateStamp): PDateStamp; syscall AOS_DOSBase 32;
procedure DOSDelay(TimeOut: LongWord); syscall AOS_DOSBase 33;
-function WaitForChar(File_: BPTR; TimeOut: LongInt): LongInt; syscall AOS_DOSBase 34;
+function WaitForChar(File_: BPTR; TimeOut: LongInt): LongBool; syscall AOS_DOSBase 34;
function ParentDir(Lock: BPTR): BPTR; syscall AOS_DOSBase 35;
function IsInteractive(File_: BPTR): LongInt; syscall AOS_DOSBase 36;
-function Execute(const String_: STRPTR; Input: BPTR; Output: BPTR): LongInt; syscall AOS_DOSBase 37;
+function Execute(const String_: STRPTR; Input: BPTR; Output: BPTR): LongBool; syscall AOS_DOSBase 37;
function AllocDosObject(Type_: LongWord; const Tags: PTagItem): APTR; syscall AOS_DOSBase 38;
function AllocDosObjectTagList(Type_: LongWord; const Tags: PTagItem): APTR; syscall AOS_DOSBase 38;
procedure FreeDosObject(Type_: LongWord; Ptr: APTR); syscall AOS_DOSBase 39;
@@ -2256,8 +2256,8 @@ function FGets(Fh: BPTR; Buf: STRPTR; BufLen: LongWord): STRPTR; syscall AOS_DOS
function FPuts(File_: BPTR; const String_: STRPTR): LongInt; syscall AOS_DOSBase 57;
function VFWritef(Fh: BPTR; const Fmt: STRPTR; const ArgArray: PLongInt): LongInt; syscall AOS_DOSBase 58;
function VFPrintf(Fh: BPTR; const format: STRPTR; const ArgArray: PLongInt): LongInt; syscall AOS_DOSBase 59;
-function DOSFlush(File_: BPTR): LongInt; syscall AOS_DOSBase 60;
-function SetVBuf(File_: BPTR; Buff: STRPTR; Type_: LongInt; Size: LongInt): LongInt; syscall AOS_DOSBase 61;
+function DOSFlush(File_: BPTR): LongBool; syscall AOS_DOSBase 60;
+function SetVBuf(File_: BPTR; Buff: STRPTR; Type_: LongInt; Size: LongInt): LongBool; syscall AOS_DOSBase 61;
function DupLockFromFH(Lock: BPTR): BPTR; syscall AOS_DOSBase 62;
function OpenFromLock(Lock: BPTR): BPTR; syscall AOS_DOSBase 63;
function ParentOfFH(Fh: BPTR): BPTR; syscall AOS_DOSBase 64;
@@ -2269,8 +2269,8 @@ function SplitName(const Name: STRPTR; Seperator: LongWord; Buf: STRPTR; OldPos:
function SameLock(Lock1: BPTR; Lock2: BPTR): LongInt; syscall AOS_DOSBase 70;
function SetMode(Fh: BPTR; Mode: LongInt): LongBool; syscall AOS_DOSBase 71;
function ExAll(Lock: BPTR; Buffer: PExAllData; Size: LongInt; Data: LongInt; Control: PExAllControl): LongBool; syscall AOS_DOSBase 72;
-function ReadLink(Port: PMsgPort; Lock: LongInt; const Path: STRPTR; Buffer: STRPTR; Size: LongWord): LongInt; syscall AOS_DOSBase 73;
-function MakeLink(const Name: STRPTR; Dest: APTR; Soft: LongInt): LongInt; syscall AOS_DOSBase 74;
+function ReadLink(Port: PMsgPort; Lock: LongInt; const Path: STRPTR; Buffer: STRPTR; Size: LongWord): LongBool; syscall AOS_DOSBase 73;
+function MakeLink(const Name: STRPTR; Dest: APTR; Soft: LongInt): LongBool; syscall AOS_DOSBase 74;
function ChangeMode(Type_: LongWord; Object_: BPTR; NewMode: LongWord): LongBool; syscall AOS_DOSBase 75;
function SetFileSize(File_: BPTR; Offset: LongInt; Mode: LongInt): LongInt; syscall AOS_DOSBase 76;
function SetIoErr(Result_: LongInt): LongInt; syscall AOS_DOSBase 77;
@@ -2300,26 +2300,26 @@ function SetProgramDir(Lock: BPTR): BPTR; syscall AOS_DOSBase 99;
function GetProgramDir: BPTR; syscall AOS_DOSBase 100;
function SystemTagList(const Command: STRPTR; const Tags: PTagItem): LongInt; syscall AOS_DOSBase 101;
function DOSSystem(const Command: STRPTR; const Tags: PTagItem): LongInt; syscall AOS_DOSBase 101;
-function AssignLock(const Name: STRPTR; Lock: BPTR): LongInt; syscall AOS_DOSBase 102;
+function AssignLock(const Name: STRPTR; Lock: BPTR): LongBool; syscall AOS_DOSBase 102;
function AssignLate(const Name: STRPTR; const Path: STRPTR): LongBool; syscall AOS_DOSBase 103;
function AssignPath(const Name: STRPTR; const Path: STRPTR): LongBool; syscall AOS_DOSBase 104;
function AssignAdd(const Name: STRPTR; Lock: BPTR): LongBool; syscall AOS_DOSBase 105;
-function RemAssignList(const Name: STRPTR; Lock: BPTR): LongInt; syscall AOS_DOSBase 106;
+function RemAssignList(const Name: STRPTR; Lock: BPTR): LongBool; syscall AOS_DOSBase 106;
function GetDeviceProc(const Name: STRPTR; Dp: PDevProc): PDevProc; syscall AOS_DOSBase 107;
procedure FreeDeviceProc(Dp: PDevProc); syscall AOS_DOSBase 108;
function LockDosList(Flags: LongWord): PDosList; syscall AOS_DOSBase 109;
procedure UnLockDosList(Flags: LongWord); syscall AOS_DOSBase 110;
function AttemptLockDosList(Flags: LongWord): PDosList; syscall AOS_DOSBase 111;
-function RemDosEntry(DList: PDosList): LongInt; syscall AOS_DOSBase 112;
-function AddDosEntry(DList: PDosList): LongInt; syscall AOS_DOSBase 113;
+function RemDosEntry(DList: PDosList): LongBool; syscall AOS_DOSBase 112;
+function AddDosEntry(DList: PDosList): LongBool; syscall AOS_DOSBase 113;
function FindDosEntry(const DList: PDosList; const Name: STRPTR; Flags: LongWord): PDosList; syscall AOS_DOSBase 114;
function NextDosEntry(const DList: PDosList; Flags: LongWord): PDosList; syscall AOS_DOSBase 115;
function MakeDosEntry(const Name: STRPTR; Type_: LongInt): PDosList; syscall AOS_DOSBase 116;
procedure FreeDosEntry(DList: PDosList); syscall AOS_DOSBase 117;
function IsFileSystem(const Name: STRPTR): LongBool; syscall AOS_DOSBase 118;
-function DosFormat(const DeviceName: STRPTR; const VolumeName: STRPTR; DosType: LongWord): LongBool; syscall AOS_DOSBase 119;
-function Relabel(const Drive: STRPTR; const NewName: STRPTR): LongInt; syscall AOS_DOSBase 120;
-function Inhibit(const Name: STRPTR; OnOff: LongInt): LongInt; syscall AOS_DOSBase 121;
+function Format(const DeviceName: STRPTR; const VolumeName: STRPTR; DosType: LongWord): LongBool; syscall AOS_DOSBase 119;
+function Relabel(const Drive: STRPTR; const NewName: STRPTR): LongBool; syscall AOS_DOSBase 120;
+function Inhibit(const Name: STRPTR; OnOff: LongInt): LongBool; syscall AOS_DOSBase 121;
function AddBuffers(const DeviceName: STRPTR; NumbBuffers: LongInt): LongBool; syscall AOS_DOSBase 122;
function CompareDates(const Date1: PDateStamp; const Date2: PDateStamp): LongInt; syscall AOS_DOSBase 123;
function DOSDateToStr(Datetime: _PDateTime): LongBool; syscall AOS_DOSBase 124;
@@ -2330,7 +2330,7 @@ function NewLoadSeg(const File_: STRPTR; const Tags: PTagItem): BPTR; syscall AO
function NewLoadSegTagList(const File_: STRPTR; const Tags: PTagItem): BPTR; syscall AOS_DOSBase 128;
function AddSegment(const Name: STRPTR; Seg: BPTR; Type_: LongInt): LongBool; syscall AOS_DOSBase 129;
function FindSegment(const Name: STRPTR; const Seg: PSegment; System: LongBool): PSegment; syscall AOS_DOSBase 130;
-function RemSegment(Seg: PSegment): LongInt; syscall AOS_DOSBase 131;
+function RemSegment(Seg: PSegment): LongBool; syscall AOS_DOSBase 131;
function CheckSignal(Mask: LongInt): LongInt; syscall AOS_DOSBase 132;
function ReadArgs(const Template: STRPTR; Array_: PIPTR; RdArgs: PRDArgs): PRDArgs; syscall AOS_DOSBase 133;
function FindArg(const Template: STRPTR; const KeyWord: STRPTR): LongInt; syscall AOS_DOSBase 134;
@@ -2349,7 +2349,7 @@ function StartNotify(Notify: PNotifyRequest): LongBool; syscall AOS_DOSBase 148;
procedure EndNotify(Notify: PNotifyRequest); syscall AOS_DOSBase 149;
function SetVar(const Name: STRPTR; Buffer: PChar; Size: LongInt; Flags: LongInt): LongBool; syscall AOS_DOSBase 150;
function GetVar(const Name: STRPTR; Buffer: STRPTR; Size: LongInt; Flags: LongInt): LongInt; syscall AOS_DOSBase 151;
-function DeleteVar(const Name: STRPTR; Flags: LongWord): LongInt; syscall AOS_DOSBase 152;
+function DeleteVar(const Name: STRPTR; Flags: LongWord): LongBool; syscall AOS_DOSBase 152;
function FindVar(const Name: STRPTR; Type_: LongWord): PLocalVar; syscall AOS_DOSBase 153;
function CliInit(Dp: PDosPacket): IPTR; syscall AOS_DOSBase 154;
function CliInitNewcli(Dp: PDosPacket): IPTR; syscall AOS_DOSBase 155;
diff --git a/packages/morphunits/src/agraphics.pas b/packages/morphunits/src/agraphics.pas
index 017dddcf9e..a254d639b7 100644
--- a/packages/morphunits/src/agraphics.pas
+++ b/packages/morphunits/src/agraphics.pas
@@ -1978,7 +1978,7 @@ const
GRAPHICSNAME: PChar = 'graphics.library';
var
- GfxBase : Pointer = nil;
+ GfxBase : PGfxBase = nil;
function BltBitMap(srcBitMap: PBitMap location 'a0'; XSrc: LongInt location 'd0'; YSrc: LongInt location 'd1'; DestBitMap: PBitMap location 'a1'; XDest: LongInt location 'd2'; YDest: LongInt location 'd3'; XSize: LongInt location 'd4'; YSize: LongInt location 'd5'; MinTerm: LongWord location 'd6'; Mask: LongWord location 'd7'; TempA: TPlanePtr location 'a2'): LongInt; SysCall GfxBase 030;
procedure BltTemplate(Source: TPlanePtr location 'a0'; XSrc: LongInt location 'd0'; SrcMod: LongInt location 'd1'; DestRP: PRastPort location 'a1'; XDest: LongInt location 'd2'; YDest: LongInt location 'd3'; XSize: LongInt location 'd4'; YSize: LongInt location 'd5'); SysCall GfxBase 036;
@@ -2365,8 +2365,8 @@ begin
end;
initialization
- GfxBase := OpenLibrary(GRAPHICSNAME,LIBVERSION);
+ GfxBase := PGfxBase(OpenLibrary(GRAPHICSNAME,LIBVERSION));
finalization
if Assigned(GfxBase) then
- CloseLibrary(GfxBase);
+ CloseLibrary(PLibrary(GfxBase));
end.
diff --git a/packages/morphunits/src/amigados.pas b/packages/morphunits/src/amigados.pas
index a411b01527..6ffa4bb325 100644
--- a/packages/morphunits/src/amigados.pas
+++ b/packages/morphunits/src/amigados.pas
@@ -1656,8 +1656,8 @@ SysCall MOS_DOSBase 66;
function dosDeleteFile(fname: PChar location 'd1'): LongBool;
SysCall MOS_DOSBase 72;
-function dosRename(oldName: PChar location 'd1';
- newName: PChar location 'd2'): LongInt;
+function dosRename(oldName: STRPTR location 'd1';
+ newName: STRPTR location 'd2'): LongBool;
SysCall MOS_DOSBase 78;
function Lock(lname : PChar location 'd1';
@@ -1671,15 +1671,15 @@ function DupLock(lock: BPTR location 'd1'): LongInt;
SysCall MOS_DOSBase 096;
function Examine(lock : BPTR location 'd1';
- fileInfoBlock: PFileInfoBlock location 'd2'): LongInt;
+ fileInfoBlock: PFileInfoBlock location 'd2'): LongBool;
SysCall MOS_DOSBase 102;
function ExNext(lock : BPTR location 'd1';
- fileInfoBlock: PFileInfoBlock location 'd2'): LongInt;
+ fileInfoBlock: PFileInfoBlock location 'd2'): LongBool;
SysCall MOS_DOSBase 108;
function Info(lock : BPTR location 'd1';
- parameterBlock: PInfoData location 'd2'): LongInt;
+ parameterBlock: PInfoData location 'd2'): LongBool;
SysCall MOS_DOSBase 114;
function dosCreateDir(dname: PChar location 'd1'): LongInt;
@@ -1714,7 +1714,7 @@ function SetComment(name : PChar location 'd1';
SysCall MOS_DOSBase 180;
function SetProtection(name: PChar location 'd1';
- mask: LongInt location 'd2'): LongInt;
+ mask: LongInt location 'd2'): LongBool;
SysCall MOS_DOSBase 186;
function DateStamp(date: PDateStamp location 'd1'): PDateStamp;
@@ -1733,9 +1733,9 @@ SysCall MOS_DOSBase 210;
function IsInteractive(file1: BPTR location 'd1'): LongBool;
SysCall MOS_DOSBase 216;
-function Execute(string1: PChar location 'd1';
- file1 : BPTR location 'd2';
- file2 : BPTR location 'd3'): LongBool;
+function Execute(string1: STRPTR location 'd1';
+ file1 : BPTR location 'd2';
+ file2 : BPTR location 'd3'): LongBool;
SysCall MOS_DOSBase 222;
function AllocDosObject(type1: Cardinal location 'd1';
@@ -1873,13 +1873,13 @@ function VFPrintf(fh : BPTR location 'd1';
argarray: PLongInt location 'd3'): LongInt;
SysCall MOS_DOSBase 354;
-function dosFlush(fh: BPTR location 'd1'): LongInt;
+function dosFlush(fh: BPTR location 'd1'): LongBool;
SysCall MOS_DOSBase 360;
function SetVBuf(fh : BPTR location 'd1';
buff : PChar location 'd2';
type1: LongInt location 'd3';
- size : LongInt location 'd4'): LongInt;
+ size : LongInt location 'd4'): LongBool;
SysCall MOS_DOSBase 366;
function DupLockFromFH(fh: BPTR location 'd1'): BPTR;
@@ -1921,7 +1921,7 @@ function SameLock(lock1: BPTR location 'd1';
SysCall MOS_DOSBase 420;
function SetMode(fh : BPTR location 'd1';
- mode: LongInt location 'd2'): LongInt;
+ mode: LongInt location 'd2'): LongBool;
SysCall MOS_DOSBase 426;
function ExAll(lock : BPTR location 'd1';
@@ -2085,7 +2085,7 @@ SysCall MOS_DOSBase 666;
function RemDosEntry(dlist: PDosList location 'd1'): LongBool;
SysCall MOS_DOSBase 672;
-function AddDosEntry(dlist: PDosList location 'd1'): LongInt;
+function AddDosEntry(dlist: PDosList location 'd1'): LongBool;
SysCall MOS_DOSBase 678;
function FindDosEntry(dlist: PDosList location 'd1';
diff --git a/packages/os4units/src/amigados.pas b/packages/os4units/src/amigados.pas
index c1870501cb..4d78beb03f 100644
--- a/packages/os4units/src/amigados.pas
+++ b/packages/os4units/src/amigados.pas
@@ -1437,7 +1437,7 @@ Type
3: ( dol_Misc: array[0..23] of Byte;
dol_Name: DWord; { BPTR }
);
- end;
+ end;
{ This structure can take on different values depending on whether it is
@@ -2596,7 +2596,7 @@ function FindVar(const Name: STRPTR; Type_: LongWord): PLocalVar; syscall IDos 7
function CliInitNewcli(Dp: PDosPacket): LongInt; syscall IDos 736;
function CliInitRun(Dp: PDosPacket): LongInt; syscall IDos 740;
function WriteChars(const Buf: STRPTR; BufLen: LongWord): LongInt; syscall IDos 744;
-function PutStr(const Str: STRPTR): LongBool; syscall IDos 748;
+function PutStr(const Str: STRPTR): LongInt; syscall IDos 748;
function VPrintf(const Format: STRPTR; const ArgArray: PLongInt): LongInt; syscall IDos 752;
// 756 Printf
// 760 reserved
diff --git a/packages/rtl-console/src/amicommon/crt.pp b/packages/rtl-console/src/amicommon/crt.pp
index 5778354c51..f2b90a7d4f 100644
--- a/packages/rtl-console/src/amicommon/crt.pp
+++ b/packages/rtl-console/src/amicommon/crt.pp
@@ -535,11 +535,7 @@ begin
OutP := DosOutput();
//SetMode(OutP, 1);
// Wait one millisecond for the key (-1 = timeout)
- {$if defined(AROS)}
- KeyPressed := WaitForChar(OutP, 1) <> 0;
- {$else}
KeyPressed := WaitForChar(OutP, 1);
- {$endif}
//SetMode(OutP, 0);
end;