diff --git a/packages/morphunits/src/agraphics.pas b/packages/morphunits/src/agraphics.pas index 9be8052980..13df729505 100644 --- a/packages/morphunits/src/agraphics.pas +++ b/packages/morphunits/src/agraphics.pas @@ -71,7 +71,7 @@ type xln_Pred: PNode; xln_Type: Byte; // NT_GRAPHICS xln_Pri: ShortInt; - xln_Name: PChar; + xln_Name: PAnsiChar; xln_Subsystem: Byte; // see below xln_Subtype: Byte; // SS_GRAPHICS xln_Library : Longint; @@ -215,7 +215,7 @@ type tf_Style: Byte; // font style | match a font tf_Flags: Byte; // preferences and flags / request. tf_XSize: Word; // nominal font width - tf_Baseline: Word; // distance from the top of char to baseline + tf_Baseline: Word; // distance from the top of AnsiChar to baseline tf_BoldSmear: Word; // smear to affect a bold enhancement tf_Accessors: Word; // access count tf_LoChar: Byte; // the first character described here @@ -785,7 +785,7 @@ const CT_COLORMASK = $000F; // mask to get to following color styles CT_COLORFONT = $0001; // color map contains designer's colors } CT_GREYFONT = $0002; // color map describes even-stepped brightnesses from low to high - CT_ANTIALIAS = $0004; // zero background thru fully saturated char + CT_ANTIALIAS = $0004; // zero background thru fully saturated AnsiChar CTB_MAPCOLOR = 0; // map ctf_FgColor to the rp_FgPen IF it's } CTF_MAPCOLOR = 1 shl CTB_MAPCOLOR; // is a valid color within ctf_Low..ctf_High @@ -985,11 +985,11 @@ const REQUEST_SPECIAL = 1 shl MSB_REQUEST_SPECIAL; REQUEST_A2024 = 1 shl MSB_REQUEST_A2024; - DEFAULT_MONITOR_NAME : PChar = 'default.monitor'; - NTSC_MONITOR_NAME : PChar = 'ntsc.monitor'; - PAL_MONITOR_NAME : PChar = 'pal.monitor'; - VGA_MONITOR_NAME : PChar = 'vga.monitor'; - VGA70_MONITOR_NAME : PChar = 'vga70.monitor'; + DEFAULT_MONITOR_NAME : PAnsiChar = 'default.monitor'; + NTSC_MONITOR_NAME : PAnsiChar = 'ntsc.monitor'; + PAL_MONITOR_NAME : PAnsiChar = 'pal.monitor'; + VGA_MONITOR_NAME : PAnsiChar = 'vga.monitor'; + VGA70_MONITOR_NAME : PAnsiChar = 'vga70.monitor'; STANDARD_MONITOR_MASK = REQUEST_NTSC or REQUEST_PAL; STANDARD_NTSC_ROWS = 262; @@ -1619,7 +1619,7 @@ type PNameInfo = ^TNameInfo; TNameInfo = record Header: TQueryHeader; - Name: array[0..DISPLAYNAMELEN - 1] of Char; + Name: array[0..DISPLAYNAMELEN - 1] of AnsiChar; Reserved: array[0..1] of LongWord; // terminator end; @@ -1975,7 +1975,7 @@ const // GfxFlags (private) NEW_DATABASE = 1; - GRAPHICSNAME: PChar = 'graphics.library'; + GRAPHICSNAME: PAnsiChar = 'graphics.library'; var GfxBase : PGfxBase = nil; @@ -2094,7 +2094,7 @@ function TextExtent(Rp: PRastPort location 'a1'; String1: STRPTR location 'a0'; function TextFit(Rp: PRastPort location 'a1'; String1: STRPTR location 'a0'; StrLen: LongWord location 'd0'; TextExtent: PTextExtent location 'a2'; ConstrainingExtent: PTextExtent location 'a3'; StrDirection: LongInt location 'd1'; ConstrainingBitWidth: LongWord location 'd2'; constrainingBitHeight: LongWord location 'd3'): LongWord; SysCall GfxBase 696; function GfxLookUp(associateNode: APTR location 'a0'): APTR; SysCall GfxBase 702; function VideoControl(ColorMap: PColorMap location 'a0'; TagArray: PTagItem location 'a1'): LongBool; SysCall GfxBase 708; -function OpenMonitor(MonitorName: PChar location 'a1'; DisplayID: LongWord location 'd0'): PMonitorSpec; SysCall GfxBase 714; +function OpenMonitor(MonitorName: PAnsiChar location 'a1'; DisplayID: LongWord location 'd0'): PMonitorSpec; SysCall GfxBase 714; function CloseMonitor(MonitorSpec: PMonitorSpec location 'a0'): LongBool; SysCall GfxBase 720; function FindDisplayInfo(DisplayID: LongWord location 'd0'): DisplayInfoHandle; SysCall GfxBase 726; function NextDisplayInfo(DisplayID: LongWord location 'd0'): LongWord; SysCall GfxBase 732; diff --git a/packages/morphunits/src/ahi.pas b/packages/morphunits/src/ahi.pas index fae79686ff..50ae011e95 100644 --- a/packages/morphunits/src/ahi.pas +++ b/packages/morphunits/src/ahi.pas @@ -343,7 +343,7 @@ var { Function to filter mode id's } AHIR_FilterFunc = AHI_TagBase + 271; { DEFS } - AHINAME : PChar = 'ahi.device'; + AHINAME : PAnsiChar = 'ahi.device'; { Invalid Audio ID } AHI_INVALID_ID = not (0); { Only for AHI_AllocAudioA()! } @@ -538,7 +538,7 @@ SysCall AHIBase 150; function AHI_RemoveAudioMode(d0arg : Cardinal location 'd0') : Cardinal; SysCall AHIBase 156; -function AHI_LoadModeFile(a0arg : PChar location 'a0') : Cardinal; +function AHI_LoadModeFile(a0arg : PAnsiChar location 'a0') : Cardinal; SysCall AHIBase 162; diff --git a/packages/morphunits/src/amigados.pas b/packages/morphunits/src/amigados.pas index 6ffa4bb325..4da90950b4 100644 --- a/packages/morphunits/src/amigados.pas +++ b/packages/morphunits/src/amigados.pas @@ -82,19 +82,19 @@ type TFileInfoBlock = packed record fib_DiskKey : LongInt; fib_DirEntryType: LongInt; - fib_FileName : Array[0..107] Of Char; + fib_FileName : Array[0..107] Of AnsiChar; fib_Protection : LongInt; fib_EntryType : LongInt; fib_Size : LongInt; fib_NumBlocks : LongInt; fib_Date : TDateStamp; - fib_Comment : Array[0..79] Of Char; + fib_Comment : Array[0..79] Of AnsiChar; fib_OwnerUID : Word; fib_OwnerGID : Word; case SmallInt of 0: ( - fib_Reserved : Array[0..31] Of Char; + fib_Reserved : Array[0..31] Of AnsiChar; ); 1: ( // 64bit DOS extensions V51 filled by Examine64, ExNext64, ExamineFH64 with ACTION_EXAMINE_OBJECT64 @@ -297,9 +297,9 @@ type dat_Stamp : TDateStamp; dat_Format : Byte; dat_Flags : Byte; - dat_StrDay : PChar; - dat_StrDate: PChar; - dat_StrTime: PChar; + dat_StrDay : PAnsiChar; + dat_StrDate: PAnsiChar; + dat_StrTime: PAnsiChar; end; const @@ -528,8 +528,8 @@ const ACTION_EXAMINE_NEXT64 = 26409; // dp_Arg1 - BPTR to lock to examine, dp_Arg2 - BPTR to TFileInfoBlock ACTION_EXAMINE_FH64 = 26410; // dp_Arg1 - LongInt fh_Arg1, dp_Arg2 - BPTR to TFileInfoBlock - FQA_MaxFileNameLength = 0; // LongInt - Return the maximum length of a file name (in characters), excluding terminating '\0' char. - FQA_MaxVolumeNameLength = 1; // LongInt - Return the maximum length of the volume name (in characters), excluding terminating '\0' char + FQA_MaxFileNameLength = 0; // LongInt - Return the maximum length of a file name (in characters), excluding terminating '\0' AnsiChar. + FQA_MaxVolumeNameLength = 1; // LongInt - Return the maximum length of the volume name (in characters), excluding terminating '\0' AnsiChar FQA_MaxFileSize = 2; // Int64 - Returns maximum size of the file the filesystem supports. FQA_IsCaseSensitive = 3; // LongInt - If the filesystem names are case sensitive, this attribute must return DOSTrue. FQA_DeviceType = 4; // LongInt - Return the type of the medium the filesystem is using, if known. Value is one of DG_* @@ -713,7 +713,7 @@ type end; ); 2: ( dol_assign : record - dol_AssignName: PChar; + dol_AssignName: PAnsiChar; dol_List : PAssignList; end; ); @@ -822,7 +822,7 @@ type cdi_Future: LongWord; // For future expansion, 0 for now cdi_Pri: ShortInt; // CLI priority cdi_Flags: Byte; // If bit 0 is set cdi_command is valid - cdi_Command: array[0..0] of Char; // 0-terminated command being executed + cdi_Command: array[0..0] of AnsiChar; // 0-terminated command being executed end; PCLIDataItem = ^TCLIDataItem; @@ -847,7 +847,7 @@ type an_Lock : BPTR; an_Info : TFileInfoBlock; an_Flags : ShortInt; - an_String: Array[0..0] Of Char; + an_String: Array[0..0] Of AnsiChar; { * an_String continues * } end; @@ -870,7 +870,7 @@ type ap_Reserved : ShortInt; ap_Strlen : SmallInt; ap_Info : TFileInfoBlock; - ap_Buf : Array[0..1] of Char; + ap_Buf : Array[0..1] of AnsiChar; { * an_Buf continues * } ); end; @@ -1059,14 +1059,14 @@ type PExAllData = ^TExAllData; TExAllData = packed record ed_Next : PExAllData; - ed_Name : PChar; + ed_Name : PAnsiChar; ed_Type : LongInt; ed_Size : LongWord; ed_Prot : LongWord; ed_Days : LongWord; ed_Mins : LongWord; ed_Ticks : LongWord; - ed_Comment : PChar; + ed_Comment : PAnsiChar; ed_OwnerUID: Word; ed_OwnerGID: Word; ed_Size64: QWord; @@ -1077,7 +1077,7 @@ type TexAllControl = packed record eac_Entries : LongWord; eac_LastKey : LongWord; - eac_MatchString: PChar; + eac_MatchString: PAnsiChar; eac_MatchFunc : PHook; end; @@ -1279,7 +1279,7 @@ const ADO_AN_MsgPort = ADO_Dummy + 121; // PMsgPort ADO_AN_Lock = ADO_Dummy + 122; // BPTR ADO_AN_Type = ADO_Dummy + 123; // LongWord - ADO_AN_AssignName = ADO_Dummy + 124; // PChar + ADO_AN_AssignName = ADO_Dummy + 124; // PAnsiChar ADO_AN_AssignList = ADO_Dummy + 125; // PAssignList // GetDosObjectAttr uses this to store variable size entries. @@ -1368,7 +1368,7 @@ type TLocalVar = packed record lv_Node : TNode; lv_Flags: Word; - lv_Value: PChar; + lv_Value: PAnsiChar; lv_Len : LongWord; end; @@ -1406,7 +1406,7 @@ const type PCSource = ^TCSource; TCSource = packed record - CS_Buffer: PChar; + CS_Buffer: PAnsiChar; CS_Length: LongInt; CS_CurChr: LongInt; end; @@ -1416,9 +1416,9 @@ type TRDArgs = packed record RDA_Source : TCSource; RDA_DAList : LongInt; - RDA_Buffer : PChar; + RDA_Buffer : PAnsiChar; RDA_BufSiz : LongInt; - RDA_ExtHelp: PChar; + RDA_ExtHelp: PAnsiChar; RDA_Flags : LongInt; end; @@ -1534,8 +1534,8 @@ const type PNotifyRequest = ^TNotifyRequest; TNotifyRequest = packed record - nr_Name : PChar; - nr_FullName: PChar; + nr_Name : PAnsiChar; + nr_FullName: PAnsiChar; nr_UserData: LongWord; nr_Flags : LongWord; nr_stuff : record @@ -1615,7 +1615,7 @@ type PSegNode = ^TSegNode; TSegNode = packed record seg_Node : TMinNode; - seg_Name : PChar; + seg_Name : PAnsiChar; seg_Array: Array[0..0] Of TSegArray; end; @@ -1625,7 +1625,7 @@ type { dos.library functions } -function dosOpen(fname : PChar location 'd1'; +function dosOpen(fname : PAnsiChar location 'd1'; accessMode: LongInt location 'd2'): BPTR; SysCall MOS_DOSBase 30; @@ -1653,14 +1653,14 @@ function dosSeek(fileh : BPTR location 'd1'; posmode : LongInt location 'd3'): LongInt; SysCall MOS_DOSBase 66; -function dosDeleteFile(fname: PChar location 'd1'): LongBool; +function dosDeleteFile(fname: PAnsiChar location 'd1'): LongBool; SysCall MOS_DOSBase 72; function dosRename(oldName: STRPTR location 'd1'; newName: STRPTR location 'd2'): LongBool; SysCall MOS_DOSBase 78; -function Lock(lname : PChar location 'd1'; +function Lock(lname : PAnsiChar location 'd1'; accessMode: LongInt location 'd2'): BPTR; SysCall MOS_DOSBase 84; @@ -1682,7 +1682,7 @@ function Info(lock : BPTR location 'd1'; parameterBlock: PInfoData location 'd2'): LongBool; SysCall MOS_DOSBase 114; -function dosCreateDir(dname: PChar location 'd1'): LongInt; +function dosCreateDir(dname: PAnsiChar location 'd1'): LongInt; SysCall MOS_DOSBase 120; function CurrentDir(lock: BPTR location 'd1'): BPTR; @@ -1691,7 +1691,7 @@ SysCall MOS_DOSBase 126; function IoErr: LongInt; SysCall MOS_DOSBase 132; -function CreateProc(name : PChar location 'd1'; +function CreateProc(name : PAnsiChar location 'd1'; pri : LongInt location 'd2'; segList : BPTR location 'd3'; stackSize: LongInt location 'd4'): PMsgPort; @@ -1700,20 +1700,20 @@ SysCall MOS_DOSBase 138; procedure dosExit(returnCode: LongInt location 'd1'); SysCall MOS_DOSBase 144; -function LoadSeg(name: PChar location 'd1'): BPTR; +function LoadSeg(name: PAnsiChar location 'd1'): BPTR; SysCall MOS_DOSBase 150; procedure UnLoadSeg(seglist: BPTR location 'd1'); SysCall MOS_DOSBase 156; -function DeviceProc(name: PChar location 'd1'): PMsgPort; +function DeviceProc(name: PAnsiChar location 'd1'): PMsgPort; SysCall MOS_DOSBase 174; -function SetComment(name : PChar location 'd1'; - comment: PChar location 'd2'): LongBool; +function SetComment(name : PAnsiChar location 'd1'; + comment: PAnsiChar location 'd2'): LongBool; SysCall MOS_DOSBase 180; -function SetProtection(name: PChar location 'd1'; +function SetProtection(name: PAnsiChar location 'd1'; mask: LongInt location 'd2'): LongBool; SysCall MOS_DOSBase 186; @@ -1855,21 +1855,21 @@ function FWrite(fh : BPTR location 'd1'; SysCall MOS_DOSBase 330; function FGets(fh : BPTR location 'd1'; - buf : PChar location 'd2'; - buflen: Cardinal location 'd3'): PChar; + buf : PAnsiChar location 'd2'; + buflen: Cardinal location 'd3'): PAnsiChar; SysCall MOS_DOSBase 336; function FPuts(fh : BPTR location 'd1'; - str: PChar location 'd2'): LongInt; + str: PAnsiChar location 'd2'): LongInt; SysCall MOS_DOSBase 342; procedure VFWritef(fh : BPTR location 'd1'; - format : PChar location 'd2'; + format : PAnsiChar location 'd2'; argarray: Pointer location 'd3'); SysCall MOS_DOSBase 348; function VFPrintf(fh : BPTR location 'd1'; - format : PChar location 'd2'; + format : PAnsiChar location 'd2'; argarray: PLongInt location 'd3'): LongInt; SysCall MOS_DOSBase 354; @@ -1877,7 +1877,7 @@ function dosFlush(fh: BPTR location 'd1'): LongBool; SysCall MOS_DOSBase 360; function SetVBuf(fh : BPTR location 'd1'; - buff : PChar location 'd2'; + buff : PAnsiChar location 'd2'; type1: LongInt location 'd3'; size : LongInt location 'd4'): LongBool; SysCall MOS_DOSBase 366; @@ -1895,23 +1895,23 @@ function ExamineFH(fh : BPTR location 'd1'; fib: PFileInfoBlock location 'd2'): LongBool; SysCall MOS_DOSBase 390; -function SetFileDate(name: PChar location 'd1'; +function SetFileDate(name: PAnsiChar location 'd1'; date: PDateStamp location 'd2'): LongBool; SysCall MOS_DOSBase 396; function NameFromLock(lock : BPTR location 'd1'; - buffer: PChar location 'd2'; + buffer: PAnsiChar location 'd2'; len : LongInt location 'd3'): LongBool; SysCall MOS_DOSBase 402; function NameFromFH(fh : BPTR location 'd1'; - buffer: PChar location 'd2'; + buffer: PAnsiChar location 'd2'; len : LongInt location 'd3'): LongBool; SysCall MOS_DOSBase 408; -function SplitName(name : PChar location 'd1'; +function SplitName(name : PAnsiChar location 'd1'; separator: Cardinal location 'd2'; - buf : PChar location 'd3'; + buf : PAnsiChar location 'd3'; oldpos : LongInt location 'd4'; size : LongInt location 'd5'): SmallInt; SysCall MOS_DOSBase 414; @@ -1933,12 +1933,12 @@ SysCall MOS_DOSBase 432; function ReadLink(port : PMsgPort location 'd1'; lock : BPTR location 'd2'; - path : PChar location 'd3'; - buffer: PChar location 'd4'; + path : PAnsiChar location 'd3'; + buffer: PAnsiChar location 'd4'; size : Cardinal location 'd5'): LongBool; SysCall MOS_DOSBase 438; -function MakeLink(name: PChar location 'd1'; +function MakeLink(name: PAnsiChar location 'd1'; dest: LongInt location 'd2'; soft: LongInt location 'd3'): LongBool; SysCall MOS_DOSBase 444; @@ -1957,13 +1957,13 @@ function SetIoErr(result: LongInt location 'd1'): LongInt; SysCall MOS_DOSBase 462; function Fault(code : LongInt location 'd1'; - header: PChar location 'd2'; - buffer: PChar location 'd3'; + header: PAnsiChar location 'd2'; + buffer: PAnsiChar location 'd3'; len : LongInt location 'd4'): LongBool; SysCall MOS_DOSBase 468; function PrintFault(code : LongInt location 'd1'; - header: PChar location 'd2'): LongBool; + header: PAnsiChar location 'd2'): LongBool; SysCall MOS_DOSBase 474; function ErrorReport(code : LongInt location 'd1'; @@ -1983,7 +1983,7 @@ SysCall MOS_DOSBase 498; function RunCommand(seg : BPTR location 'd1'; stack : LongInt location 'd2'; - paramptr: PChar location 'd3'; + paramptr: PAnsiChar location 'd3'; paramlen: LongInt location 'd4'): LongInt; SysCall MOS_DOSBase 504; @@ -1999,10 +1999,10 @@ SysCall MOS_DOSBase 522; function SetFileSysTask(task: PMsgPort location 'd1'): PMsgPort; SysCall MOS_DOSBase 528; -function GetArgStr: PChar; +function GetArgStr: PAnsiChar; SysCall MOS_DOSBase 534; -function SetArgStr(str: PChar location 'd1'): LongBool; +function SetArgStr(str: PAnsiChar location 'd1'): LongBool; SysCall MOS_DOSBase 540; function FindCliProc(num: Cardinal location 'd1'): PProcess; @@ -2011,24 +2011,24 @@ SysCall MOS_DOSBase 546; function MaxCli: Cardinal; SysCall MOS_DOSBase 552; -function SetCurrentDirName(name: PChar location 'd1'): LongBool; +function SetCurrentDirName(name: PAnsiChar location 'd1'): LongBool; SysCall MOS_DOSBase 558; -function GetCurrentDirName(buf: PChar location 'd1'; +function GetCurrentDirName(buf: PAnsiChar location 'd1'; len: LongInt location 'd2'): LongBool; SysCall MOS_DOSBase 564; -function SetProgramName(name: PChar location 'd1'): LongBool; +function SetProgramName(name: PAnsiChar location 'd1'): LongBool; SysCall MOS_DOSBase 570; -function GetProgramName(buf: PChar location 'd1'; +function GetProgramName(buf: PAnsiChar location 'd1'; len: LongInt location 'd2'): LongBool; SysCall MOS_DOSBase 576; -function SetPrompt(name: PChar location 'd1'): LongBool; +function SetPrompt(name: PAnsiChar location 'd1'): LongBool; SysCall MOS_DOSBase 582; -function GetPrompt(buf: PChar location 'd1'; +function GetPrompt(buf: PAnsiChar location 'd1'; len: LongInt location 'd2'): LongBool; SysCall MOS_DOSBase 588; @@ -2038,35 +2038,35 @@ SysCall MOS_DOSBase 594; function GetProgramDir: BPTR; SysCall MOS_DOSBase 600; -function SystemTagList(command: PChar location 'd1'; +function SystemTagList(command: PAnsiChar location 'd1'; tags : PTagItem location 'd2'): LongInt; SysCall MOS_DOSBase 606; -function dosSystem(command: PChar location 'd1'; +function dosSystem(command: PAnsiChar location 'd1'; tags : PTagItem location 'd2'): LongInt; SysCall MOS_DOSBase 606; -function AssignLock(name: PChar location 'd1'; +function AssignLock(name: PAnsiChar location 'd1'; lock: BPTR location 'd2'): LongBool; SysCall MOS_DOSBase 612; -function AssignLate(name: PChar location 'd1'; - path: PChar location 'd2'): LongBool; +function AssignLate(name: PAnsiChar location 'd1'; + path: PAnsiChar location 'd2'): LongBool; SysCall MOS_DOSBase 618; -function AssignPath(name: PChar location 'd1'; - path: PChar location 'd2'): LongBool; +function AssignPath(name: PAnsiChar location 'd1'; + path: PAnsiChar location 'd2'): LongBool; SysCall MOS_DOSBase 624; -function AssignAdd(name: PChar location 'd1'; +function AssignAdd(name: PAnsiChar location 'd1'; lock: BPTR location 'd2'): LongBool; SysCall MOS_DOSBase 630; -function RemAssignList(name: PChar location 'd1'; +function RemAssignList(name: PAnsiChar location 'd1'; lock: BPTR location 'd2'): LongBool; SysCall MOS_DOSBase 636; -function GetDeviceProc(name: PChar location 'd1'; +function GetDeviceProc(name: PAnsiChar location 'd1'; dp : PDevProc location 'd2'): PDevProc; SysCall MOS_DOSBase 642; @@ -2089,7 +2089,7 @@ function AddDosEntry(dlist: PDosList location 'd1'): LongBool; SysCall MOS_DOSBase 678; function FindDosEntry(dlist: PDosList location 'd1'; - name : PChar location 'd2'; + name : PAnsiChar location 'd2'; flags: Cardinal location 'd3'): PDosList; SysCall MOS_DOSBase 684; @@ -2097,30 +2097,30 @@ function NextDosEntry(dlist: PDosList location 'd1'; flags: Cardinal location 'd2'): PDosList; SysCall MOS_DOSBase 690; -function MakeDosEntry(name : PChar location 'd1'; +function MakeDosEntry(name : PAnsiChar location 'd1'; type1: LongInt location 'd2'): PDosList; SysCall MOS_DOSBase 696; procedure FreeDosEntry(dlist: PDosList location 'd1'); SysCall MOS_DOSBase 702; -function IsFileSystem(name: PChar location 'd1'): LongBool; +function IsFileSystem(name: PAnsiChar location 'd1'): LongBool; SysCall MOS_DOSBase 708; -function Format(filesystem: PChar location 'd1'; - volumename: PChar location 'd2'; +function Format(filesystem: PAnsiChar location 'd1'; + volumename: PAnsiChar location 'd2'; dostype : Cardinal location 'd3'): LongBool; SysCall MOS_DOSBase 714; -function Relabel(drive : PChar location 'd1'; - newname: PChar location 'd2'): LongBool; +function Relabel(drive : PAnsiChar location 'd1'; + newname: PAnsiChar location 'd2'): LongBool; SysCall MOS_DOSBase 720; -function Inhibit(name : PChar location 'd1'; +function Inhibit(name : PAnsiChar location 'd1'; onoff: LongInt location 'd2'): LongBool; SysCall MOS_DOSBase 726; -function AddBuffers(name : PChar location 'd1'; +function AddBuffers(name : PAnsiChar location 'd1'; number: LongInt location 'd2'): LongBool; SysCall MOS_DOSBase 732; @@ -2140,20 +2140,20 @@ function InternalLoadSeg(fh : BPTR location 'd0'; var stack : LongInt location 'a2'): LongInt; SysCall MOS_DOSBase 756; -function NewLoadSeg(file1: PChar location 'd1'; +function NewLoadSeg(file1: PAnsiChar location 'd1'; tags : PTagItem location 'd2'): LongInt; SysCall MOS_DOSBase 768; -function NewLoadSegTagList(file1: PChar location 'd1'; +function NewLoadSegTagList(file1: PAnsiChar location 'd1'; tags : PTagItem location 'd2'): LongInt; SysCall MOS_DOSBase 768; -function AddSegment(name : PChar location 'd1'; +function AddSegment(name : PAnsiChar location 'd1'; seg : BPTR location 'd2'; system: LongInt location 'd3'): LongBool; SysCall MOS_DOSBase 774; -function FindSegment(name : PChar location 'd1'; +function FindSegment(name : PAnsiChar location 'd1'; seg : PSegment location 'd2'; system: LongInt location 'd3'): PSegment; SysCall MOS_DOSBase 780; @@ -2164,25 +2164,25 @@ SysCall MOS_DOSBase 786; function CheckSignal(mask: LongInt location 'd1'): LongInt; SysCall MOS_DOSBase 792; -function ReadArgs(arg_template: PChar location 'd1'; +function ReadArgs(arg_template: PAnsiChar location 'd1'; var array1 : LongInt location 'd2'; args : PRDArgs location 'd3'): PRDArgs; SysCall MOS_DOSBase 798; -function FindArg(keyword : PChar location 'd1'; - arg_template: PChar location 'd2'): LongInt; +function FindArg(keyword : PAnsiChar location 'd1'; + arg_template: PAnsiChar location 'd2'): LongInt; SysCall MOS_DOSBase 804; -function ReadItem(name : PChar location 'd1'; +function ReadItem(name : PAnsiChar location 'd1'; maxchars: LongInt location 'd2'; cSource : PCSource location 'd3'): LongInt; SysCall MOS_DOSBase 810; -function StrToLong(string1 : PChar location 'd1'; +function StrToLong(string1 : PAnsiChar location 'd1'; var value: LongInt location 'd2'): LongInt; SysCall MOS_DOSBase 816; -function MatchFirst(pat : PChar location 'd1'; +function MatchFirst(pat : PAnsiChar location 'd1'; anchor: PAnchorPath location 'd2'): LongInt; SysCall MOS_DOSBase 822; @@ -2192,26 +2192,26 @@ SysCall MOS_DOSBase 828; procedure MatchEnd(anchor: PAnchorPath location 'd1'); SysCall MOS_DOSBase 834; -function ParsePattern(pat : PChar location 'd1'; - buf : PChar location 'd2'; +function ParsePattern(pat : PAnsiChar location 'd1'; + buf : PAnsiChar location 'd2'; buflen: LongInt location 'd3'): LongInt; SysCall MOS_DOSBase 840; -function MatchPattern(pat: PChar location 'd1'; - str: PChar location 'd2'): LongBool; +function MatchPattern(pat: PAnsiChar location 'd1'; + str: PAnsiChar location 'd2'): LongBool; SysCall MOS_DOSBase 846; procedure FreeArgs(args: pRDArgs location 'd1'); SysCall MOS_DOSBase 858; -function FilePart(path: PChar location 'd1'): PChar; +function FilePart(path: PAnsiChar location 'd1'): PAnsiChar; SysCall MOS_DOSBase 870; -function PathPart(path: PChar location 'd1'): PChar; +function PathPart(path: PAnsiChar location 'd1'): PAnsiChar; SysCall MOS_DOSBase 876; -function AddPart(dirname: PChar location 'd1'; - filename: PChar location 'd2'; +function AddPart(dirname: PAnsiChar location 'd1'; + filename: PAnsiChar location 'd2'; size : Cardinal location 'd3'): LongBool; SysCall MOS_DOSBase 882; @@ -2221,23 +2221,23 @@ SysCall MOS_DOSBase 888; procedure EndNotify(notify: PNotifyRequest location 'd1'); SysCall MOS_DOSBase 894; -function SetVar(name : PChar location 'd1'; - buffer: PChar location 'd2'; +function SetVar(name : PAnsiChar location 'd1'; + buffer: PAnsiChar location 'd2'; size : LongInt location 'd3'; flags : LongInt location 'd4'): LongBool; SysCall MOS_DOSBase 900; -function GetVar(name : PChar location 'd1'; - buffer: PChar location 'd2'; +function GetVar(name : PAnsiChar location 'd1'; + buffer: PAnsiChar location 'd2'; size : LongInt location 'd3'; flags : LongInt location 'd4'): LongInt; SysCall MOS_DOSBase 906; -function DeleteVar(name : PChar location 'd1'; +function DeleteVar(name : PAnsiChar location 'd1'; flags: Cardinal location 'd2'): LongBool; SysCall MOS_DOSBase 912; -function FindVar(name : PChar location 'd1'; +function FindVar(name : PAnsiChar location 'd1'; type1: Cardinal location 'd2'): PLocalVar; SysCall MOS_DOSBase 918; @@ -2247,24 +2247,24 @@ SysCall MOS_DOSBase 930; function CliInitRun(dp: PDosPacket location 'a0'): LongInt; SysCall MOS_DOSBase 936; -function WriteChars(buf : PChar location 'd1'; +function WriteChars(buf : PAnsiChar location 'd1'; buflen: Cardinal location 'd2'): LongInt; SysCall MOS_DOSBase 942; -function PutStr(str: PChar location 'd1'): LongInt; +function PutStr(str: PAnsiChar location 'd1'): LongInt; SysCall MOS_DOSBase 948; -function VPrintf(format : PChar location 'd1'; +function VPrintf(format : PAnsiChar location 'd1'; argarray: Pointer location 'd2'): LongInt; SysCall MOS_DOSBase 954; -function ParsePatternNoCase(pat : PChar location 'd1'; - buf : PChar location 'd2'; +function ParsePatternNoCase(pat : PAnsiChar location 'd1'; + buf : PAnsiChar location 'd2'; buflen: LongInt location 'd3'): LongInt; SysCall MOS_DOSBase 966; -function MatchPatternNoCase(pat: PChar location 'd1'; - str: PChar location 'd2'): LongBool; +function MatchPatternNoCase(pat: PAnsiChar location 'd1'; + str: PAnsiChar location 'd2'): LongBool; SysCall MOS_DOSBase 972; function SameDevice(lock1: BPTR location 'd1'; @@ -2278,7 +2278,7 @@ procedure ExAllEnd(lock : LongInt location 'd1'; control: PExAllControl location 'd5'); SysCall MOS_DOSBase 990; -function SetOwner(name : PChar location 'd1'; +function SetOwner(name : PAnsiChar location 'd1'; owner_info: LongInt location 'd2'): LongBool; SysCall MOS_DOSBase 996; @@ -2328,12 +2328,12 @@ function MKBADDR(x: Pointer): BPTR; Inline; * } function ReadChar: LongInt; Inline; -function WriteChar(ch: Char): LongInt; Inline; -function UnReadChar(ch: Char): LongInt; Inline; +function WriteChar(ch: AnsiChar): LongInt; Inline; +function UnReadChar(ch: AnsiChar): LongInt; Inline; function ReadChars(buf: Pointer; num: LongInt): LongInt; Inline; -function dosReadLn(buf: PChar; num: LongInt): PChar; Inline; -function dosWriteStr(str: PChar): LongInt; Inline; -procedure VWritef(format: PChar; argv: Pointer); Inline; +function dosReadLn(buf: PAnsiChar; num: LongInt): PAnsiChar; Inline; +function dosWriteStr(str: PAnsiChar): LongInt; Inline; +procedure VWritef(format: PAnsiChar; argv: Pointer); Inline; { * calls with tags workarounds (should be removed later) @@ -2342,7 +2342,7 @@ procedure VWritef(format: PChar; argv: Pointer); Inline; function CreateNewProcTags(tags: array of dword): PProcess; Inline; function AllocDosObjectTags(type1: Cardinal; Tags: array of DWord): Pointer; inline; -function SystemTags(command: PChar; Tags: array of DWord): LongInt; Inline; +function SystemTags(command: PAnsiChar; Tags: array of DWord): LongInt; Inline; function SetDosObjectAttrTagList(Type_: LongWord; Ptr: APTR; const Tags: array of PtrUInt): LongInt; inline; function GetDosObjectAttrTagList(Type_: LongWord; Ptr: APTR; const Tags: array of PtrUInt): LongInt; inline; @@ -2365,12 +2365,12 @@ begin ReadChar:=FGetC(dosInput); end; -function WriteChar(ch: Char): LongInt; Inline; +function WriteChar(ch: AnsiChar): LongInt; Inline; begin WriteChar:=FPutC(dosOutput,Byte(ch)); end; -function UnReadChar(ch: Char): LongInt; Inline; +function UnReadChar(ch: AnsiChar): LongInt; Inline; begin UnReadChar:=UnGetC(dosInput,Byte(ch)); end; @@ -2380,17 +2380,17 @@ begin ReadChars:=FRead(dosInput,buf,1,num); end; -function dosReadLn(buf: PChar; num: LongInt): PChar; Inline; +function dosReadLn(buf: PAnsiChar; num: LongInt): PAnsiChar; Inline; begin dosReadLn:=FGets(dosInput,buf,num); end; -function dosWriteStr(str: PChar): LongInt; Inline; +function dosWriteStr(str: PAnsiChar): LongInt; Inline; begin dosWriteStr:=FPuts(dosOutput,str); end; -procedure VWritef(format: PChar; argv: Pointer); Inline; +procedure VWritef(format: PAnsiChar; argv: Pointer); Inline; begin VFWritef(dosOutput,format,argv); end; @@ -2428,7 +2428,7 @@ begin AllocDosObjectTags := AllocDosObject(type1, @Tags); end; -function SystemTags(command: PChar; Tags: array of DWord): LongInt; +function SystemTags(command: PAnsiChar; Tags: array of DWord): LongInt; begin SystemTags := SystemTagList(Command, @Tags); end; diff --git a/packages/morphunits/src/asl.pas b/packages/morphunits/src/asl.pas index b11f48a496..796c937e54 100644 --- a/packages/morphunits/src/asl.pas +++ b/packages/morphunits/src/asl.pas @@ -30,7 +30,7 @@ uses exec, utility, workbench, agraphics; {************************************************************************} const - ASLNAME: PChar = 'asl.library'; + ASLNAME: PAnsiChar = 'asl.library'; ASL_TB = TAG_USER + $80000; {************************************************************************} @@ -418,7 +418,7 @@ const * of the semaphore is given below; it exists only with asl.library V45 and * IPrefs V45 and beyond. } - ASL_SEMAPHORE_NAME: PChar = 'asl.library'; + ASL_SEMAPHORE_NAME: PAnsiChar = 'asl.library'; type PAslSemaphore = ^TAslSemaphore; diff --git a/packages/morphunits/src/clipboard.pas b/packages/morphunits/src/clipboard.pas index 7069320f0c..745a5c4927 100644 --- a/packages/morphunits/src/clipboard.pas +++ b/packages/morphunits/src/clipboard.pas @@ -54,7 +54,7 @@ type io_Error : Shortint; { error or warning num } io_Actual : DWord; { number of bytes transferred } io_Length : DWord; { number of bytes requested } - io_Data : PChar; { either clip stream or post port } + io_Data : PAnsiChar; { either clip stream or post port } io_Offset : DWord; { offset in clip stream } io_ClipID : Longint; { ordinal clip identifier } end; diff --git a/packages/morphunits/src/commodities.pas b/packages/morphunits/src/commodities.pas index 67b67bc66d..505a8c4814 100644 --- a/packages/morphunits/src/commodities.pas +++ b/packages/morphunits/src/commodities.pas @@ -124,7 +124,7 @@ var CxBase: PLibrary = nil; const - COMMODITIESNAME: PChar = 'commodities.library'; + COMMODITIESNAME: PAnsiChar = 'commodities.library'; function CreateCxObj(Typ: LongWord location 'd0'; Arg1: LongInt location 'a0'; Arg2: LongInt location 'a1'): PCxObj; syscall CxBase 30; function CxBroker(Nb: PNewBroker location 'a0'; var Error: LongInt location 'd0'): PCxObj; syscall CxBase 36; diff --git a/packages/morphunits/src/console.pas b/packages/morphunits/src/console.pas index f647f0d509..9845fc6457 100644 --- a/packages/morphunits/src/console.pas +++ b/packages/morphunits/src/console.pas @@ -113,7 +113,7 @@ var ConsoleDevice: PDevice = nil; function CDInputHandler(Events: PInputEvent location 'a0'; ConsoleDev: PLibrary location 'a1'): PInputEvent; syscall ConsoleDevice 42; -function RawKeyConvert(Events: PInputEvent location 'a0'; Buffer: PChar location 'a1'; Length: LongInt location 'd1'; KeyMap: PKeyMap location 'a2'): LongInt; syscall ConsoleDevice 48; +function RawKeyConvert(Events: PInputEvent location 'a0'; Buffer: PAnsiChar location 'a1'; Length: LongInt location 'd1'; KeyMap: PKeyMap location 'a2'): LongInt; syscall ConsoleDevice 48; implementation diff --git a/packages/morphunits/src/cybergraphics.pas b/packages/morphunits/src/cybergraphics.pas index 5673d9a775..2797530122 100644 --- a/packages/morphunits/src/cybergraphics.pas +++ b/packages/morphunits/src/cybergraphics.pas @@ -28,7 +28,7 @@ USES VAR CyberGfxBase : pLibrary = nil; const - CYBERGRAPHICSNAME : PChar = 'cybergraphics.library'; + CYBERGRAPHICSNAME : PAnsiChar = 'cybergraphics.library'; { Contents of this file is based on cybergraphics.h from the MorphOS SDK: @@ -49,7 +49,7 @@ const PCyberModeNode = ^tCyberModeNode; tCyberModeNode = record Node : tNode; - ModeText : array[0..(DISPLAYNAMELEN)-1] of char; { name for this mode } + ModeText : array[0..(DISPLAYNAMELEN)-1] of AnsiChar; { name for this mode } DisplayID : ULONG; { display id associated with the node } Width : UWORD; { visible width } Height : UWORD; { visible height } diff --git a/packages/morphunits/src/datatypes.pas b/packages/morphunits/src/datatypes.pas index 56bb76ad67..4a775d5568 100644 --- a/packages/morphunits/src/datatypes.pas +++ b/packages/morphunits/src/datatypes.pas @@ -41,7 +41,7 @@ Type tDataTypeHeader = record dth_Name, { Descriptive name of the data type } dth_BaseName, { Base name of the data type } - dth_Pattern : PChar; { Match pattern for file name. } + dth_Pattern : PAnsiChar; { Match pattern for file name. } dth_Mask : Pointer; { Comparision mask } dth_GroupID, { Group that the DataType is in } dth_ID : longword; { ID for DataType (same as IFF FORM type) } @@ -139,7 +139,7 @@ Type {$WARNING FIX ME!!! IFF handle type} // dthc_IFF : pIFFHandle; { Pointer to an IFFHandle (may be NULL) } dthc_IFF : Pointer; { Pointer to an IFFHandle (may be NULL) } - dthc_Buffer : PChar; { Buffer } + dthc_Buffer : PAnsiChar; { Buffer } dthc_BufferLength : longword; { Length of the buffer } end; @@ -153,7 +153,7 @@ Type tTool = record tn_Which, { Which tool is this } tn_Flags : WORD; { Flags } - tn_Program : PChar; { Application to use } + tn_Program : PAnsiChar; { Application to use } end; const @@ -185,7 +185,7 @@ Type dtn_Node2 : tNode; { Reserved for system use } dtn_Header : pDataTypeHeader; { Pointer to the DataTypeHeader } dtn_ToolList: tList; { List of tool nodes } - dtn_FunctionName : PChar; { Name of comparision routine } + dtn_FunctionName : PAnsiChar; { Name of comparision routine } dtn_AttrList : pTagItem; { Object creation tags } dtn_Length : longword; { Length of the memory block } end; @@ -227,7 +227,7 @@ const {***************************************************************************} - DATATYPESCLASS : Pchar = 'datatypesclass'; + DATATYPESCLASS : PAnsiChar = 'datatypesclass'; {***************************************************************************} @@ -396,7 +396,7 @@ const { (struct RastPort ) RastPort to use when printing. (V40) } DTA_ARexxPortName = (DTA_Dummy+404); - { (PChar) Pointer to base name for ARexx port (V40) } + { (PAnsiChar) Pointer to base name for ARexx port (V40) } {***************************************************************************} @@ -457,7 +457,7 @@ Type pDTMethod = ^tDTMethod; tDTMethod = record dtm_Label, - dtm_Command : PChar; + dtm_Command : PAnsiChar; dtm_Method : longword; end; @@ -557,7 +557,7 @@ Type tdtGoto = record MethodID : longword; dtg_GInfo : pGadgetInfo; - dtg_NodeName : PChar; { Node to goto } + dtg_NodeName : PAnsiChar; { Node to goto } dtg_AttrList : pTagItem; { Additional attributes } end; @@ -655,7 +655,7 @@ const {***************************************************************************} - PICTUREDTCLASS : PChar = 'picture.datatype'; + PICTUREDTCLASS : PAnsiChar = 'picture.datatype'; {***************************************************************************} @@ -863,7 +863,7 @@ const {***************************************************************************} - SOUNDDTCLASS : PChar = 'sound.datatype'; + SOUNDDTCLASS : PAnsiChar = 'sound.datatype'; {***************************************************************************} @@ -967,7 +967,7 @@ const { ***************************************************************************} - TEXTDTCLASS : PChar = 'text.datatype'; + TEXTDTCLASS : PAnsiChar = 'text.datatype'; { ***************************************************************************} @@ -987,7 +987,7 @@ Type pLine = ^tLine; tLine = record ln_Link : tMinNode; { to link the lines together } - ln_Text : PChar; { pointer to the text for this line } + ln_Text : PAnsiChar; { pointer to the text for this line } ln_TextLen : longword; { the character length of the text for this line } ln_XOffset, { where in the line the text starts } ln_YOffset, { line the text is on } @@ -1025,7 +1025,7 @@ const { ***************************************************************************} - ANIMATIONDTCLASS : PChar = 'animation.datatype'; + ANIMATIONDTCLASS : PAnsiChar = 'animation.datatype'; { ***************************************************************************} @@ -1261,7 +1261,7 @@ var DataTypesBase : PLibrary = nil; const - DATATYPESNAME : PChar = 'datatypes.library'; + DATATYPESNAME : PAnsiChar = 'datatypes.library'; function ObtainDataTypeA(Typ: LongWord location 'd0'; Handle: POINTER location 'a0'; Attrs: PTagItem location 'a1'): PDataType; SysCall DataTypesBase 036; @@ -1291,12 +1291,12 @@ function CopyDTMethods(Src: LongWord location 'a0'; Include: LongWord location ' function CopyDTTriggerMethods(Src: PDTMethod location 'a0'; Include: PDTMethod location 'a1'; Exclude: PDTMethod location 'a2'): PDTMethod; SysCall DataTypesBase 276; procedure FreeDTMethods(m: Pointer location 'a0'); SysCall DataTypesBase 282; function GetDTTriggerMethodDataFlags(TriggerMethod: LongWord location 'd0'): LongWord; SysCall DataTypesBase 288; -function SaveDTObjectA(o: PObject_ location 'a0'; Win: PWindow location 'a1'; Req: PRequester location 'a2'; File_: PChar location 'a3'; Mode: LongWord location 'd0'; SaveIcon: BOOLEAN location 'd1'; Attrs: PTagItem location 'a4'): LongWord; SysCall DataTypesBase 294; +function SaveDTObjectA(o: PObject_ location 'a0'; Win: PWindow location 'a1'; Req: PRequester location 'a2'; File_: PAnsiChar location 'a3'; Mode: LongWord location 'd0'; SaveIcon: BOOLEAN location 'd1'; Attrs: PTagItem location 'a4'): LongWord; SysCall DataTypesBase 294; function StartDragSelect(o: PObject_ location 'a0'): LongWord; SysCall DataTypesBase 300; function DoDTDomainA(o: PObject_ location 'a0'; Win: PWindow location 'a1'; Req: PRequester location 'a2'; RPort: PRastPort location 'a3'; Which: LongWord location 'd0'; Domain: PIBox location 'a4'; Attrs: PTagItem location 'a5'): LongWord; SysCall DataTypesBase 306; function ObtainDataType(Typ: LongWord; Handle: Pointer; const Attrs: array of LongWord): PDataType; Inline; -function NewDTObject(Name: PChar; const attrs: array of LongWord): Pointer; Inline; +function NewDTObject(Name: PAnsiChar; const attrs: array of LongWord): Pointer; Inline; function SetDTAttrs(o: PObject_; Win: PWindow; Req: PRequester; const Attrs: array of LongWord): LongWord; Inline; function GetDTAttrs(o: PObject_; const Attrs: array of LongWord): LongWord; Inline; procedure RefreshDTObject(o: PObject_; Win: PWindow; Req: PRequester; const Attrs: array of LongWord); Inline; @@ -1305,7 +1305,7 @@ function ObtainDTDrawInfo(o: PObject_; const Attrs: array of LongWord): Pointer; function DrawDTObject(Rp: PRastPort; o: PObject_; x: LongInt; y: LongInt; w: LongInt; h: LongInt; th: LongInt; tv: LongInt; const Attrs: array of LongWord): LongInt; Inline; function FindToolNode(Tl: PList; const Attrs: array of LongWord): PToolNode; Inline; function LaunchTool(t: PTool; Project: PShortInt; const Attrs: array of LongWord): LongWord; Inline; -function SaveDTObject(o: PObject_; Win: PWindow; Req: PRequester; File_: PChar; Mode: LongWord; SaveIcon: BOOLEAN; const Attrs: array of LongWord): LongWord; Inline; +function SaveDTObject(o: PObject_; Win: PWindow; Req: PRequester; File_: PAnsiChar; Mode: LongWord; SaveIcon: BOOLEAN; const Attrs: array of LongWord): LongWord; Inline; function DoDTDomain(o: PObject_; Win: PWindow; Req: PRequester; RPort: PRastPort; Which: LongWord; Domain: PIBox; const Attrs: array of LongWord): LongWord; Inline; function InitDatatypesLibrary: boolean; @@ -1318,7 +1318,7 @@ begin ObtainDataType := ObtainDataTypeA(typ, Handle, @Attrs); end; -function NewDTObject(Name: PChar; const Attrs: array of LongWord): Pointer; Inline; +function NewDTObject(Name: PAnsiChar; const Attrs: array of LongWord): Pointer; Inline; begin NewDTObject := NewDTObjectA(Name, @Attrs); end; @@ -1363,7 +1363,7 @@ begin LaunchTool:=LaunchToolA(t, Project, @Attrs); end; -function SaveDTObject(o: PObject_; Win: PWindow; Req: PRequester; File_: PChar; Mode: LongWord; SaveIcon: BOOLEAN; const Attrs: array of LongWord): LongWord; Inline; +function SaveDTObject(o: PObject_; Win: PWindow; Req: PRequester; File_: PAnsiChar; Mode: LongWord; SaveIcon: BOOLEAN; const Attrs: array of LongWord): LongWord; Inline; begin SaveDTObject:=SaveDTObjectA(o, Win, Req, File_, Mode, Saveicon, @Attrs); end; diff --git a/packages/morphunits/src/diskfont.pas b/packages/morphunits/src/diskfont.pas index dce85d4a2c..177496d2b7 100644 --- a/packages/morphunits/src/diskfont.pas +++ b/packages/morphunits/src/diskfont.pas @@ -31,7 +31,7 @@ const type PFontContents = ^TFontContents; TFontContents = record - fc_FileName: array[0..MAXFONTPATH - 1] of Char; + fc_FileName: array[0..MAXFONTPATH - 1] of AnsiChar; fc_YSize: Word; fc_Style: Byte; fc_Flags: Byte; @@ -39,7 +39,7 @@ type PTFontContents = ^TTFontContents; TTFontContents = record - tfc_FileName: array[0..MAXFONTPATH - 3] of Char; + tfc_FileName: array[0..MAXFONTPATH - 3] of AnsiChar; tfc_TagCount: Word; tfc_YSize: Word; tfc_Style: Byte; @@ -70,7 +70,7 @@ type dfh_FileID: Word; dfh_Revision: Word; dfh_Segment: LongInt; - dfh_Name: array[0..MAXFONTNAME - 1] of Char; + dfh_Name: array[0..MAXFONTNAME - 1] of AnsiChar; dfh_TF: TTextFont; end; @@ -238,7 +238,7 @@ type PGlyphEngine = ^TGlyphEngine; TGlyphEngine = record gle_Library: PLibrary; - gle_Name: PChar; + gle_Name: PAnsiChar; end; FIXED = LongInt; @@ -286,7 +286,7 @@ const OTERR_UnknownGlyph = 12; const - DISKFONTNAME : PChar = 'diskfont.library'; + DISKFONTNAME : PAnsiChar = 'diskfont.library'; var DiskfontBase : pLibrary = nil; diff --git a/packages/morphunits/src/exec.pas b/packages/morphunits/src/exec.pas index ad3e04470b..589c918273 100644 --- a/packages/morphunits/src/exec.pas +++ b/packages/morphunits/src/exec.pas @@ -22,7 +22,7 @@ interface { Some types for classic Amiga and AROS compatibility } type - STRPTR = PChar; + STRPTR = PAnsiChar; WSTRPTR = PWideChar; ULONG = Longword; LONG = Longint; @@ -153,7 +153,7 @@ type ln_Pred: PNode; ln_Type: Byte; ln_Pri : ShortInt; - ln_Name: PChar; + ln_Name: PAnsiChar; end; type @@ -243,8 +243,8 @@ type rt_Version : Byte; rt_Type : Byte; rt_Pri : ShortInt; - rt_Name : PChar; - rt_IdString : PChar; + rt_Name : PAnsiChar; + rt_IdString : PAnsiChar; rt_Init : APTR; // Only valid when RTF_EXTENDED is set rt_Revision : Word; // Revision Entry @@ -1075,7 +1075,7 @@ type lib_PosSize : Word; lib_Version : Word; lib_Revision: Word; - lib_IdString: PChar; + lib_IdString: PAnsiChar; lib_Sum : LongWord; lib_OpenCnt : Word; end; @@ -1783,7 +1783,7 @@ procedure MakeFunctions(target : Pointer location 'a0'; funcDispBase : Pointer location 'a2'); SysCall MOS_ExecBase 090; -function FindResident(name: PChar location 'a1'): PResident; +function FindResident(name: PAnsiChar location 'a1'): PResident; SysCall MOS_ExecBase 096; function InitResident(resident: PResident location 'a1'; @@ -1893,7 +1893,7 @@ procedure Enqueue(list: PList location 'a0'; SysCall MOS_ExecBase 270; function FindName(list: PList location 'a0'; - name: PChar location 'a1'): PNode; + name: PAnsiChar location 'a1'): PNode; SysCall MOS_ExecBase 276; function AddTask(task : PTask location 'a1'; @@ -1904,7 +1904,7 @@ SysCall MOS_ExecBase 282; procedure RemTask(task: PTask location 'a1'); SysCall MOS_ExecBase 288; -function FindTask(name: PChar location 'a1'): PTask; +function FindTask(name: PAnsiChar location 'a1'): PTask; SysCall MOS_ExecBase 294; function SetTaskPri(task : PTask location 'a1'; @@ -1957,7 +1957,7 @@ SysCall MOS_ExecBase 378; function WaitPort(port: PMsgPort location 'a0'): PMessage; SysCall MOS_ExecBase 384; -function FindPort(name: PChar location 'a1'): PMsgPort; +function FindPort(name: PAnsiChar location 'a1'): PMsgPort; SysCall MOS_ExecBase 390; procedure AddLibrary(libHandle: PLibrary location 'a1'); @@ -1966,7 +1966,7 @@ SysCall MOS_ExecBase 396; procedure RemLibrary(libHandle: PLibrary location 'a1'); SysCall MOS_ExecBase 402; -function OldOpenLibrary(libName: PChar location 'a1'): PLibrary; +function OldOpenLibrary(libName: PAnsiChar location 'a1'): PLibrary; SysCall MOS_ExecBase 408; procedure CloseLibrary(libHandle: PLibrary location 'a1'); @@ -1986,7 +1986,7 @@ SysCall MOS_ExecBase 432; procedure RemDevice(device: PDevice location 'a1'); SysCall MOS_ExecBase 438; -function OpenDevice(devName : PChar location 'a0'; +function OpenDevice(devName : PAnsiChar location 'a0'; numunit : Cardinal location 'd0'; ioRequest: pIORequest location 'a1'; flags : Cardinal location 'd1'): ShortInt; @@ -2016,19 +2016,19 @@ SysCall MOS_ExecBase 486; procedure RemResource(resource: Pointer location 'a1'); SysCall MOS_ExecBase 492; -function OpenResource(resName: PChar location 'a1'): Pointer; +function OpenResource(resName: PAnsiChar location 'a1'): Pointer; SysCall MOS_ExecBase 498; procedure RawIOInit; SysCall MOS_ExecBase 504; -function RawMayGetChar: Char; +function RawMayGetChar: AnsiChar; SysCall MOS_ExecBase 510; -procedure RawPutChar(d0arg: Char location 'd0'); +procedure RawPutChar(d0arg: AnsiChar location 'd0'); SysCall MOS_ExecBase 516; -function RawDoFmt(formatString: PChar location 'a0'; +function RawDoFmt(formatString: PAnsiChar location 'a0'; dataStream : Pointer location 'a1'; putChProc : Pointer location 'a2'; putChData : Pointer location 'a3'): Pointer; @@ -2048,7 +2048,7 @@ procedure Vacate(sigSem: PSignalSemaphore location 'a0'; bidMsg: PSemaphoreMessage location 'a1'); SysCall MOS_ExecBase 546; -function OpenLibrary(libname: PChar location 'a1'; +function OpenLibrary(libname: PAnsiChar location 'a1'; libver : Cardinal location 'd0'): Pointer; SysCall MOS_ExecBase 552; @@ -2070,7 +2070,7 @@ SysCall MOS_ExecBase 582; procedure ReleaseSemaphoreList(sigSem: PList location 'a0'); SysCall MOS_ExecBase 588; -function FindSemaphore(sigSem: PChar location 'a1'): PSignalSemaphore; +function FindSemaphore(sigSem: PAnsiChar location 'a1'): PSignalSemaphore; SysCall MOS_ExecBase 594; procedure AddSemaphore(sigSem: PSignalSemaphore location 'a1'); @@ -2086,7 +2086,7 @@ procedure AddMemList(size : Cardinal location 'd0'; attributes: Cardinal location 'd1'; pri : LongInt location 'd2'; base : Pointer location 'a0'; - name : PChar location 'a1'); + name : PAnsiChar location 'a1'); SysCall MOS_ExecBase 618; procedure CopyMem(source: Pointer location 'a0'; @@ -2213,10 +2213,10 @@ SysCall MOS_ExecBase 810; function ReadGayle: Cardinal; SysCall MOS_ExecBase 816; -function VNewRawDoFmt(FmtString: PChar; +function VNewRawDoFmt(FmtString: PAnsiChar; PutChProc: Pointer; - PutChData: PChar; - args : PChar): PChar; + PutChData: PAnsiChar; + args : PAnsiChar): PAnsiChar; SysCall BaseSysV MOS_ExecBase 822; procedure CacheFlushDataArea(Address: Pointer location 'a0'; @@ -2307,7 +2307,7 @@ procedure RemExecNotify(hook: PHook); SysCall BaseSysV MOS_ExecBase 954; function FindExecNode(ttype: Cardinal location 'd0'; - name : PChar location 'a0'): PNode; + name : PAnsiChar location 'a0'): PNode; SysCall MOS_ExecBase 960; function AddExecNodeA(innode : Pointer location 'a0'; diff --git a/packages/morphunits/src/gadtools.pas b/packages/morphunits/src/gadtools.pas index a05dde04ca..089c96f38b 100644 --- a/packages/morphunits/src/gadtools.pas +++ b/packages/morphunits/src/gadtools.pas @@ -46,7 +46,7 @@ CONST NUM_KINDS = 14; - GADTOOLSNAME : PChar = 'gadtools.library'; + GADTOOLSNAME : PAnsiChar = 'gadtools.library'; {------------------------------------------------------------------------} diff --git a/packages/morphunits/src/get9.pas b/packages/morphunits/src/get9.pas index d86b238cc7..bc91b75316 100644 --- a/packages/morphunits/src/get9.pas +++ b/packages/morphunits/src/get9.pas @@ -25,7 +25,7 @@ var Get9Base: Pointer = nil; const - GET9NAME : PChar = 'get9.library'; + GET9NAME : PAnsiChar = 'get9.library'; procedure DNetCheck(force: boolean); SysCall BaseSysV Get9Base 28; diff --git a/packages/morphunits/src/icon.pas b/packages/morphunits/src/icon.pas index 85321cde49..7c52d13031 100644 --- a/packages/morphunits/src/icon.pas +++ b/packages/morphunits/src/icon.pas @@ -15,7 +15,7 @@ **********************************************************************} { History: - Added overlay functions for Pchar->Strings, functions + Added overlay functions for PAnsiChar->Strings, functions and procedures. 14 Jul 2000. @@ -344,42 +344,42 @@ uses exec, workbench,utility,amigados,agraphics,intuition,datatypes; Const - ICONNAME : PChar = 'icon.library'; + ICONNAME : PAnsiChar = 'icon.library'; VAR IconBase : pLibrary = nil; FUNCTION AddFreeList(freelist : pFreeList location 'a0'; const mem : POINTER location 'a1'; size : ULONG location 'a2') : LongBool; syscall IconBase 072; -FUNCTION BumpRevision(newname : pCHAR location 'a0'; const oldname : pCHAR location 'a1') : pCHAR; syscall IconBase 108; -FUNCTION DeleteDiskObject(const name : pCHAR location 'a0') : LongBool; syscall IconBase 138; -FUNCTION FindToolType(const toolTypeArray : POINTER location 'a0'; const typeName : pCHAR location 'a1') : pCHAR; syscall IconBase 096; +FUNCTION BumpRevision(newname : PAnsiChar location 'a0'; const oldname : PAnsiChar location 'a1') : PAnsiChar; syscall IconBase 108; +FUNCTION DeleteDiskObject(const name : PAnsiChar location 'a0') : LongBool; syscall IconBase 138; +FUNCTION FindToolType(const toolTypeArray : POINTER location 'a0'; const typeName : PAnsiChar location 'a1') : PAnsiChar; syscall IconBase 096; PROCEDURE FreeDiskObject(diskobj : pDiskObject location 'a0'); syscall IconBase 090; PROCEDURE FreeFreeList(freelist : pFreeList location 'a0'); syscall IconBase 054; FUNCTION GetDefDiskObject(typ : LONGINT location 'd0') : pDiskObject; syscall IconBase 120; -FUNCTION GetDiskObject(const name : pCHAR location 'a0') : pDiskObject; syscall IconBase 078; -FUNCTION GetDiskObjectNew(const name : pCHAR location 'a0') : pDiskObject; syscall IconBase 132; -FUNCTION MatchToolValue(const typeString : pCHAR location 'a0'; const value : pCHAR location 'a1') : LongBool; syscall IconBase 102; +FUNCTION GetDiskObject(const name : PAnsiChar location 'a0') : pDiskObject; syscall IconBase 078; +FUNCTION GetDiskObjectNew(const name : PAnsiChar location 'a0') : pDiskObject; syscall IconBase 132; +FUNCTION MatchToolValue(const typeString : PAnsiChar location 'a0'; const value : PAnsiChar location 'a1') : LongBool; syscall IconBase 102; FUNCTION PutDefDiskObject(const diskObject : pDiskObject location 'a0') : LongBool; syscall IconBase 126; -FUNCTION PutDiskObject(const name : pCHAR location 'a0'; const diskobj : pDiskObject location 'a1') : LongBool; syscall IconBase 084; +FUNCTION PutDiskObject(const name : PAnsiChar location 'a0'; const diskobj : pDiskObject location 'a1') : LongBool; syscall IconBase 084; { version 44 } FUNCTION DupDiskObjectA(CONST diskObject : pDiskObject location 'a0'; CONST tags : pTagItem location 'a1') : pDiskObject; syscall IconBase 150; FUNCTION IconControlA(icon : pDiskObject location 'a0'; CONST tags : pTagItem location 'a1') : longword; syscall IconBase 156; -PROCEDURE DrawIconStateA(rp : pRastPort location 'a0'; CONST icon : pDiskObject location 'a1'; CONST label_ : pCHAR location 'a2'; leftOffset : LONGINT location 'd0'; topOffset : LONGINT location 'd1'; state : longword location 'd2'; CONST tags : pTagItem location 'a3'); syscall IconBase 162; -FUNCTION GetIconRectangleA(rp : pRastPort location 'a0'; CONST icon : pDiskObject location 'a1'; CONST label_ : pCHAR location 'a2'; rect : pRectangle location 'a3'; CONST tags : pTagItem location 'a4') : LongBool; syscall IconBase 168; +PROCEDURE DrawIconStateA(rp : pRastPort location 'a0'; CONST icon : pDiskObject location 'a1'; CONST label_ : PAnsiChar location 'a2'; leftOffset : LONGINT location 'd0'; topOffset : LONGINT location 'd1'; state : longword location 'd2'; CONST tags : pTagItem location 'a3'); syscall IconBase 162; +FUNCTION GetIconRectangleA(rp : pRastPort location 'a0'; CONST icon : pDiskObject location 'a1'; CONST label_ : PAnsiChar location 'a2'; rect : pRectangle location 'a3'; CONST tags : pTagItem location 'a4') : LongBool; syscall IconBase 168; FUNCTION NewDiskObject(type_ : LONGINT location 'd0') : pDiskObject; syscall IconBase 174; -FUNCTION GetIconTagList(CONST name : pCHAR location 'a0'; CONST tags : pTagItem location 'a1') : pDiskObject; syscall IconBase 180; -FUNCTION PutIconTagList(CONST name : pCHAR location 'a0'; CONST icon : pDiskObject location 'a1'; CONST tags : pTagItem location 'a2') : LongBool; syscall IconBase 186; +FUNCTION GetIconTagList(CONST name : PAnsiChar location 'a0'; CONST tags : pTagItem location 'a1') : pDiskObject; syscall IconBase 180; +FUNCTION PutIconTagList(CONST name : PAnsiChar location 'a0'; CONST icon : pDiskObject location 'a1'; CONST tags : pTagItem location 'a2') : LongBool; syscall IconBase 186; FUNCTION LayoutIconA(icon : pDiskObject location 'a0'; screen : pScreen location 'a1'; tags : pTagItem location 'a2') : LongBool; syscall IconBase 192; PROCEDURE ChangeToSelectedIconColor(cr : pColorRegister location 'a0'); syscall IconBase 198; { overlay } -FUNCTION BumpRevision(newname : pCHar; const oldname : RawByteString) : pCHAR; +FUNCTION BumpRevision(newname : PAnsiChar; const oldname : RawByteString) : PAnsiChar; FUNCTION DeleteDiskObject(const name : RawByteString) : BOOLEAN; -FUNCTION FindToolType(const toolTypeArray : POINTER;const typeName : RawByteString) : pCHAR; +FUNCTION FindToolType(const toolTypeArray : POINTER;const typeName : RawByteString) : PAnsiChar; FUNCTION GetDiskObject(const name : RawByteString) : pDiskObject; FUNCTION GetDiskObjectNew(const name : RawByteString) : pDiskObject; -FUNCTION MatchToolValue(const typeString : RawByteString;const value : pCHAR) : BOOLEAN; -FUNCTION MatchToolValue(const typeString : pCHAR;const value : RawByteString) : BOOLEAN; +FUNCTION MatchToolValue(const typeString : RawByteString;const value : PAnsiChar) : BOOLEAN; +FUNCTION MatchToolValue(const typeString : PAnsiChar;const value : RawByteString) : BOOLEAN; FUNCTION MatchToolValue(const typeString : RawByteString;const value : RawByteString) : BOOLEAN; FUNCTION PutDiskObject(const name : RawByteString;const diskobj : pDiskObject) : BOOLEAN; @@ -398,59 +398,59 @@ begin end; -FUNCTION BumpRevision(newname : pCHar;const oldname : RawByteString) : pCHAR; +FUNCTION BumpRevision(newname : PAnsiChar;const oldname : RawByteString) : PAnsiChar; begin - BumpRevision := BumpRevision(newname,PChar(oldname)); + BumpRevision := BumpRevision(newname,PAnsiChar(oldname)); end; FUNCTION DeleteDiskObject(const name : RawByteString) : BOOLEAN; begin - DeleteDiskObject := DeleteDiskObject(PChar(name)); + DeleteDiskObject := DeleteDiskObject(PAnsiChar(name)); end; -FUNCTION FindToolType(const toolTypeArray : POINTER;const typeName : RawByteString) : pCHAR; +FUNCTION FindToolType(const toolTypeArray : POINTER;const typeName : RawByteString) : PAnsiChar; begin - FindToolType := FindToolType(toolTypeArray,PChar(typeName)); + FindToolType := FindToolType(toolTypeArray,PAnsiChar(typeName)); end; FUNCTION GetDiskObject(const name : RawByteString) : pDiskObject; begin - GetDiskObject := GetDiskObject(PChar(name)); + GetDiskObject := GetDiskObject(PAnsiChar(name)); end; FUNCTION GetDiskObjectNew(const name : RawByteString) : pDiskObject; begin - GetDiskObjectNew := GetDiskObjectNew(PChar(name)); + GetDiskObjectNew := GetDiskObjectNew(PAnsiChar(name)); end; -FUNCTION MatchToolValue(const typeString : RawByteString;const value : pCHAR) : BOOLEAN; +FUNCTION MatchToolValue(const typeString : RawByteString;const value : PAnsiChar) : BOOLEAN; begin - MatchToolValue := MatchToolValue(PChar(typeString),value); + MatchToolValue := MatchToolValue(PAnsiChar(typeString),value); end; -FUNCTION MatchToolValue(const typeString : pCHAR;const value : RawByteString) : BOOLEAN; +FUNCTION MatchToolValue(const typeString : PAnsiChar;const value : RawByteString) : BOOLEAN; begin - MatchToolValue := MatchToolValue(typeString,PChar(value)); + MatchToolValue := MatchToolValue(typeString,PAnsiChar(value)); end; FUNCTION MatchToolValue(const typeString : RawByteString;const value : RawByteString) : BOOLEAN; begin - MatchToolValue := MatchToolValue(PChar(typeString),PChar(value)); + MatchToolValue := MatchToolValue(PAnsiChar(typeString),PAnsiChar(value)); end; FUNCTION PutDiskObject(const name : RawByteString;const diskobj : pDiskObject) : BOOLEAN; begin - PutDiskObject := PutDiskObject(PChar(name),diskobj); + PutDiskObject := PutDiskObject(PAnsiChar(name),diskobj); end; FUNCTION GetIconTagList(CONST name : RawByteString; CONST tags : pTagItem) : pDiskObject; begin - GetIconTagList := GetIconTagList(PChar(name),tags); + GetIconTagList := GetIconTagList(PAnsiChar(name),tags); end; FUNCTION PutIconTagList(CONST name : RawByteString; CONST icon : pDiskObject; CONST tags : pTagItem) : BOOLEAN; begin - PutIconTagList := PutIconTagList(PChar(name),icon,tags); + PutIconTagList := PutIconTagList(PAnsiChar(name),icon,tags); end; const diff --git a/packages/morphunits/src/iffparse.pas b/packages/morphunits/src/iffparse.pas index 809c93144b..bcdfb1e084 100644 --- a/packages/morphunits/src/iffparse.pas +++ b/packages/morphunits/src/iffparse.pas @@ -29,7 +29,7 @@ uses exec, clipboard, utility; const - IFFPARSENAME : PChar = 'iffparse.library'; + IFFPARSENAME : PAnsiChar = 'iffparse.library'; { * Struct associated with an active IFF stream. @@ -242,7 +242,7 @@ PROCEDURE FreeIFF(iff : pIFFHandle location 'a0'); syscall IFFParseBase 054; PROCEDURE FreeLocalItem(localItem : pLocalContextItem location 'a0'); syscall IFFParseBase 204; FUNCTION GoodID(id : LONGINT location 'd0') : LONGINT; syscall IFFParseBase 258; FUNCTION GoodType(typ : LONGINT location 'd0') : LONGINT; syscall IFFParseBase 264; -FUNCTION IDtoStr(id : LONGINT location 'd0'; buf : pCHAR location 'a0') : pCHAR; syscall IFFParseBase 270; +FUNCTION IDtoStr(id : LONGINT location 'd0'; buf : PAnsiChar location 'a0') : PAnsiChar; syscall IFFParseBase 270; PROCEDURE InitIFF(iff : pIFFHandle location 'a0'; flags : LONGINT location 'd0'; const streamHook : pHook location 'a1'); syscall IFFParseBase 228; PROCEDURE InitIFFasClip(iff : pIFFHandle location 'a0'); syscall IFFParseBase 240; PROCEDURE InitIFFasDOS(iff : pIFFHandle location 'a0'); syscall IFFParseBase 234; @@ -270,14 +270,14 @@ FUNCTION WriteChunkRecords(iff : pIFFHandle location 'a0'; const buf : POINTER l FUNCTION SeekChunkBytes(iff : pIFFHandle location 'a0'; numBytes : LONGINT location 'd0'; mode : LONGINT location 'd1') : LONGINT; syscall IFFParseBase 276; FUNCTION SeekChunkRecords(iff : pIFFHandle location 'a0'; bytesPerRecord : LONGINT location 'd0'; numRecords : LONGINT location 'd1'; mode : LONGINT location 'd2') : LONGINT; syscall IFFParseBase 282; -Function Make_ID(const str : String) : LONGINT; +Function Make_ID(const str : ShortString) : LONGINT; function InitIFFPARSELibrary: boolean; IMPLEMENTATION -function Make_ID(const str : String) : LONGINT; +function Make_ID(const str : ShortString) : LONGINT; begin Make_ID := (LONGINT(Ord(Str[1])) shl 24) or (LONGINT(Ord(Str[2])) shl 16 ) or diff --git a/packages/morphunits/src/intuition.pas b/packages/morphunits/src/intuition.pas index 8c76e36811..7a2d1cef2c 100644 --- a/packages/morphunits/src/intuition.pas +++ b/packages/morphunits/src/intuition.pas @@ -46,7 +46,7 @@ type LeftEdge: SmallInt; // relative start location for the text TopEdge: SmallInt; // relative start location for the text ITextFont: PTextAttr; // if nil, you accept the default - IText: PChar; // pointer to null-terminated text + IText: PAnsiChar; // pointer to null-terminated text NextText: PIntuiText; // continuation to TxWrite another text end; @@ -81,7 +81,7 @@ type MutualExclude: LongInt; // set bits mean this item excludes that ItemFill: APTR; // points to Image, IntuiText, or nil SelectFill: APTR; // points to Image, IntuiText, or nil when this item is pointed to by the cursor and the items highlight mode HIGHIMAGE is selected, this alternate image will be displayed - Command: Char; // only if appliprog sets the COMMSEQ flag + Command: AnsiChar; // only if appliprog sets the COMMSEQ flag SubItem: PMenuItem; // if non-nil, DrawMenu shows "->" NextSelect: Word; // The NextSelect field represents the menu number of next selected item (when user has drag-selected several items) end; @@ -116,7 +116,7 @@ type Width, Height: SmallInt; // dimensions of the select box Flags: Word; // see flag definitions below (MENUENABLED, MIDRAWN) - MenuName: PChar; // text for this Menu Header + MenuName: PAnsiChar; // text for this Menu Header FirstItem: PMenuItem; // pointer to first in chain JazzX, // these mysteriously-named variables are for internal use only JazzY, @@ -224,7 +224,7 @@ CONST stashed in GadgetText. } GFLG_LABELMASK = $3000; GFLG_LABELITEXT = $0000; // GadgetText points to IntuiText - GFLG_LABELSTRING = $1000; // GadgetText points to (PChar) + GFLG_LABELSTRING = $1000; // GadgetText points to (PAnsiChar) GFLG_LABELIMAGE = $2000; // GadgetText points to Image (object) // New for V37: GFLG_TABCYCLE @@ -426,8 +426,8 @@ type PStringInfo = ^TStringInfo; TStringInfo = record // you initialize these variables, and then Intuition maintains them - Buffer: PChar; // the buffer containing the start and final string - UndoBuffer: PChar; // optional buffer for undoing current entry + Buffer: PAnsiChar; // the buffer containing the start and final string + UndoBuffer: PAnsiChar; // optional buffer for undoing current entry BufferPos: SmallInt; // character position in Buffer MaxChars: SmallInt; // max number of chars in Buffer (including #0) DispPos: SmallInt; // Buffer position of first displayed character @@ -630,7 +630,7 @@ type MenuStrip: PMenu; // the strip of Menu headers - Title: PChar; // the title text for this window + Title: PAnsiChar; // the title text for this window FirstRequest: PRequester; // all active Requesters @@ -682,7 +682,7 @@ type rendering MenuItems of this Window that want to be checkmarked if this is equal to NULL, you'll get the default imagery} CheckMark: PImage; - ScreenTitle: PChar; // if non-nil, Screen title when Window is active + ScreenTitle: PAnsiChar; // if non-nil, Screen title when Window is active { These variables have the mouse coordinates relative to the inner-Window of GIMMEZEROZERO Windows. This is compared with the MouseX and MouseY variables, which contain the mouse coordinates @@ -718,8 +718,8 @@ type MouseX: SmallInt; // mouse position on screen Flags: Word; // one of the flags defined below - Title: PChar; // null-terminated Title text - DefaultTitle: PChar; // for Windows without ScreenTitle + Title: PAnsiChar; // null-terminated Title text + DefaultTitle: PAnsiChar; // for Windows without ScreenTitle // BarHeight can still be read if you need to know the actual size of the bar, even if it's not // visible due to user configuration. Remember to add 1 to get real height @@ -969,7 +969,7 @@ type CheckMark: PImage; { the CheckMark is a pointer to the imagery that will be used when rendering MenuItems of this Window that want to be checkmarked if this is equal to NULL, you'll get the default imagery} - Title: PChar; // the title text for this window + Title: PAnsiChar; // the title text for this window Screen: PScreen; { the Screen pointer is used only if you've defined a CUSTOMSCREEN and want this Window to open in it. If so, you pass the Pointer of the Custom Screen structure in this variable. Otherwise, this variable @@ -1022,7 +1022,7 @@ type FirstGadget: PGadget; CheckMark: PImage; - Title: PChar; + Title: PAnsiChar; WScreen: PScreen; WBitMap: PBitMap; @@ -1079,7 +1079,7 @@ const // You can specify the dimensions of the interior region of your window, independent of what // the border widths will be. You probably want to also specify WA_AutoAdjust to allow // Intuition to move your window or even shrink it so that it is completely on screen. - WA_PubScreenName = WA_Dummy + 21; // [I..] declares that you want the window to open as a visitor on the public screen whose name is pointed to by (PChar) ti_Data + WA_PubScreenName = WA_Dummy + 21; // [I..] declares that you want the window to open as a visitor on the public screen whose name is pointed to by (PAnsiChar) ti_Data WA_PubScreen = WA_Dummy + 22; // [I..] open as a visitor window on the public screen whose Pointer is in (struct Screen *) ti_Data. // To ensure that this screen remains open, you should either be the screen's owner, have a window open on the screen, or use LockPubScreen(). WA_PubScreenFallBack = WA_Dummy + 23; // [I..] A Boolean, specifies whether a visitor window should "fall back" to the default public screen @@ -1247,9 +1247,9 @@ type TEasyStruct = record es_StructSize: LongWord; // should be sizeof (TEasyStruct) Note that this size may change, if you update the includes! Do not use absolute values as the size of pointers may vary on different platforms! es_Flags: LongWord; // should be 0 for now - es_Title: PChar; // title of requester window - es_TextFormat: PChar; // 'printf' style formatting string - es_GadgetFormat: PChar; // Text of the gadgets, separated by |'s + es_Title: PAnsiChar; // title of requester window + es_TextFormat: PAnsiChar; // 'printf' style formatting string + es_GadgetFormat: PAnsiChar; // Text of the gadgets, separated by |'s end; const @@ -1481,7 +1481,7 @@ const VC_NoColorPaletteLoad tag for your screen's ViewPort, you should also set this tag.} // V51 SA_Displayed = SA_Dummy + 101; // [..G] LongBool. Check whether the screen is currently displayed on one of system's gfx cards. - SA_MonitorName = SA_Dummy + 102; // [I.G] PChar. Should be used to determine on which monitor (gfx card) the screen should be opened. Please use this instead of storing ModeIDs + SA_MonitorName = SA_Dummy + 102; // [I.G] PAnsiChar. Should be used to determine on which monitor (gfx card) the screen should be opened. Please use this instead of storing ModeIDs // in prefs files! Overrides SA_DisplayID and will be used to get the best available mode together with SA_Depth or SA_Width/Height. Will open a screen on other gfx card if the selected one is not // found. Please note that .monitor prefix is included in the name. For autoscrolling and other non-typical screens please read SA_DisplayWidth/Height notes. SA_MonitorObject = SA_Dummy + 103; // [..G] PObject_. Returns the MONITORCLASS object associated with the screen. Use it in order to get more info about the gfx card used to display the screen, monitor alignment, etc. @@ -1557,7 +1557,7 @@ type SType: Word; // the Screen type (see defines above) (Type in C-Include) Font: PTextAttr; // this Screen's default text attributes - DefaultTitle: PChar; // the default title for this Screen + DefaultTitle: PAnsiChar; // the default title for this Screen Gadgets: PGadget; // your own Gadgets for this Screen { if you are opening a CUSTOMSCREEN and already have a BitMap @@ -1580,7 +1580,7 @@ type ViewModes: Word; ens_Type: Word; { type in C-Includes } Font: PTextAttr; - DefaultTitle: PChar; + DefaultTitle: PAnsiChar; Gadgets: PGadget; CustomBitMap: PBitMap; Extension: PTagItem; // ExtNewScreen specific extension SA_* @@ -1711,7 +1711,7 @@ type // printer configurations PrinterType: Word; // printer type - PrinterFilename: array[0..FILENAME_SIZE - 1] of char; // file for printer + PrinterFilename: array[0..FILENAME_SIZE - 1] of AnsiChar; // file for printer // print format and quality configurations PrintPitch: Word; // print pitch @@ -1737,7 +1737,7 @@ type // temp file for printer Pad: array[0..11] of Byte; - PrtDevName: array [0..DEVNAME_SIZE - 1] of char; // Device used by printer.device (leave out the ".device") + PrtDevName: array [0..DEVNAME_SIZE - 1] of AnsiChar; // Device used by printer.device (leave out the ".device") DefaultPrtUnit: Byte; // Default unit opened by printer.device DefaultSerUnit: Byte; // Default serial unit @@ -1971,21 +1971,21 @@ Type over the lowercase strings, but this makes a good place to list the names of the built-in classes.} const - ROOTCLASS: PChar = 'rootclass'; - IMAGECLASS: PChar = 'imageclass'; - FRAMEICLASS: PChar = 'frameiclass'; - SYSICLASS: PChar = 'sysiclass'; - FILLRECTCLASS: PChar = 'fillrectclass'; - GADGETCLASS: PChar = 'gadgetclass'; - PROPGCLASS: PChar = 'propgclass'; - STRGCLASS: PChar = 'strgclass'; - BUTTONGCLASS: PChar = 'buttongclass'; - FRBUTTONCLASS: PChar = 'frbuttonclass'; - GROUPGCLASS: PChar = 'groupgclass'; - ICCLASS: PChar = 'icclass'; - MODELCLASS: PChar = 'modelclass'; - ITEXTICLASS: PChar = 'itexticlass'; - POINTERCLASS: PChar = 'pointerclass'; + ROOTCLASS: PAnsiChar = 'rootclass'; + IMAGECLASS: PAnsiChar = 'imageclass'; + FRAMEICLASS: PAnsiChar = 'frameiclass'; + SYSICLASS: PAnsiChar = 'sysiclass'; + FILLRECTCLASS: PAnsiChar = 'fillrectclass'; + GADGETCLASS: PAnsiChar = 'gadgetclass'; + PROPGCLASS: PAnsiChar = 'propgclass'; + STRGCLASS: PAnsiChar = 'strgclass'; + BUTTONGCLASS: PAnsiChar = 'buttongclass'; + FRBUTTONCLASS: PAnsiChar = 'frbuttonclass'; + GROUPGCLASS: PAnsiChar = 'groupgclass'; + ICCLASS: PAnsiChar = 'icclass'; + MODELCLASS: PAnsiChar = 'modelclass'; + ITEXTICLASS: PAnsiChar = 'itexticlass'; + POINTERCLASS: PAnsiChar = 'pointerclass'; { Dispatched method ID's NOTE: Applications should use Intuition entry points, not direct @@ -2115,7 +2115,7 @@ const GA_RelWidth = GA_Dummy + 6; // (LongInt) Width of the gadget relative to the width of the window GA_Height = GA_Dummy + 7; // (LONG) Height of the gadget GA_RelHeight = GA_Dummy + 8; // (LONG) Height of the gadget relative to the height of the window - GA_Text = GA_Dummy + 9; // (PChar) Gadget imagry is #0 terminated string + GA_Text = GA_Dummy + 9; // (PAnsiChar) Gadget imagry is #0 terminated string GA_Image = GA_Dummy + 10; // (PImage) Gadget imagry is an image GA_Border = GA_Dummy + 11; // (PBorder) Gadget imagry is a border GA_SelectRender = GA_Dummy + 12; // (PImage) Selected gadget imagry @@ -2156,10 +2156,10 @@ const GA_TextAttr = GA_Dummy + 40; // (PTextAttr) Indicate the font to use for the gadget. GA_ReadOnly = GA_Dummy + 41; // (LongBool) Indicate that the gadget is read-only (non-selectable). Defaults to False // V44 - GA_Underscore = GA_Dummy + 42; // (Char) Underscore/escape character for keyboard shortcuts. Defaults to '_' . - GA_ActivateKey = GA_Dummy + 43; // (PChar) Set/Get the gadgets shortcut/activation key(s) Defaults to nil + GA_Underscore = GA_Dummy + 42; // (AnsiChar) Underscore/escape character for keyboard shortcuts. Defaults to '_' . + GA_ActivateKey = GA_Dummy + 43; // (PAnsiChar) Set/Get the gadgets shortcut/activation key(s) Defaults to nil GA_BackFill = GA_Dummy + 44; // (PHook) Backfill pattern hook. Defaults to nil. - GA_GadgetHelpText = GA_Dummy + 45; // (PChar) RESERVERD/PRIVATE DO NOT USE Defaults to nil. + GA_GadgetHelpText = GA_Dummy + 45; // (PAnsiChar) RESERVERD/PRIVATE DO NOT USE Defaults to nil. GA_UserInput = GA_Dummy + 46; // (LongBool) Notification tag indicates this notification is from the activite // gadget receiving user input - an attempt to make IDCMPUPDATE more efficient. Defaults to False // V50 @@ -2460,7 +2460,7 @@ const IA_FrameType = IA_Dummy + 27; // Starting with V39, FrameIClass recognizes several standard types of frame. Use one // of the FRAME_ specifiers below. Defaults to FRAME_DEFAULT. // V44: - IA_Underscore = IA_Dummy + 28; // Indicate underscore keyboard shortcut for image labels. (Char) Defaults to '_' + IA_Underscore = IA_Dummy + 28; // Indicate underscore keyboard shortcut for image labels. (AnsiChar) Defaults to '_' IA_Scalable = IA_Dummy + 29; // Attribute indicates this image is allowed to/can scale its rendering. (LongBool) Defaults to False. IA_ActivateKey = IA_Dummy + 30; // Used to get an underscored label shortcut. Useful for labels attached to string gadgets. (Byte) Defaults to 0. IA_Screen = IA_Dummy + 31; // Screen pointer, may be useful/required by certain classes. (PScreen) @@ -2760,7 +2760,7 @@ const EO_ENTER = $0005; // "enter" or "return" key, terminate EO_RESET = $0006; // current Intuition-style undo EO_REPLACECHAR = $0007; // replaced one character and (maybe) advanced cursor - EO_INSERTCHAR = $0008; // inserted one char into string or added one at end + EO_INSERTCHAR = $0008; // inserted one AnsiChar into string or added one at end EO_BADFORMAT = $0009; // didn't like the text data, e.g., Bad LONGINT EO_BIGCHANGE = $000A; // unused by Intuition complete or major change to the text, e.g. new string EO_UNDO = $000B; // unused by Intuition some other style of undo @@ -2775,7 +2775,7 @@ const // These Mode Flags are for internal use only SGM_NOCHANGE = 1 shl 3; // no edit changes yet SGM_NOWORKB = 1 shl 4; // Buffer = PrevBuffer - SGM_CONTROL = 1 shl 5; // control char escape mode + SGM_CONTROL = 1 shl 5; // control AnsiChar escape mode SGM_LONGINT = 1 shl 6; // an intuition LongInt gadget // String Gadget Action Flags (put in SGWork.Actions by EditHook) SGA_USE = $1; // use contents of SGWork @@ -2869,7 +2869,7 @@ type PPBTDNode = ^PBTDNode; TBTDNode = record BN_Tag: Tag; // ID tag for parameter - BN_Name: PChar; // parameter name + BN_Name: PAnsiChar; // parameter name BN_Type: LongWord; end; @@ -2900,35 +2900,35 @@ type TBTDCycle = record BC_Node: TBTDNode; BC_Value: LongInt; // selected item - BC_Labels: PPChar; // #0 terminated array with labels + BC_Labels: PPAnsiChar; // #0 terminated array with labels end; PBTDString = ^TBTDString; TBTDString = record BS_Node: TBTDNode; - BS_String: array[0..BTDMAXSTRLEN - 1] of char; + BS_String: array[0..BTDMAXSTRLEN - 1] of AnsiChar; end; PBTDFont = ^TBTDFont; TBTDFont = record BF_Node: TBTDNode; - BF_Font: array[0..BTDMAXSTRLEN - 1] of char; + BF_Font: array[0..BTDMAXSTRLEN - 1] of AnsiChar; end; PBTDFile = ^TBTDFile; TBTDFile = record BF_Node: TBTDNode; - BF_Font: array[0..BTDMAXSTRLEN - 1] of char; + BF_Font: array[0..BTDMAXSTRLEN - 1] of AnsiChar; end; // struct returned by QueryBlanker() PBTDInfo = ^TBTDInfo; TBTDInfo = record BI_Revision: LongWord; // put BTDI_Revision here - BI_ID: LongWord; // 4 char ID for your blanker - BI_Name: PChar; // blanker name - BI_Description: PChar; // blanker description - BI_Author: PChar; // blanker author(s) + BI_ID: LongWord; // 4 AnsiChar ID for your blanker + BI_Name: PAnsiChar; // blanker name + BI_Description: PAnsiChar; // blanker description + BI_Author: PAnsiChar; // blanker author(s) BI_Flags: LongWord; // blanker requirements BI_Params: PPBTDNode; // #0 terminated array with params end; @@ -3130,9 +3130,9 @@ type TExtEasyStruct = record es_StructSize: LongWord; es_Flags: LongWord; - es_Title: PChar; - es_TextFormat: PChar; - es_GadgetFormat: PChar; + es_Title: PAnsiChar; + es_TextFormat: PAnsiChar; + es_GadgetFormat: PAnsiChar; es_Tags: PTagItem; end; const @@ -3447,7 +3447,7 @@ const SBCT_UninstallPlugin = SBCT_Dummy + 2; // PMUI_CustomClass const - INTUITIONNAME: PChar = 'intuition.library'; + INTUITIONNAME: PAnsiChar = 'intuition.library'; var Intuitionbase: PIntuitionBase = nil; @@ -3462,7 +3462,7 @@ function CloseScreen(screen: PScreen location 'a0'): LongBool; SysCall Intuition procedure CloseWindow(window: PWindow location 'a0'); SysCall IntuitionBase 072; function CloseWorkBench: LongInt; SysCall IntuitionBase 078; procedure CurrentTime(var seconds: LongWord location 'a0'; var micros: LongWord location 'a1'); SysCall IntuitionBase 084; -function DisplayAlert(AlertNumber: LongWord location 'd0'; String1: PChar location 'a0'; Height: LongWord location 'd1'): LongBool; SysCall IntuitionBase 090; +function DisplayAlert(AlertNumber: LongWord location 'd0'; String1: PAnsiChar location 'a0'; Height: LongWord location 'd1'): LongBool; SysCall IntuitionBase 090; procedure DisplayBeep(Screen: PScreen location 'a0'); SysCall IntuitionBase 096; function DoubleClick(SSeconds: LongWord location 'd0'; SMicros: LongWord location 'd1'; CSeconds: LongWord location 'd2'; CMicros: LongWord location 'd3'): LongBool; SysCall IntuitionBase 102; procedure DrawBorder(Rp: PRastPort location 'a0'; Border: PBorder location 'a1'; LeftOffset: LongInt location 'd0'; TopOffset: LongInt location 'd1'); SysCall IntuitionBase 108; @@ -3494,7 +3494,7 @@ procedure ScreenToFront(Screen: PScreen location 'a0'); SysCall IntuitionBase 25 function SetDMRequest(Window: PWindow location 'a0'; Requester: PRequester location 'a1'): LongBool; SysCall IntuitionBase 258; function SetMenuStrip(Window: PWindow location 'a0'; Menu: PMenu location 'a1'): LongBool; SysCall IntuitionBase 264; procedure SetPointer(Window: PWindow location 'a0'; Pointer: PWord location 'a1'; Height: LongInt location 'd0'; Width: LongInt location 'd1'; XOffset: LongInt location 'd2'; YOffset: LongInt location 'd3'); SysCall IntuitionBase 270; -procedure SetWindowTitles(Window: PWindow location 'a0'; WindowTitle: PChar location 'a1'; ScreenTitle: PChar location 'a2'); SysCall IntuitionBase 276; +procedure SetWindowTitles(Window: PWindow location 'a0'; WindowTitle: PAnsiChar location 'a1'; ScreenTitle: PAnsiChar location 'a2'); SysCall IntuitionBase 276; procedure ShowTitle(Screen: PScreen location 'a0'; ShowIt: LongInt location 'd0'); SysCall IntuitionBase 282; procedure SizeWindow(Window: PWindow location 'a0'; Dx: LongInt location 'd0'; Dy: LongInt location 'd1'); SysCall IntuitionBase 288; function ViewAddress: PView; SysCall IntuitionBase 294; @@ -3541,19 +3541,19 @@ function SetEditHook(Hook: PHook location 'a0'): PHook; SysCall IntuitionBase 49 function SetMouseQueue(Window: PWindow location 'a0'; QueueLength: LongWord location 'd0'): LongInt; SysCall IntuitionBase 498; procedure ZipWindow(Window: PWindow location 'a0'); SysCall IntuitionBase 504; -function LockPubScreen(Name: PChar location 'a0'): PScreen; SysCall IntuitionBase 510; -procedure UnlockPubScreen(Name: PChar location 'a0'; Screen: PScreen location 'a1'); SysCall IntuitionBase 516; +function LockPubScreen(Name: PAnsiChar location 'a0'): PScreen; SysCall IntuitionBase 510; +procedure UnlockPubScreen(Name: PAnsiChar location 'a0'; Screen: PScreen location 'a1'); SysCall IntuitionBase 516; function LockPubScreenList: PList; SysCall IntuitionBase 522; procedure UnlockPubScreenList; SysCall IntuitionBase 528; -function NextPubScreen(Screen: PScreen location 'a0'; NameBuf: PChar location 'a1'): PChar; SysCall IntuitionBase 534; -procedure SetDefaultPubScreen(Name: PChar location 'a0'); SysCall IntuitionBase 540; +function NextPubScreen(Screen: PScreen location 'a0'; NameBuf: PAnsiChar location 'a1'): PAnsiChar; SysCall IntuitionBase 534; +procedure SetDefaultPubScreen(Name: PAnsiChar location 'a0'); SysCall IntuitionBase 540; function SetPubScreenModes(Modes: LongWord location 'd0'): Word; SysCall IntuitionBase 546; function PubScreenStatus(Screen: PScreen location 'a0'; StatusFlags: LongWord location 'd0'): Word; SysCall IntuitionBase 552; function ObtainGIRPort(GInfo: PGadgetInfo location 'a0'): PRastPort; SysCall IntuitionBase 558; procedure ReleaseGIRPort(Rp: PRastPort location 'a0'); SysCall IntuitionBase 564; procedure GadgetMouse(Gadget: PGadget location 'a0'; GInfo: PGadgetInfo location 'a1'; var MousePoint: SmallInt location 'a2'); SysCall IntuitionBase 570; -procedure GetDefaultPubScreen(NameBuffer: PChar location 'a0'); SysCall IntuitionBase 582; +procedure GetDefaultPubScreen(NameBuffer: PAnsiChar location 'a0'); SysCall IntuitionBase 582; function EasyRequestArgs(Window: PWindow location 'a0'; EasyStruct: pEasyStruct location 'a1'; IDCMPPtr: PLongWord location 'a2'; Args: APTR location 'a3'): LongInt; SysCall IntuitionBase 588; function BuildEasyRequestArgs(Window: PWindow location 'a0'; EasyStruct: PEasyStruct location 'a1'; IDCMP: LongWord location 'd0'; Args: APTR location 'a3'): PWindow; SysCall IntuitionBase 594; function SysReqHandler(Window: PWindow location 'a0'; IDCMPPtr: PLongWord location 'a1'; WaitInput: LongInt location 'd0'): LongInt; SysCall IntuitionBase 600; @@ -3564,7 +3564,7 @@ procedure DrawImageState(Rp: PRastPort location 'a0'; Image: PImage location 'a1 function PointInImage(Point: LongWord location 'd0'; Image: PImage location 'a0'): LongBool; SysCall IntuitionBase 624; procedure EraseImage(Rp: PRastPort location 'a0'; Image: PImage location 'a1'; LeftOffset: LongInt location 'd0'; TopOffset: LongInt location 'd1'); SysCall IntuitionBase 630; -function NewObjectA(ClassPtr: PIClass location 'a0'; ClassID: PChar location 'a1'; TagList: PTagItem location 'a2'): APTR; SysCall IntuitionBase 636; +function NewObjectA(ClassPtr: PIClass location 'a0'; ClassID: PAnsiChar location 'a1'; TagList: PTagItem location 'a2'): APTR; SysCall IntuitionBase 636; procedure DisposeObject(Object1: APTR location 'a0'); SysCall IntuitionBase 642; function SetAttrsA(Object1: APTR location 'a0'; TagList: PTagItem location 'a1'): LongWord; SysCall IntuitionBase 648; @@ -3575,7 +3575,7 @@ function GetAttr(AttrID: LongWord location 'd0'; Object1: APTR location 'a0'; va function SetGadgetAttrsA(Gadget: PGadget location 'a0'; Window: PWindow location 'a1'; Requester: PRequester location 'a2'; TagList: PTagItem location 'a3'): LongWord; SysCall IntuitionBase 660; function NextObject(ObjectPtrPtr: APTR location 'a0'): APTR; SysCall IntuitionBase 666; -function MakeClass(ClassID: PChar location 'a0'; SuperClassID: PChar location 'a1'; SuperClassPtr: PIClass location 'a2'; InstanceSize: LongWord location 'd0'; Flags: LongWord location 'd1'): PIClass; SysCall IntuitionBase 678; +function MakeClass(ClassID: PAnsiChar location 'a0'; SuperClassID: PAnsiChar location 'a1'; SuperClassPtr: PIClass location 'a2'; InstanceSize: LongWord location 'd0'; Flags: LongWord location 'd1'): PIClass; SysCall IntuitionBase 678; procedure AddClass(ClassPtr: PIClass location 'a0'); SysCall IntuitionBase 684; function GetScreenDrawInfo(Screen: PScreen location 'a0'): PDrawInfo; SysCall IntuitionBase 690; @@ -3594,7 +3594,7 @@ procedure ScrollWindowRaster(Win: PWindow location 'a1'; Dx: LongInt location 'd procedure LendMenus(Fromwindow: PWindow location 'a0'; ToWindow: PWindow location 'a1'); SysCall IntuitionBase 804; function DoGadgetMethodA(Gad: PGadget location 'a0'; Win: PWindow location 'a1'; Req: PRequester location 'a2'; Message: PLongWord location 'a3'): LongWord; SysCall IntuitionBase 810; procedure SetWindowPointerA(Win: PWindow location 'a0'; Taglist: PTagItem location 'a1'); SysCall IntuitionBase 816; -function TimedDisplayAlert(AlertNumber: LongWord location 'd0'; String1: PChar location 'a0'; Height: LongWord location 'd1'; Time: LongWord location 'a1'): LongBool; SysCall IntuitionBase 822; +function TimedDisplayAlert(AlertNumber: LongWord location 'd0'; String1: PAnsiChar location 'a0'; Height: LongWord location 'd1'; Time: LongWord location 'a1'): LongBool; SysCall IntuitionBase 822; procedure HelpControl(Win: PWindow location 'a0'; Flags: LongWord location 'd0'); SysCall IntuitionBase 828; // V50 @@ -3634,7 +3634,7 @@ function EasyRequest(Window: PWindow; const EasyStruct: PEasyStruct; IDCMPPtr: P function BuildEasyRequest(Window: PWindow; EasyStruct: PEasyStruct; IDCMP: LongWord; const Args: array of PtrUInt): PWindow; inline; function OpenWindowTags(NewWindow: PNewWindow; const TagList: array of PtrUInt): PWindow; Inline; function OpenScreenTags(NewScreen: PNewScreen; const TagList: array of PtrUInt): PScreen; Inline; -function NewObject(ClassPtr: PIClass; ClassID: PChar; const Tags: array of PtrUInt): Pointer; inline; +function NewObject(ClassPtr: PIClass; ClassID: PAnsiChar; const Tags: array of PtrUInt): Pointer; inline; function SetAttrs(Object1: APTR; const Tags: array of PtrUInt): LongWord; inline; function DoGadgetMethod(Gad: PGadget; Win: PWindow; Req: PRequester; const Args: array of PtrUInt): LongWord; inline; function SetGadgetAttrs(Gadget: PGadget; Window: PWindow; Requester: PRequester; const Tags: array of PtrUInt): LongWord; inline; @@ -3675,7 +3675,7 @@ begin OpenScreenTags := OpenScreenTagList(NewScreen, @TagList); end; -function NewObject(ClassPtr: PIClass; ClassID: PChar; const Tags: array of PtrUInt): APTR; inline; +function NewObject(ClassPtr: PIClass; ClassID: PAnsiChar; const Tags: array of PtrUInt): APTR; inline; begin NewObject := NewObjectA(ClassPtr, ClassID, @Tags); end; diff --git a/packages/morphunits/src/keymap.pas b/packages/morphunits/src/keymap.pas index 1ae9a241a6..b05bc57a2e 100644 --- a/packages/morphunits/src/keymap.pas +++ b/packages/morphunits/src/keymap.pas @@ -113,7 +113,7 @@ var KeyMapBase: PLibrary = nil; const - KEYMAPNAME: PChar = 'keymap.library'; + KEYMAPNAME: PAnsiChar = 'keymap.library'; procedure SetKeyMapDefault(const KeyMap: PKeyMap location 'a0'); SysCall KeyMapBase 030; function AskKeyMapDefault: PKeyMap; SysCall KeyMapBase 036; @@ -121,8 +121,8 @@ function MapRawKey(const Event: PInputEvent location 'a0'; Buffer: STRPTR locati function MapANSI(const Strg: STRPTR location 'a0'; Count: LongInt location 'd0'; Buffer: STRPTR location 'a1'; Length: LongInt location 'd1'; const KeyMap: PKeyMap location 'a2'): LongInt; SysCall KeyMapBase 048; function MapRawKeyUCS4(const Event: PInputEvent location 'a0'; Buffer: WSTRPTR location 'a1'; Length: LongInt location 'd1'; const KeyMap: PKeyMap location 'a2'): LongInt; SysCall KeyMapBase 54; function MapUCS4(const Strg: WSTRPTR location 'a0'; Count: LongInt location 'd0'; Buffer: STRPTR location 'a1'; Length: LongInt location 'd1'; const KeyMap: PKeyMap location 'a2'): LongInt; SysCall KeyMapBase 60; -function ToANSI(UCS4Char: WideChar location 'a0'; const KeyMap: PKeyMap location 'a1'): Char; SysCall KeyMapBase 66; -function ToUCS4(ASCIIChar: Char location 'a0'; const KeyMap: PKeyMap location 'a1'): WideChar; SysCall KeyMapBase 72; +function ToANSI(UCS4Char: WideChar location 'a0'; const KeyMap: PKeyMap location 'a1'): AnsiChar; SysCall KeyMapBase 66; +function ToUCS4(ASCIIChar: AnsiChar location 'a0'; const KeyMap: PKeyMap location 'a1'): WideChar; SysCall KeyMapBase 72; function GetKeyMapCodePage(const KeyMap: PKeyMap location 'a0'): STRPTR; SysCall KeyMapBase 78; // Helper calls diff --git a/packages/morphunits/src/layers.pas b/packages/morphunits/src/layers.pas index c8883d8ae9..db3e67b6a1 100644 --- a/packages/morphunits/src/layers.pas +++ b/packages/morphunits/src/layers.pas @@ -86,7 +86,7 @@ const LR_RenderList = LR_Dummy + 6; // PPLayer. a nil terminated list of PLayer pointers to render if they are within given bounds LR_IgnoreList = LR_Dummy + 7; // PPLayer. a nil terminated list of PLayer pointers to ommit when rendering the layerinfo. mutually exclusive with LR_RenderList! - LAYERSNAME: PChar = 'layers.library'; + LAYERSNAME: PAnsiChar = 'layers.library'; var LayersBase: PLibrary = nil; diff --git a/packages/morphunits/src/locale.pas b/packages/morphunits/src/locale.pas index 5331a41657..b446152035 100644 --- a/packages/morphunits/src/locale.pas +++ b/packages/morphunits/src/locale.pas @@ -234,7 +234,7 @@ var LocaleBase: PLocaleBase = nil; const - LOCALENAME: PChar = 'locale.library'; + LOCALENAME: PAnsiChar = 'locale.library'; procedure CloseCatalog(Catalog: PCatalog location 'a0'); syscall LocaleBase 36; procedure CloseLocale(Locale: PLocale location 'a0'); syscall LocaleBase 42; diff --git a/packages/morphunits/src/mui.pas b/packages/morphunits/src/mui.pas index 966f6bd9b8..5cc653595b 100644 --- a/packages/morphunits/src/mui.pas +++ b/packages/morphunits/src/mui.pas @@ -136,7 +136,7 @@ var MUIMasterBase : pLibrary = nil; const - MUIMASTER_NAME : PChar = 'muimaster.library'; + MUIMASTER_NAME : PAnsiChar = 'muimaster.library'; MUIMASTER_VMIN = 11; MUIMASTER_VLATEST = 19; @@ -167,7 +167,7 @@ const plongword = ^longword; tMUI_PenSpec = record - buf : array[0..31] of char; + buf : array[0..31] of AnsiChar; end; pMUI_PenSpec = ^tMUI_PenSpec; @@ -183,15 +183,15 @@ const } const - PSD_INITIAL_NAME : PChar = '(unnamed)'; - PSD_INITIAL_TITLE : PChar = 'MUI Public Screen'; + PSD_INITIAL_NAME : PAnsiChar = '(unnamed)'; + PSD_INITIAL_TITLE : PAnsiChar = 'MUI Public Screen'; const - PSD_NAME_FRONTMOST : PChar = '«Frontmost»'; - PSD_FILENAME_SAVE : PChar = 'envarc:mui/PublicScreens.iff'; - PSD_FILENAME_USE : PChar = 'env:mui/PublicScreens.iff'; + PSD_NAME_FRONTMOST : PAnsiChar = '«Frontmost»'; + PSD_FILENAME_SAVE : PAnsiChar = 'envarc:mui/PublicScreens.iff'; + PSD_FILENAME_USE : PAnsiChar = 'env:mui/PublicScreens.iff'; PSD_MAXLEN_NAME = 32; PSD_MAXLEN_TITLE = 128; PSD_MAXLEN_FONT = 48; @@ -213,10 +213,10 @@ const tMUI_PubScreenDesc = record Version : LongInt; - Name : array[0..(PSD_MAXLEN_NAME)-1] of char; - Title : array[0..(PSD_MAXLEN_TITLE)-1] of char; - Font : array[0..(PSD_MAXLEN_FONT)-1] of char; - Background : array[0..(PSD_MAXLEN_BACKGROUND)-1] of char; + Name : array[0..(PSD_MAXLEN_NAME)-1] of AnsiChar; + Title : array[0..(PSD_MAXLEN_TITLE)-1] of AnsiChar; + Font : array[0..(PSD_MAXLEN_FONT)-1] of AnsiChar; + Background : array[0..(PSD_MAXLEN_BACKGROUND)-1] of AnsiChar; DisplayID : LongWord; DisplayWidth : WORD; DisplayHeight : WORD; @@ -254,22 +254,22 @@ const { ************************************************************************* } const - MUIO_Label = 1; { PChar label, LongWord flags } - MUIO_Button = 2; { PChar label } - MUIO_Checkmark = 3; { PChar label } - MUIO_Cycle = 4; { PChar label, PChar entries } - MUIO_Radio = 5; { PChar label, PChar entries } - MUIO_Slider = 6; { PChar label, LongInt min, LongInt max } - MUIO_String = 7; { PChar label, LongInt maxlen } - MUIO_PopButton = 8; { PChar imagespec } + MUIO_Label = 1; { PAnsiChar label, LongWord flags } + MUIO_Button = 2; { PAnsiChar label } + MUIO_Checkmark = 3; { PAnsiChar label } + MUIO_Cycle = 4; { PAnsiChar label, PAnsiChar entries } + MUIO_Radio = 5; { PAnsiChar label, PAnsiChar entries } + MUIO_Slider = 6; { PAnsiChar label, LongInt min, LongInt max } + MUIO_String = 7; { PAnsiChar label, LongInt maxlen } + MUIO_PopButton = 8; { PAnsiChar imagespec } MUIO_HSpace = 9; { LongInt space } MUIO_VSpace = 10; { LongInt space } MUIO_HBar = 11; { LongInt space } MUIO_VBar = 12; { LongInt space } MUIO_MenustripNM = 13; { struct NewMenu nm, LongWord flags } - MUIO_Menuitem = 14; { PChar label, PChar shortcut, LongWord flags, LongWord data } - MUIO_BarTitle = 15; { PChar label } - MUIO_NumericButton = 16; { PChar label, LongInt min, LongInt max, PChar format } + MUIO_Menuitem = 14; { PAnsiChar label, PAnsiChar shortcut, LongWord flags, LongWord data } + MUIO_BarTitle = 15; { PAnsiChar label } + MUIO_NumericButton = 16; { PAnsiChar label, LongInt min, LongInt max, PAnsiChar format } MUIO_Menuitem_CopyStrings = 1 shl 30; @@ -288,8 +288,8 @@ const type tMUI_Command = record - mc_Name : Pchar; - mc_Template : Pchar; + mc_Name : PAnsiChar; + mc_Template : PAnsiChar; mc_Parameters : LongInt; mc_Hook : PHook; mc_Reserved : array[0..4] of LongInt; @@ -297,7 +297,7 @@ type pMUI_Command = ^tMUI_Command; const - MC_TEMPLATE_ID = -1; { MC_TEMPLATE_ID : PCHar = not(0); } + MC_TEMPLATE_ID = -1; { MC_TEMPLATE_ID : PAnsiChar = not(0); } MUI_RXERR_BADDEFINITION = -1; MUI_RXERR_OUTOFMEMORY = -2; MUI_RXERR_UNKNOWNCOMMAND = -3; @@ -691,7 +691,7 @@ const { ************************************************************************* } const - MUIC_Notify : PChar = 'Notify.mui'; + MUIC_Notify : PAnsiChar = 'Notify.mui'; { ** Methods ** } const @@ -778,7 +778,7 @@ type tMUIP_NoNotifySet = record { ... } MethodID : LongWord; attr : LongWord; - format : Pchar; + format : PAnsiChar; val : LongWord; end; pMUIP_NoNotifySet = ^tMUIP_NoNotifySet; @@ -802,7 +802,7 @@ type tMUIP_SetAsString = record { ... } MethodID : LongWord; attr : LongWord; - format : Pchar; + format : PAnsiChar; val : LongWord; end; pMUIP_SetAsString = ^tMUIP_SetAsString; @@ -832,8 +832,8 @@ type tMUIP_WriteString = record MethodID : LongWord; - str : Pchar; - memory : Pchar; + str : PAnsiChar; + memory : PAnsiChar; end; pMUIP_WriteString = ^tMUIP_WriteString; @@ -842,7 +842,7 @@ const MUIA_ApplicationObject = $8042d3ee; { V4 ..g Object } MUIA_AppMessage = $80421955; { V5 ..g struct AppMessage } MUIA_HelpLine = $8042a825; { V4 isg LongInt } - MUIA_HelpNode = $80420b85; { V4 isg PChar } + MUIA_HelpNode = $80420b85; { V4 isg PAnsiChar } MUIA_NoNotify = $804237f9; { V7 .s. BOOL } MUIA_NoNotifyMethod = $80420a74; { V20 .s. LongWord } MUIA_ObjectID = $8042d76e; { V11 isg LongWord } @@ -857,7 +857,7 @@ const { ************************************************************************* } const - MUIC_Family : PChar = 'Family.mui'; + MUIC_Family : PAnsiChar = 'Family.mui'; { ** Methods ** } const @@ -917,7 +917,7 @@ const { ************************************************************************* } const - MUIC_Menustrip : PChar = 'Menustrip.mui'; + MUIC_Menustrip : PAnsiChar = 'Menustrip.mui'; { ** Methods ** } const @@ -945,12 +945,12 @@ const { ************************************************************************* } const - MUIC_Menu : PChar = 'Menu.mui'; + MUIC_Menu : PAnsiChar = 'Menu.mui'; { ** Attributes ** } const MUIA_Menu_Enabled = $8042ed48; { V8 isg BOOL } - MUIA_Menu_Title = $8042a0e3; { V8 isg PChar } + MUIA_Menu_Title = $8042a0e3; { V8 isg PAnsiChar } @@ -958,7 +958,7 @@ const { ************************************************************************* } const - MUIC_Menuitem : PChar = 'Menuitem.mui'; + MUIC_Menuitem : PAnsiChar = 'Menuitem.mui'; { ** Methods ** } @@ -969,8 +969,8 @@ const MUIA_Menuitem_CommandString = $8042b9cc; { V16 isg BOOL } MUIA_Menuitem_Enabled = $8042ae0f; { V8 isg BOOL } MUIA_Menuitem_Exclude = $80420bc6; { V8 isg LongInt } - MUIA_Menuitem_Shortcut = $80422030; { V8 isg PChar } - MUIA_Menuitem_Title = $804218be; { V8 isg PChar } + MUIA_Menuitem_Shortcut = $80422030; { V8 isg PAnsiChar } + MUIA_Menuitem_Title = $804218be; { V8 isg PAnsiChar } MUIA_Menuitem_Toggle = $80424d5c; { V8 isg BOOL } MUIA_Menuitem_Trigger = $80426f32; { V8 ..g struct MenuItem } @@ -983,7 +983,7 @@ const { ************************************************************************* } const - MUIC_Application : PChar = 'Application.mui'; + MUIC_Application : PAnsiChar = 'Application.mui'; { ** Methods ** } const @@ -1058,7 +1058,7 @@ type tMUIP_Application_Load = record MethodID : LongWord; - name : PChar; + name : PAnsiChar; end; tMUIP_Application_NewInput = record @@ -1094,7 +1094,7 @@ type tMUIP_Application_Save = record MethodID : LongWord; - name : PChar; + name : PAnsiChar; end; tMUIP_Application_SetConfigItem = record @@ -1121,8 +1121,8 @@ type tMUIP_Application_ShowHelp = record MethodID : LongWord; window : pObject_; - name : Pchar; - node : Pchar; + name : PAnsiChar; + node : PAnsiChar; line : LongInt; end; pMUIP_Application_ShowHelp = ^tMUIP_Application_ShowHelp; @@ -1130,34 +1130,34 @@ type { ** Attributes ** } const MUIA_Application_Active = $804260ab; { V4 isg BOOL } - MUIA_Application_Author = $80424842; { V4 i.g PChar } - MUIA_Application_Base = $8042e07a; { V4 i.g PChar } + MUIA_Application_Author = $80424842; { V4 i.g PAnsiChar } + MUIA_Application_Base = $8042e07a; { V4 i.g PAnsiChar } MUIA_Application_Broker = $8042dbce; { V4 ..g Broker } MUIA_Application_BrokerHook = $80428f4b; { V4 isg struct Hook } MUIA_Application_BrokerPort = $8042e0ad; { V6 ..g struct MsgPort } MUIA_Application_BrokerPri = $8042c8d0; { V6 i.g LongInt } MUIA_Application_Commands = $80428648; { V4 isg struct MUI_Command } - MUIA_Application_Copyright = $8042ef4d; { V4 i.g PChar } - MUIA_Application_Description = $80421fc6; { V4 i.g PChar } + MUIA_Application_Copyright = $8042ef4d; { V4 i.g PAnsiChar } + MUIA_Application_Description = $80421fc6; { V4 i.g PAnsiChar } MUIA_Application_DiskObject = $804235cb; { V4 isg struct DiskObject } MUIA_Application_DoubleStart = $80423bc6; { V4 ..g BOOL } MUIA_Application_DropObject = $80421266; { V5 is. Object } MUIA_Application_ForceQuit = $804257df; { V8 ..g BOOL } - MUIA_Application_HelpFile = $804293f4; { V8 isg PChar } + MUIA_Application_HelpFile = $804293f4; { V8 isg PAnsiChar } MUIA_Application_Iconified = $8042a07f; { V4 .sg BOOL } MUIA_Application_MenuAction = $80428961; { V4 ..g LongWord } MUIA_Application_MenuHelp = $8042540b; { V4 ..g LongWord } MUIA_Application_Menustrip = $804252d9; { V8 i.. Object } MUIA_Application_RexxHook = $80427c42; { V7 isg struct Hook } MUIA_Application_RexxMsg = $8042fd88; { V4 ..g struct RxMsg } - MUIA_Application_RexxString = $8042d711; { V4 .s. PChar } + MUIA_Application_RexxString = $8042d711; { V4 .s. PAnsiChar } MUIA_Application_SingleTask = $8042a2c8; { V4 i.. BOOL } MUIA_Application_Sleep = $80425711; { V4 .s. BOOL } - MUIA_Application_Title = $804281b8; { V4 i.g PChar } + MUIA_Application_Title = $804281b8; { V4 i.g PAnsiChar } MUIA_Application_UseCommodities = $80425ee5; { V10 i.. BOOL } MUIA_Application_UsedClasses = $8042e9a7; { V20 isg STRPTR * } MUIA_Application_UseRexx = $80422387; { V10 i.. BOOL } - MUIA_Application_Version = $8042b33f; { V4 i.g PChar } + MUIA_Application_Version = $8042b33f; { V4 i.g PAnsiChar } MUIA_Application_Window = $8042bfe0; { V4 i.. Object } MUIA_Application_WindowList = $80429abe; { V13 ..g struct List } @@ -1167,7 +1167,7 @@ const { ************************************************************************* } const - MUIC_Window : PChar = 'Window.mui'; + MUIC_Window : PAnsiChar = 'Window.mui'; const MUIM_Window_AddEventHandler = $804203b7; { V16 } @@ -1289,15 +1289,15 @@ const MUIA_Window_NeedsMouseObject = $8042372a; { V10 i.. BOOL } MUIA_Window_NoMenus = $80429df5; { V4 is. BOOL } MUIA_Window_Open = $80428aa0; { V4 .sg BOOL } - MUIA_Window_PublicScreen = $804278e4; { V6 isg PChar } + MUIA_Window_PublicScreen = $804278e4; { V6 isg PAnsiChar } MUIA_Window_RefWindow = $804201f4; { V4 is. Object } MUIA_Window_RootObject = $8042cba5; { V4 isg Object } MUIA_Window_Screen = $8042df4f; { V4 isg struct Screen } - MUIA_Window_ScreenTitle = $804234b0; { V5 isg PChar } + MUIA_Window_ScreenTitle = $804234b0; { V5 isg PAnsiChar } MUIA_Window_SizeGadget = $8042e33d; { V4 i.. BOOL } MUIA_Window_SizeRight = $80424780; { V4 i.. BOOL } MUIA_Window_Sleep = $8042e7db; { V4 .sg BOOL } - MUIA_Window_Title = $8042ad3d; { V4 isg PChar } + MUIA_Window_Title = $8042ad3d; { V4 isg PAnsiChar } MUIA_Window_TopEdge = $80427c66; { V4 i.g LongInt } MUIA_Window_UseBottomBorderScroller = $80424e79; { V13 isg BOOL } MUIA_Window_UseLeftBorderScroller = $8042433e; { V13 isg BOOL } @@ -1353,7 +1353,7 @@ const { ************************************************************************* } const - MUIC_Aboutmui : PChar = 'Aboutmui.mui'; + MUIC_Aboutmui : PAnsiChar = 'Aboutmui.mui'; { ** Methods ** } @@ -1367,7 +1367,7 @@ const { ************************************************************************* } const - MUIC_Area : PChar = 'Area.mui'; + MUIC_Area : PAnsiChar = 'Area.mui'; { ** Methods ** } const @@ -1446,7 +1446,7 @@ type MethodID : LongWord; x : LongInt; y : LongInt; - txt : PChar; + txt : PAnsiChar; flags : LongWord; end; pMUIP_CreateBubble = ^tMUIP_CreateBubble; @@ -1466,7 +1466,7 @@ type tMUIP_DeleteShortHelp = record MethodID : LongWord; - help : PChar; + help : PAnsiChar; end; pMUIP_DeleteShortHelp = ^tMUIP_DeleteShortHelp; @@ -1576,7 +1576,7 @@ const MUIA_BottomEdge = $8042e552; { V4 ..g LongInt } MUIA_ContextMenu = $8042b704; { V11 isg Object } MUIA_ContextMenuTrigger = $8042a2c1; { V11 ..g Object } - MUIA_ControlChar = $8042120b; { V4 isg char } + MUIA_ControlChar = $8042120b; { V4 isg AnsiChar } MUIA_CycleChain = $80421ce7; { V11 isg LongInt } MUIA_Disabled = $80423661; { V4 isg BOOL } MUIA_DoubleBuffer = $8042a9c7; { V20 isg BOOL } @@ -1584,14 +1584,14 @@ const MUIA_Dropable = $8042fbce; { V11 isg BOOL } MUIA_FillArea = $804294a3; { V4 is. BOOL } MUIA_FixHeight = $8042a92b; { V4 i.. LongInt } - MUIA_FixHeightTxt = $804276f2; { V4 i.. PChar } + MUIA_FixHeightTxt = $804276f2; { V4 i.. PAnsiChar } MUIA_FixWidth = $8042a3f1; { V4 i.. LongInt } - MUIA_FixWidthTxt = $8042d044; { V4 i.. PChar } + MUIA_FixWidthTxt = $8042d044; { V4 i.. PAnsiChar } MUIA_Font = $8042be50; { V4 i.g struct TextFont } MUIA_Frame = $8042ac64; { V4 i.. LongInt } MUIA_FrameDynamic = $804223c9; { V20 isg BOOL } MUIA_FramePhantomHoriz = $8042ed76; { V4 i.. BOOL } - MUIA_FrameTitle = $8042d1c7; { V4 i.. PChar } + MUIA_FrameTitle = $8042d1c7; { V4 i.. PAnsiChar } MUIA_FrameVisible = $80426498; { V20 isg BOOL } MUIA_Height = $80423237; { V4 ..g LongInt } MUIA_HorizDisappear = $80429615; { V11 isg LongInt } @@ -1607,7 +1607,7 @@ const MUIA_Pressed = $80423535; { V4 ..g BOOL } MUIA_RightEdge = $8042ba82; { V4 ..g LongInt } MUIA_Selected = $8042654b; { V4 isg BOOL } - MUIA_ShortHelp = $80428fe3; { V11 isg PChar } + MUIA_ShortHelp = $80428fe3; { V11 isg PAnsiChar } MUIA_ShowMe = $80429ba8; { V4 isg BOOL } MUIA_ShowSelState = $8042caac; { V4 i.. BOOL } MUIA_Timer = $80426435; { V4 ..g LongInt } @@ -1665,7 +1665,7 @@ const { ************************************************************************* } const - MUIC_Dtpic : PChar = 'Dtpic.mui'; + MUIC_Dtpic : PAnsiChar = 'Dtpic.mui'; { ** Methods ** } @@ -1679,11 +1679,11 @@ const { ************************************************************************* } const - MUIC_Rectangle : PChar = 'Rectangle.mui'; + MUIC_Rectangle : PAnsiChar = 'Rectangle.mui'; { ** Attributes ** } const - MUIA_Rectangle_BarTitle = $80426689; { V11 i.g PChar } + MUIA_Rectangle_BarTitle = $80426689; { V11 i.g PAnsiChar } MUIA_Rectangle_HBar = $8042c943; { V7 i.g BOOL } MUIA_Rectangle_VBar = $80422204; { V7 i.g BOOL } @@ -1693,7 +1693,7 @@ const { ************************************************************************* } const - MUIC_Balance : PChar = 'Balance.mui'; + MUIC_Balance : PAnsiChar = 'Balance.mui'; { ** Attributes ** } const @@ -1705,7 +1705,7 @@ const { ************************************************************************* } const - MUIC_Image : PChar = 'Image.mui'; + MUIC_Image : PAnsiChar = 'Image.mui'; { ** Attributes ** } @@ -1716,7 +1716,7 @@ const MUIA_Image_FreeHoriz = $8042da84; { V4 i.. BOOL } MUIA_Image_FreeVert = $8042ea28; { V4 i.. BOOL } MUIA_Image_OldImage = $80424f3d; { V4 i.. struct Image } - MUIA_Image_Spec = $804233d5; { V4 i.. char } + MUIA_Image_Spec = $804233d5; { V4 i.. AnsiChar } MUIA_Image_State = $8042a3ad; { V4 is. LongInt } @@ -1725,7 +1725,7 @@ const { ************************************************************************* } const - MUIC_Menubar : PChar = 'Menubar.mui'; + MUIC_Menubar : PAnsiChar = 'Menubar.mui'; @@ -1733,7 +1733,7 @@ const { ************************************************************************* } const - MUIC_Bitmap : PChar = 'Bitmap.mui'; + MUIC_Bitmap : PAnsiChar = 'Bitmap.mui'; { ** Attributes ** } const @@ -1754,7 +1754,7 @@ const { ************************************************************************* } const - MUIC_Bodychunk : PChar = 'Bodychunk.mui'; + MUIC_Bodychunk : PAnsiChar = 'Bodychunk.mui'; { ** Attributes ** } const @@ -1769,15 +1769,15 @@ const { ************************************************************************* } const - MUIC_Text : PChar = 'Text.mui'; + MUIC_Text : PAnsiChar = 'Text.mui'; { ** Attributes ** } const - MUIA_Text_Contents = $8042f8dc; { V4 isg PChar } - MUIA_Text_ControlChar = $8042e6d0; { V20 isg char } + MUIA_Text_Contents = $8042f8dc; { V4 isg PAnsiChar } + MUIA_Text_ControlChar = $8042e6d0; { V20 isg AnsiChar } MUIA_Text_Copy = $80427727; { V20 isg BOOL } - MUIA_Text_HiChar = $804218ff; { V4 i.. char } - MUIA_Text_PreParse = $8042566d; { V4 isg PChar } + MUIA_Text_HiChar = $804218ff; { V4 i.. AnsiChar } + MUIA_Text_PreParse = $8042566d; { V4 isg PAnsiChar } MUIA_Text_SetMax = $80424d0a; { V4 i.. BOOL } MUIA_Text_SetMin = $80424e10; { V4 i.. BOOL } MUIA_Text_SetVMax = $80420d8b; { V11 i.. BOOL } @@ -1795,7 +1795,7 @@ const { ************************************************************************* } const - MUIC_Gadget : PChar = 'Gadget.mui'; + MUIC_Gadget : PAnsiChar = 'Gadget.mui'; { ** Attributes ** } const @@ -1807,25 +1807,25 @@ const { ************************************************************************* } const - MUIC_String : PChar = 'String.mui'; + MUIC_String : PAnsiChar = 'String.mui'; { ** Methods ** } { ** Attributes ** } const - MUIA_String_Accept = $8042e3e1; { V4 isg PChar } - MUIA_String_Acknowledge = $8042026c; { V4 ..g PChar } + MUIA_String_Accept = $8042e3e1; { V4 isg PAnsiChar } + MUIA_String_Acknowledge = $8042026c; { V4 ..g PAnsiChar } MUIA_String_AdvanceOnCR = $804226de; { V11 isg BOOL } MUIA_String_AttachedList = $80420fd2; { V4 isg Object } MUIA_String_BufferPos = $80428b6c; { V4 .sg LongInt } - MUIA_String_Contents = $80428ffd; { V4 isg PChar } + MUIA_String_Contents = $80428ffd; { V4 isg PAnsiChar } MUIA_String_DisplayPos = $8042ccbf; { V4 .sg LongInt } MUIA_String_EditHook = $80424c33; { V7 isg struct Hook } MUIA_String_Format = $80427484; { V4 i.g LongInt } MUIA_String_Integer = $80426e8a; { V4 isg LongWord } MUIA_String_LonelyEditHook = $80421569; { V11 isg BOOL } MUIA_String_MaxLen = $80424984; { V4 i.g LongInt } - MUIA_String_Reject = $8042179c; { V4 isg PChar } + MUIA_String_Reject = $8042179c; { V4 isg PAnsiChar } MUIA_String_Secret = $80428769; { V4 i.g BOOL } const @@ -1839,12 +1839,12 @@ const { ************************************************************************* } const - MUIC_Boopsi : PChar = 'Boopsi.mui'; + MUIC_Boopsi : PAnsiChar = 'Boopsi.mui'; { ** Attributes ** } const MUIA_Boopsi_Class = $80426999; { V4 isg struct IClass } - MUIA_Boopsi_ClassID = $8042bfa3; { V4 isg char } + MUIA_Boopsi_ClassID = $8042bfa3; { V4 isg AnsiChar } MUIA_Boopsi_MaxHeight = $8042757f; { V4 isg LongWord } MUIA_Boopsi_MaxWidth = $8042bcb1; { V4 isg LongWord } MUIA_Boopsi_MinHeight = $80422c93; { V4 isg LongWord } @@ -1862,7 +1862,7 @@ const { ************************************************************************* } const - MUIC_Prop : PChar = 'Prop.mui'; + MUIC_Prop : PAnsiChar = 'Prop.mui'; { ** Methods ** } const @@ -1903,7 +1903,7 @@ const { ************************************************************************* } const - MUIC_Gauge : PChar = 'Gauge.mui'; + MUIC_Gauge : PAnsiChar = 'Gauge.mui'; { ** Attributes ** } const @@ -1911,7 +1911,7 @@ const MUIA_Gauge_Divide = $8042d8df; { V4 isg BOOL } MUIA_Gauge_Horiz = $804232dd; { V4 i.. BOOL } MUIA_Gauge_InfoRate = $804253c8; { V4 isg LONG } - MUIA_Gauge_InfoText = $8042bf15; { V7 isg PChar } + MUIA_Gauge_InfoText = $8042bf15; { V7 isg PAnsiChar } MUIA_Gauge_Max = $8042bcdb; { V4 isg LongInt } @@ -1920,7 +1920,7 @@ const { ************************************************************************* } const - MUIC_Scale : PChar = 'Scale.mui'; + MUIC_Scale : PAnsiChar = 'Scale.mui'; { ** Attributes ** } const @@ -1932,7 +1932,7 @@ const { ************************************************************************* } const - MUIC_Colorfield : PChar = 'Colorfield.mui'; + MUIC_Colorfield : PAnsiChar = 'Colorfield.mui'; { ** Attributes ** } const @@ -1948,7 +1948,7 @@ const { ************************************************************************* } const - MUIC_List : PChar = 'List.mui'; + MUIC_List : PAnsiChar = 'List.mui'; { Methods } { V4 } @@ -2111,7 +2111,7 @@ const MUIA_List_Entries = $80421654; { V4 ..g LongInt } MUIA_List_First = $804238d4; - { V4 isg PChar } + { V4 isg PAnsiChar } MUIA_List_Format = $80423c0a; { V9 ..g LongInt } MUIA_List_InsertPosition = $8042d0cd; @@ -2131,7 +2131,7 @@ const MUIA_List_ShowDropMarks = $8042c6f3; { V4 i.. Pointer } MUIA_List_SourceArray = $8042c0a0; - { V6 isg char } + { V6 isg AnsiChar } MUIA_List_Title = $80423e66; { V4 ..g LongInt } MUIA_List_Visible = $8042191f; @@ -2154,18 +2154,18 @@ const const - MUIC_Floattext : PChar = 'Floattext.mui'; + MUIC_Floattext : PAnsiChar = 'Floattext.mui'; { Attributes } { V4 isg BOOL } const MUIA_Floattext_Justify = $8042dc03; - { V4 is. PChar } + { V4 is. PAnsiChar } MUIA_Floattext_SkipChars = $80425c7d; { V4 is. LongInt } MUIA_Floattext_TabSize = $80427d17; - { V4 isg PChar } + { V4 isg PAnsiChar } MUIA_Floattext_Text = $8042d16a; { } { Volumelist } @@ -2173,14 +2173,14 @@ const const - MUIC_Volumelist : PChar = 'Volumelist.mui'; + MUIC_Volumelist : PAnsiChar = 'Volumelist.mui'; { } { Scrmodelist } { } const - MUIC_Scrmodelist : PChar = 'Scrmodelist.mui'; + MUIC_Scrmodelist : PAnsiChar = 'Scrmodelist.mui'; { Attributes } { } @@ -2189,7 +2189,7 @@ const const - MUIC_Dirlist : PChar = 'Dirlist.mui'; + MUIC_Dirlist : PAnsiChar = 'Dirlist.mui'; { Methods } { V4 } @@ -2203,11 +2203,11 @@ const end; { Attributes } - { V4 is. PChar } + { V4 is. PAnsiChar } const MUIA_Dirlist_AcceptPattern = $8042760a; - { V4 isg PChar } + { V4 isg PAnsiChar } MUIA_Dirlist_Directory = $8042ea41; { V4 is. BOOL } MUIA_Dirlist_DrawersOnly = $8042b379; @@ -2225,11 +2225,11 @@ const MUIA_Dirlist_NumDrawers = $80429cb8; { V4 ..g LongInt } MUIA_Dirlist_NumFiles = $8042a6f0; - { V4 ..g PChar } + { V4 ..g PAnsiChar } MUIA_Dirlist_Path = $80426176; { V4 is. BOOL } MUIA_Dirlist_RejectIcons = $80424808; - { V4 is. PChar } + { V4 is. PAnsiChar } MUIA_Dirlist_RejectPattern = $804259c7; { V4 is. LongInt } MUIA_Dirlist_SortDirs = $8042bbb9; @@ -2253,7 +2253,7 @@ const { } const - MUIC_Numeric : PChar = 'Numeric.mui'; + MUIC_Numeric : PAnsiChar = 'Numeric.mui'; { Methods } { V11 } @@ -2317,7 +2317,7 @@ const MUIA_Numeric_CheckAllSizes = $80421594; { V11 isg LongInt } MUIA_Numeric_Default = $804263e8; - { V11 isg PChar } + { V11 isg PAnsiChar } MUIA_Numeric_Format = $804263e9; { V11 isg LongInt } MUIA_Numeric_Max = $8042d78a; @@ -2337,7 +2337,7 @@ const const - MUIC_Knob : PChar = 'Knob.mui'; + MUIC_Knob : PAnsiChar = 'Knob.mui'; { } { Levelmeter } @@ -2345,10 +2345,10 @@ const const - MUIC_Levelmeter : PChar = 'Levelmeter.mui'; + MUIC_Levelmeter : PAnsiChar = 'Levelmeter.mui'; { Attributes } - { V11 isg PChar } + { V11 isg PAnsiChar } const MUIA_Levelmeter_Label = $80420dd5; @@ -2358,7 +2358,7 @@ const const - MUIC_Numericbutton : PChar = 'Numericbutton.mui'; + MUIC_Numericbutton : PAnsiChar = 'Numericbutton.mui'; { } { Slider } @@ -2366,7 +2366,7 @@ const const - MUIC_Slider : PChar = 'Slider.mui'; + MUIC_Slider : PAnsiChar = 'Slider.mui'; { Attributes } { V11 isg BOOL } @@ -2385,7 +2385,7 @@ const const - MUIC_Framedisplay : PChar = 'Framedisplay.mui'; + MUIC_Framedisplay : PAnsiChar = 'Framedisplay.mui'; { Attributes } { } @@ -2394,14 +2394,14 @@ const const - MUIC_Popframe : PChar = 'Popframe.mui'; + MUIC_Popframe : PAnsiChar = 'Popframe.mui'; { } { Imagedisplay } { } const - MUIC_Imagedisplay : PChar = 'Imagedisplay.mui'; + MUIC_Imagedisplay : PAnsiChar = 'Imagedisplay.mui'; { Attributes } { } @@ -2410,7 +2410,7 @@ const const - MUIC_Popimage : PChar = 'Popimage.mui'; + MUIC_Popimage : PAnsiChar = 'Popimage.mui'; { } { Pendisplay } @@ -2418,7 +2418,7 @@ const const - MUIC_Pendisplay : PChar = 'Pendisplay.mui'; + MUIC_Pendisplay : PAnsiChar = 'Pendisplay.mui'; { Methods } { V13 } @@ -2465,7 +2465,7 @@ const const - MUIC_Poppen : PChar = 'Poppen.mui'; + MUIC_Poppen : PAnsiChar = 'Poppen.mui'; { } { Group } @@ -2473,7 +2473,7 @@ const const - MUIC_Group : PChar = 'Group.mui'; + MUIC_Group : PAnsiChar = 'Group.mui'; { Methods } { V11 } @@ -2544,21 +2544,21 @@ const const - MUIC_Mccprefs : PChar = 'Mccprefs.mui'; + MUIC_Mccprefs : PAnsiChar = 'Mccprefs.mui'; { } { Register } { } const - MUIC_Register : PChar = 'Register.mui'; + MUIC_Register : PAnsiChar = 'Register.mui'; { Attributes } { V7 i.g BOOL } const MUIA_Register_Frame = $8042349b; - { V7 i.g PChar } + { V7 i.g PAnsiChar } MUIA_Register_Titles = $804297ec; { } { Penadjust } @@ -2566,7 +2566,7 @@ const const - MUIC_Penadjust : PChar= 'Penadjust.mui'; + MUIC_Penadjust : PAnsiChar= 'Penadjust.mui'; { Methods } { Attributes } @@ -2580,7 +2580,7 @@ const const - MUIC_Settingsgroup : PChar = 'Settingsgroup.mui'; + MUIC_Settingsgroup : PAnsiChar = 'Settingsgroup.mui'; { Methods } { V11 } @@ -2609,7 +2609,7 @@ const { } const - MUIC_Settings : PChar = 'Settings.mui'; + MUIC_Settings : PAnsiChar = 'Settings.mui'; { Methods } { Attributes } @@ -2619,7 +2619,7 @@ const const - MUIC_Frameadjust : PChar = 'Frameadjust.mui'; + MUIC_Frameadjust : PAnsiChar = 'Frameadjust.mui'; { Methods } { Attributes } @@ -2629,7 +2629,7 @@ const const - MUIC_Imageadjust : PChar = 'Imageadjust.mui'; + MUIC_Imageadjust : PAnsiChar = 'Imageadjust.mui'; { Methods } { Attributes } @@ -2645,7 +2645,7 @@ const const - MUIC_Virtgroup : PChar = 'Virtgroup.mui'; + MUIC_Virtgroup : PAnsiChar = 'Virtgroup.mui'; { Methods } { Attributes } @@ -2667,7 +2667,7 @@ const const - MUIC_Scrollgroup : PChar = 'Scrollgroup.mui'; + MUIC_Scrollgroup : PAnsiChar = 'Scrollgroup.mui'; { Methods } { Attributes } @@ -2691,7 +2691,7 @@ const const - MUIC_Scrollbar : PChar = 'Scrollbar.mui'; + MUIC_Scrollbar : PAnsiChar = 'Scrollbar.mui'; { Attributes } { V11 i.. LongInt } @@ -2708,7 +2708,7 @@ const const - MUIC_Listview : PChar = 'Listview.mui'; + MUIC_Listview : PAnsiChar = 'Listview.mui'; { Attributes } { V7 ..g LongInt } @@ -2747,14 +2747,14 @@ const const - MUIC_Radio : PChar = 'Radio.mui'; + MUIC_Radio : PAnsiChar = 'Radio.mui'; { Attributes } { V4 isg LongInt } const MUIA_Radio_Active = $80429b41; - { V4 i.. PChar } + { V4 i.. PAnsiChar } MUIA_Radio_Entries = $8042b6a1; { } { Cycle } @@ -2762,14 +2762,14 @@ const const - MUIC_Cycle : PChar = 'Cycle.mui'; + MUIC_Cycle : PAnsiChar = 'Cycle.mui'; { Attributes } { V4 isg LongInt } const MUIA_Cycle_Active = $80421788; - { V4 i.. PChar } + { V4 i.. PAnsiChar } MUIA_Cycle_Entries = $80420629; MUIV_Cycle_Active_Next = -(1); MUIV_Cycle_Active_Prev = -(2); @@ -2779,7 +2779,7 @@ const const - MUIC_Coloradjust : PChar = 'Coloradjust.mui'; + MUIC_Coloradjust : PAnsiChar = 'Coloradjust.mui'; { Methods } { Attributes } @@ -2801,7 +2801,7 @@ const const - MUIC_Palette : PChar = 'Palette.mui'; + MUIC_Palette : PAnsiChar = 'Palette.mui'; { Attributes } { V6 i.g struct MUI_Palette_Entry } @@ -2810,7 +2810,7 @@ const MUIA_Palette_Entries = $8042a3d8; { V6 isg BOOL } MUIA_Palette_Groupable = $80423e67; - { V6 isg char } + { V6 isg AnsiChar } MUIA_Palette_Names = $8042c3a2; { } { Popstring } @@ -2818,7 +2818,7 @@ const const - MUIC_Popstring : PChar = 'Popstring.mui'; + MUIC_Popstring : PAnsiChar = 'Popstring.mui'; { Methods } { V7 } @@ -2859,7 +2859,7 @@ const const - MUIC_Popobject : PChar = 'Popobject.mui'; + MUIC_Popobject : PAnsiChar = 'Popobject.mui'; { Attributes } { V7 isg BOOL } @@ -2884,10 +2884,10 @@ const const - MUIC_Poplist : PChar = 'Poplist.mui'; + MUIC_Poplist : PAnsiChar = 'Poplist.mui'; { Attributes } - { V8 i.. char } + { V8 i.. AnsiChar } const MUIA_Poplist_Array = $8042084c; @@ -2897,7 +2897,7 @@ const const - MUIC_Popscreen : PChar = 'Popscreen.mui'; + MUIC_Popscreen : PAnsiChar = 'Popscreen.mui'; { Attributes } { } @@ -2905,7 +2905,7 @@ const { } const - MUIC_Popasl : PChar = 'Popasl.mui'; + MUIC_Popasl : PAnsiChar = 'Popasl.mui'; { Attributes } { V7 ..g BOOL } @@ -2924,7 +2924,7 @@ const const - MUIC_Semaphore : PChar = 'Semaphore.mui'; + MUIC_Semaphore : PAnsiChar = 'Semaphore.mui'; { Methods } { V11 } @@ -2971,7 +2971,7 @@ const { } const - MUIC_Applist : PChar = 'Applist.mui'; + MUIC_Applist : PAnsiChar = 'Applist.mui'; { Methods } { } { Cclist } @@ -2979,7 +2979,7 @@ const const - MUIC_Cclist : PChar = 'Cclist.mui'; + MUIC_Cclist : PAnsiChar = 'Cclist.mui'; { Methods } { } @@ -2988,7 +2988,7 @@ const const - MUIC_Dataspace : PChar = 'Dataspace.mui'; + MUIC_Dataspace : PAnsiChar = 'Dataspace.mui'; { Methods } { V11 } @@ -3065,7 +3065,7 @@ const const - MUIC_Configdata : PChar = 'Configdata.mui'; + MUIC_Configdata : PAnsiChar = 'Configdata.mui'; { Methods } { Attributes } @@ -3306,7 +3306,7 @@ const end; pMUI_CustomClass = ^tMUI_CustomClass; -function MUI_NewObjectA(class_ : pChar location 'a0'; tags : pTagItem location 'a1') : pObject_; +function MUI_NewObjectA(class_ : PAnsiChar location 'a0'; tags : pTagItem location 'a1') : pObject_; syscall legacy MUIMasterBase 30; procedure MUI_DisposeObject(obj : pObject_ location 'a0'); @@ -3315,9 +3315,9 @@ syscall legacy MUIMasterBase 36; function MUI_RequestA(app : POINTER location 'd0'; win : POINTER location 'd1'; flags : LongWord location 'd2'; - title : pChar location 'a0'; - gadgets : pChar location 'a1'; - format : pChar location 'a2'; + title : PAnsiChar location 'a0'; + gadgets : PAnsiChar location 'a1'; + format : PAnsiChar location 'a2'; params : POINTER location 'a3') : longint; syscall legacy MUIMasterBase 42; @@ -3336,7 +3336,7 @@ syscall legacy MUIMasterBase 66; function MUI_SetError(errnum : LONGINT location 'd0') : LONGINT; syscall legacy MUIMasterBase 72; -function MUI_GetClass(name : pChar location 'a0') : pIClass; +function MUI_GetClass(name : PAnsiChar location 'a0') : pIClass; syscall legacy MUIMasterBase 78; procedure MUI_FreeClass(cl : pIClass location 'a0'); @@ -3352,7 +3352,7 @@ procedure MUI_Redraw(obj : pObject_ location 'a0'; flags : LongWord location 'd0 syscall legacy MUIMasterBase 102; function MUI_CreateCustomClass(base : pLibrary location 'a0'; - supername : pChar location 'a1'; + supername : PAnsiChar location 'a1'; supermcc : pMUI_CustomClass location 'a2'; datasize : LONGINT location 'd0'; dispatcher : POINTER location 'a3') : pMUI_CustomClass; @@ -3475,7 +3475,7 @@ function MUIV_Window_Width_Visible(p : longint) : longint; inline; function MUIV_Window_Width_Screen(p : longint) : longint; inline; -function MAKE_ID(a,b,c,d : char): longword; inline; +function MAKE_ID(a,b,c,d : AnsiChar): longword; inline; function MUIget(obj: pObject_; attr: longword; store: longword): longword; inline; function MUIset(obj: pObject_; attr: longword; value: longword): longword; inline; @@ -3485,8 +3485,8 @@ function MUIset(obj: pObject_; attr: longword; value: longword): longword; inlin function MUI_AllocAslRequestTags(_type : longword; tags : array Of LongWord) : POINTER; function MUI_AslRequestTags(req : POINTER; tags : array Of LongWord) : BOOLEAN; function MUI_MakeObject(_type : LONGINT; params : array of LongWord) : pLongWord; inline; -function MUI_NewObject(a0arg : pCHAR; tags : array of LongWord) : pLongWord; inline; -function MUI_Request(app : POINTER; win : POINTER; flags : longword; title : pCHAR; gadgets : pCHAR; format : pCHAR; params : array of LongWord) : LONGINT; +function MUI_NewObject(a0arg : PAnsiChar; tags : array of LongWord) : pLongWord; inline; +function MUI_Request(app : POINTER; win : POINTER; flags : longword; title : PAnsiChar; gadgets : PAnsiChar; format : PAnsiChar; params : array of LongWord) : LONGINT; function InitMUIMasterLibrary : boolean; @@ -3784,17 +3784,17 @@ begin MUI_MakeObject := MUI_MakeObjectA(_type , @params); end; -function MUI_NewObject(a0arg : PChar; tags : array of LongWord) : pLongWord; inline; +function MUI_NewObject(a0arg : PAnsiChar; tags : array of LongWord) : pLongWord; inline; begin MUI_NewObject := MUI_NewObjectA(a0arg, @tags); end; -function MUI_Request(app : POINTER; win : POINTER; flags : longword; title : pCHAR; gadgets : pCHAR; format : pCHAR; params : array of LongWord) : LONGINT; +function MUI_Request(app : POINTER; win : POINTER; flags : longword; title : PAnsiChar; gadgets : PAnsiChar; format : PAnsiChar; params : array of LongWord) : LONGINT; begin MUI_Request := MUI_RequestA(app , win , flags , title , gadgets , format , @params); end; -function MAKE_ID(a,b,c,d : char): longword; +function MAKE_ID(a,b,c,d : AnsiChar): longword; begin MAKE_ID:=(byte(a) shl 24)+(byte(b) shl 16)+(byte(c) shl 8)+byte(d); end; diff --git a/packages/morphunits/src/serial.pas b/packages/morphunits/src/serial.pas index 00308d3e2d..9392c7af30 100644 --- a/packages/morphunits/src/serial.pas +++ b/packages/morphunits/src/serial.pas @@ -24,7 +24,7 @@ uses type - // array of termination char's to use,see serial.doc setparams + // array of termination AnsiChar's to use,see serial.doc setparams PIOTArray = ^TIOTArray; TIOTArray = record TermArray0: LongWord; @@ -156,7 +156,7 @@ const IOSERB_ACTIVE = 4; // rqst-qued-OR-current IOSERF_ACTIVE = 1 shl IOSERB_ACTIVE; - SERIALNAME: PChar = 'serial.device'; + SERIALNAME: PAnsiChar = 'serial.device'; implementation diff --git a/packages/morphunits/src/tinygl.pas b/packages/morphunits/src/tinygl.pas index d63ccb068a..5680e2dca2 100644 --- a/packages/morphunits/src/tinygl.pas +++ b/packages/morphunits/src/tinygl.pas @@ -26,7 +26,7 @@ uses exec; const - TINYGLNAME : PChar = 'tinygl.library'; + TINYGLNAME : PAnsiChar = 'tinygl.library'; var TinyGLBase: Pointer = nil; diff --git a/packages/morphunits/src/utility.pas b/packages/morphunits/src/utility.pas index fe93cc1328..420b3feeea 100644 --- a/packages/morphunits/src/utility.pas +++ b/packages/morphunits/src/utility.pas @@ -186,8 +186,8 @@ function UDivMod32(Dividend: LongWord location 'd0'; Divisor: LongWord location function Stricmp(String1: STRPTR location 'a0'; String2: STRPTR location 'a1'): LongInt; SysCall MOS_UtilityBase 162; function Strnicmp(String1: STRPTR location 'a0'; String2: STRPTR location 'a1'; Length: LongInt location 'd0'): LongInt; SysCall MOS_UtilityBase 168; -function ToUpper(Character: LongWord location 'd0'): Char; SysCall MOS_UtilityBase 174; -function ToLower(character: LongWord location 'd0'): Char; SysCall MOS_UtilityBase 180; +function ToUpper(Character: LongWord location 'd0'): AnsiChar; SysCall MOS_UtilityBase 174; +function ToLower(character: LongWord location 'd0'): AnsiChar; SysCall MOS_UtilityBase 180; procedure ApplyTagChanges(List: PTagItem location 'a0'; ChangeList: PTagItem location 'a1'); SysCall MOS_UtilityBase 186; @@ -212,13 +212,13 @@ function GetUniqueID: LongWord; SysCall MOS_UtilityBase 270; function AllocNamedObject(Name: STRPTR; const Tags: array of PtrUInt): PNamedObject; inline; function TAG_(Value: Pointer): PtrUInt; overload; inline; -function TAG_(Value: PChar): PtrUInt; overload; inline; +function TAG_(Value: PAnsiChar): PtrUInt; overload; inline; function TAG_(Value: Boolean): PtrUInt; overload; inline; function TAG_(Value: LongInt): PtrUInt; overload; inline; function TAG_(Value: LongWord): PtrUInt; overload; inline; function AsTag(Value: Pointer): PtrUInt; overload; inline; -function AsTag(Value: PChar): PtrUInt; overload; inline; +function AsTag(Value: PAnsiChar): PtrUInt; overload; inline; function AsTag(Value: Boolean): PtrUInt; overload; inline; function AsTag(Value: LongInt): PtrUInt; overload; inline; function AsTag(Value: LongWord): PtrUInt; overload; inline; @@ -240,7 +240,7 @@ begin TAG_ := PtrUInt(Value); end; -function TAG_(Value: PChar): PtrUInt; inline; +function TAG_(Value: PAnsiChar): PtrUInt; inline; begin TAG_ := PtrUInt(Value); end; @@ -268,7 +268,7 @@ begin AsTag := LongWord(Value); end; -function AsTag(Value: PChar): PtrUInt; inline; +function AsTag(Value: PAnsiChar): PtrUInt; inline; begin AsTag := PtrUInt(Value); end; diff --git a/packages/morphunits/src/workbench.pas b/packages/morphunits/src/workbench.pas index 8b8b8dcb57..9a5b813273 100644 --- a/packages/morphunits/src/workbench.pas +++ b/packages/morphunits/src/workbench.pas @@ -100,7 +100,7 @@ type do_Gadget: TGadget; // a copy of in core gadget do_Type: Byte; do_DefaultTool: STRPTR; - do_ToolTypes: PPChar; + do_ToolTypes: PPAnsiChar; do_CurrentX: LongInt; do_CurrentY: LongInt; do_DrawerData: PDrawerData; @@ -459,13 +459,13 @@ const UPDATEWB_ObjectRemoved = 0; // Object has been deleted. UPDATEWB_ObjectAdded = 1; // Object is new or has changed. - WORKBENCHNAME : PChar = 'workbench.library'; + WORKBENCHNAME : PAnsiChar = 'workbench.library'; var WorkbenchBase: PLibrary = nil; -function AddAppIconA(Id: LongWord location 'd0'; UserData: LongWord location 'd1'; Text_: PChar location 'a0'; MsgPort: PMsgPort location 'a1'; Lock: BPTR location 'a2'; DiskObj: PDiskObject location 'a3'; const TagList: PTagItem location 'a4'): PAppIcon; syscall WorkbenchBase 060; -function AddAppMenuItemA(Id: LongWord location 'd0'; UserData: LongWord location 'd1'; Text_: PChar location 'a0'; MsgPort: PMsgPort location 'a1'; const TagList: PTagItem location 'a2'): PAppMenuItem; syscall WorkbenchBase 072; +function AddAppIconA(Id: LongWord location 'd0'; UserData: LongWord location 'd1'; Text_: PAnsiChar location 'a0'; MsgPort: PMsgPort location 'a1'; Lock: BPTR location 'a2'; DiskObj: PDiskObject location 'a3'; const TagList: PTagItem location 'a4'): PAppIcon; syscall WorkbenchBase 060; +function AddAppMenuItemA(Id: LongWord location 'd0'; UserData: LongWord location 'd1'; Text_: PAnsiChar location 'a0'; MsgPort: PMsgPort location 'a1'; const TagList: PTagItem location 'a2'): PAppMenuItem; syscall WorkbenchBase 072; function AddAppWindowA(Id: LongWord location 'd0'; UserData: LongWord location 'd1'; Window: PWindow location 'a0'; MsgPort: PMsgPort location 'a1'; const TagList: PTagItem location 'a2'): PAppWindow; syscall WorkbenchBase 048; function RemoveAppIcon(AppIcon: PAppIcon location 'a0'): LongBool; syscall WorkbenchBase 066; function RemoveAppMenuItem(AppMenuItem: PAppMenuItem location 'a0'): LongBool; syscall WorkbenchBase 078; @@ -480,33 +480,33 @@ function OpenWorkbenchObjectA(Name: STRPTR location 'a0'; const Tags: PTagItem l function RemoveAppWindowDropZone(Aw: PAppWindow location 'a0'; DropZone: PAppWindowDropZone location 'a1'): LongBool; syscall WorkbenchBase 120; function WorkbenchControlA(Name: STRPTR location 'a0'; const Tags: PTagItem location 'a1'): LongBool; syscall WorkbenchBase 108; // V51 -function ManageDesktopObjectA(Name: PChar; Action: LongInt; Tags: PTagItem): Boolean; syscall BaseSysV WorkbenchBase 148; -function CreateDrawerA(Drawer: PChar; Tags: PTagItem): Boolean; syscall BaseSysV WorkbenchBase 154; -function CreateIconA(Name: PChar; Tags: PTagItem): Boolean; syscall BaseSysV WorkbenchBase 160; +function ManageDesktopObjectA(Name: PAnsiChar; Action: LongInt; Tags: PTagItem): Boolean; syscall BaseSysV WorkbenchBase 148; +function CreateDrawerA(Drawer: PAnsiChar; Tags: PTagItem): Boolean; syscall BaseSysV WorkbenchBase 154; +function CreateIconA(Name: PAnsiChar; Tags: PTagItem): Boolean; syscall BaseSysV WorkbenchBase 160; -function AddAppIcon(Id: LongWord; UserData: LongWord; Text_: PChar; MsgPort: PMsgPort; Lock: BPTR; DiskObj: PDiskObject; const TagList: array of PtrUInt): PAppIcon; inline; -function AddAppMenuItem(Id: LongWord; UserData: LongWord; Text_: PChar; MsgPort: PMsgPort; const Tags: array of PtrUInt): PAppMenuItem; inline; +function AddAppIcon(Id: LongWord; UserData: LongWord; Text_: PAnsiChar; MsgPort: PMsgPort; Lock: BPTR; DiskObj: PDiskObject; const TagList: array of PtrUInt): PAppIcon; inline; +function AddAppMenuItem(Id: LongWord; UserData: LongWord; Text_: PAnsiChar; MsgPort: PMsgPort; const Tags: array of PtrUInt): PAppMenuItem; inline; function AddAppWindow(Id: LongWord; UserData: LongWord; Window: PWindow; MsgPort: PMsgPort; const Tags: array of PtrUInt): PAppWindow; inline; -function OpenWorkbenchObject(Name: PChar; const Tags: array of PtrUInt): LongBool; inline; -function CloseWorkbenchObject(Name: PChar; const Tags: array of PtrUInt): LongBool; inline; -function WorkbenchControl(Name: PChar; const Tags: array of PtrUInt): LongBool; inline; +function OpenWorkbenchObject(Name: PAnsiChar; const Tags: array of PtrUInt): LongBool; inline; +function CloseWorkbenchObject(Name: PAnsiChar; const Tags: array of PtrUInt): LongBool; inline; +function WorkbenchControl(Name: PAnsiChar; const Tags: array of PtrUInt): LongBool; inline; function AddAppWindowDropZone(Aw: PAppWindow; Id: LongWord; UserData: LongWord; const Tags: array of PtrUInt): PAppWindowDropZone; inline; function ChangeWorkbenchSelection(Name: STRPTR; Hook: PHook; const Tags: array of PtrUInt): LongBool; inline; function MakeWorkbenchObjectVisible(Name: STRPTR; const Tags: array of PtrUInt): LongBool; inline; // V51 -function ManageDesktopObjectTags(Name: PChar; Action: LongInt; const Tags: array of PtrUInt): Boolean; inline; -function CreateDrawerTags(Drawer: PChar; const Tags: array of PtrUInt): Boolean; inline; -function CreateIconTags(Name: PChar; const Tags: array of PtrUInt): Boolean; inline; +function ManageDesktopObjectTags(Name: PAnsiChar; Action: LongInt; const Tags: array of PtrUInt): Boolean; inline; +function CreateDrawerTags(Drawer: PAnsiChar; const Tags: array of PtrUInt): Boolean; inline; +function CreateIconTags(Name: PAnsiChar; const Tags: array of PtrUInt): Boolean; inline; implementation -function AddAppIcon(Id: LongWord; UserData: LongWord; Text_: PChar; MsgPort: PMsgPort; Lock: BPTR; DiskObj: PDiskObject; const TagList: array of PtrUInt): PAppIcon; +function AddAppIcon(Id: LongWord; UserData: LongWord; Text_: PAnsiChar; MsgPort: PMsgPort; Lock: BPTR; DiskObj: PDiskObject; const TagList: array of PtrUInt): PAppIcon; begin AddAppIcon := AddAppIconA(Id, UserData, Text_, MsgPort, Lock, Diskobj, @TagList); end; -function AddAppMenuItem(Id: LongWord; UserData: LongWord; Text_: PChar; MsgPort: PMsgPort; const Tags: array of PtrUInt): PAppMenuItem; +function AddAppMenuItem(Id: LongWord; UserData: LongWord; Text_: PAnsiChar; MsgPort: PMsgPort; const Tags: array of PtrUInt): PAppMenuItem; begin AddAppMenuItem := AddAppMenuItemA(Id, UserData, Text_, MsgPort, @Tags); end; @@ -516,17 +516,17 @@ begin AddAppWindow := AddAppWindowA(Id, UserData, Window, MsgPort, @Tags); end; -function OpenWorkbenchObject(Name: PChar; const Tags: array of PtrUInt): LongBool; +function OpenWorkbenchObject(Name: PAnsiChar; const Tags: array of PtrUInt): LongBool; begin OpenWorkbenchObject := OpenWorkbenchObjectA(Name, @Tags); end; -function CloseWorkbenchObject(Name: PChar; const Tags: array of PtrUInt): LongBool; +function CloseWorkbenchObject(Name: PAnsiChar; const Tags: array of PtrUInt): LongBool; begin CloseWorkbenchObject := CloseWorkbenchObjectA(Name, @Tags); end; -function WorkbenchControl(Name: PChar; const Tags: array of PtrUInt): LongBool; +function WorkbenchControl(Name: PAnsiChar; const Tags: array of PtrUInt): LongBool; begin WorkbenchControl := WorkbenchControlA(Name, @Tags); end; @@ -546,17 +546,17 @@ begin MakeWorkbenchObjectVisible := MakeWorkbenchObjectVisibleA(Name, @Tags); end; -function ManageDesktopObjectTags(Name: PChar; Action: LongInt; const Tags: array of PtrUInt): Boolean; +function ManageDesktopObjectTags(Name: PAnsiChar; Action: LongInt; const Tags: array of PtrUInt): Boolean; begin ManageDesktopObjectTags := ManageDesktopObjectA(Name, Action, @Tags); end; -function CreateDrawerTags(Drawer: PChar; const Tags: array of PtrUInt): Boolean; +function CreateDrawerTags(Drawer: PAnsiChar; const Tags: array of PtrUInt): Boolean; begin CreateDrawerTags := CreateDrawerA(Drawer, @Tags); end; -function CreateIconTags(Name: PChar; const Tags: array of PtrUInt): Boolean; +function CreateIconTags(Name: PAnsiChar; const Tags: array of PtrUInt): Boolean; begin CreateIconTags := CreateIconA(Name, @Tags); end;