* Char -> AnsiChar

This commit is contained in:
Michael VAN CANNEYT 2022-12-21 17:36:27 +01:00 committed by Michaël Van Canneyt
parent 7c538b1797
commit bd2b954ae5
6 changed files with 24 additions and 24 deletions

View File

@ -51,7 +51,7 @@ ACCOMPANYING THE COMPACT DISK.
{ Fixed size data types }
type
SByte = char; // I'am not sure about that (FK)
SByte = AnsiChar; // I'am not sure about that (FK)
UInt16 = word;
UInt32 = cardinal;
SWord = integer;
@ -59,7 +59,7 @@ ACCOMPANYING THE COMPACT DISK.
SDWord = longint;
Int32 = longint;
DWord = cardinal;
UChar = char; // I'am not sure about that (FK)
UChar = AnsiChar; // I'am not sure about that (FK)
Short = integer;
UShort = word;
Int = integer;
@ -83,7 +83,7 @@ ACCOMPANYING THE COMPACT DISK.
{ Logical data types }
BooleanPtr = ^Boolean;
CharPtr = ^Char;
CharPtr = ^AnsiChar;
UCharPtr = ^UChar;
ShortPtr = ^Short;
UShortPtr = ^UShort;
@ -93,9 +93,9 @@ ACCOMPANYING THE COMPACT DISK.
ULongPtr = ^ULong;
{ Generic Pointer types used by Memory Manager }
{ We have to define Ptr as char* because that's what the Mac includes do. }
{ We have to define Ptr as AnsiChar* because that's what the Mac includes do. }
{ global pointer }
Ptr = ^char;
Ptr = ^AnsiChar;
{ global handle }
Handle = ^Ptr;

View File

@ -40,12 +40,12 @@
function FntCharHeight:SWord;systrap sysTrapFntCharHeight;
function FntLineHeight:SWord;systrap sysTrapFntLineHeight;
function FntAverageCharWidth:SWord;systrap sysTrapFntAverageCharWidth;
function FntCharWidth(ch:Char):SWord;systrap sysTrapFntCharWidth;
function FntCharsWidth(chars:pChar; len:Word):SWord;systrap sysTrapFntCharsWidth;
procedure FntCharsInWidth(string:pChar; stringWidthP:pSWord; stringLengthP:pSWord; fitWithinWidth:pBoolean);systrap sysTrapFntCharsInWidth;
function FntCharWidth(ch:AnsiChar):SWord;systrap sysTrapFntCharWidth;
function FntCharsWidth(chars:PAnsiChar; len:Word):SWord;systrap sysTrapFntCharsWidth;
procedure FntCharsInWidth(string:PAnsiChar; stringWidthP:pSWord; stringLengthP:pSWord; fitWithinWidth:pBoolean);systrap sysTrapFntCharsInWidth;
function FntDescenderHeight:SWord;systrap sysTrapFntDescenderHeight;
function FntLineWidth(pChars:pChar; length:Word):SWord;systrap sysTrapFntLineWidth;
function FntWordWrap(chars:pChar; maxWidth:Word):Word;systrap sysTrapFntWordWrap;
procedure FntWordWrapReverseNLines(chars:pChar; maxWidth:Word; linesToScrollP:WordPtr; scrollPosP:WordPtr);systrap sysTrapFntWordWrapReverseNLines;
procedure FntGetScrollValues(chars:pChar; width:Word; scrollPos:Word; linesP:WordPtr; topLine:WordPtr);systrap sysTrapFntGetScrollValues;
function FntLineWidth(pChars:PAnsiChar; length:Word):SWord;systrap sysTrapFntLineWidth;
function FntWordWrap(chars:PAnsiChar; maxWidth:Word):Word;systrap sysTrapFntWordWrap;
procedure FntWordWrapReverseNLines(chars:PAnsiChar; maxWidth:Word; linesToScrollP:WordPtr; scrollPosP:WordPtr);systrap sysTrapFntWordWrapReverseNLines;
procedure FntGetScrollValues(chars:PAnsiChar; width:Word; scrollPos:Word; linesP:WordPtr; topLine:WordPtr);systrap sysTrapFntGetScrollValues;
function FntDefineFont(font:FontID; fontP:FontPtr):Err;systrap sysTrapFntDefineFont;

View File

@ -99,6 +99,6 @@ function DmReleaseResource(resourceH: MemHandle): Err; syscall sysTrapDmReleaseR
const
sysTrapWinDrawChars = $A220;
procedure WinDrawChars(const chars: PChar; len: SmallInt; x, y: SmallInt); syscall sysTrapWinDrawChars;
procedure WinDrawChars(const chars: PAnsiChar; len: SmallInt; x, y: SmallInt); syscall sysTrapWinDrawChars;
{$PACKRECORDS DEFAULT}

View File

@ -87,16 +87,16 @@ interface
UInt = word;
OsType = UInt;
Cstring = packed array[1..32] of char;
Cstr16 = packed array[1..16] of char;
Cstr8 = packed array[1..8] of char;
Cstring = packed array[1..32] of AnsiChar;
Cstr16 = packed array[1..16] of AnsiChar;
Cstr8 = packed array[1..8] of AnsiChar;
PString = packed record
case boolean of
true: (
p: String;
);
false: (
c: array[0..255] of char
c: array[0..255] of AnsiChar
);
end;

View File

@ -25,12 +25,12 @@ begin
end;
procedure do_erase(p : pchar; pchangeable: boolean);
procedure do_erase(p : PAnsiChar; pchangeable: boolean);
begin
end;
procedure do_rename(p1,p2 : pchar; p1changeable, p2changeable: boolean);
procedure do_rename(p1,p2 : PAnsiChar; p1changeable, p2changeable: boolean);
begin
end;

View File

@ -31,8 +31,8 @@ const
DriveSeparator = ':';
ExtensionSeparator = '.';
PathSeparator = ';';
AllowDirectorySeparators : set of char = ['\','/'];
AllowDriveSeparators : set of char = [':'];
AllowDirectorySeparators : set of AnsiChar = ['\','/'];
AllowDriveSeparators : set of AnsiChar = [':'];
FileNameCaseSensitive = false;
FileNameCasePreserving = true;
CtrlZMarksEOF: boolean = false; (* #26 not considered as end of file *)
@ -50,10 +50,10 @@ const
StdErrorHandle = $ffff;
var
args: PChar;
args: PAnsiChar;
argc: LongInt;
argv: PPChar;
envp: PPChar;
argv: PPAnsiChar;
envp: PPAnsiChar;
{$if defined(FPUSOFT)}