Browse Source

* PChar -> PAnsiChar

Michaël Van Canneyt 2 years ago
parent
commit
2210a8c845

+ 12 - 12
packages/os4units/src/agraphics.pas

@@ -348,7 +348,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  =  8;     // map ctf_FgColor to the rp_FgPen if it's
   CTF_MAPCOLOR  =  $0100; // is a valid color within ctf_Low..ctf_High
 
@@ -517,7 +517,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
@@ -1170,9 +1170,9 @@ 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';
+  DEFAULT_MONITOR_NAME: PAnsiChar = 'default.monitor';
+  NTSC_MONITOR_NAME: PAnsiChar    = 'ntsc.monitor';
+  PAL_MONITOR_NAME: PAnsiChar     = 'pal.monitor';
   STANDARD_MONITOR_MASK = REQUEST_NTSC or REQUEST_PAL;
 
   STANDARD_NTSC_ROWS    = 262;
@@ -1211,7 +1211,7 @@ const
   VGA_VSSTOP      = $0235;
   VGA_VBSTOP      = $0CCD;
 
-  VGA_MONITOR_NAME: PChar = 'vga.monitor';
+  VGA_MONITOR_NAME: PAnsiChar = 'vga.monitor';
 
 // NOTE: VGA70 definitions are obsolete - a VGA70 monitor has never been implemented.
   VGA70_COLORCLOCKS = STANDARD_COLORCLOCKS / 2;
@@ -1228,7 +1228,7 @@ const
   VGA70_VBSTOP      = $0F73;
 
   //VGA70_BEAMCON = SPECIAL_BEAMCON xor VSYNCTRUE;
-  VGA70_MONITOR_NAME: PChar = 'vga70.monitor';
+  VGA70_MONITOR_NAME: PAnsiChar = 'vga70.monitor';
 
   BROADCAST_HBSTRT  = $01;
   BROADCAST_HSSTRT  = $06;
@@ -1919,7 +1919,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;
 
@@ -2285,7 +2285,7 @@ const
    GFXF_NEW_DATABASE  = $0001; // New display database
    GFXF_HAVECOMPOSITE = $0002; // CompositeTagList() is available
 
-   GRAPHICSNAME: PChar  = 'graphics.library';
+   GRAPHICSNAME: PAnsiChar  = 'graphics.library';
 
 var
   GfxBase: PLibrary = nil;
@@ -2295,12 +2295,12 @@ function GfxObtain(): LongWord; syscall IGfx 60;
 function GfxRelease(): LongWord; syscall IGfx 64;
 procedure GfxExpunge(); syscall IGfx 68;
 function GfxClone(): PInterface; syscall IGfx 72;
-function BltBitMap(const SrcBitMap: PBitMap; XSrc, YSrc: LongInt; DestBitMap: PBitMap; XDest, YDest, XSize, YSize: LongInt; MinTerm, Mask: LongWord; TempA: PChar): LongInt; syscall IGfx 76;
+function BltBitMap(const SrcBitMap: PBitMap; XSrc, YSrc: LongInt; DestBitMap: PBitMap; XDest, YDest, XSize, YSize: LongInt; MinTerm, Mask: LongWord; TempA: PAnsiChar): LongInt; syscall IGfx 76;
 procedure BltTemplate(const Source: TPlanePtr; XSrc, SrcMod: LongInt; DestRP: PRastPort; XDest, YDest, XSize, YSize: LongInt); syscall IGfx 80;
 procedure ClearEOL(Rp: PRastPort); syscall IGfx 84;
 procedure ClearScreen(Rp: PRastPort); syscall IGfx 88;
-function TextLength(Rp: PRastPort; const String_: PChar; Count: LongWord): LongInt; syscall IGfx 92;
-procedure GfxText(Rp: PRastPort; const String_: PChar; Count: LongWord); syscall IGfx 96;
+function TextLength(Rp: PRastPort; const String_: PAnsiChar; Count: LongWord): LongInt; syscall IGfx 92;
+procedure GfxText(Rp: PRastPort; const String_: PAnsiChar; Count: LongWord); syscall IGfx 96;
 procedure SetFont(Rp: PRastPort; const TextFont: PTextFont); syscall IGfx 100;
 function OpenFont(TextAttr: PTextAttr): PTextFont; syscall IGfx 104;
 procedure CloseFont(TextFont: PTextFont); syscall IGfx 108;

+ 11 - 11
packages/os4units/src/amigados.pas

@@ -305,13 +305,13 @@ type
   TFileInfoBlock = record
     fib_DiskKey: LongWord;     // -- FILESYSTEM PRIVATE !!
     fib_DirEntryType: LongInt; // Use FIB_IS_ macros to identify object.
-    fib_FileName: array[0..107] of Char; // Null terminated.
+    fib_FileName: array[0..107] of AnsiChar; // Null terminated.
     fib_Protection: LongWord;  // Bit mask of protection, rwxd are 3-0.
     fib_Obsolete: LongInt;     // obsolete use fib_DirEntryType instead
     fib_Size: LongWord;        // Byte size of file, only good to 4 gig.
     fib_NumBlocks: LongWord;   // Number of blocks in file
     fib_Date: TDateStamp;      // Date file last changed
-    fib_Comment: array[0..79] of Char; // Null terminated comment string.
+    fib_Comment: array[0..79] of AnsiChar; // Null terminated comment string.
     // Note: the following two fields are not supported by all filesystems.
     //   Should be 0 if not supported
     fib_OwnerUID: Word;        //
@@ -638,7 +638,7 @@ Type
     an_Flags: Shortint;
     an_ExData: PExamineData;
     an_DevProc: Pointer; // real type PDevProc;
-    an_String: Array[0..0] of Char;
+    an_String: Array[0..0] of AnsiChar;
   end;
 
 // Obsolete definition ==ONLY== for legacy reference, pre V50.76 DOS.
@@ -660,7 +660,7 @@ Type
       ap_Reserved: Shortint;
       ap_Strlen: Word;             // This is what ap_Length used to be
       ap_Info: TFileInfoBlock;
-      ap_Buf: array[0..0] of Char; // Buffer for path name, allocated by user !!
+      ap_Buf: array[0..0] of AnsiChar; // Buffer for path name, allocated by user !!
      );
   end;
 
@@ -1220,7 +1220,7 @@ type
     seg_Next: BPTR;   // BCPL pointer to next DosResidentSeg, or zero
     seg_UC: LongInt;  // Use Count
     seg_Seg: BPTR;    // BCPL pointer to seglist of command.
-    seg_Name: array[0..3] of Char; // First 4 chars of BCPL style formatted name
+    seg_Name: array[0..3] of AnsiChar; // First 4 chars of BCPL style formatted name
   end;
 const
   CMD_SYSTEM   = -1;
@@ -1430,7 +1430,7 @@ Type
            end;
          );
       2: ( dol_assign : record
-             dol_AssignName: PChar;
+             dol_AssignName: PAnsiChar;
              dol_List      : PAssignList;
            end;
          );
@@ -2124,7 +2124,7 @@ const
 // bit definitions of flags passed to GetVar()/SetVar()/DeleteVar(), ScanVars() these bit defs are OR'ed with the type. Item will be treated as a single line of text unless BINARY_VAR is specified
   GVB_GLOBAL_ONLY       = 8;  // only use global vars, no local vars will be accessed.
   GVB_LOCAL_ONLY        = 9;  // only use local vars, no global vars will be accessed.
-  GVB_BINARY_VAR        = 10; // treat as binary var, don't truncate at a newline or carriage return char.
+  GVB_BINARY_VAR        = 10; // treat as binary var, don't truncate at a newline or carriage return AnsiChar.
   GVB_DONT_NULL_TERM    = 11; // can only be used with GVF_BINARY_VAR do not add a nul-terminator 0 byte at the end of data.
   GVB_SAVE_VAR          = 12; // only works with GVF_GLOBAL_VAR this is only supported in >= V39 dos.  V37 dos ignores this. this causes SetVar to affect ENVARC: as well as ENV:
   GVB_SCAN_ENVARC       = 13; // only usefull with GLOBAL vars scan envarc: instead of env: for use in ScanVars() - v50
@@ -2304,10 +2304,10 @@ const
   RLI_MultiLine       = RLI_Dummy + 11; // (LongInt; boolean) -- Enable Multi-line processing. Defaults to FALSE.
   RLI_CommentChars    = RLI_Dummy + 12; // (STRPTR) -- Nul-terminated string of one or more characters to be used as a comment marker.
                                         // This may be an empty string '' or nil, for none. Defaults to ''.
-  RLI_Substitute_N    = RLI_Dummy + 13; // (LongInt; boolean) -- Substitute quoted escaped 'N' to the hex char $0a.
+  RLI_Substitute_N    = RLI_Dummy + 13; // (LongInt; boolean) -- Substitute quoted escaped 'N' to the hex AnsiChar $0a.
                                         // Only works when RLI_EscapeChars is not "" or nil. Defaults to TRUE.
   RLI_Substitute_E    = RLI_Dummy + 14; // (LongInt; boolean) -- Substitute quoted escaped 'E' to the hex
-                                        // char $1b. Only works when RLI_EscapeChars is not '' or nil. Defaults to TRUE.
+                                        // AnsiChar $1b. Only works when RLI_EscapeChars is not '' or nil. Defaults to TRUE.
 // Tags for SetFileHandleAttr()
   FH_Dummy      = TAG_USER + 6000;
 
@@ -2734,7 +2734,7 @@ function MKBADDR(adr: Pointer): BPTR;
 // var args version
 function AllocDosObjectTags(type_ : LongWord; Const argv : Array of PtrUInt) : POINTER;
 function CreateNewProcTags(Const argv : Array of PtrUInt) : pProcess;
