Browse Source

* PChar -> PAnsiChar

Michaël Van Canneyt 2 years ago
parent
commit
42c0fd5c34

+ 10 - 10
packages/arosunits/src/agraphics.pas

@@ -221,7 +221,7 @@ type
     tf_Style: Byte;       // font style      |    match a font
     tf_Style: Byte;       // font style      |    match a font
     tf_Flags: Byte;       // preferences and flags /    request.
     tf_Flags: Byte;       // preferences and flags /    request.
     tf_XSize: Word;       // nominal font width
     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_BoldSmear: Word;   // smear to affect a bold enhancement
     tf_Accessors: Word;   // access count
     tf_Accessors: Word;   // access count
     tf_LoChar: Byte;      // the first character described here
     tf_LoChar: Byte;      // the first character described here
@@ -286,7 +286,7 @@ const
   CTF_MAPCOLOR  =  1 shl 0; // is a valid color within ctf_Low..ctf_High
   CTF_MAPCOLOR  =  1 shl 0; // is a valid color within ctf_Low..ctf_High
   CT_COLORFONT  =  1 shl 0; // color map contains designer's colors
   CT_COLORFONT  =  1 shl 0; // color map contains designer's colors
   CT_GREYFONT   =  1 shl 1; // color map describes even-stepped brightnesses from low to high
   CT_GREYFONT   =  1 shl 1; // color map describes even-stepped brightnesses from low to high
-  CT_ANTIALIAS  =  1 shl 2; // zero background thru fully saturated char
+  CT_ANTIALIAS  =  1 shl 2; // zero background thru fully saturated AnsiChar
   CT_COLORMASK  =  $000F;   // mask to get to following color styles
   CT_COLORMASK  =  $000F;   // mask to get to following color styles
 
 
 // VSprite flags
 // VSprite flags
@@ -757,7 +757,7 @@ type
     xln_Pred: PNode;
     xln_Pred: PNode;
     xln_Type: Byte;          // NT_GRAPHICS
     xln_Type: Byte;          // NT_GRAPHICS
     xln_Pri: ShortInt;
     xln_Pri: ShortInt;
-    xln_Name: PChar;
+    xln_Name: PAnsiChar;
     xln_Subsystem: Byte;     // see below
     xln_Subsystem: Byte;     // see below
     xln_Subtype: Byte;       // SS_GRAPHICS
     xln_Subtype: Byte;       // SS_GRAPHICS
     xln_Library : APTR;
     xln_Library : APTR;
@@ -855,10 +855,10 @@ const
   REQUEST_SPECIAL       =  4;
   REQUEST_SPECIAL       =  4;
   REQUEST_A2024         =  8;
   REQUEST_A2024         =  8;
 
 
-  DEFAULT_MONITOR_NAME: PChar = 'default.monitor';
-  NTSC_MONITOR_NAME: PChar    = 'ntsc.monitor';
-  PAL_MONITOR_NAME: PChar     = 'pal.monitor';
-  VGA_MONITOR_NAME: PChar     = 'vga.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';
 
 
   STANDARD_MONITOR_MASK =  REQUEST_NTSC or REQUEST_PAL;
   STANDARD_MONITOR_MASK =  REQUEST_NTSC or REQUEST_PAL;
 
 
@@ -1643,7 +1643,7 @@ type
   PNameInfo = ^TNameInfo;
   PNameInfo = ^TNameInfo;
   TNameInfo = record
   TNameInfo = record
     Header: TQueryHeader;
     Header: TQueryHeader;
-    Name: array[0..DISPLAYNAMELEN - 1] of Char;
+    Name: array[0..DISPLAYNAMELEN - 1] of AnsiChar;
     Reserved: array[0..1] of IPTR; // terminator
     Reserved: array[0..1] of IPTR; // terminator
   end;
   end;
 
 
@@ -2033,7 +2033,7 @@ const
 { GfxFlags (private) }
 { GfxFlags (private) }
   NEW_DATABASE   = 1;
   NEW_DATABASE   = 1;
 
 
-  GRAPHICSNAME: PChar  = 'graphics.library';
+  GRAPHICSNAME: PAnsiChar  = 'graphics.library';
 
 
 var
 var
   GfxBase: PGfxBase;
   GfxBase: PGfxBase;
@@ -2156,7 +2156,7 @@ function OpenMonitor(MonitorName: STRPTR; DisplayID: LongWord): PMonitorSpec; sy
 function CloseMonitor(Monitor_Spec: PMonitorSpec): LongInt; syscall GfxBase 120;
 function CloseMonitor(Monitor_Spec: PMonitorSpec): LongInt; syscall GfxBase 120;
 function FindDisplayInfo(ID: LongWord): DisplayInfoHandle; syscall GfxBase 121;
 function FindDisplayInfo(ID: LongWord): DisplayInfoHandle; syscall GfxBase 121;
 function NextDisplayInfo(Last_ID: LongWord): LongWord; syscall GfxBase 122;
 function NextDisplayInfo(Last_ID: LongWord): LongWord; syscall GfxBase 122;
-function GetDisplayInfoData(Handle: DisplayInfoHandle; Buf: PChar; Size: LongWord; TagID: LongWord; ID: LongWord): LongWord; syscall GfxBase 126;
+function GetDisplayInfoData(Handle: DisplayInfoHandle; Buf: PAnsiChar; Size: LongWord; TagID: LongWord; ID: LongWord): LongWord; syscall GfxBase 126;
 procedure FontExtent(Font: PTextFont; FontExtent: PTextExtent); syscall GfxBase 127;
 procedure FontExtent(Font: PTextFont; FontExtent: PTextExtent); syscall GfxBase 127;
 function ReadPixelLine8(Rp: PRastPort; xStart, yStart, Width: LongWord; Array_: PByte; TempRP: PRastPort): LongInt; syscall GfxBase 128;
 function ReadPixelLine8(Rp: PRastPort; xStart, yStart, Width: LongWord; Array_: PByte; TempRP: PRastPort): LongInt; syscall GfxBase 128;
 function WritePixelLine8(Rp: PRastPort; xStart, yStart, Width: LongWord; Array_: PByte; TempRP: PRastPort): LongInt; syscall GfxBase 129;
 function WritePixelLine8(Rp: PRastPort; xStart, yStart, Width: LongWord; Array_: PByte; TempRP: PRastPort): LongInt; syscall GfxBase 129;

+ 17 - 17
packages/arosunits/src/amigados.pas

@@ -88,16 +88,16 @@ type
   TFileInfoBlock = record
   TFileInfoBlock = record
     fib_DiskKey: IPTR;
     fib_DiskKey: IPTR;
     fib_DirEntryType: LongInt;                              // type of Directory. If < 0, then a plain file. If > 0 a directory
     fib_DirEntryType: LongInt;                              // type of Directory. If < 0, then a plain file. If > 0 a directory
-    fib_FileName: array [0..MAXFILENAMELENGTH - 1] of Char; // Null terminated. Max 30 chars used for now
+    fib_FileName: array [0..MAXFILENAMELENGTH - 1] of AnsiChar; // Null terminated. Max 30 chars used for now
     fib_Protection: LongInt;                                // bit mask of protection, rwxd are 3-0.
     fib_Protection: LongInt;                                // bit mask of protection, rwxd are 3-0.
     fib_EntryType: LongInt;
     fib_EntryType: LongInt;
     fib_Size: LongInt;                                      // Number of bytes in file
     fib_Size: LongInt;                                      // Number of bytes in file
     fib_NumBlocks: LongInt;                                 // Number of blocks in file
     fib_NumBlocks: LongInt;                                 // Number of blocks in file
     fib_Date: TDateStamp;                                   // Date file last changed
     fib_Date: TDateStamp;                                   // Date file last changed
-    fib_Comment: array [0..MAXCOMMENTLENGTH - 1] of Char;   // Null terminated comment associated with file
+    fib_Comment: array [0..MAXCOMMENTLENGTH - 1] of AnsiChar;   // Null terminated comment associated with file
     fib_OwnerUID: Word;                                     // UserID of fileowner.
     fib_OwnerUID: Word;                                     // UserID of fileowner.
     fib_OwnerGID: Word;                                     // GroupID of fileowner.
     fib_OwnerGID: Word;                                     // GroupID of fileowner.
-    fib_Reserved: array [0..31] of Char;                    // PRIVATE
+    fib_Reserved: array [0..31] of AnsiChar;                    // PRIVATE
   end;
   end;
 
 
 const
 const
@@ -406,7 +406,7 @@ type
     an_Lock: BPTR;      // Lock of this anchor
     an_Lock: BPTR;      // Lock of this anchor
     an_Info: TFileInfoBlock; // fib Discribing this anchor
     an_Info: TFileInfoBlock; // fib Discribing this anchor
     an_Flags: ShortInt;      // se below
     an_Flags: ShortInt;      // se below
-    an_String: array[0..0] of Char;
+    an_String: array[0..0] of AnsiChar;
   end;
   end;
 const
 const
 // an_Flags
 // an_Flags
@@ -438,7 +438,7 @@ type
       ap_Reserved   : Shortint;            // Private
       ap_Reserved   : Shortint;            // Private
       ap_Strlen     : SmallInt;            // Size of ap_Buf (see below). This may be zero.
       ap_Strlen     : SmallInt;            // Size of ap_Buf (see below). This may be zero.
       ap_Info       : TFileInfoBlock;      // describes any files found by matching-functions.
       ap_Info       : TFileInfoBlock;      // describes any files found by matching-functions.
-      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;
   end;
 
 
@@ -786,7 +786,7 @@ type
     seg_Next: BPTR;    // Pointer to next segment.
     seg_Next: BPTR;    // Pointer to next segment.
     seg_UC: LongInt;   // Usage count/type
     seg_UC: LongInt;   // Usage count/type
     seg_Seg: BPTR;     // Actual Segment
     seg_Seg: BPTR;     // Actual Segment
-    seg_Name: array[0..3] of Char;  // actually the first 4 chars of BSTR name }
+    seg_Name: array[0..3] of AnsiChar;  // actually the first 4 chars of BSTR name }
   end;
   end;
 
 
 const
 const
@@ -1006,7 +1006,7 @@ type
   PExAllData = ^TExAllData;
   PExAllData = ^TExAllData;
   TExAllData = record
   TExAllData = record
     ed_Next: PExAllData;
     ed_Next: PExAllData;
-    ed_Name: PChar;        // Name of the file
+    ed_Name: PAnsiChar;        // Name of the file
     ed_Type: LongInt;      // Type of File
     ed_Type: LongInt;      // Type of File
     ed_Size,               // Size of File
     ed_Size,               // Size of File
     ed_Prot,               // Protection Bits
     ed_Prot,               // Protection Bits
@@ -1016,7 +1016,7 @@ type
     ed_Mins,
     ed_Mins,
     ed_Ticks    : ULONG;
     ed_Ticks    : ULONG;
 
 
-    ed_Comment: PChar;     // The file comment
+    ed_Comment: PAnsiChar;     // The file comment
     ed_OwnerUID,           // The owner ID
     ed_OwnerUID,           // The owner ID
     ed_OwnerGID : Word;    // the group-owner ID
     ed_OwnerGID : Word;    // the group-owner ID
   end;
   end;
@@ -1046,7 +1046,7 @@ type
   TExAllControl = record
   TExAllControl = record
     eac_Entries: ULONG;     // number of entries returned in buffer
     eac_Entries: ULONG;     // number of entries returned in buffer
     eac_LastKey: IPTR;      // Don't touch inbetween linked ExAll calls!
     eac_LastKey: IPTR;      // Don't touch inbetween linked ExAll calls!
-    eac_MatchString: PChar; // wildcard string for pattern match OR nil
+    eac_MatchString: PAnsiChar; // wildcard string for pattern match OR nil
     eac_MatchFunc: PHook;   // optional private wildcard FUNCTION
     eac_MatchFunc: PHook;   // optional private wildcard FUNCTION
   end;
   end;
 
 
@@ -1257,7 +1257,7 @@ type
 // This structure emulates an input stream by using a buffer.
 // This structure emulates an input stream by using a buffer.
   PCSource = ^TCSource;
   PCSource = ^TCSource;
   TCSource = record
   TCSource = record
-    CS_Buffer: PChar;   // The buffer, which contains the stream. In most cases this may be nil,
+    CS_Buffer: PAnsiChar;   // The buffer, which contains the stream. In most cases this may be nil,
                         // in which case the current input stream is used.
                         // in which case the current input stream is used.
     CS_Length,
     CS_Length,
     CS_CurChr: LongInt;
     CS_CurChr: LongInt;
@@ -1300,9 +1300,9 @@ type
         {The next two fields allow an application to supply a buffer to be parsed
         {The next two fields allow an application to supply a buffer to be parsed
        to ReadArgs(). If either of these fields is 0, ReadArgs() allocates this
        to ReadArgs(). If either of these fields is 0, ReadArgs() allocates this
        buffer itself.}
        buffer itself.}
-    RDA_Buffer: PChar;       // Pointer to buffer. May be nil.
+    RDA_Buffer: PAnsiChar;       // Pointer to buffer. May be nil.
     RDA_BufSiz: LongInt;     // Size of the supplied RDA_Buffer. May be 0.
     RDA_BufSiz: LongInt;     // Size of the supplied RDA_Buffer. May be 0.
-    RDA_ExtHelp: PChar;      // Additional help, if user requests it, by supplying '?' as argument.
+    RDA_ExtHelp: PAnsiChar;      // Additional help, if user requests it, by supplying '?' as argument.
     RDA_Flags: LongInt;      // Flags for any required control (RDAF_?)
     RDA_Flags: LongInt;      // Flags for any required control (RDAF_?)
   end;
   end;
 
 
@@ -1531,7 +1531,7 @@ type
 // Reads from a filehandle into a buffer.
 // Reads from a filehandle into a buffer.
   PIFS_READ_WRITE = ^TIFS_READ_WRITE;
   PIFS_READ_WRITE = ^TIFS_READ_WRITE;
   TIFS_READ_WRITE = record
   TIFS_READ_WRITE = record
-    io_Buffer: PChar;    // The buffer for the data to read/write.
+    io_Buffer: PAnsiChar;    // The buffer for the data to read/write.
     io_Length: LongInt;  // The length of the buffer. This is filled by the filesystem handler
     io_Length: LongInt;  // The length of the buffer. This is filled by the filesystem handler
   end;                   // with the number of bytes actually read/written.
   end;                   // with the number of bytes actually read/written.
 // This action does exactly the same as the function Seek().
 // This action does exactly the same as the function Seek().
@@ -1714,7 +1714,7 @@ type
   end;
   end;
   PIFS_PARENT_DIR = ^TIFS_PARENT_DIR;
   PIFS_PARENT_DIR = ^TIFS_PARENT_DIR;
   TIFS_PARENT_DIR = record
   TIFS_PARENT_DIR = record
-    io_DirName: PChar; // This will contain the return value of the parent directory, or
+    io_DirName: PAnsiChar; // This will contain the return value of the parent directory, or
   end;                 // nil if we are at the root directory already
   end;                 // nil if we are at the root directory already
 // Allows us to change a console between raw and cooked mode.
 // Allows us to change a console between raw and cooked mode.
   PIFS_CONSOLE_MODE = ^TIFS_CONSOLE_MODE;
   PIFS_CONSOLE_MODE = ^TIFS_CONSOLE_MODE;
@@ -2158,7 +2158,7 @@ type
 
 
   TAttrs_Section = record
   TAttrs_Section = record
     Size:   LongWord;
     Size:   LongWord;
-    Vendor: array[0..0] of char;   // NULL-terminated name
+    Vendor: array[0..0] of AnsiChar;   // NULL-terminated name
   end;                             // Vendor-specific subsections follow
   end;                             // Vendor-specific subsections follow
 
 
   TAttrs_SubSection = packed record
   TAttrs_SubSection = packed record
@@ -2350,7 +2350,7 @@ function PathPart(const Path: STRPTR): STRPTR; syscall AOS_DOSBase 146;
 function AddPart(DirName: STRPTR; const FileName: STRPTR; Size: LongWord): LongBool; syscall AOS_DOSBase 147;
 function AddPart(DirName: STRPTR; const FileName: STRPTR; Size: LongWord): LongBool; syscall AOS_DOSBase 147;
 function StartNotify(Notify: PNotifyRequest): LongBool; syscall AOS_DOSBase 148;
 function StartNotify(Notify: PNotifyRequest): LongBool; syscall AOS_DOSBase 148;
 procedure EndNotify(Notify: PNotifyRequest); syscall AOS_DOSBase 149;
 procedure EndNotify(Notify: PNotifyRequest); syscall AOS_DOSBase 149;
-function SetVar(const Name: STRPTR; Buffer: PChar; Size: LongInt; Flags: LongInt): LongBool;  syscall AOS_DOSBase 150;
+function SetVar(const Name: STRPTR; Buffer: PAnsiChar; Size: LongInt; Flags: LongInt): LongBool;  syscall AOS_DOSBase 150;
 function GetVar(const Name: STRPTR; Buffer: STRPTR; Size: LongInt; Flags: LongInt): LongInt; syscall AOS_DOSBase 151;
 function GetVar(const Name: STRPTR; Buffer: STRPTR; Size: LongInt; Flags: LongInt): LongInt; syscall AOS_DOSBase 151;
 function DeleteVar(const Name: STRPTR; Flags: LongWord): LongBool; syscall AOS_DOSBase 152;
 function DeleteVar(const Name: STRPTR; Flags: LongWord): LongBool; syscall AOS_DOSBase 152;
 function FindVar(const Name: STRPTR; Type_: LongWord): PLocalVar; syscall AOS_DOSBase 153;
 function FindVar(const Name: STRPTR; Type_: LongWord): PLocalVar; syscall AOS_DOSBase 153;
@@ -2369,7 +2369,7 @@ function SetOwner(const Name: STRPTR; Owner_Info: LongWord): LongBool; syscall A
 function ScanVars(Hook: PHook; Flags: LongWord; UserData: APTR): LongInt; syscall AOS_DOSBase 167;
 function ScanVars(Hook: PHook; Flags: LongWord; UserData: APTR): LongInt; syscall AOS_DOSBase 167;
 
 
 {$ifdef AROS_ABIv0}
 {$ifdef AROS_ABIv0}
-function RunHandler(DevNode: PDeviceNode; Path: PChar): PMsgPort; syscall AOS_DOSBase 27;
+function RunHandler(DevNode: PDeviceNode; Path: PAnsiChar): PMsgPort; syscall AOS_DOSBase 27;
 function DosError(): BPTR; syscall AOS_DOSBase 142;
 function DosError(): BPTR; syscall AOS_DOSBase 142;
 function SelectError(Fh: BPTR): BPTR; syscall AOS_DOSBase 144;
 function SelectError(Fh: BPTR): BPTR; syscall AOS_DOSBase 144;
 function Pipe(const Name: STRPTR; var Reader: BPTR; var Writer: BPTR): LongInt; syscall AOS_DOSBase 160;
 function Pipe(const Name: STRPTR; var Reader: BPTR; var Writer: BPTR): LongInt; syscall AOS_DOSBase 160;

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

@@ -21,7 +21,7 @@ uses
   exec, utility, workbench, agraphics;
   exec, utility, workbench, agraphics;
 
 
 const
 const
-  ASLNAME: PChar = 'asl.library';
+  ASLNAME: PAnsiChar = 'asl.library';
   ASL_TB = TAG_USER + $80000;
   ASL_TB = TAG_USER + $80000;
 
 
 // Types of requesters known to ASL, used as arguments to AllocAslRequest()
 // Types of requesters known to ASL, used as arguments to AllocAslRequest()
@@ -368,7 +368,7 @@ const
   defaults for the window size and the file requester sort order. The name
   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
   of the semaphore is given below; it exists only with asl.library V45 and
   IPrefs V45 and beyond.}
   IPrefs V45 and beyond.}
-  ASL_SEMAPHORE_NAME: PChar = 'asl.library';
+  ASL_SEMAPHORE_NAME: PAnsiChar = 'asl.library';
 
 
 type
 type
   PASLSemaphore = ^TASLSemaphore;
   PASLSemaphore = ^TASLSemaphore;

+ 1 - 1
packages/arosunits/src/clipboard.pas

@@ -91,7 +91,7 @@ var
   Iff: PIffHandle;
   Iff: PIffHandle;
   Error: LongInt;
   Error: LongInt;
   Cn: PContextNode;
   Cn: PContextNode;
-  Buf: PChar;
+  Buf: PAnsiChar;
   Len: Integer;
   Len: Integer;
   Cu: LongInt;
   Cu: LongInt;
 begin
 begin

+ 4 - 4
packages/arosunits/src/commodities.pas

@@ -128,9 +128,9 @@ type
   PBrokerCopy = ^TBrokerCopy;
   PBrokerCopy = ^TBrokerCopy;
   TBrokerCopy = record
   TBrokerCopy = record
     bc_Node: TNode;
     bc_Node: TNode;
-    bc_Name: array[0..CBD_NAMELEN - 1] of Char;
-    bc_Title: array[0..CBD_TITLELEN - 1] of Char;
-    bc_Descr: array[0..CBD_DESCRLEN - 1] of Char;
+    bc_Name: array[0..CBD_NAMELEN - 1] of AnsiChar;
+    bc_Title: array[0..CBD_TITLELEN - 1] of AnsiChar;
+    bc_Descr: array[0..CBD_DESCRLEN - 1] of AnsiChar;
     bc_Task: PTask;     // Private, do not use this
     bc_Task: PTask;     // Private, do not use this
     bc_Port: PMsgPort;  // Private, do not use this
     bc_Port: PMsgPort;  // Private, do not use this
     bc_Dummy: Word;
     bc_Dummy: Word;
@@ -141,7 +141,7 @@ var
  CxBase: PLibrary = nil;
  CxBase: PLibrary = nil;
 
 
 const
 const
-    COMMODITIESNAME: PChar = 'commodities.library';
+    COMMODITIESNAME: PAnsiChar = 'commodities.library';
 
 
 function CreateCxObj(Typ: LongWord; Arg1: IPTR; Arg2: IPTR): PCxObj; syscall CxBase 5;
 function CreateCxObj(Typ: LongWord; Arg1: IPTR; Arg2: IPTR): PCxObj; syscall CxBase 5;
 function CxBroker(Nb: PNewBroker; var Error: LongInt): PCxObj; syscall CxBase 6;
 function CxBroker(Nb: PNewBroker; var Error: LongInt): PCxObj; syscall CxBase 6;

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

@@ -113,7 +113,7 @@ var
   ConsoleDevice: PDevice = nil;
   ConsoleDevice: PDevice = nil;
 
 
 function CDInputHandler(Events: PInputEvent; CDIhData: APTR): PInputEvent; syscall ConsoleDevice 7;
 function CDInputHandler(Events: PInputEvent; CDIhData: APTR): PInputEvent; syscall ConsoleDevice 7;
-function RawKeyConvert(Events: PInputEvent; Buffer: PChar; Length: LongInt; KeyMap: PKeyMap): LongInt; syscall ConsoleDevice 8;
+function RawKeyConvert(Events: PInputEvent; Buffer: PAnsiChar; Length: LongInt; KeyMap: PKeyMap): LongInt; syscall ConsoleDevice 8;
 function GetConSnip(): APTR; syscall ConsoleDevice 84;
 function GetConSnip(): APTR; syscall ConsoleDevice 84;
 function SetConSnip(Param: APTR): LongInt; syscall ConsoleDevice 88;
 function SetConSnip(Param: APTR): LongInt; syscall ConsoleDevice 88;
 procedure AddConSnipHook(Hook: PHook); syscall ConsoleDevice 92;
 procedure AddConSnipHook(Hook: PHook); syscall ConsoleDevice 92;

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

@@ -69,7 +69,7 @@ type
    PCyberModeNode = ^TCyberModeNode;
    PCyberModeNode = ^TCyberModeNode;
    TCyberModeNode = record
    TCyberModeNode = record
      Node: TNode;
      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
      DisplayID: ULONG;                               // display id associated with the node
      Width: UWORD;                                   // visible width
      Width: UWORD;                                   // visible width
      Height: UWORD;                                  // visible height
      Height: UWORD;                                  // visible height

+ 6 - 6
packages/arosunits/src/diskfont.pas

@@ -25,7 +25,7 @@ const
 type
 type
   PFontContents = ^TFontContents;
   PFontContents = ^TFontContents;
   TFontContents = record
   TFontContents = record
-    fc_FileName: array[0..MAXFONTPATH - 1] of Char;
+    fc_FileName: array[0..MAXFONTPATH - 1] of AnsiChar;
     fc_YSize: Word;
     fc_YSize: Word;
     fc_Style: Byte;
     fc_Style: Byte;
     fc_Flags: Byte;
     fc_Flags: Byte;
@@ -33,7 +33,7 @@ type
 
 
   PTFontContents = ^TTFontContents;
   PTFontContents = ^TTFontContents;
   TTFontContents = record
   TTFontContents = record
-    tfc_FileName: array[0..MAXFONTPATH - 3] of Char;
+    tfc_FileName: array[0..MAXFONTPATH - 3] of AnsiChar;
     tfc_TagCount: Word;
     tfc_TagCount: Word;
     tfc_YSize: Word;
     tfc_YSize: Word;
     tfc_Style,
     tfc_Style,
@@ -63,7 +63,7 @@ type
     dfh_FileID: Word;
     dfh_FileID: Word;
     dfh_Revision: Word;
     dfh_Revision: Word;
     dfh_Segment: BPTR;
     dfh_Segment: BPTR;
-    dfh_Name: array [0..MAXFONTNAME-1] of Char;
+    dfh_Name: array [0..MAXFONTNAME-1] of AnsiChar;
     dfh_TF: TTextFont;
     dfh_TF: TTextFont;
   end;
   end;
 
 
@@ -98,14 +98,14 @@ type
   end;
   end;
 
 
 const
 const
-  DISKFONTNAME: PChar = 'diskfont.library';
+  DISKFONTNAME: PAnsiChar = 'diskfont.library';
 
 
 var
 var
   DiskfontBase: PLibrary;
   DiskfontBase: PLibrary;
 
 
-function AvailFonts(Buffer: PChar; BufBytes: LongInt; Flags: LongInt): LongInt; syscall DiskfontBase 6;
+function AvailFonts(Buffer: PAnsiChar; BufBytes: LongInt; Flags: LongInt): LongInt; syscall DiskfontBase 6;
 procedure DisposeFontContents(FontContentsHeader: PFontContentsHeader); syscall DiskfontBase 8;
 procedure DisposeFontContents(FontContentsHeader: PFontContentsHeader); syscall DiskfontBase 8;
-function NewFontContents(FontsLock: BPTR; FontName: PChar): PFontContentsHeader; syscall DiskfontBase 7;
+function NewFontContents(FontsLock: BPTR; FontName: PAnsiChar): PFontContentsHeader; syscall DiskfontBase 7;
 function NewScaledDiskFont(SourceFont: PTextFont; DestTextAttr: PTextAttr): PDiskFontHeader; syscall DiskfontBase 9;
 function NewScaledDiskFont(SourceFont: PTextFont; DestTextAttr: PTextAttr): PDiskFontHeader; syscall DiskfontBase 9;
 function OpenDiskFont(TextAttr: PTextAttr): PTextFont; syscall DiskfontBase 5;
 function OpenDiskFont(TextAttr: PTextAttr): PTextFont; syscall DiskfontBase 5;
 //function GetDiskFontCtrl(tagid: LongInt): LongInt;
 //function GetDiskFontCtrl(tagid: LongInt): LongInt;

+ 9 - 9
packages/arosunits/src/exec.pas

@@ -42,8 +42,8 @@ type
   IPTR         = NativeUInt;
   IPTR         = NativeUInt;
   SIPTR        = NativeInt;
   SIPTR        = NativeInt;
   PIPTR        = ^IPTR;
   PIPTR        = ^IPTR;
-  STRPTR       = PChar;
-  CONST_STRPTR = PChar;
+  STRPTR       = PAnsiChar;
+  CONST_STRPTR = PAnsiChar;
   BPTR         = Pointer;
   BPTR         = Pointer;
   BSTR         = Pointer;
   BSTR         = Pointer;
   BOOL         = SmallInt;
   BOOL         = SmallInt;
@@ -1287,7 +1287,7 @@ procedure InitCode(StartClass: ULONG; Version: ULONG); syscall AOS_ExecBase 12;
 procedure InitStruct(const InitTable: APTR; Memory: APTR; Size: ULONG); syscall AOS_ExecBase 13;
 procedure InitStruct(const InitTable: APTR; Memory: APTR; Size: ULONG); syscall AOS_ExecBase 13;
 function MakeLibrary(const FuncInit: APTR; const StructInit: APTR; LibInit: TProcedure; DataSize: ULONG; SegList: ULONG): PLibrary; syscall AOS_ExecBase 14;
 function MakeLibrary(const FuncInit: APTR; const StructInit: APTR; LibInit: TProcedure; DataSize: ULONG; SegList: ULONG): PLibrary; syscall AOS_ExecBase 14;
 procedure MakeFunctions(const Target: APTR; const FunctionArray: CONST_APTR; const FuncDispBase: CONST_APTR); syscall AOS_ExecBase 15;
 procedure MakeFunctions(const Target: APTR; const FunctionArray: CONST_APTR; const FuncDispBase: CONST_APTR); syscall AOS_ExecBase 15;
-function FindResident(const Name: PChar): PResident; syscall AOS_ExecBase 16;
+function FindResident(const Name: PAnsiChar): PResident; syscall AOS_ExecBase 16;
 function InitResident(const Resident_: PResident; SegList: ULONG): PResident; syscall AOS_ExecBase 17;
 function InitResident(const Resident_: PResident; SegList: ULONG): PResident; syscall AOS_ExecBase 17;
 procedure Alert(AlertNum: ULONG); syscall AOS_ExecBase 18;
 procedure Alert(AlertNum: ULONG); syscall AOS_ExecBase 18;
 procedure Debug(Flags: ULONG); syscall AOS_ExecBase 19;
 procedure Debug(Flags: ULONG); syscall AOS_ExecBase 19;
@@ -1317,7 +1317,7 @@ procedure Remove(Node: PNode); syscall AOS_ExecBase 42;
 function RemHead(List: PList): PNode; syscall AOS_ExecBase 43;
 function RemHead(List: PList): PNode; syscall AOS_ExecBase 43;
 function RemTail(List: PList): PNode; syscall AOS_ExecBase 44;
 function RemTail(List: PList): PNode; syscall AOS_ExecBase 44;
 procedure Enqueue(List: PList; Node: PNode); syscall AOS_ExecBase 45;
 procedure Enqueue(List: PList; Node: PNode); syscall AOS_ExecBase 45;
-function FindName(List: PList; const Name: PChar): PNode; syscall AOS_ExecBase 46;
+function FindName(List: PList; const Name: PAnsiChar): PNode; syscall AOS_ExecBase 46;
 function AddTask(Task: PTask; const InitialPC: APTR; const FinalPC: APTR): PTask; syscall AOS_ExecBase 47;  deprecated;
 function AddTask(Task: PTask; const InitialPC: APTR; const FinalPC: APTR): PTask; syscall AOS_ExecBase 47;  deprecated;
 procedure RemTask(Task: PTask); syscall AOS_ExecBase 48;
 procedure RemTask(Task: PTask); syscall AOS_ExecBase 48;
 function FindTask(const Name: STRPTR): PTask; syscall AOS_ExecBase 49;
 function FindTask(const Name: STRPTR): PTask; syscall AOS_ExecBase 49;
@@ -1406,7 +1406,7 @@ function ObtainQuickVector(InterruptCode: APTR): ULONG; syscall AOS_ExecBase 131
 function NewStackSwap(NewStack: PStackSwapStruct; Function_: APTR; Args: PStackSwapArgs): IPTR; syscall AOS_ExecBase 134;
 function NewStackSwap(NewStack: PStackSwapStruct; Function_: APTR; Args: PStackSwapArgs): IPTR; syscall AOS_ExecBase 134;
 function TaggedOpenLibrary(Tag: LongInt): APTR; syscall AOS_ExecBase 135;
 function TaggedOpenLibrary(Tag: LongInt): APTR; syscall AOS_ExecBase 135;
 function ReadGayle: ULONG; syscall AOS_ExecBase 136;
 function ReadGayle: ULONG; syscall AOS_ExecBase 136;
-function VNewRawDoFmt(const FormatString: STRPTR; PutChProc: TProcedure; PutChData: APTR; VaListStream: PChar): STRPTR; syscall AOS_ExecBase 137;
+function VNewRawDoFmt(const FormatString: STRPTR; PutChProc: TProcedure; PutChData: APTR; VaListStream: PAnsiChar): STRPTR; syscall AOS_ExecBase 137;
 function NewCreateTaskA(TagList: PTagItem): APTR; syscall AOS_ExecBase 153;
 function NewCreateTaskA(TagList: PTagItem): APTR; syscall AOS_ExecBase 153;
 function AddResetCallback(ResetCallback: PInterrupt): LongBool; syscall AOS_ExecBase 167;
 function AddResetCallback(ResetCallback: PInterrupt): LongBool; syscall AOS_ExecBase 167;
 procedure RemResetCallback(ResetCallback: PInterrupt); syscall AOS_ExecBase 168;
 procedure RemResetCallback(ResetCallback: PInterrupt); syscall AOS_ExecBase 168;
@@ -1461,8 +1461,8 @@ function GetParentTaskStorageSlot(Id: LongInt): IPTR; syscall AOS_ExecBase 186;
 
 
 function BitMask(no :ShortInt): LongInt;
 function BitMask(no :ShortInt): LongInt;
 // C Macros
 // C Macros
-procedure SetNodeName(Node: PNode; Name: PChar);
-function GetNodeName(Node: PNode): PChar;
+procedure SetNodeName(Node: PNode; Name: PAnsiChar);
+function GetNodeName(Node: PNode): PAnsiChar;
 
 
 procedure NewList(List: PList);
 procedure NewList(List: PList);
 function GetHead(List: PList): PNode; inline;
 function GetHead(List: PList): PNode; inline;
@@ -1501,13 +1501,13 @@ begin
 end;
 end;
 
 
 // C Macros
 // C Macros
-procedure SetNodeName(Node: PNode; Name: PChar); inline;
+procedure SetNodeName(Node: PNode; Name: PAnsiChar); inline;
 begin
 begin
   if Assigned(Node) then
   if Assigned(Node) then
     Node^.ln_Name := Name;
     Node^.ln_Name := Name;
 end;
 end;
 
 
-function GetNodeName(Node: PNode): PChar; inline;
+function GetNodeName(Node: PNode): PAnsiChar; inline;
 begin
 begin
   if Assigned(Node) then
   if Assigned(Node) then
     GetNodeName := Node^.ln_Name;
     GetNodeName := Node^.ln_Name;

+ 1 - 1
packages/arosunits/src/gadtools.pas

@@ -43,7 +43,7 @@ CONST
 
 
  NUM_KINDS     =  14;
  NUM_KINDS     =  14;
 
 
- GADTOOLSNAME   : PChar = 'gadtools.library';
+ GADTOOLSNAME   : PAnsiChar = 'gadtools.library';
 
 
 
 
 {------------------------------------------------------------------------}
 {------------------------------------------------------------------------}

+ 12 - 12
packages/arosunits/src/icon.pas

@@ -22,7 +22,7 @@ uses
 //,datatypes;
 //,datatypes;
 
 
 const
 const
-  ICONNAME    : PChar = 'icon.library';
+  ICONNAME    : PAnsiChar = 'icon.library';
 
 
   ICONA_Dummy = TAG_USER + $9000;  // Start of icon.library tags
   ICONA_Dummy = TAG_USER + $9000;  // Start of icon.library tags
   ICONA_ErrorCode = ICONA_Dummy + 1; // Errorcode (PLongInt)
   ICONA_ErrorCode = ICONA_Dummy + 1; // Errorcode (PLongInt)