-function SystemTags(command : PChar; Const argv : Array of PtrUInt) : LongInt;
+function SystemTags(command : PAnsiChar; Const argv : Array of PtrUInt) : LongInt;
 
 
 
@@ -2761,7 +2761,7 @@ begin
   CreateNewProcTags := CreateNewProcTagList(@argv);
 end;
 
-function SystemTags(command : PChar; Const argv : Array of PtrUInt) : LongInt;
+function SystemTags(command : PAnsiChar; Const argv : Array of PtrUInt) : LongInt;
 begin
   SystemTags := SystemTagList(command, @argv);
 end;

+ 2 - 2
packages/os4units/src/asl.pas

@@ -21,7 +21,7 @@ uses
   exec, utility, workbench, agraphics;
 
 const
-  ASLNAME: PChar = 'asl.library';
+  ASLNAME: PAnsiChar = 'asl.library';
   ASL_Dummy = TAG_USER + $80000;
 
 // Types of requesters known to ASL, used as arguments to AllocAslRequest()
@@ -369,7 +369,7 @@ const
   defaults for the window size and the file requester sort order. The name
   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;

+ 1 - 1
packages/os4units/src/console.pas

@@ -114,7 +114,7 @@ var
   IConsoleDevice: Pointer = nil;
 
 function CDInputHandler(Events: PInputEvent; ConsoleDev: PLibrary): PInputEvent; syscall IConsoleDevice 76;
-function RawKeyConvert(Events: PInputEvent; Buffer: PChar; Length: LongInt; KeyMap: PKeyMap): LongInt; syscall IConsoleDevice 80;
+function RawKeyConvert(Events: PInputEvent; Buffer: PAnsiChar; Length: LongInt; KeyMap: PKeyMap): LongInt; syscall IConsoleDevice 80;
 function GetConSnip(): APTR; syscall ConsoleDevice 9;
 function SetConSnip(Param: APTR): LongInt; syscall ConsoleDevice 10;
 procedure AddConSnipHook(Hook: PHook); syscall ConsoleDevice 11;

+ 1 - 1
packages/os4units/src/cybergraphics.pas

@@ -30,7 +30,7 @@ type
    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

+ 1 - 1
packages/os4units/src/datatypes.pas

@@ -825,7 +825,7 @@ var
   IDataTypes: PInterface;
 
 const
-  DATATYPESNAME: PChar = 'datatypes.library';
+  DATATYPESNAME: PAnsiChar = 'datatypes.library';
 
 function ObtainDataTypeA(Typ: LongWord; Handle: APTR; Attrs: PTagItem): PDataType; syscall IDataTypes 80;
 procedure ReleaseDataType(Dt: PDataType); syscall IDataTypes 88;

+ 5 - 5
packages/os4units/src/diskfont.pas

@@ -25,7 +25,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;
@@ -33,7 +33,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;  // including the TAG_DONE tag
     // if tfc_TagCount is non-zero, tfc_FileName is overlayed with Text Tags starting at:
     //     PTagItem(@tfc_FileName[MAXFONTPATH - (tfc_TagCount * sizeof(TTagItem))])
@@ -71,7 +71,7 @@ type
     dfh_FileID: Word;     // DFH_ID
     dfh_Revision: Word;   // the font revision
     dfh_Segment: Longint; // the segment address when loaded
-    dfh_Name: array [0..MAXFONTNAME-1] of Char; // stripped font name (null terminated)
+    dfh_Name: array [0..MAXFONTNAME-1] of AnsiChar; // stripped font name (null terminated)
     dfh_TF: TTextFont;    // loaded TextFont structure, dfh_TF.tf_Message.mn_Node.ln_Name points to the full font name
   end;
 
@@ -119,7 +119,7 @@ type
   PGlyphEngine = ^TGlyphEngine;
   TGlyphEngine = record
     gle_Library: PLibrary; // engine library
-    gle_Name: PChar;       // library basename: e.g. 'bullet'
+    gle_Name: PAnsiChar;       // library basename: e.g. 'bullet'
     // private library data follows...
   end;
 
@@ -436,7 +436,7 @@ const
   OTERR_UnknownGlyph = 12; // glyph not known by engine
 
 const
-  DISKFONTNAME: PChar = 'diskfont.library';
+  DISKFONTNAME: PAnsiChar = 'diskfont.library';
 
 var
   DiskfontBase: PLibrary;

+ 6 - 6
packages/os4units/src/exec.pas

@@ -24,8 +24,8 @@ unit exec;
 interface
 
 type
-  STRPTR   = PChar;
-  PSTRPTR  = PPChar;
+  STRPTR   = PAnsiChar;
+  PSTRPTR  = PPAnsiChar;
   ULONG    = Longword;
   LONG     = LongInt;
   APTR     = Pointer;
@@ -1745,7 +1745,7 @@ procedure ExecExpunge(); syscall IExec 68;
 function ExecClone(): PInterface; syscall IExec 72;
 procedure AddHead(List: PList; Node: PNode); syscall IExec 76;
 procedure AddMemHandler(MemHand: PInterrupt); syscall IExec 80;
-procedure AddMemList(Size: LongWord; Attributes: LongWord; Pri: LongInt; Base: APTR; const Name: PChar); syscall IExec 84;
+procedure AddMemList(Size: LongWord; Attributes: LongWord; Pri: LongInt; Base: APTR; const Name: PAnsiChar); syscall IExec 84;
 procedure AddTail(List: PList; Node: PNode); syscall IExec 88;
 function AllocAbs(ByteSize: LongWord; Location: APTR): APTR; syscall IExec 92;
 function Allocate(FreeList: PMemHeader; ByteSize: LongWord): APTR; syscall IExec 96;