@@ -114,7 +114,7 @@ const
 
 
   { Default icon type to retrieve (LongInt) }
   { Default icon type to retrieve (LongInt) }
   ICONGETA_GetDefaultType    = ICONA_Dummy+45;
   ICONGETA_GetDefaultType    = ICONA_Dummy+45;
-  { Retrieve default icon for the given name (PChar) }
+  { Retrieve default icon for the given name (PAnsiChar) }
   ICONGETA_GetDefaultName = ICONA_Dummy + 46;
   ICONGETA_GetDefaultName = ICONA_Dummy + 46;
   { Return a default icon if the requested icon
   { Return a default icon if the requested icon
     file cannot be found (BOOL).}
     file cannot be found (BOOL).}
@@ -127,7 +127,7 @@ const
   ICONGETA_RemapIcon = ICONA_Dummy + 50;
   ICONGETA_RemapIcon = ICONA_Dummy + 50;
   { Generate icon image masks (BOOL).  }
   { Generate icon image masks (BOOL).  }
   ICONGETA_GenerateImageMasks = ICONA_Dummy + 51;
   ICONGETA_GenerateImageMasks = ICONA_Dummy + 51;
-  { Label text to be assigned to the icon (PChar).  }
+  { Label text to be assigned to the icon (PAnsiChar).  }
   ICONGETA_Label = ICONA_Dummy + 52;
   ICONGETA_Label = ICONA_Dummy + 52;
   { Screen to remap the icon to (PScreen).  }
   { Screen to remap the icon to (PScreen).  }
   ICONGETA_Screen = ICONA_Dummy + 69;
   ICONGETA_Screen = ICONA_Dummy + 69;
@@ -138,7 +138,7 @@ const
   ICONPUTA_NotifyWorkbench = ICONA_Dummy + 53;
   ICONPUTA_NotifyWorkbench = ICONA_Dummy + 53;
   { Store icon as the default for this type (LongInt)  }
   { Store icon as the default for this type (LongInt)  }
   ICONPUTA_PutDefaultType = ICONA_Dummy + 54;
   ICONPUTA_PutDefaultType = ICONA_Dummy + 54;
-  { Store icon as a default for the given name (PChar)  }
+  { Store icon as a default for the given name (PAnsiChar)  }
   ICONPUTA_PutDefaultName = ICONA_Dummy + 55;
   ICONPUTA_PutDefaultName = ICONA_Dummy + 55;
   { When storing a palette mapped icon, don't save the
   { When storing a palette mapped icon, don't save the
        the original planar icon image with the file. Replace
        the original planar icon image with the file. Replace
@@ -219,15 +219,15 @@ var
   IconBase: PLibrary;
   IconBase: PLibrary;
 
 
 function AddFreeList(FreeList: PFreeList; const Mem: APTR; Size: ULONG): BOOL; syscall IconBase 12;
 function AddFreeList(FreeList: PFreeList; const Mem: APTR; Size: ULONG): BOOL; syscall IconBase 12;
-function BumpRevision(NewName: PChar; const OldName: PChar): PChar; syscall IconBase 18;
-function DeleteDiskObject(const Name: PChar): BOOL; syscall IconBase 23;
-function FindToolType(const ToolTypeArray: PPChar; const TypeName: STRPTR): STRPTR; syscall IconBase 16;
+function BumpRevision(NewName: PAnsiChar; const OldName: PAnsiChar): PAnsiChar; syscall IconBase 18;
+function DeleteDiskObject(const Name: PAnsiChar): BOOL; syscall IconBase 23;
+function FindToolType(const ToolTypeArray: PPAnsiChar; const TypeName: STRPTR): STRPTR; syscall IconBase 16;
 procedure FreeDiskObject(DiskObj: PDiskObject); syscall IconBase 15;
 procedure FreeDiskObject(DiskObj: PDiskObject); syscall IconBase 15;
 procedure FreeFreeList(FreeList: PFreeList); syscall IconBase 9;
 procedure FreeFreeList(FreeList: PFreeList); syscall IconBase 9;
 function GetDefDiskObject(Typ: LongInt): PDiskObject; syscall IconBase 20;
 function GetDefDiskObject(Typ: LongInt): PDiskObject; syscall IconBase 20;
 function GetDiskObject(const Name: STRPTR): PDiskObject; syscall IconBase 13;
 function GetDiskObject(const Name: STRPTR): PDiskObject; syscall IconBase 13;
-function GetDiskObjectNew(const Name : PChar): PDiskObject; syscall IconBase 22;
-function MatchToolValue(const TypeString: PChar; const Value: PChar): BOOL; syscall IconBase 17;
+function GetDiskObjectNew(const Name : PAnsiChar): PDiskObject; syscall IconBase 22;
+function MatchToolValue(const TypeString: PAnsiChar; const Value: PAnsiChar): BOOL; syscall IconBase 17;
 function PutDefDiskObject(const Icon: PDiskObject): BOOL; syscall IconBase 21;
 function PutDefDiskObject(const Icon: PDiskObject): BOOL; syscall IconBase 21;
 function PutDiskObject(const Name: STRPTR; const Icon: PDiskObject): BOOL; syscall IconBase 14;
 function PutDiskObject(const Name: STRPTR; const Icon: PDiskObject): BOOL; syscall IconBase 14;
 
 
@@ -236,7 +236,7 @@ function DupDiskObjectA(const Icon: PDiskObject; const Tags: PTagItem): PDiskObj
 function IconControlA(Icon: PDiskObject; const Tags: PTagItem): ULONG;  syscall IconBase 26;
 function IconControlA(Icon: PDiskObject; const Tags: PTagItem): ULONG;  syscall IconBase 26;
 procedure DrawIconStateA(Rp: PRastPort; const Icon: PDiskObject; const Label_: STRPTR;
 procedure DrawIconStateA(Rp: PRastPort; const Icon: PDiskObject; const Label_: STRPTR;
   LeftEdge: LongInt; TopEdge: LongInt; State: ULONG; const Tags: PTagItem);  syscall IconBase 27;
   LeftEdge: LongInt; TopEdge: LongInt; State: ULONG; const Tags: PTagItem);  syscall IconBase 27;
-function GetIconRectangleA(Rp: PRastPort; const Icon: PDiskObject; const Label_: PChar;
+function GetIconRectangleA(Rp: PRastPort; const Icon: PDiskObject; const Label_: PAnsiChar;
   Rect: PRectangle; const Tags: PTagItem): BOOL;  syscall IconBase 28;
   Rect: PRectangle; const Tags: PTagItem): BOOL;  syscall IconBase 28;
 function NewDiskObject(Type_: ULONG): PDiskObject; syscall IconBase 29;
 function NewDiskObject(Type_: ULONG): PDiskObject; syscall IconBase 29;
 function GetIconTagList(const Name: STRPTR; const Tags: PTagItem): PDiskObject; syscall IconBase 30;
 function GetIconTagList(const Name: STRPTR; const Tags: PTagItem): PDiskObject; syscall IconBase 30;
@@ -259,11 +259,11 @@ implementation
 function GetToolTypes(Filename: AnsiString): TToolTypeArray;
 function GetToolTypes(Filename: AnsiString): TToolTypeArray;
 var
 var
   DObj: PDiskObject;
   DObj: PDiskObject;
-  Tooltype: PPChar;
+  Tooltype: PPAnsiChar;
   Idx: Integer;
   Idx: Integer;
 begin
 begin
   SetLength(GetToolTypes, 0);
   SetLength(GetToolTypes, 0);
-  DObj := GetDiskObject(PChar(FileName));
+  DObj := GetDiskObject(PAnsiChar(FileName));
   if not Assigned(Dobj) then
   if not Assigned(Dobj) then
     Exit;
     Exit;
   Tooltype := DObj^.do_Tooltypes;
   Tooltype := DObj^.do_Tooltypes;

+ 2 - 2
packages/arosunits/src/iffparse.pas

@@ -20,7 +20,7 @@ interface
 uses exec, clipboard, utility;
 uses exec, clipboard, utility;
 
 
 const
 const
-    IFFPARSENAME  : PChar = 'iffparse.library';
+    IFFPARSENAME  : PAnsiChar = 'iffparse.library';
 
 
 {
 {
  * Struct associated with an active IFF stream.
  * Struct associated with an active IFF stream.
@@ -228,7 +228,7 @@ procedure FreeIFF(Iff: PIFFHandle);  syscall IFFParseBase 9;
 procedure FreeLocalItem(LocalItem: PLocalContextItem); syscall IFFParseBase 34;
 procedure FreeLocalItem(LocalItem: PLocalContextItem); syscall IFFParseBase 34;
 function GoodID(Id: LongInt): LongInt; syscall IFFParseBase 43;
 function GoodID(Id: LongInt): LongInt; syscall IFFParseBase 43;
 function GoodType(Typ: LongInt): LongInt; syscall IFFParseBase 44;
 function GoodType(Typ: LongInt): LongInt; syscall IFFParseBase 44;
-function IDtoStr(Id: LongInt; Buf: PChar): PChar; syscall IFFParseBase 45;
+function IDtoStr(Id: LongInt; Buf: PAnsiChar): PAnsiChar; syscall IFFParseBase 45;
 procedure InitIFF(Iff: PIFFHandle; Flags: LongInt;const StreamHook: PHook); syscall IFFParseBase 38;
 procedure InitIFF(Iff: PIFFHandle; Flags: LongInt;const StreamHook: PHook); syscall IFFParseBase 38;
 procedure InitIFFasClip(Iff: PIFFHandle); syscall IFFParseBase 40;
 procedure InitIFFasClip(Iff: PIFFHandle); syscall IFFParseBase 40;
 procedure InitIFFasDOS(Iff: PIFFHandle); syscall IFFParseBase 39;
 procedure InitIFFasDOS(Iff: PIFFHandle); syscall IFFParseBase 39;

+ 40 - 40
packages/arosunits/src/intuition.pas

@@ -34,7 +34,7 @@ type
     LeftEdge: SmallInt;    // relative start location for the text
     LeftEdge: SmallInt;    // relative start location for the text
     TopEdge: SmallInt;     // relative start location for the text
     TopEdge: SmallInt;     // relative start location for the text
     ITextFont: PTextAttr;  // if nil, you accept the default
     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
     NextText: PIntuiText;  // continuation to TxWrite another text
   end;
   end;
 
 
@@ -79,7 +79,7 @@ type
     MutualExclude: LongInt; // set bits mean this item excludes that
     MutualExclude: LongInt; // set bits mean this item excludes that
     ItemFill: APTR;         // points to Image, IntuiText, or nil
     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
     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 "->"
     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)
     NextSelect: Word;       // The NextSelect field represents the menu number of next selected item (when user has drag-selected several items)
   end;
   end;
@@ -125,7 +125,7 @@ type
     Width,
     Width,
     Height: SmallInt;     // dimensions of the select box
     Height: SmallInt;     // dimensions of the select box
     Flags: Word;          // see flag definitions below (MENUENABLED, MIDRAWN)
     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
     FirstItem: PMenuItem; // pointer to first in chain
     JazzX,                // these mysteriously-named variables are for internal use only
     JazzX,                // these mysteriously-named variables are for internal use only
     JazzY,
     JazzY,
@@ -212,7 +212,7 @@ const
   GFLG_STRINGEXTEND = 1 shl 10; // this String Gadget has StringExtend
   GFLG_STRINGEXTEND = 1 shl 10; // this String Gadget has StringExtend
   GFLG_IMAGEDISABLE = 1 shl 11; // Gadget's image knows how to do disabled rendering
   GFLG_IMAGEDISABLE = 1 shl 11; // Gadget's image knows how to do disabled rendering
   GFLG_LABELITEXT   = $0000;    // GadgetText points to IntuiText
   GFLG_LABELITEXT   = $0000;    // GadgetText points to IntuiText
-  GFLG_LABELSTRING  = 1 shl 12; // GadgetText points to (PChar)
+  GFLG_LABELSTRING  = 1 shl 12; // GadgetText points to (PAnsiChar)
   GFLG_LABELIMAGE   = 1 shl 13; // GadgetText points to Image (object)
   GFLG_LABELIMAGE   = 1 shl 13; // GadgetText points to Image (object)
   GFLG_LABELMASK    = $3000;
   GFLG_LABELMASK    = $3000;
   GFLG_RELSPECIAL   = 1 shl 14; // custom gadget has special relativity. Gadget box values are absolutes, but can be changed via the GM_LAYOUT method.
   GFLG_RELSPECIAL   = 1 shl 14; // custom gadget has special relativity. Gadget box values are absolutes, but can be changed via the GM_LAYOUT method.
@@ -389,8 +389,8 @@ type
   PStringInfo = ^TStringInfo;
   PStringInfo = ^TStringInfo;
   TStringInfo = record
   TStringInfo = record
     // you initialize these variables, and then Intuition maintains them
     // 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
     BufferPos: SmallInt; // character position in Buffer
     MaxChars: SmallInt;  // max number of chars in Buffer (including #0)
     MaxChars: SmallInt;  // max number of chars in Buffer (including #0)
     DispPos: SmallInt;   // Buffer position of first displayed character
     DispPos: SmallInt;   // Buffer position of first displayed character
@@ -573,7 +573,7 @@ type
 
 
     Flags: LongWord;       // see below for defines
     Flags: LongWord;       // see below for defines
     MenuStrip: PMenu;      // the strip of Menu headers
     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
     FirstRequest: PRequester; // all active Requesters
     DMRequest: PRequester;    // double-click Requester
     DMRequest: PRequester;    // double-click Requester
     ReqCount: SmallInt;    // count of reqs blocking Window
     ReqCount: SmallInt;    // count of reqs blocking Window
@@ -617,7 +617,7 @@ type
     DetailPen,
     DetailPen,
     BlockPen: Byte;       // for bar/border/gadget rendering
     BlockPen: Byte;       // for bar/border/gadget rendering
     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
     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
-    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
     { These variables have the mouse coordinates relative to the
       inner-Window of GIMMEZEROZERO Windows.  This is compared with the
       inner-Window of GIMMEZEROZERO Windows.  This is compared with the
@@ -665,8 +665,8 @@ type
 {$endif}
 {$endif}
 
 
     Flags: Word;          // see definitions below
     Flags: Word;          // see definitions 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
 
 
     // Bar sizes for this Screen and all Window's in this Screen
     // Bar sizes for this Screen and all Window's in this Screen
     BarHeight,
     BarHeight,
@@ -774,7 +774,7 @@ type
     CheckMark: PImage;    { the CheckMark is a pointer to the imagery that will be used when
     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
                              rendering MenuItems of this Window that want to be checkmarked
                              if this is equal to NULL, you'll get the default imagery}
                              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
     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
                              want this Window to open in it.  If so, you pass the Pointer of the
                              Custom Screen structure in this variable.  Otherwise, this variable
                              Custom Screen structure in this variable.  Otherwise, this variable
@@ -827,7 +827,7 @@ type
 
 
     FirstGadget: PGadget;
     FirstGadget: PGadget;
     CheckMark: PImage;
     CheckMark: PImage;
-    Title: PChar;
+    Title: PAnsiChar;
     WScreen: PScreen;
     WScreen: PScreen;
     WBitMap: PBitMap;
     WBitMap: PBitMap;
 
 
@@ -885,7 +885,7 @@ const
   WA_InnerWidth   = WA_Dummy + 19;
   WA_InnerWidth   = WA_Dummy + 19;
   WA_InnerHeight  = WA_Dummy + 20; { You can specify the dimensions of the interior region of your window, independent of what the border widths will be.  You probably want
   WA_InnerHeight  = WA_Dummy + 20; { 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.}
                                      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; // 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; // 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; { open as a visitor window on the public screen whose Pointer is in (PScreen) ti_Data. To ensure that this screen remains open, you
   WA_PubScreen     = WA_Dummy + 22; { open as a visitor window on the public screen whose Pointer is in (PScreen) 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().}
                                       should either be the screen's owner, have a window open on the screen, or use LockPubScreen().}
   WA_PubScreenFallBack = WA_Dummy + 23; { A Boolean, specifies whether a visitor window should "fall back" to the default public screen
   WA_PubScreenFallBack = WA_Dummy + 23; { A Boolean, specifies whether a visitor window should "fall back" to the default public screen
@@ -1068,9 +1068,9 @@ type
   TEasyStruct = record
   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_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_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;
   end;
 
 
 const
 const
@@ -1319,7 +1319,7 @@ type
     SType: Word;            // the Screen type (see defines above) (Type in C-Include)
     SType: Word;            // the Screen type (see defines above) (Type in C-Include)
 
 
     Font: PTextAttr;        // this Screen's default text attributes
     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
     Gadgets: PGadget;       // your own Gadgets for this Screen
 
 
   { if you are opening a CUSTOMSCREEN and already have a BitMap
   { if you are opening a CUSTOMSCREEN and already have a BitMap
@@ -1342,7 +1342,7 @@ type
     ViewModes: Word;
     ViewModes: Word;
     ens_Type: Word;     { type in C-Includes }
     ens_Type: Word;     { type in C-Includes }
     Font: PTextAttr;
     Font: PTextAttr;
-    DefaultTitle: PChar;
+    DefaultTitle: PAnsiChar;
     Gadgets: PGadget;
     Gadgets: PGadget;
     CustomBitMap: PBitMap;
     CustomBitMap: PBitMap;
     Extension: PTagItem; // ExtNewScreen specific extension SA_*
     Extension: PTagItem; // ExtNewScreen specific extension SA_*
@@ -1480,7 +1480,7 @@ type
 
 
   // printer configurations
   // printer configurations
     PrinterType: Word;     // printer type
     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
   // print format and quality configurations
     PrintPitch: Word;         // print pitch
     PrintPitch: Word;         // print pitch
@@ -1506,7 +1506,7 @@ type
 
 
   // temp file for printer
   // temp file for printer
     Pad: array[0..11] of Byte;
     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
     DefaultPrtUnit: Byte; // Default unit opened by printer.device
     DefaultSerUnit: Byte; // Default serial unit
     DefaultSerUnit: Byte; // Default serial unit
@@ -1759,10 +1759,10 @@ const
   POINTERCLASS: ClassID  = 'pointerclass';     // pointerclass.h
   POINTERCLASS: ClassID  = 'pointerclass';     // pointerclass.h
 
 
 // public classes existing only in AROS but not AmigaOS
 // public classes existing only in AROS but not AmigaOS
-  MENUBARLABELCLASS: PChar = 'menubarlabelclass';
-  WINDECORCLASS: PChar     = 'windecorclass';
-  SCRDECORCLASS: PChar     = 'scrdecorclass';
-  MENUDECORCLASS: PChar    = 'menudecorclass';
+  MENUBARLABELCLASS: PAnsiChar = 'menubarlabelclass';
+  WINDECORCLASS: PAnsiChar     = 'windecorclass';
+  SCRDECORCLASS: PAnsiChar     = 'scrdecorclass';
+  MENUDECORCLASS: PAnsiChar    = 'menudecorclass';
 
 
 { Dispatched method ID's
 { Dispatched method ID's
   NOTE: Applications should use Intuition entry points, not direct
   NOTE: Applications should use Intuition entry points, not direct
@@ -1915,7 +1915,7 @@ const
   GA_RelHeight = (GA_Dummy + $0008); // [ISG] (LONG) Height of gadget, depending on window height: Height=Win^.Height-this
   GA_RelHeight = (GA_Dummy + $0008); // [ISG] (LONG) Height of gadget, depending on window height: Height=Win^.Height-this
 
 
 // Gadget rendering
 // Gadget rendering
-  GA_Text         = (GA_Dummy + $0009); // [IS.] (PChar) Label text. This is mutually exclusive with GA_IntuiText and GA_LabelImage.
+  GA_Text         = (GA_Dummy + $0009); // [IS.] (PAnsiChar) Label text. This is mutually exclusive with GA_IntuiText and GA_LabelImage.
   // The next two attributes are mutually exclusive.
   // The next two attributes are mutually exclusive.
   GA_Image        = (GA_Dummy + $000A); // (PImage) Gadget imagry is an image
   GA_Image        = (GA_Dummy + $000A); // (PImage) Gadget imagry is an image
   GA_Border       = (GA_Dummy + $000B); // (PBorder) Gadget imagry is a border
   GA_Border       = (GA_Dummy + $000B); // (PBorder) Gadget imagry is a border
@@ -1972,10 +1972,10 @@ const
      dependent on the size of the window. }
      dependent on the size of the window. }
   GA_TextAttr = GA_Dummy + 40; // [IS.] (PTextAttr) Indicate the font to use for the gadget.
   GA_TextAttr = GA_Dummy + 40; // [IS.] (PTextAttr) Indicate the font to use for the gadget.
   GA_ReadOnly = GA_Dummy + 41; // (LongBool) Indicate that the gadget is read-only (non-selectable). Default = False
   GA_ReadOnly = GA_Dummy + 41; // (LongBool) Indicate that the gadget is read-only (non-selectable). Default = False
-  GA_Underscore = GA_Dummy + 42; // (Char) Underscore/escape character for keyboard shortcuts. Defaults = '_'
-  GA_ActivateKey = GA_Dummy + 43; // (PChar) Set/Get the gadgets shortcut/activation key(s) Default = nil
+  GA_Underscore = GA_Dummy + 42; // (AnsiChar) Underscore/escape character for keyboard shortcuts. Defaults = '_'
+  GA_ActivateKey = GA_Dummy + 43; // (PAnsiChar) Set/Get the gadgets shortcut/activation key(s) Default = nil
   GA_BackFill = GA_Dummy + 44; // (PHook) Backfill pattern hook. 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. Default = nil
+  GA_GadgetHelpText = GA_Dummy + 45; // (PAnsiChar) RESERVERD/PRIVATE DO NOT USE. Default = 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.
   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.
 // Aros Specifics
 // Aros Specifics
   GA_LabelPlace = GA_Dummy + 100; { [I..] (LongInt) Choose the placing of the label. GadgetClass does not support
   GA_LabelPlace = GA_Dummy + 100; { [I..] (LongInt) Choose the placing of the label. GadgetClass does not support
@@ -2464,7 +2464,7 @@ const
   EO_ENTER       = $0005; // "enter" or "return" key, terminate
   EO_ENTER       = $0005; // "enter" or "return" key, terminate
   EO_RESET       = $0006; // current Intuition-style undo
   EO_RESET       = $0006; // current Intuition-style undo
   EO_REPLACECHAR = $0007; // replaced one character and (maybe) advanced cursor
   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_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_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
   EO_UNDO        = $000B; // unused by Intuition  some other style of undo
@@ -2479,7 +2479,7 @@ const
   // These Mode Flags are for internal use only
   // These Mode Flags are for internal use only
   SGM_NOCHANGE   = 1 shl 3; // no edit changes yet
   SGM_NOCHANGE   = 1 shl 3; // no edit changes yet
   SGM_NOWORKB    = 1 shl 4; // Buffer = PrevBuffer
   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
   SGM_LONGINT    = 1 shl 6; // an intuition LongInt gadget
   // String Gadget Action Flags (put in SGWork.Actions by EditHook)
   // String Gadget Action Flags (put in SGWork.Actions by EditHook)
   SGA_USE        = $1;  // use contents of SGWork
   SGA_USE        = $1;  // use contents of SGWork
@@ -3338,7 +3338,7 @@ function CloseScreen(Screen: PScreen): LongBool; syscall IntuitionBase 11;
 procedure CloseWindow(Window: PWindow); syscall IntuitionBase 12;
 procedure CloseWindow(Window: PWindow); syscall IntuitionBase 12;
 function CloseWorkBench: LongInt; syscall IntuitionBase 13;
 function CloseWorkBench: LongInt; syscall IntuitionBase 13;
 procedure CurrentTime(var Seconds: LongWord; var Micros: LongWord); syscall IntuitionBase 14;
 procedure CurrentTime(var Seconds: LongWord; var Micros: LongWord); syscall IntuitionBase 14;
-function DisplayAlert(AlertNumber: LongWord; String_: PChar; Height: Word): LongBool; syscall IntuitionBase 15; deprecated;
+function DisplayAlert(AlertNumber: LongWord; String_: PAnsiChar; Height: Word): LongBool; syscall IntuitionBase 15; deprecated;
 procedure DisplayBeep(Screen: PScreen); syscall IntuitionBase 16;
 procedure DisplayBeep(Screen: PScreen); syscall IntuitionBase 16;
 function DoubleClick(SSeconds: LongWord; SMicros: LongWord; CSeconds: LongWord; CMicros: LongWord): LongBool; syscall IntuitionBase 17;
 function DoubleClick(SSeconds: LongWord; SMicros: LongWord; CSeconds: LongWord; CMicros: LongWord): LongBool; syscall IntuitionBase 17;
 procedure DrawBorder(Rp: PRastPort; Border: PBorder; LeftOffset: LongInt; TopOffset: LongInt); syscall IntuitionBase 18;
 procedure DrawBorder(Rp: PRastPort; Border: PBorder; LeftOffset: LongInt; TopOffset: LongInt); syscall IntuitionBase 18;
@@ -3369,7 +3369,7 @@ procedure ScreenToFront(Screen: PScreen); syscall IntuitionBase 42;
 function SetDMRequest(Window: PWindow; Requester: PRequester): LongBool; syscall IntuitionBase 43;
 function SetDMRequest(Window: PWindow; Requester: PRequester): LongBool; syscall IntuitionBase 43;
 function SetMenuStrip(Window: PWindow; Menu: PMenu): LongBool; syscall IntuitionBase 44;
 function SetMenuStrip(Window: PWindow; Menu: PMenu): LongBool; syscall IntuitionBase 44;
 procedure SetPointer(Window: PWindow; Pointer_: PWord; Height: LongInt; Width: LongInt; XOffset: LongInt; YOffset: LongInt); syscall IntuitionBase 45;
 procedure SetPointer(Window: PWindow; Pointer_: PWord; Height: LongInt; Width: LongInt; XOffset: LongInt; YOffset: LongInt); syscall IntuitionBase 45;
-procedure SetWindowTitles(Window: PWindow; const WindowTitle: PChar; const ScreenTitle: PChar); syscall IntuitionBase 46;
+procedure SetWindowTitles(Window: PWindow; const WindowTitle: PAnsiChar; const ScreenTitle: PAnsiChar); syscall IntuitionBase 46;
 procedure ShowTitle(Screen: PScreen; ShowIt: LongBool); syscall IntuitionBase 47;
 procedure ShowTitle(Screen: PScreen; ShowIt: LongBool); syscall IntuitionBase 47;
 procedure SizeWindow(Window: PWindow; Dx: LongInt; Dy: LongInt); syscall IntuitionBase 48;
 procedure SizeWindow(Window: PWindow; Dx: LongInt; Dy: LongInt); syscall IntuitionBase 48;
 function ViewAddress: PView; syscall IntuitionBase 49;
 function ViewAddress: PView; syscall IntuitionBase 49;
@@ -3409,18 +3409,18 @@ function SetEditHook(Hook: PHook): PHook; syscall IntuitionBase 82;
 function SetMouseQueue(Window: PWindow; QueueLength: LongWord): LongInt; syscall IntuitionBase 83;
 function SetMouseQueue(Window: PWindow; QueueLength: LongWord): LongInt; syscall IntuitionBase 83;
 procedure ZipWindow(Window: PWindow); syscall IntuitionBase 84;
 procedure ZipWindow(Window: PWindow); syscall IntuitionBase 84;
 function LockPubScreen(const Name: STRPTR): PScreen; syscall IntuitionBase 85;
 function LockPubScreen(const Name: STRPTR): PScreen; syscall IntuitionBase 85;
-procedure UnlockPubScreen(Name: PChar; Screen: PScreen); syscall IntuitionBase 86;
+procedure UnlockPubScreen(Name: PAnsiChar; Screen: PScreen); syscall IntuitionBase 86;
 function LockPubScreenList: PList; syscall IntuitionBase 87;
 function LockPubScreenList: PList; syscall IntuitionBase 87;
 procedure UnlockPubScreenList; syscall IntuitionBase 88;
 procedure UnlockPubScreenList; syscall IntuitionBase 88;
-function NextPubScreen(Screen: PScreen; Namebuf: PChar): PChar; syscall IntuitionBase 89;
-procedure SetDefaultPubScreen(Name: PChar); syscall IntuitionBase 90;
+function NextPubScreen(Screen: PScreen; Namebuf: PAnsiChar): PAnsiChar; syscall IntuitionBase 89;
+procedure SetDefaultPubScreen(Name: PAnsiChar); syscall IntuitionBase 90;
 function SetPubScreenModes(Modes: Word): Word; syscall IntuitionBase 91;
 function SetPubScreenModes(Modes: Word): Word; syscall IntuitionBase 91;
 function PubScreenStatus(Screen: PScreen; StatusFlags: Word): Word; syscall IntuitionBase 92;
 function PubScreenStatus(Screen: PScreen; StatusFlags: Word): Word; syscall IntuitionBase 92;
 function ObtainGIRPort(GInfo: PGadgetInfo): PRastPort; syscall IntuitionBase 93;
 function ObtainGIRPort(GInfo: PGadgetInfo): PRastPort; syscall IntuitionBase 93;
 procedure ReleaseGIRPort(Rp: PRastPort); syscall IntuitionBase 94;
 procedure ReleaseGIRPort(Rp: PRastPort); syscall IntuitionBase 94;
 procedure GadgetMouse(Gadget: PGadget; GInfo: PGadgetInfo; var MousePoint: SmallInt); syscall IntuitionBase 95;
 procedure GadgetMouse(Gadget: PGadget; GInfo: PGadgetInfo; var MousePoint: SmallInt); syscall IntuitionBase 95;
 function SetIPrefs(Data: Pointer; Length: LongWord; Typ: LongWord): LongWord; syscall IntuitionBase 96;
 function SetIPrefs(Data: Pointer; Length: LongWord; Typ: LongWord): LongWord; syscall IntuitionBase 96;
-function GetDefaultPubScreen(NameBuffer: PChar): PScreen; syscall IntuitionBase 97;
+function GetDefaultPubScreen(NameBuffer: PAnsiChar): PScreen; syscall IntuitionBase 97;
 function EasyRequestArgs(Window: PWindow; EasyStruct: PEasyStruct; IDCMP_Ptr: PLongWord; Args: APTR): LongInt; syscall IntuitionBase 98;
 function EasyRequestArgs(Window: PWindow; EasyStruct: PEasyStruct; IDCMP_Ptr: PLongWord; Args: APTR): LongInt; syscall IntuitionBase 98;
 function BuildEasyRequestArgs(Window: PWindow; EasyStruct: PEasyStruct; IDCMP: LongWord; Args: APTR): PWindow; syscall IntuitionBase 99;
 function BuildEasyRequestArgs(Window: PWindow; EasyStruct: PEasyStruct; IDCMP: LongWord; Args: APTR): PWindow; syscall IntuitionBase 99;
 function SysReqHandler(Window: PWindow; IDCMPFlagsPtr: PLongWord; WaitInput: LongBool): LongInt; syscall IntuitionBase 100;
 function SysReqHandler(Window: PWindow; IDCMPFlagsPtr: PLongWord; WaitInput: LongBool): LongInt; syscall IntuitionBase 100;
@@ -3429,7 +3429,7 @@ function OpenScreenTagList(NewScreen: PNewScreen; TagList: PTagItem): PScreen; s
 procedure DrawImageState(Rp: PRastPort; Image: PImage; LeftOffset: LongInt; TopOffset: LongInt; state: LongWord; DrawInfo: PDrawInfo); syscall IntuitionBase 103;
 procedure DrawImageState(Rp: PRastPort; Image: PImage; LeftOffset: LongInt; TopOffset: LongInt; state: LongWord; DrawInfo: PDrawInfo); syscall IntuitionBase 103;
 function PointInImage(Point: LongWord; Image: PImage): LongBool; syscall IntuitionBase 104;
 function PointInImage(Point: LongWord; Image: PImage): LongBool; syscall IntuitionBase 104;
 procedure EraseImage(Rp: PRastPort; Image: PImage; LeftOffset: LongInt; TopOffset: LongInt); syscall IntuitionBase 105;
 procedure EraseImage(Rp: PRastPort; Image: PImage; LeftOffset: LongInt; TopOffset: LongInt); syscall IntuitionBase 105;
-function NewObjectA(ClassPtr: PIClass; ClassID: PChar; TagList: PTagItem): APTR; syscall IntuitionBase 106;
+function NewObjectA(ClassPtr: PIClass; ClassID: PAnsiChar; TagList: PTagItem): APTR; syscall IntuitionBase 106;
 procedure DisposeObject(Object_: APTR); syscall IntuitionBase 107;
 procedure DisposeObject(Object_: APTR); syscall IntuitionBase 107;
 function SetAttrsA(Object_: APTR; TagList: PTagItem): IPTR; syscall IntuitionBase 108;
 function SetAttrsA(Object_: APTR; TagList: PTagItem): IPTR; syscall IntuitionBase 108;
 function GetAttr(AttrID: LongWord; Object_: PObject_; StoragePtr: PIPTR): LongWord; overload syscall IntuitionBase 109;
 function GetAttr(AttrID: LongWord; Object_: PObject_; StoragePtr: PIPTR): LongWord; overload syscall IntuitionBase 109;
@@ -3453,7 +3453,7 @@ procedure ScrollWindowRaster(Win: PWindow; Dx: SmallInt; Dy: SmallInt; XMin: Sma
 procedure LendMenus(FromWindow: PWindow; ToWindow: PWindow); syscall IntuitionBase 134;
 procedure LendMenus(FromWindow: PWindow; ToWindow: PWindow); syscall IntuitionBase 134;
 function DoGadgetMethodA(Gad: PGadget; Win: PWindow; Req: PRequester; Msg: TMsg): IPTR; syscall IntuitionBase 135;
 function DoGadgetMethodA(Gad: PGadget; Win: PWindow; Req: PRequester; Msg: TMsg): IPTR; syscall IntuitionBase 135;
 procedure SetWindowPointerA(Win: PWindow; Taglist: PTagItem); syscall IntuitionBase 136;
 procedure SetWindowPointerA(Win: PWindow; Taglist: PTagItem); syscall IntuitionBase 136;
-function TimedDisplayAlert(AlertNumber: LongWord; String_: PChar; Height: Word; Time: LongWord): LongBool; syscall IntuitionBase 137;
+function TimedDisplayAlert(AlertNumber: LongWord; String_: PAnsiChar; Height: Word; Time: LongWord): LongBool; syscall IntuitionBase 137;
 procedure HelpControl(Window: PWindow; Flags: LongWord); syscall IntuitionBase 138;
 procedure HelpControl(Window: PWindow; Flags: LongWord); syscall IntuitionBase 138;
 function IsWindowVisible(Window: PWindow): LongWord; syscall IntuitionBase 139;
 function IsWindowVisible(Window: PWindow): LongWord; syscall IntuitionBase 139;
 procedure ShowWindow(Window: PWindow); syscall IntuitionBase 140;
 procedure ShowWindow(Window: PWindow); syscall IntuitionBase 140;
@@ -3488,7 +3488,7 @@ function GetMonitorList(Tags: PTagItem): PPObject_; syscall IntuitionBase 161;
 
 
 // VarArgs Versions
 // VarArgs Versions
 function SetAttrs(Obj: APTR; const Tags: array of PtrUInt): LongWord;
 function SetAttrs(Obj: APTR; const Tags: array of PtrUInt): LongWord;
-function NewObject(ClassPtr: PIClass; ClassID: PChar; const Tags: array of PtrUInt): APTR;
+function NewObject(ClassPtr: PIClass; ClassID: PAnsiChar; const Tags: array of PtrUInt): APTR;
 function BuildEasyRequest(Window: PWindow; EasyStruct: PEasyStruct; IDCMP: LongWord; const Args: array of PtrUInt): PWindow;
 function BuildEasyRequest(Window: PWindow; EasyStruct: PEasyStruct; IDCMP: LongWord; const Args: array of PtrUInt): PWindow;
 function DoGadgetMethod(Gad: PGadget; Win: PWindow; Req: PRequester; const Args: array of PtrUInt): IPTR;
 function DoGadgetMethod(Gad: PGadget; Win: PWindow; Req: PRequester; const Args: array of PtrUInt): IPTR;
 function EasyRequest(Window: PWindow; EasyStruct: PEasyStruct; IDCMP_Ptr: PLongWord; const Args: array of PtrUInt): LongInt;
 function EasyRequest(Window: PWindow; EasyStruct: PEasyStruct; IDCMP_Ptr: PLongWord; const Args: array of PtrUInt): LongInt;
@@ -3544,7 +3544,7 @@ begin
   SetAttrs := SetAttrsA(Obj, @Tags);
   SetAttrs := SetAttrsA(Obj, @Tags);
 end;
 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
 begin
   NewObject := NewObjectA(ClassPtr, ClassID, @Tags);
   NewObject := NewObjectA(ClassPtr, ClassID, @Tags);
 end;
 end;

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

@@ -88,11 +88,11 @@ Const
 var KeyMapBase : pLibrary;
 var KeyMapBase : pLibrary;
 
 
 const
 const
-    KEYMAPNAME : PChar = 'keymap.library';
+    KEYMAPNAME : PAnsiChar = 'keymap.library';
 
 
 function AskKeyMapDefault : PKeyMap; syscall KeyMapBase 6;
 function AskKeyMapDefault : PKeyMap; syscall KeyMapBase 6;
-function MapANSI(TheString : PChar; Count : LongInt; Buffer : PChar; Length : LongInt; KeyMap : PKeyMap) : LongInt;  syscall KeyMapBase 8;
-function MapRawKey(Event : PInputEvent; Buffer : PChar; Length : LongInt; KeyMap : PKeyMap) : SmallInt;  syscall KeyMapBase 7;
+function MapANSI(TheString : PAnsiChar; Count : LongInt; Buffer : PAnsiChar; Length : LongInt; KeyMap : PKeyMap) : LongInt;  syscall KeyMapBase 8;
+function MapRawKey(Event : PInputEvent; Buffer : PAnsiChar; Length : LongInt; KeyMap : PKeyMap) : SmallInt;  syscall KeyMapBase 7;
 procedure SetKeyMapDefault(KeyMap : PKeyMap);  syscall KeyMapBase 5;
 procedure SetKeyMapDefault(KeyMap : PKeyMap);  syscall KeyMapBase 5;
 
 
 implementation
 implementation

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

@@ -91,7 +91,7 @@ const
   LA_Behind  = TAG_USER + 99 + 103; // ABI_V0 compatibility
   LA_Behind  = TAG_USER + 99 + 103; // ABI_V0 compatibility
   LA_ChildOf = TAG_USER + 99 + 101; // ABI_V0 compatibility
   LA_ChildOf = TAG_USER + 99 + 101; // ABI_V0 compatibility
 
 
-  LAYERSNAME : PChar = 'layers.library';
+  LAYERSNAME : PAnsiChar = 'layers.library';
 
 
 var
 var
   LayersBase : PLibrary;
   LayersBase : PLibrary;

+ 1 - 1
packages/arosunits/src/locale.pas

@@ -210,7 +210,7 @@ var
   LocaleBase: PLocaleBase = nil;
   LocaleBase: PLocaleBase = nil;
 
 
 const
 const
-  LOCALENAME: PChar = 'locale.library';
+  LOCALENAME: PAnsiChar = 'locale.library';
 
 
 procedure CloseCatalog(Catalog: PCatalog); syscall LocaleBase 6;
 procedure CloseCatalog(Catalog: PCatalog); syscall LocaleBase 6;
 procedure CloseLocale(Locale: PLocale); syscall LocaleBase 7;
 procedure CloseLocale(Locale: PLocale); syscall LocaleBase 7;

+ 1 - 1
packages/arosunits/src/longarray.pas

@@ -56,7 +56,7 @@ begin
       vtpchar: ArgList[Offset + i] := IPTR(Args[i].vpchar);
       vtpchar: ArgList[Offset + i] := IPTR(Args[i].vpchar);
       vtchar: ArgList[Offset + i] := IPTR(Args[i].vchar);
       vtchar: ArgList[Offset + i] := IPTR(Args[i].vchar);
       vtpointer: ArgList[Offset + i] := IPTR(Args[i].vpointer);
       vtpointer: ArgList[Offset + i] := IPTR(Args[i].vpointer);
-      vtstring: ArgList[Offset + i] := IPTR(PChar(string(Args[i].vstring^)));
+      vtstring: ArgList[Offset + i] := IPTR(PAnsiChar(string(Args[i].vstring^)));
       vtboolean: ArgList[Offset + i] := IPTR(Byte(Args[i].vboolean));
       vtboolean: ArgList[Offset + i] := IPTR(Byte(Args[i].vboolean));
     end;
     end;
   end;
   end;

+ 110 - 110
packages/arosunits/src/mui.pas

@@ -126,7 +126,7 @@ uses
 
 
 
 
 const
 const
-  MUIMASTER_NAME: PChar = 'muimaster.library';
+  MUIMASTER_NAME: PAnsiChar = 'muimaster.library';
   MUIMASTER_VMIN = 11;
   MUIMASTER_VMIN = 11;
   MUIMASTER_VLATEST = 19;
   MUIMASTER_VLATEST = 19;
 
 
@@ -151,12 +151,12 @@ const
 // Black box specification structures for images, pens, frames
 // Black box specification structures for images, pens, frames
 type
 type
   TMUI_PenSpec = record
   TMUI_PenSpec = record
-    buf: array[0..31] of char;
+    buf: array[0..31] of AnsiChar;
   end;
   end;
   PMUI_PenSpec = ^TMUI_PenSpec;
   PMUI_PenSpec = ^TMUI_PenSpec;
 
 
   TMUI_FrameSpec = record
   TMUI_FrameSpec = record
-    buf: array[0..31] of char;
+    buf: array[0..31] of AnsiChar;
   end;
   end;
   PMUI_FrameSpec = ^TMUI_FrameSpec;
   PMUI_FrameSpec = ^TMUI_FrameSpec;
 
 
@@ -164,13 +164,13 @@ type
 // NOTE: This stuff is only included to allow compilation of the supplied public screen manager for educational purposes. Everything
 // 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.
 //       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
 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
 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_NAME = 32;
   PSD_MAXLEN_TITLE = 128;
   PSD_MAXLEN_TITLE = 128;
   PSD_MAXLEN_FONT = 48;
   PSD_MAXLEN_FONT = 48;
@@ -191,10 +191,10 @@ type
 
 
   TMUI_PubScreenDesc = record
   TMUI_PubScreenDesc = record
     Version: LongInt;
     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;
     DisplayID: LongWord;
 
 
@@ -270,8 +270,8 @@ const
 // ARexx Interface
 // ARexx Interface
 type
 type
   TMUI_Command = record
   TMUI_Command = record
-    mc_Name: PChar;
-    mc_Template: PChar;
+    mc_Name: PAnsiChar;
+    mc_Template: PAnsiChar;
     mc_Parameters: LongInt;
     mc_Parameters: LongInt;
     mc_Hook: PHook;
     mc_Hook: PHook;
     mc_Reserved: array[0..4] of LongInt;
     mc_Reserved: array[0..4] of LongInt;
@@ -602,7 +602,7 @@ const
 // *********************************************************************
 // *********************************************************************
 // Notify
 // Notify
 const
 const
-  MUIC_Notify: PChar = 'Notify.mui';
+  MUIC_Notify: PAnsiChar = 'Notify.mui';
 
 
 // Identifier base (for Zune extensions)
 // Identifier base (for Zune extensions)
   MUIB_Notify = MUIB_ZUNE or $00001d00;
   MUIB_Notify = MUIB_ZUNE or $00001d00;
@@ -754,7 +754,7 @@ type
     {$PUSH}{$IF DEFINED(CPU32)}{$CODEALIGN RECORDMIN=4}{$ELSEIF DEFINED(CPU64)}{$CODEALIGN RECORDMIN=8}{$ENDIF}
     {$PUSH}{$IF DEFINED(CPU32)}{$CODEALIGN RECORDMIN=4}{$ELSEIF DEFINED(CPU64)}{$CODEALIGN RECORDMIN=8}{$ENDIF}
     MethodID: LongWord; // MUIM_SetAsString
     MethodID: LongWord; // MUIM_SetAsString
     attr: LongWord;
     attr: LongWord;
-    format: PChar;
+    format: PAnsiChar;
     val: IPTR;
     val: IPTR;
     pad_align: record end; // properly pad previous field if applicable
     pad_align: record end; // properly pad previous field if applicable
     {$POP}
     {$POP}
@@ -796,8 +796,8 @@ type
   TMUIP_WriteString = record  // record with stacked fields
   TMUIP_WriteString = record  // record with stacked fields
     {$PUSH}{$IF DEFINED(CPU32)}{$CODEALIGN RECORDMIN=4}{$ELSEIF DEFINED(CPU64)}{$CODEALIGN RECORDMIN=8}{$ENDIF}
     {$PUSH}{$IF DEFINED(CPU32)}{$CODEALIGN RECORDMIN=4}{$ELSEIF DEFINED(CPU64)}{$CODEALIGN RECORDMIN=8}{$ENDIF}
     MethodID: LongWord; // MUIM_WriteString
     MethodID: LongWord; // MUIM_WriteString
-    str: PChar;
-    memory: PChar;
+    str: PAnsiChar;
+    memory: PAnsiChar;
     pad_align: record end; // properly pad previous field if applicable
     pad_align: record end; // properly pad previous field if applicable
     {$POP}
     {$POP}
   end;
   end;
@@ -836,7 +836,7 @@ const
 // *********************************************************************
 // *********************************************************************
 // Family
 // Family
 const
 const
-   MUIC_Family: PChar = 'Family.mui';
+   MUIC_Family: PAnsiChar = 'Family.mui';
 
 
 // Identifier base (for Zune extensions)
 // Identifier base (for Zune extensions)
   MUIB_Family = MUIB_ZUNE or $00000c00;
   MUIB_Family = MUIB_ZUNE or $00000c00;
@@ -929,7 +929,7 @@ const
 // *********************************************************************
 // *********************************************************************
 //  Application
 //  Application
 const
 const
-  MUIC_Application: PChar = 'Application.mui';
+  MUIC_Application: PAnsiChar = 'Application.mui';
 
 
 // Identifier base (for Zune extensions)
 // Identifier base (for Zune extensions)
   MUIB_Application = MUIB_ZUNE or $00000100;
   MUIB_Application = MUIB_ZUNE or $00000100;
@@ -1133,8 +1133,8 @@ type
     {$PUSH}{$IF DEFINED(CPU32)}{$CODEALIGN RECORDMIN=4}{$ELSEIF DEFINED(CPU64)}{$CODEALIGN RECORDMIN=8}{$ENDIF}
     {$PUSH}{$IF DEFINED(CPU32)}{$CODEALIGN RECORDMIN=4}{$ELSEIF DEFINED(CPU64)}{$CODEALIGN RECORDMIN=8}{$ENDIF}
     MethodID: LongWord;  // MUIM_Application_ShowHelp
     MethodID: LongWord;  // MUIM_Application_ShowHelp
     window: PObject_;
     window: PObject_;
-    name: PChar;
-    node: PChar;
+    name: PAnsiChar;
+    node: PAnsiChar;
     line: LongInt;
     line: LongInt;
     pad_align: record end; // properly pad previous field if applicable
     pad_align: record end; // properly pad previous field if applicable
     {$POP}
     {$POP}
@@ -1230,7 +1230,7 @@ type
 // *********************************************************************
 // *********************************************************************
 //  Window
 //  Window
 const
 const
-  MUIC_Window: PChar = 'Window.mui';
+  MUIC_Window: PAnsiChar = 'Window.mui';
 
 
 // Identifier base (for Zune extensions)
 // Identifier base (for Zune extensions)
   MUIB_Window = MUIB_ZUNE or $00003600;
   MUIB_Window = MUIB_ZUNE or $00003600;
@@ -1551,7 +1551,7 @@ const
 // *********************************************************************
 // *********************************************************************
 //  Area
 //  Area
 const
 const
-  MUIC_Area: PChar = 'Area.mui';
+  MUIC_Area: PAnsiChar = 'Area.mui';
 
 
 // Identifier base (for Zune extensions)
 // Identifier base (for Zune extensions)
   MUIB_Area = MUIB_ZUNE or $00000200;
   MUIB_Area = MUIB_ZUNE or $00000200;
@@ -1644,7 +1644,7 @@ type
     MethodID: LongWord;  // MUIM_CreateBubble
     MethodID: LongWord;  // MUIM_CreateBubble
     x: LongInt;
     x: LongInt;
     y: LongInt;
     y: LongInt;
-    txt : PChar;
+    txt : PAnsiChar;
     flags: LongWord;
     flags: LongWord;
     pad_align: record end; // properly pad previous field if applicable
     pad_align: record end; // properly pad previous field if applicable
     {$POP}
     {$POP}
@@ -1917,7 +1917,7 @@ const
   MUIA_BottomEdge         = MUIB_MUI or $42e552; // V4  ..g LongInt
   MUIA_BottomEdge         = MUIB_MUI or $42e552; // V4  ..g LongInt
   MUIA_ContextMenu        = MUIB_MUI or $42b704; // V11 isg PObject
   MUIA_ContextMenu        = MUIB_MUI or $42b704; // V11 isg PObject
   MUIA_ContextMenuTrigger = MUIB_MUI or $42a2c1; // V11 ..g 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_CycleChain         = MUIB_MUI or $421ce7; // V11 isg LongInt
   MUIA_Disabled           = MUIB_MUI or $423661; // V4  isg WordBool
   MUIA_Disabled           = MUIB_MUI or $423661; // V4  isg WordBool
   MUIA_DoubleBuffer       = MUIB_MUI or $42a9c7; // V20 isg WordBool
   MUIA_DoubleBuffer       = MUIB_MUI or $42a9c7; // V20 isg WordBool
@@ -2014,7 +2014,7 @@ type
     // offset 95
     // offset 95
     mad_InputMode: ShortInt;         // how to react to events
     mad_InputMode: ShortInt;         // how to react to events
     // offset 96
     // offset 96
-    mad_ControlChar: Char;           // key shortcut
+    mad_ControlChar: AnsiChar;           // key shortcut
     mad_TitleHeightAdd: ShortInt;    // frame title height = mad_TitleBelow + mad_TitleBaseline
     mad_TitleHeightAdd: ShortInt;    // frame title height = mad_TitleBelow + mad_TitleBaseline
     mad_TitleHeightBelow: ShortInt;  // height below frame
     mad_TitleHeightBelow: ShortInt;  // height below frame
     mad_TitleHeightAbove: ShortInt;  // height above frame
     mad_TitleHeightAbove: ShortInt;  // height above frame
@@ -2032,7 +2032,7 @@ type
     mad_ehn: TMUI_EventHandlerNode;
     mad_ehn: TMUI_EventHandlerNode;
     mad_Timer: TMUI_InputHandlerNode;   // MUIA_Timer
     mad_Timer: TMUI_InputHandlerNode;   // MUIA_Timer
     mad_Timeval: LongWord;              // just to trigger notifications
     mad_Timeval: LongWord;              // just to trigger notifications
-    mad_ccn: TMUI_EventHandlerNode;     // gross hack for control char
+    mad_ccn: TMUI_EventHandlerNode;     // gross hack for control AnsiChar
     mad_ContextMenu: APTR;              // menu strip
     mad_ContextMenu: APTR;              // menu strip
     mad_ClickX: LongInt;                // x position of the initial SELECTDOWN click
     mad_ClickX: LongInt;                // x position of the initial SELECTDOWN click
     mad_ClickY: LongInt;                // y position of the intiial SELECTDOWN click
     mad_ClickY: LongInt;                // y position of the intiial SELECTDOWN click
@@ -2075,7 +2075,7 @@ const
 // *********************************************************************
 // *********************************************************************
 //  Group
 //  Group
 const
 const
-  MUIC_Group: PChar = 'Group.mui';
+  MUIC_Group: PAnsiChar = 'Group.mui';
 
 
 // Identifier base (for Zune extensions)
 // Identifier base (for Zune extensions)
   MUIB_Group = MUIB_ZUNE or $00001000;
   MUIB_Group = MUIB_ZUNE or $00001000;
@@ -2207,7 +2207,7 @@ const
 // *********************************************************************
 // *********************************************************************
 //  Rectangle
 //  Rectangle
 const
 const
-  MUIC_Rectangle: PChar = 'Rectangle.mui';
+  MUIC_Rectangle: PAnsiChar = 'Rectangle.mui';
 
 
 // Identifier base (for Zune extensions)
 // Identifier base (for Zune extensions)
   MUIB_Rectangle = MUIB_ZUNE or $00002b00;
   MUIB_Rectangle = MUIB_ZUNE or $00002b00;
@@ -2221,7 +2221,7 @@ const
 // *********************************************************************
 // *********************************************************************
 //  Text
 //  Text
 const
 const
-  MUIC_Text: PChar = 'Text.mui';
+  MUIC_Text: PAnsiChar = 'Text.mui';
 
 
 // Identifier base (for Zune extensions)
 // Identifier base (for Zune extensions)
   MUIB_Text = MUIB_ZUNE or $00003500;
   MUIB_Text = MUIB_ZUNE or $00003500;
@@ -2229,8 +2229,8 @@ const
 // Attributes
 // Attributes
 const
 const
   MUIA_Text_Contents  = MUIB_MUI or $42f8dc; // V4  isg STRPTR
   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_PreParse  = MUIB_MUI or $42566d; // V4  isg STRPTR
   MUIA_Text_SetMax    = MUIB_MUI or $424d0a; // V4  i.. WordBool
   MUIA_Text_SetMax    = MUIB_MUI or $424d0a; // V4  i.. WordBool
   MUIA_Text_SetMin    = MUIB_MUI or $424e10; // V4  i.. WordBool
   MUIA_Text_SetMin    = MUIB_MUI or $424e10; // V4  i.. WordBool
@@ -2252,7 +2252,7 @@ const
 // *********************************************************************
 // *********************************************************************
 //  Numeric
 //  Numeric
 const
 const
-  MUIC_Numeric: PChar = 'Numeric.mui';
+  MUIC_Numeric: PAnsiChar = 'Numeric.mui';
 
 
 // Identifier base (for Zune extensions)
 // Identifier base (for Zune extensions)
   MUIB_Numeric = MUIB_ZUNE or $00001e00;
   MUIB_Numeric = MUIB_ZUNE or $00001e00;
@@ -2351,7 +2351,7 @@ const
 // *********************************************************************
 // *********************************************************************
 //  Slider
 //  Slider
 const
 const
-  MUIC_Slider: PChar = 'Slider.mui';
+  MUIC_Slider: PAnsiChar = 'Slider.mui';
 
 
 // Identifier base (for Zune extensions)
 // Identifier base (for Zune extensions)
   MUIB_Slider = MUIB_ZUNE or $00003300;
   MUIB_Slider = MUIB_ZUNE or $00003300;
@@ -2371,7 +2371,7 @@ const
 // *********************************************************************
 // *********************************************************************
 //  String
 //  String
 const
 const
-  MUIC_String: PChar = 'String.mui';
+  MUIC_String: PAnsiChar = 'String.mui';
 
 
 // Identifier base (for Zune extensions)
 // Identifier base (for Zune extensions)
   MUIB_String = MUIB_ZUNE or $00003400;
   MUIB_String = MUIB_ZUNE or $00003400;
@@ -2448,7 +2448,7 @@ type
 // *********************************************************************
 // *********************************************************************
 //  Boopsi
 //  Boopsi
 const
 const
-  MUIC_Boopsi: PChar = 'Boopsi.mui';
+  MUIC_Boopsi: PAnsiChar = 'Boopsi.mui';
 
 
 // Identifier base (for Zune extensions)
 // Identifier base (for Zune extensions)
   MUIB_Boopsi = MUIB_ZUNE or $00000600;
   MUIB_Boopsi = MUIB_ZUNE or $00000600;
@@ -2456,7 +2456,7 @@ const
 // Attributes
 // Attributes
 const
 const
   MUIA_Boopsi_Class       = MUIB_MUI or $426999; // V4  isg PIClass
   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_MaxHeight   = MUIB_MUI or $42757f; // V4  isg LongWord
   MUIA_Boopsi_MaxWidth    = MUIB_MUI or $42bcb1; // V4  isg LongWord
   MUIA_Boopsi_MaxWidth    = MUIB_MUI or $42bcb1; // V4  isg LongWord
   MUIA_Boopsi_MinHeight   = MUIB_MUI or $422c93; // V4  isg LongWord
   MUIA_Boopsi_MinHeight   = MUIB_MUI or $422c93; // V4  isg LongWord
@@ -2471,7 +2471,7 @@ const
 // *********************************************************************
 // *********************************************************************
 //  Prop
 //  Prop
 const
 const
-  MUIC_Prop: PChar = 'Prop.mui';
+  MUIC_Prop: PAnsiChar = 'Prop.mui';
 
 
 // Identifier base (for Zune extensions)
 // Identifier base (for Zune extensions)
   MUIB_Prop = MUIB_ZUNE or $00002900;
   MUIB_Prop = MUIB_ZUNE or $00002900;
@@ -2520,7 +2520,7 @@ const
 // *********************************************************************
 // *********************************************************************
 //  Scrollbar
 //  Scrollbar
 const
 const
-  MUIC_Scrollbar: PChar = 'Scrollbar.mui';
+  MUIC_Scrollbar: PAnsiChar = 'Scrollbar.mui';
 
 
 // Identifier base (for Zune extensions)
 // Identifier base (for Zune extensions)
   MUIB_Scrollbar = MUIB_ZUNE or $00002e00;
   MUIB_Scrollbar = MUIB_ZUNE or $00002e00;
@@ -2537,7 +2537,7 @@ const
 // *********************************************************************
 // *********************************************************************
 //  Register
 //  Register
 const
 const
-  MUIC_Register: PChar = 'Register.mui';
+  MUIC_Register: PAnsiChar = 'Register.mui';
 
 
 // Identifier base  (for Zune extensions)
 // Identifier base  (for Zune extensions)
   MUIB_Register = MUIB_ZUNE or $00002c00;
   MUIB_Register = MUIB_ZUNE or $00002c00;
@@ -2552,7 +2552,7 @@ const
 // *********************************************************************
 // *********************************************************************
 //  Menustrip
 //  Menustrip
 const
 const
-  MUIC_Menustrip: PChar = 'Menustrip.mui';
+  MUIC_Menustrip: PAnsiChar = 'Menustrip.mui';
 
 
 // Identifier base (for Zune extensions)
 // Identifier base (for Zune extensions)
   MUIB_Menustrip = MUIB_ZUNE or $00001a00;
   MUIB_Menustrip = MUIB_ZUNE or $00001a00;
@@ -2564,7 +2564,7 @@ const
 // *********************************************************************
 // *********************************************************************
 //  Menu
 //  Menu
 const
 const
-  MUIC_Menu: PChar = 'Menu.mui';
+  MUIC_Menu: PAnsiChar = 'Menu.mui';
 
 
 // Identifier base (for Zune extensions)
 // Identifier base (for Zune extensions)
   MUIB_Menu = MUIB_ZUNE or $00001b00;
   MUIB_Menu = MUIB_ZUNE or $00001b00;
@@ -2577,7 +2577,7 @@ const
 // *********************************************************************
 // *********************************************************************
 //  Menuitem
 //  Menuitem
 const
 const
-  MUIC_Menuitem: PChar = 'Menuitem.mui';
+  MUIC_Menuitem: PAnsiChar = 'Menuitem.mui';
 
 
 // Identifier base (for Zune extensions)
 // Identifier base (for Zune extensions)
   MUIB_Menuitem = MUIB_ZUNE or $00001c00;
   MUIB_Menuitem = MUIB_ZUNE or $00001c00;
@@ -2601,7 +2601,7 @@ const
 // *********************************************************************
 // *********************************************************************
 //  Dataspace
 //  Dataspace
 const
 const
-  MUIC_Dataspace: PChar = 'Dataspace.mui';
+  MUIC_Dataspace: PAnsiChar = 'Dataspace.mui';
 
 
 // Identifier base (for Zune extensions)
 // Identifier base (for Zune extensions)
   MUIB_Dataspace = MUIB_ZUNE or $00000b00;
   MUIB_Dataspace = MUIB_ZUNE or $00000b00;
@@ -2690,7 +2690,7 @@ const
 // *********************************************************************
 // *********************************************************************
 //  Virtgroup
 //  Virtgroup
 const
 const
-  MUIC_Virtgroup: PChar = 'Virtgroup.mui';
+  MUIC_Virtgroup: PAnsiChar = 'Virtgroup.mui';
 
 
 // Identifier base (for Zune extensions)
 // Identifier base (for Zune extensions)
   MUIB_Virtgroup = MUIB_ZUNE or $00003700;
   MUIB_Virtgroup = MUIB_ZUNE or $00003700;
@@ -2706,7 +2706,7 @@ const
 // *********************************************************************
 // *********************************************************************
 //  Scrollgroup
 //  Scrollgroup
 const
 const
-  MUIC_Scrollgroup: PChar = 'Scrollgroup.mui';
+  MUIC_Scrollgroup: PAnsiChar = 'Scrollgroup.mui';
 
 
 // Identifier base (for Zune extensions)
 // Identifier base (for Zune extensions)
   MUIB_Scrollgroup = MUIB_ZUNE or $00002f00;
   MUIB_Scrollgroup = MUIB_ZUNE or $00002f00;
@@ -2723,7 +2723,7 @@ const
 // *********************************************************************
 // *********************************************************************
 //  ScrollButton
 //  ScrollButton
 const
 const
-  MUIC_Scrollbutton: PChar = 'Scrollbutton.mui';
+  MUIC_Scrollbutton: PAnsiChar = 'Scrollbutton.mui';
 
 
 // Identifier base
 // Identifier base
   MUIB_Scrollbutton = MUIB_ZUNE or $00004100;
   MUIB_Scrollbutton = MUIB_ZUNE or $00004100;
@@ -2739,7 +2739,7 @@ const
 // *********************************************************************
 // *********************************************************************
 //  Semaphore
 //  Semaphore
 const
 const
-  MUIC_Semaphore: PChar = 'Semaphore.mui';
+  MUIC_Semaphore: PAnsiChar = 'Semaphore.mui';
 
 
 // Identifier base (for Zune extensions)
 // Identifier base (for Zune extensions)
   MUIB_Semaphore = MUIB_ZUNE or $00003000;
   MUIB_Semaphore = MUIB_ZUNE or $00003000;
@@ -2796,7 +2796,7 @@ type
 // *********************************************************************
 // *********************************************************************
 //  Bitmap
 //  Bitmap
 const
 const
-  MUIC_Bitmap: PChar = 'Bitmap.mui';
+  MUIC_Bitmap: PAnsiChar = 'Bitmap.mui';
 
 
 // Identifier base (for Zune extensions)
 // Identifier base (for Zune extensions)
   MUIB_Bitmap = MUIB_ZUNE or $00000400;
   MUIB_Bitmap = MUIB_ZUNE or $00000400;
@@ -2817,7 +2817,7 @@ const
 // *********************************************************************
 // *********************************************************************
 //  Bodychunk
 //  Bodychunk
 const
 const
-   MUIC_Bodychunk : PChar = 'Bodychunk.mui';
+   MUIC_Bodychunk : PAnsiChar = 'Bodychunk.mui';
 
 
 // Identifier base (for Zune extensions)
 // Identifier base (for Zune extensions)
   MUIB_Bodychunk = MUIB_ZUNE or $00000500;
   MUIB_Bodychunk = MUIB_ZUNE or $00000500;
@@ -2832,7 +2832,7 @@ const
 // *********************************************************************
 // *********************************************************************
 //  ChunkyImage
 //  ChunkyImage
 const
 const
-   MUIC_ChunkyImage : PChar = 'ChunkyImage.mui';
+   MUIC_ChunkyImage : PAnsiChar = 'ChunkyImage.mui';
 
 
 // Identifier base (for Zune extensions)
 // Identifier base (for Zune extensions)
   MUIB_ChunkyImage = MUIB_ZUNE or $00004000;
   MUIB_ChunkyImage = MUIB_ZUNE or $00004000;
@@ -2847,7 +2847,7 @@ const
 // *********************************************************************
 // *********************************************************************
 //  Listview
 //  Listview
 const
 const
-  MUIC_Listview: PChar = 'Listview.mui';
+  MUIC_Listview: PAnsiChar = 'Listview.mui';
 
 
 // Identifier base (for Zune extensions)
 // Identifier base (for Zune extensions)
   MUIB_Listview = MUIB_ZUNE or $00001900;
   MUIB_Listview = MUIB_ZUNE or $00001900;
@@ -2880,7 +2880,7 @@ const
 // *********************************************************************
 // *********************************************************************
 //  List
 //  List
 const
 const
-  MUIC_List: PChar = 'List.mui';
+  MUIC_List: PAnsiChar = 'List.mui';
 
 
 // Identifier base (for Zune extensions)
 // Identifier base (for Zune extensions)
   MUIB_List = MUIB_ZUNE or $00001400;
   MUIB_List = MUIB_ZUNE or $00001400;
@@ -3096,7 +3096,7 @@ const
   MUIA_List_Quiet          = MUIB_MUI or $42d8c7; // V4  .s. WordBool
   MUIA_List_Quiet          = MUIB_MUI or $42d8c7; // V4  .s. WordBool
   MUIA_List_ShowDropMarks  = MUIB_MUI or $42c6f3; // V11 isg WordBool
   MUIA_List_ShowDropMarks  = MUIB_MUI or $42c6f3; // V11 isg WordBool
   MUIA_List_SourceArray    = MUIB_MUI or $42c0a0; // V4  i.. APTR
   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
   MUIA_List_Visible        = MUIB_MUI or $42191f; // V4  ..g LongInt
 
 
   MUIV_List_Active_Off      = -1;
   MUIV_List_Active_Off      = -1;
@@ -3164,7 +3164,7 @@ const
 // *********************************************************************
 // *********************************************************************
 //  Scrmodelist
 //  Scrmodelist
 const
 const
-  MUIC_Scrmodelist: PChar = 'Scrmodelist.mui';
+  MUIC_Scrmodelist: PAnsiChar = 'Scrmodelist.mui';
 
 
 // Identifier base (for Zune extensions)
 // Identifier base (for Zune extensions)
   MUIB_Scrmodelist = MUIB_ZUNE or $00001700;
   MUIB_Scrmodelist = MUIB_ZUNE or $00001700;
@@ -3172,7 +3172,7 @@ const
 // *********************************************************************
 // *********************************************************************
 //  Floattext
 //  Floattext
 const
 const
-  MUIC_Floattext: PChar = 'Floattext.mui';
+  MUIC_Floattext: PAnsiChar = 'Floattext.mui';
 
 
 // Identifier base (for Zune extensions)
 // Identifier base (for Zune extensions)
   MUIB_Floattext = MUIB_ZUNE or $00001500;
   MUIB_Floattext = MUIB_ZUNE or $00001500;
@@ -3200,7 +3200,7 @@ const
 // *********************************************************************
 // *********************************************************************
 //  Popstring
 //  Popstring
 const
 const
-  MUIC_Popstring: PChar = 'Popstring.mui';
+  MUIC_Popstring: PAnsiChar = 'Popstring.mui';
 
 
 // Identifier base (for Zune extensions)
 // Identifier base (for Zune extensions)
   MUIB_Popstring = MUIB_ZUNE or $00002800;
   MUIB_Popstring = MUIB_ZUNE or $00002800;
@@ -3239,7 +3239,7 @@ const
 // *********************************************************************
 // *********************************************************************
 //  Popobject
 //  Popobject
 const
 const
-  MUIC_Popobject: PChar = 'Popobject.mui';
+  MUIC_Popobject: PAnsiChar = 'Popobject.mui';
 
 
 // Identifier base
 // Identifier base
   MUIB_Popobject = MUIB_ZUNE or $00002400;
   MUIB_Popobject = MUIB_ZUNE or $00002400;
@@ -3257,7 +3257,7 @@ const
 // *********************************************************************
 // *********************************************************************
 //  Cycle
 //  Cycle
 const
 const
-  MUIC_Cycle: PChar = 'Cycle.mui';
+  MUIC_Cycle: PAnsiChar = 'Cycle.mui';
 
 
 // Identifier base (for Zune extensions)
 // Identifier base (for Zune extensions)
   MUIB_Cycle = MUIB_ZUNE or $00000a00;
   MUIB_Cycle = MUIB_ZUNE or $00000a00;
@@ -3273,7 +3273,7 @@ const
 // *********************************************************************
 // *********************************************************************
 //  Gauge
 //  Gauge
 const
 const
-  MUIC_Gauge: PChar = 'Gauge.mui';
+  MUIC_Gauge: PAnsiChar = 'Gauge.mui';
 
 
 // Identifier base (for Zune extensions)
 // Identifier base (for Zune extensions)
   MUIB_Gauge = MUIB_ZUNE or $00000f00;
   MUIB_Gauge = MUIB_ZUNE or $00000f00;
@@ -3291,7 +3291,7 @@ const
 // *********************************************************************
 // *********************************************************************
 //  Image
 //  Image
 const
 const
-  MUIC_Image: PChar = 'Image.mui';
+  MUIC_Image: PAnsiChar = 'Image.mui';
 
 
 // Identifier base (for Zune extensions)
 // Identifier base (for Zune extensions)
   MUIB_Image = MUIB_ZUNE or $00001300;
   MUIB_Image = MUIB_ZUNE or $00001300;
@@ -3304,13 +3304,13 @@ const
   MUIA_Image_FreeHoriz       = MUIB_MUI or $42da84; // V4  i.. WordBool
   MUIA_Image_FreeHoriz       = MUIB_MUI or $42da84; // V4  i.. WordBool
   MUIA_Image_FreeVert        = MUIB_MUI or $42ea28; // 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_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
   MUIA_Image_State           = MUIB_MUI or $42a3ad; // V4  is. LongInt
 
 
 // *********************************************************************
 // *********************************************************************
 //  Imagedisplay
 //  Imagedisplay
 const
 const
-  MUIC_Imagedisplay: PChar = 'Imagedisplay.mui';
+  MUIC_Imagedisplay: PAnsiChar = 'Imagedisplay.mui';
 
 
 // Identifier base (for Zune extensions)
 // Identifier base (for Zune extensions)
   MUIB_Imagedisplay = MUIB_ZUNE or $00001200;
   MUIB_Imagedisplay = MUIB_ZUNE or $00001200;
@@ -3325,7 +3325,7 @@ const
 // *********************************************************************
 // *********************************************************************
 //  Popasl
 //  Popasl
 const
 const
-  MUIC_Popasl: PChar = 'Popasl.mui';
+  MUIC_Popasl: PAnsiChar = 'Popasl.mui';
 
 
 // Identifier base (for Zune extensions)
 // Identifier base (for Zune extensions)
   MUIB_Popasl = MUIB_ZUNE or $00002100;
   MUIB_Popasl = MUIB_ZUNE or $00002100;
@@ -3340,7 +3340,7 @@ const
 // *********************************************************************
 // *********************************************************************
 //  Settingsgroup
 //  Settingsgroup
 const
 const
-  MUIC_Settingsgroup: PChar = 'Settingsgroup.mui';
+  MUIC_Settingsgroup: PAnsiChar = 'Settingsgroup.mui';
 
 
 // Identifier base (for Zune extensions)
 // Identifier base (for Zune extensions)
   MUIB_Settingsgroup = MUIB_ZUNE or $00003100;
   MUIB_Settingsgroup = MUIB_ZUNE or $00003100;
@@ -3372,7 +3372,7 @@ type
 // *********************************************************************
 // *********************************************************************
 //  Settings
 //  Settings
 const
 const
-  MUIC_Settings: PChar = 'Settings.mui';
+  MUIC_Settings: PAnsiChar = 'Settings.mui';
 
 
 // Identifier base (for Zune extensions)
 // Identifier base (for Zune extensions)
   MUIB_Settings = MUIB_ZUNE or $00003200;
   MUIB_Settings = MUIB_ZUNE or $00003200;
@@ -3380,7 +3380,7 @@ const
 // *********************************************************************
 // *********************************************************************
 //  Aboutmui
 //  Aboutmui
 const
 const
-  MUIC_Aboutmui: PChar = 'Aboutmui.mui';
+  MUIC_Aboutmui: PAnsiChar = 'Aboutmui.mui';
 
 
 // Identifier base (for Zune extensions)
 // Identifier base (for Zune extensions)
   MUIB_Aboutmui = MUIB_ZUNE or $0;
   MUIB_Aboutmui = MUIB_ZUNE or $0;
@@ -3392,7 +3392,7 @@ const
 // *********************************************************************
 // *********************************************************************
 //  Configdata
 //  Configdata
 const
 const
-   MUIC_Configdata : PChar = 'Configdata.mui';
+   MUIC_Configdata : PAnsiChar = 'Configdata.mui';
 
 
 // Identifier base (for Zune extensions)
 // Identifier base (for Zune extensions)
   MUIB_Configdata = MUIB_ZUNE or $00000900;
   MUIB_Configdata = MUIB_ZUNE or $00000900;
@@ -3679,7 +3679,7 @@ const
 // *********************************************************************
 // *********************************************************************
 //  Imageadjust
 //  Imageadjust
 const
 const
-  MUIC_Imageadjust: PChar = 'Imageadjust.mui';
+  MUIC_Imageadjust: PAnsiChar = 'Imageadjust.mui';
 
 
 // Identifier base (for AROS extensions)
 // Identifier base (for AROS extensions)
   MUIB_Imageadjust = MUIB_ZUNE or $00001100;
   MUIB_Imageadjust = MUIB_ZUNE or $00001100;
@@ -3687,7 +3687,7 @@ const
 // Attributes
 // Attributes
 const
 const
   MUIA_Imageadjust_Type = MUIB_MUI or $422f2b; // V11 i.. LongInt
   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
   // AROS special
   MUIA_Imageadjust_Originator = MUIB_Imageadjust or $0; // Zune: i.. PObject_
   MUIA_Imageadjust_Originator = MUIB_Imageadjust or $0; // Zune: i.. PObject_
 
 
@@ -3699,7 +3699,7 @@ const
 // *********************************************************************
 // *********************************************************************
 //  Popimage
 //  Popimage
 const
 const
-  MUIC_Popimage: PChar = 'Popimage.mui';
+  MUIC_Popimage: PAnsiChar = 'Popimage.mui';
 
 
 // Identifier base (for Zune extensions)
 // Identifier base (for Zune extensions)
   MUIB_Popimage = MUIB_ZUNE or $00002300;
   MUIB_Popimage = MUIB_ZUNE or $00002300;
@@ -3707,7 +3707,7 @@ const
 // *********************************************************************
 // *********************************************************************
 //  Scale
 //  Scale
 const
 const
-  MUIC_Scale: PChar = 'Scale.mui';
+  MUIC_Scale: PAnsiChar = 'Scale.mui';
 
 
 // Identifier base (for Zune extensions)
 // Identifier base (for Zune extensions)
   MUIB_Scale = MUIB_ZUNE or $00002d00;
   MUIB_Scale = MUIB_ZUNE or $00002d00;
@@ -3719,7 +3719,7 @@ const
 // *********************************************************************
 // *********************************************************************
 //  Radio
 //  Radio
 const
 const
-  MUIC_Radio: PChar = 'Radio.mui';
+  MUIC_Radio: PAnsiChar = 'Radio.mui';
 
 
 // Identifier base (for Zune extensions)
 // Identifier base (for Zune extensions)
   MUIB_Radio = MUIB_ZUNE or $00002a00;
   MUIB_Radio = MUIB_ZUNE or $00002a00;
@@ -3732,7 +3732,7 @@ const
 // *********************************************************************
 // *********************************************************************
 //  Balance
 //  Balance
 const
 const
-  MUIC_Balance: PChar = 'Balance.mui';
+  MUIC_Balance: PAnsiChar = 'Balance.mui';
 
 
 // Identifier base (for Zune extensions)
 // Identifier base (for Zune extensions)
   MUIB_Balance = MUIB_ZUNE or $00000300;
   MUIB_Balance = MUIB_ZUNE or $00000300;
@@ -3743,7 +3743,7 @@ const
 // *********************************************************************
 // *********************************************************************
 //  Pendisplay
 //  Pendisplay
 const
 const
-  MUIC_Pendisplay: PChar = 'Pendisplay.mui';
+  MUIC_Pendisplay: PAnsiChar = 'Pendisplay.mui';
 
 
 // Identifier base (for Zune extensions)
 // Identifier base (for Zune extensions)
   MUIB_Pendisplay = MUIB_ZUNE or $00002000;
   MUIB_Pendisplay = MUIB_ZUNE or $00002000;
@@ -3794,7 +3794,7 @@ const
 // *********************************************************************
 // *********************************************************************
 //  Penadjust
 //  Penadjust
 const
 const
-  MUIC_Penadjust: PChar= 'Penadjust.mui';
+  MUIC_Penadjust: PAnsiChar= 'Penadjust.mui';
 
 
 // Identifier base (for Zune extensions)
 // Identifier base (for Zune extensions)
   MUIB_Penadjust = MUIB_ZUNE or $00001f00;
   MUIB_Penadjust = MUIB_ZUNE or $00001f00;
@@ -3806,7 +3806,7 @@ const
 // *********************************************************************
 // *********************************************************************
 //  Poppen
 //  Poppen
 const
 const
-  MUIC_Poppen: PChar = 'Poppen.mui';
+  MUIC_Poppen: PAnsiChar = 'Poppen.mui';
 
 
 // Identifier base (for Zune extensions)
 // Identifier base (for Zune extensions)
   MUIB_Poppen = MUIB_ZUNE or $00002700;
   MUIB_Poppen = MUIB_ZUNE or $00002700;
@@ -3814,7 +3814,7 @@ const
 // *********************************************************************
 // *********************************************************************
 //  Colorfield
 //  Colorfield
 const
 const
-  MUIC_Colorfield: PChar = 'Colorfield.mui';
+  MUIC_Colorfield: PAnsiChar = 'Colorfield.mui';
 
 
 // Identifier base (for Zune extensions)
 // Identifier base (for Zune extensions)
   MUIB_Colorfield = MUIB_ZUNE or $00000800;
   MUIB_Colorfield = MUIB_ZUNE or $00000800;
@@ -3830,7 +3830,7 @@ const
 // *********************************************************************
 // *********************************************************************
 //  Coloradjust
 //  Coloradjust
 const
 const
-  MUIC_Coloradjust: PChar = 'Coloradjust.mui';
+  MUIC_Coloradjust: PAnsiChar = 'Coloradjust.mui';
 
 
 // Identifier base (for Zune extensions)
 // Identifier base (for Zune extensions)
   MUIB_Coloradjust = MUIB_ZUNE or $00000700;
   MUIB_Coloradjust = MUIB_ZUNE or $00000700;
@@ -3846,12 +3846,12 @@ const
 // *********************************************************************
 // *********************************************************************
 //  Mccprefs
 //  Mccprefs
 const
 const
-  MUIC_Mccprefs: PChar = 'Mccprefs.mui';
+  MUIC_Mccprefs: PAnsiChar = 'Mccprefs.mui';
 
 
 // *********************************************************************
 // *********************************************************************
 //  Frameadjust
 //  Frameadjust
 const
 const
-  MUIC_Frameadjust: PChar = 'Frameadjust.mui';
+  MUIC_Frameadjust: PAnsiChar = 'Frameadjust.mui';
 
 
 // Identifier base (for Zune extensions)
 // Identifier base (for Zune extensions)
   MUIB_Frameadjust = MUIB_ZUNE or $00000d00;
   MUIB_Frameadjust = MUIB_ZUNE or $00000d00;
@@ -3862,7 +3862,7 @@ const
 // *********************************************************************
 // *********************************************************************
 //  Framedisplay
 //  Framedisplay
 const
 const
-  MUIC_Framedisplay: PChar = 'Framedisplay.mui';
+  MUIC_Framedisplay: PAnsiChar = 'Framedisplay.mui';
 
 
 // Identifier base (for Zune extensions)
 // Identifier base (for Zune extensions)
   MUIB_Framedisplay = MUIB_ZUNE or $00000e00;
   MUIB_Framedisplay = MUIB_ZUNE or $00000e00;
@@ -3873,7 +3873,7 @@ const
 // *********************************************************************
 // *********************************************************************
 //  Popframe
 //  Popframe
 const
 const
-  MUIC_Popframe: PChar = 'Popframe.mui';
+  MUIC_Popframe: PAnsiChar = 'Popframe.mui';
 
 
 // Identifier base (for Zune extensions)
 // Identifier base (for Zune extensions)
   MUIB_Popframe = MUIB_ZUNE or $00002200;
   MUIB_Popframe = MUIB_ZUNE or $00002200;
@@ -3881,7 +3881,7 @@ const
 // *********************************************************************
 // *********************************************************************
 //  Volumelist
 //  Volumelist
 const
 const
-  MUIC_Volumelist: PChar = 'Volumelist.mui';
+  MUIC_Volumelist: PAnsiChar = 'Volumelist.mui';
 
 
 // Identifier base (for Zune extensions)
 // Identifier base (for Zune extensions)
   MUIB_Volumelist = MUIB_ZUNE or $1600;
   MUIB_Volumelist = MUIB_ZUNE or $1600;
@@ -3889,7 +3889,7 @@ const
 // *********************************************************************
 // *********************************************************************
 //  Dirlist
 //  Dirlist
 const
 const
-  MUIC_Dirlist: PChar = 'Dirlist.mui';
+  MUIC_Dirlist: PAnsiChar = 'Dirlist.mui';
 
 
 // Identifer base (for Zune extensions)
 // Identifer base (for Zune extensions)
   MUIB_Dirlist = MUIB_ZUNE or $00001800;
   MUIB_Dirlist = MUIB_ZUNE or $00001800;
@@ -3941,24 +3941,24 @@ const
 // *********************************************************************
 // *********************************************************************
 //  Numericbutton
 //  Numericbutton
 const
 const
-  MUIC_Numericbutton: PChar = 'Numericbutton.mui';
+  MUIC_Numericbutton: PAnsiChar = 'Numericbutton.mui';
 
 
 // *********************************************************************
 // *********************************************************************
 //  Poplist
 //  Poplist
 const
 const
-  MUIC_Poplist: PChar = 'Poplist.mui';
+  MUIC_Poplist: PAnsiChar = 'Poplist.mui';
 
 
 // Identifier base (for Zune extensions)
 // Identifier base (for Zune extensions)
   MUIB_Poplist = MUIB_ZUNE or $00002500;
   MUIB_Poplist = MUIB_ZUNE or $00002500;
 
 
 // Attributes
 // Attributes
 const
 const
-  MUIA_Poplist_Array = MUIB_MUI or $42084c; // V8  i.. PPChar
+  MUIA_Poplist_Array = MUIB_MUI or $42084c; // V8  i.. PPAnsiChar
 
 
 // *********************************************************************
 // *********************************************************************
 //  Popscreen
 //  Popscreen
 const
 const
-  MUIC_Popscreen: PChar = 'Popscreen.mui';
+  MUIC_Popscreen: PAnsiChar = 'Popscreen.mui';
 
 
 // Identifier base (for Zune extensions)
 // Identifier base (for Zune extensions)
   MUIB_Popscreen = MUIB_ZUNE or $00002600;
   MUIB_Popscreen = MUIB_ZUNE or $00002600;
@@ -3966,12 +3966,12 @@ const
 // *********************************************************************
 // *********************************************************************
 //  Crawling
 //  Crawling
 const
 const
-  MUIC_Crawling: PChar = 'Crawling.mui';
+  MUIC_Crawling: PAnsiChar = 'Crawling.mui';
 
 
 // *********************************************************************
 // *********************************************************************
 //  Levelmeter
 //  Levelmeter
 const
 const
-  MUIC_Levelmeter: PChar = 'Levelmeter.mui';
+  MUIC_Levelmeter: PAnsiChar = 'Levelmeter.mui';
 
 
 // Attributes
 // Attributes
 const
 const
@@ -3980,12 +3980,12 @@ const
 // *********************************************************************
 // *********************************************************************
 //  Knob
 //  Knob
 const
 const
-  MUIC_Knob: PChar = 'Knob.mui';
+  MUIC_Knob: PAnsiChar = 'Knob.mui';
 
 
 // *********************************************************************
 // *********************************************************************
 //  Dtpic
 //  Dtpic
 const
 const
-  MUIC_Dtpic: PChar = 'Dtpic.mui';
+  MUIC_Dtpic: PAnsiChar = 'Dtpic.mui';
 
 
 // Identifier base (for Zune extensions)
 // Identifier base (for Zune extensions)
   MUIB_Palette = MUIB_ZUNE or $00008a00;
   MUIB_Palette = MUIB_ZUNE or $00008a00;
@@ -4001,23 +4001,23 @@ const
 // *********************************************************************
 // *********************************************************************
 //  Palette
 //  Palette
 const
 const
-  MUIC_Palette: PChar = 'Palette.mui';
+  MUIC_Palette: PAnsiChar = 'Palette.mui';
 
 
 // Attributes
 // Attributes
 const
 const
   MUIA_Palette_Entries   = $8042a3d8;{ V6  i.g struct MUI_Palette_Entry    }
   MUIA_Palette_Entries   = $8042a3d8;{ V6  i.g struct MUI_Palette_Entry    }
   MUIA_Palette_Groupable = $80423e67;{ V6  isg BOOL               }
   MUIA_Palette_Groupable = $80423e67;{ V6  isg BOOL               }
-  MUIA_Palette_Names     = $8042c3a2;{ V6  isg char               }
+  MUIA_Palette_Names     = $8042c3a2;{ V6  isg AnsiChar               }
 
 
 // *********************************************************************
 // *********************************************************************
 //  Title
 //  Title
 const
 const
-  MUIC_Title: PChar = 'Title.mui';
+  MUIC_Title: PAnsiChar = 'Title.mui';
 
 
 // *********************************************************************
 // *********************************************************************
 //  Process
 //  Process
 const
 const
-  MUIC_Process: PChar = 'Process.mui';
+  MUIC_Process: PAnsiChar = 'Process.mui';
 
 
 // Methods
 // Methods
   MUIM_Process_Kill    = MUIB_MUI or $4264cf; // V20
   MUIM_Process_Kill    = MUIB_MUI or $4264cf; // V20
@@ -4071,7 +4071,7 @@ const
 // *********************************************************************
 // *********************************************************************
 //  Pixmap
 //  Pixmap
 const
 const
-  MUIC_Pixmap: PChar = 'Pixmap.mui';
+  MUIC_Pixmap: PAnsiChar = 'Pixmap.mui';
 
 
 // Identifier base (for Zune extensions)
 // Identifier base (for Zune extensions)
   MUIB_Pixmap = MUIB_ZUNE or $00003600;
   MUIB_Pixmap = MUIB_ZUNE or $00003600;
@@ -4117,7 +4117,7 @@ const
 // *********************************************************************
 // *********************************************************************
 //  Gadget
 //  Gadget
 const
 const
-  MUIC_Gadget: PChar = 'Gadget.mui';
+  MUIC_Gadget: PAnsiChar = 'Gadget.mui';
 
 
 // Attributes
 // Attributes
 const
 const
@@ -4126,12 +4126,12 @@ const
 // *********************************************************************
 // *********************************************************************
 //  Applist
 //  Applist
 const
 const
-  MUIC_Applist: PChar = 'Applist.mui';
+  MUIC_Applist: PAnsiChar = 'Applist.mui';
 
 
 // *********************************************************************
 // *********************************************************************
 //  Cclist
 //  Cclist
 const
 const
-  MUIC_Cclist: PChar = 'Cclist.mui';
+  MUIC_Cclist: PAnsiChar = 'Cclist.mui';
 
 
 type
 type
 // Instance data of notify class
 // Instance data of notify class
@@ -4232,20 +4232,20 @@ type
 var
 var
   MUIMasterBase: PLibrary;
   MUIMasterBase: PLibrary;
 
 
-function MUI_NewObjectA(ClassID: PChar; Tags: pTagItem): PObject_; syscall MUIMasterBase 5;
+function MUI_NewObjectA(ClassID: PAnsiChar; Tags: pTagItem): PObject_; syscall MUIMasterBase 5;
 procedure MUI_DisposeObject(Obj: PObject_); syscall MUIMasterBase 6;
 procedure MUI_DisposeObject(Obj: PObject_); syscall MUIMasterBase 6;
-function MUI_RequestA(App: APTR; Win: APTR; Flags: LongBits; Title: PChar; Gadgets: PChar; Format: PChar; Params: APTR): LongInt; syscall MUIMasterBase 7;
+function MUI_RequestA(App: APTR; Win: APTR; Flags: LongBits; Title: PAnsiChar; Gadgets: PAnsiChar; Format: PAnsiChar; Params: APTR): LongInt; syscall MUIMasterBase 7;
 function MUI_AllocAslRequest(ReqTyp: LongWord; TagList: PTagItem): Pointer; syscall MUIMasterBase 8;
 function MUI_AllocAslRequest(ReqTyp: LongWord; TagList: PTagItem): Pointer; syscall MUIMasterBase 8;
 function MUI_AslRequest(Requester: Pointer; TagList: PTagItem): LongBool; syscall MUIMasterBase 9;
 function MUI_AslRequest(Requester: Pointer; TagList: PTagItem): LongBool; syscall MUIMasterBase 9;
 procedure MUI_FreeAslRequest(Requester: APTR); syscall MUIMasterBase 10;
 procedure MUI_FreeAslRequest(Requester: APTR); syscall MUIMasterBase 10;
 function MUI_Error: LongInt; syscall MUIMasterBase 11;
 function MUI_Error: LongInt; syscall MUIMasterBase 11;
 function MUI_SetError(ErrNum: LongInt): LongInt; syscall MUIMasterBase 12;
 function MUI_SetError(ErrNum: LongInt): LongInt; syscall MUIMasterBase 12;
-function MUI_GetClass(ClassID: PChar): PIClass; syscall MUIMasterBase 13;
+function MUI_GetClass(ClassID: PAnsiChar): PIClass; syscall MUIMasterBase 13;
 procedure MUI_FreeClass(Cl: PIClass); syscall MUIMasterBase 14;
 procedure MUI_FreeClass(Cl: PIClass); syscall MUIMasterBase 14;
 procedure MUI_RequestIDCMP(Obj: PObject_; Flags: LongWord); syscall MUIMasterBase 15;
 procedure MUI_RequestIDCMP(Obj: PObject_; Flags: LongWord); syscall MUIMasterBase 15;
 procedure MUI_RejectIDCMP(Obj: PObject_; Flags: LongWord); syscall MUIMasterBase 16;
 procedure MUI_RejectIDCMP(Obj: PObject_; Flags: LongWord); syscall MUIMasterBase 16;
 procedure MUI_Redraw(Obj: PObject_; Flags: LongWord); syscall MUIMasterBase 17;
 procedure MUI_Redraw(Obj: PObject_; Flags: LongWord); syscall MUIMasterBase 17;
-function MUI_CreateCustomClass(Base: PLibrary; Supername: PChar; Supermcc: PMUI_CustomClass; DataSize: LongInt; Dispatcher: Pointer): PMUI_CustomClass; syscall MUIMasterBase 18;
+function MUI_CreateCustomClass(Base: PLibrary; Supername: PAnsiChar; Supermcc: PMUI_CustomClass; DataSize: LongInt; Dispatcher: Pointer): PMUI_CustomClass; syscall MUIMasterBase 18;
 function MUI_DeleteCustomClass(Mcc: PMUI_CustomClass): LongBool; syscall MUIMasterBase 19;
 function MUI_DeleteCustomClass(Mcc: PMUI_CustomClass): LongBool; syscall MUIMasterBase 19;
 function MUI_MakeObjectA(Typ: LongInt; Params: PIPTR): PObject_; syscall MUIMasterBase 20;
 function MUI_MakeObjectA(Typ: LongInt; Params: PIPTR): PObject_; syscall MUIMasterBase 20;
 function MUI_Layout(Obj: PObject_; Left: LongInt; Top: LongInt; Width: LongInt; Height: LongInt; Flags: LongWord): LongBool; syscall MUIMasterBase 21;
 function MUI_Layout(Obj: PObject_; Left: LongInt; Top: LongInt; Width: LongInt; Height: LongInt; Flags: LongWord): LongBool; syscall MUIMasterBase 21;
@@ -4340,8 +4340,8 @@ function MUIV_Window_Width_Screen(p: LongInt): LongInt;
 function MUI_AllocAslRequestTags(ReqTyp: Longword; const Tags: array of PtrUInt): Pointer;
 function MUI_AllocAslRequestTags(ReqTyp: Longword; const Tags: array of PtrUInt): Pointer;
 function MUI_AslRequestTags(req: Pointer; const Tags : array of PtrUInt): LongBool;
 function MUI_AslRequestTags(req: Pointer; const Tags : array of PtrUInt): LongBool;
 function MUI_MakeObject(_Type: LongInt; const Params : array of PtrUInt): PObject_;
 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
 implementation
 
 
@@ -4629,12 +4629,12 @@ begin
   MUI_MakeObject := MUI_MakeObjectA(_Type, @Params);
   MUI_MakeObject := MUI_MakeObjectA(_Type, @Params);
 end;
 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
 begin
   MUI_NewObject := MUI_NewObjectA(a0arg , @Tags);
   MUI_NewObject := MUI_NewObjectA(a0arg , @Tags);
 end;
 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
 begin
   MUI_Request := MUI_RequestA(App, Win, Flags, Title, Gadgets, Format, @Params);
   MUI_Request := MUI_RequestA(App, Win, Flags, Title, Gadgets, Format, @Params);
 end;
 end;

+ 2 - 2
packages/arosunits/src/serial.pas

@@ -23,7 +23,7 @@ uses
 
 
 type
 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;
   PIOTArray = ^TIOTArray;
   TIOTArray = record
   TIOTArray = record
     TermArray0: LongWord;
     TermArray0: LongWord;
@@ -155,7 +155,7 @@ const
   IOSERB_ACTIVE   = 4;                     // rqst-qued-OR-current
   IOSERB_ACTIVE   = 4;                     // rqst-qued-OR-current
   IOSERF_ACTIVE   = 1 shl IOSERB_ACTIVE;
   IOSERF_ACTIVE   = 1 shl IOSERB_ACTIVE;
 
 
-  SERIALNAME: PChar = 'serial.device';
+  SERIALNAME: PAnsiChar = 'serial.device';
 
 
 implementation
 implementation
 
 

+ 1 - 1
packages/arosunits/src/tagsarray.pas

@@ -49,7 +49,7 @@ begin
         vtboolean : TagList[ii].ti_data := IPTR(byte(Args[i].vboolean));
         vtboolean : TagList[ii].ti_data := IPTR(byte(Args[i].vboolean));
         vtpchar   : TagList[ii].ti_data := IPTR(Args[i].vpchar);
         vtpchar   : TagList[ii].ti_data := IPTR(Args[i].vpchar);
         vtchar    : TagList[ii].ti_data := IPTR(Args[i].vchar);
         vtchar    : TagList[ii].ti_data := IPTR(Args[i].vchar);
-        vtstring  : TagList[ii].ti_data := IPTR(PChar(string(Args[i].vstring^)));
+        vtstring  : TagList[ii].ti_data := IPTR(PAnsiChar(string(Args[i].vstring^)));
         vtpointer : TagList[ii].ti_data := IPTR(Args[i].vpointer);
         vtpointer : TagList[ii].ti_data := IPTR(Args[i].vpointer);
       end;
       end;
       inc(ii);
       inc(ii);

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

@@ -42,7 +42,7 @@ const
   UNIT_WAITUNTIL      = 3;
   UNIT_WAITUNTIL      = 3;
   UNIT_WAITECLOCK     = 4;
   UNIT_WAITECLOCK     = 4;
 
 
-  TIMERNAME: PChar = 'timer.device';
+  TIMERNAME: PAnsiChar = 'timer.device';
 
 
 type
 type
   PTimeval = ^TTimeval;
   PTimeval = ^TTimeval;

+ 6 - 6
packages/arosunits/src/utility.pas

@@ -231,8 +231,8 @@ function SDivMod32(Dividend, Divisor: LongInt): Int64; syscall AOS_UtilityBase 2
 function UDivMod32(Dividend, Divisor: LongWord): LongWord; syscall AOS_UtilityBase 26;
 function UDivMod32(Dividend, Divisor: LongWord): LongWord; syscall AOS_UtilityBase 26;
 function Stricmp(const Str1: STRPTR; const Str2: STRPTR): LongInt; syscall AOS_UtilityBase 27;
 function Stricmp(const Str1: STRPTR; const Str2: STRPTR): LongInt; syscall AOS_UtilityBase 27;
 function Strnicmp(const Str1: STRPTR; const Str2 : STRPTR; Length_: LongInt): LongInt; syscall AOS_UtilityBase 28;
 function Strnicmp(const Str1: STRPTR; const Str2 : STRPTR; Length_: LongInt): LongInt; syscall AOS_UtilityBase 28;
-function ToUpper(c: LongWord): Char; syscall AOS_UtilityBase 29;
-function ToLower(c: LongWord): Char; syscall AOS_UtilityBase 30;
+function ToUpper(c: LongWord): AnsiChar; syscall AOS_UtilityBase 29;
+function ToLower(c: LongWord): AnsiChar; syscall AOS_UtilityBase 30;
 procedure ApplyTagChanges(List: PTagItem; ChangeList: PTagItem); syscall AOS_UtilityBase 31;
 procedure ApplyTagChanges(List: PTagItem; ChangeList: PTagItem); syscall AOS_UtilityBase 31;
 function SMult64(Arg1, Arg2: LongInt): Int64; syscall AOS_UtilityBase 33;
 function SMult64(Arg1, Arg2: LongInt): Int64; syscall AOS_UtilityBase 33;
 function UMult64(Arg1, Arg2: LongWord): QWord; syscall AOS_UtilityBase 34;
 function UMult64(Arg1, Arg2: LongWord): QWord; syscall AOS_UtilityBase 34;
@@ -256,13 +256,13 @@ function AllocNamedObject(const Name: STRPTR; const Tags: array of PtrUInt): PNa
 function CallHook(Hook: PHook; Object_: APTR; const Params: array of PtrUInt): IPTR;
 function CallHook(Hook: PHook; Object_: APTR; const Params: array of PtrUInt): IPTR;
 
 
 function TAG_(Value: Pointer): PtrUInt; overload; 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: boolean): PtrUInt; overload; inline;
 function TAG_(Value: LongInt): PtrUInt; overload; inline;
 function TAG_(Value: LongInt): PtrUInt; overload; inline;
 function TAG_(Value: LongWord): PtrUInt; overload; inline;
 function TAG_(Value: LongWord): PtrUInt; overload; inline;
 
 
 function AsTag(Value: Pointer): 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: boolean): PtrUInt; overload; inline;
 function AsTag(Value: LongInt): PtrUInt; overload; inline;
 function AsTag(Value: LongInt): PtrUInt; overload; inline;
 function AsTag(Value: LongWord): PtrUInt; overload; inline;
 function AsTag(Value: LongWord): PtrUInt; overload; inline;
@@ -297,7 +297,7 @@ begin
   TAG_ := PtrUInt(Value);
   TAG_ := PtrUInt(Value);
 end;
 end;
 
 
-function TAG_(value: pchar): PtrUInt; inline;
+function TAG_(value: PAnsiChar): PtrUInt; inline;
 begin
 begin
   TAG_ := PtrUInt(Value);
   TAG_ := PtrUInt(Value);
 end;
 end;
@@ -325,7 +325,7 @@ begin
   AsTag := PtrUInt(Value);
   AsTag := PtrUInt(Value);
 end;
 end;
 
 
-function AsTag(value: pchar): PtrUInt; inline;
+function AsTag(value: PAnsiChar): PtrUInt; inline;
 begin
 begin
   AsTag := PtrUInt(Value);
   AsTag := PtrUInt(Value);
 end;
 end;

+ 9 - 9
packages/arosunits/src/workbench.pas

@@ -35,7 +35,7 @@ type
   PWBArg = ^TWBArg;
   PWBArg = ^TWBArg;
   TWBArg = record
   TWBArg = record
     wa_Lock: BPTR;       // A lock descriptor.
     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;
   end;
 
 
 // ###### <freepascal> ######################################################
 // ###### <freepascal> ######################################################
@@ -51,14 +51,14 @@ type
     sm_Process: PMsgPort;    // The process descriptor for you.
     sm_Process: PMsgPort;    // The process descriptor for you.
     sm_Segment: BPTR;        // A descriptor for your code.
     sm_Segment: BPTR;        // A descriptor for your code.
     sm_NumArgs: LongInt;     // The number of elements in ArgList.
     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
     sm_ArgList: PWBArgList;  // The arguments themselves
   end;
   end;
 
 
 // ###### workbench/workbench.h #############################################
 // ###### workbench/workbench.h #############################################
 
 
 const
 const
-  WORKBENCHNAME: PChar = 'workbench.library';  // Workbench library name.
+  WORKBENCHNAME: PAnsiChar = 'workbench.library';  // Workbench library name.
 
 
 type
 type
   POldDrawerData = ^TOldDrawerData;
   POldDrawerData = ^TOldDrawerData;
@@ -105,7 +105,7 @@ type
     do_Gadget: TGadget;          // A copy of in core gadget.
     do_Gadget: TGadget;          // A copy of in core gadget.
     do_type: Byte;
     do_type: Byte;
     do_DefaultTool: STRPTR;
     do_DefaultTool: STRPTR;
-    do_Tooltypes: PPChar;
+    do_Tooltypes: PPAnsiChar;
     do_CurrentX: LongInt;
     do_CurrentX: LongInt;
     do_CurrentY: LongInt;
     do_CurrentY: LongInt;
     do_DrawerData: PDrawerData;
     do_DrawerData: PDrawerData;
@@ -560,7 +560,7 @@ function QuoteWorkbench(StringNum: LongWord): LongBool; syscall WorkbenchBase 6;
 function StartWorkbench(Flag: LongWord; Ptr: APTR): LongBool; syscall WorkbenchBase 7;
 function StartWorkbench(Flag: LongWord; Ptr: APTR): LongBool; syscall WorkbenchBase 7;
 function AddAppWindowA(ID: LongWord; UserData: LongWord; Window: PWindow; MsgPort: PMsgPort; TagList: PTagItem): PAppWindow;  syscall WorkbenchBase 8;
 function AddAppWindowA(ID: LongWord; UserData: LongWord; Window: PWindow; MsgPort: PMsgPort; TagList: PTagItem): PAppWindow;  syscall WorkbenchBase 8;
 function RemoveAppWindow(AppWindow: PAppWindow): LongBool;  syscall WorkbenchBase 9;
 function RemoveAppWindow(AppWindow: PAppWindow): LongBool;  syscall WorkbenchBase 9;
-function AddAppIconA(ID: LongWord; UserData: LongWord; Text_: PChar; MsgPort: PMsgPort; Lock: BPTR; DiskObj: PDiskObject; TagList: PTagItem): PAppIcon; syscall WorkbenchBase 10;
+function AddAppIconA(ID: LongWord; UserData: LongWord; Text_: PAnsiChar; MsgPort: PMsgPort; Lock: BPTR; DiskObj: PDiskObject; TagList: PTagItem): PAppIcon; syscall WorkbenchBase 10;
 function RemoveAppIcon(AppIcon: PAppIcon): LongBool; syscall WorkbenchBase 11;
 function RemoveAppIcon(AppIcon: PAppIcon): LongBool; syscall WorkbenchBase 11;
 function AddAppMenuItemA(ID: LongWord; UserData: LongWord; Text_: APTR; MsgPort: PMsgPort; TagList: PTagItem): PAppMenuItem; syscall WorkbenchBase 12;
 function AddAppMenuItemA(ID: LongWord; UserData: LongWord; Text_: APTR; MsgPort: PMsgPort; TagList: PTagItem): PAppMenuItem; syscall WorkbenchBase 12;
 function RemoveAppMenuItem(AppMenuItem: PAppMenuItem): LongBool; syscall WorkbenchBase 13;
 function RemoveAppMenuItem(AppMenuItem: PAppMenuItem): LongBool; syscall WorkbenchBase 13;
@@ -579,11 +579,11 @@ function MakeWorkbenchObjectVisibleA(Name: STRPTR; Tags: PTagItem): LongBool; sy
 function RegisterWorkbench(MessagePort: PMsgPort): LongBool; syscall WorkbenchBase 23;
 function RegisterWorkbench(MessagePort: PMsgPort): LongBool; syscall WorkbenchBase 23;
 function UnregisterWorkbench(MessagePort: PMsgPort): LongBool; syscall WorkbenchBase 24;
 function UnregisterWorkbench(MessagePort: PMsgPort): LongBool; syscall WorkbenchBase 24;
 function UpdateWorkbenchObjectA(Name: STRPTR; Type_: LongInt; Tags: PTagItem): LongBool; syscall WorkbenchBase 25;
 function UpdateWorkbenchObjectA(Name: STRPTR; Type_: LongInt; Tags: PTagItem): LongBool; syscall WorkbenchBase 25;
-function SendAppWindowMessage(Win: PWindow; NumFiles: LongWord; Files: PPChar; Class_: Word; MouseX: SmallInt; MouseY: SmallInt; Seconds: LongWord; Micros: LongWord): LongBool; syscall WorkbenchBase 26;
-function GetNextAppIcon(LastDiskObj: PDiskObject; Text_: PChar): PDiskObject; syscall WorkbenchBase 27;
+function SendAppWindowMessage(Win: PWindow; NumFiles: LongWord; Files: PPAnsiChar; Class_: Word; MouseX: SmallInt; MouseY: SmallInt; Seconds: LongWord; Micros: LongWord): LongBool; syscall WorkbenchBase 26;
+function GetNextAppIcon(LastDiskObj: PDiskObject; Text_: PAnsiChar): PDiskObject; syscall WorkbenchBase 27;
 
 
 // varargs versions:
 // 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 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 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;
 function AddAppWindowDropZone(Aw: PAppWindow; ID: LongWord; UserData: LongWord; const Tags: array of PtrUInt): PAppWindowDropZone;
@@ -596,7 +596,7 @@ implementation
 
 
 
 
 // varargs versions:
 // 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
 begin
   AddAppIcon := AddAppIconA(ID, UserData, Text_, MsgPort, Lock, DiskObj, @Tags);
   AddAppIcon := AddAppIconA(ID, UserData, Text_, MsgPort, Lock, DiskObj, @Tags);
 end;
 end;