@@ -1761,8 +1761,8 @@ function CreatePool(MemFlags: LongWord; PuddleSize: LongWord; ThreshSize: LongWo
 procedure Deallocate(MemHeader: PMemHeader; MemoryBlock: APTR; ByteSize: LongWord); syscall IExec 136;
 procedure DeletePool(PoolHeader: APTR); syscall IExec 140;
 procedure Enqueue(List: PList; Node: PNode); syscall IExec 144;
-function FindName(Start: PList; const Name: PChar): PNode; syscall IExec 148;
-function FindIName(Start: PList; const Name: PChar): PNode; syscall IExec 152;
+function FindName(Start: PList; const Name: PAnsiChar): PNode; syscall IExec 148;
+function FindIName(Start: PList; const Name: PAnsiChar): PNode; syscall IExec 152;
 procedure Forbid(); syscall IExec 156;
 procedure FreeEntry(MemList: PMemList); syscall IExec 160;
 procedure ExecFreeMem(MemoryBlock: APTR; ByteSize: LongWord); syscall IExec 164;
@@ -1914,7 +1914,7 @@ function Emulate(const InitPC: APTR; const TagList: PTagItem): LongWord; syscall
 // 748 DebugPrintF
 function IsNative(const Code: APTR): LongBool; syscall IExec 752;
 function RawMayGetChar(): LongInt;syscall IExec 756;
-procedure RawPutChar(c: Char); syscall IExec 760;
+procedure RawPutChar(c: AnsiChar); syscall IExec 760;
 procedure GetCPUInfo(const TagList: PTagItem); syscall IExec 764;
 // 768 GetCPUInfoTags
 function OwnerOfMem(const Address: APTR): PTask; syscall IExec 772;

+ 8 - 8
packages/os4units/src/icon.pas

@@ -21,7 +21,7 @@ uses
   exec, workbench, utility, amigados, agraphics, intuition;
 
 const
-  ICONNAME: PChar = 'icon.library';
+  ICONNAME: PAnsiChar = 'icon.library';
 
   ICONA_Dummy                   = TAG_USER + $9000; // Start of icon.library tags
   ICONA_ErrorCode               = ICONA_Dummy + 1;  // (PLongInt) Errorcode
@@ -58,13 +58,13 @@ const
 
 // Tags for use with GetIconTagList()
   ICONGETA_GetDefaultType       = ICONA_Dummy + 45; // Default icon type to retrieve (LongInt)
-  ICONGETA_GetDefaultName       = ICONA_Dummy + 46; // Retrieve default icon for the given name (PChar)
+  ICONGETA_GetDefaultName       = ICONA_Dummy + 46; // Retrieve default icon for the given name (PAnsiChar)
   ICONGETA_FailIfUnavailable    = ICONA_Dummy + 47; // Return a default icon if the requested icon file cannot be found (BOOL).
   ICONGETA_GetPaletteMappedIcon = ICONA_Dummy + 48; // If possible, retrieve a palette mapped icon (BOOL).
   ICONGETA_IsDefaultIcon        = ICONA_Dummy + 49; // Set if the icon returned is a default icon (PLongBool).
   ICONGETA_RemapIcon            = ICONA_Dummy + 50; // Remap the icon to the default screen, if possible (BOOL).
   ICONGETA_GenerateImageMasks   = ICONA_Dummy + 51; // Generate icon image masks (BOOL).
-  ICONGETA_Label                = ICONA_Dummy + 52; // Label text to be assigned to the icon (PChar).
+  ICONGETA_Label                = ICONA_Dummy + 52; // Label text to be assigned to the icon (PAnsiChar).
   ICONGETA_Screen               = ICONA_Dummy + 69; // Screen to remap the icon to (PScreen).
   ICONGETA_UseFriendBitMap      = ICONA_Dummy + 90; // Allocate a bitmap for the icon images instead of the traditional planar icon images (LongBool). (V50)
   ICONGETA_FileFormat           = ICONA_Dummy + 112; // Returns the format of the file the icon is loaded from. If the file is in native Amiga format, the returned name will be "Amiga" (^STRPTR). (V51)
@@ -129,7 +129,7 @@ const
 
   ICONPUTA_NotifyWorkbench       = ICONA_Dummy + 53; // Notify Workbench of the icon being written (BOOL)
   ICONPUTA_PutDefaultType        = ICONA_Dummy + 54; // Store icon as the default for this type (LongInt)
-  ICONPUTA_PutDefaultName        = ICONA_Dummy + 55; // Store icon as a default for the given name (PChar)
+  ICONPUTA_PutDefaultName        = ICONA_Dummy + 55; // Store icon as a default for the given name (PAnsiChar)
   ICONPUTA_DropPlanarIconImage   = ICONA_Dummy + 56; // When storing a palette mapped icon, don't save the the original planar icon image with the file. Replace it with a tiny replacement image.
   ICONPUTA_DropChunkyIconImage   = ICONA_Dummy + 57; // Don't write the chunky icon image data to disk.
   ICONPUTA_DropNewIconToolTypes  = ICONA_Dummy + 58; // Don't write the NewIcons tool types to disk.
@@ -234,9 +234,9 @@ function AddFreeList(FreeList: PFreeList; const Mem: APTR; Size: LongWord): Long
 function GetDiskObject(const Name: STRPTR): PDiskObject; syscall IIcon 108;
 function PutDiskObject(const Name: STRPTR; const Icon: PDiskObject): LongBool; syscall IIcon 112;
 procedure FreeDiskObject(DiskObj: PDiskObject); syscall IIcon 116;
-function FindToolType(const ToolTypeArray: PPChar; const TypeName: STRPTR): STRPTR; syscall IIcon 120;
+function FindToolType(const ToolTypeArray: PPAnsiChar; const TypeName: STRPTR): STRPTR; syscall IIcon 120;
 function MatchToolValue(const TypeString: STRPTR; const Value: STRPTR): BOOL; syscall IIcon 124;
-function BumpRevision(NewName: PChar; const OldName: PChar): PChar; syscall IIcon 128;
+function BumpRevision(NewName: PAnsiChar; const OldName: PAnsiChar): PAnsiChar; syscall IIcon 128;
 function FreeAlloc(FreeList: PFreeList; Len, Type_: LongWord): APTR; syscall IIcon 132;
 function GetDefDiskObject(Typ: LongInt): PDiskObject; syscall IIcon 136;
 function PutDefDiskObject(const Icon: PDiskObject): LongBool; syscall IIcon 140;
@@ -276,11 +276,11 @@ implementation
 function GetToolTypes(Filename: AnsiString): TToolTypeArray;
 var
   DObj: PDiskObject;
-  Tooltype: PPChar;
+  Tooltype: PPAnsiChar;
   Idx: Integer;
 begin
   SetLength(GetToolTypes, 0);
-  DObj := GetDiskObject(PChar(FileName));
+  DObj := GetDiskObject(PAnsiChar(FileName));
   if not Assigned(Dobj) then
     Exit;
   Tooltype := DObj^.do_Tooltypes;

+ 3 - 3
packages/os4units/src/iffparse.pas

@@ -152,7 +152,7 @@ const
   IFFCMD_PURGELCI = 7; // Purge a LocalContextItem
 
 const
-  IFFPARSENAME: PChar = 'iffparse.library';
+  IFFPARSENAME: PAnsiChar = 'iffparse.library';
 
 var
   IFFParseBase: PLibrary = nil;
@@ -203,11 +203,11 @@ function GoodID(ID: LongInt): LongInt; syscall IIFFParse 224;
 function GoodType(Type_: LongInt): LongInt; syscall IIFFParse 228;
 function IDtoStr(ID: LongInt; Buf: STRPTR): STRPTR; syscall IIFFParse 232;
 
-function Make_ID(Str: string): LongWord;
+function Make_ID(Str: shortstring): LongWord;
 
 implementation
 
-function Make_ID(Str: string): LongWord;
+function Make_ID(Str: shortstring): LongWord;
 begin
   Make_ID := 0;
   if Length(Str) >= 4 then

+ 29 - 29
packages/os4units/src/intuition.pas

@@ -85,7 +85,7 @@ type
     ItemFill: 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
     SelectFill: APTR;       // points to Image, IntuiText, or nil
-    Command: Char;          // only if appliprog sets the COMMSEQ flag
+    Command: AnsiChar;          // only if appliprog sets the COMMSEQ flag
     SubItem: PMenuItem;     // if non-zero, DrawMenu shows "->"
     // The NextSelect field represents the menu number of next selected item (when user has drag-selected several items)
     NextSelect: Word;
@@ -2267,7 +2267,7 @@ type
     EnableCLI: WordBool;   // CLI availability switch
     // 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
     PrintQuality: Word;       // print quality
@@ -2291,10 +2291,10 @@ type
     SerParShk: Byte;  // upper nibble = (value for Parity setting)
                       // lower nibble = (value for Handshake mode)
     LaceWB: Byte;     // if workbench is to be interlaced
-    Pad: array[0..FILENAME_SIZE - 1] of Char; // This was UBYTE WorkName[FILENAME_SIZE]; (temp file for printer) in old versions.
+    Pad: array[0..FILENAME_SIZE - 1] of AnsiChar; // This was UBYTE WorkName[FILENAME_SIZE]; (temp file for printer) in old versions.
     PrinterDevPrivateFlags: Byte;    // system private (V51)
     PrtDevOpenDeviceFlags: LongWord; // flags for device below (V51)
-    PrtDevName: array[0..DEVNAME_SIZE - 1] of Char; // device used by printer.device (omit the ".device")
+    PrtDevName: array[0..DEVNAME_SIZE - 1] of AnsiChar; // device used by printer.device (omit the ".device")
     DefaultPrtUnit: Byte;      // default unit opened by printer.device
     DefaultSerUnit: Byte;      // default serial unit
     RowSizeChange: SmallInt;   // affect NormalDisplayRows/Columns
@@ -2520,22 +2520,22 @@ type
  * 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';
-  SCROLLERGCLASS : PChar = 'scrollergclass'; // V50
-  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';
+  SCROLLERGCLASS : PAnsiChar = 'scrollergclass'; // V50
+  ICCLASS        : PAnsiChar = 'icclass';
+  MODELCLASS     : PAnsiChar = 'modelclass';
+  ITEXTICLASS    : PAnsiChar = 'itexticlass';
+  POINTERCLASS   : PAnsiChar = 'pointerclass';
 
 
 // Dispatched method ID's
@@ -2775,8 +2775,8 @@ CONST
   STRINGA_ExitHelp       = STRINGA_Dummy + $0013; // STRINGA_ExitHelp is new for V37, and ignored by V36. Set this if you want the gadget to exit when Help is
                                                   // pressed.  Look for a code of $5F, the rawkey code for Help
   // New in V50:
-  STRINGA_MarkedBlock    = STRINGA_Dummy + $0014; // Sets/gets the marked block of a string.gadget. The hi-word contains the start position (first marked char) and the
-                                                  // lo-word the end position (last marked char).  If both are -1 nothing is marked.
+  STRINGA_MarkedBlock    = STRINGA_Dummy + $0014; // Sets/gets the marked block of a string.gadget. The hi-word contains the start position (first marked AnsiChar) and the
+                                                  // lo-word the end position (last marked AnsiChar).  If both are -1 nothing is marked.
   SG_DEFAULTMAXCHARS = 128;
 
 // Gadget Layout related attributes
@@ -3089,9 +3089,9 @@ const
                                         // as TRUE.  You cannot set or clear this attribute, however.
   IA_FrameType   = IA_Dummy + $1b; // Starting with V39, FrameIClass recognizes  several standard types of frame.  Use one
                                         // of the FRAME_ specifiers below.  Defaults to FRAME_DEFAULT.
-  IA_Underscore  = IA_Dummy + $1c; // V44, Indicate underscore keyboard shortcut for image labels. (Char) Defaults to '_'
+  IA_Underscore  = IA_Dummy + $1c; // V44, Indicate underscore keyboard shortcut for image labels. (AnsiChar) Defaults to '_'
   IA_Scalable    = IA_Dummy + $1d; // V44, Attribute indicates this image is allowed to/can scale its rendering. (BOOL) Defaults to FALSE.
-  IA_ActivateKey = IA_Dummy + $1e; // V44, Used to get an underscored label shortcut. Useful for labels attached to string gadgets. (Char) Defaults to #0.
+  IA_ActivateKey = IA_Dummy + $1e; // V44, Used to get an underscored label shortcut. Useful for labels attached to string gadgets. (AnsiChar) Defaults to #0.
   IA_Screen      = IA_Dummy + $1f; // V44 Screen pointer, may be useful/required by certain classes. (PScreen)
   IA_Precision   = IA_Dummy + $20; // V44 Precision value, typically pen precision but may be used for similar custom purposes. (LongWord)
   // New For V50:
@@ -3461,7 +3461,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
@@ -3477,7 +3477,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
@@ -3793,7 +3793,7 @@ type
 
 
 const
-  INTUITIONNAME: PChar = 'intuition.library';
+  INTUITIONNAME: PAnsiChar = 'intuition.library';
 
 var
   IntuitionBase: PIntuitionBase;
@@ -4032,7 +4032,7 @@ procedure DisableTemplate(Rp: PRastPort; Left, Top, Width, Height: LongInt; Temp
 
 function OpenScreenTags(newScreen: PNewScreen; const TagList: array of PtrUInt): PScreen;
 function OpenWindowTags(newWindow: PNewWindow; const TagList: array of PtrUInt): PWindow;
-function NewObject(ClassPtr: PIClass; ClassID: PChar; const argv: array of PtrUInt): Pointer;
+function NewObject(ClassPtr: PIClass; ClassID: PAnsiChar; const argv: array of PtrUInt): Pointer;
 function SetAttrs(obj: Pointer; const Tags: array of PtrUInt): LongWord;
 function SetGadgetAttrs(gadget: PGadget; Window: PWindow; Requester: PRequester; const argv: array of PtrUInt): LongWord;
 function EasyRequest(Window: PWindow; const EasyStruct: PEasyStruct; IDCMPPtr: PLongWord; const args: array of PtrUInt): LongInt;
@@ -4077,7 +4077,7 @@ begin
   OpenWindowTags := OpenWindowTagList(NewWindow, @TagList);
 end;
 
-function NewObject(ClassPtr: PIClass; ClassID: PChar; const argv: array of PtrUInt): Pointer;
+function NewObject(ClassPtr: PIClass; ClassID: PAnsiChar; const argv: array of PtrUInt): Pointer;
 begin
   NewObject := NewObjectA(ClassPtr, ClassID, @argv);
 end;

+ 3 - 3
packages/os4units/src/keymap.pas

@@ -187,7 +187,7 @@ var
   KeymapBase: PLibrary = nil;
 
 const
-  KEYMAPNAME: PChar = 'keymap.library';
+  KEYMAPNAME: PAnsiChar = 'keymap.library';
   IKeymap: PInterface = nil;
 
 function KeymapObtain(): LongWord; syscall IKeymap 60;
@@ -196,8 +196,8 @@ procedure KeymapExpunge(); syscall IKeymap 68;
 function KeymapClone(): PInterface; syscall IKeymap 72;
 procedure SetKeyMapDefault(KeyMap: PKeyMap); syscall IKeymap 76;
 function AskKeyMapDefault: PKeyMap; syscall IKeymap 80;
-function MapRawKey(Event: PInputEvent; Buffer: PChar; Length: LongInt; KeyMap: PKeyMap): SmallInt; syscall IKeymap 84;
-function MapANSI(TheString: PChar; Count: LongInt; Buffer: PChar; Length: LongInt; KeyMap: PKeyMap): LongInt; syscall IKeymap 88;
+function MapRawKey(Event: PInputEvent; Buffer: PAnsiChar; Length: LongInt; KeyMap: PKeyMap): SmallInt; syscall IKeymap 84;
+function MapANSI(TheString: PAnsiChar; Count: LongInt; Buffer: PAnsiChar; Length: LongInt; KeyMap: PKeyMap): LongInt; syscall IKeymap 88;
 function OpenKeyMapHandleA(const Filename: STRPTR; const TagList: PTagItem): APTR; syscall IKeymap 92;
 // 96 OpenKeyMapHandle
 procedure CloseKeyMapHandle(Handle: APTR); syscall IKeymap 100;

+ 1 - 1
packages/os4units/src/layers.pas

@@ -143,7 +143,7 @@ const
   LCM_COMPOSE = 0;
   LCM_DAMAGE  = 1;
 
-  LAYERSNAME: PChar = 'layers.library';
+  LAYERSNAME: PAnsiChar = 'layers.library';
 var
   LayersBase: PLibrary = nil;
   ILayers: PInterface = nil;

+ 4 - 4
packages/os4units/src/locale.pas

@@ -276,7 +276,7 @@ var
   ILocale: PInterface = nil;
 
 const
-  LOCALENAME: PChar = 'locale.library';
+  LOCALENAME: PAnsiChar = 'locale.library';
 
 function LocaleObtain(): LongWord; syscall ILocale 60;
 function LocaleRelease(): LongWord; syscall ILocale 64;
@@ -289,8 +289,8 @@ function ConvToLower(Locale: PLocale; Character: LongWord): LongWord; syscall IL
 function ConvToUpper(Locale: PLocale; Character: LongWord): LongWord; syscall ILocale 92;
 procedure FormatDate(Locale: PLocale; FmtTemplate: STRPTR; Date: PDateStamp; PutCharFunc: PHook); syscall ILocale 96;
 function FormatString(Locale: PLocale; FmtTemplate: STRPTR; DataStream: APTR; PutCharFunc: PHook): POINTER; syscall ILocale 100;
-function GetCatalogStr(Catalog: PCatalog; StringNum: LongInt; DefaultString: STRPTR): PChar; syscall ILocale 104;
-function GetLocaleStr(Locale: PLocale; StringNum: LongWord): PChar; syscall ILocale 108;
+function GetCatalogStr(Catalog: PCatalog; StringNum: LongInt; DefaultString: STRPTR): PAnsiChar; syscall ILocale 104;
+function GetLocaleStr(Locale: PLocale; StringNum: LongWord): PAnsiChar; syscall ILocale 108;
 function IsAlNum(Locale: PLocale; Character: LongWord): LongBool; syscall ILocale 112;
 function IsAlpha(Locale: PLocale; Character: LongWord): LongBool; syscall ILocale 116;
 function IsCntrl(Locale: PLocale; Character: LongWord): LongBool; syscall ILocale 120;
@@ -302,7 +302,7 @@ function IsPunct(Locale: PLocale; Character: LongWord): LongBool; syscall ILocal
 function IsSpace(Locale: PLocale; Character: LongWord): LongBool; syscall ILocale 144;
 function IsUpper(Locale: PLocale; Character: LongWord): LongBool; syscall ILocale 148;
 function IsXDigit(Locale: PLocale; Character: LongWord): LongBool; syscall ILocale 152;
-function OpenCatalogA(Locale: PLocale; Name: PChar; Tags: PTagItem): PCatalog; syscall ILocale 156;
+function OpenCatalogA(Locale: PLocale; Name: PAnsiChar; Tags: PTagItem): PCatalog; syscall ILocale 156;
 // 160 OpenCatalog
 function OpenLocale(Name: STRPTR): PLocale; syscall ILocale 164;
 function ParseDate(Locale: PLocale; Date: PDateStamp; FmtTemplate: STRPTR; GetCharFunc: PHook): LongBool; syscall ILocale 168;

+ 104 - 104
packages/os4units/src/mui.pas

@@ -118,7 +118,7 @@ uses
 
 
 const
-  MUIMASTER_NAME: PChar = 'muimaster.library';
+  MUIMASTER_NAME: PAnsiChar = 'muimaster.library';
   MUIMASTER_VMIN        = 20;
   MUIMASTER_VLATEST     = 20;
 
@@ -144,25 +144,25 @@ const
 type
   PMUI_PenSpec = ^TMUI_PenSpec;
   TMUI_PenSpec = record
-    ps_buf: array[0..31] of char; // black box
+    ps_buf: array[0..31] of AnsiChar; // black box
   end;
 
   PMUI_FrameSpec = ^TMUI_FrameSpec;
   TMUI_FrameSpec = record
-    buf: array[0..31] of char;
+    buf: array[0..31] of AnsiChar;
   end;
 
 // Public Screen Stuff
 // NOTE: This stuff is only included to allow compilation of the supplied public screen manager for educational purposes. Everything
 //       here is subject to change without notice and I guarantee to do that just for fun! More info can be found in the screen manager source file.
 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;
@@ -183,10 +183,10 @@ type
 
   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;
 
@@ -260,8 +260,8 @@ const
 // ARexx Interface
 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;
@@ -606,7 +606,7 @@ const
 // *********************************************************************
 // Notify
 const
-  MUIC_Notify: PChar = 'Notify.mui';
+  MUIC_Notify: PAnsiChar = 'Notify.mui';
 
 // Identifier base (for Zune extensions)
   MUIB_Notify = MUIB_ZUNE or $00001d00;
@@ -721,7 +721,7 @@ type
   TMUIP_SetAsString = record
     MethodID: LongWord; // MUIM_SetAsString
     attr: LongWord;
-    format: PChar;
+    format: PAnsiChar;
     val: LongWord;
   end;
   PMUIP_SetAsString = ^TMUIP_SetAsString;
@@ -751,8 +751,8 @@ type
 
   TMUIP_WriteString = record
     MethodID: LongWord; // MUIM_WriteString
-    str: PChar;
-    memory: PChar;
+    str: PAnsiChar;
+    memory: PAnsiChar;
   end;
   PMUIP_WriteString = ^TMUIP_WriteString;
 
@@ -784,7 +784,7 @@ const
 // *********************************************************************
 // Family
 const
-   MUIC_Family: PChar = 'Family.mui';
+   MUIC_Family: PAnsiChar = 'Family.mui';
 
 // Identifier base (for Zune extensions)
   MUIB_Family = MUIB_ZUNE or $00000c00;
@@ -864,7 +864,7 @@ const
 // *********************************************************************
 //  Application
 const
-  MUIC_Application: PChar = 'Application.mui';
+  MUIC_Application: PAnsiChar = 'Application.mui';
 
 // Identifier base (for Zune extensions)
   MUIB_Application = MUIB_ZUNE or $00000100;
@@ -1013,8 +1013,8 @@ type
   TMUIP_Application_ShowHelp = record
     MethodID: LongWord;  // MUIM_Application_ShowHelp
     window: PObject_;
-    name: PChar;
-    node: PChar;
+    name: PAnsiChar;
+    node: PAnsiChar;
     line: LongInt;
   end;
   PMUIP_Application_ShowHelp = ^TMUIP_Application_ShowHelp;
@@ -1110,7 +1110,7 @@ type
 // *********************************************************************
 //  Window
 const
-  MUIC_Window: PChar = 'Window.mui';
+  MUIC_Window: PAnsiChar = 'Window.mui';
 
 // Identifier base (for Zune extensions)
   MUIB_Window = MUIB_ZUNE or $00003600;
@@ -1362,7 +1362,7 @@ const
 // *********************************************************************
 //  Area
 const
-  MUIC_Area: PChar = 'Area.mui';
+  MUIC_Area: PAnsiChar = 'Area.mui';
 
 // Identifier base (for Zune extensions)
   MUIB_Area = MUIB_ZUNE or $00000200;
@@ -1444,7 +1444,7 @@ type
     MethodID: LongWord;  // MUIM_CreateBubble
     x: LongInt;
     y: LongInt;
-    txt : PChar;
+    txt : PAnsiChar;
     flags: LongWord;
   end;
   PMUIP_CreateBubble = ^TMUIP_CreateBubble;
@@ -1640,7 +1640,7 @@ const
   MUIA_BottomEdge         = MUIB_MUI or $42e552; // V4  ..g LongInt
   MUIA_ContextMenu        = MUIB_MUI or $42b704; // V11 isg PObject
   MUIA_ContextMenuTrigger = MUIB_MUI or $42a2c1; // V11 ..g PObject
-  MUIA_ControlChar        = MUIB_MUI or $42120b; // V4  isg Char
+  MUIA_ControlChar        = MUIB_MUI or $42120b; // V4  isg AnsiChar
   MUIA_CycleChain         = MUIB_MUI or $421ce7; // V11 isg LongInt
   MUIA_Disabled           = MUIB_MUI or $423661; // V4  isg WordBool
   MUIA_DoubleBuffer       = MUIB_MUI or $42a9c7; // V20 isg WordBool
@@ -1750,7 +1750,7 @@ const
 // *********************************************************************
 //  Group
 const
-  MUIC_Group: PChar = 'Group.mui';
+  MUIC_Group: PAnsiChar = 'Group.mui';
 
 // Identifier base (for Zune extensions)
   MUIB_Group = MUIB_ZUNE or $00001000;
@@ -1856,7 +1856,7 @@ const
 // *********************************************************************
 //  Rectangle
 const
-  MUIC_Rectangle: PChar = 'Rectangle.mui';
+  MUIC_Rectangle: PAnsiChar = 'Rectangle.mui';
 
 // Identifier base (for Zune extensions)
   MUIB_Rectangle = MUIB_ZUNE or $00002b00;
@@ -1870,7 +1870,7 @@ const
 // *********************************************************************
 //  Text
 const
-  MUIC_Text: PChar = 'Text.mui';
+  MUIC_Text: PAnsiChar = 'Text.mui';
 
 // Identifier base (for Zune extensions)
   MUIB_Text = MUIB_ZUNE or $00003500;
@@ -1878,8 +1878,8 @@ const
 // Attributes
 const
   MUIA_Text_Contents  = MUIB_MUI or $42f8dc; // V4  isg STRPTR
-  MUIA_Text_HiChar    = MUIB_MUI or $4218ff; // V4  i.. Char
-  MUIA_Text_HiCharIdx = MUIB_MUI or $4214f5; //     i.. Char
+  MUIA_Text_HiChar    = MUIB_MUI or $4218ff; // V4  i.. AnsiChar
+  MUIA_Text_HiCharIdx = MUIB_MUI or $4214f5; //     i.. AnsiChar
   MUIA_Text_PreParse  = MUIB_MUI or $42566d; // V4  isg STRPTR
   MUIA_Text_SetMax    = MUIB_MUI or $424d0a; // V4  i.. WordBool
   MUIA_Text_SetMin    = MUIB_MUI or $424e10; // V4  i.. WordBool
@@ -1901,7 +1901,7 @@ const
 // *********************************************************************
 //  Numeric
 const
-  MUIC_Numeric: PChar = 'Numeric.mui';
+  MUIC_Numeric: PAnsiChar = 'Numeric.mui';
 
 // Identifier base (for Zune extensions)
   MUIB_Numeric = MUIB_ZUNE or $00001e00;
@@ -1979,7 +1979,7 @@ const
 // *********************************************************************
 //  Slider
 const
-  MUIC_Slider: PChar = 'Slider.mui';
+  MUIC_Slider: PAnsiChar = 'Slider.mui';
 
 // Identifier base (for Zune extensions)
   MUIB_Slider = MUIB_ZUNE or $00003300;
@@ -1999,7 +1999,7 @@ const
 // *********************************************************************
 //  String
 const
-  MUIC_String: PChar = 'String.mui';
+  MUIC_String: PAnsiChar = 'String.mui';
 
 // Identifier base (for Zune extensions)
   MUIB_String = MUIB_ZUNE or $00003400;
@@ -2067,7 +2067,7 @@ type
 // *********************************************************************
 //  Boopsi
 const
-  MUIC_Boopsi: PChar = 'Boopsi.mui';
+  MUIC_Boopsi: PAnsiChar = 'Boopsi.mui';
 
 // Identifier base (for Zune extensions)
   MUIB_Boopsi = MUIB_ZUNE or $00000600;
@@ -2075,7 +2075,7 @@ const
 // Attributes
 const
   MUIA_Boopsi_Class       = MUIB_MUI or $426999; // V4  isg PIClass
-  MUIA_Boopsi_ClassID     = MUIB_MUI or $42bfa3; // V4  isg PChar
+  MUIA_Boopsi_ClassID     = MUIB_MUI or $42bfa3; // V4  isg PAnsiChar
   MUIA_Boopsi_MaxHeight   = MUIB_MUI or $42757f; // V4  isg LongWord
   MUIA_Boopsi_MaxWidth    = MUIB_MUI or $42bcb1; // V4  isg LongWord
   MUIA_Boopsi_MinHeight   = MUIB_MUI or $422c93; // V4  isg LongWord
@@ -2090,7 +2090,7 @@ const
 // *********************************************************************
 //  Prop
 const
-  MUIC_Prop: PChar = 'Prop.mui';
+  MUIC_Prop: PAnsiChar = 'Prop.mui';
 
 // Identifier base (for Zune extensions)
   MUIB_Prop = MUIB_ZUNE or $00002900;
@@ -2133,7 +2133,7 @@ const
 // *********************************************************************
 //  Scrollbar
 const
-  MUIC_Scrollbar: PChar = 'Scrollbar.mui';
+  MUIC_Scrollbar: PAnsiChar = 'Scrollbar.mui';
 
 // Identifier base (for Zune extensions)
   MUIB_Scrollbar = MUIB_ZUNE or $00002e00;
@@ -2150,7 +2150,7 @@ const
 // *********************************************************************
 //  Register
 const
-  MUIC_Register: PChar = 'Register.mui';
+  MUIC_Register: PAnsiChar = 'Register.mui';
 
 // Identifier base  (for Zune extensions)
   MUIB_Register = MUIB_ZUNE or $00002c00;
@@ -2165,7 +2165,7 @@ const
 // *********************************************************************
 //  Menustrip
 const
-  MUIC_Menustrip: PChar = 'Menustrip.mui';
+  MUIC_Menustrip: PAnsiChar = 'Menustrip.mui';
 
 // Identifier base (for Zune extensions)
   MUIB_Menustrip = MUIB_ZUNE or $00001a00;
@@ -2177,7 +2177,7 @@ const
 // *********************************************************************
 //  Menu
 const
-  MUIC_Menu: PChar = 'Menu.mui';
+  MUIC_Menu: PAnsiChar = 'Menu.mui';
 
 // Identifier base (for Zune extensions)
   MUIB_Menu = MUIB_ZUNE or $00001b00;
@@ -2190,7 +2190,7 @@ const
 // *********************************************************************
 //  Menuitem
 const
-  MUIC_Menuitem: PChar = 'Menuitem.mui';
+  MUIC_Menuitem: PAnsiChar = 'Menuitem.mui';
 
 // Identifier base (for Zune extensions)
   MUIB_Menuitem = MUIB_ZUNE or $00001c00;
@@ -2214,7 +2214,7 @@ const
 // *********************************************************************
 //  Dataspace
 const
-  MUIC_Dataspace: PChar = 'Dataspace.mui';
+  MUIC_Dataspace: PAnsiChar = 'Dataspace.mui';
 
 // Identifier base (for Zune extensions)
   MUIB_Dataspace = MUIB_ZUNE or $00000b00;
@@ -2282,7 +2282,7 @@ const
 // *********************************************************************
 //  Virtgroup
 const
-  MUIC_Virtgroup: PChar = 'Virtgroup.mui';
+  MUIC_Virtgroup: PAnsiChar = 'Virtgroup.mui';
 
 // Identifier base (for Zune extensions)
   MUIB_Virtgroup = MUIB_ZUNE or $00003700;
@@ -2298,7 +2298,7 @@ const
 // *********************************************************************
 //  Scrollgroup
 const
-  MUIC_Scrollgroup: PChar = 'Scrollgroup.mui';
+  MUIC_Scrollgroup: PAnsiChar = 'Scrollgroup.mui';
 
 // Identifier base (for Zune extensions)
   MUIB_Scrollgroup = MUIB_ZUNE or $00002f00;
@@ -2315,7 +2315,7 @@ const
 // *********************************************************************
 //  ScrollButton
 const
-  MUIC_Scrollbutton: PChar = 'Scrollbutton.mui';
+  MUIC_Scrollbutton: PAnsiChar = 'Scrollbutton.mui';
 
 // Identifier base
   MUIB_Scrollbutton = MUIB_ZUNE or $00004100;
@@ -2331,7 +2331,7 @@ const
 // *********************************************************************
 //  Semaphore
 const
-  MUIC_Semaphore: PChar = 'Semaphore.mui';
+  MUIC_Semaphore: PAnsiChar = 'Semaphore.mui';
 
 // Identifier base (for Zune extensions)
   MUIB_Semaphore = MUIB_ZUNE or $00003000;
@@ -2373,7 +2373,7 @@ type
 // *********************************************************************
 //  Bitmap
 const
-  MUIC_Bitmap: PChar = 'Bitmap.mui';
+  MUIC_Bitmap: PAnsiChar = 'Bitmap.mui';
 
 // Identifier base (for Zune extensions)
   MUIB_Bitmap = MUIB_ZUNE or $00000400;
@@ -2394,7 +2394,7 @@ const
 // *********************************************************************
 //  Bodychunk
 const
-   MUIC_Bodychunk : PChar = 'Bodychunk.mui';
+   MUIC_Bodychunk : PAnsiChar = 'Bodychunk.mui';
 
 // Identifier base (for Zune extensions)
   MUIB_Bodychunk = MUIB_ZUNE or $00000500;
@@ -2409,7 +2409,7 @@ const
 // *********************************************************************
 //  ChunkyImage
 const
-   MUIC_ChunkyImage : PChar = 'ChunkyImage.mui';
+   MUIC_ChunkyImage : PAnsiChar = 'ChunkyImage.mui';
 
 // Identifier base (for Zune extensions)
   MUIB_ChunkyImage = MUIB_ZUNE or $00004000;
@@ -2424,7 +2424,7 @@ const
 // *********************************************************************
 //  Listview
 const
-  MUIC_Listview: PChar = 'Listview.mui';
+  MUIC_Listview: PAnsiChar = 'Listview.mui';
 
 // Identifier base (for Zune extensions)
   MUIB_Listview = MUIB_ZUNE or $00001900;
@@ -2457,7 +2457,7 @@ const
 // *********************************************************************
 //  List
 const
-  MUIC_List: PChar = 'List.mui';
+  MUIC_List: PAnsiChar = 'List.mui';
 
 // Identifier base (for Zune extensions)
   MUIB_List = MUIB_ZUNE or $00001400;
@@ -2622,7 +2622,7 @@ const
   MUIA_List_Quiet          = MUIB_MUI or $42d8c7; // V4  .s. WordBool
   MUIA_List_ShowDropMarks  = MUIB_MUI or $42c6f3; // V11 isg WordBool
   MUIA_List_SourceArray    = MUIB_MUI or $42c0a0; // V4  i.. APTR
-  MUIA_List_Title          = MUIB_MUI or $423e66; // V6  isg PChar
+  MUIA_List_Title          = MUIB_MUI or $423e66; // V6  isg PAnsiChar
   MUIA_List_Visible        = MUIB_MUI or $42191f; // V4  ..g LongInt
 
   MUIV_List_Active_Off      = -1;
@@ -2692,7 +2692,7 @@ const
 // *********************************************************************
 //  Scrmodelist
 const
-  MUIC_Scrmodelist: PChar = 'Scrmodelist.mui';
+  MUIC_Scrmodelist: PAnsiChar = 'Scrmodelist.mui';
 
 // Identifier base (for Zune extensions)
   MUIB_Scrmodelist = MUIB_ZUNE or $00001700;
@@ -2700,7 +2700,7 @@ const
 // *********************************************************************
 //  Floattext
 const
-  MUIC_Floattext: PChar = 'Floattext.mui';
+  MUIC_Floattext: PAnsiChar = 'Floattext.mui';
 
 // Identifier base (for Zune extensions)
   MUIB_Floattext = MUIB_ZUNE or $00001500;
@@ -2725,7 +2725,7 @@ const
 // *********************************************************************
 //  Popstring
 const
-  MUIC_Popstring: PChar = 'Popstring.mui';
+  MUIC_Popstring: PAnsiChar = 'Popstring.mui';
 
 // Identifier base (for Zune extensions)
   MUIB_Popstring = MUIB_ZUNE or $00002800;
@@ -2758,7 +2758,7 @@ const
 // *********************************************************************
 //  Popobject
 const
-  MUIC_Popobject: PChar = 'Popobject.mui';
+  MUIC_Popobject: PAnsiChar = 'Popobject.mui';
 
 // Identifier base
   MUIB_Popobject = MUIB_ZUNE or $00002400;
@@ -2776,7 +2776,7 @@ const
 // *********************************************************************
 //  Cycle
 const
-  MUIC_Cycle: PChar = 'Cycle.mui';
+  MUIC_Cycle: PAnsiChar = 'Cycle.mui';
 
 // Identifier base (for Zune extensions)
   MUIB_Cycle = MUIB_ZUNE or $00000a00;
@@ -2792,7 +2792,7 @@ const
 // *********************************************************************
 //  Gauge
 const
-  MUIC_Gauge: PChar = 'Gauge.mui';
+  MUIC_Gauge: PAnsiChar = 'Gauge.mui';
 
 // Identifier base (for Zune extensions)
   MUIB_Gauge = MUIB_ZUNE or $00000f00;
@@ -2810,7 +2810,7 @@ const
 // *********************************************************************
 //  Image
 const
-  MUIC_Image: PChar = 'Image.mui';
+  MUIC_Image: PAnsiChar = 'Image.mui';
 
 // Identifier base (for Zune extensions)
   MUIB_Image = MUIB_ZUNE or $00001300;
@@ -2823,13 +2823,13 @@ const
   MUIA_Image_FreeHoriz       = MUIB_MUI or $42da84; // V4  i.. WordBool
   MUIA_Image_FreeVert        = MUIB_MUI or $42ea28; // V4  i.. WordBool
   MUIA_Image_OldImage        = MUIB_MUI or $424f3d; // V4  i.. PImage
-  MUIA_Image_Spec            = MUIB_MUI or $4233d5; // V4  i.. PChar
+  MUIA_Image_Spec            = MUIB_MUI or $4233d5; // V4  i.. PAnsiChar
   MUIA_Image_State           = MUIB_MUI or $42a3ad; // V4  is. LongInt
 
 // *********************************************************************
 //  Imagedisplay
 const
-  MUIC_Imagedisplay: PChar = 'Imagedisplay.mui';
+  MUIC_Imagedisplay: PAnsiChar = 'Imagedisplay.mui';
 
 // Identifier base (for Zune extensions)
   MUIB_Imagedisplay = MUIB_ZUNE or $00001200;
@@ -2844,7 +2844,7 @@ const
 // *********************************************************************
 //  Popasl
 const
-  MUIC_Popasl: PChar = 'Popasl.mui';
+  MUIC_Popasl: PAnsiChar = 'Popasl.mui';
 
 // Identifier base (for Zune extensions)
   MUIB_Popasl = MUIB_ZUNE or $00002100;
@@ -2859,7 +2859,7 @@ const
 // *********************************************************************
 //  Settingsgroup
 const
-  MUIC_Settingsgroup: PChar = 'Settingsgroup.mui';
+  MUIC_Settingsgroup: PAnsiChar = 'Settingsgroup.mui';
 
 // Identifier base (for Zune extensions)
   MUIB_Settingsgroup = MUIB_ZUNE or $00003100;
@@ -2885,7 +2885,7 @@ type
 // *********************************************************************
 //  Settings
 const
-  MUIC_Settings: PChar = 'Settings.mui';
+  MUIC_Settings: PAnsiChar = 'Settings.mui';
 
 // Identifier base (for Zune extensions)
   MUIB_Settings = MUIB_ZUNE or $00003200;
@@ -2893,7 +2893,7 @@ const
 // *********************************************************************
 //  Aboutmui
 const
-  MUIC_Aboutmui: PChar = 'Aboutmui.mui';
+  MUIC_Aboutmui: PAnsiChar = 'Aboutmui.mui';
 
 // Identifier base (for Zune extensions)
   MUIB_Aboutmui = MUIB_ZUNE or $0;
@@ -2905,7 +2905,7 @@ const
 // *********************************************************************
 //  Configdata
 const
-   MUIC_Configdata : PChar = 'Configdata.mui';
+   MUIC_Configdata : PAnsiChar = 'Configdata.mui';
 
 // Identifier base (for Zune extensions)
   MUIB_Configdata = MUIB_ZUNE or $00000900;
@@ -3162,7 +3162,7 @@ const
 // *********************************************************************
 //  Imageadjust
 const
-  MUIC_Imageadjust: PChar = 'Imageadjust.mui';
+  MUIC_Imageadjust: PAnsiChar = 'Imageadjust.mui';
 
 // Identifier base (for AROS extensions)
   MUIB_Imageadjust = MUIB_ZUNE or $00001100;
@@ -3170,7 +3170,7 @@ const
 // Attributes
 const
   MUIA_Imageadjust_Type = MUIB_MUI or $422f2b; // V11 i.. LongInt
-  MUIA_Imageadjust_Spec = MUIB_MUI or $4279e1; // ??? .g. PChar
+  MUIA_Imageadjust_Spec = MUIB_MUI or $4279e1; // ??? .g. PAnsiChar
   // AROS special
   MUIA_Imageadjust_Originator = MUIB_Imageadjust or $0; // Zune: i.. PObject_
 
@@ -3182,7 +3182,7 @@ const
 // *********************************************************************
 //  Popimage
 const
-  MUIC_Popimage: PChar = 'Popimage.mui';
+  MUIC_Popimage: PAnsiChar = 'Popimage.mui';
 
 // Identifier base (for Zune extensions)
   MUIB_Popimage = MUIB_ZUNE or $00002300;
@@ -3190,7 +3190,7 @@ const
 // *********************************************************************
 //  Scale
 const
-  MUIC_Scale: PChar = 'Scale.mui';
+  MUIC_Scale: PAnsiChar = 'Scale.mui';
 
 // Identifier base (for Zune extensions)
   MUIB_Scale = MUIB_ZUNE or $00002d00;
@@ -3202,7 +3202,7 @@ const
 // *********************************************************************
 //  Radio
 const
-  MUIC_Radio: PChar = 'Radio.mui';
+  MUIC_Radio: PAnsiChar = 'Radio.mui';
 
 // Identifier base (for Zune extensions)
   MUIB_Radio = MUIB_ZUNE or $00002a00;
@@ -3215,7 +3215,7 @@ const
 // *********************************************************************
 //  Balance
 const
-  MUIC_Balance: PChar = 'Balance.mui';
+  MUIC_Balance: PAnsiChar = 'Balance.mui';
 
 // Identifier base (for Zune extensions)
   MUIB_Balance = MUIB_ZUNE or $00000300;
@@ -3226,7 +3226,7 @@ const
 // *********************************************************************
 //  Pendisplay
 const
-  MUIC_Pendisplay: PChar = 'Pendisplay.mui';
+  MUIC_Pendisplay: PAnsiChar = 'Pendisplay.mui';
 
 // Identifier base (for Zune extensions)
   MUIB_Pendisplay = MUIB_ZUNE or $00002000;
@@ -3268,7 +3268,7 @@ const
 // *********************************************************************
 //  Penadjust
 const
-  MUIC_Penadjust: PChar= 'Penadjust.mui';
+  MUIC_Penadjust: PAnsiChar= 'Penadjust.mui';
 
 // Identifier base (for Zune extensions)
   MUIB_Penadjust = MUIB_ZUNE or $00001f00;
@@ -3280,7 +3280,7 @@ const
 // *********************************************************************
 //  Poppen
 const
-  MUIC_Poppen: PChar = 'Poppen.mui';
+  MUIC_Poppen: PAnsiChar = 'Poppen.mui';
 
 // Identifier base (for Zune extensions)
   MUIB_Poppen = MUIB_ZUNE or $00002700;
@@ -3288,7 +3288,7 @@ const
 // *********************************************************************
 //  Colorfield
 const
-  MUIC_Colorfield: PChar = 'Colorfield.mui';
+  MUIC_Colorfield: PAnsiChar = 'Colorfield.mui';
 
 // Identifier base (for Zune extensions)
   MUIB_Colorfield = MUIB_ZUNE or $00000800;
@@ -3304,7 +3304,7 @@ const
 // *********************************************************************
 //  Coloradjust
 const
-  MUIC_Coloradjust: PChar = 'Coloradjust.mui';
+  MUIC_Coloradjust: PAnsiChar = 'Coloradjust.mui';
 
 // Identifier base (for Zune extensions)
   MUIB_Coloradjust = MUIB_ZUNE or $00000700;
@@ -3320,12 +3320,12 @@ const
 // *********************************************************************
 //  Mccprefs
 const
-  MUIC_Mccprefs: PChar = 'Mccprefs.mui';
+  MUIC_Mccprefs: PAnsiChar = 'Mccprefs.mui';
 
 // *********************************************************************
 //  Frameadjust
 const
-  MUIC_Frameadjust: PChar = 'Frameadjust.mui';
+  MUIC_Frameadjust: PAnsiChar = 'Frameadjust.mui';
 
 // Identifier base (for Zune extensions)
   MUIB_Frameadjust = MUIB_ZUNE or $00000d00;
@@ -3336,7 +3336,7 @@ const
 // *********************************************************************
 //  Framedisplay
 const
-  MUIC_Framedisplay: PChar = 'Framedisplay.mui';
+  MUIC_Framedisplay: PAnsiChar = 'Framedisplay.mui';
 
 // Identifier base (for Zune extensions)
   MUIB_Framedisplay = MUIB_ZUNE or $00000e00;
@@ -3347,7 +3347,7 @@ const
 // *********************************************************************
 //  Popframe
 const
-  MUIC_Popframe: PChar = 'Popframe.mui';
+  MUIC_Popframe: PAnsiChar = 'Popframe.mui';
 
 // Identifier base (for Zune extensions)
   MUIB_Popframe = MUIB_ZUNE or $00002200;
@@ -3355,7 +3355,7 @@ const
 // *********************************************************************
 //  Volumelist
 const
-  MUIC_Volumelist: PChar = 'Volumelist.mui';
+  MUIC_Volumelist: PAnsiChar = 'Volumelist.mui';
 
 // Identifier base (for Zune extensions)
   MUIB_Volumelist = MUIB_ZUNE or $1600;
@@ -3363,7 +3363,7 @@ const
 // *********************************************************************
 //  Dirlist
 const
-  MUIC_Dirlist: PChar = 'Dirlist.mui';
+  MUIC_Dirlist: PAnsiChar = 'Dirlist.mui';
 
 // Identifer base (for Zune extensions)
   MUIB_Dirlist = MUIB_ZUNE or $00001800;
@@ -3412,24 +3412,24 @@ const
 // *********************************************************************
 //  Numericbutton
 const
-  MUIC_Numericbutton: PChar = 'Numericbutton.mui';
+  MUIC_Numericbutton: PAnsiChar = 'Numericbutton.mui';
 
 // *********************************************************************
 //  Poplist
 const
-  MUIC_Poplist: PChar = 'Poplist.mui';
+  MUIC_Poplist: PAnsiChar = 'Poplist.mui';
 
 // Identifier base (for Zune extensions)
   MUIB_Poplist = MUIB_ZUNE or $00002500;
 
 // Attributes
 const
-  MUIA_Poplist_Array = MUIB_MUI or $42084c; // V8  i.. PPChar
+  MUIA_Poplist_Array = MUIB_MUI or $42084c; // V8  i.. PPAnsiChar
 
 // *********************************************************************
 //  Popscreen
 const
-  MUIC_Popscreen: PChar = 'Popscreen.mui';
+  MUIC_Popscreen: PAnsiChar = 'Popscreen.mui';
 
 // Identifier base (for Zune extensions)
   MUIB_Popscreen = MUIB_ZUNE or $00002600;
@@ -3437,12 +3437,12 @@ const
 // *********************************************************************
 //  Crawling
 const
-  MUIC_Crawling: PChar = 'Crawling.mui';
+  MUIC_Crawling: PAnsiChar = 'Crawling.mui';
 
 // *********************************************************************
 //  Levelmeter
 const
-  MUIC_Levelmeter: PChar = 'Levelmeter.mui';
+  MUIC_Levelmeter: PAnsiChar = 'Levelmeter.mui';
 
 // Attributes
 const
@@ -3451,12 +3451,12 @@ const
 // *********************************************************************
 //  Knob
 const
-  MUIC_Knob: PChar = 'Knob.mui';
+  MUIC_Knob: PAnsiChar = 'Knob.mui';
 
 // *********************************************************************
 //  Dtpic
 const
-  MUIC_Dtpic: PChar = 'Dtpic.mui';
+  MUIC_Dtpic: PAnsiChar = 'Dtpic.mui';
 
 // Identifier base (for Zune extensions)
   MUIB_Palette = MUIB_ZUNE or $00008a00;
@@ -3472,23 +3472,23 @@ const
 // *********************************************************************
 //  Palette
 const
-  MUIC_Palette: PChar = 'Palette.mui';
+  MUIC_Palette: PAnsiChar = 'Palette.mui';
 
 // Attributes
 const
   MUIA_Palette_Entries   = $8042a3d8;{ V6  i.g struct MUI_Palette_Entry    }
   MUIA_Palette_Groupable = $80423e67;{ V6  isg BOOL               }
-  MUIA_Palette_Names     = $8042c3a2;{ V6  isg char               }
+  MUIA_Palette_Names     = $8042c3a2;{ V6  isg AnsiChar               }
 
 // *********************************************************************
 //  Title
 const
-  MUIC_Title: PChar = 'Title.mui';
+  MUIC_Title: PAnsiChar = 'Title.mui';
 
 // *********************************************************************
 //  Process
 const
-  MUIC_Process: PChar = 'Process.mui';
+  MUIC_Process: PAnsiChar = 'Process.mui';
 
 // Methods
   MUIM_Process_Kill    = MUIB_MUI or $4264cf; // V20
@@ -3530,7 +3530,7 @@ const
 // *********************************************************************
 //  Pixmap
 const
-  MUIC_Pixmap: PChar = 'Pixmap.mui';
+  MUIC_Pixmap: PAnsiChar = 'Pixmap.mui';
 
 // Identifier base (for Zune extensions)
   MUIB_Pixmap = MUIB_ZUNE or $00003600;
@@ -3573,7 +3573,7 @@ const
 // *********************************************************************
 //  Gadget
 const
-  MUIC_Gadget: PChar = 'Gadget.mui';
+  MUIC_Gadget: PAnsiChar = 'Gadget.mui';
 
 // Attributes
 const
@@ -3582,12 +3582,12 @@ const
 // *********************************************************************
 //  Applist
 const
-  MUIC_Applist: PChar = 'Applist.mui';
+  MUIC_Applist: PAnsiChar = 'Applist.mui';
 
 // *********************************************************************
 //  Cclist
 const
-  MUIC_Cclist: PChar = 'Cclist.mui';
+  MUIC_Cclist: PAnsiChar = 'Cclist.mui';
 
 type
 // Instance data of notify class
@@ -3800,8 +3800,8 @@ function MUIV_Window_Width_Screen(p: LongInt): LongInt;
 function MUI_AllocAslRequestTags(ReqTyp: Longword; const Tags: array of PtrUInt): Pointer;
 function MUI_AslRequestTags(req: Pointer; const Tags : array of PtrUInt): LongBool;
 function MUI_MakeObject(_Type: LongInt; const Params : array of PtrUInt): PObject_;
-function MUI_NewObject(a0arg: PChar; const Tags: array of PtrUInt): PObject_;
-function MUI_Request(App: Pointer; win: Pointer; Flags: LongWord; Title: PChar; Gadgets: PChar; Format: PChar; const Params: Array Of PtrUInt): LongInt;
+function MUI_NewObject(a0arg: PAnsiChar; const Tags: array of PtrUInt): PObject_;
+function MUI_Request(App: Pointer; win: Pointer; Flags: LongWord; Title: PAnsiChar; Gadgets: PAnsiChar; Format: PAnsiChar; const Params: Array Of PtrUInt): LongInt;
 
 implementation
 
@@ -4089,12 +4089,12 @@ begin
   MUI_MakeObject := MUI_MakeObjectA(_Type, @Params);
 end;
 
-function MUI_NewObject(a0arg: PChar; const Tags: array of PtrUInt): PObject_; inline;
+function MUI_NewObject(a0arg: PAnsiChar; const Tags: array of PtrUInt): PObject_; inline;
 begin
   MUI_NewObject := MUI_NewObjectA(a0arg , @Tags);
 end;
 
-function MUI_Request(App: Pointer; win: Pointer; Flags: LongWord; Title: PChar; Gadgets: PChar; Format: PChar; const Params: Array Of PtrUInt): LongInt;
+function MUI_Request(App: Pointer; win: Pointer; Flags: LongWord; Title: PAnsiChar; Gadgets: PAnsiChar; Format: PAnsiChar; const Params: Array Of PtrUInt): LongInt;
 begin
   MUI_Request := MUI_RequestA(App, Win, Flags, Title, Gadgets, Format, @Params);
 end;

+ 2 - 2
packages/os4units/src/picasso96api.pas

@@ -23,7 +23,7 @@ uses
 //  (C) Copyright 1996-98 Alexander Kneer & Tobias Abt
 //      All Rights Reserved.
 const
-  PICASSO96APINAME: PChar = 'Picasso96API.library';
+  PICASSO96APINAME: PAnsiChar = 'Picasso96API.library';
 
 // Types for RGBFormat used
 type
@@ -193,7 +193,7 @@ type
   PP96Mode = ^TP96Mode;
   TP96Mode = record
     Node: TNode;
-    Description: array[0..MODENAMELENGTH - 1] of Char;
+    Description: array[0..MODENAMELENGTH - 1] of AnsiChar;
     Width: Word;
     Height: Word;
     Depth: Word;

+ 2 - 2
packages/os4units/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
 

+ 1 - 1
packages/os4units/src/timer.pas

@@ -31,7 +31,7 @@ const
   UNIT_WAITECLOCK = 4; // wait until a certain point of time (in EClock ticks)
   UNIT_ENTROPY    = 5; // Read entropy data
 
-  TIMERNAME : PChar   = 'timer.device';
+  TIMERNAME : PAnsiChar   = 'timer.device';
 
 type
   PTimeVal = ^TTimeVal;

+ 7 - 7
packages/os4units/src/utility.pas

@@ -284,7 +284,7 @@ procedure DeleteSplayTree(SplayTree: PSplayTree); syscall IUtility 216;
 function FindSplayNode(SplayTree: PSplayTree; Key: APTR): PSplayTree; syscall IUtility 220;
 function InsertSplayNode(SplayTree: PSplayTree; Key: APTR; DateSize: LongWord): PSplayTree; syscall IUtility 224;
 function RemoveSplayNode(SplayTree: PSplayTree; Key: APTR): PSplayTree; syscall IUtility 228;
-function FindNameNC(List: PList; const Name: PChar): PNode; syscall IUtility 232;
+function FindNameNC(List: PList; const Name: PAnsiChar): PNode; syscall IUtility 232;
 function GetUniqueID : LongWord; syscall IUtility 236;
 procedure MessageDigest_SHA_Final(SHAs: PMessageDigest_SHA); syscall IUtility 240;
 procedure MessageDigest_SHA_Init(SHAs: PMessageDigest_SHA); syscall IUtility 244;
@@ -297,8 +297,8 @@ function Stricmp(const S1: STRPTR; const S2: STRPTR): LongInt; syscall IUtility
 function Strlcpy(Dst: STRPTR; const Src: STRPTR; Size: LongInt): LongInt; syscall IUtility 272;
 function Strlcat(Dst: STRPTR; const Src: STRPTR; Size: LongInt): LongInt; syscall IUtility 276;
 function Strnicmp(const S1: STRPTR; const S2: STRPTR; n: LongInt): LongInt; syscall IUtility 280;
-function ToLower(c: Char): LongWord; syscall IUtility 284;
-function ToUpper(c: Char): LongWord; syscall IUtility 288;
+function ToLower(c: AnsiChar): LongWord; syscall IUtility 284;
+function ToUpper(c: AnsiChar): LongWord; syscall IUtility 288;
 function VASPrintf(const Fmt: STRPTR; Args: APTR): STRPTR; syscall IUtility 292;
 // 296 ASPrintf
 function VSNPrintf(Buffer: STRPTR; BufferSize: LongInt; const Fmt: STRPTR; Args: APTR): STRPTR; syscall IUtility 300;
@@ -323,12 +323,12 @@ function AllocNamedObject(Name: STRPTR; const Tags: array of PtrUInt): PNamedObj
 function CallHook(Hook: PHook; Obj: APTR; Params: array of PtrUInt): LongWord; 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 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;
 
@@ -349,7 +349,7 @@ begin
   TAG_:=PtrUInt(value);
 end;
 
-function TAG_(value: PChar): PtrUInt; inline;
+function TAG_(value: PAnsiChar): PtrUInt; inline;
 begin
   TAG_:=PtrUInt(value);
 end;
@@ -372,7 +372,7 @@ begin
   AsTag:=PtrUInt(value);
 end;
 
-function AsTag(value: PChar): PtrUInt; inline;
+function AsTag(value: PAnsiChar): PtrUInt; inline;
 begin
   AsTag:=PtrUInt(value);
 end;

+ 7 - 7
packages/os4units/src/workbench.pas

@@ -27,7 +27,7 @@ type
   PWBArg = ^TWBArg;
   TWBArg = record
     wa_Lock: BPTR;       // A lock descriptor.
-    wa_Name: PChar;      // A string relative to that lock.
+    wa_Name: PAnsiChar;      // A string relative to that lock.
   end;
 
 // ###### <freepascal> ######################################################
@@ -43,14 +43,14 @@ type
     sm_Process: PMsgPort;    // The process descriptor for you.
     sm_Segment: BPTR;        // A descriptor for your code.
     sm_NumArgs: LongInt;     // The number of elements in ArgList.
-    sm_ToolWindow: PChar;    // Description of window.
+    sm_ToolWindow: PAnsiChar;    // Description of window.
     sm_ArgList: PWBArgList;  // The arguments themselves
   end;
 
 // ###### workbench/workbench.h #############################################
 
 const
-  WORKBENCHNAME: PChar = 'workbench.library';  // Workbench library name.
+  WORKBENCHNAME: PAnsiChar = 'workbench.library';  // Workbench library name.
 
 type
   POldDrawerData = ^TOldDrawerData;
@@ -97,7 +97,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;
@@ -530,7 +530,7 @@ procedure UpdateWorkbench(const Name: STRPTR; Lock: BPTR; Action: LongInt); sysc
 function AddAppWindowA(ID: LongWord; UserData: LongWord; Window: PWindow; MsgPort: PMsgPort; TagList: PTagItem): PAppWindow;  syscall IWorkbench 88;
 // 92 AddAppWindow
 function RemoveAppWindow(AppWindow: PAppWindow): LongBool;  syscall IWorkbench 96;
-function AddAppIconA(ID: LongWord; UserData: LongWord; Text_: PChar; MsgPort: PMsgPort; Lock: BPTR; DiskObj: PDiskObject; TagList: PTagItem): PAppIcon; syscall IWorkbench 100;
+function AddAppIconA(ID: LongWord; UserData: LongWord; Text_: PAnsiChar; MsgPort: PMsgPort; Lock: BPTR; DiskObj: PDiskObject; TagList: PTagItem): PAppIcon; syscall IWorkbench 100;
 // 104 AddAppIcon
 function RemoveAppIcon(AppIcon: PAppIcon): LongBool; syscall IWorkbench 108;
 function AddAppMenuItemA(ID: LongWord; UserData: LongWord; Text_: APTR; MsgPort: PMsgPort; TagList: PTagItem): PAppMenuItem; syscall IWorkbench 112;
@@ -556,7 +556,7 @@ function WhichWorkbenchObjectA(Window: PWindow; X, Y: LongInt; Tags: PTagItem):
 // 192 private
 
 // varargs versions:
-function AddAppIcon(ID: LongWord; UserData: LongWord; Text_: PChar; MsgPort: PMsgPort; Lock: BPTR; DiskObj: PDiskObject; const Tags: array of PtrUInt): PAppIcon;
+function AddAppIcon(ID: LongWord; UserData: LongWord; Text_: PAnsiChar; MsgPort: PMsgPort; Lock: BPTR; DiskObj: PDiskObject; const Tags: array of PtrUInt): PAppIcon;
 function AddAppMenuItem(ID: LongWord; UserData: LongWord; Text_: APTR; MsgPort: PMsgPort; const Tags: array of PtrUInt): PAppMenuItem;
 function AddAppWindow(ID: LongWord; UserData: LongWord; Window: PWindow; MsgPort: PMsgPort; const Tags: array of PtrUInt): PAppWindow;
 function AddAppWindowDropZone(Aw: PAppWindow; ID: LongWord; UserData: LongWord; const Tags: array of PtrUInt): PAppWindowDropZone;
@@ -569,7 +569,7 @@ implementation
 
 
 // varargs versions:
-function AddAppIcon(ID: LongWord; UserData: LongWord; Text_: PChar; MsgPort: PMsgPort; Lock: BPTR; DiskObj: PDiskObject; const Tags: array of PtrUInt): PAppIcon; inline;
+function AddAppIcon(ID: LongWord; UserData: LongWord; Text_: PAnsiChar; MsgPort: PMsgPort; Lock: BPTR; DiskObj: PDiskObject; const Tags: array of PtrUInt): PAppIcon; inline;
 begin
   AddAppIcon := AddAppIconA(ID, UserData, Text_, MsgPort, Lock, DiskObj, @Tags);
 end;