Browse Source

* PChar -> PAnsiChar

Michaël Van Canneyt 2 years ago
parent
commit
99106402cb
100 changed files with 1478 additions and 1478 deletions
  1. 1 1
      packages/amunits/examples/amicube.pas
  2. 2 2
      packages/amunits/examples/asltest.pas
  3. 3 3
      packages/amunits/examples/deviceinfo.pas
  4. 2 2
      packages/amunits/examples/dirdemo.pas
  5. 1 1
      packages/amunits/examples/easter.pas
  6. 6 6
      packages/amunits/examples/easygadtools.pas
  7. 7 7
      packages/amunits/examples/getdate.pas
  8. 2 2
      packages/amunits/examples/getmultifiles.pas
  9. 3 3
      packages/amunits/examples/gtmenu.pas
  10. 10 10
      packages/amunits/examples/imagegadget.pas
  11. 1 1
      packages/amunits/examples/listtest.pas
  12. 1 1
      packages/amunits/examples/otherlibs/amarqueetest.pas
  13. 2 2
      packages/amunits/examples/otherlibs/bestmodeid.pas
  14. 1 1
      packages/amunits/examples/otherlibs/checkbox.pas
  15. 12 12
      packages/amunits/examples/otherlibs/demo.pas
  16. 3 3
      packages/amunits/examples/otherlibs/gadgetdemo.pas
  17. 1 1
      packages/amunits/examples/otherlibs/gttest.pas
  18. 4 4
      packages/amunits/examples/otherlibs/linklib.pas
  19. 1 1
      packages/amunits/examples/otherlibs/listview.pas
  20. 1 1
      packages/amunits/examples/otherlibs/modelist.pas
  21. 3 3
      packages/amunits/examples/otherlibs/openpip.pas
  22. 5 5
      packages/amunits/examples/otherlibs/openscreen.pas
  23. 2 2
      packages/amunits/examples/otherlibs/p96checkboards.pas
  24. 1 1
      packages/amunits/examples/otherlibs/requestmodeid.pas
  25. 6 6
      packages/amunits/examples/otherlibs/rtdemo.pas
  26. 2 2
      packages/amunits/examples/otherlibs/smallplay.pas
  27. 3 3
      packages/amunits/examples/otherlibs/toolmanager1.pas
  28. 3 3
      packages/amunits/examples/otherlibs/toolmanager2.pas
  29. 3 3
      packages/amunits/examples/otherlibs/toolmanager3.pas
  30. 4 4
      packages/amunits/examples/otherlibs/tritongadgets.pas
  31. 2 2
      packages/amunits/examples/otherlibs/writetruecolordata.pas
  32. 3 3
      packages/amunits/examples/showdevs.pas
  33. 1 1
      packages/amunits/examples/snow.pas
  34. 6 6
      packages/amunits/examples/sortdemo.pas
  35. 1 1
      packages/amunits/examples/stars.pas
  36. 2 2
      packages/amunits/examples/talk2boopsi.pas
  37. 3 3
      packages/amunits/examples/wbtest.pas
  38. 25 25
      packages/amunits/src/coreunits/agraphics.pas
  39. 301 301
      packages/amunits/src/coreunits/amigados.pas
  40. 9 9
      packages/amunits/src/coreunits/amigaguide.pas
  41. 9 9
      packages/amunits/src/coreunits/amigalib.pas
  42. 12 12
      packages/amunits/src/coreunits/amigaprinter.pas
  43. 2 2
      packages/amunits/src/coreunits/asl.pas
  44. 1 1
      packages/amunits/src/coreunits/audio.pas
  45. 2 2
      packages/amunits/src/coreunits/bootblock.pas
  46. 2 2
      packages/amunits/src/coreunits/bullet.pas
  47. 1 1
      packages/amunits/src/coreunits/colorwheel.pas
  48. 6 6
      packages/amunits/src/coreunits/commodities.pas
  49. 1 1
      packages/amunits/src/coreunits/console.pas
  50. 1 1
      packages/amunits/src/coreunits/datatypes.pas
  51. 6 6
      packages/amunits/src/coreunits/diskfont.pas
  52. 58 58
      packages/amunits/src/coreunits/exec.pas
  53. 1 1
      packages/amunits/src/coreunits/expansion.pas
  54. 1 1
      packages/amunits/src/coreunits/gadtools.pas
  55. 9 9
      packages/amunits/src/coreunits/hardblocks.pas
  56. 32 32
      packages/amunits/src/coreunits/icon.pas
  57. 4 4
      packages/amunits/src/coreunits/iffparse.pas
  58. 77 77
      packages/amunits/src/coreunits/intuition.pas
  59. 6 6
      packages/amunits/src/coreunits/keymap.pas
  60. 1 1
      packages/amunits/src/coreunits/layers.pas
  61. 12 12
      packages/amunits/src/coreunits/locale.pas
  62. 1 1
      packages/amunits/src/coreunits/lowlevel.pas
  63. 6 6
      packages/amunits/src/coreunits/nonvolatile.pas
  64. 1 1
      packages/amunits/src/coreunits/parallel.pas
  65. 19 19
      packages/amunits/src/coreunits/prefs.pas
  66. 1 1
      packages/amunits/src/coreunits/prtbase.pas
  67. 2 2
      packages/amunits/src/coreunits/realtime.pas
  68. 13 13
      packages/amunits/src/coreunits/rexx.pas
  69. 1 1
      packages/amunits/src/coreunits/romboot_base.pas
  70. 2 2
      packages/amunits/src/coreunits/serial.pas
  71. 1 1
      packages/amunits/src/coreunits/timer.pas
  72. 2 2
      packages/amunits/src/coreunits/trackdisk.pas
  73. 2 2
      packages/amunits/src/coreunits/translator.pas
  74. 30 30
      packages/amunits/src/coreunits/utility.pas
  75. 23 23
      packages/amunits/src/coreunits/workbench.pas
  76. 3 3
      packages/amunits/src/otherlibs/ahi.pas
  77. 1 1
      packages/amunits/src/otherlibs/ahi_sub.pas
  78. 98 98
      packages/amunits/src/otherlibs/amarquee.pas
  79. 2 2
      packages/amunits/src/otherlibs/cybergraphics.pas
  80. 11 11
      packages/amunits/src/otherlibs/gtlayout.pas
  81. 13 13
      packages/amunits/src/otherlibs/guigfx.pas
  82. 25 25
      packages/amunits/src/otherlibs/identify.pas
  83. 2 2
      packages/amunits/src/otherlibs/lucyplay.pas
  84. 101 101
      packages/amunits/src/otherlibs/mui.pas
  85. 1 1
      packages/amunits/src/otherlibs/mysticview.pas
  86. 3 3
      packages/amunits/src/otherlibs/picasso96api.pas
  87. 4 4
      packages/amunits/src/otherlibs/preferences.pas
  88. 7 7
      packages/amunits/src/otherlibs/ptreplay.pas
  89. 1 1
      packages/amunits/src/otherlibs/render.pas
  90. 50 50
      packages/amunits/src/otherlibs/reqtools.pas
  91. 50 50
      packages/amunits/src/otherlibs/triton.pas
  92. 213 213
      packages/amunits/src/otherlibs/tritonmacros.pas
  93. 1 1
      packages/amunits/src/otherlibs/ttengine.pas
  94. 10 10
      packages/amunits/src/otherlibs/xadmaster.pas
  95. 3 3
      packages/amunits/src/otherlibs/zlib.pas
  96. 18 18
      packages/amunits/src/utilunits/amigautils.pas
  97. 24 24
      packages/amunits/src/utilunits/consoleio.pas
  98. 3 3
      packages/amunits/src/utilunits/deadkeys.pas
  99. 26 26
      packages/amunits/src/utilunits/easyasl.pas
  100. 11 11
      packages/amunits/src/utilunits/hisoft.pas

+ 1 - 1
packages/amunits/examples/amicube.pas

@@ -164,7 +164,7 @@ begin
 end;
 
 const
-  win_info: array[0..63] of char = '';
+  win_info: array[0..63] of AnsiChar = '';
 
 var
   win: PWindow;

+ 2 - 2
packages/amunits/examples/asltest.pas

@@ -36,10 +36,10 @@ BEGIN
         if dummy then begin
            MessageBox('Test of Asl',
                       ' The path is:" ' +
-                      string(fr^.rf_Dir) + '"' +
+                      ShortString(fr^.rf_Dir) + '"' +
                       chr(10) +
                       'And the file is: "' +
-                      string(fr^.rf_File) + '"', 
+                      ShortString(fr^.rf_File) + '"',
                       'OK');
         end else MessageBox('Test of Asl','You canceled','OK');
         FreeAslRequest(fr);

+ 3 - 3
packages/amunits/examples/deviceinfo.pas

@@ -30,8 +30,8 @@ Var
   MyLock          : longint;
   Inf             : pInfoData;
   Ok              : Boolean;
-  Myfile          : string;
-  S, S1           : String;
+  Myfile          : ShortString;
+  S, S1           : ShortString;
   Size, Used, Bpb : Integer;
 
 Procedure Cls;
@@ -41,7 +41,7 @@ Begin
 
 End;
 
-Procedure AsdaLaVista(warum : String ; code : longint);
+Procedure AsdaLaVista(warum : ShortString ; code : longint);
 
 Begin
   If Inf   <> Nil Then FreeMem(Inf);

+ 2 - 2
packages/amunits/examples/dirdemo.pas

@@ -23,7 +23,7 @@ VAR ExData       : pExAllData;
     FileList     : pList;
     DirList      : pList;
     tempnode     : pFPCNode;
-    Buffer       : PChar;
+    Buffer       : PAnsiChar;
     i,temp       : longint;
     TotalSize    : longint;
     TheDir       : AnsiString;
@@ -61,7 +61,7 @@ BEGIN
     EAC^.eac_LastKey := 0;
     EAC^.eac_MatchString := NIL;
     EAC^.eac_MatchFunc := NIL;
-    MyLock:=Lock(PChar(TheDir),SHARED_LOCK);
+    MyLock:=Lock(PAnsiChar(TheDir),SHARED_LOCK);
     IF MyLock=0 THEN CleanUp('No lock on directory',10);
 
     REPEAT

+ 1 - 1
packages/amunits/examples/easter.pas

@@ -22,7 +22,7 @@ Program easter;
 
 uses amigados;
 
-const version : pchar = '$VER: easter v1.0 (3-Nov-95) by Andreas Tetzl';
+const version : PAnsiChar = '$VER: easter v1.0 (3-Nov-95) by Andreas Tetzl';
 
 VAR i,a,b,c,d,e,m,n : Integer;
     year, month, day : longint;

+ 6 - 6
packages/amunits/examples/easygadtools.pas

@@ -19,7 +19,7 @@ USES Intuition, Exec, AGraphics, GadTools, Utility;
 
 CONST
 
-     strarray : array[0..4] of PChar = ('A cycle',
+     strarray : array[0..4] of PAnsiChar = ('A cycle',
                                         'test',
                                         'for',
                                         'FPC Pascal',
@@ -38,7 +38,7 @@ VAR
   HG                : word;
   attr              : pTextAttr;
 
-function NewGadget(left,top,width,height : Integer; txt : PChar; txtattr: pTextAttr;
+function NewGadget(left,top,width,height : Integer; txt : PAnsiChar; txtattr: pTextAttr;
                    id : word; flags: Longint; visinfo, userdata : Pointer): tNewGadget;
 var
     ng : tNewGadget;
@@ -58,7 +58,7 @@ begin
     NewGadget := ng;
 end;
 
-PROCEDURE CleanUp(why : string; rc : BYTE);
+PROCEDURE CleanUp(why : ShortString; rc : BYTE);
 BEGIN
   IF assigned(wp) THEN CloseWindow(wp);
   IF assigned(glist) THEN FreeGadgets(glist);
@@ -83,7 +83,7 @@ BEGIN
   END;
 END;
 
-function ButtonGadget(id,left,top,width,height:word; txt:pchar): pGadget;
+function ButtonGadget(id,left,top,width,height:word; txt:PAnsiChar): pGadget;
 begin
    ng := NewGadget(left,top,width,height,txt,attr,id,PLACETEXT_IN,vi,nil);
    gad := CreateGadgetA(BUTTON_KIND,gad,@ng,nil);
@@ -92,10 +92,10 @@ end;
 
 function ButtonGadget(id,left,top,width,height:word; txt: AnsiString): pGadget;
 begin
-   ButtonGadget := ButtonGadget(id,left,top,width,height,PChar(txt));
+   ButtonGadget := ButtonGadget(id,left,top,width,height,PAnsiChar(txt));
 end;
 
-function CycleGadget(id,left,top,width,height:word; txt:pchar ; thearr : Pointer): pGadget;
+function CycleGadget(id,left,top,width,height:word; txt:PAnsiChar ; thearr : Pointer): pGadget;
 begin
    ng := NewGadget(left,top,width,height,txt,attr,id,PLACETEXT_LEFT,vi,nil);
    gad := CreateGadget(CYCLE_KIND,gad,@ng,[

+ 7 - 7
packages/amunits/examples/getdate.pas

@@ -12,21 +12,21 @@ Program GetDate;
 
 uses amigados, strings;
 
-const template : pchar = 'Format/K,Help/S';
+const template : PAnsiChar = 'Format/K,Help/S';
 
-      version : pchar = '$VER: GetDate 1.0 (21.2.95)';
+      version : PAnsiChar = '$VER: GetDate 1.0 (21.2.95)';
 
 VAR DS : tDateStamp;
     DT : _tDateTime;
     rda : pRDArgs;
-    WeekDay, Date, Time, hours, mins, secs, day, month, year : pchar;
+    WeekDay, Date, Time, hours, mins, secs, day, month, year : PAnsiChar;
     vec : Array[0..1] of longint;
     i : longint;
-    LFormat : pchar;
+    LFormat : PAnsiChar;
 
 Procedure PrintFormat;
-VAR Str : string;
-    tmp : string;
+VAR Str : ShortString;
+    tmp : ShortString;
 Begin
  Str := strpas(LFormat);
  tmp := '';
@@ -82,7 +82,7 @@ begin
 
  LFormat:=StrAlloc(100);
 
- If StrComp(pointer(vec[0]),pchar('')) <> 0 then StrCopy(LFormat,pointer(vec[0])) else LFormat:=NIL;
+ If StrComp(pointer(vec[0]),PAnsiChar('')) <> 0 then StrCopy(LFormat,pointer(vec[0])) else LFormat:=NIL;
 
 
  If vec[1]<>0 then Help;

+ 2 - 2
packages/amunits/examples/getmultifiles.pas

@@ -14,9 +14,9 @@ uses exec,easyasl, linklist, strings, amigautils;
 
 VAR
 
-  pdummy   : array [0..108] of char;
+  pdummy   : array [0..108] of AnsiChar;
 
-  path     : PChar;
+  path     : PAnsiChar;
   dummy    : boolean;
   mylist   : pList;
   mynode   : pFPCNode;

+ 3 - 3
packages/amunits/examples/gtmenu.pas

@@ -142,9 +142,9 @@ begin
     {
       make the barlabels
     }
-    mynewmenu[3].nm_Label := PChar(NM_BARLABEL);
-    mynewmenu[7].nm_Label := PChar(NM_BARLABEL);
-    mynewmenu[13].nm_Label := PChar(NM_BARLABEL);
+    mynewmenu[3].nm_Label := PAnsiChar(NM_BARLABEL);
+    mynewmenu[7].nm_Label := PAnsiChar(NM_BARLABEL);
+    mynewmenu[13].nm_Label := PAnsiChar(NM_BARLABEL);
 
     if pExecBase(_ExecBase)^.LibNode.Lib_Version >= 39 then begin
         MenuStrip := CreateMenus(@mynewmenu, [

+ 10 - 10
packages/amunits/examples/imagegadget.pas

@@ -6,7 +6,7 @@ PROGRAM ImageGadget;
    20 Sep 1998.
 
    Changed the code to use TAGS, now also use
-   pas2c for strings-pchar.
+   pas2c for strings-PAnsiChar.
    1 Nov 1998.
 
    Removed opening of gadtools.library.
@@ -25,13 +25,13 @@ USES Intuition, Exec, AGraphics, GadTools, Utility;
 
 
 CONST
-  MSG_NO_PS            : PChar = 'Can''t lock Public Screen';
-  MSG_NO_VI            : PChar = 'Can''t get Visual Info';
-  MSG_NO_MEM           : PChar = 'Not enough memory free';
-  MSG_NO_WP            : PChar = 'Can''t open window';
+  MSG_NO_PS            : PAnsiChar = 'Can''t lock Public Screen';
+  MSG_NO_VI            : PAnsiChar = 'Can''t get Visual Info';
+  MSG_NO_MEM           : PAnsiChar = 'Not enough memory free';
+  MSG_NO_WP            : PAnsiChar = 'Can''t open window';
 
-  WIN_TITLE            : PChar = 'Images-Example';
-  OK_TEXT              : PChar = 'OK';
+  WIN_TITLE            : PAnsiChar = 'Images-Example';
+  OK_TEXT              : PAnsiChar = 'OK';
 
   type
       data = array[1..176] of word;
@@ -242,7 +242,7 @@ VAR
   wp                : pWindow;
 
 
-function NewGadget(left,top,width,height : Integer; txt : PChar; txtattr: pTextAttr;
+function NewGadget(left,top,width,height : Integer; txt : PAnsiChar; txtattr: pTextAttr;
                    id : word; flags: Longint; visinfo, userdata : Pointer):
 tNewGadget;
 var
@@ -286,7 +286,7 @@ end;
 
 
 
-FUNCTION EasyReq(wp : pWindow; title,body,gad : PChar) : Longint;
+FUNCTION EasyReq(wp : pWindow; title,body,gad : PAnsiChar) : Longint;
 VAR
   es : tEasyStruct;
   Res: LongWord;
@@ -300,7 +300,7 @@ BEGIN
   EasyReq := EasyRequestArgs(wp,@es,@Res,NIL);
 END;
 
-PROCEDURE CleanUp(why : PChar; rc : BYTE);
+PROCEDURE CleanUp(why : PAnsiChar; rc : BYTE);
 BEGIN
   IF assigned(wp) THEN CloseWindow(wp);
   IF assigned(gl) THEN FreeGadgets(gl);

+ 1 - 1
packages/amunits/examples/listtest.pas

@@ -18,7 +18,7 @@ uses
     MyNode   : pFPCNode;
     i        : Longint;
     temp     : Longint;
-    buffer   : PChar;
+    buffer   : PAnsiChar;
     bufsize  : Longint;
     templist : pList;
 

+ 1 - 1
packages/amunits/examples/otherlibs/amarqueetest.pas

@@ -37,7 +37,7 @@ begin
       end;
 
     {Set a variable}
-    setOpVal := QSetOp(session, 'testVal',pchar('just a test'#0), 12);
+    setOpVal := QSetOp(session, 'testVal',PAnsiChar('just a test'#0), 12);
     if setOpVal = 0 then begin
       writeln('Warning, QSetOp failed.');
       end;

+ 2 - 2
packages/amunits/examples/otherlibs/bestmodeid.pas

@@ -21,10 +21,10 @@ uses exec, amigados, agraphics, picasso96api, utility;
 
 Const
 
-    template    :   pchar  =    'Width=W/N,Height=H/N,Depth=D/N';
+    template    :   PAnsiChar  =    'Width=W/N,Height=H/N,Depth=D/N';
     vecarray    :   Array[0..2] of long = (0,0,0);
 
-    fmtstrings  :   Array [1..(Ord(RGBFB_MaxFormats)-2)] OF pchar = (
+    fmtstrings  :   Array [1..(Ord(RGBFB_MaxFormats)-2)] OF PAnsiChar = (
                     'RGBFB_NONE',
                     'RGBFB_CLUT',
                     'RGBFB_R8G8B8',

+ 1 - 1
packages/amunits/examples/otherlibs/checkbox.pas

@@ -20,7 +20,7 @@ VAR
      trmsg    : pTR_Message;
      dummy    : Longint;
 
-procedure CleanUp(why : string; err : longint);
+procedure CleanUp(why : ShortString; err : longint);
 begin
     if assigned(Project) then TR_CloseProject(Project);
     if assigned(App) then TR_DeleteApp(App);

+ 12 - 12
packages/amunits/examples/otherlibs/demo.pas

@@ -48,9 +48,9 @@ VAR
 const
     NULL : longint = longint(nil);
 
-Function IntToStr (I : Longint) : String;
+Function IntToStr (I : Longint) : ShortString;
 
-     Var S : String;
+     Var S : ShortString;
 
      begin
       Str (I,S);
@@ -115,7 +115,7 @@ VAR
 
 BEGIN
     ProjectStart;
-    WindowTitle('Groups'); WindowPosition(TRWP_CENTERDISPLAY); WindowUnderscore(string('~')); WindowID(1);
+    WindowTitle('Groups'); WindowPosition(TRWP_CENTERDISPLAY); WindowUnderscore(ShortString('~')); WindowID(1);
 
     HorizGroupA; Space; VertGroupA;
     Space;
@@ -280,7 +280,7 @@ END;
 
 PROCEDURE do_gadgets;
 CONST
-  cycle_entries : ARRAY [0..10] OF PChar = (
+  cycle_entries : ARRAY [0..10] OF PAnsiChar = (
                   'Entry 0',
                   '1',
                   '2',
@@ -294,7 +294,7 @@ CONST
                   NIL);
 
 
-  mx_entries : ARRAY [0..3] OF PChar = (
+  mx_entries : ARRAY [0..3] OF PAnsiChar = (
                   'Choice 0',
                   'Choice 1',
                   'Choice 2',
@@ -815,7 +815,7 @@ END;
 PROCEDURE do_lists;
 CONST
 
-    LVList1Strings : ARRAY[0..18] OF PChar = (
+    LVList1Strings : ARRAY[0..18] OF PAnsiChar = (
                        'This is a' ,
                        'READ ONLY' ,
                        'Listview' ,
@@ -838,7 +838,7 @@ CONST
 
 
 
-    LVList2Strings : ARRAY [0..8] OF PChar = (
+    LVList2Strings : ARRAY [0..8] OF PAnsiChar = (
                        'This is a' ,
                        'SELECT' ,
                        'Listview' ,
@@ -851,7 +851,7 @@ CONST
 
 
 
-    LVList3Strings : ARRAY [0..12] OF PChar = (
+    LVList3Strings : ARRAY [0..12] OF PAnsiChar = (
                        'This is a' ,
                        'SHOW' ,
                        'SELECTED' ,
@@ -951,8 +951,8 @@ VAR
     close_me          : BOOLEAN;
     trmsg             : pTR_Message;
     appwindow_project : pTR_Project;
-    chararray         : ARRAY [0..100] OF Char;
-    dirname           : PChar;
+    chararray         : ARRAY [0..100] OF AnsiChar;
+    dirname           : PAnsiChar;
     temp              : BOOLEAN;
     reqstr            : STRING[200];
 
@@ -1017,7 +1017,7 @@ VAR
     trmsg      : pTR_Message;
     quit       : BOOLEAN;
     reqstr     : string[255];
-    helpstring : PChar;
+    helpstring : PAnsiChar;
     abouttags  : Pointer;
 
 BEGIN
@@ -1111,7 +1111,7 @@ BEGIN
                                        END;
                                     END;
                  TRMS_HELP        : BEGIN
-                                      helpstring := PChar(TR_GetAttribute(Main_Project,trmsg^.trm_ID,TRDO_QuickHelpString));
+                                      helpstring := PAnsiChar(TR_GetAttribute(Main_Project,trmsg^.trm_ID,TRDO_QuickHelpString));
                                       IF helpstring <> NIL THEN BEGIN
                                          reqstr := 'Help for object ' + IntToStr(trmsg^.trm_ID) + ':' + #10 + '%h' + strpas(helpstring);
                                       END ELSE BEGIN

+ 3 - 3
packages/amunits/examples/otherlibs/gadgetdemo.pas

@@ -20,7 +20,7 @@ CONST
     NumInList   =  7;
     cyclenum    =  4;
 
-    mxstrings : ARRAY[0..NumInList-1] OF PChar = (
+    mxstrings : ARRAY[0..NumInList-1] OF PAnsiChar = (
                                         'Amiga 500',
                                         'Amiga 600',
                                         'Amiga 1200',
@@ -29,7 +29,7 @@ CONST
                                         'Amiga 4000',
                                          NIL);
 
-    cyclestrings : ARRAY[0..cyclenum-1] OF PChar = (
+    cyclestrings : ARRAY[0..cyclenum-1] OF PAnsiChar = (
                                         'Hallo',
                                         'Moin',
                                         'Tach',
@@ -129,7 +129,7 @@ ProjectStart;
                    SetTRTag(TRAT_Value,5);
                    SetTRTag(TRAT_ID,ScrollGadID);
                    Space;
-                   ClippedTextBoxMW(PChar('5'),ScrollGadTextID,2);
+                   ClippedTextBoxMW(PAnsiChar('5'),ScrollGadTextID,2);
                 EndLine;
                 Space;
                 BeginLine;

+ 1 - 1
packages/amunits/examples/otherlibs/gttest.pas

@@ -34,7 +34,7 @@ var
     msggadget : pGadget;
     done : boolean;
 
-procedure CleanUp(why : string; rc : integer);
+procedure CleanUp(why : ShortString; rc : integer);
 begin
     LT_DeleteHandle(handle);
     if why <> '' then MessageBox('GTLayout Report',why,'OK');

+ 4 - 4
packages/amunits/examples/otherlibs/linklib.pas

@@ -18,8 +18,8 @@ VAR
      Project  : pTR_Project;
      mylist   : pList;
      llist    : pList;
-     pdummy   : ARRAY [0..108] OF Char;
-     path     : PChar;
+     pdummy   : ARRAY [0..108] OF AnsiChar;
+     path     : PAnsiChar;
      Triton_App : pTR_App;
 
 const
@@ -96,8 +96,8 @@ PROCEDURE removelib;
 VAR
    num : Longint;
    mynode : pFPCNode;
-   strbuf : ARRAY [0..255] OF Char;
-   buffer : PChar;
+   strbuf : ARRAY [0..255] OF AnsiChar;
+   buffer : PAnsiChar;
    dummy : Longint;
 BEGIN
    buffer := @strbuf;

+ 1 - 1
packages/amunits/examples/otherlibs/listview.pas

@@ -16,7 +16,7 @@ uses exec, triton, tritonmacros, linklist, utility;
 
 const
 
-     weekday : array [0..6] of pchar =  (
+     weekday : array [0..6] of PAnsiChar =  (
                 'Monday',
                 'Tuesday',
                 'Wendsday',

+ 1 - 1
packages/amunits/examples/otherlibs/modelist.pas

@@ -19,7 +19,7 @@ Program ModeList;
 
 uses exec, amigados, picasso96api, utility;
 Const
-    template    :   pchar  =   'Width=W/N,Height=H/N,Depth=D/N';
+    template    :   PAnsiChar  =   'Width=W/N,Height=H/N,Depth=D/N';
     vecarray    :   Array[0..2] of long = (0,0,0);
 
 Var

+ 3 - 3
packages/amunits/examples/otherlibs/openpip.pas

@@ -21,12 +21,12 @@ uses exec, amigados, agraphics, intuition, picasso96api, utility,strings;
 
 
 Const
-    WB          :   Pchar = 'Workbench';
-    template    :   Pchar = 'Width=W/N,Height=H/N,Pubscreen=PS/K';
+    WB          :   PAnsiChar = 'Workbench';
+    template    :   PAnsiChar = 'Width=W/N,Height=H/N,Pubscreen=PS/K';
     vecarray    :   Array[0..2] of long = (0,0,0);
     ltrue       :   longint = 1;
 Var
-    PubScreenName   :   Array [0..80] Of Char;
+    PubScreenName   :   Array [0..80] Of AnsiChar;
     height,
     width           :   longint;
     wd              :   pWindow;

+ 5 - 5
packages/amunits/examples/otherlibs/openscreen.pas

@@ -25,8 +25,8 @@ uses exec, amigados, agraphics, intuition, picasso96api, utility;
 Const
 
     Pens        :   Array [0..0] Of integer = (NOT(0));
-    template    :   pchar  =   'Width=W/N,Height=H/N,Depth=D/N';
-    ScreenTitle :   pchar  =   'Picasso96 API Test';
+    template    :   PAnsiChar  =   'Width=W/N,Height=H/N,Depth=D/N';
+    ScreenTitle :   PAnsiChar  =   'Picasso96 API Test';
     vecarray    :   Array[0..2] of longint = (0,0,0);
     ltrue       :   longint = 1;
 
@@ -51,7 +51,7 @@ Var
     Depth       :   longint;
     rda         :   pRDArgs;
 
-procedure CleanUp(str : string);
+procedure CleanUp(str : ShortString);
 begin
     if assigned(wdp) then CloseWindow(wdp);
     if assigned(wdf) then CloseWindow(wdf);
@@ -121,7 +121,7 @@ BEGIN
     If wdp = Nil Then CleanUp('Unable to open window 1.');
 
     wdf:=OpenWindowTags(NIL,[WA_CustomScreen, PtrUInt(sc),
-                             WA_Title, PtrUInt(PChar('FillRect')),
+                             WA_Title, PtrUInt(PAnsiChar('FillRect')),
                              WA_Left,(sc^.Width div 2-200) div 2,
                              WA_Top,(sc^.Height-sc^.BarHeight-300)div 2,
                              WA_Zoom, PtrUInt(@Dimensions),
@@ -140,7 +140,7 @@ BEGIN
                              WA_SizeGadget, lTRUE,
                              WA_SizeBBottom, lTRUE,
                              WA_GimmeZeroZero, lTRUE,
-                             WA_ScreenTitle, PtrUInt(PChar(ScreenTitle)),
+                             WA_ScreenTitle, PtrUInt(PAnsiChar(ScreenTitle)),
                              WA_IDCMP, IDCMP_RAWKEY or IDCMP_CLOSEWINDOW,
                              TAG_DONE]);
 

+ 2 - 2
packages/amunits/examples/otherlibs/p96checkboards.pas

@@ -29,8 +29,8 @@ var
    LargestFreeMemory,
    MemoryClock,
    MoniSwitch  : Longint;
-   BoardName   : Pchar;
-   boardtmp    : array[0..200] of char;
+   BoardName   : PAnsiChar;
+   boardtmp    : array[0..200] of AnsiChar;
 
 FUNCTION GetMonitorValue(value : longint): STRING;
 BEGIN

+ 1 - 1
packages/amunits/examples/otherlibs/requestmodeid.pas

@@ -20,7 +20,7 @@ Program RequestModeID;
 uses exec, amigados, agraphics, intuition, picasso96api, utility;
 
 Const
-    template    :   pchar = 'Width=W/N,Height=H/N,Depth=D/N';
+    template    :   PAnsiChar = 'Width=W/N,Height=H/N,Depth=D/N';
 
     vecarray    :   Array[0..2] of longint = (0,0,0);
 

+ 6 - 6
packages/amunits/examples/otherlibs/rtdemo.pas

@@ -37,17 +37,17 @@ VAR
     fontreq         : prtFontRequester;
     scrnreq         : prtScreenModeRequester;
     filelist        : prtFileList;
-    buffer          : PChar;
-    filename        : PChar;
-    dummy           : PChar;
-    dummy2          : PChar;
+    buffer          : PAnsiChar;
+    filename        : PAnsiChar;
+    dummy           : PAnsiChar;
+    dummy2          : PAnsiChar;
     longnum         : Longword;
     ret             : Longint;
     color           : Longint;
     undertag        : Array [0..1] of tTagItem;
     Param           : array of PtrUInt;
 
-FUNCTION GetScrollValue(value : INTEGER): STRING;
+FUNCTION GetScrollValue(value : INTEGER): ShortString;
 BEGIN
     IF value = 0 THEN GetScrollValue := 'Off'
     ELSE GetScrollValue := 'On';
@@ -400,7 +400,7 @@ BEGIN
             Param[2] := scrnreq^.DisplayHeight;
             Param[3] := scrnreq^.DisplayDepth;
             Param[4] := scrnreq^.OverscanType;
-            Param[5] := AsTag(PChar(AnsiString(GetScrollValue(scrnreq^.AutoScroll))));
+            Param[5] := AsTag(PAnsiChar(AnsiString(GetScrollValue(scrnreq^.AutoScroll))));
             rtEZRequestA('You picked this mode:' + #10 +
                          'ModeID  : 0x%lx' + #10 +
                          'Size    : %ld x %ld' + #10 +

+ 2 - 2
packages/amunits/examples/otherlibs/smallplay.pas

@@ -11,14 +11,14 @@ program smallplay;
 uses exec, amigados, ptreplay;
 
 const
-    vstr : pchar = '$VER: SmallPlay 2.0 (23.12.93)';
+    vstr : PAnsiChar = '$VER: SmallPlay 2.0 (23.12.93)';
 
 var
     module : pModule;
     SigBit : shortint;
     SigMask : longint;
 
-procedure CleanUp(why : string; err : integer);
+procedure CleanUp(why : ShortString; err : integer);
 begin
     if why <> '' then writeln(why);
     halt(err);

+ 3 - 3
packages/amunits/examples/otherlibs/toolmanager1.pas

@@ -37,9 +37,9 @@ uses exec, triton, tritonmacros, amigalib, utility, linklist;
 
 
 const
-     cycle_entries : array [0..7] of PChar = ('Exec','Image','Sound','Menu','Icon','Dock','Access',NIL);
+     cycle_entries : array [0..7] of PAnsiChar = ('Exec','Image','Sound','Menu','Icon','Dock','Access',NIL);
 
-     liststrings : array [0..8] of PChar = (
+     liststrings : array [0..8] of PAnsiChar = (
                      '2024view' ,
                      'Add to archive',
                      'Delete',
@@ -56,7 +56,7 @@ var
    MyNode : pFPCNode;
    Triton_App : pTR_App;
 
-procedure CleanUp(why : string; err : longint);
+procedure CleanUp(why : ShortString; err : longint);
 begin
     if assigned(Triton_App) then  TR_DeleteApp(Triton_App);
     if assigned(LVList) then DestroyList(LVList);

+ 3 - 3
packages/amunits/examples/otherlibs/toolmanager2.pas

@@ -38,9 +38,9 @@ uses exec, triton, tritonmacros, linklist, utility;
 
 
 const
-     cycle_entries : array [0..7] of pchar = ('Exec','Image','Sound','Menu','Icon','Dock','Access',NIL);
+     cycle_entries : array [0..7] of PAnsiChar = ('Exec','Image','Sound','Menu','Icon','Dock','Access',NIL);
 
-     liststrings : array [0..8] of pchar = (
+     liststrings : array [0..8] of PAnsiChar = (
                      '2024view' ,
                      'Add to archive',
                      'Delete',
@@ -57,7 +57,7 @@ var
    MyNode : pFPCNode;
    Triton_App : pTR_App;
 
-procedure CleanUp(why : string; err : longint);
+procedure CleanUp(why : ShortString; err : longint);
 begin
    if assigned(Triton_App) then TR_DeleteApp(Triton_App);
    if assigned(LVList) then DestroyList(LVList);

+ 3 - 3
packages/amunits/examples/otherlibs/toolmanager3.pas

@@ -39,9 +39,9 @@ uses exec, triton, tritonmacros,utility, linklist, vartags;
 
 
 const
-     cycle_entries : array [0..7] of pchar = ('Exec','Image','Sound','Menu','Icon','Dock','Access',NIL);
+     cycle_entries : array [0..7] of PAnsiChar = ('Exec','Image','Sound','Menu','Icon','Dock','Access',NIL);
 
-     liststrings : array [0..8] of pchar = (
+     liststrings : array [0..8] of PAnsiChar = (
                      '2024view' ,
                      'Add to archive',
                      'Delete',
@@ -58,7 +58,7 @@ var
    MyNode : pFPCNode;
    Triton_App : pTr_App;
 
-procedure CleanUp(why : string; err : longint);
+procedure CleanUp(why : ShortString; err : longint);
 begin
      if assigned(Triton_App) then TR_DeleteApp(triton_App);
      if assigned(LVList) then DestroyList(LVList);

+ 4 - 4
packages/amunits/examples/otherlibs/tritongadgets.pas

@@ -36,9 +36,9 @@ VAR
     dummy       : longint;
     Triton_App  : pTR_App;
 
-Function longToStr (I : Longint) : String;
+Function longToStr (I : Longint) : ShortString;
 
-     Var S : String;
+     Var S : ShortString;
 
      begin
       Str (I,S);
@@ -46,7 +46,7 @@ Function longToStr (I : Longint) : String;
      end;
 
 
-PROCEDURE CleanExit(errstring : STRING; rc : Integer);
+PROCEDURE CleanExit(errstring : ShortString; rc : Integer);
 BEGIN
     IF Project <> NIL THEN TR_CloseProject(Project);
     if Triton_App <> nil then TR_DeleteApp(Triton_App);
@@ -88,7 +88,7 @@ begin
                         Space;
                         SliderGadget(SLIDER_MIN,SLIDER_MAX,5,MYGAD_SLIDER);
                         Space;
-                        TextID(string('5'),MYGAD_SLIDERTEXT); SetTRTag(TRAT_MinWidth, 2);
+                        TextID(ShortString('5'),MYGAD_SLIDERTEXT); SetTRTag(TRAT_MinWidth, 2);
                         Space;
                     EndLine;
                     SpaceS;

+ 2 - 2
packages/amunits/examples/otherlibs/writetruecolordata.pas

@@ -23,7 +23,7 @@ uses exec, amigados, intuition, agraphics, picasso96api, utility;
 Const
     DataWidth   =   160;
     DataHeight  =   160;
-    template    :   PChar = 'Width=W/N,Height=H/N,Depth=D/N';
+    template    :   PAnsiChar = 'Width=W/N,Height=H/N,Depth=D/N';
     vecarray    :   Array[0..2] of long = (0,0,0);
     ltrue       :   longint = 1;
 Var
@@ -57,7 +57,7 @@ Var
     imsg        :   pIntuiMessage;
 
 
-procedure CleanUp(why : string);
+procedure CleanUp(why : ShortString);
 begin
     if assigned(win) then CloseWindow(win);
     if assigned(sc) then p96CloseScreen(sc);

+ 3 - 3
packages/amunits/examples/showdevs.pas

@@ -22,7 +22,7 @@ program ShowDevs;
 
 uses exec,amigados;
 
-CONST   Device_Types : Array [0..2] OF pchar = (('DEVICE     '),
+CONST   Device_Types : Array [0..2] OF PAnsiChar = (('DEVICE     '),
                                                  ('DIRECTORY  '),
                                                  ('VOLUME     '));
 
@@ -31,8 +31,8 @@ VAR
     myrootptr    : pRootNode;
     myinfoptr    : pDosInfo;
     mydeviceptr  : pDeviceNode;
-    mystr        : pchar;
-    eingabe      : CHAR;
+    mystr        : PAnsiChar;
+    eingabe      : AnsiChar;
     mystartup    : pFileSysStartupMsg;
     myenvec      : pDOSEnvec;
     i            : longint;

+ 1 - 1
packages/amunits/examples/snow.pas

@@ -55,7 +55,7 @@ begin
     halt(20);
 end;
 
-procedure CleanUp(why : string; err : longint);
+procedure CleanUp(why : ShortString; err : longint);
 begin
     if assigned(w) then CloseWindow(w);
     if assigned(s) then CloseScreen(s);

+ 6 - 6
packages/amunits/examples/sortdemo.pas

@@ -42,7 +42,7 @@ uses Exec, Intuition, AGraphics, Utility, GadTools, amsgbox;
 
 
 CONST
-      vers : string = '$VER: SortDemo 1.3 ' + {$I %DATE%} + ' ' + {$I %TIME%}#0;
+      vers : ShortString = '$VER: SortDemo 1.3 ' + {$I %DATE%} + ' ' + {$I %TIME%}#0;
 
       nmax=2000;
 
@@ -67,7 +67,7 @@ CONST
 
       { The easiest way to use gadtoolsmenus in FPC is
         to have them as const types. No need to cast
-        strings to PChar. That we have to use recordmembers
+        strings to PAnsiChar. That we have to use recordmembers
         name is a pain.
       }
 
@@ -131,7 +131,7 @@ VAR sort: ARRAY[1..nmax] OF Real;
     wintitle        : string[80];
     scrtitle        : string[80];
 
-Procedure CleanUp(s : string; err : Integer);
+Procedure CleanUp(s : ShortString; err : Integer);
 begin
     if assigned(MenuStrip) then begin
        ClearMenuStrip(w);
@@ -227,9 +227,9 @@ BEGIN
   descending := sort[i]>sort[j];
 END;
 
-Function IntToStr (I : Longint) : String;
+Function IntToStr (I : Longint) : ShortString;
 
-     Var S : String;
+     Var S : ShortString;
 
      begin
       Str (I,S);
@@ -523,7 +523,7 @@ begin
     Rast := w^.RPort;
 
     { Here we set the barlabel }
-    nm[3].nm_Label := PChar(NM_BARLABEL);
+    nm[3].nm_Label := PAnsiChar(NM_BARLABEL);
     if pExecBase(_ExecBase)^.LibNode.Lib_Version >= 39 then begin
         MenuStrip := CreateMenus(@nm,[
                      GTMN_FrontPen, 1, TAG_END]);

+ 1 - 1
packages/amunits/examples/stars.pas

@@ -89,7 +89,7 @@ BEGIN
 END;
 
 
-PROCEDURE CleanUp(str:string; code : Longint);
+PROCEDURE CleanUp(str:ShortString; code : Longint);
 
 BEGIN
   If assigned(Win) Then

+ 2 - 2
packages/amunits/examples/talk2boopsi.pas

@@ -45,7 +45,7 @@ VAR
 
 CONST
 
-   vers  : PChar = '$VER: Talk2boopsi 37.1';
+   vers  : PAnsiChar = '$VER: Talk2boopsi 37.1';
 
    PROPGADGET_ID       = 1;
    INTGADGET_ID        = 2;
@@ -59,7 +59,7 @@ CONST
    MINWINDOWHEIGHT     = (PROPGADGETHEIGHT + 70);
    MAXCHARS            = 3;
 
-PROCEDURE CleanUp(Why : STRING; err: Word);
+PROCEDURE CleanUp(Why : ShortString; err: Word);
 BEGIN
     IF assigned(prop) THEN DisposeObject(prop);
     IF assigned(int) THEN DisposeObject(int);

+ 3 - 3
packages/amunits/examples/wbtest.pas

@@ -18,12 +18,12 @@ uses wbargs, amsgbox;
 
 var
    i : integer;
-   dummy : string;
+   dummy : ShortString;
 
 
-Function IntToStr (I : Longint) : String;
+Function IntToStr (I : Longint) : ShortString;
 Var
-    S : String;
+    S : ShortString;
 begin
     Str (I,S);
     IntToStr:=S;

+ 25 - 25
packages/amunits/src/coreunits/agraphics.pas

@@ -23,12 +23,12 @@
     ReadPixelArray8,
     ReadPixelLine8,
     WriteChunkyPixels.
-    They all had one argument(array_) defined as pchar,
+    They all had one argument(array_) defined as PAnsiChar,
     should be pointer, fixed.
     20 Aug 2000.
 
     InitTmpRas had wrong define for the buffer arg.
-    Changed from pchar to PLANEPTR.
+    Changed from PAnsiChar to PLANEPTR.
     23 Aug 2000.
 
     Compiler had problems with Text, changed to GText.
@@ -265,7 +265,7 @@ Type
         tf_Style        : Byte;         { font style      |    match a font }
         tf_Flags        : Byte;         { preferences and flags /    request. }
         tf_XSize        : Word;        { nominal font width }
-        tf_Baseline     : Word; { distance from the top of char to baseline }
+        tf_Baseline     : Word; { distance from the top of AnsiChar to baseline }
         tf_BoldSmear    : Word;        { smear to affect a bold enhancement }
 
         tf_Accessors    : Word;        { access count }
@@ -309,7 +309,7 @@ CONST
  CT_COLORFONT  =  $0001;  { color map contains designer's colors }
  CT_GREYFONT   =  $0002;  { color map describes even-stepped }
                                 { brightnesses from low to high }
- CT_ANTIALIAS  =  $0004;  { zero background thru fully saturated char }
+ CT_ANTIALIAS  =  $0004;  { zero background thru fully saturated AnsiChar }
 
  CTB_MAPCOLOR  =  0;      { map ctf_FgColor to the rp_FgPen IF it's }
  CTF_MAPCOLOR  =  $0001;  { is a valid color within ctf_Low..ctf_High }
@@ -1007,9 +1007,9 @@ const
   REQUEST_SPECIAL       =  4;
   REQUEST_A2024         =  8;
 
-  DEFAULT_MONITOR_NAME  : PChar =  'default.monitor';
-  NTSC_MONITOR_NAME     : PChar =  'ntsc.monitor';
-  PAL_MONITOR_NAME      : PChar =  'pal.monitor';
+  DEFAULT_MONITOR_NAME  : PAnsiChar =  'default.monitor';
+  NTSC_MONITOR_NAME     : PAnsiChar =  'ntsc.monitor';
+  PAL_MONITOR_NAME      : PAnsiChar =  'pal.monitor';
   STANDARD_MONITOR_MASK =  ( REQUEST_NTSC OR REQUEST_PAL ) ;
 
   STANDARD_NTSC_ROWS    =  262;
@@ -1048,7 +1048,7 @@ const
   VGA_VSSTOP      = $0235;
   VGA_VBSTOP      = $0CCD;
 
-  VGA_MONITOR_NAME  : PChar    =  'vga.monitor';
+  VGA_MONITOR_NAME  : PAnsiChar    =  'vga.monitor';
 
 { NOTE: VGA70 definitions are obsolete - a VGA70 monitor has never been
  * implemented.
@@ -1067,7 +1067,7 @@ const
   VGA70_VBSTOP      = $0F73;
 
   VGA70_BEAMCON     = (SPECIAL_BEAMCON XOR VSYNCTRUE);
-  VGA70_MONITOR_NAME  : PChar  =      'vga70.monitor';
+  VGA70_MONITOR_NAME  : PAnsiChar  =      'vga70.monitor';
 
   BROADCAST_HBSTRT  =      $01  ;
   BROADCAST_HSSTRT  =      $06  ;
@@ -1874,7 +1874,7 @@ Type
  pNameInfo = ^tNameInfo;
  tNameInfo = record
   Header : tQueryHeader;
-  Name   : Array[0..DISPLAYNAMELEN-1] of Char;
+  Name   : Array[0..DISPLAYNAMELEN-1] of AnsiChar;
   reserved : Array[0..1] of ULONG;          { terminator }
  END;
 
@@ -2244,7 +2244,7 @@ const
 { GfxFlags (private) }
    NEW_DATABASE   = 1;
 
-   GRAPHICSNAME   : PChar  = 'graphics.library';
+   GRAPHICSNAME   : PAnsiChar  = 'graphics.library';
 
 
 var
@@ -2269,8 +2269,8 @@ PROCEDURE gfxMove(rp : pRastPort location 'a1'; x : LONGINT location 'd0'; y : L
 PROCEDURE PolyDraw(rp : pRastPort location 'a1'; count : LONGINT location 'd0';const polyTable : PSmallInt location 'a0'); syscall GfxBase 336;
 FUNCTION ReadPixel(rp : pRastPort location 'a1'; x : LONGINT location 'd0'; y : LONGINT location 'd1') : ULONG; syscall GfxBase 318;
 PROCEDURE ScrollRaster(rp : pRastPort location 'a1'; dx : LONGINT location 'd0'; dy : LONGINT location 'd1'; xMin : LONGINT location 'd2'; yMin : LONGINT location 'd3'; xMax : LONGINT location 'd4'; yMax : LONGINT location 'd5'); syscall GfxBase 396;
-FUNCTION GfxText(rp : pRastPort location 'a1';const string_ : pCHAR location 'a0'; count : ULONG location 'd0') : LONGINT; syscall GfxBase 060;
-FUNCTION TextLength(rp : pRastPort location 'a1';const string_ : pCHAR location 'a0'; count : ULONG location 'd0') : smallint; syscall GfxBase 054;
+FUNCTION GfxText(rp : pRastPort location 'a1';const string_ : PAnsiChar location 'a0'; count : ULONG location 'd0') : LONGINT; syscall GfxBase 060;
+FUNCTION TextLength(rp : pRastPort location 'a1';const string_ : PAnsiChar location 'a0'; count : ULONG location 'd0') : smallint; syscall GfxBase 054;
 FUNCTION WritePixel(rp : pRastPort location 'a1'; x : LONGINT location 'd0'; y : LONGINT location 'd1') : LONGINT; syscall GfxBase 324;
 
 FUNCTION AreaDraw(rp : pRastPort location 'a1'; x : LONGINT location 'd0'; y : LONGINT location 'd1') : LONGINT; syscall GfxBase 258;
@@ -2289,11 +2289,11 @@ PROCEDURE LoadRGB4(vp : pViewPort location 'a0';const colors : pWord location 'a
 PROCEDURE SetRGB4(vp : pViewPort location 'a0'; index : LONGINT location 'd0'; red : ULONG location 'd1'; green : ULONG location 'd2'; blue : ULONG location 'd3'); syscall GfxBase 288;
 PROCEDURE SetRGB4CM(colorMap : pColorMap location 'a0'; index : LONGINT location 'd0'; red : ULONG location 'd1'; green : ULONG location 'd2'; blue : ULONG location 'd3'); syscall GfxBase 630;
 
-FUNCTION BltBitMap(const srcBitMap : pBitMap location 'a0'; xSrc : LONGINT location 'd0'; ySrc : LONGINT location 'd1'; destBitMap : pBitMap location 'a1'; xDest : LONGINT location 'd2'; yDest : LONGINT location 'd3'; xSize : LONGINT location 'd4'; ySize : LONGINT location 'd5'; minterm : ULONG location 'd6'; mask : ULONG location 'd7'; tempA : pCHAR location 'a2') : LONGINT; syscall GfxBase 030;
+FUNCTION BltBitMap(const srcBitMap : pBitMap location 'a0'; xSrc : LONGINT location 'd0'; ySrc : LONGINT location 'd1'; destBitMap : pBitMap location 'a1'; xDest : LONGINT location 'd2'; yDest : LONGINT location 'd3'; xSize : LONGINT location 'd4'; ySize : LONGINT location 'd5'; minterm : ULONG location 'd6'; mask : ULONG location 'd7'; tempA : PAnsiChar location 'a2') : LONGINT; syscall GfxBase 030;
 PROCEDURE BltBitMapRastPort(const srcBitMap : pBitMap location 'a0'; xSrc : LONGINT location 'd0'; ySrc : LONGINT location 'd1'; destRP : pRastPort location 'a1'; xDest : LONGINT location 'd2'; yDest : LONGINT location 'd3'; xSize : LONGINT location 'd4'; ySize : LONGINT location 'd5'; minterm : ULONG location 'd6'); syscall GfxBase 606;
 PROCEDURE BltClear(memBlock : pointer location 'a1'; byteCount : ULONG location 'd0'; flags : ULONG location 'd1'); syscall GfxBase 300;
-PROCEDURE BltMaskBitMapRastPort(const srcBitMap : pBitMap location 'a0'; xSrc : LONGINT location 'd0'; ySrc : LONGINT location 'd1'; destRP : pRastPort location 'a1'; xDest : LONGINT location 'd2'; yDest : LONGINT location 'd3'; xSize : LONGINT location 'd4'; ySize : LONGINT location 'd5'; minterm : ULONG location 'd6';const bltMask : pCHAR location 'a2'); syscall GfxBase 636;
-PROCEDURE BltPattern(rp : pRastPort location 'a1';const mask : pCHAR location 'a0'; xMin : LONGINT location 'd0'; yMin : LONGINT location 'd1'; xMax : LONGINT location 'd2'; yMax : LONGINT location 'd3'; maskBPR : ULONG location 'd4'); syscall GfxBase 312;
+PROCEDURE BltMaskBitMapRastPort(const srcBitMap : pBitMap location 'a0'; xSrc : LONGINT location 'd0'; ySrc : LONGINT location 'd1'; destRP : pRastPort location 'a1'; xDest : LONGINT location 'd2'; yDest : LONGINT location 'd3'; xSize : LONGINT location 'd4'; ySize : LONGINT location 'd5'; minterm : ULONG location 'd6';const bltMask : PAnsiChar location 'a2'); syscall GfxBase 636;
+PROCEDURE BltPattern(rp : pRastPort location 'a1';const mask : PAnsiChar location 'a0'; xMin : LONGINT location 'd0'; yMin : LONGINT location 'd1'; xMax : LONGINT location 'd2'; yMax : LONGINT location 'd3'; maskBPR : ULONG location 'd4'); syscall GfxBase 312;
 PROCEDURE BltTemplate(const source : pWORD location 'a0'; xSrc : LONGINT location 'd0'; srcMod : LONGINT location 'd1'; destRP : pRastPort location 'a1'; xDest : LONGINT location 'd2'; yDest : LONGINT location 'd3'; xSize : LONGINT location 'd4'; ySize : LONGINT location 'd5'); syscall GfxBase 036;
 PROCEDURE ClipBlit(srcRP : pRastPort location 'a0'; xSrc : LONGINT location 'd0'; ySrc : LONGINT location 'd1'; destRP : pRastPort location 'a1'; xDest : LONGINT location 'd2'; yDest : LONGINT location 'd3'; xSize : LONGINT location 'd4'; ySize : LONGINT location 'd5'; minterm : ULONG location 'd6'); syscall GfxBase 552;
 PROCEDURE DisownBlitter; syscall GfxBase 462;
@@ -2385,11 +2385,11 @@ FUNCTION AttachPalExtra(cm : pColorMap location 'a0'; vp : pViewPort location 'a
 FUNCTION AttemptLockLayerRom(layer : pLayer location 'a5') : LongBool; syscall GfxBase 654;
 FUNCTION BestModeIDA(const tags : pTagItem location 'a0') : ULONG; syscall GfxBase 1050;
 PROCEDURE BitMapScale(bitScaleArgs : pBitScaleArgs location 'a0'); syscall GfxBase 678;
-FUNCTION BltBitMap(const srcBitMap : pBitMap location 'a0'; xSrc : LONGINT location 'd0'; ySrc : LONGINT location 'd1'; destBitMap : pBitMap location 'a1'; xDest : LONGINT location 'd2'; yDest : LONGINT location 'd3'; xSize : LONGINT location 'd4'; ySize : LONGINT location 'd5'; minterm : ULONG location 'd6'; mask : ULONG location 'd7'; tempA : pCHAR location 'a2') : LONGINT; syscall GfxBase 030;
+FUNCTION BltBitMap(const srcBitMap : pBitMap location 'a0'; xSrc : LONGINT location 'd0'; ySrc : LONGINT location 'd1'; destBitMap : pBitMap location 'a1'; xDest : LONGINT location 'd2'; yDest : LONGINT location 'd3'; xSize : LONGINT location 'd4'; ySize : LONGINT location 'd5'; minterm : ULONG location 'd6'; mask : ULONG location 'd7'; tempA : PAnsiChar location 'a2') : LONGINT; syscall GfxBase 030;
 PROCEDURE BltBitMapRastPort(const srcBitMap : pBitMap location 'a0'; xSrc : LONGINT location 'd0'; ySrc : LONGINT location 'd1'; destRP : pRastPort location 'a1'; xDest : LONGINT location 'd2'; yDest : LONGINT location 'd3'; xSize : LONGINT location 'd4'; ySize : LONGINT location 'd5'; minterm : ULONG location 'd6'); syscall GfxBase 606;
 PROCEDURE BltClear(memBlock : pointer location 'a1'; byteCount : ULONG location 'd0'; flags : ULONG location 'd1'); syscall GfxBase 300;
-PROCEDURE BltMaskBitMapRastPort(const srcBitMap : pBitMap location 'a0'; xSrc : LONGINT location 'd0'; ySrc : LONGINT location 'd1'; destRP : pRastPort location 'a1'; xDest : LONGINT location 'd2'; yDest : LONGINT location 'd3'; xSize : LONGINT location 'd4'; ySize : LONGINT location 'd5'; minterm : ULONG location 'd6';const bltMask : pCHAR location 'a2'); syscall GfxBase 636;
-PROCEDURE BltPattern(rp : pRastPort location 'a1';const mask : pCHAR location 'a0'; xMin : LONGINT location 'd0'; yMin : LONGINT location 'd1'; xMax : LONGINT location 'd2'; yMax : LONGINT location 'd3'; maskBPR : ULONG location 'd4'); syscall GfxBase 312;
+PROCEDURE BltMaskBitMapRastPort(const srcBitMap : pBitMap location 'a0'; xSrc : LONGINT location 'd0'; ySrc : LONGINT location 'd1'; destRP : pRastPort location 'a1'; xDest : LONGINT location 'd2'; yDest : LONGINT location 'd3'; xSize : LONGINT location 'd4'; ySize : LONGINT location 'd5'; minterm : ULONG location 'd6';const bltMask : PAnsiChar location 'a2'); syscall GfxBase 636;
+PROCEDURE BltPattern(rp : pRastPort location 'a1';const mask : PAnsiChar location 'a0'; xMin : LONGINT location 'd0'; yMin : LONGINT location 'd1'; xMax : LONGINT location 'd2'; yMax : LONGINT location 'd3'; maskBPR : ULONG location 'd4'); syscall GfxBase 312;
 PROCEDURE BltTemplate(const source : pWORD location 'a0'; xSrc : LONGINT location 'd0'; srcMod : LONGINT location 'd1'; destRP : pRastPort location 'a1'; xDest : LONGINT location 'd2'; yDest : LONGINT location 'd3'; xSize : LONGINT location 'd4'; ySize : LONGINT location 'd5'); syscall GfxBase 036;
 FUNCTION CalcIVG(v : pView location 'a0'; vp : pViewPort location 'a1') : WORD; syscall GfxBase 828;
 PROCEDURE CBump(copList : pUCopList location 'a1'); syscall GfxBase 366;
@@ -2433,7 +2433,7 @@ FUNCTION GetAPen(rp : pRastPort location 'a0') : ULONG; syscall GfxBase 858;
 FUNCTION GetBitMapAttr(const bm : pBitMap location 'a0'; attrnum : ULONG location 'd1') : ULONG; syscall GfxBase 960;
 FUNCTION GetBPen(rp : pRastPort location 'a0') : ULONG; syscall GfxBase 864;
 FUNCTION GetColorMap(entries : LONGINT location 'd0') : pColorMap; syscall GfxBase 570;
-FUNCTION GetDisplayInfoData(const handle : POINTER location 'a0'; buf : pCHAR location 'a1'; size : ULONG location 'd0'; tagID : ULONG location 'd1'; displayID : ULONG location 'd2') : ULONG; syscall GfxBase 756;
+FUNCTION GetDisplayInfoData(const handle : POINTER location 'a0'; buf : PAnsiChar location 'a1'; size : ULONG location 'd0'; tagID : ULONG location 'd1'; displayID : ULONG location 'd2') : ULONG; syscall GfxBase 756;
 FUNCTION GetDrMd(rp : pRastPort location 'a0') : ULONG; syscall GfxBase 870;
 FUNCTION GetExtSpriteA(ss : pExtSprite location 'a2';const tags : pTagItem location 'a1') : LONGINT; syscall GfxBase 930;
 FUNCTION GetGBuffers(anOb : pAnimOb location 'a0'; rp : pRastPort location 'a1'; flag : LONGINT location 'd0') : LongBool; syscall GfxBase 168;
@@ -2470,7 +2470,7 @@ FUNCTION NextDisplayInfo(displayID : ULONG location 'd0') : ULONG; syscall GfxBa
 FUNCTION ObtainBestPenA(cm : pColorMap location 'a0'; r : ULONG location 'd1'; g : ULONG location 'd2'; b : ULONG location 'd3';const tags : pTagItem location 'a1') : LONGINT; syscall GfxBase 840;
 FUNCTION ObtainPen(cm : pColorMap location 'a0'; n : ULONG location 'd0'; r : ULONG location 'd1'; g : ULONG location 'd2'; b : ULONG location 'd3'; f : LONGINT location 'd4') : ULONG; syscall GfxBase 954;
 FUNCTION OpenFont(textAttr : pTextAttr location 'a0') : pTextFont; syscall GfxBase 072;
-FUNCTION OpenMonitor(const monitorName : pCHAR location 'a1'; displayID : ULONG location 'd0') : pMonitorSpec; syscall GfxBase 714;
+FUNCTION OpenMonitor(const monitorName : PAnsiChar location 'a1'; displayID : ULONG location 'd0') : pMonitorSpec; syscall GfxBase 714;
 FUNCTION OrRectRegion(region : pRegion location 'a0';const rectangle : pRectangle location 'a1') : LongBool; syscall GfxBase 510;
 FUNCTION OrRegionRegion(const srcRegion : pRegion location 'a0'; destRegion : pRegion location 'a1') : LongBool; syscall GfxBase 612;
 PROCEDURE OwnBlitter; syscall GfxBase 456;
@@ -2509,10 +2509,10 @@ FUNCTION SetWriteMask(rp : pRastPort location 'a0'; msk : ULONG location 'd0') :
 PROCEDURE SortGList(rp : pRastPort location 'a1'); syscall GfxBase 150;
 PROCEDURE StripFont(font : pTextFont location 'a0'); syscall GfxBase 822;
 PROCEDURE SyncSBitMap(layer : pLayer location 'a0'); syscall GfxBase 444;
-FUNCTION GfxText(rp : pRastPort location 'a1';const string_ : pCHAR location 'a0'; count : ULONG location 'd0') : LONGINT; syscall GfxBase 060;
-FUNCTION TextExtent(rp : pRastPort location 'a1';const string_ : pCHAR location 'a0'; count : LONGINT location 'd0'; _textExtent : pTextExtent location 'a2') : smallint; syscall GfxBase 690;
-FUNCTION TextFit(rp : pRastPort location 'a1';const string_ : pCHAR location 'a0'; strLen : ULONG location 'd0'; textExtent : pTextExtent location 'a2'; constrainingExtent : pTextExtent location 'a3'; strDirection : LONGINT location 'd1'; constrainingBitWidth : ULONG location 'd2'; constrainingBitHeight : ULONG location 'd3') : ULONG; syscall GfxBase 696;
-FUNCTION TextLength(rp : pRastPort location 'a1';const string_ : pCHAR location 'a0'; count : ULONG location 'd0') : smallint; syscall GfxBase 054;
+FUNCTION GfxText(rp : pRastPort location 'a1';const string_ : PAnsiChar location 'a0'; count : ULONG location 'd0') : LONGINT; syscall GfxBase 060;
+FUNCTION TextExtent(rp : pRastPort location 'a1';const string_ : PAnsiChar location 'a0'; count : LONGINT location 'd0'; _textExtent : pTextExtent location 'a2') : smallint; syscall GfxBase 690;
+FUNCTION TextFit(rp : pRastPort location 'a1';const string_ : PAnsiChar location 'a0'; strLen : ULONG location 'd0'; textExtent : pTextExtent location 'a2'; constrainingExtent : pTextExtent location 'a3'; strDirection : LONGINT location 'd1'; constrainingBitWidth : ULONG location 'd2'; constrainingBitHeight : ULONG location 'd3') : ULONG; syscall GfxBase 696;
+FUNCTION TextLength(rp : pRastPort location 'a1';const string_ : PAnsiChar location 'a0'; count : ULONG location 'd0') : smallint; syscall GfxBase 054;
 FUNCTION UCopperListInit(uCopList : pUCopList location 'a0'; n : LONGINT location 'd0') : pCopList; syscall GfxBase 594;
 PROCEDURE UnlockLayerRom(layer : pLayer location 'a5'); syscall GfxBase 438;
 FUNCTION VBeamPos : LONGINT; syscall GfxBase 384;

+ 301 - 301
packages/amunits/src/coreunits/amigados.pas

@@ -15,10 +15,10 @@
  **********************************************************************}
 {
     History:
-    Added overlay functions for Pchar->Strings, functions
-    and procedures. Now you can mix PChar and Strings e.g
+    Added overlay functions for PAnsiChar->Strings, functions
+    and procedures. Now you can mix PAnsiChar and Strings e.g
     OpenLibrary('whatis.library',37). No need to cast to
-    a PChar.
+    a PAnsiChar.
     14 Jul 2000.
 
     Changed ReadArgs, removed the var for the second arg.
@@ -112,7 +112,7 @@ Type
         fib_DirEntryType : Longint;
                         { Type of Directory. If < 0, then a plain file.
                           If > 0 a directory }
-        fib_FileName     : Array [0..107] of Char;
+        fib_FileName     : Array [0..107] of AnsiChar;
                         { Null terminated. Max 30 chars used for now }
         fib_Protection   : Longint;
                         { bit mask of protection, rwxd are 3-0. }
@@ -120,11 +120,11 @@ Type
         fib_Size         : Longint;      { Number of bytes in file }
         fib_NumBlocks    : Longint;      { Number of blocks in file }
         fib_Date         : tDateStamp;   { Date file last changed }
-        fib_Comment      : Array [0..79] of Char;
+        fib_Comment      : Array [0..79] of AnsiChar;
                         { Null terminated comment associated with file }
         fib_OwnerUID     : Word;
         fib_OwnerGID     : Word;
-        fib_Reserved     : Array [0..31] of Char;
+        fib_Reserved     : Array [0..31] of AnsiChar;
     end;
 
 Const
@@ -394,7 +394,7 @@ Type
         an_Lock     : BPTR;
         an_Info     : tFileInfoBlock;
         an_Flags    : Shortint;
-        an_String   : Array[0..0] of Char;   { FIX!! }
+        an_String   : Array[0..0] of AnsiChar;   { FIX!! }
        END;
 
        pAnchorPath = ^tAnchorPath;
@@ -413,7 +413,7 @@ Type
         ap_Reserved   : Shortint;
         ap_Strlen     : smallint;       { This is what ap_Length used to be }
         ap_Info       : tFileInfoBlock;
-        ap_Buf        : Array[0..0] of Char;     { Buffer for path name, allocated by user !! }
+        ap_Buf        : Array[0..0] of AnsiChar;     { Buffer for path name, allocated by user !! }
         { FIX! }
         );
        END;
@@ -833,7 +833,7 @@ Type
         seg_Next  : BPTR;
         seg_UC    : Longint;
         seg_Seg   : BPTR;
-        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;
 
 CONST
@@ -1234,8 +1234,8 @@ Type
 
        pNotifyRequest = ^tNotifyRequest;
        tNotifyRequest = record
-            nr_Name : pchar;
-            nr_FullName : pchar;
+            nr_Name : PAnsiChar;
+            nr_FullName : PAnsiChar;
             nr_UserData : ULONG;
             nr_Flags : ULONG;
             nr_stuff : record
@@ -1577,12 +1577,12 @@ CONST
 
 {$if defined(AMIGA_V1_2_ONLY)}
 PROCEDURE DOSClose(file_ : BPTR location 'd1'); syscall _DOSBase 036;
-FUNCTION DOSOpen(const name : pCHAR location 'd1'; accessMode : LONGINT location 'd2') : BPTR; syscall _DOSBase 030;
+FUNCTION DOSOpen(const name : PAnsiChar location 'd1'; accessMode : LONGINT location 'd2') : BPTR; syscall _DOSBase 030;
 FUNCTION DOSRead(file_ : BPTR location 'd1'; buffer : POINTER location 'd2'; length : LONGINT location 'd3') : LONGINT; syscall _DOSBase 042;
 FUNCTION DOSSeek(file_ : BPTR location 'd1'; position : LONGINT location 'd2'; offset : LONGINT location 'd3') : LONGINT; syscall _DOSBase 066;
 FUNCTION DOSWrite(file_ : BPTR location 'd1'; buffer : POINTER location 'd2'; length : LONGINT location 'd3') : LONGINT; syscall _DOSBase 048;
 
-FUNCTION CreateDir(const name : pCHAR location 'd1') : BPTR; syscall _DOSBase 120;
+FUNCTION CreateDir(const name : PAnsiChar location 'd1') : BPTR; syscall _DOSBase 120;
 FUNCTION CurrentDir(lock : BPTR location 'd1') : BPTR; syscall _DOSBase 126;
 FUNCTION DOSDeleteFile(const name : STRPTR location 'd1') : LongBool; syscall _DOSBase 072;
 FUNCTION Examine(lock : BPTR location 'd1'; fileInfoBlock : pFileInfoBlock location 'd2') : LongBool; syscall _DOSBase 102;
@@ -1590,39 +1590,39 @@ FUNCTION ExNext(lock : BPTR location 'd1'; fileInfoBlock : pFileInfoBlock locati
 FUNCTION Info(lock : BPTR location 'd1'; parameterBlock : pInfoData location 'd2') : LongBool; syscall _DOSBase 114;
 FUNCTION ParentDir(lock : BPTR location 'd1') : BPTR; syscall _DOSBase 210;
 FUNCTION DOSRename(const oldName : STRPTR location 'd1';const newName : STRPTR location 'd2') : LongBool; syscall _DOSBase 078;
-FUNCTION SetComment(const name : pCHAR location 'd1';const comment : pCHAR location 'd2') : LongBool; syscall _DOSBase 180;
-FUNCTION SetProtection(const name : pCHAR location 'd1'; protect : LONGINT location 'd2') : LongBool; syscall _DOSBase 186;
+FUNCTION SetComment(const name : PAnsiChar location 'd1';const comment : PAnsiChar location 'd2') : LongBool; syscall _DOSBase 180;
+FUNCTION SetProtection(const name : PAnsiChar location 'd1'; protect : LONGINT location 'd2') : LongBool; syscall _DOSBase 186;
 
 FUNCTION DupLock(lock : BPTR location 'd1') : BPTR; syscall _DOSBase 096;
 FUNCTION DOSInput : BPTR; syscall _DOSBase 054;
 FUNCTION IoErr : LONGINT; syscall _DOSBase 132;
 FUNCTION IsInteractive(file_ : BPTR location 'd1') : LongBool; syscall _DOSBase 216;
-FUNCTION Lock(const name : pCHAR location 'd1'; type_ : LONGINT location 'd2') : LONGINT; syscall _DOSBase 084;
+FUNCTION Lock(const name : PAnsiChar location 'd1'; type_ : LONGINT location 'd2') : LONGINT; syscall _DOSBase 084;
 FUNCTION DOSOutput : BPTR; syscall _DOSBase 060;
 PROCEDURE UnLock(lock : BPTR location 'd1'); syscall _DOSBase 090;
 
-FUNCTION CreateProc(const name : pCHAR location 'd1'; pri : LONGINT location 'd2'; segList : BPTR location 'd3'; stackSize : LONGINT location 'd4') : pMsgPort; syscall _DOSBase 138;
+FUNCTION CreateProc(const name : PAnsiChar location 'd1'; pri : LONGINT location 'd2'; segList : BPTR location 'd3'; stackSize : LONGINT location 'd4') : pMsgPort; syscall _DOSBase 138;
 PROCEDURE DateStamp(date : pDateStamp location 'd1'); syscall _DOSBase 192;
 PROCEDURE DOSDelay(timeout : LONGINT location 'd1'); syscall _DOSBase 198;
-FUNCTION DeviceProc(const name : pCHAR location 'd1') : pMsgPort; syscall _DOSBase 174;
+FUNCTION DeviceProc(const name : PAnsiChar location 'd1') : pMsgPort; syscall _DOSBase 174;
 PROCEDURE DOSExit(returnCode : LONGINT location 'd1'); syscall _DOSBase 144;
 FUNCTION WaitForChar(file_ : BPTR location 'd1'; timeout : LONGINT location 'd2') : LongBool; syscall _DOSBase 204;
 
-FUNCTION Execute(const string_ : pCHAR location 'd1'; file_ : BPTR location 'd2'; file2 : BPTR location 'd3') : LongBool; syscall _DOSBase 222;
-FUNCTION LoadSeg(const name : pCHAR location 'd1') : LONGINT; syscall _DOSBase 150;
+FUNCTION Execute(const string_ : PAnsiChar location 'd1'; file_ : BPTR location 'd2'; file2 : BPTR location 'd3') : LongBool; syscall _DOSBase 222;
+FUNCTION LoadSeg(const name : PAnsiChar location 'd1') : LONGINT; syscall _DOSBase 150;
 PROCEDURE UnLoadSeg(seglist : BPTR location 'd1'); syscall _DOSBase 156;
 {$else}
 PROCEDURE AbortPkt(port : pMsgPort location 'd1'; pkt : pDosPacket location 'd2'); syscall _DOSBase 264;
-FUNCTION AddBuffers(const name : pCHAR location 'd1'; number : LONGINT location 'd2') : LongBool; syscall _DOSBase 732;
+FUNCTION AddBuffers(const name : PAnsiChar location 'd1'; number : LONGINT location 'd2') : LongBool; syscall _DOSBase 732;
 FUNCTION AddDosEntry(dlist : pDosList location 'd1') : LongBool; syscall _DOSBase 678;
-FUNCTION AddPart(dirname : pCHAR location 'd1';const filename : pCHAR location 'd2'; size : ULONG location 'd3') : LongBool; syscall _DOSBase 882;
-FUNCTION AddSegment(const name : pCHAR location 'd1'; seg : BPTR location 'd2'; system : LONGINT location 'd3') : LongBool; syscall _DOSBase 774;
+FUNCTION AddPart(dirname : PAnsiChar location 'd1';const filename : PAnsiChar location 'd2'; size : ULONG location 'd3') : LongBool; syscall _DOSBase 882;
+FUNCTION AddSegment(const name : PAnsiChar location 'd1'; seg : BPTR location 'd2'; system : LONGINT location 'd3') : LongBool; syscall _DOSBase 774;
 FUNCTION AllocDosObject(type_ : ULONG location 'd1';const tags : pTagItem location 'd2') : POINTER; syscall _DOSBase 228;
 FUNCTION AllocDosObjectTagList(type_ : ULONG location 'd1';const tags : pTagItem location 'd2') : POINTER; syscall _DOSBase 228;
-FUNCTION AssignAdd(const name : pCHAR location 'd1'; lock : BPTR location 'd2') : LongBool; syscall _DOSBase 630;
-FUNCTION AssignLate(const name : pCHAR location 'd1';const path : pCHAR location 'd2') : LongBool; syscall _DOSBase 618;
-FUNCTION AssignLock(const name : pCHAR location 'd1'; lock : BPTR location 'd2') : LongBool; syscall _DOSBase 612;
-FUNCTION AssignPath(const name : pCHAR location 'd1';const path : pCHAR location 'd2') : LongBool; syscall _DOSBase 624;
+FUNCTION AssignAdd(const name : PAnsiChar location 'd1'; lock : BPTR location 'd2') : LongBool; syscall _DOSBase 630;
+FUNCTION AssignLate(const name : PAnsiChar location 'd1';const path : PAnsiChar location 'd2') : LongBool; syscall _DOSBase 618;
+FUNCTION AssignLock(const name : PAnsiChar location 'd1'; lock : BPTR location 'd2') : LongBool; syscall _DOSBase 612;
+FUNCTION AssignPath(const name : PAnsiChar location 'd1';const path : PAnsiChar location 'd2') : LongBool; syscall _DOSBase 624;
 FUNCTION AttemptLockDosList(flags : ULONG location 'd1') : pDosList; syscall _DOSBase 666;
 FUNCTION ChangeMode(type_ : LONGINT location 'd1'; fh : LONGINT location 'd2'; newmode : LONGINT location 'd3') : LongBool; syscall _DOSBase 450;
 FUNCTION CheckSignal(mask : LONGINT location 'd1') : LONGINT; syscall _DOSBase 792;
@@ -1630,16 +1630,16 @@ FUNCTION Cli : pCommandLineInterface; syscall _DOSBase 492;
 FUNCTION CliInitNewcli(dp : pDosPacket location 'a0') : LONGINT; syscall _DOSBase 930;
 FUNCTION CliInitRun(dp : pDosPacket location 'a0') : LONGINT; syscall _DOSBase 936;
 FUNCTION CompareDates(const date1 : pDateStamp location 'd1';const date2 : pDateStamp location 'd2') : LONGINT; syscall _DOSBase 738;
-FUNCTION CreateDir(const name : pCHAR location 'd1') : BPTR; syscall _DOSBase 120;
+FUNCTION CreateDir(const name : PAnsiChar location 'd1') : BPTR; syscall _DOSBase 120;
 FUNCTION CreateNewProc(const tags : pTagItem location 'd1') : pProcess; syscall _DOSBase 498;
 FUNCTION CreateNewProcTagList(const tags : pTagItem location 'd1') : pProcess; syscall _DOSBase 498;
-FUNCTION CreateProc(const name : pCHAR location 'd1'; pri : LONGINT location 'd2'; segList : BPTR location 'd3'; stackSize : LONGINT location 'd4') : pMsgPort; syscall _DOSBase 138;
+FUNCTION CreateProc(const name : PAnsiChar location 'd1'; pri : LONGINT location 'd2'; segList : BPTR location 'd3'; stackSize : LONGINT location 'd4') : pMsgPort; syscall _DOSBase 138;
 FUNCTION CurrentDir(lock : BPTR location 'd1') : BPTR; syscall _DOSBase 126;
 PROCEDURE DateStamp(date : pDateStamp location 'd1'); syscall _DOSBase 192;
 FUNCTION DOSDateToStr(datetime : _PDateTime location 'd1') : LongBool; syscall _DOSBase 744;
 FUNCTION DOSDeleteFile(const name : STRPTR location 'd1') : LongBool; syscall _DOSBase 072;
 FUNCTION DeleteVar(const name : STRPTR location 'd1'; flags : ULONG location 'd2') : LongBool; syscall _DOSBase 912;
-FUNCTION DeviceProc(const name : pCHAR location 'd1') : pMsgPort; syscall _DOSBase 174;
+FUNCTION DeviceProc(const name : PAnsiChar location 'd1') : pMsgPort; syscall _DOSBase 174;
 FUNCTION DoPkt(port : pMsgPort location 'd1'; action : LONGINT location 'd2'; arg1 : LONGINT location 'd3'; arg2 : LONGINT location 'd4'; arg3 : LONGINT location 'd5'; arg4 : LONGINT location 'd6'; arg5 : LONGINT location 'd7') : LONGINT; syscall _DOSBase 240;
 FUNCTION DoPkt0(port : pMsgPort location 'd1'; action : LONGINT location 'd2') : LONGINT; syscall _DOSBase 240;
 FUNCTION DoPkt1(port : pMsgPort location 'd1'; action : LONGINT location 'd2'; arg1 : LONGINT location 'd3') : LONGINT; syscall _DOSBase 240;
@@ -1651,7 +1651,7 @@ PROCEDURE DOSDelay(timeout : LONGINT location 'd1'); syscall _DOSBase 198;
 PROCEDURE DOSExit(returnCode : LONGINT location 'd1'); syscall _DOSBase 144;
 FUNCTION DOSFlush(fh : BPTR location 'd1') : LongBool; syscall _DOSBase 360;
 FUNCTION DOSInput : BPTR; syscall _DOSBase 054;
-FUNCTION DOSOpen(const name : pCHAR location 'd1'; accessMode : LONGINT location 'd2') : BPTR; syscall _DOSBase 030;
+FUNCTION DOSOpen(const name : PAnsiChar location 'd1'; accessMode : LONGINT location 'd2') : BPTR; syscall _DOSBase 030;
 FUNCTION DOSOutput : BPTR; syscall _DOSBase 060;
 FUNCTION DOSRead(file_ : BPTR location 'd1'; buffer : POINTER location 'd2'; length : LONGINT location 'd3') : LONGINT; syscall _DOSBase 042;
 FUNCTION DOSRename(const oldName : STRPTR location 'd1';const newName : STRPTR location 'd2') : LongBool; syscall _DOSBase 078;
@@ -1665,116 +1665,116 @@ FUNCTION ExAll(lock : BPTR location 'd1'; buffer : pExAllData location 'd2'; siz
 PROCEDURE ExAllEnd(lock : BPTR location 'd1'; buffer : pExAllData location 'd2'; size : LONGINT location 'd3'; data : LONGINT location 'd4'; control : pExAllControl location 'd5'); syscall _DOSBase 990;
 FUNCTION Examine(lock : BPTR location 'd1'; fileInfoBlock : pFileInfoBlock location 'd2') : LongBool; syscall _DOSBase 102;
 FUNCTION ExamineFH(fh : BPTR location 'd1'; fib : pFileInfoBlock location 'd2') : LongBool; syscall _DOSBase 390;
-FUNCTION Execute(const string_ : pCHAR location 'd1'; file_ : BPTR location 'd2'; file2 : BPTR location 'd3') : LongBool; syscall _DOSBase 222;
+FUNCTION Execute(const string_ : PAnsiChar location 'd1'; file_ : BPTR location 'd2'; file2 : BPTR location 'd3') : LongBool; syscall _DOSBase 222;
 FUNCTION ExNext(lock : BPTR location 'd1'; fileInfoBlock : pFileInfoBlock location 'd2') : LongBool; syscall _DOSBase 108;
-FUNCTION Fault(code : LONGINT location 'd1'; header : pCHAR location 'd2'; buffer : pCHAR location 'd3'; len : LONGINT location 'd4') : LongBool; syscall _DOSBase 468;
+FUNCTION Fault(code : LONGINT location 'd1'; header : PAnsiChar location 'd2'; buffer : PAnsiChar location 'd3'; len : LONGINT location 'd4') : LongBool; syscall _DOSBase 468;
 FUNCTION FGetC(fh : BPTR location 'd1') : LONGINT; syscall _DOSBase 306;
-FUNCTION FGets(fh : BPTR location 'd1'; buf : pCHAR location 'd2'; buflen : ULONG location 'd3') : pCHAR; syscall _DOSBase 336;
-FUNCTION FilePart(const path : pCHAR location 'd1') : pCHAR; syscall _DOSBase 870;
-FUNCTION FindArg(const keyword : pCHAR location 'd1';const arg_template : pCHAR location 'd2') : LONGINT; syscall _DOSBase 804;
+FUNCTION FGets(fh : BPTR location 'd1'; buf : PAnsiChar location 'd2'; buflen : ULONG location 'd3') : PAnsiChar; syscall _DOSBase 336;
+FUNCTION FilePart(const path : PAnsiChar location 'd1') : PAnsiChar; syscall _DOSBase 870;
+FUNCTION FindArg(const keyword : PAnsiChar location 'd1';const arg_template : PAnsiChar location 'd2') : LONGINT; syscall _DOSBase 804;
 FUNCTION FindCliProc(num : ULONG location 'd1') : pProcess; syscall _DOSBase 546;
-FUNCTION FindDosEntry(const dlist : pDosList location 'd1';const name : pCHAR location 'd2'; flags : ULONG location 'd3') : pDosList; syscall _DOSBase 684;
-FUNCTION FindSegment(const name : pCHAR location 'd1';const seg : pSegment location 'd2'; system : LONGINT location 'd3') : pSegment; syscall _DOSBase 780;
-FUNCTION FindVar(const name : pCHAR location 'd1'; type_ : ULONG location 'd2') : pLocalVar; syscall _DOSBase 918;
-FUNCTION Format(const filesystem : pCHAR location 'd1';const volumename : pCHAR location 'd2'; dostype : ULONG location 'd3') : LongBool; syscall _DOSBase 714;
+FUNCTION FindDosEntry(const dlist : pDosList location 'd1';const name : PAnsiChar location 'd2'; flags : ULONG location 'd3') : pDosList; syscall _DOSBase 684;
+FUNCTION FindSegment(const name : PAnsiChar location 'd1';const seg : pSegment location 'd2'; system : LONGINT location 'd3') : pSegment; syscall _DOSBase 780;
+FUNCTION FindVar(const name : PAnsiChar location 'd1'; type_ : ULONG location 'd2') : pLocalVar; syscall _DOSBase 918;
+FUNCTION Format(const filesystem : PAnsiChar location 'd1';const volumename : PAnsiChar location 'd2'; dostype : ULONG location 'd3') : LongBool; syscall _DOSBase 714;
 FUNCTION FPutC(fh : BPTR location 'd1'; ch : LONGINT location 'd2') : LONGINT; syscall _DOSBase 312;
-FUNCTION FPuts(fh : BPTR location 'd1';const str : pCHAR location 'd2') : LongInt; syscall _DOSBase 342;
+FUNCTION FPuts(fh : BPTR location 'd1';const str : PAnsiChar location 'd2') : LongInt; syscall _DOSBase 342;
 FUNCTION FRead(fh : BPTR location 'd1'; block : POINTER location 'd2'; blocklen : ULONG location 'd3'; number : ULONG location 'd4') : LONGINT; syscall _DOSBase 324;
 PROCEDURE FreeArgs(args : pRDArgs location 'd1'); syscall _DOSBase 858;
 PROCEDURE FreeDeviceProc(dp : pDevProc location 'd1'); syscall _DOSBase 648;
 PROCEDURE FreeDosEntry(dlist : pDosList); syscall _DOSBase 702;
 PROCEDURE FreeDosObject(type_ : ULONG location 'd1'; ptr : POINTER location 'd2'); syscall _DOSBase 234;
 FUNCTION FWrite(fh : BPTR location 'd1'; block : POINTER location 'd2'; blocklen : ULONG location 'd3'; number : ULONG location 'd4') : LONGINT; syscall _DOSBase 330;
-FUNCTION GetArgStr : pCHAR; syscall _DOSBase 534;
+FUNCTION GetArgStr : PAnsiChar; syscall _DOSBase 534;
 FUNCTION GetConsoleTask : pMsgPort; syscall _DOSBase 510;
-FUNCTION GetCurrentDirName(buf : pCHAR location 'd1'; len : LONGINT location 'd2') : LongBool; syscall _DOSBase 564;
-FUNCTION GetDeviceProc(const name : pCHAR location 'd1'; dp : pDevProc location 'd2') : pDevProc; syscall _DOSBase 642;
+FUNCTION GetCurrentDirName(buf : PAnsiChar location 'd1'; len : LONGINT location 'd2') : LongBool; syscall _DOSBase 564;
+FUNCTION GetDeviceProc(const name : PAnsiChar location 'd1'; dp : pDevProc location 'd2') : pDevProc; syscall _DOSBase 642;
 FUNCTION GetFileSysTask : pMsgPort; syscall _DOSBase 522;
 FUNCTION GetProgramDir : BPTR; syscall _DOSBase 600;
-FUNCTION GetProgramName(buf : pCHAR location 'd1'; len : LONGINT location 'd2') : LongBool; syscall _DOSBase 576;
-FUNCTION GetPrompt(buf : pCHAR location 'd1'; len : LONGINT location 'd2') : LongBool; syscall _DOSBase 588;
-FUNCTION GetVar(const name : pCHAR location 'd1'; buffer : pCHAR location 'd2'; size : LONGINT location 'd3'; flags : LONGINT location 'd4') : LONGINT; syscall _DOSBase 906;
+FUNCTION GetProgramName(buf : PAnsiChar location 'd1'; len : LONGINT location 'd2') : LongBool; syscall _DOSBase 576;
+FUNCTION GetPrompt(buf : PAnsiChar location 'd1'; len : LONGINT location 'd2') : LongBool; syscall _DOSBase 588;
+FUNCTION GetVar(const name : PAnsiChar location 'd1'; buffer : PAnsiChar location 'd2'; size : LONGINT location 'd3'; flags : LONGINT location 'd4') : LONGINT; syscall _DOSBase 906;
 FUNCTION Info(lock : BPTR location 'd1'; parameterBlock : pInfoData location 'd2') : LongBool; syscall _DOSBase 114;
-FUNCTION Inhibit(const name : pCHAR location 'd1'; onoff : LONGINT location 'd2') : LongBool; syscall _DOSBase 726;
+FUNCTION Inhibit(const name : PAnsiChar location 'd1'; onoff : LONGINT location 'd2') : LongBool; syscall _DOSBase 726;
 FUNCTION InternalLoadSeg(fh : BPTR location 'd0'; table : LONGINT location 'a0';const funcarray : pLONGINT location 'a1'; VAR stack : LONGINT location 'a2') : LONGINT; syscall _DOSBase 756;
 FUNCTION InternalUnLoadSeg(seglist : BPTR location 'd1'; freefunc : tPROCEDURE location 'a1') : LongBool; syscall _DOSBase 762;
 FUNCTION IoErr : LONGINT; syscall _DOSBase 132;
-FUNCTION IsFileSystem(const name : pCHAR location 'd1') : LongBool; syscall _DOSBase 708;
+FUNCTION IsFileSystem(const name : PAnsiChar location 'd1') : LongBool; syscall _DOSBase 708;
 FUNCTION IsInteractive(file_ : BPTR location 'd1') : LongBool; syscall _DOSBase 216;
-FUNCTION LoadSeg(const name : pCHAR location 'd1') : LONGINT; syscall _DOSBase 150;
-FUNCTION Lock(const name : pCHAR location 'd1'; type_ : LONGINT location 'd2') : LONGINT; syscall _DOSBase 084;
+FUNCTION LoadSeg(const name : PAnsiChar location 'd1') : LONGINT; syscall _DOSBase 150;
+FUNCTION Lock(const name : PAnsiChar location 'd1'; type_ : LONGINT location 'd2') : LONGINT; syscall _DOSBase 084;
 FUNCTION LockDosList(flags : ULONG location 'd1') : pDosList; syscall _DOSBase 654;
 FUNCTION LockRecord(fh : BPTR location 'd1'; offset : ULONG location 'd2'; length : ULONG location 'd3'; mode : ULONG location 'd4'; timeout : ULONG location 'd5') : LongBool; syscall _DOSBase 270;
 FUNCTION LockRecords(recArray : pRecordLock location 'd1'; timeout : ULONG location 'd2') : LongBool; syscall _DOSBase 276;
-FUNCTION MakeDosEntry(const name : pCHAR location 'd1'; type_ : LONGINT location 'd2') : pDosList; syscall _DOSBase 696;
-FUNCTION MakeLink(const name : pCHAR location 'd1'; dest : LONGINT location 'd2'; soft : LONGINT location 'd3') : LongBool; syscall _DOSBase 444;
+FUNCTION MakeDosEntry(const name : PAnsiChar location 'd1'; type_ : LONGINT location 'd2') : pDosList; syscall _DOSBase 696;
+FUNCTION MakeLink(const name : PAnsiChar location 'd1'; dest : LONGINT location 'd2'; soft : LONGINT location 'd3') : LongBool; syscall _DOSBase 444;
 PROCEDURE MatchEnd(anchor : pAnchorPath location 'd1'); syscall _DOSBase 834;
-FUNCTION MatchFirst(const pat : pCHAR location 'd1'; anchor : pAnchorPath location 'd2') : LONGINT; syscall _DOSBase 822;
+FUNCTION MatchFirst(const pat : PAnsiChar location 'd1'; anchor : pAnchorPath location 'd2') : LONGINT; syscall _DOSBase 822;
 FUNCTION MatchNext(anchor : pAnchorPath location 'd1') : LONGINT; syscall _DOSBase 828;
-FUNCTION MatchPattern(const pat : pCHAR location 'd1'; str : pCHAR location 'd2') : LongBool; syscall _DOSBase 846;
-FUNCTION MatchPatternNoCase(const pat : pCHAR location 'd1'; str : pCHAR location 'd2') : LongBool; syscall _DOSBase 972;
+FUNCTION MatchPattern(const pat : PAnsiChar location 'd1'; str : PAnsiChar location 'd2') : LongBool; syscall _DOSBase 846;
+FUNCTION MatchPatternNoCase(const pat : PAnsiChar location 'd1'; str : PAnsiChar location 'd2') : LongBool; syscall _DOSBase 972;
 FUNCTION MaxCli : ULONG; syscall _DOSBase 552;
-FUNCTION NameFromFH(fh : BPTR location 'd1'; buffer : pCHAR location 'd2'; len : LONGINT location 'd3') : LongBool; syscall _DOSBase 408;
-FUNCTION NameFromLock(lock : BPTR location 'd1'; buffer : pCHAR location 'd2'; len : LONGINT location 'd3') : LongBool; syscall _DOSBase 402;
-FUNCTION NewLoadSeg(const file_ : pCHAR location 'd1';const tags : pTagItem location 'd2') : BPTR; syscall _DOSBase 768;
-FUNCTION NewLoadSegTagList(const file_ : pCHAR location 'd1';const tags : pTagItem location 'd2') : BPTR; syscall _DOSBase 768;
+FUNCTION NameFromFH(fh : BPTR location 'd1'; buffer : PAnsiChar location 'd2'; len : LONGINT location 'd3') : LongBool; syscall _DOSBase 408;
+FUNCTION NameFromLock(lock : BPTR location 'd1'; buffer : PAnsiChar location 'd2'; len : LONGINT location 'd3') : LongBool; syscall _DOSBase 402;
+FUNCTION NewLoadSeg(const file_ : PAnsiChar location 'd1';const tags : pTagItem location 'd2') : BPTR; syscall _DOSBase 768;
+FUNCTION NewLoadSegTagList(const file_ : PAnsiChar location 'd1';const tags : pTagItem location 'd2') : BPTR; syscall _DOSBase 768;
 FUNCTION NextDosEntry(const dlist : pDosList location 'd1'; flags : ULONG location 'd2') : pDosList; syscall _DOSBase 690;
 FUNCTION OpenFromLock(lock : BPTR location 'd1') : BPTR; syscall _DOSBase 378;
 FUNCTION ParentDir(lock : BPTR location 'd1') : BPTR; syscall _DOSBase 210;
 FUNCTION ParentOfFH(fh : BPTR location 'd1') : BPTR; syscall _DOSBase 384;
-FUNCTION ParsePattern(const pat : pCHAR location 'd1'; buf : pCHAR location 'd2'; buflen : LONGINT location 'd3') : LONGINT; syscall _DOSBase 840;
-FUNCTION ParsePatternNoCase(const pat : pCHAR location 'd1'; buf : pCHAR location 'd2'; buflen : LONGINT location 'd3') : LONGINT; syscall _DOSBase 966;
-FUNCTION PathPart(const path : pCHAR location 'd1') : pCHAR; syscall _DOSBase 876;
-FUNCTION PrintFault(code : LONGINT location 'd1';const header : pCHAR location 'd2') : LongBool; syscall _DOSBase 474;
-FUNCTION PutStr(const str : pCHAR location 'd1') : LongInt; syscall _DOSBase 948;
-FUNCTION ReadArgs(const arg_template : pCHAR location 'd1'; arra : pLONGINT location 'd2'; args : pRDArgs location 'd3') : pRDArgs; syscall _DOSBase 798;
-FUNCTION ReadItem(const name : pCHAR location 'd1'; maxchars : LONGINT location 'd2'; cSource : pCSource location 'd3') : LONGINT; syscall _DOSBase 810;
-FUNCTION ReadLink(port : pMsgPort location 'd1'; lock : LONGINT location 'd2';const path : pCHAR location 'd3'; buffer : pCHAR location 'd4'; size : ULONG location 'd5') : LongBool; syscall _DOSBase 438;
-FUNCTION Relabel(const drive : pCHAR location 'd1';const newname : pCHAR location 'd2') : LongBool; syscall _DOSBase 720;
-FUNCTION RemAssignList(const name : pCHAR location 'd1'; lock : LONGINT location 'd2') : LongBool; syscall _DOSBase 636;
+FUNCTION ParsePattern(const pat : PAnsiChar location 'd1'; buf : PAnsiChar location 'd2'; buflen : LONGINT location 'd3') : LONGINT; syscall _DOSBase 840;
+FUNCTION ParsePatternNoCase(const pat : PAnsiChar location 'd1'; buf : PAnsiChar location 'd2'; buflen : LONGINT location 'd3') : LONGINT; syscall _DOSBase 966;
+FUNCTION PathPart(const path : PAnsiChar location 'd1') : PAnsiChar; syscall _DOSBase 876;
+FUNCTION PrintFault(code : LONGINT location 'd1';const header : PAnsiChar location 'd2') : LongBool; syscall _DOSBase 474;
+FUNCTION PutStr(const str : PAnsiChar location 'd1') : LongInt; syscall _DOSBase 948;
+FUNCTION ReadArgs(const arg_template : PAnsiChar location 'd1'; arra : pLONGINT location 'd2'; args : pRDArgs location 'd3') : pRDArgs; syscall _DOSBase 798;
+FUNCTION ReadItem(const name : PAnsiChar location 'd1'; maxchars : LONGINT location 'd2'; cSource : pCSource location 'd3') : LONGINT; syscall _DOSBase 810;
+FUNCTION ReadLink(port : pMsgPort location 'd1'; lock : LONGINT location 'd2';const path : PAnsiChar location 'd3'; buffer : PAnsiChar location 'd4'; size : ULONG location 'd5') : LongBool; syscall _DOSBase 438;
+FUNCTION Relabel(const drive : PAnsiChar location 'd1';const newname : PAnsiChar location 'd2') : LongBool; syscall _DOSBase 720;
+FUNCTION RemAssignList(const name : PAnsiChar location 'd1'; lock : LONGINT location 'd2') : LongBool; syscall _DOSBase 636;
 FUNCTION RemDosEntry(dlist : pDosList location 'd1') : LongBool; syscall _DOSBase 672;
 FUNCTION RemSegment(seg : pSegment location 'd1') : LongBool; syscall _DOSBase 786;
 PROCEDURE ReplyPkt(dp : pDosPacket location 'd1'; res1 : LONGINT location 'd2'; res2 : LONGINT location 'd3'); syscall _DOSBase 258;
-FUNCTION RunCommand(seg : BPTR location 'd1'; stack : LONGINT location 'd2';const paramptr : pCHAR location 'd3'; paramlen : LONGINT location 'd4') : LONGINT; syscall _DOSBase 504;
+FUNCTION RunCommand(seg : BPTR location 'd1'; stack : LONGINT location 'd2';const paramptr : PAnsiChar location 'd3'; paramlen : LONGINT location 'd4') : LONGINT; syscall _DOSBase 504;
 FUNCTION SameDevice(lock1 : BPTR location 'd1'; lock2 : BPTR location 'd2') : LongBool; syscall _DOSBase 984;
 FUNCTION SameLock(lock1 : BPTR location 'd1'; lock2 : BPTR location 'd2') : LONGINT; syscall _DOSBase 420;
 FUNCTION SelectInput(fh : BPTR location 'd1') : BPTR; syscall _DOSBase 294;
 FUNCTION SelectOutput(fh : BPTR location 'd1') : BPTR; syscall _DOSBase 300;
 PROCEDURE SendPkt(dp : pDosPacket location 'd1'; port : pMsgPort location 'd2'; replyport : pMsgPort location 'd3'); syscall _DOSBase 246;
-FUNCTION SetArgStr(const string_ : pCHAR location 'd1') : PChar; syscall _DOSBase 540;
-FUNCTION SetComment(const name : pCHAR location 'd1';const comment : pCHAR location 'd2') : LongBool; syscall _DOSBase 180;
+FUNCTION SetArgStr(const string_ : PAnsiChar location 'd1') : PAnsiChar; syscall _DOSBase 540;
+FUNCTION SetComment(const name : PAnsiChar location 'd1';const comment : PAnsiChar location 'd2') : LongBool; syscall _DOSBase 180;
 FUNCTION SetConsoleTask(const task : pMsgPort location 'd1') : pMsgPort; syscall _DOSBase 516;
-FUNCTION SetCurrentDirName(const name : pCHAR location 'd1') : LongBool; syscall _DOSBase 558;
-FUNCTION SetFileDate(const name : pCHAR location 'd1'; date : pDateStamp location 'd2') : LongBool; syscall _DOSBase 396;
+FUNCTION SetCurrentDirName(const name : PAnsiChar location 'd1') : LongBool; syscall _DOSBase 558;
+FUNCTION SetFileDate(const name : PAnsiChar location 'd1'; date : pDateStamp location 'd2') : LongBool; syscall _DOSBase 396;
 FUNCTION SetFileSize(fh : BPTR location 'd1'; pos : LONGINT location 'd2'; mode : LONGINT location 'd3') : LongInt; syscall _DOSBase 456;
 FUNCTION SetFileSysTask(const task : pMsgPort location 'd1') : pMsgPort; syscall _DOSBase 528;
 FUNCTION SetIoErr(result : LONGINT location 'd1') : LONGINT; syscall _DOSBase 462;
 FUNCTION SetMode(fh : BPTR location 'd1'; mode : LONGINT location 'd2') : LongBool; syscall _DOSBase 426;
-FUNCTION SetOwner(const name : pCHAR location 'd1'; owner_info : LONGINT location 'd2') : LongBool; syscall _DOSBase 996;
+FUNCTION SetOwner(const name : PAnsiChar location 'd1'; owner_info : LONGINT location 'd2') : LongBool; syscall _DOSBase 996;
 FUNCTION SetProgramDir(lock : BPTR location 'd1') : LONGINT; syscall _DOSBase 594;
-FUNCTION SetProgramName(const name : pCHAR location 'd1') : LongBool; syscall _DOSBase 570;
-FUNCTION SetPrompt(const name : pCHAR location 'd1') : LongBool; syscall _DOSBase 582;
-FUNCTION SetProtection(const name : pCHAR location 'd1'; protect : LONGINT location 'd2') : LongBool; syscall _DOSBase 186;
-FUNCTION SetVar(const name : pCHAR location 'd1'; buffer : pCHAR location 'd2'; size : LONGINT location 'd3'; flags : LONGINT location 'd4') : LongBool; syscall _DOSBase 900;
-FUNCTION SetVBuf(fh : BPTR location 'd1'; buff : pCHAR location 'd2'; type_ : LONGINT location 'd3'; size : LONGINT location 'd4') : LongBool; syscall _DOSBase 366;
-FUNCTION SplitName(const name : pCHAR location 'd1'; seperator : ULONG location 'd2'; buf : pCHAR location 'd3'; oldpos : LONGINT location 'd4'; size : LONGINT location 'd5') : smallint; syscall _DOSBase 414;
+FUNCTION SetProgramName(const name : PAnsiChar location 'd1') : LongBool; syscall _DOSBase 570;
+FUNCTION SetPrompt(const name : PAnsiChar location 'd1') : LongBool; syscall _DOSBase 582;
+FUNCTION SetProtection(const name : PAnsiChar location 'd1'; protect : LONGINT location 'd2') : LongBool; syscall _DOSBase 186;
+FUNCTION SetVar(const name : PAnsiChar location 'd1'; buffer : PAnsiChar location 'd2'; size : LONGINT location 'd3'; flags : LONGINT location 'd4') : LongBool; syscall _DOSBase 900;
+FUNCTION SetVBuf(fh : BPTR location 'd1'; buff : PAnsiChar location 'd2'; type_ : LONGINT location 'd3'; size : LONGINT location 'd4') : LongBool; syscall _DOSBase 366;
+FUNCTION SplitName(const name : PAnsiChar location 'd1'; seperator : ULONG location 'd2'; buf : PAnsiChar location 'd3'; oldpos : LONGINT location 'd4'; size : LONGINT location 'd5') : smallint; syscall _DOSBase 414;
 FUNCTION StartNotify(notify : pNotifyRequest location 'd1') : LongBool; syscall _DOSBase 888;
 FUNCTION DOSStrToDate(datetime : _PDateTime location 'd1') : LongBool; syscall _DOSBase 750;
-FUNCTION StrToLong(const string_ : pCHAR location 'd1'; VAR value : LONGINT location 'd2') : LONGINT; syscall _DOSBase 816;
-FUNCTION SystemTagList(const command : pCHAR location 'd1';const tags : pTagItem location 'd2') : LONGINT; syscall _DOSBase 606;
-FUNCTION DOSSystem(const command : pCHAR location 'd1';const tags : pTagItem location 'd2') : LONGINT; syscall _DOSBase 606;
+FUNCTION StrToLong(const string_ : PAnsiChar location 'd1'; VAR value : LONGINT location 'd2') : LONGINT; syscall _DOSBase 816;
+FUNCTION SystemTagList(const command : PAnsiChar location 'd1';const tags : pTagItem location 'd2') : LONGINT; syscall _DOSBase 606;
+FUNCTION DOSSystem(const command : PAnsiChar location 'd1';const tags : pTagItem location 'd2') : LONGINT; syscall _DOSBase 606;
 FUNCTION UnGetC(fh : LONGINT location 'd1'; character : LONGINT location 'd2') : LONGINT; syscall _DOSBase 318;
 PROCEDURE UnLoadSeg(seglist : BPTR location 'd1'); syscall _DOSBase 156;
 PROCEDURE UnLock(lock : BPTR location 'd1'); syscall _DOSBase 090;
 PROCEDURE UnLockDosList(flags : ULONG location 'd1'); syscall _DOSBase 660;
 FUNCTION UnLockRecord(fh : BPTR location 'd1'; offset : ULONG location 'd2'; length : ULONG location 'd3') : LongBool; syscall _DOSBase 282;
 FUNCTION UnLockRecords(recArray : pRecordLock location 'd1') : LongBool; syscall _DOSBase 288;
-FUNCTION VFPrintf(fh : BPTR location 'd1';const format : pCHAR location 'd2';const argarray : PLongInt location 'd3') : LONGINT; syscall _DOSBase 354;
-PROCEDURE VFWritef(fh : BPTR location 'd1';const format : pCHAR location 'd2';const argarray : pLONGINT location 'd3'); syscall _DOSBase 348;
-FUNCTION VPrintf(const format : pCHAR location 'd1'; const argarray : PLongInt location 'd2') : LONGINT; syscall _DOSBase 954;
+FUNCTION VFPrintf(fh : BPTR location 'd1';const format : PAnsiChar location 'd2';const argarray : PLongInt location 'd3') : LONGINT; syscall _DOSBase 354;
+PROCEDURE VFWritef(fh : BPTR location 'd1';const format : PAnsiChar location 'd2';const argarray : pLONGINT location 'd3'); syscall _DOSBase 348;
+FUNCTION VPrintf(const format : PAnsiChar location 'd1'; const argarray : PLongInt location 'd2') : LONGINT; syscall _DOSBase 954;
 FUNCTION WaitForChar(file_ : BPTR location 'd1'; timeout : LONGINT location 'd2') : LongBool; syscall _DOSBase 204;
 FUNCTION WaitPkt : pDosPacket; syscall _DOSBase 252;
-FUNCTION WriteChars(const buf : pCHAR location 'd1'; buflen : ULONG location 'd2') : LONGINT; syscall _DOSBase 942;
+FUNCTION WriteChars(const buf : PAnsiChar location 'd1'; buflen : ULONG location 'd2') : LONGINT; syscall _DOSBase 942;
 {$endif}
 
 
@@ -1782,86 +1782,86 @@ FUNCTION BADDR(bval :BPTR): POINTER;
 FUNCTION MKBADDR(adr: Pointer): BPTR;
 
 {$if defined(AMIGA_V1_2_ONLY)}
-function GetVar(const Name: PChar; Buffer: PChar; Size: LongInt; Flags: LongInt): LongInt;
+function GetVar(const Name: PAnsiChar; Buffer: PAnsiChar; Size: LongInt; Flags: LongInt): LongInt;
 {$endif}
 
 {$if not defined(AMIGA_V1_2_ONLY)}
 // var args version
 FUNCTION AllocDosObjectTags(type_ : ULONG; Const argv : Array of PtrUInt) : POINTER;
 FUNCTION CreateNewProcTags(Const argv : Array of PtrUInt) : pProcess;
-FUNCTION NewLoadSegTags(file_ : pCHAR; Const argv : Array of PtrUInt) : LONGINT;
-FUNCTION SystemTags(command : pCHAR; Const argv : Array of PtrUInt) : LONGINT;
+FUNCTION NewLoadSegTags(file_ : PAnsiChar; Const argv : Array of PtrUInt) : LONGINT;
+FUNCTION SystemTags(command : PAnsiChar; Const argv : Array of PtrUInt) : LONGINT;
 
 { overlay function and procedures}
 
-FUNCTION AddBuffers(const name : string; number : LONGINT) : BOOLEAN;
-FUNCTION AddPart(dirname : pCHAR;const filename : string; size : ULONG) : BOOLEAN;
-FUNCTION AssignAdd(const name : string; lock : LONGINT) : BOOLEAN;
-FUNCTION AssignLate(const name : string;const path : pCHAR) : BOOLEAN;
-FUNCTION AssignLate(const name : pChar;const path : string) : BOOLEAN;
-FUNCTION AssignLate(const name : string;const path : string) : BOOLEAN;
-FUNCTION AssignLock(const name : string; lock : LONGINT) : BOOLEAN;
-FUNCTION AssignPath(const name : string; const path : pCHAR) : BOOLEAN;
-FUNCTION AssignPath(const name : pCHAR;const path : string) : BOOLEAN;
-FUNCTION AssignPath(const name : string;const path : string) : BOOLEAN;
-FUNCTION CreateDir(const name : string) : LONGINT;
-FUNCTION DOSDeleteFile(const name : string) : BOOLEAN;
-FUNCTION DeleteVar(const name : string; flags : ULONG) : BOOLEAN;
-FUNCTION DeviceProc(const name : string) : pMsgPort;
-FUNCTION DOSOpen(const name : string; accessMode : LONGINT) : LONGINT;
-FUNCTION DOSRename(const oldName : string;const newName : pChar) : boolean;
-FUNCTION DOSRename(const oldName : pCHAR;const newName : string) : Boolean;
-FUNCTION DOSRename(const oldName : string;const newName : string) : Boolean;
-FUNCTION Execute(const string_ : string; file_ : LONGINT; file2 : LONGINT) : BOOLEAN;
-FUNCTION Fault(code : LONGINT; header : string; buffer : pCHAR; len : LONGINT) : BOOLEAN;
-FUNCTION FilePart(const path : string) : pCHAR;
-FUNCTION FindArg(const keyword : string;const arg_template : pCHAR) : LONGINT;
-FUNCTION FindArg(const keyword : pCHAR;const arg_template : string) : LONGINT;
-FUNCTION FindArg(const keyword : string;const arg_template : string) : LONGINT;
-FUNCTION FindDosEntry(const dlist : pDosList;const name : string; flags : ULONG) : pDosList;
-FUNCTION FindSegment(const name : string;const seg : pSegment; system : LONGINT) : pSegment;
-FUNCTION FindVar(const name : string; type_ : ULONG) : pLocalVar;
-FUNCTION Format(const filesystem : string;const volumename : pCHAR; dostype : ULONG) : BOOLEAN;
-FUNCTION Format(const filesystem : pCHAR;const volumename : string; dostype : ULONG) : BOOLEAN;
-FUNCTION Format(const filesystem : string;const volumename : string; dostype : ULONG) : BOOLEAN;
-FUNCTION FPuts(fh : LONGINT;const str : string) : LongInt;
-FUNCTION GetDeviceProc(const name : string; dp : pDevProc) : pDevProc;
-FUNCTION GetVar(const name : string; buffer : pCHAR; size : LONGINT; flags : LONGINT) : LONGINT;
-FUNCTION Inhibit(const name : string; onoff : LONGINT) : BOOLEAN;
-FUNCTION IsFileSystem(const name : string) : BOOLEAN;
-FUNCTION LoadSeg(const name : string) : LONGINT;
-FUNCTION Lock(const name : string; type_ : LONGINT) : LONGINT;
-FUNCTION MakeDosEntry(const name : string; type_ : LONGINT) : pDosList;
-FUNCTION MakeLink(const name : string; dest : LONGINT; soft : LONGINT) : BOOLEAN;
-FUNCTION MatchFirst(const pat : string; anchor : pAnchorPath) : LONGINT;
-FUNCTION MatchPattern(const pat : pCHAR; str : string) : BOOLEAN;
-FUNCTION MatchPatternNoCase(const pat : pCHAR; str : string) : BOOLEAN;
-FUNCTION NewLoadSeg(const file_ : string;const tags : pTagItem) : LONGINT;
-FUNCTION NewLoadSegTagList(const file_ : string;const tags : pTagItem) : LONGINT;
-FUNCTION PathPart(const path : string) : pCHAR;
-FUNCTION PrintFault(code : LONGINT;const header : string) : BOOLEAN;
-FUNCTION PutStr(const str : string) : LongInt;
-FUNCTION ReadArgs(const arg_template : string; arra : pLONGINT; args : pRDArgs) : pRDArgs;
-FUNCTION ReadLink(port : pMsgPort; lock : LONGINT;const path : string; buffer : pCHAR; size : ULONG) : BOOLEAN;
-FUNCTION Relabel(const drive : string;const newname : pCHAR) : BOOLEAN;
-FUNCTION Relabel(const drive : pCHAR;const newname : string) : BOOLEAN;
-FUNCTION Relabel(const drive : string;const newname : string) : BOOLEAN;
-FUNCTION RemAssignList(const name : string; lock : LONGINT) : BOOLEAN;
-FUNCTION RunCommand(seg : LONGINT; stack : LONGINT;const paramptr : string; paramlen : LONGINT) : LONGINT;
-FUNCTION SetComment(const name : string;const comment : pCHAR) : BOOLEAN;
-FUNCTION SetComment(const name : pCHAR;const comment : string) : BOOLEAN;
-FUNCTION SetComment(const name : string;const comment : string) : BOOLEAN;
-FUNCTION SetCurrentDirName(const name : string) : BOOLEAN;
-FUNCTION SetFileDate(const name : string; date : pDateStamp) : BOOLEAN;
-FUNCTION SetOwner(const name : string; owner_info : LONGINT) : BOOLEAN;
-FUNCTION SetProgramName(const name : string) : BOOLEAN;
-FUNCTION SetPrompt(const name : string) : BOOLEAN;
-FUNCTION SetProtection(const name : string; protect : LONGINT) : BOOLEAN;
-FUNCTION SetVar(const name : string; buffer : pCHAR; size : LONGINT; flags : LONGINT) : BOOLEAN;
-FUNCTION SplitName(const name : string; seperator : ULONG; buf : pCHAR; oldpos : LONGINT; size : LONGINT) : smallint;
-FUNCTION StrToLong(const string_ : string; VAR value : LONGINT) : LONGINT;
-FUNCTION SystemTagList(const command : string;const tags : pTagItem) : LONGINT;
-FUNCTION DOSSystem(const command : string;const tags : pTagItem) : LONGINT;
+FUNCTION AddBuffers(const name : ShortString; number : LONGINT) : BOOLEAN;
+FUNCTION AddPart(dirname : PAnsiChar;const filename : ShortString; size : ULONG) : BOOLEAN;
+FUNCTION AssignAdd(const name : ShortString; lock : LONGINT) : BOOLEAN;
+FUNCTION AssignLate(const name : ShortString;const path : PAnsiChar) : BOOLEAN;
+FUNCTION AssignLate(const name : PAnsiChar;const path : ShortString) : BOOLEAN;
+FUNCTION AssignLate(const name : ShortString;const path : ShortString) : BOOLEAN;
+FUNCTION AssignLock(const name : ShortString; lock : LONGINT) : BOOLEAN;
+FUNCTION AssignPath(const name : ShortString; const path : PAnsiChar) : BOOLEAN;
+FUNCTION AssignPath(const name : PAnsiChar;const path : ShortString) : BOOLEAN;
+FUNCTION AssignPath(const name : ShortString;const path : ShortString) : BOOLEAN;
+FUNCTION CreateDir(const name : ShortString) : LONGINT;
+FUNCTION DOSDeleteFile(const name : ShortString) : BOOLEAN;
+FUNCTION DeleteVar(const name : ShortString; flags : ULONG) : BOOLEAN;
+FUNCTION DeviceProc(const name : ShortString) : pMsgPort;
+FUNCTION DOSOpen(const name : ShortString; accessMode : LONGINT) : LONGINT;
+FUNCTION DOSRename(const oldName : ShortString;const newName : PAnsiChar) : boolean;
+FUNCTION DOSRename(const oldName : PAnsiChar;const newName : ShortString) : Boolean;
+FUNCTION DOSRename(const oldName : ShortString;const newName : ShortString) : Boolean;
+FUNCTION Execute(const string_ : ShortString; file_ : LONGINT; file2 : LONGINT) : BOOLEAN;
+FUNCTION Fault(code : LONGINT; header : ShortString; buffer : PAnsiChar; len : LONGINT) : BOOLEAN;
+FUNCTION FilePart(const path : ShortString) : PAnsiChar;
+FUNCTION FindArg(const keyword : ShortString;const arg_template : PAnsiChar) : LONGINT;
+FUNCTION FindArg(const keyword : PAnsiChar;const arg_template : ShortString) : LONGINT;
+FUNCTION FindArg(const keyword : ShortString;const arg_template : ShortString) : LONGINT;
+FUNCTION FindDosEntry(const dlist : pDosList;const name : ShortString; flags : ULONG) : pDosList;
+FUNCTION FindSegment(const name : ShortString;const seg : pSegment; system : LONGINT) : pSegment;
+FUNCTION FindVar(const name : ShortString; type_ : ULONG) : pLocalVar;
+FUNCTION Format(const filesystem : ShortString;const volumename : PAnsiChar; dostype : ULONG) : BOOLEAN;
+FUNCTION Format(const filesystem : PAnsiChar;const volumename : ShortString; dostype : ULONG) : BOOLEAN;
+FUNCTION Format(const filesystem : ShortString;const volumename : ShortString; dostype : ULONG) : BOOLEAN;
+FUNCTION FPuts(fh : LONGINT;const str : ShortString) : LongInt;
+FUNCTION GetDeviceProc(const name : ShortString; dp : pDevProc) : pDevProc;
+FUNCTION GetVar(const name : ShortString; buffer : PAnsiChar; size : LONGINT; flags : LONGINT) : LONGINT;
+FUNCTION Inhibit(const name : ShortString; onoff : LONGINT) : BOOLEAN;
+FUNCTION IsFileSystem(const name : ShortString) : BOOLEAN;
+FUNCTION LoadSeg(const name : ShortString) : LONGINT;
+FUNCTION Lock(const name : ShortString; type_ : LONGINT) : LONGINT;
+FUNCTION MakeDosEntry(const name : ShortString; type_ : LONGINT) : pDosList;
+FUNCTION MakeLink(const name : ShortString; dest : LONGINT; soft : LONGINT) : BOOLEAN;
+FUNCTION MatchFirst(const pat : ShortString; anchor : pAnchorPath) : LONGINT;
+FUNCTION MatchPattern(const pat : PAnsiChar; str : ShortString) : BOOLEAN;
+FUNCTION MatchPatternNoCase(const pat : PAnsiChar; str : ShortString) : BOOLEAN;
+FUNCTION NewLoadSeg(const file_ : ShortString;const tags : pTagItem) : LONGINT;
+FUNCTION NewLoadSegTagList(const file_ : ShortString;const tags : pTagItem) : LONGINT;
+FUNCTION PathPart(const path : ShortString) : PAnsiChar;
+FUNCTION PrintFault(code : LONGINT;const header : ShortString) : BOOLEAN;
+FUNCTION PutStr(const str : ShortString) : LongInt;
+FUNCTION ReadArgs(const arg_template : ShortString; arra : pLONGINT; args : pRDArgs) : pRDArgs;
+FUNCTION ReadLink(port : pMsgPort; lock : LONGINT;const path : ShortString; buffer : PAnsiChar; size : ULONG) : BOOLEAN;
+FUNCTION Relabel(const drive : ShortString;const newname : PAnsiChar) : BOOLEAN;
+FUNCTION Relabel(const drive : PAnsiChar;const newname : ShortString) : BOOLEAN;
+FUNCTION Relabel(const drive : ShortString;const newname : ShortString) : BOOLEAN;
+FUNCTION RemAssignList(const name : ShortString; lock : LONGINT) : BOOLEAN;
+FUNCTION RunCommand(seg : LONGINT; stack : LONGINT;const paramptr : ShortString; paramlen : LONGINT) : LONGINT;
+FUNCTION SetComment(const name : ShortString;const comment : PAnsiChar) : BOOLEAN;
+FUNCTION SetComment(const name : PAnsiChar;const comment : ShortString) : BOOLEAN;
+FUNCTION SetComment(const name : ShortString;const comment : ShortString) : BOOLEAN;
+FUNCTION SetCurrentDirName(const name : ShortString) : BOOLEAN;
+FUNCTION SetFileDate(const name : ShortString; date : pDateStamp) : BOOLEAN;
+FUNCTION SetOwner(const name : ShortString; owner_info : LONGINT) : BOOLEAN;
+FUNCTION SetProgramName(const name : ShortString) : BOOLEAN;
+FUNCTION SetPrompt(const name : ShortString) : BOOLEAN;
+FUNCTION SetProtection(const name : ShortString; protect : LONGINT) : BOOLEAN;
+FUNCTION SetVar(const name : ShortString; buffer : PAnsiChar; size : LONGINT; flags : LONGINT) : BOOLEAN;
+FUNCTION SplitName(const name : ShortString; seperator : ULONG; buf : PAnsiChar; oldpos : LONGINT; size : LONGINT) : smallint;
+FUNCTION StrToLong(const string_ : ShortString; VAR value : LONGINT) : LONGINT;
+FUNCTION SystemTagList(const command : ShortString;const tags : pTagItem) : LONGINT;
+FUNCTION DOSSystem(const command : ShortString;const tags : pTagItem) : LONGINT;
 {$endif}
 
 IMPLEMENTATION
@@ -1878,7 +1878,7 @@ BEGIN
 END;
 
 {$if defined(AMIGA_V1_2_ONLY)}
-function GetVar(const Name: PChar; Buffer: PChar; Size: LongInt; Flags: LongInt): LongInt;
+function GetVar(const Name: PAnsiChar; Buffer: PAnsiChar; Size: LongInt; Flags: LongInt): LongInt;
 var
   Anchor: TAnchorPath;
   FName: AnsiString;
@@ -1894,12 +1894,12 @@ begin
   MyProc^.pr_WindowPtr := Pointer(-1);
   //
   FName := 'ENV:' + AnsiString(Name);
-  FLock := Lock(PChar(FName), SHARED_LOCK);
+  FLock := Lock(PAnsiChar(FName), SHARED_LOCK);
   if FLock <> 0 then
   begin
     UnLock(FLock);
     // search in env for all Variables
-    Fh := DosOpen(PChar(FName), MODE_OLDFILE);
+    Fh := DosOpen(PAnsiChar(FName), MODE_OLDFILE);
     if Fh <> 0 then
     begin
       GetVar := DosRead(Fh, Buffer, Size);
@@ -1922,354 +1922,354 @@ begin
      CreateNewProcTags := CreateNewProcTagList(@argv);
 end;
 
-FUNCTION NewLoadSegTags(file_ : pCHAR; Const argv : Array of PtrUInt) : LONGINT;
+FUNCTION NewLoadSegTags(file_ : PAnsiChar; Const argv : Array of PtrUInt) : LONGINT;
 begin
      NewLoadSegTags := NewLoadSegTagList(file_, @argv);
 end;
 
-FUNCTION SystemTags(command : pCHAR; Const argv : Array of PtrUInt) : LONGINT;
+FUNCTION SystemTags(command : PAnsiChar; Const argv : Array of PtrUInt) : LONGINT;
 begin
      SystemTags := SystemTagList(command, @argv);
 end;
 
-FUNCTION AddBuffers(const name : string; number : LONGINT) : BOOLEAN;
+FUNCTION AddBuffers(const name : ShortString; number : LONGINT) : BOOLEAN;
 begin
-     AddBuffers := AddBuffers(PChar(RawByteString(name)), number);
+     AddBuffers := AddBuffers(PAnsiChar(RawByteString(name)), number);
 end;
 
-FUNCTION AddPart(dirname : pCHAR; const filename : string; size : ULONG) : BOOLEAN;
+FUNCTION AddPart(dirname : PAnsiChar; const filename : ShortString; size : ULONG) : BOOLEAN;
 begin
-     AddPart := AddPart(dirname,PChar(RawByteString(filename)),size);
+     AddPart := AddPart(dirname,PAnsiChar(RawByteString(filename)),size);
 end;
 
-FUNCTION AssignAdd(const name : string; lock : LONGINT) : BOOLEAN;
+FUNCTION AssignAdd(const name : ShortString; lock : LONGINT) : BOOLEAN;
 begin
-     AssignAdd := AssignAdd(PChar(RawByteString(name)),lock);
+     AssignAdd := AssignAdd(PAnsiChar(RawByteString(name)),lock);
 end;
 
-FUNCTION AssignLate(const name : string;const path : pCHAR) : BOOLEAN;
+FUNCTION AssignLate(const name : ShortString;const path : PAnsiChar) : BOOLEAN;
 begin
-     AssignLate := AssignLate(PChar(RawByteString(name)),path);
+     AssignLate := AssignLate(PAnsiChar(RawByteString(name)),path);
 end;
 
-FUNCTION AssignLate(const name : pChar;const  path : string) : BOOLEAN;
+FUNCTION AssignLate(const name : PAnsiChar;const  path : ShortString) : BOOLEAN;
 begin
-     AssignLate := AssignLate(name,PChar(RawByteString(path)));
+     AssignLate := AssignLate(name,PAnsiChar(RawByteString(path)));
 end;
 
-FUNCTION AssignLate(const name : string;const path : string) : BOOLEAN;
+FUNCTION AssignLate(const name : ShortString;const path : ShortString) : BOOLEAN;
 begin
-     AssignLate := AssignLate(PChar(RawByteString(name)),PChar(RawByteString(path)));
+     AssignLate := AssignLate(PAnsiChar(RawByteString(name)),PAnsiChar(RawByteString(path)));
 end;
 
-FUNCTION AssignLock(const name : string; lock : LONGINT) : BOOLEAN;
+FUNCTION AssignLock(const name : ShortString; lock : LONGINT) : BOOLEAN;
 begin
-     AssignLock := AssignLock(PChar(RawByteString(name)),lock);
+     AssignLock := AssignLock(PAnsiChar(RawByteString(name)),lock);
 end;
 
-FUNCTION AssignPath(const name : string;const path : pCHAR) : BOOLEAN;
+FUNCTION AssignPath(const name : ShortString;const path : PAnsiChar) : BOOLEAN;
 begin
-     AssignPath := AssignPath(PChar(RawByteString(name)),path);
+     AssignPath := AssignPath(PAnsiChar(RawByteString(name)),path);
 end;
 
-FUNCTION AssignPath(const name : pCHAR;const path : string) : BOOLEAN;
+FUNCTION AssignPath(const name : PAnsiChar;const path : ShortString) : BOOLEAN;
 begin
-     AssignPath := AssignPath(name,PChar(RawByteString(path)));
+     AssignPath := AssignPath(name,PAnsiChar(RawByteString(path)));
 end;
 
-FUNCTION AssignPath(const name : string;const path : string) : BOOLEAN;
+FUNCTION AssignPath(const name : ShortString;const path : ShortString) : BOOLEAN;
 begin
-     AssignPath := AssignPath(PChar(RawByteString(name)),PChar(RawByteString(path)));
+     AssignPath := AssignPath(PAnsiChar(RawByteString(name)),PAnsiChar(RawByteString(path)));
 end;
 
-FUNCTION CreateDir(const name : string) : LONGINT;
+FUNCTION CreateDir(const name : ShortString) : LONGINT;
 begin
-     CreateDir := CreateDir(PChar(RawByteString(name)));
+     CreateDir := CreateDir(PAnsiChar(RawByteString(name)));
 end;
 
-FUNCTION DOSDeleteFile(const name : string) : BOOLEAN;
+FUNCTION DOSDeleteFile(const name : ShortString) : BOOLEAN;
 begin
-     DOSDeleteFile := DOSDeleteFile(PChar(RawByteString(name)));
+     DOSDeleteFile := DOSDeleteFile(PAnsiChar(RawByteString(name)));
 end;
 
-FUNCTION DeleteVar(const name : string; flags : ULONG) : BOOLEAN;
+FUNCTION DeleteVar(const name : ShortString; flags : ULONG) : BOOLEAN;
 begin
-     DeleteVar := DeleteVar(PChar(RawByteString(name)),flags);
+     DeleteVar := DeleteVar(PAnsiChar(RawByteString(name)),flags);
 end;
 
-FUNCTION DeviceProc(const name : string) : pMsgPort;
+FUNCTION DeviceProc(const name : ShortString) : pMsgPort;
 begin
-     Deviceproc := DeviceProc(PChar(RawByteString(name)));
+     Deviceproc := DeviceProc(PAnsiChar(RawByteString(name)));
 end;
 
-FUNCTION DOSOpen(const name : string; accessMode : LONGINT) : LONGINT;
+FUNCTION DOSOpen(const name : ShortString; accessMode : LONGINT) : LONGINT;
 begin
-     DOSOpen := DOSOpen(PChar(RawByteString(name)),accessMode);
+     DOSOpen := DOSOpen(PAnsiChar(RawByteString(name)),accessMode);
 end;
 
-FUNCTION DOSRename(const oldName : string;const newName : pCHAR) : Boolean;
+FUNCTION DOSRename(const oldName : ShortString;const newName : PAnsiChar) : Boolean;
 begin
-     DOSRename := DOSRename(PChar(RawByteString(oldName)),newName);
+     DOSRename := DOSRename(PAnsiChar(RawByteString(oldName)),newName);
 end;
 
-FUNCTION DOSRename(const oldName : pCHAR;const newName : string) : Boolean;
+FUNCTION DOSRename(const oldName : PAnsiChar;const newName : ShortString) : Boolean;
 begin
-     DOSRename := DOSRename(oldName,PChar(RawByteString(newName)));
+     DOSRename := DOSRename(oldName,PAnsiChar(RawByteString(newName)));
 end;
 
-FUNCTION DOSRename(const oldName : string;const newName : string) : Boolean;
+FUNCTION DOSRename(const oldName : ShortString;const newName : ShortString) : Boolean;
 begin
-     DOSRename := DOSRename(PChar(RawByteString(oldName)),PChar(RawByteString(newName)));
+     DOSRename := DOSRename(PAnsiChar(RawByteString(oldName)),PAnsiChar(RawByteString(newName)));
 end;
 
-FUNCTION Execute(const string_ : string; file_ : LONGINT; file2 : LONGINT) : BOOLEAN;
+FUNCTION Execute(const string_ : ShortString; file_ : LONGINT; file2 : LONGINT) : BOOLEAN;
 begin
-     Execute := Execute(PChar(RawByteString(string_)),file_ ,file2);
+     Execute := Execute(PAnsiChar(RawByteString(string_)),file_ ,file2);
 end;
 
-FUNCTION Fault(code : LONGINT; header : string; buffer : pCHAR; len : LONGINT) : BOOLEAN;
+FUNCTION Fault(code : LONGINT; header : ShortString; buffer : PAnsiChar; len : LONGINT) : BOOLEAN;
 begin
-    Fault := Fault(code,PChar(RawByteString(header)),buffer,len);
+    Fault := Fault(code,PAnsiChar(RawByteString(header)),buffer,len);
 end;
 
-FUNCTION FilePart(const path : string) : pCHAR;
+FUNCTION FilePart(const path : ShortString) : PAnsiChar;
 begin
-    FilePart := FilePart(PChar(RawByteString(path)));
+    FilePart := FilePart(PAnsiChar(RawByteString(path)));
 end;
 
-FUNCTION FindArg(const keyword : string;const arg_template : pCHAR) : LONGINT;
+FUNCTION FindArg(const keyword : ShortString;const arg_template : PAnsiChar) : LONGINT;
 begin
-    FindArg := FindArg(PChar(RawByteString(keyword)),arg_template);
+    FindArg := FindArg(PAnsiChar(RawByteString(keyword)),arg_template);
 end;
 
-FUNCTION FindArg(const keyword : pCHAR;const arg_template : string) : LONGINT;
+FUNCTION FindArg(const keyword : PAnsiChar;const arg_template : ShortString) : LONGINT;
 begin
-    FindArg := FindArg(keyword,PChar(RawByteString(arg_template)));
+    FindArg := FindArg(keyword,PAnsiChar(RawByteString(arg_template)));
 end;
 
-FUNCTION FindArg(const keyword : string;const arg_template : string) : LONGINT;
+FUNCTION FindArg(const keyword : ShortString;const arg_template : ShortString) : LONGINT;
 begin
-    FindArg := FindArg(PChar(RawByteString(keyword)),PChar(RawByteString(arg_template)));
+    FindArg := FindArg(PAnsiChar(RawByteString(keyword)),PAnsiChar(RawByteString(arg_template)));
 end;
 
-FUNCTION FindDosEntry(const dlist : pDosList;const name : string; flags : ULONG) : pDosList;
+FUNCTION FindDosEntry(const dlist : pDosList;const name : ShortString; flags : ULONG) : pDosList;
 begin
-    FindDosEntry := FindDosEntry(dlist,PChar(RawByteString(name)),flags);
+    FindDosEntry := FindDosEntry(dlist,PAnsiChar(RawByteString(name)),flags);
 end;
 
-FUNCTION FindSegment(const name : string;const seg : pSegment; system : LONGINT) : pSegment;
+FUNCTION FindSegment(const name : ShortString;const seg : pSegment; system : LONGINT) : pSegment;
 begin
-    FindSegment := FindSegment(PChar(RawByteString(name)),seg,system);
+    FindSegment := FindSegment(PAnsiChar(RawByteString(name)),seg,system);
 end;
 
-FUNCTION FindVar(const name : string; type_ : ULONG) : pLocalVar;
+FUNCTION FindVar(const name : ShortString; type_ : ULONG) : pLocalVar;
 begin
-    FindVar := FindVar(PChar(RawByteString(name)),type_);
+    FindVar := FindVar(PAnsiChar(RawByteString(name)),type_);
 end;
 
-FUNCTION Format(const filesystem : string;const volumename : pCHAR; dostype : ULONG) : BOOLEAN;
+FUNCTION Format(const filesystem : ShortString;const volumename : PAnsiChar; dostype : ULONG) : BOOLEAN;
 begin
-    Format := Format(PChar(RawByteString(filesystem)),volumename,dostype);
+    Format := Format(PAnsiChar(RawByteString(filesystem)),volumename,dostype);
 end;
 
-FUNCTION Format(const filesystem : pCHAR;const volumename : string; dostype : ULONG) : BOOLEAN;
+FUNCTION Format(const filesystem : PAnsiChar;const volumename : ShortString; dostype : ULONG) : BOOLEAN;
 begin
-    Format := Format(filesystem,PChar(RawByteString(volumename)),dostype);
+    Format := Format(filesystem,PAnsiChar(RawByteString(volumename)),dostype);
 end;
 
-FUNCTION Format(const filesystem : string;const volumename : string; dostype : ULONG) : BOOLEAN;
+FUNCTION Format(const filesystem : ShortString;const volumename : ShortString; dostype : ULONG) : BOOLEAN;
 begin
-    Format := Format(PChar(RawByteString(filesystem)),PChar(RawByteString(volumename)),dostype);
+    Format := Format(PAnsiChar(RawByteString(filesystem)),PAnsiChar(RawByteString(volumename)),dostype);
 end;
 
-FUNCTION FPuts(fh : LONGINT;const str : string) : LongInt;
+FUNCTION FPuts(fh : LONGINT;const str : ShortString) : LongInt;
 begin
-    FPuts := FPuts(fh,PChar(RawByteString(str)));
+    FPuts := FPuts(fh,PAnsiChar(RawByteString(str)));
 end;
 
-FUNCTION GetDeviceProc(const name : string; dp : pDevProc) : pDevProc;
+FUNCTION GetDeviceProc(const name : ShortString; dp : pDevProc) : pDevProc;
 begin
-    GetDeviceProc := GetDeviceProc(PChar(RawByteString(name)),dp);
+    GetDeviceProc := GetDeviceProc(PAnsiChar(RawByteString(name)),dp);
 end;
 
-FUNCTION GetVar(const name : string; buffer : pCHAR; size : LONGINT; flags : LONGINT) : LONGINT;
+FUNCTION GetVar(const name : ShortString; buffer : PAnsiChar; size : LONGINT; flags : LONGINT) : LONGINT;
 begin
-    GetVar := GetVar(PChar(RawByteString(name)),buffer,size,flags);
+    GetVar := GetVar(PAnsiChar(RawByteString(name)),buffer,size,flags);
 end;
 
-FUNCTION Inhibit(const name : string; onoff : LONGINT) : BOOLEAN;
+FUNCTION Inhibit(const name : ShortString; onoff : LONGINT) : BOOLEAN;
 begin
-    Inhibit := Inhibit(PChar(RawByteString(name)),onoff);
+    Inhibit := Inhibit(PAnsiChar(RawByteString(name)),onoff);
 end;
 
-FUNCTION IsFileSystem(const name : string) : BOOLEAN;
+FUNCTION IsFileSystem(const name : ShortString) : BOOLEAN;
 begin
-    IsFileSystem := IsFileSystem(PChar(RawByteString(name)));
+    IsFileSystem := IsFileSystem(PAnsiChar(RawByteString(name)));
 end;
 
-FUNCTION LoadSeg(const name : string) : LONGINT;
+FUNCTION LoadSeg(const name : ShortString) : LONGINT;
 begin
-    LoadSeg := LoadSeg(PChar(RawByteString(name)));
+    LoadSeg := LoadSeg(PAnsiChar(RawByteString(name)));
 end;
 
-FUNCTION Lock(const name : string; type_ : LONGINT) : LONGINT;
+FUNCTION Lock(const name : ShortString; type_ : LONGINT) : LONGINT;
 begin
-    Lock := Lock(PChar(RawByteString(name)),type_);
+    Lock := Lock(PAnsiChar(RawByteString(name)),type_);
 end;
 
-FUNCTION MakeDosEntry(const name : string; type_ : LONGINT) : pDosList;
+FUNCTION MakeDosEntry(const name : ShortString; type_ : LONGINT) : pDosList;
 begin
-    MakeDosEntry := MakeDosEntry(PChar(RawByteString(name)),type_);
+    MakeDosEntry := MakeDosEntry(PAnsiChar(RawByteString(name)),type_);
 end;
 
-FUNCTION MakeLink(const name : string; dest : LONGINT; soft : LONGINT) : BOOLEAN;
+FUNCTION MakeLink(const name : ShortString; dest : LONGINT; soft : LONGINT) : BOOLEAN;
 begin
-    MakeLink := MakeLink(PChar(RawByteString(name)),dest,soft);
+    MakeLink := MakeLink(PAnsiChar(RawByteString(name)),dest,soft);
 end;
 
-FUNCTION MatchFirst(const pat : string; anchor : pAnchorPath) : LONGINT;
+FUNCTION MatchFirst(const pat : ShortString; anchor : pAnchorPath) : LONGINT;
 begin
-    MatchFirst := MatchFirst(PChar(RawByteString(pat)),anchor);
+    MatchFirst := MatchFirst(PAnsiChar(RawByteString(pat)),anchor);
 end;
 
-FUNCTION MatchPattern(const pat : pCHAR; str : string) : BOOLEAN;
+FUNCTION MatchPattern(const pat : PAnsiChar; str : ShortString) : BOOLEAN;
 begin
-    MatchPattern := MatchPattern(pat,PChar(RawByteString(str)));
+    MatchPattern := MatchPattern(pat,PAnsiChar(RawByteString(str)));
 end;
 
-FUNCTION MatchPatternNoCase(const pat : pCHAR; str : string) : BOOLEAN;
+FUNCTION MatchPatternNoCase(const pat : PAnsiChar; str : ShortString) : BOOLEAN;
 begin
-    MatchPatternNoCase := MatchPatternNoCase(pat,PChar(RawByteString(str)));
+    MatchPatternNoCase := MatchPatternNoCase(pat,PAnsiChar(RawByteString(str)));
 end;
 
-FUNCTION NewLoadSeg(const file_ : string;const tags : pTagItem) : LONGINT;
+FUNCTION NewLoadSeg(const file_ : ShortString;const tags : pTagItem) : LONGINT;
 begin
-    NewLoadSeg := NewLoadSeg(PChar(RawByteString(file_)),tags);
+    NewLoadSeg := NewLoadSeg(PAnsiChar(RawByteString(file_)),tags);
 end;
 
-FUNCTION NewLoadSegTagList(const file_ : string;const tags : pTagItem) : LONGINT;
+FUNCTION NewLoadSegTagList(const file_ : ShortString;const tags : pTagItem) : LONGINT;
 begin
-    NewLoadSegTagList := NewLoadSegTagList(PChar(RawByteString(file_)),tags);
+    NewLoadSegTagList := NewLoadSegTagList(PAnsiChar(RawByteString(file_)),tags);
 end;
 
-FUNCTION PathPart(const path : string) : pCHAR;
+FUNCTION PathPart(const path : ShortString) : PAnsiChar;
 begin
-    PathPart := PathPart(PChar(RawByteString(path)));
+    PathPart := PathPart(PAnsiChar(RawByteString(path)));
 end;
 
-FUNCTION PrintFault(code : LONGINT;const header : string) : BOOLEAN;
+FUNCTION PrintFault(code : LONGINT;const header : ShortString) : BOOLEAN;
 begin
-    PrintFault := PrintFault(code,PChar(RawByteString(header)));
+    PrintFault := PrintFault(code,PAnsiChar(RawByteString(header)));
 end;
 
-FUNCTION PutStr(const str : string) : LongInt;
+FUNCTION PutStr(const str : ShortString) : LongInt;
 begin
-    PutStr := PutStr(PChar(RawByteString(str)));
+    PutStr := PutStr(PAnsiChar(RawByteString(str)));
 end;
 
-FUNCTION ReadArgs(const arg_template : string; arra : pLONGINT; args : pRDArgs) : pRDArgs;
+FUNCTION ReadArgs(const arg_template : ShortString; arra : pLONGINT; args : pRDArgs) : pRDArgs;
 begin
-    ReadArgs := ReadArgs(PChar(RawByteString(arg_template)),arra,args);
+    ReadArgs := ReadArgs(PAnsiChar(RawByteString(arg_template)),arra,args);
 end;
 
-FUNCTION ReadLink(port : pMsgPort; lock : LONGINT;const path : string; buffer : pCHAR; size : ULONG) : BOOLEAN;
+FUNCTION ReadLink(port : pMsgPort; lock : LONGINT;const path : ShortString; buffer : PAnsiChar; size : ULONG) : BOOLEAN;
 begin
-    ReadLink := ReadLink(port,lock,PChar(RawByteString(path)),buffer,size);
+    ReadLink := ReadLink(port,lock,PAnsiChar(RawByteString(path)),buffer,size);
 end;
 
-FUNCTION Relabel(const drive : string;const newname : pCHAR) : BOOLEAN;
+FUNCTION Relabel(const drive : ShortString;const newname : PAnsiChar) : BOOLEAN;
 begin
-    Relabel := Relabel(PChar(RawByteString(drive)),newname);
+    Relabel := Relabel(PAnsiChar(RawByteString(drive)),newname);
 end;
 
-FUNCTION Relabel(const drive : pCHAR;const newname : string) : BOOLEAN;
+FUNCTION Relabel(const drive : PAnsiChar;const newname : ShortString) : BOOLEAN;
 begin
-    Relabel := Relabel(drive,PChar(RawByteString(newname)));
+    Relabel := Relabel(drive,PAnsiChar(RawByteString(newname)));
 end;
 
-FUNCTION Relabel(const drive : string;const newname : string) : BOOLEAN;
+FUNCTION Relabel(const drive : ShortString;const newname : ShortString) : BOOLEAN;
 begin
-    Relabel := Relabel(PChar(RawByteString(drive)),PChar(RawByteString(newname)));
+    Relabel := Relabel(PAnsiChar(RawByteString(drive)),PAnsiChar(RawByteString(newname)));
 end;
 
-FUNCTION RemAssignList(const name : string; lock : LONGINT) : BOOLEAN;
+FUNCTION RemAssignList(const name : ShortString; lock : LONGINT) : BOOLEAN;
 begin
-    RemAssignList := RemAssignList(PChar(RawByteString(name)),lock);
+    RemAssignList := RemAssignList(PAnsiChar(RawByteString(name)),lock);
 end;
 
-FUNCTION RunCommand(seg : LONGINT; stack : LONGINT;const paramptr : string; paramlen : LONGINT) : LONGINT;
+FUNCTION RunCommand(seg : LONGINT; stack : LONGINT;const paramptr : ShortString; paramlen : LONGINT) : LONGINT;
 begin
-    RunCommand := RunCommand(seg,stack,PChar(RawByteString(paramptr)),paramlen);
+    RunCommand := RunCommand(seg,stack,PAnsiChar(RawByteString(paramptr)),paramlen);
 end;
 
-FUNCTION SetComment(const name : string;const comment : pCHAR) : BOOLEAN;
+FUNCTION SetComment(const name : ShortString;const comment : PAnsiChar) : BOOLEAN;
 begin
-    SetComment := SetComment(PChar(RawByteString(name)),comment);
+    SetComment := SetComment(PAnsiChar(RawByteString(name)),comment);
 end;
 
-FUNCTION SetComment(const name : pCHAR;const comment : string) : BOOLEAN;
+FUNCTION SetComment(const name : PAnsiChar;const comment : ShortString) : BOOLEAN;
 begin
-    SetComment := SetComment(name,PChar(RawByteString(comment)));
+    SetComment := SetComment(name,PAnsiChar(RawByteString(comment)));
 end;
 
-FUNCTION SetComment(const name : string;const comment : string) : BOOLEAN;
+FUNCTION SetComment(const name : ShortString;const comment : ShortString) : BOOLEAN;
 begin
-    SetComment := SetComment(PChar(RawByteString(name)),PChar(RawByteString(comment)));
+    SetComment := SetComment(PAnsiChar(RawByteString(name)),PAnsiChar(RawByteString(comment)));
 end;
 
-FUNCTION SetCurrentDirName(const name : string) : BOOLEAN;
+FUNCTION SetCurrentDirName(const name : ShortString) : BOOLEAN;
 begin
-     SetCurrentDirName := SetCurrentDirName(PChar(RawByteString(name)));
+     SetCurrentDirName := SetCurrentDirName(PAnsiChar(RawByteString(name)));
 end;
 
-FUNCTION SetFileDate(const name : string; date : pDateStamp) : BOOLEAN;
+FUNCTION SetFileDate(const name : ShortString; date : pDateStamp) : BOOLEAN;
 begin
-     SetFileDate := SetFileDate(PChar(RawByteString(name)),date);
+     SetFileDate := SetFileDate(PAnsiChar(RawByteString(name)),date);
 end;
 
-FUNCTION SetOwner(const name : string; owner_info : LONGINT) : BOOLEAN;
+FUNCTION SetOwner(const name : ShortString; owner_info : LONGINT) : BOOLEAN;
 begin
-     SetOwner := SetOwner(PChar(RawByteString(name)),owner_info);
+     SetOwner := SetOwner(PAnsiChar(RawByteString(name)),owner_info);
 end;
 
-FUNCTION SetProgramName(const name : string) : BOOLEAN;
+FUNCTION SetProgramName(const name : ShortString) : BOOLEAN;
 begin
-     SetProgramName := SetProgramName(PChar(RawByteString(name)));
+     SetProgramName := SetProgramName(PAnsiChar(RawByteString(name)));
 end;
 
-FUNCTION SetPrompt(const name : string) : BOOLEAN;
+FUNCTION SetPrompt(const name : ShortString) : BOOLEAN;
 begin
-     SetPrompt := SetPrompt(PChar(RawByteString(name)));
+     SetPrompt := SetPrompt(PAnsiChar(RawByteString(name)));
 end;
 
-FUNCTION SetProtection(const name : string; protect : LONGINT) : BOOLEAN;
+FUNCTION SetProtection(const name : ShortString; protect : LONGINT) : BOOLEAN;
 begin
-     SetProtection := SetProtection(PChar(RawByteString(name)),protect);
+     SetProtection := SetProtection(PAnsiChar(RawByteString(name)),protect);
 end;
 
-FUNCTION SetVar(const name : string; buffer : pCHAR; size : LONGINT; flags : LONGINT) : BOOLEAN;
+FUNCTION SetVar(const name : ShortString; buffer : PAnsiChar; size : LONGINT; flags : LONGINT) : BOOLEAN;
 begin
-     SetVar := SetVar(PChar(RawByteString(name)),buffer,size,flags);
+     SetVar := SetVar(PAnsiChar(RawByteString(name)),buffer,size,flags);
 end;
 
-FUNCTION SplitName(const name : string; seperator : ULONG; buf : pCHAR; oldpos : LONGINT; size : LONGINT) : smallint;
+FUNCTION SplitName(const name : ShortString; seperator : ULONG; buf : PAnsiChar; oldpos : LONGINT; size : LONGINT) : smallint;
 begin
-     SplitName := SplitName(PChar(RawByteString(name)),seperator,buf,oldpos,size);
+     SplitName := SplitName(PAnsiChar(RawByteString(name)),seperator,buf,oldpos,size);
 end;
 
-FUNCTION StrToLong(const string_ : string; VAR value : LONGINT) : LONGINT;
+FUNCTION StrToLong(const string_ : ShortString; VAR value : LONGINT) : LONGINT;
 begin
-     StrToLong := StrToLong(PChar(RawByteString(string_)),value);
+     StrToLong := StrToLong(PAnsiChar(RawByteString(string_)),value);
 end;
 
-FUNCTION SystemTagList(const command : string;const tags : pTagItem) : LONGINT;
+FUNCTION SystemTagList(const command : ShortString;const tags : pTagItem) : LONGINT;
 begin
-     SystemTagList := SystemTagList(PChar(RawByteString(command)),tags);
+     SystemTagList := SystemTagList(PAnsiChar(RawByteString(command)),tags);
 end;
 
-FUNCTION DOSSystem(const command : string;const tags : pTagItem) : LONGINT;
+FUNCTION DOSSystem(const command : ShortString;const tags : pTagItem) : LONGINT;
 begin
-     DOSSystem := DOSSystem(PChar(RawByteString(command)),tags);
+     DOSSystem := DOSSystem(PAnsiChar(RawByteString(command)),tags);
 end;
 {$endif}
 

+ 9 - 9
packages/amunits/src/coreunits/amigaguide.pas

@@ -242,32 +242,32 @@ Type
 VAR AmigaGuideBase : pLibrary = nil;
 
 const
-    AMIGAGUIDENAME : Pchar = 'amigaguide.library';
+    AMIGAGUIDENAME : PAnsiChar = 'amigaguide.library';
 
-function AddAmigaGuideHostA(h : pHook location 'a0'; name : pCHAR location 'd0'; attrs : pTagItem location 'a1') : POINTER; syscall AmigaGuideBase 138;
+function AddAmigaGuideHostA(h : pHook location 'a0'; name : PAnsiChar location 'd0'; attrs : pTagItem location 'a1') : POINTER; syscall AmigaGuideBase 138;
 function AmigaGuideSignal(cl : POINTER location 'a0') : ULONG; syscall AmigaGuideBase 072;
 procedure CloseAmigaGuide(cl : POINTER location 'a0'); syscall AmigaGuideBase 066;
 procedure ExpungeXRef; syscall AmigaGuideBase 132;
 function GetAmigaGuideAttr(tag : ULONG location 'd0'; cl : POINTER location 'a0'; storage : POINTER location 'a1') : LONGINT; syscall AmigaGuideBase 114;
 function GetAmigaGuideMsg(cl : POINTER location 'a0') : pAmigaGuideMsg; syscall AmigaGuideBase 078;
-function GetAmigaGuideString(id : LONGINT location 'd0') : pCHAR; syscall AmigaGuideBase 210;
-function LoadXRef(lock : LONGINT location 'a0'; name : pCHAR location 'a1') : LONGINT; syscall AmigaGuideBase 126;
+function GetAmigaGuideString(id : LONGINT location 'd0') : PAnsiChar; syscall AmigaGuideBase 210;
+function LoadXRef(lock : LONGINT location 'a0'; name : PAnsiChar location 'a1') : LONGINT; syscall AmigaGuideBase 126;
 function LockAmigaGuideBase(handle : POINTER location 'a0') : LONGINT; syscall AmigaGuideBase 036;
 function OpenAmigaGuideA(nag : pNewAmigaGuide location 'a0'; taglist : pTagItem location 'a1') : POINTER; syscall AmigaGuideBase 054;
 function OpenAmigaGuideAsyncA(nag : pNewAmigaGuide location 'a0'; attrs : pTagItem location 'd0') : POINTER; syscall AmigaGuideBase 060;
 function RemoveAmigaGuideHostA(hh : POINTER location 'a0'; attrs : pTagItem location 'a1') : LONGINT; syscall AmigaGuideBase 144;
 procedure ReplyAmigaGuideMsg(amsg : pAmigaGuideMsg location 'a0'); syscall AmigaGuideBase 084;
-function SendAmigaGuideCmdA(cl : POINTER location 'a0'; cmd : pCHAR location 'd0'; attrs : pTagItem location 'd1') : LONGINT; syscall AmigaGuideBase 102;
+function SendAmigaGuideCmdA(cl : POINTER location 'a0'; cmd : PAnsiChar location 'd0'; attrs : pTagItem location 'd1') : LONGINT; syscall AmigaGuideBase 102;
 function SendAmigaGuideContextA(cl : POINTER location 'a0'; attrs : pTagItem location 'd0') : LONGINT; syscall AmigaGuideBase 096;
 function SetAmigaGuideAttrsA(cl : POINTER location 'a0'; attrs : pTagItem location 'a1') : LONGINT; syscall AmigaGuideBase 108;
 function SetAmigaGuideContextA(cl : POINTER location 'a0'; id : ULONG location 'd0'; attrs : pTagItem location 'd1') : LONGINT; syscall AmigaGuideBase 090;
 procedure UnlockAmigaGuideBase(key : LONGINT location 'd0'); syscall AmigaGuideBase 042;
 
-function AddAmigaGuideHost(h : pHook; name : pCHAR; Const argv : array of PtrUInt) : POINTER;
+function AddAmigaGuideHost(h : pHook; name : PAnsiChar; Const argv : array of PtrUInt) : POINTER;
 function OpenAmigaGuide(nag : pNewAmigaGuide; Const argv : array of PtrUInt) : POINTER;
 function OpenAmigaGuideAsync(nag : pNewAmigaGuide; Const argv : array of PtrUInt) : POINTER;
 function RemoveAmigaGuideHost(hh : POINTER; Const argv : array of PtrUInt) : LONGINT;
-function SendAmigaGuideCmd(cl : POINTER; cmd : pCHAR; Const argv : array of PtrUInt) : LONGINT;
+function SendAmigaGuideCmd(cl : POINTER; cmd : PAnsiChar; Const argv : array of PtrUInt) : LONGINT;
 function SendAmigaGuideContext(cl : POINTER; Const argv : array of PtrUInt) : LONGINT;
 function SetAmigaGuideAttrs(cl : POINTER; Const argv : array of PtrUInt) : LONGINT;
 function SetAmigaGuideContext(cl : POINTER; id : ULONG; Const argv : array of PtrUInt) : LONGINT;
@@ -279,7 +279,7 @@ const
     VERSION : string[2] = '0';
     LIBVERSION : longword = 0;
 
-function AddAmigaGuideHost(h : pHook; name : pCHAR; Const argv : array of PtrUInt) : POINTER;
+function AddAmigaGuideHost(h : pHook; name : PAnsiChar; Const argv : array of PtrUInt) : POINTER;
 begin
     AddAmigaGuideHost := AddAmigaGuideHostA(h, name, @argv);
 end;
@@ -299,7 +299,7 @@ begin
     RemoveAmigaGuideHost := RemoveAmigaGuideHostA(hh, @argv);
 end;
 
-function SendAmigaGuideCmd(cl : POINTER; cmd : pCHAR; Const argv : array of PtrUInt) : LONGINT;
+function SendAmigaGuideCmd(cl : POINTER; cmd : PAnsiChar; Const argv : array of PtrUInt) : LONGINT;
 begin
     SendAmigaGuideCmd := SendAmigaGuideCmdA(cl,cmd,@argv);
 end;

+ 9 - 9
packages/amunits/src/coreunits/amigalib.pas

@@ -37,7 +37,7 @@
     Rewrote Createport and DeletePort.
     06 Sep 2000.
 
-    Added two printf, one with pchar and one with string.
+    Added two printf, one with PAnsiChar and one with string.
     They use array of const so this unit compiles with
     mode objfpc.
     05 Nov 2002.
@@ -65,7 +65,7 @@ function CreateExtIO (port: pMsgPort; size: Longint): pIORequest; inline;
 procedure DeleteExtIO (ioReq: pIORequest); inline;
 function CreateStdIO (port: pMsgPort): pIOStdReq; inline;
 procedure DeleteStdIO (ioReq: pIOStdReq); inline;
-function CreatePort (name: PChar; pri: longint): pMsgPort; inline;
+function CreatePort (name: PAnsiChar; pri: longint): pMsgPort; inline;
 procedure DeletePort (port: pMsgPort); inline;
 function CreateTask (name: STRPTR; pri: longint;
                      initPC : Pointer;
@@ -165,8 +165,8 @@ procedure HookEntryPas;
 
 }
 
-procedure printf(Fmtstr : pchar; const Args : array of const);
-procedure printf(Fmtstr : string; const Args : array of const);
+procedure printf(Fmtstr : PAnsiChar; const Args : array of const);
+procedure printf(Fmtstr : ShortString; const Args : array of const);
 
 IMPLEMENTATION
 
@@ -197,7 +197,7 @@ begin
     Exec.DeleteStdIO(ioReq)
 end;
 
-function Createport(name : PChar; pri : longint): pMsgPort; inline;
+function Createport(name : PAnsiChar; pri : longint): pMsgPort; inline;
 begin
   Createport := Exec.Createport(name, pri);
 end;
@@ -313,7 +313,7 @@ asm
   move.l (a7)+,a2
 end;
 
-procedure printf(Fmtstr : pchar; const Args : array of const);
+procedure printf(Fmtstr : PAnsiChar; const Args : array of const);
 var
   i,j : longint;
   argarray : array of longint;
@@ -331,7 +331,7 @@ begin
         vtpointer : argarray[i] := longint(args[i].vpointer);
         vtstring  : begin
             strarray[j]:=RawByteString(args[i].vstring^);
-            argarray[i]:=longint(PChar(strarray[j]));
+            argarray[i]:=longint(PAnsiChar(strarray[j]));
             inc(j);
           end;
       end;
@@ -341,9 +341,9 @@ begin
   {$endif}
 end;
 
-procedure printf(Fmtstr : string; const Args : array of const);
+procedure printf(Fmtstr : ShortString; const Args : array of const);
 begin
-  printf(PChar(RawByteString(Fmtstr)), Args);
+  printf(PAnsiChar(RawByteString(Fmtstr)), Args);
 end;
 
 

+ 12 - 12
packages/amunits/src/coreunits/amigaprinter.pas

@@ -48,7 +48,7 @@ Const
     aNEL        = 3;            { ESCE  return,lf               ISO }
     aRI         = 4;            { ESCM  reverse lf              ISO }
 
-    aSGR0       = 5;            { ESC[0m normal char set        ISO }
+    aSGR0       = 5;            { ESC[0m normal AnsiChar set        ISO }
     aSGR3       = 6;            { ESC[3m italics on             ISO }
     aSGR23      = 7;            { ESC[23m italics off           ISO }
     aSGR4       = 8;            { ESC[4m underline on           ISO }
@@ -81,17 +81,17 @@ Const
     aPLU        = 32;           { ESCL  partial line up         ISO }
     aPLD        = 33;           { ESCK  partial line down       ISO }
 
-    aFNT0       = 34;           { ESC(B US char set or Typeface  0 (default) }
-    aFNT1       = 35;           { ESC(R French char set or Typeface  1 }
-    aFNT2       = 36;           { ESC(K German char set or Typeface  2 }
-    aFNT3       = 37;           { ESC(A UK char set or Typeface  3 }
-    aFNT4       = 38;           { ESC(E Danish I char set or Typeface  4 }
-    aFNT5       = 39;           { ESC(H Sweden char set or Typeface  5 }
-    aFNT6       = 40;           { ESC(Y Italian char set or Typeface  6 }
-    aFNT7       = 41;           { ESC(Z Spanish char set or Typeface  7 }
-    aFNT8       = 42;           { ESC(J Japanese char set or Typeface  8 }
-    aFNT9       = 43;           { ESC(6 Norweign char set or Typeface  9 }
-    aFNT10      = 44;           { ESC(C Danish II char set or Typeface 10 }
+    aFNT0       = 34;           { ESC(B US AnsiChar set or Typeface  0 (default) }
+    aFNT1       = 35;           { ESC(R French AnsiChar set or Typeface  1 }
+    aFNT2       = 36;           { ESC(K German AnsiChar set or Typeface  2 }
+    aFNT3       = 37;           { ESC(A UK AnsiChar set or Typeface  3 }
+    aFNT4       = 38;           { ESC(E Danish I AnsiChar set or Typeface  4 }
+    aFNT5       = 39;           { ESC(H Sweden AnsiChar set or Typeface  5 }
+    aFNT6       = 40;           { ESC(Y Italian AnsiChar set or Typeface  6 }
+    aFNT7       = 41;           { ESC(Z Spanish AnsiChar set or Typeface  7 }
+    aFNT8       = 42;           { ESC(J Japanese AnsiChar set or Typeface  8 }
+    aFNT9       = 43;           { ESC(6 Norweign AnsiChar set or Typeface  9 }
+    aFNT10      = 44;           { ESC(C Danish II AnsiChar set or Typeface 10 }
 
 {
         Suggested typefaces are:

+ 2 - 2
packages/amunits/src/coreunits/asl.pas

@@ -58,7 +58,7 @@ uses
 {************************************************************************}
 
 const
-  ASLNAME: PChar = 'asl.library';
+  ASLNAME: PAnsiChar = 'asl.library';
   ASL_TB = TAG_USER + $80000;
 
 {************************************************************************}
@@ -438,7 +438,7 @@ const
  * of the semaphore is given below; it exists only with asl.library V45 and
  * IPrefs V45 and beyond.
  }
-  ASL_SEMAPHORE_NAME: PChar = 'asl.library';
+  ASL_SEMAPHORE_NAME: PAnsiChar = 'asl.library';
 
 type
   PAslSemaphore = ^TAslSemaphore;

+ 1 - 1
packages/amunits/src/coreunits/audio.pas

@@ -31,7 +31,7 @@ uses exec;
 
 const
 
-    AUDIONAME           : PChar = 'audio.device';
+    AUDIONAME           : PAnsiChar = 'audio.device';
 
     ADHARD_CHANNELS     = 4;
 

+ 2 - 2
packages/amunits/src/coreunits/bootblock.pas

@@ -29,8 +29,8 @@ type
 const
     BOOTSECTS   = 2;    { 1K bootstrap }
 
-    BBID_DOS    : PChar = 'DOS';
-    BBID_KICK   : PChar = 'KICK';
+    BBID_DOS    : PAnsiChar = 'DOS';
+    BBID_KICK   : PAnsiChar = 'KICK';
 
     BBNAME_DOS  = $444F5300;    { DOS\0 as an Integer }
     BBNAME_KICK = $4B49434B;    { KICK as an Integer }

+ 2 - 2
packages/amunits/src/coreunits/bullet.pas

@@ -247,7 +247,7 @@ const
 { .otag tags }
 
 { suffix for files in FONTS: that contain these tags }
-     OTSUFFIX     : PChar =  '.otag';
+     OTSUFFIX     : PAnsiChar =  '.otag';
 
 { OT_FileIdent both identifies this file and verifies its size.
  * It is required to be the first tag in the file. }
@@ -371,7 +371,7 @@ const
 VAR BulletBase : pLibrary;
 
 const
-    BULLETNAME : PChar = 'bullet.library';
+    BULLETNAME : PAnsiChar = 'bullet.library';
 
 
 PROCEDURE CloseEngine(glyphEngine : pGlyphEngine location 'a0'); syscall BulletBase 036;

+ 1 - 1
packages/amunits/src/coreunits/colorwheel.pas

@@ -78,7 +78,7 @@ const
 VAR ColorWheelBase : pLibrary = nil;
 
 const
-    COLORWHEELNAME : Pchar = 'colorwheel.library';
+    COLORWHEELNAME : PAnsiChar = 'colorwheel.library';
 
 PROCEDURE ConvertHSBToRGB(hsb : pColorWheelHSB location 'a0'; rgb : pColorWheelRGB location 'a1'); syscall ColorWheelBase 030;
 PROCEDURE ConvertRGBToHSB(rgb : pColorWheelRGB location 'a0'; hsb : pColorWheelHSB location 'a1'); syscall ColorWheelBase 036;

+ 6 - 6
packages/amunits/src/coreunits/commodities.pas

@@ -15,7 +15,7 @@
  **********************************************************************}
 {
     History:
-    Added overlay functions for Pchar->Strings, functions
+    Added overlay functions for PAnsiChar->Strings, functions
     and procedures.
     14 Jul 2000.
 
@@ -227,7 +227,7 @@ CONST
 VAR CxBase : pLibrary = nil;
 
 const
-    COMMODITIESNAME : PChar = 'commodities.library';
+    COMMODITIESNAME : PAnsiChar = 'commodities.library';
 
 
 FUNCTION ActivateCxObj(co : pCxObj location 'a0'; tru : LONGINT location 'd0') : LONGINT; syscall CxBase 042;
@@ -249,11 +249,11 @@ PROCEDURE EnqueueCxObj(headObj : pCxObj location 'a0'; co : pCxObj location 'a1'
 PROCEDURE InsertCxObj(headObj : pCxObj location 'a0'; co : pCxObj location 'a1'; pred : pCxObj location 'a2'); syscall CxBase 096;
 FUNCTION InvertKeyMap(ansiCode : ULONG location 'd0'; event : pInputEvent location 'a0'; km : pKeyMap location 'a1') : LongBool; syscall CxBase 174;
 FUNCTION MatchIX(event : pInputEvent location 'a0'; ix : pInputXpression location 'a1') : LongBool; syscall CxBase 204;
-FUNCTION ParseIX(description : pCHAR location 'a0'; ix : pInputXpression location 'a1') : LONGINT; syscall CxBase 132;
+FUNCTION ParseIX(description : PAnsiChar location 'a0'; ix : pInputXpression location 'a1') : LONGINT; syscall CxBase 132;
 PROCEDURE RemoveCxObj(co : pCxObj location 'a0'); syscall CxBase 102;
 PROCEDURE RouteCxMsg(cxm : pCxMsg location 'a0'; co : pCxObj location 'a1'); syscall CxBase 162;
 FUNCTION SetCxObjPri(co : pCxObj location 'a0'; pri : LONGINT location 'd0') : LONGINT; syscall CxBase 078;
-PROCEDURE SetFilter(filter : pCxObj location 'a0'; text : pCHAR location 'a1'); syscall CxBase 120;
+PROCEDURE SetFilter(filter : pCxObj location 'a0'; text : PAnsiChar location 'a1'); syscall CxBase 120;
 PROCEDURE SetFilterIX(filter : pCxObj location 'a0'; ix : pInputXpression location 'a1'); syscall CxBase 126;
 PROCEDURE SetTranslate(translator : pCxObj location 'a0'; events : pInputEvent location 'a1'); syscall CxBase 114;
 
@@ -275,12 +275,12 @@ IMPLEMENTATION
 
 FUNCTION ParseIX(description : rawbytestring; ix : pInputXpression) : LONGINT;
 begin
-  ParseIX := ParseIX(pchar(description),ix);
+  ParseIX := ParseIX(PAnsiChar(description),ix);
 end;
 
 PROCEDURE SetFilter(filter : pCxObj; text : rawbytestring);
 begin
-  SetFilter(filter,pchar(text));
+  SetFilter(filter,PAnsiChar(text));
 end;
 
 procedure FreeIEvents(Events: PInputEvent);

+ 1 - 1
packages/amunits/src/coreunits/console.pas

@@ -113,7 +113,7 @@ var
   ConsoleDevice: PDevice = nil;
 
 function CDInputHandler(Events: PInputEvent location 'a0'; ConsoleDev: PLibrary location 'a1'): PInputEvent; syscall ConsoleDevice 042;
-function RawKeyConvert(Events: PInputEvent location 'a0'; Buffer: PCHAR location 'a1'; Length: LongInt location 'd1'; KeyMap: PKeyMap location 'a2'): LongInt; syscall ConsoleDevice 048;
+function RawKeyConvert(Events: PInputEvent location 'a0'; Buffer: PAnsiChar location 'a1'; Length: LongInt location 'd1'; KeyMap: PKeyMap location 'a2'): LongInt; syscall ConsoleDevice 048;
 
 implementation
 

+ 1 - 1
packages/amunits/src/coreunits/datatypes.pas

@@ -859,7 +859,7 @@ var
   DataTypesBase: PLibrary = nil;
 
 const
-  DATATYPESNAME: PChar = 'datatypes.library';
+  DATATYPESNAME: PAnsiChar = 'datatypes.library';
 
 function AddDTObject(Win: PWindow location 'a0'; Req: PRequester location 'a1'; o: PObject_ location 'a2'; Pos: LongInt location 'd0'): LongInt; syscall DataTypesBase 072;
 procedure DisposeDTObject(o: PObject_ location 'a0'); syscall DataTypesBase 054;

+ 6 - 6
packages/amunits/src/coreunits/diskfont.pas

@@ -50,7 +50,7 @@ Type
 
     pFontContents = ^tFontContents;
     tFontContents = record
-        fc_FileName     : Array [0..MAXFONTPATH-1] of Char;
+        fc_FileName     : Array [0..MAXFONTPATH-1] of AnsiChar;
         fc_YSize        : Word;
         fc_Style        : Byte;
         fc_Flags        : Byte;
@@ -59,7 +59,7 @@ Type
 
    pTFontContents = ^tTFontContents;
    tTFontContents = record
-    tfc_FileName  : Array[0..MAXFONTPATH-3] of Char;
+    tfc_FileName  : Array[0..MAXFONTPATH-3] of AnsiChar;
     tfc_TagCount  : Word;
 
     tfc_YSize     : Word;
@@ -97,7 +97,7 @@ Type
         dfh_FileID      : Word;
         dfh_Revision    : Word;
         dfh_Segment     : Longint;
-        dfh_Name        : Array [0..MAXFONTNAME-1] of Char;
+        dfh_Name        : Array [0..MAXFONTNAME-1] of AnsiChar;
         dfh_TF          : tTextFont;
     end;
 
@@ -135,13 +135,13 @@ Type
     end;
 
 const
-    DISKFONTNAME : PChar = 'diskfont.library';
+    DISKFONTNAME : PAnsiChar = 'diskfont.library';
 
 VAR DiskfontBase : pLibrary = nil;
 
-FUNCTION AvailFonts(buffer : pCHAR location 'a0'; bufBytes : LONGINT location 'd0'; flags : LONGINT location 'd1') : LONGINT; syscall DiskfontBase 036;
+FUNCTION AvailFonts(buffer : PAnsiChar location 'a0'; bufBytes : LONGINT location 'd0'; flags : LONGINT location 'd1') : LONGINT; syscall DiskfontBase 036;
 PROCEDURE DisposeFontContents(fontContentsHeader : pFontContentsHeader location 'a1'); syscall DiskfontBase 048;
-FUNCTION NewFontContents(fontsLock : BPTR location 'a0'; fontName : pCHAR location 'a1') : pFontContentsHeader; syscall DiskfontBase 042;
+FUNCTION NewFontContents(fontsLock : BPTR location 'a0'; fontName : PAnsiChar location 'a1') : pFontContentsHeader; syscall DiskfontBase 042;
 FUNCTION NewScaledDiskFont(sourceFont : pTextFont location 'a0'; destTextAttr : pTextAttr location 'a1') : pDiskFontHeader; syscall DiskfontBase 054;
 FUNCTION OpenDiskFont(textAttr : pTextAttr location 'a0') : pTextFont; syscall DiskfontBase 030;
 FUNCTION GetDiskFontCtrl(tagid : LONGINT location 'd0') : LONGINT; syscall DiskfontBase 060;

+ 58 - 58
packages/amunits/src/coreunits/exec.pas

@@ -16,10 +16,10 @@
 
 {
     History:
-    Added overlay functions for Pchar->Strings, functions
-    and procedures. Now you can mix PChar and Strings e.g
+    Added overlay functions for PAnsiChar->Strings, functions
+    and procedures. Now you can mix PAnsiChar and Strings e.g
     OpenLibrary('whatis.library',37). No need to cast to
-    a PChar.
+    a PAnsiChar.
     12 Oct 1998.
 
     More missing functions added.
@@ -95,7 +95,7 @@ INTERFACE
 
 TYPE
 
-       STRPTR   = PChar;
+       STRPTR   = PAnsiChar;
        ULONG    = Longword;
        LONG     = longint;
        APTR     = Pointer;
@@ -1180,7 +1180,7 @@ var
 FUNCTION Supervisor(userFunction : tPROCEDURE location 'a5') : ULONG; syscall _ExecBase 030;
 PROCEDURE Alert(alertNum : ULONG location 'd7'); syscall _ExecBase 108;
 PROCEDURE Debug(flags : ULONG location 'd0'); syscall _ExecBase 114;
-FUNCTION FindResident(const name : pCHAR location 'a1') : pResident; syscall _ExecBase 096;
+FUNCTION FindResident(const name : PAnsiChar location 'a1') : pResident; syscall _ExecBase 096;
 PROCEDURE InitCode(startClass : ULONG location 'd0'; version : ULONG location 'd1'); syscall _ExecBase 072;
 FUNCTION InitResident(const resident_ : pResident location 'a1'; segList : ULONG location 'd0') : POINTER; syscall _ExecBase 102;
 PROCEDURE InitStruct(const initTable : POINTER location 'a1'; memory : POINTER location 'a2'; size : ULONG location 'd0'); syscall _ExecBase 078;
@@ -1209,7 +1209,7 @@ PROCEDURE ExecFreeMem(memoryBlock : POINTER location 'a1'; byteSize : ULONG loca
 PROCEDURE AddHead(list : pList location 'a0'; node : pNode location 'a1'); syscall _ExecBase 240;
 PROCEDURE AddTail(list : pList location 'a0'; node : pNode location 'a1'); syscall _ExecBase 246;
 PROCEDURE Enqueue(list : pList location 'a0'; node : pNode location 'a1'); syscall _ExecBase 270;
-FUNCTION FindName(list : pList location 'a0'; const name : pCHAR location 'a1') : pNode; syscall _ExecBase 276;
+FUNCTION FindName(list : pList location 'a0'; const name : PAnsiChar location 'a1') : pNode; syscall _ExecBase 276;
 PROCEDURE ExecInsert(list : pList location 'a0'; node : pNode location 'a1'; pred : pNode location 'a2'); syscall _ExecBase 234;
 FUNCTION RemHead(list : pList location 'a0') : pNode; syscall _ExecBase 258;
 PROCEDURE Remove(node : pNode location 'a1'); syscall _ExecBase 252;
@@ -1218,7 +1218,7 @@ FUNCTION RemTail(list : pList location 'a0') : pNode; syscall _ExecBase 264;
 FUNCTION AddTask(task : pTask location 'a1';const initPC : POINTER location 'a2';const finalPC : POINTER location 'a3') : POINTER; syscall _ExecBase 282;
 FUNCTION AllocSignal(signalNum : LONGINT location 'd0') : shortint; syscall _ExecBase 330;
 FUNCTION AllocTrap(trapNum : LONGINT location 'd0') : LONGINT; syscall _ExecBase 342;
-FUNCTION FindTask(const name : pCHAR location 'a1') : pTask; syscall _ExecBase 294;
+FUNCTION FindTask(const name : PAnsiChar location 'a1') : pTask; syscall _ExecBase 294;
 PROCEDURE FreeSignal(signalNum : LONGINT location 'd0'); syscall _ExecBase 336;
 PROCEDURE FreeTrap(trapNum : LONGINT location 'd0'); syscall _ExecBase 348;
 PROCEDURE RemTask(task : pTask location 'a1'); syscall _ExecBase 288;
@@ -1228,7 +1228,7 @@ FUNCTION SetTaskPri(task : pTask location 'a1'; priority : LONGINT location 'd0'
 FUNCTION Wait(signalSet : ULONG location 'd0') : ULONG; syscall _ExecBase 318;
 
 PROCEDURE AddPort(port : pMsgPort location 'a1'); syscall _ExecBase 354;
-FUNCTION FindPort(const name : pCHAR location 'a1') : pMsgPort; syscall _ExecBase 390;
+FUNCTION FindPort(const name : PAnsiChar location 'a1') : pMsgPort; syscall _ExecBase 390;
 FUNCTION GetMsg(port : pMsgPort location 'a0') : pMessage; syscall _ExecBase 372;
 PROCEDURE PutMsg(port : pMsgPort location 'a0'; message : pMessage location 'a1'); syscall _ExecBase 366;
 PROCEDURE RemPort(port : pMsgPort location 'a1'); syscall _ExecBase 360;
@@ -1239,8 +1239,8 @@ PROCEDURE AddLibrary(lib : pLibrary location 'a1'); syscall _ExecBase 396;
 PROCEDURE CloseLibrary(lib : pLibrary location 'a1'); syscall _ExecBase 414;
 PROCEDURE MakeFunctions(const target : POINTER location 'a0';const functionArray : POINTER location 'a1';const funcDispBase :pointer location 'a2'); syscall _ExecBase 090;
 FUNCTION MakeLibrary(const  funcInit : POINTER location 'a0';const  structInit : POINTER location 'a1'; libInit : tPROCEDURE location 'a2';dataSize : ULONG location 'd0'; segList : ULONG location 'd0') : pLibrary; syscall _ExecBase 084;
-FUNCTION OldOpenLibrary(const libName : pCHAR location 'a1') : pLibrary; syscall _ExecBase 408;
-FUNCTION OpenLibrary(const libName : pCHAR location 'a1'; version : ULONG location 'd0') : pLibrary; syscall _ExecBase 552;
+FUNCTION OldOpenLibrary(const libName : PAnsiChar location 'a1') : pLibrary; syscall _ExecBase 408;
+FUNCTION OpenLibrary(const libName : PAnsiChar location 'a1'; version : ULONG location 'd0') : pLibrary; syscall _ExecBase 552;
 PROCEDURE RemLibrary(lib : pLibrary location 'a1'); syscall _ExecBase 402;
 FUNCTION SetFunction(lib : pLibrary location 'a1'; funcOffset : LONGINT location 'a0'; newFunction : tPROCEDURE location 'd0') : POINTER; syscall _ExecBase 420;
 PROCEDURE SumLibrary(lib : pLibrary location 'a1'); syscall _ExecBase 426;
@@ -1250,18 +1250,18 @@ PROCEDURE AddDevice(device : pDevice location 'a1'); syscall _ExecBase 432;
 FUNCTION CheckIO(ioRequest : pIORequest location 'a1') : pIORequest; syscall _ExecBase 468;
 PROCEDURE CloseDevice(ioRequest : pIORequest location 'a1'); syscall _ExecBase 450;
 FUNCTION DoIO(ioRequest : pIORequest location 'a1') : shortint; syscall _ExecBase 456;
-FUNCTION OpenDevice(const devName : pCHAR location 'a0'; unite : ULONG location 'd0'; ioRequest : pIORequest location 'a1'; flags : ULONG location 'd1') : shortint; syscall _ExecBase 444;
+FUNCTION OpenDevice(const devName : PAnsiChar location 'a0'; unite : ULONG location 'd0'; ioRequest : pIORequest location 'a1'; flags : ULONG location 'd1') : shortint; syscall _ExecBase 444;
 PROCEDURE RemDevice(device : pDevice location 'a1'); syscall _ExecBase 438;
 PROCEDURE SendIO(ioRequest : pIORequest location 'a1'); syscall _ExecBase 462;
 FUNCTION WaitIO(ioRequest : pIORequest location 'a1') : shortint; syscall _ExecBase 474;
 
 PROCEDURE AddResource(resource : POINTER location 'a1'); syscall _ExecBase 486;
-FUNCTION OpenResource(const resName : pCHAR location 'a1') : POINTER; syscall _ExecBase 498;
+FUNCTION OpenResource(const resName : PAnsiChar location 'a1') : POINTER; syscall _ExecBase 498;
 PROCEDURE RemResource(resource : POINTER location 'a1'); syscall _ExecBase 492;
 
 PROCEDURE AddSemaphore(sigSem : pSignalSemaphore location 'a1'); syscall _ExecBase 600;
 FUNCTION AttemptSemaphore(sigSem : pSignalSemaphore location 'a0') : LongBool; syscall _ExecBase 576;
-FUNCTION FindSemaphore(const sigSem : pCHAR location 'a1') : pSignalSemaphore; syscall _ExecBase 594;
+FUNCTION FindSemaphore(const sigSem : PAnsiChar location 'a1') : pSignalSemaphore; syscall _ExecBase 594;
 PROCEDURE InitSemaphore(sigSem : pSignalSemaphore location 'a0'); syscall _ExecBase 558;
 PROCEDURE ObtainSemaphore(sigSem : pSignalSemaphore location 'a0'); syscall _ExecBase 564;
 PROCEDURE ObtainSemaphoreList(sigSem : pList location 'a0'); syscall _ExecBase 582;
@@ -1271,13 +1271,13 @@ PROCEDURE ReleaseSemaphoreList(sigSem : pList location 'a0'); syscall _ExecBase
 PROCEDURE RemSemaphore(sigSem : pSignalSemaphore location 'a1'); syscall _ExecBase 606;
 PROCEDURE Vacate(sigSem : pSignalSemaphore location 'a0'; bidMsg : pSemaphoreMessage location 'a1'); syscall _ExecBase 546;
 
-PROCEDURE AddMemList(size : ULONG location 'd0'; attributes : ULONG location 'd1'; pri : LONGINT location 'd2'; base : POINTER location 'a0'; const name : pCHAR location 'a1'); syscall _ExecBase 618;
+PROCEDURE AddMemList(size : ULONG location 'd0'; attributes : ULONG location 'd1'; pri : LONGINT location 'd2'; base : POINTER location 'a0'; const name : PAnsiChar location 'a1'); syscall _ExecBase 618;
 PROCEDURE CopyMem(const source : POINTER location 'a0'; dest : POINTER location 'a1'; size : ULONG location 'd0'); syscall _ExecBase 624;
 PROCEDURE CopyMemQuick(const source : POINTER location 'a0'; dest : POINTER location 'a1'; size : ULONG location 'd0'); syscall _ExecBase 630;
 PROCEDURE SumKickData; syscall _ExecBase 612;
 
 FUNCTION GetCC : ULONG; syscall _ExecBase 528;
-function RawDoFmt(const formatString : pCHAR location 'a0';const dataStream : POINTER location 'a1'; putChProc : tPROCEDURE location 'a2'; putChData : POINTER location 'a3'): pointer; syscall _ExecBase 522;
+function RawDoFmt(const formatString : PAnsiChar location 'a0';const dataStream : POINTER location 'a1'; putChProc : tPROCEDURE location 'a2'; putChData : POINTER location 'a3'): pointer; syscall _ExecBase 522;
 FUNCTION TypeOfMem(const address : POINTER location 'a1') : ULONG; syscall _ExecBase 534;
 
 {$else}
@@ -1287,7 +1287,7 @@ PROCEDURE AddHead(list : pList location 'a0'; node : pNode location 'a1'); sysca
 PROCEDURE AddIntServer(intNumber : LONGINT location 'd0'; interrupt_ : pInterrupt location 'a1'); syscall _ExecBase 168;
 PROCEDURE AddLibrary(lib : pLibrary location 'a1'); syscall _ExecBase 396;
 PROCEDURE AddMemHandler(memhand : pInterrupt location 'a1'); syscall _ExecBase 774;
-PROCEDURE AddMemList(size : ULONG location 'd0'; attributes : ULONG location 'd1'; pri : LONGINT location 'd2'; base : POINTER location 'a0'; const name : pCHAR location 'a1'); syscall _ExecBase 618;
+PROCEDURE AddMemList(size : ULONG location 'd0'; attributes : ULONG location 'd1'; pri : LONGINT location 'd2'; base : POINTER location 'a0'; const name : PAnsiChar location 'a1'); syscall _ExecBase 618;
 PROCEDURE AddPort(port : pMsgPort location 'a1'); syscall _ExecBase 354;
 PROCEDURE AddResource(resource : POINTER location 'a1'); syscall _ExecBase 486;
 PROCEDURE AddSemaphore(sigSem : pSignalSemaphore location 'a1'); syscall _ExecBase 600;
@@ -1335,11 +1335,11 @@ PROCEDURE Enable; syscall _ExecBase 126;
 PROCEDURE Enqueue(list : pList location 'a0'; node : pNode location 'a1'); syscall _ExecBase 270;
 PROCEDURE ExecFreeMem(memoryBlock : POINTER location 'a1'; byteSize : ULONG location 'd0'); syscall _ExecBase 210;
 PROCEDURE ExecInsert(list : pList location 'a0'; node : pNode location 'a1'; pred : pNode location 'a2'); syscall _ExecBase 234;
-FUNCTION FindName(list : pList location 'a0'; const name : pCHAR location 'a1') : pNode; syscall _ExecBase 276;
-FUNCTION FindPort(const name : pCHAR location 'a1') : pMsgPort; syscall _ExecBase 390;
-FUNCTION FindResident(const name : pCHAR location 'a1') : pResident; syscall _ExecBase 096;
-FUNCTION FindSemaphore(const sigSem : pCHAR location 'a1') : pSignalSemaphore; syscall _ExecBase 594;
-FUNCTION FindTask(const name : pCHAR location 'a1') : pTask; syscall _ExecBase 294;
+FUNCTION FindName(list : pList location 'a0'; const name : PAnsiChar location 'a1') : pNode; syscall _ExecBase 276;
+FUNCTION FindPort(const name : PAnsiChar location 'a1') : pMsgPort; syscall _ExecBase 390;
+FUNCTION FindResident(const name : PAnsiChar location 'a1') : pResident; syscall _ExecBase 096;
+FUNCTION FindSemaphore(const sigSem : PAnsiChar location 'a1') : pSignalSemaphore; syscall _ExecBase 594;
+FUNCTION FindTask(const name : PAnsiChar location 'a1') : pTask; syscall _ExecBase 294;
 PROCEDURE Forbid; syscall _ExecBase 132;
 PROCEDURE FreeEntry(entry : pMemList location 'a0'); syscall _ExecBase 228;
 PROCEDURE FreePooled(poolHeader : POINTER location 'a0'; memory : POINTER location 'a1'; memSize : ULONG location 'd0'); syscall _ExecBase 714;
@@ -1358,14 +1358,14 @@ FUNCTION ObtainQuickVector(interruptCode : POINTER location 'a0') : ULONG; sysca
 PROCEDURE ObtainSemaphore(sigSem : pSignalSemaphore location 'a0'); syscall _ExecBase 564;
 PROCEDURE ObtainSemaphoreList(sigSem : pList location 'a0'); syscall _ExecBase 582;
 PROCEDURE ObtainSemaphoreShared(sigSem : pSignalSemaphore location 'a0'); syscall _ExecBase 678;
-FUNCTION OldOpenLibrary(const libName : pCHAR location 'a1') : pLibrary; syscall _ExecBase 408;
-FUNCTION OpenDevice(const devName : pCHAR location 'a0'; unite : ULONG location 'd0'; ioRequest : pIORequest location 'a1'; flags : ULONG location 'd1') : shortint; syscall _ExecBase 444;
-FUNCTION OpenLibrary(const libName : pCHAR location 'a1'; version : ULONG location 'd0') : pLibrary; syscall _ExecBase 552;
-FUNCTION OpenResource(const resName : pCHAR location 'a1') : POINTER; syscall _ExecBase 498;
+FUNCTION OldOpenLibrary(const libName : PAnsiChar location 'a1') : pLibrary; syscall _ExecBase 408;
+FUNCTION OpenDevice(const devName : PAnsiChar location 'a0'; unite : ULONG location 'd0'; ioRequest : pIORequest location 'a1'; flags : ULONG location 'd1') : shortint; syscall _ExecBase 444;
+FUNCTION OpenLibrary(const libName : PAnsiChar location 'a1'; version : ULONG location 'd0') : pLibrary; syscall _ExecBase 552;
+FUNCTION OpenResource(const resName : PAnsiChar location 'a1') : POINTER; syscall _ExecBase 498;
 PROCEDURE Permit; syscall _ExecBase 138;
 FUNCTION Procure(sigSem : pSignalSemaphore location 'a0'; bidMsg : pSemaphoreMessage location 'a1') : LongBool; syscall _ExecBase 540;
 PROCEDURE PutMsg(port : pMsgPort location 'a0'; message : pMessage location 'a1'); syscall _ExecBase 366;
-function RawDoFmt(const formatString : pCHAR location 'a0';const dataStream : POINTER location 'a1'; putChProc : tPROCEDURE location 'a2'; putChData : POINTER location 'a3'): pointer; syscall _ExecBase 522;
+function RawDoFmt(const formatString : PAnsiChar location 'a0';const dataStream : POINTER location 'a1'; putChProc : tPROCEDURE location 'a2'; putChData : POINTER location 'a3'): pointer; syscall _ExecBase 522;
 PROCEDURE ReleaseSemaphore(sigSem : pSignalSemaphore location 'a0'); syscall _ExecBase 570;
 PROCEDURE ReleaseSemaphoreList(sigSem : pList location 'a0'); syscall _ExecBase 588;
 PROCEDURE RemDevice(device : pDevice location 'a1'); syscall _ExecBase 438;
@@ -1413,16 +1413,16 @@ FUNCTION AVL_FindFirstNode(CONST root : pAVLNode location 'a0') : pAVLNode; sysc
 FUNCTION AVL_FindLastNode(CONST root : pAVLNode location 'a0') : pAVLNode; syscall _ExecBase 906;
 {$endif}
 
-FUNCTION FindName(list : pList; const name : String) : pNode;
-FUNCTION FindPort(const name : String) : pMsgPort;
-FUNCTION FindResident(const name : String) : pResident;
-FUNCTION FindSemaphore(const sigSem : String) : pSignalSemaphore;
-FUNCTION FindTask(const name : String) : pTask;
-FUNCTION OldOpenLibrary(const libName : String) : pLibrary;
-FUNCTION OpenDevice(const devName : String; unite : ULONG; ioRequest : pIORequest;flags : ULONG) : shortint;
-FUNCTION OpenLibrary(const libName : String; version : ULONG) : pLibrary;
-FUNCTION OpenResource(const resName : String) : POINTER;
-function RawDoFmt(const formatString : String;const dataStream : POINTER; putChProc :tPROCEDURE; putChData : POINTER): pointer;
+FUNCTION FindName(list : pList; const name : ShortString) : pNode;
+FUNCTION FindPort(const name : ShortString) : pMsgPort;
+FUNCTION FindResident(const name : ShortString) : pResident;
+FUNCTION FindSemaphore(const sigSem : ShortString) : pSignalSemaphore;
+FUNCTION FindTask(const name : ShortString) : pTask;
+FUNCTION OldOpenLibrary(const libName : ShortString) : pLibrary;
+FUNCTION OpenDevice(const devName : ShortString; unite : ULONG; ioRequest : pIORequest;flags : ULONG) : shortint;
+FUNCTION OpenLibrary(const libName : ShortString; version : ULONG) : pLibrary;
+FUNCTION OpenResource(const resName : ShortString) : POINTER;
+function RawDoFmt(const formatString : ShortString;const dataStream : POINTER; putChProc :tPROCEDURE; putChData : POINTER): pointer;
 
 function BitMask(no :shortint): longint;
 function IsListEmpty( list : pList): boolean;
@@ -1433,7 +1433,7 @@ function CreateExtIO(Port: PMsgPort; Size: LongInt): PIORequest;
 procedure DeleteExtIO(IOReq: PIORequest);
 function CreateStdIO(Port: PMsgPort): PIOStdReq;
 procedure DeleteStdIO(IOReq: PIOStdReq);
-function CreatePort(Name: PChar; Pri: LongInt): PMsgPort;
+function CreatePort(Name: PAnsiChar; Pri: LongInt): PMsgPort;
 procedure DeletePort(Port: PMsgPort);
 function CreateTask(Name: STRPTR; Pri: LongInt; InitPC: Pointer; StackSize: LongWord): PTask;
 procedure DeleteTask(Task: PTask);
@@ -1467,55 +1467,55 @@ begin
          IsMsgPortEmpty := mp_MsgList.lh_TailPred = pNode(@mp_MsgList);
 end;
 
-FUNCTION FindName(list : pList; const name : String) : pNode;
+FUNCTION FindName(list : pList; const name : ShortString) : pNode;
 BEGIN
-    FindName := FindName(list,PChar(RawByteString(name)));
+    FindName := FindName(list,PAnsiChar(RawByteString(name)));
 END;
 
-FUNCTION FindPort(const name : String) : pMsgPort;
+FUNCTION FindPort(const name : ShortString) : pMsgPort;
 BEGIN
-    FindPort := FindPort(PChar(RawByteString(name)));
+    FindPort := FindPort(PAnsiChar(RawByteString(name)));
 END;
 
-FUNCTION FindResident(const name : String) : pResident;
+FUNCTION FindResident(const name : ShortString) : pResident;
 BEGIN
-    FindResident := FindResident(PChar(RawByteString(name)));
+    FindResident := FindResident(PAnsiChar(RawByteString(name)));
 END;
 
-FUNCTION FindSemaphore(const sigSem : String) : pSignalSemaphore;
+FUNCTION FindSemaphore(const sigSem : ShortString) : pSignalSemaphore;
 BEGIN
-    FindSemaphore := FindSemaphore(PChar(RawByteString(sigSem)));
+    FindSemaphore := FindSemaphore(PAnsiChar(RawByteString(sigSem)));
 END;
 
-FUNCTION FindTask(const name : String) : pTask;
+FUNCTION FindTask(const name : ShortString) : pTask;
 BEGIN
-    FindTask := FindTask(PChar(RawByteString(name)));
+    FindTask := FindTask(PAnsiChar(RawByteString(name)));
 END;
 
-FUNCTION OldOpenLibrary(const libName : String) : pLibrary;
+FUNCTION OldOpenLibrary(const libName : ShortString) : pLibrary;
 BEGIN
-    OldOpenLibrary := OldOpenLibrary(PChar(RawByteString(libName)));
+    OldOpenLibrary := OldOpenLibrary(PAnsiChar(RawByteString(libName)));
 END;
 
-FUNCTION OpenDevice(const devName : String; unite : ULONG; ioRequest : pIORequest;
+FUNCTION OpenDevice(const devName : ShortString; unite : ULONG; ioRequest : pIORequest;
 flags : ULONG) : shortint;
 BEGIN
-    OpenDevice := OpenDevice(PChar(RawByteString(devName)),unite,ioRequest,flags);
+    OpenDevice := OpenDevice(PAnsiChar(RawByteString(devName)),unite,ioRequest,flags);
 END;
 
-FUNCTION OpenLibrary(const libName : String; version : ULONG) : pLibrary;
+FUNCTION OpenLibrary(const libName : ShortString; version : ULONG) : pLibrary;
 BEGIN
-    OpenLibrary := OpenLibrary(PChar(RawByteString(libName)),version);
+    OpenLibrary := OpenLibrary(PAnsiChar(RawByteString(libName)),version);
 END;
 
-FUNCTION OpenResource(const resName : String) : POINTER;
+FUNCTION OpenResource(const resName : ShortString) : POINTER;
 BEGIN
-    OpenResource := OpenResource(PChar(RawByteString(resName)));
+    OpenResource := OpenResource(PAnsiChar(RawByteString(resName)));
 END;
 
-function RawDoFmt(const formatString : String;const dataStream : POINTER; putChProc : tPROCEDURE; putChData : POINTER): pointer;
+function RawDoFmt(const formatString : ShortString;const dataStream : POINTER; putChProc : tPROCEDURE; putChData : POINTER): pointer;
 BEGIN
-    RawDoFmt := RawDoFmt(PChar(RawByteString(formatString)),dataStream,putChProc,putChData);
+    RawDoFmt := RawDoFmt(PAnsiChar(RawByteString(formatString)),dataStream,putChProc,putChData);
 END;
 
 
@@ -1584,7 +1584,7 @@ begin
 end;
 
 
-function CreatePort(Name: PChar; Pri: LongInt): PMsgPort;
+function CreatePort(Name: PAnsiChar; Pri: LongInt): PMsgPort;
 var
   SigBit: Byte;
   Port: PMsgPort;

+ 1 - 1
packages/amunits/src/coreunits/expansion.pas

@@ -37,7 +37,7 @@ INTERFACE
 USES exec, configvars, amigados;
 
 Const
-    EXPANSIONNAME       : PChar = 'expansion.library';
+    EXPANSIONNAME       : PAnsiChar = 'expansion.library';
 
 { flags for the AddDosNode() call }
     ADNB_STARTPROC      = 0;

+ 1 - 1
packages/amunits/src/coreunits/gadtools.pas

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

+ 9 - 9
packages/amunits/src/coreunits/hardblocks.pas

@@ -126,13 +126,13 @@ type
 
     { drive identification }
 
-        rdb_DiskVendor  : Array [0..7] of Char;
-        rdb_DiskProduct : Array [0..15] of Char;
-        rdb_DiskRevision : Array [0..3] of Char;
-        rdb_ControllerVendor : Array [0..7] of Char;
-        rdb_ControllerProduct : Array [0..15] of Char;
-        rdb_ControllerRevision : Array [0..3] of Char;
-        rdb_DriveInitName : array[0..39] of char;
+        rdb_DiskVendor  : Array [0..7] of AnsiChar;
+        rdb_DiskProduct : Array [0..15] of AnsiChar;
+        rdb_DiskRevision : Array [0..3] of AnsiChar;
+        rdb_ControllerVendor : Array [0..7] of AnsiChar;
+        rdb_ControllerProduct : Array [0..15] of AnsiChar;
+        rdb_ControllerRevision : Array [0..3] of AnsiChar;
+        rdb_DriveInitName : array[0..39] of AnsiChar;
     end;
 
 const
@@ -196,7 +196,7 @@ type
         pb_Flags        : ULONG;      { see below for defines }
         pb_Reserved1    : Array [0..1] of ULONG;
         pb_DevFlags     : ULONG;      { preferred flags for OpenDevice }
-        pb_DriveName    : Array [0..31] of Char; { preferred DOS device name: BSTR form }
+        pb_DriveName    : Array [0..31] of AnsiChar; { preferred DOS device name: BSTR form }
                                         { (not used if this name is in use) }
         pb_Reserved2    : Array [0..14] of ULONG; { filler to 32 longwords }
         pb_Environment  : Array [0..19] of ULONG; { environment vector for this partition }
@@ -244,7 +244,7 @@ type
                                 {   processing before substitution }
         fhb_GlobalVec   : Longint;      { BCPL global vector when starting task }
         fhb_Reserved2   : Array [0..22] of ULONG; { (those reserved by PatchFlags) }
-        fhb_FileSysName : array[0..83] of char;  { File system file name as loaded. }
+        fhb_FileSysName : array[0..83] of AnsiChar;  { File system file name as loaded. }
     end;
 
 const

+ 32 - 32
packages/amunits/src/coreunits/icon.pas

@@ -15,7 +15,7 @@
  **********************************************************************}
 {
     History:
-    Added overlay functions for Pchar->Strings, functions
+    Added overlay functions for PAnsiChar->Strings, functions
     and procedures.
     14 Jul 2000.
 
@@ -344,42 +344,42 @@ uses exec, workbench,utility,amigados,agraphics,intuition,datatypes;
 
 Const
 
-    ICONNAME    : PChar = 'icon.library';
+    ICONNAME    : PAnsiChar = 'icon.library';
 
 VAR IconBase : pLibrary = nil;
 
 FUNCTION AddFreeList(freelist : pFreeList location 'a0'; const mem : POINTER location 'a1'; size : ULONG location 'a2') : LongBool; syscall IconBase 072;
-FUNCTION BumpRevision(newname : pCHAR location 'a0'; const oldname : pCHAR location 'a1') : pCHAR; syscall IconBase 108;
-FUNCTION DeleteDiskObject(const name : pCHAR location 'a0') : LongBool; syscall IconBase 138;
-FUNCTION FindToolType(const toolTypeArray : POINTER location 'a0'; const typeName : pCHAR location 'a1') : pCHAR; syscall IconBase 096;
+FUNCTION BumpRevision(newname : PAnsiChar location 'a0'; const oldname : PAnsiChar location 'a1') : PAnsiChar; syscall IconBase 108;
+FUNCTION DeleteDiskObject(const name : PAnsiChar location 'a0') : LongBool; syscall IconBase 138;
+FUNCTION FindToolType(const toolTypeArray : POINTER location 'a0'; const typeName : PAnsiChar location 'a1') : PAnsiChar; syscall IconBase 096;
 PROCEDURE FreeDiskObject(diskobj : pDiskObject location 'a0'); syscall IconBase 090;
 PROCEDURE FreeFreeList(freelist : pFreeList location 'a0'); syscall IconBase 054;
 FUNCTION GetDefDiskObject(typ : LONGINT location 'd0') : pDiskObject; syscall IconBase 120;
-FUNCTION GetDiskObject(const name : pCHAR location 'a0') : pDiskObject; syscall IconBase 078;
-FUNCTION GetDiskObjectNew(const name : pCHAR location 'a0') : pDiskObject; syscall IconBase 132;
-FUNCTION MatchToolValue(const typeString : pCHAR location 'a0'; const value : pCHAR location 'a1') : LongBool; syscall IconBase 102;
+FUNCTION GetDiskObject(const name : PAnsiChar location 'a0') : pDiskObject; syscall IconBase 078;
+FUNCTION GetDiskObjectNew(const name : PAnsiChar location 'a0') : pDiskObject; syscall IconBase 132;
+FUNCTION MatchToolValue(const typeString : PAnsiChar location 'a0'; const value : PAnsiChar location 'a1') : LongBool; syscall IconBase 102;
 FUNCTION PutDefDiskObject(const diskObject : pDiskObject location 'a0') : LongBool; syscall IconBase 126;
-FUNCTION PutDiskObject(const name : pCHAR location 'a0'; const diskobj : pDiskObject location 'a1') : LongBool; syscall IconBase 084;
+FUNCTION PutDiskObject(const name : PAnsiChar location 'a0'; const diskobj : pDiskObject location 'a1') : LongBool; syscall IconBase 084;
 
 { version 44 }
 FUNCTION DupDiskObjectA(CONST diskObject : pDiskObject location 'a0'; CONST tags : pTagItem location 'a1') : pDiskObject; syscall IconBase 150;
 FUNCTION IconControlA(icon : pDiskObject location 'a0'; CONST tags : pTagItem location 'a1') : longword; syscall IconBase 156;
-PROCEDURE DrawIconStateA(rp : pRastPort location 'a0'; CONST icon : pDiskObject location 'a1'; CONST label_ : pCHAR location 'a2'; leftOffset : LONGINT location 'd0'; topOffset : LONGINT location 'd1'; state : longword location 'd2'; CONST tags : pTagItem location 'a3'); syscall IconBase 162;
-FUNCTION GetIconRectangleA(rp : pRastPort location 'a0'; CONST icon : pDiskObject location 'a1'; CONST label_ : pCHAR location 'a2'; rect : pRectangle location 'a3'; CONST tags : pTagItem location 'a4') : LongBool; syscall IconBase 168;
+PROCEDURE DrawIconStateA(rp : pRastPort location 'a0'; CONST icon : pDiskObject location 'a1'; CONST label_ : PAnsiChar location 'a2'; leftOffset : LONGINT location 'd0'; topOffset : LONGINT location 'd1'; state : longword location 'd2'; CONST tags : pTagItem location 'a3'); syscall IconBase 162;
+FUNCTION GetIconRectangleA(rp : pRastPort location 'a0'; CONST icon : pDiskObject location 'a1'; CONST label_ : PAnsiChar location 'a2'; rect : pRectangle location 'a3'; CONST tags : pTagItem location 'a4') : LongBool; syscall IconBase 168;
 FUNCTION NewDiskObject(type_ : LONGINT location 'd0') : pDiskObject; syscall IconBase 174;
-FUNCTION GetIconTagList(CONST name : pCHAR location 'a0'; CONST tags : pTagItem location 'a1') : pDiskObject; syscall IconBase 180;
-FUNCTION PutIconTagList(CONST name : pCHAR location 'a0'; CONST icon : pDiskObject location 'a1'; CONST tags : pTagItem location 'a2') : LongBool; syscall IconBase 186;
+FUNCTION GetIconTagList(CONST name : PAnsiChar location 'a0'; CONST tags : pTagItem location 'a1') : pDiskObject; syscall IconBase 180;
+FUNCTION PutIconTagList(CONST name : PAnsiChar location 'a0'; CONST icon : pDiskObject location 'a1'; CONST tags : pTagItem location 'a2') : LongBool; syscall IconBase 186;
 FUNCTION LayoutIconA(icon : pDiskObject location 'a0'; screen : pScreen location 'a1'; tags : pTagItem location 'a2') : LongBool; syscall IconBase 192;
 PROCEDURE ChangeToSelectedIconColor(cr : pColorRegister location 'a0'); syscall IconBase 198;
 
 { overlay }
-FUNCTION BumpRevision(newname : pCHar; const oldname : RawByteString) : pCHAR;
+FUNCTION BumpRevision(newname : PAnsiChar; const oldname : RawByteString) : PAnsiChar;
 FUNCTION DeleteDiskObject(const name : RawByteString) : BOOLEAN;
-FUNCTION FindToolType(const toolTypeArray : POINTER;const typeName : RawByteString) : pCHAR;
+FUNCTION FindToolType(const toolTypeArray : POINTER;const typeName : RawByteString) : PAnsiChar;
 FUNCTION GetDiskObject(const name : RawByteString) : pDiskObject;
 FUNCTION GetDiskObjectNew(const name : RawByteString) : pDiskObject;
-FUNCTION MatchToolValue(const typeString : RawByteString;const value : pCHAR) : BOOLEAN;
-FUNCTION MatchToolValue(const typeString : pCHAR;const value : RawByteString) : BOOLEAN;
+FUNCTION MatchToolValue(const typeString : RawByteString;const value : PAnsiChar) : BOOLEAN;
+FUNCTION MatchToolValue(const typeString : PAnsiChar;const value : RawByteString) : BOOLEAN;
 FUNCTION MatchToolValue(const typeString : RawByteString;const value : RawByteString) : BOOLEAN;
 FUNCTION PutDiskObject(const name : RawByteString;const diskobj : pDiskObject) : BOOLEAN;
 
@@ -398,59 +398,59 @@ begin
 end;
 
 
-FUNCTION BumpRevision(newname : pCHar;const oldname : RawByteString) : pCHAR;
+FUNCTION BumpRevision(newname : PAnsiChar;const oldname : RawByteString) : PAnsiChar;
 begin
-      BumpRevision := BumpRevision(newname,PChar(oldname));
+      BumpRevision := BumpRevision(newname,PAnsiChar(oldname));
 end;
 
 FUNCTION DeleteDiskObject(const name : RawByteString) : BOOLEAN;
 begin
-      DeleteDiskObject := DeleteDiskObject(PChar(name));
+      DeleteDiskObject := DeleteDiskObject(PAnsiChar(name));
 end;
 
-FUNCTION FindToolType(const toolTypeArray : POINTER;const typeName : RawByteString) : pCHAR;
+FUNCTION FindToolType(const toolTypeArray : POINTER;const typeName : RawByteString) : PAnsiChar;
 begin
-      FindToolType := FindToolType(toolTypeArray,PChar(typeName));
+      FindToolType := FindToolType(toolTypeArray,PAnsiChar(typeName));
 end;
 
 FUNCTION GetDiskObject(const name : RawByteString) : pDiskObject;
 begin
-      GetDiskObject := GetDiskObject(PChar(name));
+      GetDiskObject := GetDiskObject(PAnsiChar(name));
 end;
 
 FUNCTION GetDiskObjectNew(const name : RawByteString) : pDiskObject;
 begin
-      GetDiskObjectNew := GetDiskObjectNew(PChar(name));
+      GetDiskObjectNew := GetDiskObjectNew(PAnsiChar(name));
 end;
 
-FUNCTION MatchToolValue(const typeString : RawByteString;const value : pCHAR) : BOOLEAN;
+FUNCTION MatchToolValue(const typeString : RawByteString;const value : PAnsiChar) : BOOLEAN;
 begin
-       MatchToolValue := MatchToolValue(PChar(typeString),value);
+       MatchToolValue := MatchToolValue(PAnsiChar(typeString),value);
 end;
 
-FUNCTION MatchToolValue(const typeString : pCHAR;const value : RawByteString) : BOOLEAN;
+FUNCTION MatchToolValue(const typeString : PAnsiChar;const value : RawByteString) : BOOLEAN;
 begin
-       MatchToolValue := MatchToolValue(typeString,PChar(value));
+       MatchToolValue := MatchToolValue(typeString,PAnsiChar(value));
 end;
 
 FUNCTION MatchToolValue(const typeString : RawByteString;const value : RawByteString) : BOOLEAN;
 begin
-       MatchToolValue := MatchToolValue(PChar(typeString),PChar(value));
+       MatchToolValue := MatchToolValue(PAnsiChar(typeString),PAnsiChar(value));
 end;
 
 FUNCTION PutDiskObject(const name : RawByteString;const diskobj : pDiskObject) : BOOLEAN;
 begin
-       PutDiskObject := PutDiskObject(PChar(name),diskobj);
+       PutDiskObject := PutDiskObject(PAnsiChar(name),diskobj);
 end;
 
 FUNCTION GetIconTagList(CONST name : RawByteString; CONST tags : pTagItem) : pDiskObject;
 begin
-       GetIconTagList := GetIconTagList(PChar(name),tags);
+       GetIconTagList := GetIconTagList(PAnsiChar(name),tags);
 end;
 
 FUNCTION PutIconTagList(CONST name : RawByteString; CONST icon : pDiskObject; CONST tags : pTagItem) : BOOLEAN;
 begin
-       PutIconTagList := PutIconTagList(PChar(name),icon,tags);
+       PutIconTagList := PutIconTagList(PAnsiChar(name),icon,tags);
 end;
 
 const

+ 4 - 4
packages/amunits/src/coreunits/iffparse.pas

@@ -44,7 +44,7 @@ uses exec, clipboard, utility;
 
 const
 
-    IFFPARSENAME  : PChar = 'iffparse.library';
+    IFFPARSENAME  : PAnsiChar = 'iffparse.library';
 
 {
  * Struct associated with an active IFF stream.
@@ -252,7 +252,7 @@ PROCEDURE FreeIFF(iff : pIFFHandle location 'a0'); syscall IFFParseBase 054;
 PROCEDURE FreeLocalItem(localItem : pLocalContextItem location 'a0'); syscall IFFParseBase 204;
 FUNCTION GoodID(id : LONGINT location 'd0') : LONGINT; syscall IFFParseBase 258;
 FUNCTION GoodType(typ : LONGINT location 'd0') : LONGINT; syscall IFFParseBase 264;
-FUNCTION IDtoStr(id : LONGINT location 'd0'; buf : pCHAR location 'a0') : pCHAR; syscall IFFParseBase 270;
+FUNCTION IDtoStr(id : LONGINT location 'd0'; buf : PAnsiChar location 'a0') : PAnsiChar; syscall IFFParseBase 270;
 PROCEDURE InitIFF(iff : pIFFHandle location 'a0'; flags : LONGINT location 'd0'; const streamHook : pHook location 'a1'); syscall IFFParseBase 228;
 PROCEDURE InitIFFasClip(iff : pIFFHandle location 'a0'); syscall IFFParseBase 240;
 PROCEDURE InitIFFasDOS(iff : pIFFHandle location 'a0'); syscall IFFParseBase 234;
@@ -276,11 +276,11 @@ FUNCTION StoreLocalItem(iff : pIFFHandle location 'a0'; localItem : pLocalContex
 FUNCTION WriteChunkBytes(iff : pIFFHandle location 'a0'; const buf : POINTER location 'a1'; numBytes : LONGINT location 'd0') : LONGINT; syscall IFFParseBase 066;
 FUNCTION WriteChunkRecords(iff : pIFFHandle location 'a0'; const buf : POINTER location 'a1'; bytesPerRecord : LONGINT location 'd0'; numRecords : LONGINT location 'd1') : LONGINT; syscall IFFParseBase 078;
 
-Function Make_ID(str : String) : LONGINT;
+Function Make_ID(str : ShortString) : LONGINT;
 
 IMPLEMENTATION
 
-Function Make_ID(str : String) : LONGINT;
+Function Make_ID(str : ShortString) : LONGINT;
 begin
         Make_ID := (LONGINT(Ord(Str[1])) shl 24) or
                   (LONGINT(Ord(Str[2])) shl 16 ) or

+ 77 - 77
packages/amunits/src/coreunits/intuition.pas

@@ -21,7 +21,7 @@
    from Word to Integer.
    30 May 2000.
 
-   Added overlay functions for Pchar->Strings, functions
+   Added overlay functions for PAnsiChar->Strings, functions
    and procedures.
    14 Jul 2000.
 
@@ -130,7 +130,7 @@ Type
 
         SelectFill      : Pointer;      { points to Image, IntuiText, or NULL }
 
-        Command         : Char;         { only if appliprog sets the COMMSEQ flag }
+        Command         : AnsiChar;         { only if appliprog sets the COMMSEQ flag }
 
         SubItem         : pMenuItem;    { if non-zero, DrawMenu shows "->" }
 
@@ -2437,7 +2437,7 @@ Type
 
     { printer configurations }
         PrinterType     : Word;        { printer type                     }
-        PrinterFilename : Array [0..FILENAME_SIZE-1] of Char;
+        PrinterFilename : Array [0..FILENAME_SIZE-1] of AnsiChar;
                                         { file for printer         }
 
     { print format and quality configurations }
@@ -2470,7 +2470,7 @@ Type
         LaceWB          : Byte;         { if workbench is to be interlaced      }
 
         Pad             : array[0..11] of Byte;
-        PrtDevName      : array [0..DEVNAME_SIZE-1] of Char;
+        PrtDevName      : array [0..DEVNAME_SIZE-1] of AnsiChar;
                                         { temp file for printer         }
         DefaultPrtUnit: Byte;
         DefaultSerUnit: Byte;
@@ -2780,21 +2780,21 @@ typedef struct
  * to list the names of the built-in classes.
  }
 CONST
- ROOTCLASS      : PChar = 'rootclass'    ;         { classusr.h   }
- IMAGECLASS     : PChar = 'imageclass'   ;         { imageclass.h }
- FRAMEICLASS    : PChar = 'frameiclass'  ;
- SYSICLASS      : PChar = 'sysiclass'    ;
- FILLRECTCLASS  : PChar = 'fillrectclass';
- GADGETCLASS    : PChar = 'gadgetclass'  ;         { gadgetclass.h }
- PROPGCLASS     : PChar = 'propgclass'   ;
- STRGCLASS      : PChar = 'strgclass'    ;
- BUTTONGCLASS   : PChar = 'buttongclass' ;
- FRBUTTONCLASS  : PChar = 'frbuttonclass';
- GROUPGCLASS    : PChar = 'groupgclass'  ;
- ICCLASS        : PChar = 'icclass'      ;         { icclass.h    }
- MODELCLASS     : PChar = 'modelclass'   ;
- ITEXTICLASS    : PChar = 'itexticlass'  ;
- POINTERCLASS   : PChar = 'pointerclass' ;         { pointerclass.h }
+ ROOTCLASS      : PAnsiChar = 'rootclass'    ;         { classusr.h   }
+ IMAGECLASS     : PAnsiChar = 'imageclass'   ;         { imageclass.h }
+ FRAMEICLASS    : PAnsiChar = 'frameiclass'  ;
+ SYSICLASS      : PAnsiChar = 'sysiclass'    ;
+ FILLRECTCLASS  : PAnsiChar = 'fillrectclass';
+ GADGETCLASS    : PAnsiChar = 'gadgetclass'  ;         { gadgetclass.h }
+ PROPGCLASS     : PAnsiChar = 'propgclass'   ;
+ STRGCLASS      : PAnsiChar = 'strgclass'    ;
+ BUTTONGCLASS   : PAnsiChar = 'buttongclass' ;
+ FRBUTTONCLASS  : PAnsiChar = 'frbuttonclass';
+ GROUPGCLASS    : PAnsiChar = 'groupgclass'  ;
+ ICCLASS        : PAnsiChar = 'icclass'      ;         { icclass.h    }
+ MODELCLASS     : PAnsiChar = 'modelclass'   ;
+ ITEXTICLASS    : PAnsiChar = 'itexticlass'  ;
+ POINTERCLASS   : PAnsiChar = 'pointerclass' ;         { pointerclass.h }
 
 
 { Dispatched method ID's
@@ -3954,7 +3954,7 @@ CONST
  EO_REPLACECHAR=  ($0007);
         { replaced one character and (maybe) advanced cursor           }
  EO_INSERTCHAR =  ($0008);
-        { inserted one char into string or added one at end            }
+        { inserted one AnsiChar into string or added one at end            }
  EO_BADFORMAT  =  ($0009);
         { didn't like the text data, e.g., Bad LONGINT                 }
  EO_BIGCHANGE  =  ($000A);        { unused by Intuition  }
@@ -3984,7 +3984,7 @@ CONST
 { These Mode Flags are for internal use only                           }
  SGM_NOCHANGE   = (8);       { no edit changes yet          }
  SGM_NOWORKB    = (16);       { Buffer == PrevBuffer         }
- SGM_CONTROL    = (32);       { control char escape mode     }
+ SGM_CONTROL    = (32);       { control AnsiChar escape mode     }
  SGM_LONGINT    = (64);       { an intuition longint gadget  }
 
 { String Gadget Action Flags (put in SGWork.Actions by EditHook)       }
@@ -4074,7 +4074,7 @@ FUNCTION ModifyIDCMP(window : pWindow location 'a0'; flags : ULONG location 'd0'
 PROCEDURE MoveWindow(window : pWindow location 'a0'; dx : LONGINT location 'd0'; dy : LONGINT location 'd1'); syscall _IntuitionBase 168;
 FUNCTION OpenWindow(const newWindow : pNewWindow location 'a0') : pWindow; syscall _IntuitionBase 204;
 PROCEDURE RefreshWindowFrame(window : pWindow location 'a0'); syscall _IntuitionBase 456;
-PROCEDURE SetWindowTitles(window : pWindow location 'a0';const windowTitle : pCHAR location 'a1';const screenTitle : pCHAR location 'a2'); syscall _IntuitionBase 276;
+PROCEDURE SetWindowTitles(window : pWindow location 'a0';const windowTitle : PAnsiChar location 'a1';const screenTitle : PAnsiChar location 'a2'); syscall _IntuitionBase 276;
 PROCEDURE SizeWindow(window : pWindow location 'a0'; dx : LONGINT location 'd0'; dy : LONGINT location 'd1'); syscall _IntuitionBase 288;
 FUNCTION WindowLimits(window : pWindow location 'a0'; widthMin : LONGINT location 'd0'; heightMin : LONGINT location 'd1'; widthMax : ULONG location 'd2'; heightMax : ULONG location 'd3') : LongBool; syscall _IntuitionBase 318;
 PROCEDURE WindowToBack(window : pWindow location 'a0'); syscall _IntuitionBase 306;
@@ -4101,7 +4101,7 @@ FUNCTION SetMenuStrip(window : pWindow location 'a0'; menu : pMenu location 'a1'
 FUNCTION AutoRequest(window : pWindow location 'a0';const body : pIntuiText location 'a1';const posText : pIntuiText location 'a2';const negText : pIntuiText location 'a3'; pFlag : ULONG location 'd0'; nFlag : ULONG location 'd1'; width : ULONG location 'd2'; height : ULONG location 'd3') : LongBool; syscall _IntuitionBase 348;
 FUNCTION BuildSysRequest(window : pWindow location 'a0';const body : pIntuiText location 'a1';const posText : pIntuiText location 'a2';const negText : pIntuiText location 'a3'; flags : ULONG location 'd0'; width : ULONG location 'd1'; height : ULONG location 'd2') : pWindow; syscall _IntuitionBase 360;
 FUNCTION ClearDMRequest(window : pWindow location 'a0') : LongBool; syscall _IntuitionBase 048;
-FUNCTION DisplayAlert(alertNumber : ULONG location 'd0';const string_ : pCHAR location 'a0'; height : ULONG location 'd1') : LongBool; syscall _IntuitionBase 090;
+FUNCTION DisplayAlert(alertNumber : ULONG location 'd0';const string_ : PAnsiChar location 'a0'; height : ULONG location 'd1') : LongBool; syscall _IntuitionBase 090;
 PROCEDURE EndRequest(requester : pRequester location 'a0'; window : pWindow location 'a1'); syscall _IntuitionBase 120;
 PROCEDURE FreeSysRequest(window : pWindow location 'a0'); syscall _IntuitionBase 372;
 PROCEDURE InitRequester(requester : pRequester location 'a0'); syscall _IntuitionBase 138;
@@ -4175,7 +4175,7 @@ function CloseScreen(screen : pScreen location 'a0'): LongBool; syscall _Intuiti
 PROCEDURE CloseWindow(window : pWindow location 'a0'); syscall _IntuitionBase 072;
 FUNCTION CloseWorkBench : LongBool; syscall _IntuitionBase 078;
 PROCEDURE CurrentTime(VAR seconds : ULONG location 'a0'; VAR micros : ULONG location 'a1'); syscall _IntuitionBase 084;
-FUNCTION DisplayAlert(alertNumber : ULONG location 'd0';const string_ : pCHAR location 'a0'; height : ULONG location 'd1') : LongBool; syscall _IntuitionBase 090;
+FUNCTION DisplayAlert(alertNumber : ULONG location 'd0';const string_ : PAnsiChar location 'a0'; height : ULONG location 'd1') : LongBool; syscall _IntuitionBase 090;
 PROCEDURE DisplayBeep(screen : pScreen location 'a0'); syscall _IntuitionBase 096;
 PROCEDURE DisposeObject(obj : POINTER location 'a0'); syscall _IntuitionBase 642;
 FUNCTION DoGadgetMethodA(gad : pGadget location 'a0'; win : pWindow location 'a1'; req : pRequester location 'a2'; message : tMsg location 'a3') : ULONG; syscall _IntuitionBase 810;
@@ -4195,7 +4195,7 @@ PROCEDURE FreeSysRequest(window : pWindow location 'a0'); syscall _IntuitionBase
 PROCEDURE GadgetMouse(gadget : pGadget location 'a0'; gInfo : pGadgetInfo location 'a1'; mousePoint : psmallint location 'a2'); syscall _IntuitionBase 570;
 FUNCTION GetAttr(attrID : ULONG location 'd0'; obj : POINTER location 'a0'; storagePtr : pULONG location 'a1') : ULONG; overload; syscall _IntuitionBase 654;
 FUNCTION GetAttr(attrID : ULONG location 'd0'; obj : POINTER location 'a0'; var storage : ULONG location 'a1') : ULONG; overload; syscall _IntuitionBase 654;
-PROCEDURE GetDefaultPubScreen(nameBuffer : pCHAR location 'a0'); syscall _IntuitionBase 582;
+PROCEDURE GetDefaultPubScreen(nameBuffer : PAnsiChar location 'a0'); syscall _IntuitionBase 582;
 FUNCTION GetDefPrefs(preferences : pPreferences location 'a0'; size : LONGINT location 'd0') : pPreferences; syscall _IntuitionBase 126;
 FUNCTION GetPrefs(preferences : pPreferences location 'a0'; size : LONGINT location 'd0') : pPreferences; syscall _IntuitionBase 132;
 FUNCTION GetScreenData(buffer : POINTER location 'a0'; size : ULONG location 'D0'; type_ : ULONG location 'd1';const screen : pScreen location 'a1') : LongBool; syscall _IntuitionBase 426;
@@ -4206,9 +4206,9 @@ FUNCTION IntuiTextLength(const iText : pIntuiText location 'a0') : LONGINT; sysc
 FUNCTION ItemAddress(const menuStrip : pMenu location 'a0'; menuNumber : ULONG location 'd0') : pMenuItem; syscall _IntuitionBase 144;
 PROCEDURE LendMenus(fromwindow : pWindow location 'a0'; towindow : pWindow location 'a1'); syscall _IntuitionBase 804;
 FUNCTION LockIBase(dontknow : ULONG location 'd0') : ULONG; syscall _IntuitionBase 414;
-FUNCTION LockPubScreen(const name : pCHAR location 'a0') : pScreen; syscall _IntuitionBase 510;
+FUNCTION LockPubScreen(const name : PAnsiChar location 'a0') : pScreen; syscall _IntuitionBase 510;
 FUNCTION LockPubScreenList : pList; syscall _IntuitionBase 522;
-FUNCTION MakeClass(const classID : pCHAR location 'a0';const superClassID : pCHAR location 'a1';const superClassPtr : pIClass location 'a2'; instanceSize : ULONG location 'd0'; flags : ULONG location 'd1') : pIClass; syscall _IntuitionBase 678;
+FUNCTION MakeClass(const classID : PAnsiChar location 'a0';const superClassID : PAnsiChar location 'a1';const superClassPtr : pIClass location 'a2'; instanceSize : ULONG location 'd0'; flags : ULONG location 'd1') : pIClass; syscall _IntuitionBase 678;
 FUNCTION MakeScreen(screen : pScreen location 'a0') : LONGINT; syscall _IntuitionBase 378;
 FUNCTION ModifyIDCMP(window : pWindow location 'a0'; flags : ULONG location 'd0') : LongBool; syscall _IntuitionBase 150;
 PROCEDURE ModifyProp(gadget : pGadget location 'a0'; window : pWindow location 'a1'; requester : pRequester location 'a2'; flags : ULONG location 'd0'; horizPot : ULONG location 'd1'; vertPot : ULONG location 'd2'; horizBody : ULONG location 'd3'; vertBody : ULONG location 'd4'); syscall _IntuitionBase 156;
@@ -4216,9 +4216,9 @@ PROCEDURE MoveScreen(screen : pScreen location 'a0'; dx : LONGINT location 'd0';
 PROCEDURE MoveWindow(window : pWindow location 'a0'; dx : LONGINT location 'd0'; dy : LONGINT location 'd1'); syscall _IntuitionBase 168;
 PROCEDURE MoveWindowInFrontOf(window : pWindow location 'a0'; behindWindow : pWindow location 'a1'); syscall _IntuitionBase 480;
 PROCEDURE NewModifyProp(gadget : pGadget location 'a0'; window : pWindow location 'a1'; requester : pRequester location 'a2'; flags : ULONG location 'd0'; horizPot : ULONG location 'd1'; vertPot : ULONG location 'd2'; horizBody : ULONG location 'd3'; vertBody : ULONG location 'd4'; numGad : LONGINT location 'd5'); syscall _IntuitionBase 468;
-FUNCTION NewObjectA(classPtr : pIClass location 'a0';const classID : pCHAR location 'a1';const tagList : pTagItem location 'a2') : POINTER; syscall _IntuitionBase 636;
+FUNCTION NewObjectA(classPtr : pIClass location 'a0';const classID : PAnsiChar location 'a1';const tagList : pTagItem location 'a2') : POINTER; syscall _IntuitionBase 636;
 FUNCTION NextObject(objectPtrPtr : POINTER location 'a0') : POINTER; syscall _IntuitionBase 666;
-FUNCTION NextPubScreen(const screen : pScreen location 'a0'; namebuf : pCHAR location 'a1') : pCHAR; syscall _IntuitionBase 534;
+FUNCTION NextPubScreen(const screen : pScreen location 'a0'; namebuf : PAnsiChar location 'a1') : PAnsiChar; syscall _IntuitionBase 534;
 FUNCTION ObtainGIRPort(gInfo : pGadgetInfo location 'a0') : pRastPort; syscall _IntuitionBase 558;
 PROCEDURE OffGadget(gadget : pGadget location 'a0'; window : pWindow location 'a1'; requester : pRequester location 'a2'); syscall _IntuitionBase 174;
 PROCEDURE OffMenu(window : pWindow location 'a0'; menuNumber : ULONG location 'd0'); syscall _IntuitionBase 180;
@@ -4251,7 +4251,7 @@ PROCEDURE ScreenToBack(screen : pScreen location 'a0'); syscall _IntuitionBase 2
 PROCEDURE ScreenToFront(screen : pScreen location 'a0'); syscall _IntuitionBase 252;
 PROCEDURE ScrollWindowRaster(win : pWindow location 'a0'; dx : LONGINT location 'd0'; dy : LONGINT location 'd1'; xMin : LONGINT location 'd2'; yMin : LONGINT location 'd3'; xMax : LONGINT location 'd4'; yMax : LONGINT location 'd5'); syscall _IntuitionBase 798;
 FUNCTION SetAttrsA(obj : POINTER location 'a0';const tagList : pTagItem location 'a1') : ULONG; syscall _IntuitionBase 648;
-PROCEDURE SetDefaultPubScreen(const name : pCHAR location 'a0'); syscall _IntuitionBase 540;
+PROCEDURE SetDefaultPubScreen(const name : PAnsiChar location 'a0'); syscall _IntuitionBase 540;
 FUNCTION SetDMRequest(window : pWindow location 'a0'; requester : pRequester location 'a1') : LongBool; syscall _IntuitionBase 258;
 FUNCTION SetEditHook(hook : pHook location 'a0') : pHook; syscall _IntuitionBase 492;
 FUNCTION SetGadgetAttrsA(gadget : pGadget location 'a0'; window : pWindow location 'a1'; requester : pRequester location 'a2';const tagList : pTagItem location 'a3') : ULONG; syscall _IntuitionBase 660;
@@ -4261,13 +4261,13 @@ PROCEDURE SetPointer(window : pWindow location 'a0'; pointer_ : pword location '
 FUNCTION SetPrefs(const   preferences : pPreferences location 'a0'; size : LONGINT location 'd0'; inform : LONGINT location 'd1') : pPreferences; syscall _IntuitionBase 324;
 FUNCTION SetPubScreenModes(modes : ULONG location 'd0') : WORD; syscall _IntuitionBase 546;
 PROCEDURE SetWindowPointerA(win : pWindow location 'a0';const taglist : pTagItem location 'a1'); syscall _IntuitionBase 816;
-PROCEDURE SetWindowTitles(window : pWindow location 'a0';const windowTitle : pCHAR location 'a1';const screenTitle : pCHAR location 'a2'); syscall _IntuitionBase 276;
+PROCEDURE SetWindowTitles(window : pWindow location 'a0';const windowTitle : PAnsiChar location 'a1';const screenTitle : PAnsiChar location 'a2'); syscall _IntuitionBase 276;
 PROCEDURE ShowTitle(screen : pScreen location 'a0'; showIt : LONGINT location 'd0'); syscall _IntuitionBase 282;
 PROCEDURE SizeWindow(window : pWindow location 'a0'; dx : LONGINT location 'd0'; dy : LONGINT location 'd1'); syscall _IntuitionBase 288;
 FUNCTION SysReqHandler(window : pWindow location 'a0'; idcmpPtr : pULONG location 'a1'; waitInput : LONGINT location 'd0') : LONGINT; syscall _IntuitionBase 600;
-FUNCTION TimedDisplayAlert(alertNumber : ULONG location 'd0';const string_ : pCHAR location 'a0'; height : ULONG location 'd1'; time : ULONG location 'a1') : LongBool; syscall _IntuitionBase 822;
+FUNCTION TimedDisplayAlert(alertNumber : ULONG location 'd0';const string_ : PAnsiChar location 'a0'; height : ULONG location 'd1'; time : ULONG location 'a1') : LongBool; syscall _IntuitionBase 822;
 PROCEDURE UnlockIBase(ibLock : ULONG location 'a0'); syscall _IntuitionBase 420;
-PROCEDURE UnlockPubScreen(const name : pCHAR location 'a0'; screen : pScreen location 'a1'); syscall _IntuitionBase 516;
+PROCEDURE UnlockPubScreen(const name : PAnsiChar location 'a0'; screen : pScreen location 'a1'); syscall _IntuitionBase 516;
 PROCEDURE UnlockPubScreenList; syscall _IntuitionBase 528;
 FUNCTION ViewAddress : pView; syscall _IntuitionBase 294;
 FUNCTION ViewPortAddress(const window : pWindow location 'a0') : pViewPort; syscall _IntuitionBase 300;
@@ -4283,8 +4283,8 @@ function OpenScreenTags(newScreen : pNewScreen; tagList : array of PtrUInt) : pS
 function OpenWindowTags(newWindow : pNewWindow; tagList : array of PtrUInt) : pWindow;
 
 {$if not defined(AMIGA_V1_2_ONLY)}
-function NewObject(classPtr : pIClass; classID : string; Const argv : array of PtrUInt ) : POINTER;
-function NewObject(classPtr : pIClass; classID : pCHAR; Const argv : array of PtrUInt) : POINTER;
+function NewObject(classPtr : pIClass; classID : ShortString; Const argv : array of PtrUInt ) : POINTER;
+function NewObject(classPtr : pIClass; classID : PAnsiChar; Const argv : array of PtrUInt) : POINTER;
 function SetAttrs(obj : POINTER; tags: array of DWord) : ULONG;
 function SetGadgetAttrs(gadget : pGadget; window : pWindow; requester : pRequester; Const argv : array of PtrUInt) : ULONG;
 procedure SetWindowPointer(win : pWindow; tags: array of DWord);
@@ -4313,17 +4313,17 @@ function ITEMNUM( n : Word): Word;
 function MENUNUM( n : Word): Word;
 function SUBNUM( n : Word): Word;
 
-FUNCTION DisplayAlert(alertNumber : ULONG;const string_ : string; height : ULONG) : BOOLEAN;
-FUNCTION LockPubScreen(const name : string) : pScreen;
+FUNCTION DisplayAlert(alertNumber : ULONG;const string_ : ShortString; height : ULONG) : BOOLEAN;
+FUNCTION LockPubScreen(const name : ShortString) : pScreen;
 {$if not defined(AMIGA_V1_2_ONLY)}
-FUNCTION MakeClass(const classID : string;const superClassID : pCHAR;const superClassPtr : pIClass; instanceSize : ULONG; flags : ULONG) : pIClass;
-FUNCTION MakeClass(const classID : pCHAR;const superClassID : string;const superClassPtr : pIClass; instanceSize : ULONG; flags : ULONG) : pIClass;
-FUNCTION MakeClass(const classID : string;const superClassID : string;const superClassPtr : pIClass; instanceSize : ULONG; flags : ULONG) : pIClass;
-FUNCTION NewObjectA(classPtr : pIClass;const classID : string;const tagList : pTagItem) : POINTER;
+FUNCTION MakeClass(const classID : ShortString;const superClassID : PAnsiChar;const superClassPtr : pIClass; instanceSize : ULONG; flags : ULONG) : pIClass;
+FUNCTION MakeClass(const classID : PAnsiChar;const superClassID : ShortString;const superClassPtr : pIClass; instanceSize : ULONG; flags : ULONG) : pIClass;
+FUNCTION MakeClass(const classID : ShortString;const superClassID : ShortString;const superClassPtr : pIClass; instanceSize : ULONG; flags : ULONG) : pIClass;
+FUNCTION NewObjectA(classPtr : pIClass;const classID : ShortString;const tagList : pTagItem) : POINTER;
 {$endif}
-PROCEDURE SetDefaultPubScreen(const name : string);
-FUNCTION TimedDisplayAlert(alertNumber : ULONG;const string_ : string; height : ULONG; time : ULONG) : BOOLEAN;
-PROCEDURE UnlockPubScreen(const name : string; screen : pScreen);
+PROCEDURE SetDefaultPubScreen(const name : ShortString);
+FUNCTION TimedDisplayAlert(alertNumber : ULONG;const string_ : ShortString; height : ULONG; time : ULONG) : BOOLEAN;
+PROCEDURE UnlockPubScreen(const name : ShortString; screen : pScreen);
 
 {$if not defined(AMIGA_V1_2_ONLY)}
 function DoMethodA(Obj: PObject_; Msg: APTR): PtrUInt;
@@ -4343,8 +4343,8 @@ function OpenWindowTagList(NewWindow: PNewWindow; TagList: PTagItem):PWindow;
 var
   Nw: TNewWindow;
   Scr: PScreen;
-  LockedScreenName: PChar;
-  ScreenTitle: PChar;
+  LockedScreenName: PAnsiChar;
+  ScreenTitle: PAnsiChar;
   Win: PWindow;
   ILock: LongWord;
 begin
@@ -4390,8 +4390,8 @@ begin
       WA_PubScreenName:
       begin
         ILock := LockIBase(0);
-        LockedScreenName := PChar(TagList^.ti_Data);
-        if (LowerCase(string(LockedScreenName)) = 'workbench') or (LockedScreenName = nil) then
+        LockedScreenName := PAnsiChar(TagList^.ti_Data);
+        if (LowerCase(ShortString(LockedScreenName)) = 'workbench') or (LockedScreenName = nil) then
         begin
           NewWindow^.WType := WBENCHSCREEN_F;
           NewWindow^.Screen := nil;
@@ -4401,7 +4401,7 @@ begin
           Scr := pIntuitionBase(_IntuitionBase)^.FirstScreen;
         while Assigned(Scr) do
         begin
-          if LowerCase(string(scr^.Title)) = LowerCase(string(LockedScreenName)) then
+          if LowerCase(ShortString(scr^.Title)) = LowerCase(ShortString(LockedScreenName)) then
           begin
             NewWindow^.Screen := Scr;
             NewWindow^.WType := CUSTOMSCREEN_F;
@@ -4414,7 +4414,7 @@ begin
       end;
       WA_ReportMouse: NewWindow^.Flags := NewWindow^.Flags or WFLG_REPORTMOUSE;
       WA_RMBTrap: NewWindow^.Flags := NewWindow^.Flags or WFLG_RMBTRAP;
-      WA_ScreenTitle: ScreenTitle := PChar(TagList^.ti_Data);
+      WA_ScreenTitle: ScreenTitle := PAnsiChar(TagList^.ti_Data);
       WA_SimpleRefresh: NewWindow^.Flags := NewWindow^.Flags or WFLG_SIMPLE_REFRESH;
       WA_SizeBBottom: NewWindow^.Flags := NewWindow^.Flags or WFLG_SIZEBBOTTOM;
       WA_SizeBRight: NewWindow^.Flags := NewWindow^.Flags or WFLG_SIZEBRIGHT;
@@ -4423,7 +4423,7 @@ begin
       WA_Activate: NewWindow^.Flags := NewWindow^.Flags or WFLG_ACTIVATE;
       WA_Borderless: NewWindow^.Flags := NewWindow^.Flags or WFLG_BORDERLESS;
       WA_SuperBitMap: NewWindow^.BitMap := Pointer(TagList^.ti_Data);
-      WA_Title: NewWindow^.Title := PChar(TagList^.ti_Data);
+      WA_Title: NewWindow^.Title := PAnsiChar(TagList^.ti_Data);
       WA_Top: NewWindow^.TopEdge := TagList^.ti_Data;
       WA_InnerWidth,WA_Width: NewWindow^.Width := TagList^.ti_Data;
     end;
@@ -4502,7 +4502,7 @@ begin
       //SA_PubName: TODO: hmmm, not really possible
       SA_Quiet: if TagList^.ti_Data <> 0 then NewScreen^.SType := NewScreen^.SType or SCREENQUIET_F else NewScreen^.SType := NewScreen^.SType and not SCREENQUIET_F;
       SA_ShowTitle: if TagList^.ti_Data <> 0 then NewScreen^.SType := NewScreen^.SType or SHOWTITLE_F else NewScreen^.SType := NewScreen^.SType and not SHOWTITLE_F;
-      SA_Title: NewScreen^.DefaultTitle := PChar(TagList^.ti_Data);
+      SA_Title: NewScreen^.DefaultTitle := PAnsiChar(TagList^.ti_Data);
       SA_Top: NewScreen^.TopEdge := TagList^.ti_Data;
       SA_Type: NewScreen^.SType := NewScreen^.SType or (TagList^.ti_Data) and not PUBLICSCREEN_F;
       SA_DisplayID: NewScreen^.ViewModes := TagList^.ti_Data;
@@ -4521,7 +4521,7 @@ var
   pText, NText, s: AnsiString;
   Found: Boolean;
   i: Integer;
-  Target: array[0..255] of Char;
+  Target: array[0..255] of AnsiChar;
   Magic: LongWord;
 begin
   Magic := $16c04e75; // move.b d0,(a3)+ rts
@@ -4542,7 +4542,7 @@ begin
   PText := '';
   if Assigned(easyStruct^.es_GadgetFormat) then
   begin
-    s := string(easyStruct^.es_GadgetFormat);
+    s := ShortString(easyStruct^.es_GadgetFormat);
     Found := False;
     for i := 1 to Length(s) do
     begin
@@ -4566,7 +4566,7 @@ begin
     BackPen := 1;
     FrontPen := 2;
     DrawMode := JAM1;
-    IText := PChar(PText);
+    IText := PAnsiChar(PText);
     LeftEdge := 7;
     TopEdge := 4;
     ITextFont := nil;
@@ -4578,7 +4578,7 @@ begin
     BackPen := 1;
     FrontPen := 2;
     DrawMode := JAM1;
-    IText := PChar(NText);
+    IText := PAnsiChar(NText);
     LeftEdge := 7;
     TopEdge := 4;
     ITextFont := nil;
@@ -4612,14 +4612,14 @@ begin
 end;
 
 {$if not defined(AMIGA_V1_2_ONLY)}
-function NewObject(classPtr : pIClass; classID : pCHAR; Const argv : array of PtrUInt) : POINTER;
+function NewObject(classPtr : pIClass; classID : PAnsiChar; Const argv : array of PtrUInt) : POINTER;
 begin
     NewObject := NewObjectA(classPtr,classID, @argv);
 end;
 
-function NewObject(classPtr : pIClass; classID : string; Const argv : array of PtrUInt ) : POINTER;
+function NewObject(classPtr : pIClass; classID : ShortString; Const argv : array of PtrUInt ) : POINTER;
 begin
-      NewObject := NewObjectA(classPtr,PChar(RawByteString(classID)),@argv);
+      NewObject := NewObjectA(classPtr,PAnsiChar(RawByteString(classID)),@argv);
 end;
 
 function SetAttrs(obj : POINTER; tags: array of DWord) : ULONG;
@@ -4745,51 +4745,51 @@ begin
     SUBNUM := (n shr 11) and $1f
 end;
 
-FUNCTION DisplayAlert(alertNumber : ULONG;const string_ : string; height : ULONG) : BOOLEAN; inline;
+FUNCTION DisplayAlert(alertNumber : ULONG;const string_ : ShortString; height : ULONG) : BOOLEAN; inline;
 begin
-      DisplayAlert := DisplayAlert(alertNumber,PChar(RawByteString(string_)),height);
+      DisplayAlert := DisplayAlert(alertNumber,PAnsiChar(RawByteString(string_)),height);
 end;
 
-FUNCTION LockPubScreen(const name : string) : pScreen; inline;
+FUNCTION LockPubScreen(const name : ShortString) : pScreen; inline;
 begin
-      LockPubScreen := LockPubScreen(PChar(RawByteString(name)));
+      LockPubScreen := LockPubScreen(PAnsiChar(RawByteString(name)));
 end;
 
 {$if not defined(AMIGA_V1_2_ONLY)}
-FUNCTION MakeClass(const classID : string;const superClassID : pCHAR;const superClassPtr : pIClass; instanceSize : ULONG; flags : ULONG) : pIClass;
+FUNCTION MakeClass(const classID : ShortString;const superClassID : PAnsiChar;const superClassPtr : pIClass; instanceSize : ULONG; flags : ULONG) : pIClass;
 begin
-      MakeClass := MakeClass(PChar(RawByteString(classID)),superClassID,superClassPtr,instanceSize,flags);
+      MakeClass := MakeClass(PAnsiChar(RawByteString(classID)),superClassID,superClassPtr,instanceSize,flags);
 end;
 
-FUNCTION MakeClass(const classID : pCHAR;const superClassID : string;const superClassPtr : pIClass; instanceSize : ULONG; flags : ULONG) : pIClass;
+FUNCTION MakeClass(const classID : PAnsiChar;const superClassID : ShortString;const superClassPtr : pIClass; instanceSize : ULONG; flags : ULONG) : pIClass;
 begin
-      MakeClass := MakeClass(classID,PChar(RawByteString(superClassID)),superClassPtr,instanceSize,flags);
+      MakeClass := MakeClass(classID,PAnsiChar(RawByteString(superClassID)),superClassPtr,instanceSize,flags);
 end;
 
-FUNCTION MakeClass(const classID : string;const superClassID : string;const superClassPtr : pIClass; instanceSize : ULONG; flags : ULONG) : pIClass;
+FUNCTION MakeClass(const classID : ShortString;const superClassID : ShortString;const superClassPtr : pIClass; instanceSize : ULONG; flags : ULONG) : pIClass;
 begin
-      MakeClass := MakeClass(PChar(RawByteString(classID)),PChar(RawByteString(superClassID)),superClassPtr,instanceSize,flags);
+      MakeClass := MakeClass(PAnsiChar(RawByteString(classID)),PAnsiChar(RawByteString(superClassID)),superClassPtr,instanceSize,flags);
 end;
 
-FUNCTION NewObjectA(classPtr : pIClass;const classID : string;const tagList : pTagItem) : POINTER;
+FUNCTION NewObjectA(classPtr : pIClass;const classID : ShortString;const tagList : pTagItem) : POINTER;
 begin
-      NewObjectA := NewObjectA(classPtr,PChar(RawByteString(classID)),taglist);
+      NewObjectA := NewObjectA(classPtr,PAnsiChar(RawByteString(classID)),taglist);
 end;
 {$endif}
 
-PROCEDURE SetDefaultPubScreen(const name : string);
+PROCEDURE SetDefaultPubScreen(const name : ShortString);
 begin
-      SetDefaultPubScreen(PChar(RawByteString(name)));
+      SetDefaultPubScreen(PAnsiChar(RawByteString(name)));
 end;
 
-FUNCTION TimedDisplayAlert(alertNumber : ULONG;const string_ : string; height : ULONG; time : ULONG) : BOOLEAN;
+FUNCTION TimedDisplayAlert(alertNumber : ULONG;const string_ : ShortString; height : ULONG; time : ULONG) : BOOLEAN;
 begin
-      TimedDisplayAlert := TimedDisplayAlert(alertNumber,PChar(RawByteString(string_)),height,time);
+      TimedDisplayAlert := TimedDisplayAlert(alertNumber,PAnsiChar(RawByteString(string_)),height,time);
 end;
 
-PROCEDURE UnlockPubScreen(const name : string; screen : pScreen);
+PROCEDURE UnlockPubScreen(const name : ShortString; screen : pScreen);
 begin
-      UnlockPubScreen(PChar(RawByteString(name)),screen);
+      UnlockPubScreen(PAnsiChar(RawByteString(name)),screen);
 end;
 
 {$if not defined(AMIGA_V1_2_ONLY)}

+ 6 - 6
packages/amunits/src/coreunits/keymap.pas

@@ -108,14 +108,14 @@ Const
 VAR KeymapBase : pLibrary = nil;
 
 const
-    KEYMAPNAME : PChar = 'keymap.library';
+    KEYMAPNAME : PAnsiChar = 'keymap.library';
 
 {$if defined(AMIGA_V1_2_ONLY)}
-function MapRawKey(event: PInputEvent; Buffer: PCHAR; Length: LongInt; keyMap: PKeyMap): SmallInt;
+function MapRawKey(event: PInputEvent; Buffer: PAnsiChar; Length: LongInt; keyMap: PKeyMap): SmallInt;
 {$else}
 FUNCTION AskKeyMapDefault : pKeyMap; syscall KeymapBase 036;
-FUNCTION MapANSI(thestring : pCHAR location 'a0'; count : LONGINT location 'd0'; buffer : pCHAR location 'a1'; length : LONGINT location 'd1'; keyMap : pKeyMap location 'a2') : LONGINT; syscall KeymapBase 048;
-FUNCTION MapRawKey(event : pInputEvent location 'a0'; buffer : pCHAR location 'a1'; length : LONGINT location 'd1'; keyMap : pKeyMap location 'a2') : smallint; syscall KeymapBase 042;
+FUNCTION MapANSI(thestring : PAnsiChar location 'a0'; count : LONGINT location 'd0'; buffer : PAnsiChar location 'a1'; length : LONGINT location 'd1'; keyMap : pKeyMap location 'a2') : LONGINT; syscall KeymapBase 048;
+FUNCTION MapRawKey(event : pInputEvent location 'a0'; buffer : PAnsiChar location 'a1'; length : LONGINT location 'd1'; keyMap : pKeyMap location 'a2') : smallint; syscall KeymapBase 042;
 PROCEDURE SetKeyMapDefault(keyMap : pKeyMap location 'a0'); syscall KeymapBase 030;
 {$endif}
 
@@ -127,9 +127,9 @@ var
   ConMsgPort: PMsgPort = nil;
   ConIOReq: PIORequest = nil;
 
-function RawKeyConvert(Events: PInputEvent location 'a0'; Buffer: PCHAR location 'a1'; Length: LongInt location 'd1'; KeyMap: PKeyMap location 'a2'): LongInt; syscall ConDev 048;
+function RawKeyConvert(Events: PInputEvent location 'a0'; Buffer: PAnsiChar location 'a1'; Length: LongInt location 'd1'; KeyMap: PKeyMap location 'a2'): LongInt; syscall ConDev 048;
 
-function MapRawKey(event: PInputEvent; Buffer: PCHAR; Length: LongInt; keyMap: PKeyMap): SmallInt;
+function MapRawKey(event: PInputEvent; Buffer: PAnsiChar; Length: LongInt; keyMap: PKeyMap): SmallInt;
 begin
   if not Assigned(ConDev) then
   begin

+ 1 - 1
packages/amunits/src/coreunits/layers.pas

@@ -82,7 +82,7 @@ const
  LAYERS_NOBACKFILL      = 1;
  LAYERS_BACKFILL        = 0;
 
- LAYERSNAME : PChar = 'layers.library';
+ LAYERSNAME : PAnsiChar = 'layers.library';
 
 VAR LayersBase : pLibrary = nil;
 

+ 12 - 12
packages/amunits/src/coreunits/locale.pas

@@ -265,16 +265,16 @@ Type
 VAR LocaleBase : pLocaleBase = nil;
 
 const
-    LOCALENAME : PChar = 'locale.library';
+    LOCALENAME : PAnsiChar = 'locale.library';
 
 PROCEDURE CloseCatalog(catalog : pCatalog location 'a0'); syscall LocaleBase 036;
 PROCEDURE CloseLocale(locale : pLocale location 'a0'); syscall LocaleBase 042;
 FUNCTION ConvToLower(locale : pLocale location 'a0'; character : ULONG location 'd0') : ULONG; syscall LocaleBase 048;
 FUNCTION ConvToUpper(locale : pLocale location 'a0'; character : ULONG location 'd0') : ULONG; syscall LocaleBase 054;
-PROCEDURE FormatDate(locale : pLocale location 'a0'; fmtTemplate : pCHAR location 'a1'; date : pDateStamp location 'a2'; putCharFunc : pHook location 'a3'); syscall LocaleBase 060;
-FUNCTION FormatString(locale : pLocale location 'a0'; fmtTemplate : pCHAR location 'a1'; dataStream : POINTER location 'a2'; putCharFunc : pHook location 'a3') : POINTER; syscall LocaleBase 066;
-FUNCTION GetCatalogStr(catalog : pCatalog location 'a0'; stringNum : LONGINT location 'd0'; defaultString : pCHAR location 'a1') : pCHAR; syscall LocaleBase 072;
-FUNCTION GetLocaleStr(locale : pLocale location 'a0'; stringNum : ULONG location 'd0') : pCHAR; syscall LocaleBase 078;
+PROCEDURE FormatDate(locale : pLocale location 'a0'; fmtTemplate : PAnsiChar location 'a1'; date : pDateStamp location 'a2'; putCharFunc : pHook location 'a3'); syscall LocaleBase 060;
+FUNCTION FormatString(locale : pLocale location 'a0'; fmtTemplate : PAnsiChar location 'a1'; dataStream : POINTER location 'a2'; putCharFunc : pHook location 'a3') : POINTER; syscall LocaleBase 066;
+FUNCTION GetCatalogStr(catalog : pCatalog location 'a0'; stringNum : LONGINT location 'd0'; defaultString : PAnsiChar location 'a1') : PAnsiChar; syscall LocaleBase 072;
+FUNCTION GetLocaleStr(locale : pLocale location 'a0'; stringNum : ULONG location 'd0') : PAnsiChar; syscall LocaleBase 078;
 FUNCTION IsAlNum(locale : pLocale location 'a0'; character : ULONG location 'd0') : LongBool; syscall LocaleBase 084;
 FUNCTION IsAlpha(locale : pLocale location 'a0'; character : ULONG location 'd0') : LongBool; syscall LocaleBase 090;
 FUNCTION IsCntrl(locale : pLocale location 'a0'; character : ULONG location 'd0') : LongBool; syscall LocaleBase 096;
@@ -286,17 +286,17 @@ FUNCTION IsPunct(locale : pLocale location 'a0'; character : ULONG location 'd0'
 FUNCTION IsSpace(locale : pLocale location 'a0'; character : ULONG location 'd0') : LongBool; syscall LocaleBase 132;
 FUNCTION IsUpper(locale : pLocale location 'a0'; character : ULONG location 'd0') : LongBool; syscall LocaleBase 138;
 FUNCTION IsXDigit(locale : pLocale location 'a0'; character : ULONG location 'd0') : LongBool; syscall LocaleBase 144;
-FUNCTION OpenCatalogA(locale : pLocale location 'a0'; name : pCHAR location 'a1'; tags : pTagItem location 'a2') : pCatalog; syscall LocaleBase 150;
-FUNCTION OpenLocale(name : pCHAR location 'a0') : pLocale; syscall LocaleBase 156;
-FUNCTION ParseDate(locale : pLocale location 'a0'; date : pDateStamp location 'a1'; fmtTemplate : pCHAR location 'a2'; getCharFunc : pHook location 'a3') : LongBool; syscall LocaleBase 162;
-FUNCTION StrConvert(locale : pLocale location 'a0'; string1 : pCHAR location 'a1'; buffer : POINTER location 'a2'; bufferSize : ULONG location 'd0'; typ : ULONG location 'd1') : ULONG; syscall LocaleBase 174;
-FUNCTION StrnCmp(locale : pLocale location 'a0'; string1 : pCHAR location 'a1'; string2 : pCHAR location 'a2'; length : LONGINT location 'd0'; typ : ULONG location 'd1') : LONGINT; syscall LocaleBase 180;
+FUNCTION OpenCatalogA(locale : pLocale location 'a0'; name : PAnsiChar location 'a1'; tags : pTagItem location 'a2') : pCatalog; syscall LocaleBase 150;
+FUNCTION OpenLocale(name : PAnsiChar location 'a0') : pLocale; syscall LocaleBase 156;
+FUNCTION ParseDate(locale : pLocale location 'a0'; date : pDateStamp location 'a1'; fmtTemplate : PAnsiChar location 'a2'; getCharFunc : pHook location 'a3') : LongBool; syscall LocaleBase 162;
+FUNCTION StrConvert(locale : pLocale location 'a0'; string1 : PAnsiChar location 'a1'; buffer : POINTER location 'a2'; bufferSize : ULONG location 'd0'; typ : ULONG location 'd1') : ULONG; syscall LocaleBase 174;
+FUNCTION StrnCmp(locale : pLocale location 'a0'; string1 : PAnsiChar location 'a1'; string2 : PAnsiChar location 'a2'; length : LONGINT location 'd0'; typ : ULONG location 'd1') : LONGINT; syscall LocaleBase 180;
 
-function OpenCatalog(locale : pLocale; name : pCHAR; Const argv : array of PtrUInt) : pCatalog;
+function OpenCatalog(locale : pLocale; name : PAnsiChar; Const argv : array of PtrUInt) : pCatalog;
 
 IMPLEMENTATION
 
-function OpenCatalog(locale : pLocale; name : pCHAR; Const argv : array of PtrUInt) : pCatalog;
+function OpenCatalog(locale : pLocale; name : PAnsiChar; Const argv : array of PtrUInt) : pCatalog;
 begin
     OpenCatalog := OpenCatalogA(locale,name,@argv);
 end;

+ 1 - 1
packages/amunits/src/coreunits/lowlevel.pas

@@ -50,7 +50,7 @@ Type
 
 Const
 
- LOWLEVELNAME : PChar = 'lowlevel.library';
+ LOWLEVELNAME : PAnsiChar = 'lowlevel.library';
 
 { bits in the return value of GetKey() }
  LLKB_LSHIFT     = 16;

+ 6 - 6
packages/amunits/src/coreunits/nonvolatile.pas

@@ -80,15 +80,15 @@ const
 VAR NVBase : pLibrary = nil;
 
 const
-    NONVOLATILENAME : PChar = 'nonvolatile.library';
+    NONVOLATILENAME : PAnsiChar = 'nonvolatile.library';
 
-FUNCTION DeleteNV(const appName : pCHAR location 'a0'; const itemName : pCHAR location 'a1'; killRequesters : LONGINT location 'd1') : LongBool; syscall NVBase 048;
+FUNCTION DeleteNV(const appName : PAnsiChar location 'a0'; const itemName : PAnsiChar location 'a1'; killRequesters : LONGINT location 'd1') : LongBool; syscall NVBase 048;
 PROCEDURE FreeNVData(data : POINTER location 'a0'); syscall NVBase 036;
-FUNCTION GetCopyNV(const appName : pCHAR location 'a0'; const itemName : pCHAR location 'a1'; killRequesters : LONGINT location 'd1') : POINTER; syscall NVBase 030;
+FUNCTION GetCopyNV(const appName : PAnsiChar location 'a0'; const itemName : PAnsiChar location 'a1'; killRequesters : LONGINT location 'd1') : POINTER; syscall NVBase 030;
 FUNCTION GetNVInfo(killRequesters : LONGINT location 'd1') : pNVInfo; syscall NVBase 054;
-FUNCTION GetNVList(const appName : pCHAR location 'a0'; killRequesters : LONGINT location 'd1') : pMinList; syscall NVBase 060;
-FUNCTION SetNVProtection(const appName : pCHAR location 'a0'; const itemName : pCHAR location 'a1'; mask : LONGINT location 'd2'; killRequesters : LONGINT location 'd1') : LongBool; syscall NVBase 066;
-FUNCTION StoreNV(const appName : pCHAR location 'a0'; const itemName : pCHAR location 'a1'; const data : POINTER location 'a2'; length : ULONG location 'd0'; killRequesters : LONGINT location 'd1') : WORD; syscall NVBase 042;
+FUNCTION GetNVList(const appName : PAnsiChar location 'a0'; killRequesters : LONGINT location 'd1') : pMinList; syscall NVBase 060;
+FUNCTION SetNVProtection(const appName : PAnsiChar location 'a0'; const itemName : PAnsiChar location 'a1'; mask : LONGINT location 'd2'; killRequesters : LONGINT location 'd1') : LongBool; syscall NVBase 066;
+FUNCTION StoreNV(const appName : PAnsiChar location 'a0'; const itemName : PAnsiChar location 'a1'; const data : POINTER location 'a2'; length : ULONG location 'd0'; killRequesters : LONGINT location 'd1') : WORD; syscall NVBase 042;
 
 IMPLEMENTATION
 

+ 1 - 1
packages/amunits/src/coreunits/parallel.pas

@@ -96,7 +96,7 @@ Const
 
 { Note: previous versions of this include files had bits 0 and 2 swapped }
 
-    PARALLELNAME        : PChar = 'parallel.device';
+    PARALLELNAME        : PAnsiChar = 'parallel.device';
 
     PDCMD_QUERY         = CMD_NONSTD;
     PDCMD_SETPARAMS     = CMD_NONSTD + 1;

+ 19 - 19
packages/amunits/src/coreunits/prefs.pas

@@ -79,7 +79,7 @@ type
     fp_BackPen,
     fp_DrawMode     : Byte;
     fp_TextAttr     : tTextAttr;
-    fp_Name         : Array[0..FONTNAMESIZE-1] of Char;
+    fp_Name         : Array[0..FONTNAMESIZE-1] of AnsiChar;
  end;
 
 const
@@ -137,7 +137,7 @@ const
 Type
  pInputPrefs = ^tInputPrefs;
  tInputPrefs = record
-    ip_Keymap      : Array[0..15] of Char;
+    ip_Keymap      : Array[0..15] of AnsiChar;
     ip_PointerTicks : WORD;
     ip_DoubleClick,
     ip_KeyRptDelay,
@@ -160,25 +160,25 @@ Type
     cp_TelephoneCode: ULONG;
     cp_MeasuringSystem : Byte;
 
-    cp_DateTimeFormat  : Array[0..79] of Char;
-    cp_DateFormat      : Array[0..39] of Char;
-    cp_TimeFormat      : Array[0..39] of Char;
+    cp_DateTimeFormat  : Array[0..79] of AnsiChar;
+    cp_DateFormat      : Array[0..39] of AnsiChar;
+    cp_TimeFormat      : Array[0..39] of AnsiChar;
 
-    cp_ShortDateTimeFormat  : Array[0..79] of Char;
-    cp_ShortDateFormat      : Array[0..39] of Char;
-    cp_ShortTimeFormat      : Array[0..39] of Char;
+    cp_ShortDateTimeFormat  : Array[0..79] of AnsiChar;
+    cp_ShortDateFormat      : Array[0..39] of AnsiChar;
+    cp_ShortTimeFormat      : Array[0..39] of AnsiChar;
 
     { for numeric values }
     cp_DecimalPoint,
     cp_GroupSeparator,
-    cp_FracGroupSeparator   : Array[0..9] of Char;
+    cp_FracGroupSeparator   : Array[0..9] of AnsiChar;
     cp_Grouping,
     cp_FracGrouping         : Array[0..9] of Byte;
 
     { for monetary values }
     cp_MonDecimalPoint,
     cp_MonGroupSeparator,
-    cp_MonFracGroupSeparator   : Array[0..9] of Char;
+    cp_MonFracGroupSeparator   : Array[0..9] of AnsiChar;
     cp_MonGrouping,
     cp_MonFracGrouping         : Array[0..9] of Byte;
     cp_MonFracDigits,
@@ -187,16 +187,16 @@ Type
     { for currency symbols }
     cp_MonCS,
     cp_MonSmallCS,
-    cp_MonIntCS                : Array[0..9] of Char;
+    cp_MonIntCS                : Array[0..9] of AnsiChar;
 
     { for positive monetary values }
-    cp_MonPositiveSign         : Array[0..9] of Char;
+    cp_MonPositiveSign         : Array[0..9] of AnsiChar;
     cp_MonPositiveSpaceSep,
     cp_MonPositiveSignPos,
     cp_MonPositiveCSPos        : Byte;
 
     { for negative monetary values }
-    cp_MonNegativeSign         : Array[0..9] of Char;
+    cp_MonNegativeSign         : Array[0..9] of AnsiChar;
     cp_MonNegativeSpaceSep,
     cp_MonNegativeSignPos,
     cp_MonNegativeCSPos        : Byte;
@@ -207,8 +207,8 @@ Type
  pLocalePrefs = ^tLocalePrefs;
  tLocalePrefs = record
     lp_Reserved         : Array[0..3] of ULONG;
-    lp_CountryName      : Array[0..31] of Char;
-    lp_PreferredLanguages : Array[0..9] of Array[0..29] of Char;
+    lp_CountryName      : Array[0..31] of AnsiChar;
+    lp_PreferredLanguages : Array[0..9] of Array[0..29] of AnsiChar;
     lp_GMTOffset        : Longint;
     lp_Flags            : ULONG;
     lp_CountryData      : tCountryPrefs;
@@ -536,7 +536,7 @@ Type
  pPrinterTxtPrefs = ^tPrinterTxtPrefs;
  tPrinterTxtPrefs = record
     pt_Reserved     : Array[0..3] of Longint;               { System reserved            }
-    pt_Driver       : Array[0..DRIVERNAMESIZE-1] of Char;   { printer driver filename    }
+    pt_Driver       : Array[0..DRIVERNAMESIZE-1] of AnsiChar;   { printer driver filename    }
     pt_Port         : Byte;                                 { printer port connection    }
 
     pt_PaperType,
@@ -599,7 +599,7 @@ Type
     pu_Reserved         : Array[0..3] of Longint;              { System reserved              }
     pu_UnitNum          : Longint;                             { Unit number for OpenDevice() }
     pu_OpenDeviceFlags  : ULONG;                               { Flags for OpenDevice()       }
-    pu_DeviceName       : Array[0..DEVICENAMESIZE-1] of Char;  { Name for OpenDevice()        }
+    pu_DeviceName       : Array[0..DEVICENAMESIZE-1] of AnsiChar;  { Name for OpenDevice()        }
  end;
 
 
@@ -714,7 +714,7 @@ Type
     sop_AudioVolume,                { Volume of sound, 0..64     }
     sop_AudioPeriod,                { Period of sound, 127..2500 }
     sop_AudioDuration   : WORD;     { Length of simple beep      }
-    sop_AudioFileName   : Array[0..255] of Char;     { Filename of 8SVX file      }
+    sop_AudioFileName   : Array[0..255] of AnsiChar;     { Filename of 8SVX file      }
  end;
 
 const
@@ -807,7 +807,7 @@ const
 
      PWorkbenchHiddenDevicePrefs = ^tWorkbenchHiddenDevicePrefs;
      tWorkbenchHiddenDevicePrefs = record
-          whdp_Name : array[0..0] of UBYTE;  { C String including NULL char  }
+          whdp_Name : array[0..0] of UBYTE;  { C String including NULL AnsiChar  }
        end;
 
 const

+ 1 - 1
packages/amunits/src/coreunits/prtbase.pas

@@ -300,7 +300,7 @@ type
             pdp_Version : UWORD;   { PRIVATE! driver specific version }
             { PRIVATE! driver specific id }
             pdp_PrinterID : array[0..31] of UBYTE;
-            pdp_PrefName : array[0..(FILENAME_SIZE - 16)-1] of char;
+            pdp_PrefName : array[0..(FILENAME_SIZE - 16)-1] of AnsiChar;
             { size of this structure }
             pdp_Length : ULONG;
          end;

+ 2 - 2
packages/amunits/src/coreunits/realtime.pas

@@ -235,12 +235,12 @@ const
 VAR RealTimeBase : pRealTimeBase = nil;
 
 const
-    REALTIMENAME : PChar = 'realtime.library';
+    REALTIMENAME : PAnsiChar = 'realtime.library';
 
 FUNCTION CreatePlayerA(const tagList : pTagItem location 'a0') : pPlayer; syscall RealTimeBase 042;
 PROCEDURE DeletePlayer(player : pPlayer location 'a0'); syscall RealTimeBase 048;
 FUNCTION ExternalSync(player : pPlayer location 'a0'; minTime : LONGINT location 'd0'; maxTime : LONGINT location 'd1') : WordBool; syscall RealTimeBase 066;
-FUNCTION FindConductor(const name : pCHAR location 'a0') : pConductor; syscall RealTimeBase 078;
+FUNCTION FindConductor(const name : PAnsiChar location 'a0') : pConductor; syscall RealTimeBase 078;
 FUNCTION GetPlayerAttrsA(const player : pPlayer location 'a0'; const tagList : pTagItem location 'a1') : ULONG; syscall RealTimeBase 084;
 FUNCTION LockRealTime(lockType : ULONG location 'd0') : POINTER; syscall RealTimeBase 030;
 FUNCTION NextConductor(const previousConductor : pConductor location 'a0') : pConductor; syscall RealTimeBase 072;

+ 13 - 13
packages/amunits/src/coreunits/rexx.pas

@@ -15,7 +15,7 @@
  **********************************************************************}
 {
     History:
-    Added overlay functions for Pchar->Strings, functions
+    Added overlay functions for PAnsiChar->Strings, functions
     and procedures.
     14 Jul 2000.
 
@@ -375,10 +375,10 @@ Const
 
 Const
 
-    RXSNAME    : PChar = 'rexxsyslib.library';
-    RXSID      : PChar = 'rexxsyslib 1.06 (07 MAR 88)';
-    RXSDIR     : PChar = 'REXX';
-    RXSTNAME   : PChar = 'ARexx';
+    RXSNAME    : PAnsiChar = 'rexxsyslib.library';
+    RXSID      : PAnsiChar = 'rexxsyslib 1.06 (07 MAR 88)';
+    RXSDIR     : PAnsiChar = 'REXX';
+    RXSTNAME   : PAnsiChar = 'ARexx';
 
 { The REXX systems library structure.  This should be considered as    }
 { semi-private and read-only, except for documented exceptions.        }
@@ -481,26 +481,26 @@ Const
 VAR RexxSysBase : pLibrary = nil;
 
 const
-    REXXSYSLIBNAME : PChar = 'rexxsyslib.library';
+    REXXSYSLIBNAME : PAnsiChar = 'rexxsyslib.library';
 
 PROCEDURE ClearRexxMsg(msgptr : pRexxMsg location 'a0'; count : ULONG location 'd0'); syscall RexxSysBase 156;
-FUNCTION CreateArgstring(const argstring : pCHAR location 'a0'; length : ULONG location 'd0') : pCHAR; syscall RexxSysBase 126;
-FUNCTION CreateRexxMsg(const port : pMsgPort location 'a0'; const extension : pCHAR location 'a1'; host : pCHAR location 'd0') : pRexxMsg; syscall RexxSysBase 144;
-PROCEDURE DeleteArgstring(argstring : pCHAR location 'a0'); syscall RexxSysBase 132;
+FUNCTION CreateArgstring(const argstring : PAnsiChar location 'a0'; length : ULONG location 'd0') : PAnsiChar; syscall RexxSysBase 126;
+FUNCTION CreateRexxMsg(const port : pMsgPort location 'a0'; const extension : PAnsiChar location 'a1'; host : PAnsiChar location 'd0') : pRexxMsg; syscall RexxSysBase 144;
+PROCEDURE DeleteArgstring(argstring : PAnsiChar location 'a0'); syscall RexxSysBase 132;
 PROCEDURE DeleteRexxMsg(packet : pRexxMsg location 'a0'); syscall RexxSysBase 150;
 FUNCTION FillRexxMsg(msgptr : pRexxMsg location 'a0'; count : ULONG location 'd0'; mask : ULONG location 'd1') : LongBool; syscall RexxSysBase 162;
 FUNCTION IsRexxMsg(const msgptr : pRexxMsg location 'a0') : LongBool; syscall RexxSysBase 168;
-FUNCTION LengthArgstring(const argstring : pCHAR location 'a0') : ULONG; syscall RexxSysBase 138;
+FUNCTION LengthArgstring(const argstring : PAnsiChar location 'a0') : ULONG; syscall RexxSysBase 138;
 PROCEDURE LockRexxBase(resource : ULONG location 'd0'); syscall RexxSysBase 450;
 PROCEDURE UnlockRexxBase(resource : ULONG location 'd0'); syscall RexxSysBase 456;
 
-FUNCTION CreateArgstring(const argstring : string; length : ULONG) : pCHAR;
+FUNCTION CreateArgstring(const argstring : ShortString; length : ULONG) : PAnsiChar;
 
 IMPLEMENTATION
 
-FUNCTION CreateArgstring(const argstring : string; length : ULONG) : pCHAR;
+FUNCTION CreateArgstring(const argstring : ShortString; length : ULONG) : PAnsiChar;
 begin
-       CreateArgstring := CreateArgstring(PChar(RawByteString(argstring)),length);
+       CreateArgstring := CreateArgstring(PAnsiChar(RawByteString(argstring)),length);
 end;
 
 const

+ 1 - 1
packages/amunits/src/coreunits/romboot_base.pas

@@ -33,7 +33,7 @@ Type
 
 Const
 
-    ROMBOOT_NAME : PChar = 'romboot.library';
+    ROMBOOT_NAME : PAnsiChar = 'romboot.library';
 
 IMPLEMENTATION
 

+ 2 - 2
packages/amunits/src/coreunits/serial.pas

@@ -24,7 +24,7 @@ uses
 
 type
 
-  // array of termination char's to use,see serial.doc setparams
+  // array of termination AnsiChar's to use,see serial.doc setparams
   PIOTArray = ^TIOTArray;
   TIOTArray = record
     TermArray0: LongWord;
@@ -156,7 +156,7 @@ const
   IOSERB_ACTIVE   = 4;                     // rqst-qued-OR-current
   IOSERF_ACTIVE   = 1 shl IOSERB_ACTIVE;
 
-  SERIALNAME: PChar = 'serial.device';
+  SERIALNAME: PAnsiChar = 'serial.device';
 
 implementation
 

+ 1 - 1
packages/amunits/src/coreunits/timer.pas

@@ -42,7 +42,7 @@ Const
     UNIT_WAITUNTIL      = 3;
     UNIT_WAITECLOCK     = 4;
 
-    TIMERNAME : PChar   = 'timer.device';
+    TIMERNAME : PAnsiChar   = 'timer.device';
 
 Type
 

+ 2 - 2
packages/amunits/src/coreunits/trackdisk.pas

@@ -60,11 +60,11 @@ Const
  *--
  *-- Normal usage would be:
  *--
- *-- char internalName[] = TD_NAME;
+ *-- AnsiChar internalName[] = TD_NAME;
  *--
  }
 
-    TD_NAME     : PChar = 'trackdisk.device';
+    TD_NAME     : PAnsiChar = 'trackdisk.device';
 
     TDF_EXTCOM  = $00010000;            { for internal use only! }
 

+ 2 - 2
packages/amunits/src/coreunits/translator.pas

@@ -39,9 +39,9 @@ Const
 VAR TranslatorBase : pLibrary = nil;
 
 const
-    TRANSLATORNAME : PChar = 'translator.library';
+    TRANSLATORNAME : PAnsiChar = 'translator.library';
 
-FUNCTION Translate(const inputString : pCHAR location 'a0'; inputLength : LONGINT location 'd0'; outputBuffer : pCHAR location 'a1'; bufferSize : LONGINT location 'd1') : LONGINT; syscall TranslatorBase 030;
+FUNCTION Translate(const inputString : PAnsiChar location 'a0'; inputLength : LONGINT location 'd0'; outputBuffer : PAnsiChar location 'a1'; bufferSize : LONGINT location 'd1') : LONGINT; syscall TranslatorBase 030;
 
 IMPLEMENTATION
 

+ 30 - 30
packages/amunits/src/coreunits/utility.pas

@@ -377,8 +377,8 @@ function SMult64(Arg1: LongInt location 'd0'; Arg2 : LongInt location 'd1') : Lo
 function Stricmp(const Str1: STRPTR location 'a0';const Str2 : STRPTR location 'a1') : LongInt; syscall _UtilityBase 162;
 function Strnicmp(const Str1: STRPTR location 'a0';const Str2 : STRPTR location 'a1';len : LongInt location 'd0') : LongInt; syscall _UtilityBase 168;
 function TagInArray(t : Tag location 'd0';const TagArray : pULONG location 'a0') : LongBool; syscall _UtilityBase 090;
-function ToLower(c : ULONG location 'd0') : Char; syscall _UtilityBase 180;
-function ToUpper(c : ULONG location 'd0') : Char; syscall _UtilityBase 174;
+function ToLower(c : ULONG location 'd0') : AnsiChar; syscall _UtilityBase 180;
+function ToUpper(c : ULONG location 'd0') : AnsiChar; syscall _UtilityBase 174;
 function UDivMod32( dividend: ULONG location 'd0'; divisor : ULONG location 'd1') : ULONG; syscall _UtilityBase 156;
 function UMult32(Arg1: ULONG location 'd0'; Arg2 : ULONG location 'd1') : ULONG; syscall _UtilityBase 144;
 function UMult64(Arg1: ULONG location 'd0'; Arg2 : ULONG location 'd1') : ULONG; syscall _UtilityBase 204;
@@ -386,25 +386,25 @@ function UnpackStructureTags(const pac: APTR location 'a0';const packTable: pULO
 
 function AllocNamedObject(name : STRPTR; Const argv : array of PtrUInt) : pNamedObject;
 
-function AllocNamedObjectA(const name : string;const TagList : pTagItem) : pNamedObject;
-FUNCTION FindNamedObject(nameSpace : pNamedObject; CONST name : string; lastObject : pNamedObject) : pNamedObject;
-FUNCTION Stricmp(CONST string1 : string; CONST string2 : pCHAR) : LONGINT;
-FUNCTION Stricmp(CONST string1 : pCHAR; CONST string2 : string) : LONGINT;
-FUNCTION Stricmp(CONST string1 : string; CONST string2 : string) : LONGINT;
-FUNCTION Strnicmp(CONST string1 : string; CONST string2 : pCHAR; length : LONGINT) : LONGINT;
-FUNCTION Strnicmp(CONST string1 : pCHAR; CONST string2 : string; length : LONGINT) : LONGINT;
-FUNCTION Strnicmp(CONST string1 : string; CONST string2 : string; length : LONGINT) : LONGINT;
+function AllocNamedObjectA(const name : ShortString;const TagList : pTagItem) : pNamedObject;
+FUNCTION FindNamedObject(nameSpace : pNamedObject; CONST name : ShortString; lastObject : pNamedObject) : pNamedObject;
+FUNCTION Stricmp(CONST string1 : ShortString; CONST string2 : PAnsiChar) : LONGINT;
+FUNCTION Stricmp(CONST string1 : PAnsiChar; CONST string2 : ShortString) : LONGINT;
+FUNCTION Stricmp(CONST string1 : ShortString; CONST string2 : ShortString) : LONGINT;
+FUNCTION Strnicmp(CONST string1 : ShortString; CONST string2 : PAnsiChar; length : LONGINT) : LONGINT;
+FUNCTION Strnicmp(CONST string1 : PAnsiChar; CONST string2 : ShortString; length : LONGINT) : LONGINT;
+FUNCTION Strnicmp(CONST string1 : ShortString; CONST string2 : ShortString; length : LONGINT) : LONGINT;
 {$endif}
 
 
 function TAG_(value: pointer): PtrUInt; overload; inline;
-function TAG_(value: pchar): PtrUInt; overload; inline;
+function TAG_(value: PAnsiChar): PtrUInt; overload; inline;
 function TAG_(value: boolean): PtrUInt; overload; inline;
 function TAG_(value: LongInt): PtrUInt; overload; inline;
 function TAG_(Value: LongWord): PtrUInt; overload; inline;
 
 function AsTag(value: pointer): PtrUInt; overload; inline;
-function AsTag(value: pchar): PtrUInt; overload; inline;
+function AsTag(value: PAnsiChar): PtrUInt; overload; inline;
 function AsTag(value: boolean): PtrUInt; overload; inline;
 function AsTag(value: LongInt): PtrUInt; overload; inline;
 function AsTag(Value: LongWord): PtrUInt; overload; inline;
@@ -454,44 +454,44 @@ begin
 end;
 
 
-function AllocNamedObjectA(const name : string;const TagList : pTagItem) : pNamedObject;
+function AllocNamedObjectA(const name : ShortString;const TagList : pTagItem) : pNamedObject;
 begin
-       AllocNamedObjectA := AllocNamedObjectA(PChar(RawByteString(name)),TagList);
+       AllocNamedObjectA := AllocNamedObjectA(PAnsiChar(RawByteString(name)),TagList);
 end;
 
-FUNCTION FindNamedObject(nameSpace : pNamedObject; CONST name : string; lastObject : pNamedObject) : pNamedObject;
+FUNCTION FindNamedObject(nameSpace : pNamedObject; CONST name : ShortString; lastObject : pNamedObject) : pNamedObject;
 begin
-       FindNamedObject := FindNamedObject(nameSpace,PChar(RawByteString(name)),lastObject);
+       FindNamedObject := FindNamedObject(nameSpace,PAnsiChar(RawByteString(name)),lastObject);
 end;
 
-FUNCTION Stricmp(CONST string1 : string; CONST string2 : pCHAR) : LONGINT;
+FUNCTION Stricmp(CONST string1 : ShortString; CONST string2 : PAnsiChar) : LONGINT;
 begin
-       Stricmp := Stricmp(PChar(RawbyteString(string1)),string2);
+       Stricmp := Stricmp(PAnsiChar(RawbyteString(string1)),string2);
 end;
 
-FUNCTION Stricmp(CONST string1 : pCHAR; CONST string2 : string) : LONGINT;
+FUNCTION Stricmp(CONST string1 : PAnsiChar; CONST string2 : ShortString) : LONGINT;
 begin
-       Stricmp := Stricmp(string1,PChar(RawbyteString(string2)));
+       Stricmp := Stricmp(string1,PAnsiChar(RawbyteString(string2)));
 end;
 
-FUNCTION Stricmp(CONST string1 : string; CONST string2 : string) : LONGINT;
+FUNCTION Stricmp(CONST string1 : ShortString; CONST string2 : ShortString) : LONGINT;
 begin
-       Stricmp := Stricmp(PChar(RawbyteString(string1)),PChar(RawbyteString(string2)));
+       Stricmp := Stricmp(PAnsiChar(RawbyteString(string1)),PAnsiChar(RawbyteString(string2)));
 end;
 
-FUNCTION Strnicmp(CONST string1 : string; CONST string2 : pCHAR; length : LONGINT) : LONGINT;
+FUNCTION Strnicmp(CONST string1 : ShortString; CONST string2 : PAnsiChar; length : LONGINT) : LONGINT;
 begin
-       Strnicmp := Strnicmp(PChar(RawbyteString(string1)),string2,length);
+       Strnicmp := Strnicmp(PAnsiChar(RawbyteString(string1)),string2,length);
 end;
 
-FUNCTION Strnicmp(CONST string1 : pCHAR; CONST string2 : string; length : LONGINT) : LONGINT;
+FUNCTION Strnicmp(CONST string1 : PAnsiChar; CONST string2 : ShortString; length : LONGINT) : LONGINT;
 begin
-       Strnicmp := Strnicmp(string1,PChar(RawbyteString(string2)),length);
+       Strnicmp := Strnicmp(string1,PAnsiChar(RawbyteString(string2)),length);
 end;
 
-FUNCTION Strnicmp(CONST string1 : string; CONST string2 : string; length : LONGINT) : LONGINT;
+FUNCTION Strnicmp(CONST string1 : ShortString; CONST string2 : ShortString; length : LONGINT) : LONGINT;
 begin
-       Strnicmp := Strnicmp(PChar(RawbyteString(string1)),PChar(RawbyteString(string2)),length);
+       Strnicmp := Strnicmp(PAnsiChar(RawbyteString(string1)),PAnsiChar(RawbyteString(string2)),length);
 end;
 {$endif}
 
@@ -500,7 +500,7 @@ begin
   TAG_:=PtrUInt(value);
 end;
 
-function TAG_(value: pchar): PtrUInt; inline;
+function TAG_(value: PAnsiChar): PtrUInt; inline;
 begin
   TAG_:=PtrUInt(value);
 end;
@@ -528,7 +528,7 @@ begin
   AsTag:=PtrUInt(value);
 end;
 
-function AsTag(value: pchar): PtrUInt; inline;
+function AsTag(value: PAnsiChar): PtrUInt; inline;
 begin
   AsTag:=PtrUInt(value);
 end;

+ 23 - 23
packages/amunits/src/coreunits/workbench.pas

@@ -15,7 +15,7 @@
  **********************************************************************}
 {
     History:
-    Added overlay functions for Pchar->Strings, functions
+    Added overlay functions for PAnsiChar->Strings, functions
     and procedures.
     14 Jul 2000.
 
@@ -845,29 +845,29 @@ type
     { Object is new or has changed.  }
        UPDATEWB_ObjectAdded = 1;
 
-    WORKBENCHNAME : PChar  = 'workbench.library';
+    WORKBENCHNAME : PAnsiChar  = 'workbench.library';
 
 VAR
     WorkbenchBase : pLibrary = nil;
 
-FUNCTION AddAppIconA(id : ULONG location 'd0'; userdata : ULONG location 'd1'; text_ : pCHAR location 'a0'; msgport : pMsgPort location 'a1'; lock : BPTR location 'a2'; diskobj : pDiskObject location 'a3'; const taglist : pTagItem location 'a4') : pAppIcon; syscall WorkbenchBase 060;
-FUNCTION AddAppMenuItemA(id : ULONG location 'd0'; userdata : ULONG location 'd1'; text_ : pCHAR location 'a0'; msgport : pMsgPort location 'a1'; const taglist : pTagItem location 'a2') : pAppMenuItem; syscall WorkbenchBase 072;
+FUNCTION AddAppIconA(id : ULONG location 'd0'; userdata : ULONG location 'd1'; text_ : PAnsiChar location 'a0'; msgport : pMsgPort location 'a1'; lock : BPTR location 'a2'; diskobj : pDiskObject location 'a3'; const taglist : pTagItem location 'a4') : pAppIcon; syscall WorkbenchBase 060;
+FUNCTION AddAppMenuItemA(id : ULONG location 'd0'; userdata : ULONG location 'd1'; text_ : PAnsiChar location 'a0'; msgport : pMsgPort location 'a1'; const taglist : pTagItem location 'a2') : pAppMenuItem; syscall WorkbenchBase 072;
 FUNCTION AddAppWindowA(id : ULONG location 'd0'; userdata : ULONG location 'd1'; window : pWindow location 'a0'; msgport : pMsgPort location 'a1'; const taglist : pTagItem location 'a2') : pAppWindow; syscall WorkbenchBase 048;
 FUNCTION RemoveAppIcon(appIcon : pAppIcon location 'a0') : longbool; syscall WorkbenchBase 066;
 FUNCTION RemoveAppMenuItem(appMenuItem : pAppMenuItem location 'a0') : longbool; syscall WorkbenchBase 078;
 FUNCTION RemoveAppWindow(appWindow : pAppWindow location 'a0') : longbool; syscall WorkbenchBase 054;
-PROCEDURE WBInfo(lock : BPTR location 'a0'; name : pCHAR location 'a1'; screen : pScreen location 'a2'); syscall WorkbenchBase 090;
+PROCEDURE WBInfo(lock : BPTR location 'a0'; name : PAnsiChar location 'a1'; screen : pScreen location 'a2'); syscall WorkbenchBase 090;
 
 FUNCTION AddAppWindowDropZoneA(aw : pAppWindow location 'a0'; id : longword location 'd0'; userdata : longword location 'd1'; const tags : pTagItem location 'a1') : pAppWindowDropZone; syscall WorkbenchBase 114;
-FUNCTION ChangeWorkbenchSelectionA(name : pCHAR location 'a0'; hook : pHook location 'a1'; const tags : pTagItem location 'a2') : longbool; syscall WorkbenchBase 126;
-FUNCTION CloseWorkbenchObjectA(name : pCHAR location 'a0'; const tags : pTagItem location 'a1') : longbool; syscall WorkbenchBase 102;
-FUNCTION MakeWorkbenchObjectVisibleA(name : pCHAR location 'a0'; const tags : pTagItem location 'a1') : longbool; syscall WorkbenchBase 132;
-FUNCTION OpenWorkbenchObjectA(name : pCHAR location 'a0'; const tags : pTagItem location 'a1') : longbool; syscall WorkbenchBase 096;
+FUNCTION ChangeWorkbenchSelectionA(name : PAnsiChar location 'a0'; hook : pHook location 'a1'; const tags : pTagItem location 'a2') : longbool; syscall WorkbenchBase 126;
+FUNCTION CloseWorkbenchObjectA(name : PAnsiChar location 'a0'; const tags : pTagItem location 'a1') : longbool; syscall WorkbenchBase 102;
+FUNCTION MakeWorkbenchObjectVisibleA(name : PAnsiChar location 'a0'; const tags : pTagItem location 'a1') : longbool; syscall WorkbenchBase 132;
+FUNCTION OpenWorkbenchObjectA(name : PAnsiChar location 'a0'; const tags : pTagItem location 'a1') : longbool; syscall WorkbenchBase 096;
 FUNCTION RemoveAppWindowDropZone(aw : pAppWindow location 'a0'; dropZone : pAppWindowDropZone location 'a1') : longbool; syscall WorkbenchBase 120;
-FUNCTION WorkbenchControlA(name : pCHAR location 'a0'; const tags : pTagItem location 'a1') : longbool; syscall WorkbenchBase 108;
+FUNCTION WorkbenchControlA(name : PAnsiChar location 'a0'; const tags : pTagItem location 'a1') : longbool; syscall WorkbenchBase 108;
 
-function AddAppIcon(id : ULONG; userdata : ULONG; text_ : pCHAR; msgport : pMsgPort; lock: BPTR; diskobj : pDiskObject; const taglist : array of PtrUInt) : pAppIcon;
-function AddAppMenuItem(id : ULONG; userdata : ULONG; text_ : pCHAR; msgport : pMsgPort; Const argv : array of PtrUInt) : pAppMenuItem;
+function AddAppIcon(id : ULONG; userdata : ULONG; text_ : PAnsiChar; msgport : pMsgPort; lock: BPTR; diskobj : pDiskObject; const taglist : array of PtrUInt) : pAppIcon;
+function AddAppMenuItem(id : ULONG; userdata : ULONG; text_ : PAnsiChar; msgport : pMsgPort; Const argv : array of PtrUInt) : pAppMenuItem;
 function AddAppWindow(id : ULONG; userdata : ULONG; window : pWindow; msgport : pMsgPort; Const argv : array of PtrUInt) : pAppWindow;
 
 { overlays }
@@ -883,12 +883,12 @@ FUNCTION WorkbenchControlA(const name : RawByteString;const tags : pTagItem) : B
 
 IMPLEMENTATION
 
-function AddAppIcon(id : ULONG; userdata : ULONG; text_ : pCHAR; msgport : pMsgPort; lock: BPTR; diskobj : pDiskObject; const taglist : array of PtrUInt) : pAppIcon;
+function AddAppIcon(id : ULONG; userdata : ULONG; text_ : PAnsiChar; msgport : pMsgPort; lock: BPTR; diskobj : pDiskObject; const taglist : array of PtrUInt) : pAppIcon;
 begin
   AddAppIcon := AddAppIconA(id, userdata, text_, msgport, lock, diskobj, @taglist);
 end;
 
-function AddAppMenuItem(id : ULONG; userdata : ULONG; text_ : pCHAR; msgport : pMsgPort; Const argv : array of PtrUInt) : pAppMenuItem;
+function AddAppMenuItem(id : ULONG; userdata : ULONG; text_ : PAnsiChar; msgport : pMsgPort; Const argv : array of PtrUInt) : pAppMenuItem;
 begin
     AddAppMenuItem := AddAppMenuItemA(id,userdata,text_,msgport,@argv);
 end;
@@ -900,47 +900,47 @@ end;
 
 FUNCTION AddAppIconA(id : ULONG; userdata : ULONG; const text_ : RawByteString; msgport : pMsgPort; lock : BPTR; diskobj : pDiskObject;const taglist : pTagItem) : pAppIcon;
 begin
-       AddAppIconA := AddAppIconA(id,userdata,PChar(text_),msgport,lock,diskobj,taglist);
+       AddAppIconA := AddAppIconA(id,userdata,PAnsiChar(text_),msgport,lock,diskobj,taglist);
 end;
 
 FUNCTION AddAppMenuItemA(id : ULONG; userdata : ULONG; const text_ : RawByteString; msgport : pMsgPort;const taglist : pTagItem) : pAppMenuItem;
 begin
-       AddAppMenuItemA := AddAppMenuItemA(id,userdata,PChar(text_),msgport,taglist);
+       AddAppMenuItemA := AddAppMenuItemA(id,userdata,PAnsiChar(text_),msgport,taglist);
 end;
 
 PROCEDURE WBInfo(lock : BPTR; const name : RawByteString; screen : pScreen);
 begin
-       WBInfo(lock,PChar(name),screen);
+       WBInfo(lock,PAnsiChar(name),screen);
 end;
 
 FUNCTION ChangeWorkbenchSelectionA(const name : RawByteString; hook : pHook;const tags : pTagItem) : BOOLEAN;
 begin
-       ChangeWorkbenchSelectionA := ChangeWorkbenchSelectionA(PChar(name),hook,tags);
+       ChangeWorkbenchSelectionA := ChangeWorkbenchSelectionA(PAnsiChar(name),hook,tags);
 end;
 
 FUNCTION CloseWorkbenchObjectA(const name : RawByteString;const tags : pTagItem) : BOOLEAN;
 begin
-       CloseWorkbenchObjectA := CloseWorkbenchObjectA(PChar(name),tags);
+       CloseWorkbenchObjectA := CloseWorkbenchObjectA(PAnsiChar(name),tags);
 end;
 
 FUNCTION MakeWorkbenchObjectVisibleA(const name : RawByteString;const tags : pTagItem) : BOOLEAN;
 begin
-       MakeWorkbenchObjectVisibleA := MakeWorkbenchObjectVisibleA(PChar(name),tags);
+       MakeWorkbenchObjectVisibleA := MakeWorkbenchObjectVisibleA(PAnsiChar(name),tags);
 end;
 
 FUNCTION OpenWorkbenchObjectA(const name : RawByteString;const tags : pTagItem) : BOOLEAN;
 begin
-       OpenWorkbenchObjectA := OpenWorkbenchObjectA(PChar(name),tags);
+       OpenWorkbenchObjectA := OpenWorkbenchObjectA(PAnsiChar(name),tags);
 end;
 
 FUNCTION WorkbenchControlA(const name : RawByteString;const tags : pTagItem) : BOOLEAN;
 begin
-       WorkbenchControlA := WorkbenchControlA(PChar(name),tags);
+       WorkbenchControlA := WorkbenchControlA(PAnsiChar(name),tags);
 end;
 
 const
     { Change VERSION and LIBVERSION to proper values }
-    VERSION : string[2] = '0';
+    VERSION : ShortString[2] = '0';
     LIBVERSION : longword = 0;
 
 initialization

+ 3 - 3
packages/amunits/src/otherlibs/ahi.pas

@@ -363,7 +363,7 @@ VAR AHIBase : pLibrary = nil;
   { Function to filter mode id's  }
      AHIR_FilterFunc = AHI_TagBase + 271;
   {   DEFS  }
-     AHINAME : PChar = 'ahi.device';
+     AHINAME : PAnsiChar = 'ahi.device';
   { Invalid Audio ID  }
      AHI_INVALID_ID =  not (0);
   { Only for AHI_AllocAudioA()!  }
@@ -508,7 +508,7 @@ PROCEDURE AHI_FreeAudio(AudioCtrl : pAHIAudioCtrl location 'a2'); syscall AHIBas
 PROCEDURE AHI_FreeAudioRequest(Requester : pAHIAudioModeRequester location 'a0'); syscall AHIBase 132;
 FUNCTION AHI_GetAudioAttrsA(ID : longword location 'd0'; Audioctrl : pAHIAudioCtrl location 'a2'; tagList : pTagItem location 'a1') : wordbool; syscall AHIBase 108;
 PROCEDURE AHI_KillAudio; syscall AHIBase 54;
-FUNCTION AHI_LoadModeFile(a0arg : pCHAR location 'a0') : longword; syscall AHIBase 162;
+FUNCTION AHI_LoadModeFile(a0arg : PAnsiChar location 'a0') : longword; syscall AHIBase 162;
 FUNCTION AHI_LoadSound(Sound : WORD location 'd0'; _Type : longword location 'd1'; Info : POINTER location 'a0'; AudioCtrl : pAHIAudioCtrl location 'a2') : longword; syscall AHIBase 90;
 FUNCTION AHI_NextAudioID(Last_ID : longword location 'd0') : longword; syscall AHIBase 102;
 PROCEDURE AHI_PlayA(Audioctrl : pAHIAudioCtrl location 'a2'; tagList : pTagItem location 'a1'); syscall AHIBase 138;
@@ -573,7 +573,7 @@ end;
 
 const
     { Change VERSION and LIBVERSION to proper values }
-    VERSION : string[2] = '0';
+    VERSION : ShortString[2] = '0';
     LIBVERSION : longword = 0;
 
 initialization

+ 1 - 1
packages/amunits/src/otherlibs/ahi_sub.pas

@@ -134,7 +134,7 @@ USES Exec, ahi, utility;
 VAR AHIsubBase : pLibrary = nil;
 
 const
-    AHI_SUBNAME : PChar = 'ahi_sub.library';
+    AHI_SUBNAME : PAnsiChar = 'ahi_sub.library';
 
 
 FUNCTION AHIsub_AllocAudio(tagList : pTagItem location 'a1'; AudioCtrl : pAHIAudioCtrlDrv location 'a2') : longword; syscall AHIsubBase 30;

+ 98 - 98
packages/amunits/src/otherlibs/amarquee.pas

@@ -52,7 +52,7 @@ uses exec, utility;
   { Everything is okay  }
 
   const
-     AMARQUEENAME : PChar = 'amarquee.library';
+     AMARQUEENAME : PAnsiChar = 'amarquee.library';
 
      QERROR_NO_ERROR = 0;
   { Don't know what the error was.  }
@@ -136,7 +136,7 @@ uses exec, utility;
           qm_Msg : tMessage;
           qm_ID : LONG;
           qm_Status : longint;
-          qm_Path : Pchar;
+          qm_Path : PAnsiChar;
           qm_Data : pointer;
           qm_DataLen : ULONG;
           qm_ActualLen : ULONG;
@@ -200,219 +200,219 @@ uses exec, utility;
 VAR AMarqueeBase : pLibrary = nil;
 
 FUNCTION QFreeSession(session : pQSession location 'a0') : LONGINT; syscall AMarqueeBase 36;
-FUNCTION QDebugOp(session : pQSession location 'a0'; string_ : pCHar location 'a1') : LONGINT; syscall AMarqueeBase 42;
-FUNCTION QGetOp(session : pQSession location 'a0'; path : pCHar location 'a1'; maxBytes : LONGINT location 'd0') : LONGINT; syscall AMarqueeBase 48;
-FUNCTION QDeleteOp(session : pQSession location 'a0'; path : pCHar location 'a1') : LONGINT; syscall AMarqueeBase 54;
-FUNCTION QRenameOp(session : pQSession location 'a0'; path : pCHar location 'a1'; label_ : pCHar location 'd0') : LONGINT; syscall AMarqueeBase 60;
-FUNCTION QSubscribeOp(session : pQSession location 'a0'; path : pCHar location 'a1'; maxBytes : LONGINT location 'd0') : LONGINT; syscall AMarqueeBase 66;
-FUNCTION QSetOp(session : pQSession location 'a0'; path : pCHar location 'a1'; buf : POINTER location 'd0'; len : ULONG location 'd1') : LONGINT; syscall AMarqueeBase 72;
+FUNCTION QDebugOp(session : pQSession location 'a0'; string_ : PAnsiChar location 'a1') : LONGINT; syscall AMarqueeBase 42;
+FUNCTION QGetOp(session : pQSession location 'a0'; path : PAnsiChar location 'a1'; maxBytes : LONGINT location 'd0') : LONGINT; syscall AMarqueeBase 48;
+FUNCTION QDeleteOp(session : pQSession location 'a0'; path : PAnsiChar location 'a1') : LONGINT; syscall AMarqueeBase 54;
+FUNCTION QRenameOp(session : pQSession location 'a0'; path : PAnsiChar location 'a1'; label_ : PAnsiChar location 'd0') : LONGINT; syscall AMarqueeBase 60;
+FUNCTION QSubscribeOp(session : pQSession location 'a0'; path : PAnsiChar location 'a1'; maxBytes : LONGINT location 'd0') : LONGINT; syscall AMarqueeBase 66;
+FUNCTION QSetOp(session : pQSession location 'a0'; path : PAnsiChar location 'a1'; buf : POINTER location 'd0'; len : ULONG location 'd1') : LONGINT; syscall AMarqueeBase 72;
 FUNCTION QClearSubscriptionsOp(session : pQSession location 'a0'; which : LONGINT location 'd0') : LONGINT; syscall AMarqueeBase 78;
 FUNCTION QPingOp(session : pQSession location 'a0') : LONGINT; syscall AMarqueeBase 84;
 FUNCTION QInfoOp(session : pQSession location 'a0') : LONGINT; syscall AMarqueeBase 90;
-FUNCTION QSetAccessOp(session : pQSession location 'a0'; hosts : pCHar location 'a1') : LONGINT; syscall AMarqueeBase 96;
+FUNCTION QSetAccessOp(session : pQSession location 'a0'; hosts : PAnsiChar location 'a1') : LONGINT; syscall AMarqueeBase 96;
 PROCEDURE FreeQMessage(session : pQSession location 'a0'; qmsg : pQMessage location 'a1'); syscall AMarqueeBase 102;
 FUNCTION QGo(session : pQSession location 'a0'; sync : ULONG location 'd0') : LONGINT; syscall AMarqueeBase 108;
-FUNCTION QStreamOp(session : pQSession location 'a0'; path : pCHar location 'a1'; buf : POINTER location 'd0'; len : ULONG location 'd1') : LONGINT; syscall AMarqueeBase 120;
-FUNCTION QSetMessageAccessOp(session : pQSession location 'a0'; access : pCHar location 'a1'; maxbytes : LONGINT location 'd0') : LONGINT; syscall AMarqueeBase 132;
-FUNCTION QMessageOp(session : pQSession location 'a0'; hosts : pCHar location 'a1'; buffer : POINTER location 'd0'; len : ULONG location 'd1') : LONGINT; syscall AMarqueeBase 138;
+FUNCTION QStreamOp(session : pQSession location 'a0'; path : PAnsiChar location 'a1'; buf : POINTER location 'd0'; len : ULONG location 'd1') : LONGINT; syscall AMarqueeBase 120;
+FUNCTION QSetMessageAccessOp(session : pQSession location 'a0'; access : PAnsiChar location 'a1'; maxbytes : LONGINT location 'd0') : LONGINT; syscall AMarqueeBase 132;
+FUNCTION QMessageOp(session : pQSession location 'a0'; hosts : PAnsiChar location 'a1'; buffer : POINTER location 'd0'; len : ULONG location 'd1') : LONGINT; syscall AMarqueeBase 138;
 FUNCTION QNumQueuedPackets(session : pQSession location 'a0') : ULONG; syscall AMarqueeBase 150;
 FUNCTION QNumQueuedBytes(session : pQSession location 'a0') : ULONG; syscall AMarqueeBase 156;
-FUNCTION QErrorName(session : LONGINT location 'd0') : pCHar; syscall AMarqueeBase 162;
+FUNCTION QErrorName(session : LONGINT location 'd0') : PAnsiChar; syscall AMarqueeBase 162;
 FUNCTION QRequestPrivilegesOp(session : pQSession location 'a0'; privBits : ULONG location 'd0') : LONGINT; syscall AMarqueeBase 168;
 FUNCTION QReleasePrivilegesOp(session : pQSession location 'a0'; privBits : ULONG location 'd0') : LONGINT; syscall AMarqueeBase 174;
-FUNCTION QKillClientsOp(session : pQSession location 'a0'; hosts : pCHar location 'a1') : LONGINT; syscall AMarqueeBase 180;
-FUNCTION QSetParameterOp(session : pQSession location 'a0'; paramName : pCHar location 'a1'; newValue : pCHar location 'd0') : LONGINT; syscall AMarqueeBase 186;
-FUNCTION QGetParameterOp(session : pQSession location 'a0'; paramName : pCHar location 'a1') : LONGINT; syscall AMarqueeBase 192;
-FUNCTION QSysMessageOp(session : pQSession location 'a0'; hosts : pCHar location 'a1'; message : pCHar location 'd0') : LONGINT; syscall AMarqueeBase 198;
-FUNCTION QGetAndSubscribeOp(session : pQSession location 'a0'; path : pCHar location 'a1'; maxBytes : LONGINT location 'd0') : LONGINT; syscall AMarqueeBase 210;
+FUNCTION QKillClientsOp(session : pQSession location 'a0'; hosts : PAnsiChar location 'a1') : LONGINT; syscall AMarqueeBase 180;
+FUNCTION QSetParameterOp(session : pQSession location 'a0'; paramName : PAnsiChar location 'a1'; newValue : PAnsiChar location 'd0') : LONGINT; syscall AMarqueeBase 186;
+FUNCTION QGetParameterOp(session : pQSession location 'a0'; paramName : PAnsiChar location 'a1') : LONGINT; syscall AMarqueeBase 192;
+FUNCTION QSysMessageOp(session : pQSession location 'a0'; hosts : PAnsiChar location 'a1'; message : PAnsiChar location 'd0') : LONGINT; syscall AMarqueeBase 198;
+FUNCTION QGetAndSubscribeOp(session : pQSession location 'a0'; path : PAnsiChar location 'a1'; maxBytes : LONGINT location 'd0') : LONGINT; syscall AMarqueeBase 210;
 FUNCTION QDetachSession(session : pQSession location 'a0'; flags : ULONG location 'd0') : BOOLEAN; syscall AMarqueeBase 216;
 FUNCTION QReattachSession(session : pQSession location 'a0'; flags : ULONG location 'd0') : BOOLEAN; syscall AMarqueeBase 222;
-FUNCTION QNewSocketSession(host : pCHar location 'a0'; port : LONGINT location 'd0'; tags : pTagItem location 'a1') : pQSession; syscall AMarqueeBase 228;
+FUNCTION QNewSocketSession(host : PAnsiChar location 'a0'; port : LONGINT location 'd0'; tags : pTagItem location 'a1') : pQSession; syscall AMarqueeBase 228;
 FUNCTION QSendRawOp(session : pQSession location 'a0'; buf : POINTER location 'a1'; len : ULONG location 'd0') : LONGINT; syscall AMarqueeBase 234;
-FUNCTION QNewSocketSessionAsync(host : pCHar location 'a0'; port : LONGINT location 'd0'; tags : pTagItem location 'a1') : pQSession; syscall AMarqueeBase 240;
+FUNCTION QNewSocketSessionAsync(host : PAnsiChar location 'a0'; port : LONGINT location 'd0'; tags : pTagItem location 'a1') : pQSession; syscall AMarqueeBase 240;
 FUNCTION QNewSocketServerSession( port : pLONGINT location 'a0'; tags : pTagItem location 'a1') : pQSession; syscall AMarqueeBase 246;
-FUNCTION QSetKeyAccessOp(session : pQSession location 'a0'; path : pCHar location 'a1'; hosts : pCHar location 'd0') : LONGINT; syscall AMarqueeBase 252;
-FUNCTION QGetHostName(session : pQSession location 'a0') : pCHar; syscall AMarqueeBase 258;
-FUNCTION QGetProgName(session : pQSession location 'a0') : pCHar; syscall AMarqueeBase 264;
+FUNCTION QSetKeyAccessOp(session : pQSession location 'a0'; path : PAnsiChar location 'a1'; hosts : PAnsiChar location 'd0') : LONGINT; syscall AMarqueeBase 252;
+FUNCTION QGetHostName(session : pQSession location 'a0') : PAnsiChar; syscall AMarqueeBase 258;
+FUNCTION QGetProgName(session : pQSession location 'a0') : PAnsiChar; syscall AMarqueeBase 264;
 PROCEDURE QSetMaxRawBufSize(session : pQSession location 'a0'; maxBufSize : ULONG location 'd0'); syscall AMarqueeBase 270;
-FUNCTION QNewSession(host : pCHar location 'a0'; port : LONGINT location 'd0'; name : pCHar location 'a1'; taglist : pTagItem location 'd1') : pQSession; syscall AMarqueeBase 276;
-FUNCTION QNewSessionAsync(host : pCHar location 'a0'; port : LONGINT location 'd0'; name : pCHar location 'a1'; taglist : pTagItem location 'd1') : pQSession; syscall AMarqueeBase 282;
-FUNCTION QNewHostSession(hostnames : pCHar location 'a0'; port : pLONGINT location 'a1'; names : pCHar location 'd0'; taglist : pTagItem location 'd1') : pQSession; syscall AMarqueeBase 288;
-FUNCTION QNewServerSession(hostNames : pCHar location 'a0'; progNames : pCHar location 'a1'; taglist : pTagItem location 'd0') : pQSession; syscall AMarqueeBase 294;
+FUNCTION QNewSession(host : PAnsiChar location 'a0'; port : LONGINT location 'd0'; name : PAnsiChar location 'a1'; taglist : pTagItem location 'd1') : pQSession; syscall AMarqueeBase 276;
+FUNCTION QNewSessionAsync(host : PAnsiChar location 'a0'; port : LONGINT location 'd0'; name : PAnsiChar location 'a1'; taglist : pTagItem location 'd1') : pQSession; syscall AMarqueeBase 282;
+FUNCTION QNewHostSession(hostnames : PAnsiChar location 'a0'; port : pLONGINT location 'a1'; names : PAnsiChar location 'd0'; taglist : pTagItem location 'd1') : pQSession; syscall AMarqueeBase 288;
+FUNCTION QNewServerSession(hostNames : PAnsiChar location 'a0'; progNames : PAnsiChar location 'a1'; taglist : pTagItem location 'd0') : pQSession; syscall AMarqueeBase 294;
 FUNCTION QCreateSharedMessagePort : pQSharedMessagePort; syscall AMarqueeBase 300;
 PROCEDURE QDeleteSharedMessagePort(mp : pQSharedMessagePort location 'a0'); syscall AMarqueeBase 306;
-FUNCTION QGetLocalIP(session : pQSession location 'a0') : pCHAR; syscall AMarqueeBase 312;
+FUNCTION QGetLocalIP(session : pQSession location 'a0') : PAnsiChar; syscall AMarqueeBase 312;
 
 {
      This is functions and procedures with array of PtrUInt.
      For use with fpc 1.0 and above.
 
 }
-FUNCTION QNewSocketSessiontags(host : pCHar; port : LONGINT; const argv : array of PtrUInt) : pQSession;
-FUNCTION QNewSocketSessionAsyncTags(host : pCHar; port : LONGINT; const argv : array of PtrUInt) : pQSession;
+FUNCTION QNewSocketSessiontags(host : PAnsiChar; port : LONGINT; const argv : array of PtrUInt) : pQSession;
+FUNCTION QNewSocketSessionAsyncTags(host : PAnsiChar; port : LONGINT; const argv : array of PtrUInt) : pQSession;
 FUNCTION QNewSocketServerSessionTags( port : pLONGINT; const argv : array of PtrUInt) : pQSession;
-FUNCTION QNewSessionTags(host : pCHar; port : LONGINT; name : pCHar; const argv : array of PtrUInt) : pQSession;
-FUNCTION QNewSessionAsyncTags(host : pCHar; port : LONGINT; name : pCHar; const argv : array of PtrUInt) : pQSession;
-FUNCTION QNewHostSessionTags(hostnames : pCHar; port : pLONGINT; names : pCHar; const argv : array of PtrUInt) : pQSession;
-FUNCTION QNewServerSessionTags(hostNames : pCHar; progNames : pCHar; const argv : array of PtrUInt) : pQSession;
-
-
-FUNCTION QDebugOp(session : pQSession; string_ : string) : LONGINT;
-FUNCTION QGetOp(session : pQSession; path : string; maxBytes : LONGINT) : LONGINT;
-FUNCTION QDeleteOp(session : pQSession; path : string) : LONGINT;
-FUNCTION QRenameOp(session : pQSession; path : string; label_ : string) : LONGINT;
-FUNCTION QSubscribeOp(session : pQSession; path : string; maxBytes : LONGINT) : LONGINT;
-FUNCTION QSetOp(session : pQSession; path : string; buf : POINTER; len : ULONG) : LONGINT;
-FUNCTION QSetAccessOp(session : pQSession; hosts : string) : LONGINT;
-FUNCTION QStreamOp(session : pQSession; path : string; buf : POINTER; len : ULONG) : LONGINT;
-FUNCTION QSetMessageAccessOp(session : pQSession; access : string; maxbytes : LONGINT) : LONGINT;
-FUNCTION QMessageOp(session : pQSession; hosts : string; buffer : POINTER; len : ULONG) : LONGINT;
-FUNCTION QKillClientsOp(session : pQSession; hosts : string) : LONGINT;
-FUNCTION QSetParameterOp(session : pQSession; paramName : string; newValue : string) : LONGINT;
-FUNCTION QGetParameterOp(session : pQSession; paramName : string) : LONGINT;
-FUNCTION QSysMessageOp(session : pQSession; hosts : string; message : string) : LONGINT;
-FUNCTION QGetAndSubscribeOp(session : pQSession; path : string; maxBytes : LONGINT) : LONGINT;
-FUNCTION QNewSocketSession(host : string; port : LONGINT; tags : pTagItem) : pQSession;
-FUNCTION QNewSocketSessionAsync(host : string; port : LONGINT; tags : pTagItem) : pQSession;
-FUNCTION QSetKeyAccessOp(session : pQSession; path : string; hosts : string) : LONGINT;
-FUNCTION QNewSession(host : string; port : LONGINT; name : string; taglist : pTagItem) : pQSession;
-FUNCTION QNewSessionAsync(host : string; port : LONGINT; name : string; taglist : pTagItem) : pQSession;
-FUNCTION QNewHostSession(hostnames : string; port : pLONGINT; names : string; taglist : pTagItem) : pQSession;
-FUNCTION QNewServerSession(hostNames : string; progNames : string; taglist : pTagItem) : pQSession;
+FUNCTION QNewSessionTags(host : PAnsiChar; port : LONGINT; name : PAnsiChar; const argv : array of PtrUInt) : pQSession;
+FUNCTION QNewSessionAsyncTags(host : PAnsiChar; port : LONGINT; name : PAnsiChar; const argv : array of PtrUInt) : pQSession;
+FUNCTION QNewHostSessionTags(hostnames : PAnsiChar; port : pLONGINT; names : PAnsiChar; const argv : array of PtrUInt) : pQSession;
+FUNCTION QNewServerSessionTags(hostNames : PAnsiChar; progNames : PAnsiChar; const argv : array of PtrUInt) : pQSession;
+
+
+FUNCTION QDebugOp(session : pQSession; string_ : ShortString) : LONGINT;
+FUNCTION QGetOp(session : pQSession; path : ShortString; maxBytes : LONGINT) : LONGINT;
+FUNCTION QDeleteOp(session : pQSession; path : ShortString) : LONGINT;
+FUNCTION QRenameOp(session : pQSession; path : ShortString; label_ : ShortString) : LONGINT;
+FUNCTION QSubscribeOp(session : pQSession; path : ShortString; maxBytes : LONGINT) : LONGINT;
+FUNCTION QSetOp(session : pQSession; path : ShortString; buf : POINTER; len : ULONG) : LONGINT;
+FUNCTION QSetAccessOp(session : pQSession; hosts : ShortString) : LONGINT;
+FUNCTION QStreamOp(session : pQSession; path : ShortString; buf : POINTER; len : ULONG) : LONGINT;
+FUNCTION QSetMessageAccessOp(session : pQSession; access : ShortString; maxbytes : LONGINT) : LONGINT;
+FUNCTION QMessageOp(session : pQSession; hosts : ShortString; buffer : POINTER; len : ULONG) : LONGINT;
+FUNCTION QKillClientsOp(session : pQSession; hosts : ShortString) : LONGINT;
+FUNCTION QSetParameterOp(session : pQSession; paramName : ShortString; newValue : ShortString) : LONGINT;
+FUNCTION QGetParameterOp(session : pQSession; paramName : ShortString) : LONGINT;
+FUNCTION QSysMessageOp(session : pQSession; hosts : ShortString; message : ShortString) : LONGINT;
+FUNCTION QGetAndSubscribeOp(session : pQSession; path : ShortString; maxBytes : LONGINT) : LONGINT;
+FUNCTION QNewSocketSession(host : ShortString; port : LONGINT; tags : pTagItem) : pQSession;
+FUNCTION QNewSocketSessionAsync(host : ShortString; port : LONGINT; tags : pTagItem) : pQSession;
+FUNCTION QSetKeyAccessOp(session : pQSession; path : ShortString; hosts : ShortString) : LONGINT;
+FUNCTION QNewSession(host : ShortString; port : LONGINT; name : ShortString; taglist : pTagItem) : pQSession;
+FUNCTION QNewSessionAsync(host : ShortString; port : LONGINT; name : ShortString; taglist : pTagItem) : pQSession;
+FUNCTION QNewHostSession(hostnames : ShortString; port : pLONGINT; names : ShortString; taglist : pTagItem) : pQSession;
+FUNCTION QNewServerSession(hostNames : ShortString; progNames : ShortString; taglist : pTagItem) : pQSession;
 
 {
      This is functions and procedures with array of PtrUInt.
      For use with fpc 1.0 and above.
 }
 
-FUNCTION QNewSocketSessionTags(host : string; port : LONGINT; const argv : array of PtrUInt) : pQSession;
-FUNCTION QNewSocketSessionAsyncTags(host : string; port : LONGINT; const argv : array of PtrUInt) : pQSession;
-FUNCTION QNewSessionTags(host : string; port : LONGINT; name : string; const argv : array of PtrUInt) : pQSession;
-FUNCTION QNewSessionAsyncTags(host : string; port : LONGINT; name : string; const argv : array of PtrUInt) : pQSession;
-FUNCTION QNewHostSessionTags(hostnames : string; port : pLONGINT; names : string; const argv : array of PtrUInt) : pQSession;
-FUNCTION QNewServerSessionTags(hostNames : string; progNames : string; const argv : array of PtrUInt) : pQSession;
+FUNCTION QNewSocketSessionTags(host : ShortString; port : LONGINT; const argv : array of PtrUInt) : pQSession;
+FUNCTION QNewSocketSessionAsyncTags(host : ShortString; port : LONGINT; const argv : array of PtrUInt) : pQSession;
+FUNCTION QNewSessionTags(host : ShortString; port : LONGINT; name : ShortString; const argv : array of PtrUInt) : pQSession;
+FUNCTION QNewSessionAsyncTags(host : ShortString; port : LONGINT; name : ShortString; const argv : array of PtrUInt) : pQSession;
+FUNCTION QNewHostSessionTags(hostnames : ShortString; port : pLONGINT; names : ShortString; const argv : array of PtrUInt) : pQSession;
+FUNCTION QNewServerSessionTags(hostNames : ShortString; progNames : ShortString; const argv : array of PtrUInt) : pQSession;
 
 IMPLEMENTATION
 
 uses
   pastoc;
 
-FUNCTION QDebugOp(session : pQSession; string_ : string) : LONGINT;
+FUNCTION QDebugOp(session : pQSession; string_ : ShortString) : LONGINT;
 begin
     QDebugOp := QDebugOp(session,pas2c(string_));
 end;
 
-FUNCTION QGetOp(session : pQSession; path : string; maxBytes : LONGINT) : LONGINT;
+FUNCTION QGetOp(session : pQSession; path : ShortString; maxBytes : LONGINT) : LONGINT;
 begin
     QGetOp := QGetOp(session,pas2c(path),maxBytes);
 end;
 
-FUNCTION QDeleteOp(session : pQSession; path : string) : LONGINT;
+FUNCTION QDeleteOp(session : pQSession; path : ShortString) : LONGINT;
 begin
     QDeleteOp := QDeleteOp(session,pas2c(path));
 end;
 
-FUNCTION QRenameOp(session : pQSession; path : string; label_ : string) : LONGINT;
+FUNCTION QRenameOp(session : pQSession; path : ShortString; label_ : ShortString) : LONGINT;
 begin
     QRenameOp := QRenameOp(session,pas2c(path),pas2c(label_));
 end;
 
-FUNCTION QSubscribeOp(session : pQSession; path : string; maxBytes : LONGINT) : LONGINT;
+FUNCTION QSubscribeOp(session : pQSession; path : ShortString; maxBytes : LONGINT) : LONGINT;
 begin
     QSubscribeOp := QSubscribeOp(session,pas2c(path),maxBytes);
 end;
 
-FUNCTION QSetOp(session : pQSession; path : string; buf : POINTER; len : ULONG) : LONGINT;
+FUNCTION QSetOp(session : pQSession; path : ShortString; buf : POINTER; len : ULONG) : LONGINT;
 begin
     QSetOp := QSetOp(session,pas2c(path),buf,len);
 end;
 
-FUNCTION QSetAccessOp(session : pQSession; hosts : string) : LONGINT;
+FUNCTION QSetAccessOp(session : pQSession; hosts : ShortString) : LONGINT;
 begin
     QSetAccessOp := QSetAccessOp(session,pas2c(hosts));
 end;
 
-FUNCTION QStreamOp(session : pQSession; path : string; buf : POINTER; len : ULONG) : LONGINT;
+FUNCTION QStreamOp(session : pQSession; path : ShortString; buf : POINTER; len : ULONG) : LONGINT;
 begin
     QStreamOp := QStreamOp(session,pas2c(path),buf,len);
 end;
 
-FUNCTION QSetMessageAccessOp(session : pQSession; access : string; maxbytes : LONGINT) : LONGINT;
+FUNCTION QSetMessageAccessOp(session : pQSession; access : ShortString; maxbytes : LONGINT) : LONGINT;
 begin
     QSetMessageAccessOp := QSetMessageAccessOp(session,pas2c(access),maxBytes);
 end;
 
-FUNCTION QMessageOp(session : pQSession; hosts : string; buffer : POINTER; len : ULONG) : LONGINT;
+FUNCTION QMessageOp(session : pQSession; hosts : ShortString; buffer : POINTER; len : ULONG) : LONGINT;
 begin
     QMessageOp := QMessageOp(session,pas2c(hosts),buffer,len);
 end;
 
-FUNCTION QKillClientsOp(session : pQSession; hosts : string) : LONGINT;
+FUNCTION QKillClientsOp(session : pQSession; hosts : ShortString) : LONGINT;
 begin
     QKillClientsOp := QKillClientsOp(session,pas2c(hosts));
 end;
 
-FUNCTION QSetParameterOp(session : pQSession; paramName : string; newValue : string) : LONGINT;
+FUNCTION QSetParameterOp(session : pQSession; paramName : ShortString; newValue : ShortString) : LONGINT;
 begin
     QSetParameterOp := QSetParameterOp(session,pas2c(paramName),pas2c(newValue));
 end;
 
-FUNCTION QGetParameterOp(session : pQSession; paramName : string) : LONGINT;
+FUNCTION QGetParameterOp(session : pQSession; paramName : ShortString) : LONGINT;
 begin
     QGetParameterOp := QGetParameterOp(session,pas2c(paramName));
 end;
 
-FUNCTION QSysMessageOp(session : pQSession; hosts : string; message : string) : LONGINT;
+FUNCTION QSysMessageOp(session : pQSession; hosts : ShortString; message : ShortString) : LONGINT;
 begin
     QSysMessageOp := QSysMessageOp(session,pas2c(hosts),pas2c(message));
 end;
 
-FUNCTION QGetAndSubscribeOp(session : pQSession; path : string; maxBytes : LONGINT) : LONGINT;
+FUNCTION QGetAndSubscribeOp(session : pQSession; path : ShortString; maxBytes : LONGINT) : LONGINT;
 begin
     QGetAndSubscribeOp := QGetAndSubscribeOp(session,pas2c(path),maxBytes);
 end;
 
-FUNCTION QNewSocketSession(host : string; port : LONGINT; tags : pTagItem) : pQSession;
+FUNCTION QNewSocketSession(host : ShortString; port : LONGINT; tags : pTagItem) : pQSession;
 begin
     QNewSocketSession := QNewSocketSession(pas2c(host),port,tags);
 end;
 
-FUNCTION QNewSocketSessionAsync(host : string; port : LONGINT; tags : pTagItem) : pQSession;
+FUNCTION QNewSocketSessionAsync(host : ShortString; port : LONGINT; tags : pTagItem) : pQSession;
 begin
     QNewSocketSessionAsync := QNewSocketSessionAsync(pas2c(host),port,tags);
 end;
 
-FUNCTION QSetKeyAccessOp(session : pQSession; path : string; hosts : string) : LONGINT;
+FUNCTION QSetKeyAccessOp(session : pQSession; path : ShortString; hosts : ShortString) : LONGINT;
 begin
     QSetKeyAccessOp := QSetKeyAccessOp(session,pas2c(path),pas2c(hosts));
 end;
 
-FUNCTION QNewSession(host : string; port : LONGINT; name : string; taglist : pTagItem) : pQSession;
+FUNCTION QNewSession(host : ShortString; port : LONGINT; name : ShortString; taglist : pTagItem) : pQSession;
 begin
     QNewSession := QNewSession(pas2c(host),port,pas2c(name),taglist);
 end;
 
-FUNCTION QNewSessionAsync(host : string; port : LONGINT; name : string; taglist : pTagItem) : pQSession;
+FUNCTION QNewSessionAsync(host : ShortString; port : LONGINT; name : ShortString; taglist : pTagItem) : pQSession;
 begin
     QNewSessionAsync := QNewSessionAsync(pas2c(host),port,pas2c(name),taglist);
 end;
 
-FUNCTION QNewHostSession(hostnames : string; port : pLONGINT; names : string; taglist : pTagItem) : pQSession;
+FUNCTION QNewHostSession(hostnames : ShortString; port : pLONGINT; names : ShortString; taglist : pTagItem) : pQSession;
 begin
     QNewHostSession := QNewHostSession(pas2c(hostnames),port,pas2c(names),taglist);
 end;
 
-FUNCTION QNewServerSession(hostNames : string; progNames : string; taglist : pTagItem) : pQSession;
+FUNCTION QNewServerSession(hostNames : ShortString; progNames : ShortString; taglist : pTagItem) : pQSession;
 begin
     QNewServerSession := QNewServerSession(pas2c(hostnames),pas2c(prognames),taglist);
 end;
 
-FUNCTION QNewSocketSessiontags(host : pCHar; port : LONGINT; const argv : array of PtrUInt) : pQSession;
+FUNCTION QNewSocketSessiontags(host : PAnsiChar; port : LONGINT; const argv : array of PtrUInt) : pQSession;
 begin
     QNewSocketSessiontags := QNewSocketSession(host,port,@argv);
 end;
 
-FUNCTION QNewSocketSessionAsyncTags(host : pCHar; port : LONGINT; const argv : array of PtrUInt) : pQSession;
+FUNCTION QNewSocketSessionAsyncTags(host : PAnsiChar; port : LONGINT; const argv : array of PtrUInt) : pQSession;
 begin
     QNewSocketSessionAsyncTags := QNewSocketSessionAsync(host,port,@argv);
 end;
@@ -422,53 +422,53 @@ begin
     QNewSocketServerSessionTags := QNewSocketServerSession(port,@argv);
 end;
 
-FUNCTION QNewSessionTags(host : pCHar; port : LONGINT; name : pCHar; const argv : array of PtrUInt) : pQSession;
+FUNCTION QNewSessionTags(host : PAnsiChar; port : LONGINT; name : PAnsiChar; const argv : array of PtrUInt) : pQSession;
 begin
     QNewSessionTags := QNewSession(host,port,name,@argv);
 end;
 
-FUNCTION QNewSessionAsyncTags(host : pCHar; port : LONGINT; name : pCHar; const argv : array of PtrUInt) : pQSession;
+FUNCTION QNewSessionAsyncTags(host : PAnsiChar; port : LONGINT; name : PAnsiChar; const argv : array of PtrUInt) : pQSession;
 begin
     QNewSessionAsyncTags := QNewSessionAsync(host,port,name,@argv);
 end;
 
-FUNCTION QNewHostSessionTags(hostnames : pCHar; port : pLONGINT; names : pCHar; const argv : array of PtrUInt) : pQSession;
+FUNCTION QNewHostSessionTags(hostnames : PAnsiChar; port : pLONGINT; names : PAnsiChar; const argv : array of PtrUInt) : pQSession;
 begin
     QNewHostSessionTags := QNewHostSession(hostnames,port,names,@argv);
 end;
 
-FUNCTION QNewServerSessionTags(hostNames : pCHar; progNames : pCHar; const argv : array of PtrUInt) : pQSession;
+FUNCTION QNewServerSessionTags(hostNames : PAnsiChar; progNames : PAnsiChar; const argv : array of PtrUInt) : pQSession;
 begin
     QNewServerSessionTags := QNewServerSession(hostnames,prognames,@argv);
 end;
 
 
-FUNCTION QNewSocketSessionTags(host : string; port : LONGINT; const argv : array of PtrUInt) : pQSession;
+FUNCTION QNewSocketSessionTags(host : ShortString; port : LONGINT; const argv : array of PtrUInt) : pQSession;
 begin
     QNewSocketSessionTags := QNewSocketSession(host,port,@argv);
 end;
 
-FUNCTION QNewSocketSessionAsyncTags(host : string; port : LONGINT; const argv : array of PtrUInt) : pQSession;
+FUNCTION QNewSocketSessionAsyncTags(host : ShortString; port : LONGINT; const argv : array of PtrUInt) : pQSession;
 begin
     QNewSocketSessionAsyncTags := QNewSocketSessionAsync(host,port,@argv);
 end;
 
-FUNCTION QNewSessionTags(host : string; port : LONGINT; name : string; const argv : array of PtrUInt) : pQSession;
+FUNCTION QNewSessionTags(host : ShortString; port : LONGINT; name : ShortString; const argv : array of PtrUInt) : pQSession;
 begin
     QNewSessionTags := QNewSession(host,port,name,@argv);
 end;
 
-FUNCTION QNewSessionAsyncTags(host : string; port : LONGINT; name : string; const argv : array of PtrUInt) : pQSession;
+FUNCTION QNewSessionAsyncTags(host : ShortString; port : LONGINT; name : ShortString; const argv : array of PtrUInt) : pQSession;
 begin
     QNewSessionAsyncTags := QNewSessionAsync(host,port,name,@argv);
 end;
 
-FUNCTION QNewHostSessionTags(hostnames : string; port : pLONGINT; names : string; const argv : array of PtrUInt) : pQSession;
+FUNCTION QNewHostSessionTags(hostnames : ShortString; port : pLONGINT; names : ShortString; const argv : array of PtrUInt) : pQSession;
 begin
     QNewHostSessionTags := QNewHostSession(hostnames,port,names,@argv);
 end;
 
-FUNCTION QNewServerSessionTags(hostNames : string; progNames : string; const argv : array of PtrUInt) : pQSession;
+FUNCTION QNewServerSessionTags(hostNames : ShortString; progNames : ShortString; const argv : array of PtrUInt) : pQSession;
 begin
     QNewServerSessionTags := QNewServerSession(hostnames,prognames,@argv);
 end;

+ 2 - 2
packages/amunits/src/otherlibs/cybergraphics.pas

@@ -36,7 +36,7 @@ USES Exec,agraphics,utility;
 VAR CyberGfxBase : pLibrary = nil;
 
 const
-    CYBERGRAPHICSNAME : PChar = 'cybergraphics.library';
+    CYBERGRAPHICSNAME : PAnsiChar = 'cybergraphics.library';
 
 {
         $VER: cybergraphics.h 41.18 (21.02.1998)
@@ -58,7 +58,7 @@ const
      PCyberModeNode = ^tCyberModeNode;
      tCyberModeNode = record
           Node : tNode;
-          ModeText : array[0..(DISPLAYNAMELEN)-1] of char; { name for this mode  }
+          ModeText : array[0..(DISPLAYNAMELEN)-1] of AnsiChar; { name for this mode  }
           DisplayID : ULONG;                               { display id associated with the node  }
           Width : UWORD;                                   { visible width  }
           Height : UWORD;                                  { visible height  }

+ 11 - 11
packages/amunits/src/otherlibs/gtlayout.pas

@@ -52,7 +52,7 @@ USES Exec,intuition,utility, gadtools,agraphics;
 
   const
 
-     GTLAYOUTNAME : PCHar = 'gtlayout.library';
+     GTLAYOUTNAME : PAnsiChar = 'gtlayout.library';
 
      HORIZONTAL_KIND = 45;
      VERTICAL_KIND = 46;
@@ -556,7 +556,7 @@ const
 
 VAR GTLayoutBase : pLibrary = nil;
 
-PROCEDURE LT_LevelWidth(par1 : pLayoutHandle location 'a0'; par2 : pCHAR location 'a1'; par3 : POINTER location 'a2'; par4 : LONGINT location 'd0'; par5 : LONGINT location 'd1'; par6 : pLONGINT location 'a3'; par7 : pLONGINT location 'a5'; last : LONGINT location 'd2'); syscall GTLayoutBase 30;
+PROCEDURE LT_LevelWidth(par1 : pLayoutHandle location 'a0'; par2 : PAnsiChar location 'a1'; par3 : POINTER location 'a2'; par4 : LONGINT location 'd0'; par5 : LONGINT location 'd1'; par6 : pLONGINT location 'a3'; par7 : pLONGINT location 'a5'; last : LONGINT location 'd2'); syscall GTLayoutBase 30;
 PROCEDURE LT_DeleteHandle(last : pLayoutHandle location 'a0'); syscall GTLayoutBase 36;
 FUNCTION LT_CreateHandle(par1 : pScreen location 'a0'; last : pTextAttr location 'a1') : pLayoutHandle; syscall GTLayoutBase 42;
 FUNCTION LT_CreateHandleTagList(par1 : pScreen location 'a0'; tags : pTagItem location 'a1') : pLayoutHandle; syscall GTLayoutBase 48;
@@ -566,13 +566,13 @@ PROCEDURE LT_BeginRefresh(last : pLayoutHandle location 'a0'); syscall GTLayoutB
 PROCEDURE LT_EndRefresh(par1 : pLayoutHandle location 'a0'; last : LONGINT location 'd0'); syscall GTLayoutBase 72;
 FUNCTION LT_GetAttributesA(par1 : pLayoutHandle location 'a0'; par2 : LONGINT location 'd0'; tags : pTagItem location 'a1') : LONGINT; syscall GTLayoutBase 78;
 PROCEDURE LT_SetAttributesA(par1 : pLayoutHandle location 'a0'; par2 : LONGINT location 'd0'; tags : pTagItem location 'a1'); syscall GTLayoutBase 84;
-PROCEDURE LT_AddA(par1 : pLayoutHandle location 'a0'; par2 : LONGINT location 'd0'; par3 : pCHAR location 'd1'; par4 : LONGINT location 'd2'; tags : pTagItem location 'a1'); syscall GTLayoutBase 90;
+PROCEDURE LT_AddA(par1 : pLayoutHandle location 'a0'; par2 : LONGINT location 'd0'; par3 : PAnsiChar location 'd1'; par4 : LONGINT location 'd2'; tags : pTagItem location 'a1'); syscall GTLayoutBase 90;
 PROCEDURE LT_NewA(par1 : pLayoutHandle location 'a0'; tags : pTagItem location 'a1'); syscall GTLayoutBase 96;
 PROCEDURE LT_EndGroup(last : pLayoutHandle location 'a0'); syscall GTLayoutBase 102;
-FUNCTION LT_LayoutA(par1 : pLayoutHandle location 'a0'; par2 : pCHAR location 'a1'; par3 : pIBox location 'a2'; par4 : LONGINT location 'd0'; par5 : LONGINT location 'd1'; par6 : ulong location 'd2'; par7 : LONGINT location 'd3'; tags : pTagItem location 'A3') : pWindow; syscall GTLayoutBase 108;
+FUNCTION LT_LayoutA(par1 : pLayoutHandle location 'a0'; par2 : PAnsiChar location 'a1'; par3 : pIBox location 'a2'; par4 : LONGINT location 'd0'; par5 : LONGINT location 'd1'; par6 : ulong location 'd2'; par7 : LONGINT location 'd3'; tags : pTagItem location 'A3') : pWindow; syscall GTLayoutBase 108;
 FUNCTION LT_LayoutMenusA(par1 : pLayoutHandle location 'a0'; par2 : pNewMenu location 'a1'; tags : pTagItem location 'a2') : pMenu; syscall GTLayoutBase 114;
-FUNCTION LT_LabelWidth(par1 : pLayoutHandle location 'a0'; last : pCHAR location 'a1') : LONGINT; syscall GTLayoutBase 138;
-FUNCTION LT_LabelChars(par1 : pLayoutHandle location 'a0'; last : pCHAR location 'a1') : LONGINT; syscall GTLayoutBase 144;
+FUNCTION LT_LabelWidth(par1 : pLayoutHandle location 'a0'; last : PAnsiChar location 'a1') : LONGINT; syscall GTLayoutBase 138;
+FUNCTION LT_LabelChars(par1 : pLayoutHandle location 'a0'; last : PAnsiChar location 'a1') : LONGINT; syscall GTLayoutBase 144;
 PROCEDURE LT_LockWindow(last : pWindow location 'a0'); syscall GTLayoutBase 150;
 PROCEDURE LT_UnlockWindow(last : pWindow location 'a0'); syscall GTLayoutBase 156;
 PROCEDURE LT_DeleteWindowLock(last : pWindow location 'a0'); syscall GTLayoutBase 162;
@@ -591,7 +591,7 @@ FUNCTION LT_NewMenuTagList(tags : pTagItem location 'a0') : pMenu; syscall GTLay
 PROCEDURE LT_MenuControlTagList(par1 : pWindow location 'a0'; par2 : pMenu location 'a1'; tags : pTagItem location 'a2'); syscall GTLayoutBase 240;
 FUNCTION LT_GetMenuItem(par1 : pMenu location 'a0'; last : ulong location 'd0') : pMenuItem; syscall GTLayoutBase 246;
 FUNCTION LT_FindMenuCommand(par1 : pMenu location 'a0'; par2 : ulong location 'd0'; par3 : ulong location 'd1'; last : pGadget location 'a1') : pMenuItem; syscall GTLayoutBase 252;
-PROCEDURE LT_NewLevelWidth(par1 : pLayoutHandle location 'a0'; par2 : pCHAR location 'a1'; par3 : POINTER location 'a2'; par4 : LONGINT location 'd0'; par5 : LONGINT location 'd1'; par6 : pLONGINT location 'a3'; par7 : pLONGINT location 'd3'; last : LONGINT location 'd2'); syscall GTLayoutBase 258;
+PROCEDURE LT_NewLevelWidth(par1 : pLayoutHandle location 'a0'; par2 : PAnsiChar location 'a1'; par3 : POINTER location 'a2'; par4 : LONGINT location 'd0'; par5 : LONGINT location 'd1'; par6 : pLONGINT location 'a3'; par7 : pLONGINT location 'd3'; last : LONGINT location 'd2'); syscall GTLayoutBase 258;
 PROCEDURE LT_Refresh(last : pLayoutHandle location 'a0'); syscall GTLayoutBase 264;
 PROCEDURE LT_CatchUpRefresh(last : pLayoutHandle location 'a0'); syscall GTLayoutBase 270;
 FUNCTION LT_GetWindowUserData(par1 : pWindow location 'a0'; last : POINTER location 'a1') : POINTER; syscall GTLayoutBase 276;
@@ -604,9 +604,9 @@ FUNCTION LT_GetWindowUserData(par1 : pWindow location 'a0'; last : POINTER locat
 FUNCTION LT_CreateHandleTags(screen : pScreen; const tagList : array of PtrUInt) : pLayoutHandle;
 FUNCTION LT_GetAttributes(handle : pLayoutHandle; id : LONGINT; const tagList : array of PtrUInt) : LONGINT;
 PROCEDURE LT_SetAttributes(handle : pLayoutHandle; id : LONGINT; const tagList : array of PtrUInt);
-PROCEDURE LT_Add(handle : pLayoutHandle; _type : LONGINT; _label : pCHAR; id : LONGINT; const tagList : array of PtrUInt);
+PROCEDURE LT_Add(handle : pLayoutHandle; _type : LONGINT; _label : PAnsiChar; id : LONGINT; const tagList : array of PtrUInt);
 PROCEDURE LT_New(handle : pLayoutHandle; const tagList : array of PtrUInt);
-FUNCTION LT_Layout(handle : pLayoutHandle; title : pCHAR; bounds : pIBox; extraWidth : LONGINT; extraHeight : LONGINT; idcmp : longword; align : LONGINT; const tagParams : array of PtrUInt) : pWindow;
+FUNCTION LT_Layout(handle : pLayoutHandle; title : PAnsiChar; bounds : pIBox; extraWidth : LONGINT; extraHeight : LONGINT; idcmp : longword; align : LONGINT; const tagParams : array of PtrUInt) : pWindow;
 FUNCTION LT_LayoutMenus(handle : pLayoutHandle; menuTemplate : pNewMenu; const tagParams : array of PtrUInt) : pMenu;
 FUNCTION LT_Build(handle : pLayoutHandle; const tagParams : array of PtrUInt) : pWindow;
 FUNCTION LT_RebuildTags(handle : pLayoutHandle; clear : LONGINT; const tags : array of PtrUInt) : BOOLEAN;
@@ -636,7 +636,7 @@ begin
     LT_SetAttributesA(handle , id , @tagList);
 end;
 
-PROCEDURE LT_Add(handle : pLayoutHandle; _type : LONGINT; _label : pCHAR; id : LONGINT; const tagList : array of PtrUInt);
+PROCEDURE LT_Add(handle : pLayoutHandle; _type : LONGINT; _label : PAnsiChar; id : LONGINT; const tagList : array of PtrUInt);
 begin
     LT_AddA(handle , _type , _label , id , @tagList);
 end;
@@ -646,7 +646,7 @@ begin
     LT_NewA(handle , @tagList);
 end;
 
-FUNCTION LT_Layout(handle : pLayoutHandle; title : pCHAR; bounds : pIBox; extraWidth : LONGINT; extraHeight : LONGINT; idcmp : longword; align : LONGINT; const tagParams : array of PtrUInt) : pWindow;
+FUNCTION LT_Layout(handle : pLayoutHandle; title : PAnsiChar; bounds : pIBox; extraWidth : LONGINT; extraHeight : LONGINT; idcmp : longword; align : LONGINT; const tagParams : array of PtrUInt) : pWindow;
 begin
     LT_Layout := LT_LayoutA(handle , title , bounds , extraWidth , extraHeight , idcmp , align , @tagParams);
 end;

+ 13 - 13
packages/amunits/src/otherlibs/guigfx.pas

@@ -37,7 +37,7 @@ USES Exec,utility,agraphics;
 VAR GuiGFXBase : pLibrary;
 
 const
-    GUIGFXNAME : PChar = 'guigfx.library';
+    GUIGFXNAME : PAnsiChar = 'guigfx.library';
 
 
   {
@@ -158,7 +158,7 @@ FUNCTION ClonePictureA(pic : POINTER location 'a0'; tags : pTagItem location 'a1
 FUNCTION CreateDirectDrawHandleA(drawhandle : POINTER location 'a0'; sw : WORD location 'd0'; sh : WORD location 'd1'; dw : WORD location 'd2'; dh : WORD location 'd3'; tags : pTagItem location 'a1') : POINTER; syscall GuiGFXBase 168;
 FUNCTION CreatePenShareMapA(tags : pTagItem location 'a0') : POINTER; syscall GuiGFXBase 90;
 FUNCTION CreatePictureBitMapA(drawhandle : POINTER location 'a0'; pic : POINTER location 'a1'; tags : pTagItem location 'a2') : pBitMap; syscall GuiGFXBase 132;
-FUNCTION CreatePictureMaskA(pic : POINTER location 'a0'; mask : pCHAR location 'a1'; maskwidth : WORD location 'd0'; tags : pTagItem location 'a2') : BOOLEAN; syscall GuiGFXBase 186;
+FUNCTION CreatePictureMaskA(pic : POINTER location 'a0'; mask : PAnsiChar location 'a1'; maskwidth : WORD location 'd0'; tags : pTagItem location 'a2') : BOOLEAN; syscall GuiGFXBase 186;
 PROCEDURE DeleteDirectDrawHandle(ddh : POINTER location 'a0'); syscall GuiGFXBase 174;
 PROCEDURE DeletePenShareMap(psm : POINTER location 'a0'); syscall GuiGFXBase 96;
 PROCEDURE DeletePicture(pic : POINTER location 'a0'); syscall GuiGFXBase 54;
@@ -166,11 +166,11 @@ FUNCTION DirectDrawTrueColorA(ddh : POINTER location 'a0'; _array : pULONG locat
 FUNCTION DoPictureMethodA(pic : POINTER location 'a0'; method : longword location 'd0'; arguments : pULONG location 'a1') : longword; syscall GuiGFXBase 138;
 FUNCTION DrawPictureA(drawhandle : POINTER location 'a0'; pic : POINTER location 'a1'; x : WORD location 'd0'; y : WORD location 'd1'; tags : pTagItem location 'a2') : BOOLEAN; syscall GuiGFXBase 114;
 FUNCTION GetPictureAttrsA(pic : POINTER location 'a0'; tags : pTagItem location 'a1') : longword; syscall GuiGFXBase 144;
-FUNCTION IsPictureA(filename : pCHAR location 'a0'; tags : pTagItem location 'a1') : BOOLEAN; syscall GuiGFXBase 162;
-FUNCTION LoadPictureA(filename : pCHAR location 'a0'; tags : pTagItem location 'a1') : POINTER; syscall GuiGFXBase 36;
+FUNCTION IsPictureA(filename : PAnsiChar location 'a0'; tags : pTagItem location 'a1') : BOOLEAN; syscall GuiGFXBase 162;
+FUNCTION LoadPictureA(filename : PAnsiChar location 'a0'; tags : pTagItem location 'a1') : POINTER; syscall GuiGFXBase 36;
 FUNCTION LockPictureA(pic : POINTER location 'a0'; mode : longword location 'd0'; args : pULONG location 'a1') : longword; syscall GuiGFXBase 150;
 FUNCTION MakePictureA(_array : POINTER location 'a0'; width : WORD location 'd0'; height : WORD location 'd1'; tags : pTagItem location 'a1') : POINTER; syscall GuiGFXBase 30;
-FUNCTION MapPaletteA(drawhandle : POINTER location 'a0'; palette : POINTER location 'a1'; pentab : pCHAR location 'a2'; tags : pTagItem location 'a3') : BOOLEAN; syscall GuiGFXBase 120;
+FUNCTION MapPaletteA(drawhandle : POINTER location 'a0'; palette : POINTER location 'a1'; pentab : PAnsiChar location 'a2'; tags : pTagItem location 'a3') : BOOLEAN; syscall GuiGFXBase 120;
 FUNCTION MapPenA(drawhandle : POINTER location 'a0'; rgb : longword location 'a1'; tags : pTagItem location 'a2') : LONGINT; syscall GuiGFXBase 126;
 FUNCTION ObtainDrawHandleA(psm : POINTER location 'a0'; a1arg : pRastPort location 'a1'; cm : pColorMap location 'a2'; tags : pTagItem location 'a3') : POINTER; syscall GuiGFXBase 102;
 FUNCTION ReadPictureA(a0arg : pRastPort location 'a0'; colormap : pColorMap location 'a1'; x : WORD location 'd0'; y : WORD location 'd1'; width : WORD location 'd2'; height : WORD location 'd3'; tags : pTagItem location 'a2') : POINTER; syscall GuiGFXBase 42;
@@ -187,16 +187,16 @@ FUNCTION ClonePicture(pic : POINTER; const tags : array of PtrUInt) : POINTER;
 FUNCTION CreateDirectDrawHandle(drawhandle : POINTER; sw : WORD; sh : WORD; dw : WORD; dh : WORD; const tags : array of PtrUInt) : POINTER;
 FUNCTION CreatePenShareMap(const tags : array of PtrUInt) : POINTER;
 FUNCTION CreatePictureBitMap(drawhandle : POINTER; pic : POINTER; const tags : array of PtrUInt) : pBitMap;
-FUNCTION CreatePictureMask(pic : POINTER; mask : pCHAR; maskwidth : WORD; const tags : array of PtrUInt) : BOOLEAN;
+FUNCTION CreatePictureMask(pic : POINTER; mask : PAnsiChar; maskwidth : WORD; const tags : array of PtrUInt) : BOOLEAN;
 FUNCTION DirectDrawTrueColor(ddh : POINTER; _array : pULONG; x : WORD; y : WORD; const tags : array of PtrUInt) : BOOLEAN;
 FUNCTION DoPictureMethod(pic : POINTER; method : longword; const arguments : array of PtrUInt) : longword;
 FUNCTION DrawPicture(drawhandle : POINTER; pic : POINTER; x : WORD; y : WORD; const tags : array of PtrUInt) : BOOLEAN;
 FUNCTION GetPictureAttrs(pic : POINTER; const tags : array of PtrUInt) : longword;
-FUNCTION IsPicture(filename : pCHAR; const tags : array of PtrUInt) : BOOLEAN;
-FUNCTION LoadPicture(filename : pCHAR; const tags : array of PtrUInt) : POINTER;
+FUNCTION IsPicture(filename : PAnsiChar; const tags : array of PtrUInt) : BOOLEAN;
+FUNCTION LoadPicture(filename : PAnsiChar; const tags : array of PtrUInt) : POINTER;
 FUNCTION LockPicture(pic : POINTER; mode : longword; const args : array of PtrUInt) : longword;
 FUNCTION MakePicture(_array : POINTER; width : WORD; height : WORD; const tags : array of PtrUInt) : POINTER;
-FUNCTION MapPalette(drawhandle : POINTER; palette : POINTER; pentab : pCHAR; const tags : array of PtrUInt) : BOOLEAN;
+FUNCTION MapPalette(drawhandle : POINTER; palette : POINTER; pentab : PAnsiChar; const tags : array of PtrUInt) : BOOLEAN;
 FUNCTION MapPen(drawhandle : POINTER; rgb : longword; const tags : array of PtrUInt) : LONGINT;
 FUNCTION ObtainDrawHandle(psm : POINTER; a1arg : pRastPort; cm : pColorMap; const tags : array of PtrUInt) : POINTER;
 FUNCTION ReadPicture(a0arg : pRastPort; colormap : pColorMap; x : WORD; y : WORD; width : WORD; height : WORD; const tags : array of PtrUInt) : POINTER;
@@ -241,7 +241,7 @@ begin
     CreatePictureBitMap := CreatePictureBitMapA(drawhandle , pic , @tags);
 end;
 
-FUNCTION CreatePictureMask(pic : POINTER; mask : pCHAR; maskwidth : WORD; const tags : array of PtrUInt) : BOOLEAN;
+FUNCTION CreatePictureMask(pic : POINTER; mask : PAnsiChar; maskwidth : WORD; const tags : array of PtrUInt) : BOOLEAN;
 begin
     CreatePictureMask := CreatePictureMaskA(pic , mask , maskwidth , @tags);
 end;
@@ -266,12 +266,12 @@ begin
     GetPictureAttrs := GetPictureAttrsA(pic , @tags);
 end;
 
-FUNCTION IsPicture(filename : pCHAR; const tags : array of PtrUInt) : BOOLEAN;
+FUNCTION IsPicture(filename : PAnsiChar; const tags : array of PtrUInt) : BOOLEAN;
 begin
     IsPicture := IsPictureA(filename , @tags);
 end;
 
-FUNCTION LoadPicture(filename : pCHAR; const tags : array of PtrUInt) : POINTER;
+FUNCTION LoadPicture(filename : PAnsiChar; const tags : array of PtrUInt) : POINTER;
 begin
     LoadPicture := LoadPictureA(filename , @tags);
 end;
@@ -286,7 +286,7 @@ begin
     MakePicture := MakePictureA(_array , width , height , @tags);
 end;
 
-FUNCTION MapPalette(drawhandle : POINTER; palette : POINTER; pentab : pCHAR; const tags : array of PtrUInt) : BOOLEAN;
+FUNCTION MapPalette(drawhandle : POINTER; palette : POINTER; pentab : PAnsiChar; const tags : array of PtrUInt) : BOOLEAN;
 begin
     MapPalette := MapPaletteA(drawhandle , palette , pentab , @tags);
 end;

+ 25 - 25
packages/amunits/src/otherlibs/identify.pas

@@ -56,7 +56,7 @@ CONST  _IDTAGS      = $CD450000;
 { Generic library informations }
 
 CONST  IDENTIFYVERSION = 13;
-       IDENTIFYNAME    : PChar = 'identify.library';
+       IDENTIFYNAME    : PAnsiChar = 'identify.library';
 
 TYPE   pIdentifyBase = ^tIdentifyBase;
        TIdentifyBase  = Record
@@ -406,13 +406,13 @@ CONST  IDENTIFYBUFLEN = 50;  { default buffer length }
 VAR IdentifyBase : pLibrary = nil;
 
 FUNCTION IdExpansion(TagList : pTagItem location 'a0') : LONGINT; syscall IdentifyBase 30;
-FUNCTION IdHardware(Type_ : Ulong location 'd0'; TagList : pTagItem location 'a0') : pCHAR; syscall IdentifyBase 36;
+FUNCTION IdHardware(Type_ : Ulong location 'd0'; TagList : pTagItem location 'a0') : PAnsiChar; syscall IdentifyBase 36;
 FUNCTION IdAlert(ID : Ulong location 'd0'; TagList : pTagItem location 'a0') : LONGINT; syscall IdentifyBase 42;
-FUNCTION IdFunction(LibName : pCHAR location 'a0'; Offset : LONGINT location 'd0'; TagList : pTagItem location 'a1') : LONGINT; syscall IdentifyBase 48;
+FUNCTION IdFunction(LibName : PAnsiChar location 'a0'; Offset : LONGINT location 'd0'; TagList : pTagItem location 'a1') : LONGINT; syscall IdentifyBase 48;
 FUNCTION IdHardwareNum(Type_ : Ulong location 'd0'; TagList : pTagItem location 'a0') : Ulong; syscall IdentifyBase 54;
 PROCEDURE IdHardwareUpdate; syscall IdentifyBase 60;
-FUNCTION IdFormatString(String_ : pCHAR location 'a0'; Buffer : pCHAR location 'a1'; Length : Ulong location 'd0'; Tags : pTagItem location 'a2') : Ulong; syscall IdentifyBase 66;
-FUNCTION IdEstimateFormatSize(String_ : pCHAR location 'a0'; Tags : pTagItem location 'a1') : Ulong; syscall IdentifyBase 72;
+FUNCTION IdFormatString(String_ : PAnsiChar location 'a0'; Buffer : PAnsiChar location 'a1'; Length : Ulong location 'd0'; Tags : pTagItem location 'a2') : Ulong; syscall IdentifyBase 66;
+FUNCTION IdEstimateFormatSize(String_ : PAnsiChar location 'a0'; Tags : pTagItem location 'a1') : Ulong; syscall IdentifyBase 72;
 
 {
      This is functions and procedures with array of PtrUInt.
@@ -420,23 +420,23 @@ FUNCTION IdEstimateFormatSize(String_ : pCHAR location 'a0'; Tags : pTagItem loc
 }
 
 FUNCTION IdExpansionTags(const TagList : array of PtrUInt) : LONGINT;
-FUNCTION IdHardwareTags(Type_ : longword; const TagList : array of PtrUInt) : pCHAR;
+FUNCTION IdHardwareTags(Type_ : longword; const TagList : array of PtrUInt) : PAnsiChar;
 FUNCTION IdAlertTags(ID : longword; const TagList : array of PtrUInt) : LONGINT;
-FUNCTION IdFunctionTags(LibName : pCHAR; Offset : LONGINT; const TagList : array of PtrUInt) : LONGINT;
+FUNCTION IdFunctionTags(LibName : PAnsiChar; Offset : LONGINT; const TagList : array of PtrUInt) : LONGINT;
 FUNCTION IdHardwareNumTags(Type_ : longword; const TagList : array of PtrUInt) : longword;
-FUNCTION IdFormatStringTags(String_ : pCHAR; Buffer : pCHAR; Length : longword; const Tags : array of PtrUInt) : longword;
-FUNCTION IdEstimateFormatSizeTags(String_ : pCHAR; const Tags : array of PtrUInt) : longword;
+FUNCTION IdFormatStringTags(String_ : PAnsiChar; Buffer : PAnsiChar; Length : longword; const Tags : array of PtrUInt) : longword;
+FUNCTION IdEstimateFormatSizeTags(String_ : PAnsiChar; const Tags : array of PtrUInt) : longword;
 
 {
      Overlay functions
 }
 
-FUNCTION IdFunction(LibName : string; Offset : LONGINT; TagList : pTagItem) : LONGINT;
-FUNCTION IdFormatString(String_ : string; Buffer : pCHAR; Length : Ulong; Tags : pTagItem) : Ulong;
-FUNCTION IdEstimateFormatSize(String_ : string; Tags : pTagItem) : Ulong;
-FUNCTION IdFunctionTags(LibName : string; Offset : LONGINT; const TagList : array of PtrUInt) : LONGINT;
-FUNCTION IdFormatStringTags(String_ : string; Buffer : pCHAR; Length : longword; const Tags : array of PtrUInt) : longword;
-FUNCTION IdEstimateFormatSizeTags(String_ : string; const Tags : array of PtrUInt) : longword;
+FUNCTION IdFunction(LibName : ShortString; Offset : LONGINT; TagList : pTagItem) : LONGINT;
+FUNCTION IdFormatString(String_ : ShortString; Buffer : PAnsiChar; Length : Ulong; Tags : pTagItem) : Ulong;
+FUNCTION IdEstimateFormatSize(String_ : ShortString; Tags : pTagItem) : Ulong;
+FUNCTION IdFunctionTags(LibName : ShortString; Offset : LONGINT; const TagList : array of PtrUInt) : LONGINT;
+FUNCTION IdFormatStringTags(String_ : ShortString; Buffer : PAnsiChar; Length : longword; const Tags : array of PtrUInt) : longword;
+FUNCTION IdEstimateFormatSizeTags(String_ : ShortString; const Tags : array of PtrUInt) : longword;
 
 IMPLEMENTATION
 
@@ -451,7 +451,7 @@ begin
     IdExpansionTags := IdExpansion(@TagList);
 end;
 
-FUNCTION IdHardwareTags(Type_ : longword; const TagList : array of PtrUInt) : pCHAR;
+FUNCTION IdHardwareTags(Type_ : longword; const TagList : array of PtrUInt) : PAnsiChar;
 begin
     IdHardwareTags := IdHardware(Type_ , @TagList);
 end;
@@ -461,7 +461,7 @@ begin
     IdAlertTags := IdAlert(ID , @TagList);
 end;
 
-FUNCTION IdFunctionTags(LibName : pCHAR; Offset : LONGINT; const TagList : array of PtrUInt) : LONGINT;
+FUNCTION IdFunctionTags(LibName : PAnsiChar; Offset : LONGINT; const TagList : array of PtrUInt) : LONGINT;
 begin
     IdFunctionTags := IdFunction(LibName , Offset , @TagList);
 end;
@@ -471,12 +471,12 @@ begin
     IdHardwareNumTags := IdHardwareNum(Type_ , @TagList);
 end;
 
-FUNCTION IdFormatStringTags(String_ : pCHAR; Buffer : pCHAR; Length : longword; const Tags : array of PtrUInt) : longword;
+FUNCTION IdFormatStringTags(String_ : PAnsiChar; Buffer : PAnsiChar; Length : longword; const Tags : array of PtrUInt) : longword;
 begin
     IdFormatStringTags := IdFormatString(String_ , Buffer , Length , @Tags);
 end;
 
-FUNCTION IdEstimateFormatSizeTags(String_ : pCHAR; const Tags : array of PtrUInt) : longword;
+FUNCTION IdEstimateFormatSizeTags(String_ : PAnsiChar; const Tags : array of PtrUInt) : longword;
 begin
     IdEstimateFormatSizeTags := IdEstimateFormatSize(String_ , @Tags);
 end;
@@ -485,32 +485,32 @@ end;
      Overlay functions
 }
 
-FUNCTION IdFunction(LibName : string; Offset : LONGINT; TagList : pTagItem) : LONGINT;
+FUNCTION IdFunction(LibName : ShortString; Offset : LONGINT; TagList : pTagItem) : LONGINT;
 begin
     IdFunction := IdFunction(pas2c(LibName),Offset,TagList);
 end;
 
-FUNCTION IdFormatString(String_ : string; Buffer : pCHAR; Length : Ulong; Tags : pTagItem) : Ulong;
+FUNCTION IdFormatString(String_ : ShortString; Buffer : PAnsiChar; Length : Ulong; Tags : pTagItem) : Ulong;
 begin
     IdFormatString := IdFormatString(pas2c(String_),Buffer,Length,Tags);
 end;
 
-FUNCTION IdEstimateFormatSize(String_ : string; Tags : pTagItem) : Ulong;
+FUNCTION IdEstimateFormatSize(String_ : ShortString; Tags : pTagItem) : Ulong;
 begin
     IdEstimateFormatSize := IdEstimateFormatSize(pas2c(String_),Tags);
 end;
 
-FUNCTION IdFunctionTags(LibName : string; Offset : LONGINT; const TagList : array of PtrUInt) : LONGINT;
+FUNCTION IdFunctionTags(LibName : ShortString; Offset : LONGINT; const TagList : array of PtrUInt) : LONGINT;
 begin
     IdFunctionTags := IdFunction(pas2c(LibName),Offset,@TagList);
 end;
 
-FUNCTION IdFormatStringTags(String_ : string; Buffer : pCHAR; Length : longword; const Tags : array of PtrUInt) : longword;
+FUNCTION IdFormatStringTags(String_ : ShortString; Buffer : PAnsiChar; Length : longword; const Tags : array of PtrUInt) : longword;
 begin
     IdFormatStringTags := IdFormatString(pas2c(String_),Buffer,Length,@Tags);
 end;
 
-FUNCTION IdEstimateFormatSizeTags(String_ : string; const Tags : array of PtrUInt) : longword;
+FUNCTION IdEstimateFormatSizeTags(String_ : ShortString; const Tags : array of PtrUInt) : longword;
 begin
     IdEstimateFormatSizeTags := IdEstimateFormatSize(pas2c(String_),@Tags);
 end;

+ 2 - 2
packages/amunits/src/otherlibs/lucyplay.pas

@@ -36,7 +36,7 @@ USES Exec;
 VAR LucyPlayBase : pLibrary = nil;
 
 const
-    LUCYPLAYNAME : PChar = 'lucyplay.library';
+    LUCYPLAYNAME : PAnsiChar = 'lucyplay.library';
 
   type
 
@@ -93,7 +93,7 @@ const
 PROCEDURE lucAudioFree(smp : pLucyPlaySample location 'a0'); syscall LucyPlayBase 48;
 FUNCTION lucAudioInit : LONGINT; syscall LucyPlayBase 30;
 PROCEDURE lucAudioKill; syscall LucyPlayBase 36;
-FUNCTION lucAudioLoad(fname : pCHAR location 'a0') : pLucyPlaySample; syscall LucyPlayBase 42;
+FUNCTION lucAudioLoad(fname : PAnsiChar location 'a0') : pLucyPlaySample; syscall LucyPlayBase 42;
 PROCEDURE lucAudioPlay(smp : pLucyPlaySample location 'a0'); syscall LucyPlayBase 54;
 PROCEDURE lucAudioStop; syscall LucyPlayBase 60;
 PROCEDURE lucAudioWait; syscall LucyPlayBase 66;

+ 101 - 101
packages/amunits/src/otherlibs/mui.pas

@@ -146,7 +146,7 @@ uses exec, intuition,utility,agraphics,iffparse;
 
 
   const
-     MUIMASTER_NAME  : PChar = 'muimaster.library';
+     MUIMASTER_NAME  : PAnsiChar = 'muimaster.library';
      MUIMASTER_VMIN = 11;
      MUIMASTER_VLATEST = 19;
   {
@@ -169,7 +169,7 @@ uses exec, intuition,utility,agraphics,iffparse;
      plongword = ^longword;
 
      tMUI_PenSpec = record
-          buf : array[0..31] of char;
+          buf : array[0..31] of AnsiChar;
        end;
      pMUI_PenSpec = ^tMUI_PenSpec;
 
@@ -185,15 +185,15 @@ uses exec, intuition,utility,agraphics,iffparse;
    }
 
   const
-     PSD_INITIAL_NAME : PChar = '(unnamed)';
-     PSD_INITIAL_TITLE : PChar = 'MUI Public Screen';
+     PSD_INITIAL_NAME : PAnsiChar = '(unnamed)';
+     PSD_INITIAL_TITLE : PAnsiChar = 'MUI Public Screen';
 
 
 
   const
-     PSD_NAME_FRONTMOST : PChar = '«Frontmost»';
-     PSD_FILENAME_SAVE : PChar = 'envarc:mui/PublicScreens.iff';
-     PSD_FILENAME_USE : PChar = 'env:mui/PublicScreens.iff';
+     PSD_NAME_FRONTMOST : PAnsiChar = '«Frontmost»';
+     PSD_FILENAME_SAVE : PAnsiChar = 'envarc:mui/PublicScreens.iff';
+     PSD_FILENAME_USE : PAnsiChar = 'env:mui/PublicScreens.iff';
      PSD_MAXLEN_NAME = 32;
      PSD_MAXLEN_TITLE = 128;
      PSD_MAXLEN_FONT = 48;
@@ -215,10 +215,10 @@ uses exec, intuition,utility,agraphics,iffparse;
 
      tMUI_PubScreenDesc = record
           Version : LONG;
-          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 : ULONG;
           DisplayWidth : WORD;
           DisplayHeight : WORD;
@@ -302,8 +302,8 @@ uses exec, intuition,utility,agraphics,iffparse;
 
   type
      tMUI_Command = record
-          mc_Name : Pchar;
-          mc_Template : Pchar;
+          mc_Name : PAnsiChar;
+          mc_Template : PAnsiChar;
           mc_Parameters : LONG;
           mc_Hook : PHook;
           mc_Reserved : array[0..4] of LONG;
@@ -313,7 +313,7 @@ uses exec, intuition,utility,agraphics,iffparse;
 
 
     const
-     {  MC_TEMPLATE_ID : PCHar = not(0); }
+     {  MC_TEMPLATE_ID : PAnsiChar = not(0); }
        MC_TEMPLATE_ID  = -1;
        MUI_RXERR_BADDEFINITION = -(1);
        MUI_RXERR_OUTOFMEMORY = -(2);
@@ -656,7 +656,7 @@ uses exec, intuition,utility,agraphics,iffparse;
 
 
     const
-       MUIC_Notify : PChar = 'Notify.mui';
+       MUIC_Notify : PAnsiChar = 'Notify.mui';
 
     { Methods  }
     { V4   }
@@ -764,7 +764,7 @@ uses exec, intuition,utility,agraphics,iffparse;
        tMUIP_NoNotifySet = record
             MethodID : ULONG;
             attr : ULONG;
-            format : Pchar;
+            format : PAnsiChar;
             val : ULONG;
          end;
        pMUIP_NoNotifySet = ^tMUIP_NoNotifySet;
@@ -790,7 +790,7 @@ uses exec, intuition,utility,agraphics,iffparse;
        tMUIP_SetAsString = record
             MethodID : ULONG;
             attr : ULONG;
-            format : Pchar;
+            format : PAnsiChar;
             val : ULONG;
          end;
        pMUIP_SetAsString = ^tMUIP_SetAsString;
@@ -820,8 +820,8 @@ uses exec, intuition,utility,agraphics,iffparse;
 
        tMUIP_WriteString = record
             MethodID : ULONG;
-            str : Pchar;
-            memory : Pchar;
+            str : PAnsiChar;
+            memory : PAnsiChar;
          end;
        pMUIP_WriteString = ^tMUIP_WriteString;
 
@@ -854,7 +854,7 @@ uses exec, intuition,utility,agraphics,iffparse;
 
 
     const
-       MUIC_Family : PChar = 'Family.mui';
+       MUIC_Family : PAnsiChar = 'Family.mui';
 
     { Methods  }
     { V8   }
@@ -923,7 +923,7 @@ uses exec, intuition,utility,agraphics,iffparse;
 
 
     const
-       MUIC_Menustrip : PChar = 'Menustrip.mui';
+       MUIC_Menustrip : PAnsiChar = 'Menustrip.mui';
 
     { Methods  }
     { Attributes  }
@@ -937,7 +937,7 @@ uses exec, intuition,utility,agraphics,iffparse;
 
 
     const
-       MUIC_Menu : PChar = 'Menu.mui';
+       MUIC_Menu : PAnsiChar = 'Menu.mui';
 
     { Methods  }
     { Attributes  }
@@ -953,7 +953,7 @@ uses exec, intuition,utility,agraphics,iffparse;
 
 
     const
-       MUIC_Menuitem : PChar = 'Menuitem.mui';
+       MUIC_Menuitem : PAnsiChar = 'Menuitem.mui';
 
     { Methods  }
     { Attributes  }
@@ -984,7 +984,7 @@ uses exec, intuition,utility,agraphics,iffparse;
 
 
     const
-       MUIC_Application : PChar = 'Application.mui';
+       MUIC_Application : PAnsiChar = 'Application.mui';
 
     { Methods  }
     { V14  }
@@ -1130,8 +1130,8 @@ uses exec, intuition,utility,agraphics,iffparse;
        tMUIP_Application_ShowHelp = record
             MethodID : ULONG;
             window : pObject_;
-            name : Pchar;
-            node : Pchar;
+            name : PAnsiChar;
+            node : PAnsiChar;
             line : LONG;
          end;
        pMUIP_Application_ShowHelp = ^tMUIP_Application_ShowHelp;
@@ -1209,7 +1209,7 @@ uses exec, intuition,utility,agraphics,iffparse;
     {                                                                           }
 
     const
-       MUIC_Window : PChar = 'Window.mui';
+       MUIC_Window : PAnsiChar = 'Window.mui';
 
     { V16  }
 
@@ -1437,7 +1437,7 @@ uses exec, intuition,utility,agraphics,iffparse;
 
 
     const
-       MUIC_Aboutmui : PChar = 'Aboutmui.mui';
+       MUIC_Aboutmui : PAnsiChar = 'Aboutmui.mui';
 
     { Methods  }
     { Attributes  }
@@ -1451,7 +1451,7 @@ uses exec, intuition,utility,agraphics,iffparse;
 
 
     const
-       MUIC_Area : PChar = 'Area.mui';
+       MUIC_Area : PAnsiChar = 'Area.mui';
 
     { Methods  }
     { Custom Class  }
@@ -1549,7 +1549,7 @@ uses exec, intuition,utility,agraphics,iffparse;
             MethodID : ULONG;
             x : LONG;
             y : LONG;
-            txt : Pchar;
+            txt : PAnsiChar;
             flags : ULONG;
          end;
        pMUIP_CreateBubble = ^tMUIP_CreateBubble;
@@ -1673,7 +1673,7 @@ uses exec, intuition,utility,agraphics,iffparse;
        MUIA_ContextMenu = $8042b704;
     { V11 ..g Object             }
        MUIA_ContextMenuTrigger = $8042a2c1;
-    { V4  isg char               }
+    { V4  isg AnsiChar               }
        MUIA_ControlChar = $8042120b;
     { V11 isg LONG               }
        MUIA_CycleChain = $80421ce7;
@@ -1786,7 +1786,7 @@ uses exec, intuition,utility,agraphics,iffparse;
 
 
     const
-       MUIC_Rectangle : PChar = 'Rectangle.mui';
+       MUIC_Rectangle : PAnsiChar = 'Rectangle.mui';
 
     { Attributes  }
     { V11 i.g STRPTR             }
@@ -1803,7 +1803,7 @@ uses exec, intuition,utility,agraphics,iffparse;
 
 
     const
-       MUIC_Balance : PChar = 'Balance.mui';
+       MUIC_Balance : PAnsiChar = 'Balance.mui';
 
     {                                                                           }
     {  Image                                                                    }
@@ -1811,7 +1811,7 @@ uses exec, intuition,utility,agraphics,iffparse;
 
 
     const
-       MUIC_Image : PChar = 'Image.mui';
+       MUIC_Image : PAnsiChar = 'Image.mui';
 
     { Attributes  }
     { V4  i.. BOOL               }
@@ -1828,7 +1828,7 @@ uses exec, intuition,utility,agraphics,iffparse;
        MUIA_Image_FreeVert = $8042ea28;
     { V4  i.. struct Image       }
        MUIA_Image_OldImage = $80424f3d;
-    { V4  i.. char               }
+    { V4  i.. AnsiChar               }
        MUIA_Image_Spec = $804233d5;
     { V4  is. LONG               }
        MUIA_Image_State = $8042a3ad;
@@ -1838,7 +1838,7 @@ uses exec, intuition,utility,agraphics,iffparse;
 
 
     const
-       MUIC_Bitmap : PChar = 'Bitmap.mui';
+       MUIC_Bitmap : PAnsiChar = 'Bitmap.mui';
 
     { Attributes  }
     { V8  isg struct BitMap      }
@@ -1867,7 +1867,7 @@ uses exec, intuition,utility,agraphics,iffparse;
 
 
     const
-       MUIC_Bodychunk : PChar = 'Bodychunk.mui';
+       MUIC_Bodychunk : PAnsiChar = 'Bodychunk.mui';
 
     { Attributes  }
     { V8  isg UBYTE              }
@@ -1885,14 +1885,14 @@ uses exec, intuition,utility,agraphics,iffparse;
     {                                                                           }
 
     const
-       MUIC_Text : PChar = 'Text.mui';
+       MUIC_Text : PAnsiChar = 'Text.mui';
 
     { Attributes  }
     { V4  isg STRPTR             }
 
     const
        MUIA_Text_Contents = $8042f8dc;
-    { V4  i.. char               }
+    { V4  i.. AnsiChar               }
        MUIA_Text_HiChar = $804218ff;
     { V4  isg STRPTR             }
        MUIA_Text_PreParse = $8042566d;
@@ -1907,7 +1907,7 @@ uses exec, intuition,utility,agraphics,iffparse;
     {                                                                           }
 
     const
-       MUIC_Gadget : PChar = 'Gadget.mui';
+       MUIC_Gadget : PAnsiChar = 'Gadget.mui';
 
     { Attributes  }
     { V11 ..g struct Gadget      }
@@ -1920,7 +1920,7 @@ uses exec, intuition,utility,agraphics,iffparse;
 
 
     const
-       MUIC_String : PChar = 'String.mui';
+       MUIC_String : PAnsiChar = 'String.mui';
 
     { Methods  }
     { Attributes  }
@@ -1963,14 +1963,14 @@ uses exec, intuition,utility,agraphics,iffparse;
 
 
     const
-       MUIC_Boopsi : PChar = 'Boopsi.mui';
+       MUIC_Boopsi : PAnsiChar = 'Boopsi.mui';
 
     { Attributes  }
     { V4  isg struct IClass      }
 
     const
        MUIA_Boopsi_Class = $80426999;
-    { V4  isg char               }
+    { V4  isg AnsiChar               }
        MUIA_Boopsi_ClassID = $8042bfa3;
     { V4  isg ULONG              }
        MUIA_Boopsi_MaxHeight = $8042757f;
@@ -1998,7 +1998,7 @@ uses exec, intuition,utility,agraphics,iffparse;
 
 
     const
-       MUIC_Prop : PChar = 'Prop.mui';
+       MUIC_Prop : PAnsiChar = 'Prop.mui';
 
     { Methods  }
     { V16  }
@@ -2046,7 +2046,7 @@ uses exec, intuition,utility,agraphics,iffparse;
 
 
     const
-       MUIC_Gauge : PChar = 'Gauge.mui';
+       MUIC_Gauge : PAnsiChar = 'Gauge.mui';
 
     { Attributes  }
     { V4  isg LONG               }
@@ -2067,7 +2067,7 @@ uses exec, intuition,utility,agraphics,iffparse;
 
 
     const
-       MUIC_Scale : PChar = 'Scale.mui';
+       MUIC_Scale : PAnsiChar = 'Scale.mui';
 
     { Attributes  }
     { V4  isg BOOL               }
@@ -2080,7 +2080,7 @@ uses exec, intuition,utility,agraphics,iffparse;
 
 
     const
-       MUIC_Colorfield : PChar = 'Colorfield.mui';
+       MUIC_Colorfield : PAnsiChar = 'Colorfield.mui';
 
     { Attributes  }
     { V4  isg ULONG              }
@@ -2101,7 +2101,7 @@ uses exec, intuition,utility,agraphics,iffparse;
 
 
     const
-       MUIC_List : PChar = 'List.mui';
+       MUIC_List : PAnsiChar = 'List.mui';
 
     { Methods  }
     { V4   }
@@ -2284,7 +2284,7 @@ uses exec, intuition,utility,agraphics,iffparse;
        MUIA_List_ShowDropMarks = $8042c6f3;
     { V4  i.. APTR               }
        MUIA_List_SourceArray = $8042c0a0;
-    { V6  isg char               }
+    { V6  isg AnsiChar               }
        MUIA_List_Title = $80423e66;
     { V4  ..g LONG               }
        MUIA_List_Visible = $8042191f;
@@ -2307,7 +2307,7 @@ uses exec, intuition,utility,agraphics,iffparse;
 
 
     const
-       MUIC_Floattext : PChar = 'Floattext.mui';
+       MUIC_Floattext : PAnsiChar = 'Floattext.mui';
 
     { Attributes  }
     { V4  isg BOOL               }
@@ -2326,14 +2326,14 @@ uses exec, intuition,utility,agraphics,iffparse;
 
 
     const
-       MUIC_Volumelist : PChar = 'Volumelist.mui';
+       MUIC_Volumelist : PAnsiChar = 'Volumelist.mui';
 
     {                                                                           }
     {  Scrmodelist                                                              }
     {                                                                           }
 
     const
-       MUIC_Scrmodelist : PChar = 'Scrmodelist.mui';
+       MUIC_Scrmodelist : PAnsiChar = 'Scrmodelist.mui';
 
     { Attributes  }
     {                                                                           }
@@ -2342,7 +2342,7 @@ uses exec, intuition,utility,agraphics,iffparse;
 
 
     const
-       MUIC_Dirlist : PChar = 'Dirlist.mui';
+       MUIC_Dirlist : PAnsiChar = 'Dirlist.mui';
 
     { Methods  }
     { V4   }
@@ -2406,7 +2406,7 @@ uses exec, intuition,utility,agraphics,iffparse;
     {                                                                           }
 
     const
-       MUIC_Numeric : PChar = 'Numeric.mui';
+       MUIC_Numeric : PAnsiChar = 'Numeric.mui';
 
     { Methods  }
     { V11  }
@@ -2490,7 +2490,7 @@ uses exec, intuition,utility,agraphics,iffparse;
 
 
     const
-       MUIC_Knob : PChar = 'Knob.mui';
+       MUIC_Knob : PAnsiChar = 'Knob.mui';
 
     {                                                                           }
     {  Levelmeter                                                               }
@@ -2498,7 +2498,7 @@ uses exec, intuition,utility,agraphics,iffparse;
 
 
     const
-       MUIC_Levelmeter : PChar = 'Levelmeter.mui';
+       MUIC_Levelmeter : PAnsiChar = 'Levelmeter.mui';
 
     { Attributes  }
     { V11 isg STRPTR             }
@@ -2511,7 +2511,7 @@ uses exec, intuition,utility,agraphics,iffparse;
 
 
     const
-       MUIC_Numericbutton : PChar = 'Numericbutton.mui';
+       MUIC_Numericbutton : PAnsiChar = 'Numericbutton.mui';
 
     {                                                                           }
     {  Slider                                                                   }
@@ -2519,7 +2519,7 @@ uses exec, intuition,utility,agraphics,iffparse;
 
 
     const
-       MUIC_Slider : PChar = 'Slider.mui';
+       MUIC_Slider : PAnsiChar = 'Slider.mui';
 
     { Attributes  }
     { V11 isg BOOL               }
@@ -2538,7 +2538,7 @@ uses exec, intuition,utility,agraphics,iffparse;
 
 
     const
-       MUIC_Framedisplay : PChar = 'Framedisplay.mui';
+       MUIC_Framedisplay : PAnsiChar = 'Framedisplay.mui';
 
     { Attributes  }
     {                                                                           }
@@ -2547,14 +2547,14 @@ uses exec, intuition,utility,agraphics,iffparse;
 
 
     const
-       MUIC_Popframe : PChar = 'Popframe.mui';
+       MUIC_Popframe : PAnsiChar = 'Popframe.mui';
 
     {                                                                           }
     {  Imagedisplay                                                             }
     {                                                                           }
 
     const
-       MUIC_Imagedisplay : PChar = 'Imagedisplay.mui';
+       MUIC_Imagedisplay : PAnsiChar = 'Imagedisplay.mui';
 
     { Attributes  }
     {                                                                           }
@@ -2563,7 +2563,7 @@ uses exec, intuition,utility,agraphics,iffparse;
 
 
     const
-       MUIC_Popimage : PChar = 'Popimage.mui';
+       MUIC_Popimage : PAnsiChar = 'Popimage.mui';
 
     {                                                                           }
     {  Pendisplay                                                               }
@@ -2571,7 +2571,7 @@ uses exec, intuition,utility,agraphics,iffparse;
 
 
     const
-       MUIC_Pendisplay : PChar = 'Pendisplay.mui';
+       MUIC_Pendisplay : PAnsiChar = 'Pendisplay.mui';
 
     { Methods  }
     { V13  }
@@ -2618,7 +2618,7 @@ uses exec, intuition,utility,agraphics,iffparse;
 
 
     const
-       MUIC_Poppen : PChar = 'Poppen.mui';
+       MUIC_Poppen : PAnsiChar = 'Poppen.mui';
 
     {                                                                           }
     {  Group                                                                    }
@@ -2626,7 +2626,7 @@ uses exec, intuition,utility,agraphics,iffparse;
 
 
     const
-       MUIC_Group : PChar = 'Group.mui';
+       MUIC_Group : PAnsiChar = 'Group.mui';
 
     { Methods  }
     { V11  }
@@ -2697,14 +2697,14 @@ uses exec, intuition,utility,agraphics,iffparse;
 
 
     const
-       MUIC_Mccprefs : PChar = 'Mccprefs.mui';
+       MUIC_Mccprefs : PAnsiChar = 'Mccprefs.mui';
 
     {                                                                           }
     {  Register                                                                 }
     {                                                                           }
 
     const
-       MUIC_Register : PChar = 'Register.mui';
+       MUIC_Register : PAnsiChar = 'Register.mui';
 
     { Attributes  }
     { V7  i.g BOOL               }
@@ -2719,7 +2719,7 @@ uses exec, intuition,utility,agraphics,iffparse;
 
 
     const
-       MUIC_Penadjust : PChar= 'Penadjust.mui';
+       MUIC_Penadjust : PAnsiChar= 'Penadjust.mui';
 
     { Methods  }
     { Attributes  }
@@ -2733,7 +2733,7 @@ uses exec, intuition,utility,agraphics,iffparse;
 
 
     const
-       MUIC_Settingsgroup : PChar = 'Settingsgroup.mui';
+       MUIC_Settingsgroup : PAnsiChar = 'Settingsgroup.mui';
 
     { Methods  }
     { V11  }
@@ -2762,7 +2762,7 @@ uses exec, intuition,utility,agraphics,iffparse;
     {                                                                           }
 
     const
-       MUIC_Settings : PChar = 'Settings.mui';
+       MUIC_Settings : PAnsiChar = 'Settings.mui';
 
     { Methods  }
     { Attributes  }
@@ -2772,7 +2772,7 @@ uses exec, intuition,utility,agraphics,iffparse;
 
 
     const
-       MUIC_Frameadjust : PChar = 'Frameadjust.mui';
+       MUIC_Frameadjust : PAnsiChar = 'Frameadjust.mui';
 
     { Methods  }
     { Attributes  }
@@ -2782,7 +2782,7 @@ uses exec, intuition,utility,agraphics,iffparse;
 
 
     const
-       MUIC_Imageadjust : PChar = 'Imageadjust.mui';
+       MUIC_Imageadjust : PAnsiChar = 'Imageadjust.mui';
 
     { Methods  }
     { Attributes  }
@@ -2798,7 +2798,7 @@ uses exec, intuition,utility,agraphics,iffparse;
 
 
     const
-       MUIC_Virtgroup : PChar = 'Virtgroup.mui';
+       MUIC_Virtgroup : PAnsiChar = 'Virtgroup.mui';
 
     { Methods  }
     { Attributes  }
@@ -2820,7 +2820,7 @@ uses exec, intuition,utility,agraphics,iffparse;
 
 
     const
-       MUIC_Scrollgroup : PChar = 'Scrollgroup.mui';
+       MUIC_Scrollgroup : PAnsiChar = 'Scrollgroup.mui';
 
     { Methods  }
     { Attributes  }
@@ -2844,7 +2844,7 @@ uses exec, intuition,utility,agraphics,iffparse;
 
 
     const
-       MUIC_Scrollbar : PChar = 'Scrollbar.mui';
+       MUIC_Scrollbar : PAnsiChar = 'Scrollbar.mui';
 
     { Attributes  }
     { V11 i.. LONG               }
@@ -2861,7 +2861,7 @@ uses exec, intuition,utility,agraphics,iffparse;
 
 
     const
-       MUIC_Listview : PChar = 'Listview.mui';
+       MUIC_Listview : PAnsiChar = 'Listview.mui';
 
     { Attributes  }
     { V7  ..g LONG               }
@@ -2900,7 +2900,7 @@ uses exec, intuition,utility,agraphics,iffparse;
 
 
     const
-       MUIC_Radio : PChar = 'Radio.mui';
+       MUIC_Radio : PAnsiChar = 'Radio.mui';
 
     { Attributes  }
     { V4  isg LONG               }
@@ -2915,7 +2915,7 @@ uses exec, intuition,utility,agraphics,iffparse;
 
 
     const
-       MUIC_Cycle : PChar = 'Cycle.mui';
+       MUIC_Cycle : PAnsiChar = 'Cycle.mui';
 
     { Attributes  }
     { V4  isg LONG               }
@@ -2932,7 +2932,7 @@ uses exec, intuition,utility,agraphics,iffparse;
 
 
     const
-       MUIC_Coloradjust : PChar = 'Coloradjust.mui';
+       MUIC_Coloradjust : PAnsiChar = 'Coloradjust.mui';
 
     { Methods  }
     { Attributes  }
@@ -2954,7 +2954,7 @@ uses exec, intuition,utility,agraphics,iffparse;
 
 
     const
-       MUIC_Palette : PChar = 'Palette.mui';
+       MUIC_Palette : PAnsiChar = 'Palette.mui';
 
     { Attributes  }
     { V6  i.g struct MUI_Palette_Entry    }
@@ -2963,7 +2963,7 @@ uses exec, intuition,utility,agraphics,iffparse;
        MUIA_Palette_Entries = $8042a3d8;
     { V6  isg BOOL               }
        MUIA_Palette_Groupable = $80423e67;
-    { V6  isg char               }
+    { V6  isg AnsiChar               }
        MUIA_Palette_Names = $8042c3a2;
     {                                                                           }
     {  Popstring                                                                }
@@ -2971,7 +2971,7 @@ uses exec, intuition,utility,agraphics,iffparse;
 
 
     const
-       MUIC_Popstring : PChar = 'Popstring.mui';
+       MUIC_Popstring : PAnsiChar = 'Popstring.mui';
 
     { Methods  }
     { V7   }
@@ -3012,7 +3012,7 @@ uses exec, intuition,utility,agraphics,iffparse;
 
 
     const
-       MUIC_Popobject : PChar = 'Popobject.mui';
+       MUIC_Popobject : PAnsiChar = 'Popobject.mui';
 
     { Attributes  }
     { V7  isg BOOL               }
@@ -3037,10 +3037,10 @@ uses exec, intuition,utility,agraphics,iffparse;
 
 
     const
-       MUIC_Poplist : PChar = 'Poplist.mui';
+       MUIC_Poplist : PAnsiChar = 'Poplist.mui';
 
     { Attributes  }
-    { V8  i.. char               }
+    { V8  i.. AnsiChar               }
 
     const
        MUIA_Poplist_Array = $8042084c;
@@ -3050,7 +3050,7 @@ uses exec, intuition,utility,agraphics,iffparse;
 
 
     const
-       MUIC_Popscreen : PChar = 'Popscreen.mui';
+       MUIC_Popscreen : PAnsiChar = 'Popscreen.mui';
 
     { Attributes  }
     {                                                                           }
@@ -3058,7 +3058,7 @@ uses exec, intuition,utility,agraphics,iffparse;
     {                                                                           }
 
     const
-       MUIC_Popasl : PChar = 'Popasl.mui';
+       MUIC_Popasl : PAnsiChar = 'Popasl.mui';
 
     { Attributes  }
     { V7  ..g BOOL               }
@@ -3077,7 +3077,7 @@ uses exec, intuition,utility,agraphics,iffparse;
 
 
     const
-       MUIC_Semaphore : PChar = 'Semaphore.mui';
+       MUIC_Semaphore : PAnsiChar = 'Semaphore.mui';
 
     { Methods  }
     { V11  }
@@ -3124,7 +3124,7 @@ uses exec, intuition,utility,agraphics,iffparse;
     {                                                                           }
 
     const
-       MUIC_Applist : PChar = 'Applist.mui';
+       MUIC_Applist : PAnsiChar = 'Applist.mui';
     { Methods  }
     {                                                                           }
     {  Cclist                                                                   }
@@ -3132,7 +3132,7 @@ uses exec, intuition,utility,agraphics,iffparse;
 
 
     const
-       MUIC_Cclist : PChar = 'Cclist.mui';
+       MUIC_Cclist : PAnsiChar = 'Cclist.mui';
 
     { Methods  }
     {                                                                           }
@@ -3141,7 +3141,7 @@ uses exec, intuition,utility,agraphics,iffparse;
 
 
     const
-       MUIC_Dataspace : PChar = 'Dataspace.mui';
+       MUIC_Dataspace : PAnsiChar = 'Dataspace.mui';
 
     { Methods  }
     { V11  }
@@ -3218,7 +3218,7 @@ uses exec, intuition,utility,agraphics,iffparse;
 
 
     const
-       MUIC_Configdata : PChar = 'Configdata.mui';
+       MUIC_Configdata : PAnsiChar = 'Configdata.mui';
 
     { Methods  }
     { Attributes  }
@@ -3228,7 +3228,7 @@ uses exec, intuition,utility,agraphics,iffparse;
 
 
     const
-       MUIC_Dtpic : PChar = 'Dtpic.mui';
+       MUIC_Dtpic : PAnsiChar = 'Dtpic.mui';
     { Attributes  }
     {                                        }
     { End of automatic header file creation  }
@@ -3470,20 +3470,20 @@ uses exec, intuition,utility,agraphics,iffparse;
 
 VAR MUIMasterBase : pLibrary = nil;
 
-FUNCTION MUI_NewObjectA(class_ : pCHar location 'a0'; tags : pTagItem location 'a1') : pObject_; syscall MUIMasterBase 030;
+FUNCTION MUI_NewObjectA(class_ : PAnsiChar location 'a0'; tags : pTagItem location 'a1') : pObject_; syscall MUIMasterBase 030;
 PROCEDURE MUI_DisposeObject(obj : pObject_ location 'a0'); syscall MUIMasterBase 036;
-FUNCTION MUI_RequestA(app : POINTER location 'd0'; win : POINTER location 'd1'; flags : LONGBITS location 'd2'; title : pCHar location 'a0'; gadgets : pChar location 'a1'; format : pChar location 'a2'; params : POINTER location 'a3') : LONGINT; syscall MUIMasterBase 042;
+FUNCTION MUI_RequestA(app : POINTER location 'd0'; win : POINTER location 'd1'; flags : LONGBITS location 'd2'; title : PAnsiChar location 'a0'; gadgets : PAnsiChar location 'a1'; format : PAnsiChar location 'a2'; params : POINTER location 'a3') : LONGINT; syscall MUIMasterBase 042;
 FUNCTION MUI_AllocAslRequest(typ : ULONG location 'd0'; tags : pTagItem location 'a0') : POINTER; syscall MUIMasterBase 048;
 FUNCTION MUI_AslRequest(req : POINTER location 'a0'; tags : pTagItem location 'a1') : WordBool; syscall MUIMasterBase 054;
 PROCEDURE MUI_FreeAslRequest(req : POINTER location 'a0'); syscall MUIMasterBase 060;
 FUNCTION MUI_Error : LONGINT; syscall MUIMasterBase 066;
 FUNCTION MUI_SetError(errnum : LONGINT location 'd0') : LONGINT; syscall MUIMasterBase 072;
-FUNCTION MUI_GetClass(name : pChar location 'a0') : pIClass; syscall MUIMasterBase 078;
+FUNCTION MUI_GetClass(name : PAnsiChar location 'a0') : pIClass; syscall MUIMasterBase 078;
 PROCEDURE MUI_FreeClass(cl : pIClass location 'a0'); syscall MUIMasterBase 084;
 PROCEDURE MUI_RequestIDCMP(obj : pObject_ location 'a0'; flags : ULONG location 'd0'); syscall MUIMasterBase 090;
 PROCEDURE MUI_RejectIDCMP(obj : pObject_ location 'a0'; flags : ULONG location 'd0'); syscall MUIMasterBase 096;
 PROCEDURE MUI_Redraw(obj : pObject_ location 'a0'; flags : ULONG location 'd0'); syscall MUIMasterBase 102;
-FUNCTION MUI_CreateCustomClass(base : pLibrary location 'a0'; supername : pChar location 'a1'; supermcc : pMUI_CustomClass location 'a2'; datasize : LONGINT location 'd0'; dispatcher : POINTER location 'a3') : pMUI_CustomClass; syscall MUIMasterBase 108;
+FUNCTION MUI_CreateCustomClass(base : pLibrary location 'a0'; supername : PAnsiChar location 'a1'; supermcc : pMUI_CustomClass location 'a2'; datasize : LONGINT location 'd0'; dispatcher : POINTER location 'a3') : pMUI_CustomClass; syscall MUIMasterBase 108;
 FUNCTION MUI_DeleteCustomClass(mcc : pMUI_CustomClass location 'a0') : WordBool; syscall MUIMasterBase 114;
 FUNCTION MUI_MakeObjectA(typ : LONGINT location 'd0'; params : pULONG location 'a0') : pObject_; syscall MUIMasterBase 120;
 FUNCTION MUI_Layout(obj : pObject_ location 'a0'; l : LONGINT location 'd0'; t : LONGINT location 'd1'; w : LONGINT location 'd2'; h : LONGINT location 'd3'; flags : ULONG location 'd4') : WordBool; syscall MUIMasterBase 126;
@@ -3570,8 +3570,8 @@ function MUIV_Window_Width_Screen(p : longint) : longint;
 FUNCTION MUI_AllocAslRequestTags(_type : longword; const tags : array of PtrUInt) : POINTER;
 FUNCTION MUI_AslRequestTags(req : POINTER; const tags : array of PtrUInt) : BOOLEAN;
 FUNCTION MUI_MakeObject(_type : LONGINT; const params : array of PtrUInt) : pULONG;
-FUNCTION MUI_NewObject(a0arg : pCHAR; const tags : array of PtrUInt) : pULONG;
-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) : pULONG;
+FUNCTION MUI_Request(app : POINTER; win : POINTER; flags : longword; title : PAnsiChar; gadgets : PAnsiChar; format : PAnsiChar; const params : array of PtrUInt) : LONGINT;
 
 
 implementation
@@ -3865,12 +3865,12 @@ begin
     MUI_MakeObject := MUI_MakeObjectA(_type , @params);
 end;
 
-FUNCTION MUI_NewObject(a0arg : pCHAR; const tags : array of PtrUInt) : pULONG;
+FUNCTION MUI_NewObject(a0arg : PAnsiChar; const tags : array of PtrUInt) : pULONG;
 begin
     MUI_NewObject := MUI_NewObjectA(a0arg , @tags);
 end;
 
-FUNCTION MUI_Request(app : POINTER; win : POINTER; flags : longword; title : pCHAR; gadgets : pCHAR; format : pCHAR; const params : array of PtrUInt) : LONGINT;
+FUNCTION MUI_Request(app : POINTER; win : POINTER; flags : longword; title : PAnsiChar; gadgets : PAnsiChar; format : PAnsiChar; const params : array of PtrUInt) : LONGINT;
 begin
     MUI_Request := MUI_RequestA(app , win , flags , title , gadgets , format , @params);
 end;

+ 1 - 1
packages/amunits/src/otherlibs/mysticview.pas

@@ -36,7 +36,7 @@ USES Exec,agraphics,utility,intuition;
 VAR MysticBase : pLibrary = nil;
 
 const
-    MYSTICVIEWNAME : PChar = 'mysticview.library';
+    MYSTICVIEWNAME : PAnsiChar = 'mysticview.library';
 
   {
         $VER: mysticview.h 4.2 (1.6.99)

+ 3 - 3
packages/amunits/src/otherlibs/picasso96api.pas

@@ -46,7 +46,7 @@ USES Exec, utility, agraphics, intuition;
     }
 
  const
-       PICASSO96APINAME  : PChar = 'Picasso96API.library';
+       PICASSO96APINAME  : PAnsiChar = 'Picasso96API.library';
 {************************************************************************}
 { Types for RGBFormat used
  }
@@ -227,7 +227,7 @@ USES Exec, utility, agraphics, intuition;
      PP96Mode = ^TP96Mode;
      TP96Mode = record
           Node : tNode;
-          Description : array[0..(MODENAMELENGTH)-1] of char;
+          Description : array[0..(MODENAMELENGTH)-1] of AnsiChar;
           Width : UWORD;
           Height : UWORD;
           Depth : UWORD;
@@ -405,7 +405,7 @@ VAR P96Base : pLibrary = nil;
 FUNCTION p96AllocBitMap(SizeX : Ulong location 'd0'; SizeY : Ulong location 'd1'; Depth : Ulong location 'd2'; Flags : Ulong location 'd3'; Friend : pBitMap location 'a0'; RGBFormat : RGBFTYPE location 'd7') : pBitMap; syscall P96Base 030;
 PROCEDURE p96FreeBitMap(BitMap : pBitMap location 'a0'); syscall P96Base 036;
 FUNCTION p96GetBitMapAttr(BitMap : pBitMap location 'a0'; Attribute : Ulong location 'd0') : Ulong; syscall P96Base 042;
-FUNCTION p96LockBitMap(BitMap : pBitMap location 'a0'; Buffer : pCHAR location 'a1'; Size : Ulong location 'd0') : LONGINT; syscall P96Base 048;
+FUNCTION p96LockBitMap(BitMap : pBitMap location 'a0'; Buffer : PAnsiChar location 'a1'; Size : Ulong location 'd0') : LONGINT; syscall P96Base 048;
 PROCEDURE p96UnlockBitMap(BitMap : pBitMap location 'a0'; Lock : LONGINT location 'd0'); syscall P96Base 054;
 FUNCTION p96BestModeIDTagList(Tags : pTagItem location 'a0') : Ulong; syscall P96Base 060;
 FUNCTION p96RequestModeIDTagList(Tags : pTagItem location 'a0') : Ulong; syscall P96Base 066;

+ 4 - 4
packages/amunits/src/otherlibs/preferences.pas

@@ -36,7 +36,7 @@ USES Exec;
 VAR PreferencesBase : pLibrary = nil;
 
 const
-    PREFERENCESNAME : PChar = 'preferences.library';
+    PREFERENCESNAME : PAnsiChar = 'preferences.library';
 
 
   {
@@ -129,16 +129,16 @@ const
      SCP_PlugInList = $80000035;
 
 
-FUNCTION AllocPrefsHandle(name : pCHAR location 'a0') : POINTER; syscall PreferencesBase 30;
+FUNCTION AllocPrefsHandle(name : PAnsiChar location 'a0') : POINTER; syscall PreferencesBase 30;
 FUNCTION FindPreferences(PrefsHandle : POINTER location 'a0'; ID : longword location 'd0'; d1arg : longword location 'd1') : pPrefsStruct; syscall PreferencesBase 66;
 PROCEDURE FreePrefsHandle(PrefsHandle : POINTER location 'a0'); syscall PreferencesBase 36;
 FUNCTION GetEntry(PrefsHandle : POINTER location 'a0'; ID : longword location 'd0'; d1arg : longword location 'd1'; a1arg : POINTER location 'a1'; Struct_Size : WORD location 'd2'; Entry : longword location 'd3') : longword; syscall PreferencesBase 78;
 FUNCTION GetPreferences(PrefsHandle : POINTER location 'a0'; ID : longword location 'd0'; d1arg : longword location 'd1'; a1arg : POINTER location 'a1'; Struct_Size : WORD location 'd2') : longword; syscall PreferencesBase 48;
-PROCEDURE ReadPrefsHandle(PrefsHandle : POINTER location 'a0'; Filename : pCHAR location 'a1'); syscall PreferencesBase 54;
+PROCEDURE ReadPrefsHandle(PrefsHandle : POINTER location 'a0'; Filename : PAnsiChar location 'a1'); syscall PreferencesBase 54;
 FUNCTION RemEntry(PrefsHandle : POINTER location 'a0'; ID : longword location 'd0'; d1arg : longword location 'd1'; Entry : longword location 'd2') : longword; syscall PreferencesBase 84;
 PROCEDURE SetEntry(PrefsHandle : POINTER location 'a0'; ID : longword location 'd0'; d1arg : longword location 'd1'; a1arg : POINTER location 'a1'; Struct_Size : WORD location 'd2'; Entry : longword location 'd3'); syscall PreferencesBase 72;
 PROCEDURE SetPreferences(PrefsHandle : POINTER location 'a0'; ID : longword location 'd0'; d1arg : longword location 'd1'; a1arg : POINTER location 'a1'; Struct_Size : WORD location 'd2'); syscall PreferencesBase 42;
-PROCEDURE WritePrefsHandle(PrefsHandle : POINTER location 'a0'; Filename : pCHAR location 'a1'); syscall PreferencesBase 60;
+PROCEDURE WritePrefsHandle(PrefsHandle : POINTER location 'a0'; Filename : PAnsiChar location 'a1'); syscall PreferencesBase 60;
 
 IMPLEMENTATION
 

+ 7 - 7
packages/amunits/src/otherlibs/ptreplay.pas

@@ -38,20 +38,20 @@ INTERFACE
 USES Exec;
 
  const
-     PTREPLAYNAME : PChar = 'ptreplay.library';
+     PTREPLAYNAME : PAnsiChar = 'ptreplay.library';
   { The rest is private for now, but more details may be released later.  }
 
   type
      PModule = ^TModule;
      TModule = record
-          mod_Name : PChar;
+          mod_Name : PAnsiChar;
      { The rest is private for now, but more details may be released later.  }
      end;
 
      { This structure is returned by GetSample function  }
      PPTSample = ^TPTSample;
      TPTSample = record
-          Name     : array[0..21] of Char; { Null terminated string with samplename  }
+          Name     : array[0..21] of AnsiChar; { Null terminated string with samplename  }
           Length   :  WORD;                { Sample length in words  }
           FineTune : BYTE;                 { FineTune of sample in lower 4 bits  }
           Volume   : BYTE;                 { Volume of sample  }
@@ -61,7 +61,7 @@ USES Exec;
 
 VAR PTReplayBase : pLibrary = nil;
 
-FUNCTION PTLoadModule(name : pCHAR location 'a0') : pModule; syscall PTReplayBase 030;
+FUNCTION PTLoadModule(name : PAnsiChar location 'a0') : pModule; syscall PTReplayBase 030;
 PROCEDURE PTUnloadModule(module : pModule location 'a0'); syscall PTReplayBase 036;
 FUNCTION PTPlay(module : pModule location 'a0') : ULONG; syscall PTReplayBase 042;
 FUNCTION PTStop(module : pModule location 'a0') : ULONG; syscall PTReplayBase 048;
@@ -86,16 +86,16 @@ FUNCTION PTGetPri : SHORTINT; syscall PTReplayBase 156;
 FUNCTION PTGetChan : SHORTINT; syscall PTReplayBase 162;
 FUNCTION PTGetSample(Module : pModule location 'a0'; Nr : smallint location 'd0') : pPTSample; syscall PTReplayBase 168;
 
-FUNCTION PTLoadModule(const name : String) : pModule;
+FUNCTION PTLoadModule(const name : ShortString) : pModule;
 
 IMPLEMENTATION
 
-FUNCTION PTLoadModule(const name : string) : pModule;
+FUNCTION PTLoadModule(const name : ShortString) : pModule;
 var
   s: RawByteString;
 begin
   s:=name;
-  PTLoadModule := PTLoadModule(PChar(s));
+  PTLoadModule := PTLoadModule(PAnsiChar(s));
 end;
 
 const

+ 1 - 1
packages/amunits/src/otherlibs/render.pas

@@ -40,7 +40,7 @@ type
     pPLANEPTR = ^TPLANEPTR;
 
 const
-    RENDERNAME : PChar = 'render.library';
+    RENDERNAME : PAnsiChar = 'render.library';
 
 {
         $VER: render.h v40 (19.12.2002)

+ 50 - 50
packages/amunits/src/otherlibs/reqtools.pas

@@ -15,7 +15,7 @@
  **********************************************************************}
 {
     History:
-    Added overlay functions for Pchar->Strings, functions
+    Added overlay functions for PAnsiChar->Strings, functions
     and procedures.
     14 Jul 2000.
 
@@ -116,7 +116,7 @@ CONST
 
 Const
 
-    REQTOOLSNAME  : PChar = 'reqtools.library';
+    REQTOOLSNAME  : PAnsiChar = 'reqtools.library';
     REQTOOLSVERSION = 38;
 
 Type
@@ -363,7 +363,7 @@ fixed-width font! pTextFont , not pTextAttr ) - default GfxBase^.DefaultFont }
 
 RT_WaitPointer  = $8000000A; { boolean to set the standard wait pointer in window -
 default FALSE }
-RT_Underscore   = $8000000B; { (V38) char preceding keyboard shortcut characters (will
+RT_Underscore   = $8000000B; { (V38) AnsiChar preceding keyboard shortcut characters (will
 be underlined) }
 RT_ShareIDCMP   = $8000000C; { (V38) share IDCMP port with window - default FALSE }
 RT_LockWindow   = $8000000D; { (V38) lock window and set standard wait pointer -
@@ -606,19 +606,19 @@ VAR ReqToolsBase : pLibrary = nil;
 FUNCTION rtAllocRequestA(typ : ULONG location 'd0'; taglist : pTagItem location 'a0') : POINTER; syscall ReqToolsBase 030;
 FUNCTION rtChangeReqAttrA(req : POINTER location 'a1'; taglist : pTagItem location 'a0') : LONGINT; syscall ReqToolsBase 048;
 PROCEDURE rtCloseWindowSafely(win : pWindow location 'a0'); syscall ReqToolsBase 150;
-FUNCTION rtEZRequestA(bodyfmt : PChar location 'a1'; gadfmt : PChar location 'a2'; reqinfo : prtReqInfo location 'a3'; argarray: POINTER location 'a4'; taglist : pTagItem location 'a0') : ULONG; syscall ReqToolsBase 066;
-FUNCTION rtFileRequestA(filereq : prtFileRequester location 'a1'; filebuf : PChar location 'a2'; title : PChar location 'a3'; taglist : pTagItem location 'a0') : POINTER; syscall ReqToolsBase 054;
-FUNCTION rtFontRequestA(fontreq : prtFontRequester location 'a1'; title : PChar location 'a3'; taglist : pTagItem location 'a0'): ULONG; syscall ReqToolsBase 096;
+FUNCTION rtEZRequestA(bodyfmt : PAnsiChar location 'a1'; gadfmt : PAnsiChar location 'a2'; reqinfo : prtReqInfo location 'a3'; argarray: POINTER location 'a4'; taglist : pTagItem location 'a0') : ULONG; syscall ReqToolsBase 066;
+FUNCTION rtFileRequestA(filereq : prtFileRequester location 'a1'; filebuf : PAnsiChar location 'a2'; title : PAnsiChar location 'a3'; taglist : pTagItem location 'a0') : POINTER; syscall ReqToolsBase 054;
+FUNCTION rtFontRequestA(fontreq : prtFontRequester location 'a1'; title : PAnsiChar location 'a3'; taglist : pTagItem location 'a0'): ULONG; syscall ReqToolsBase 096;
 PROCEDURE rtFreeFileList(filelist : prtFileList location 'a0'); syscall ReqToolsBase 060;
 PROCEDURE rtFreeReqBuffer(req : POINTER location 'a1'); syscall ReqToolsBase 042;
 PROCEDURE rtFreeRequest(req : POINTER location 'a1'); syscall ReqToolsBase 036;
-FUNCTION rtGetLongA(VAR longptr : ULONG location 'a1'; title : PChar location 'a2'; reqinfo : prtReqInfo location 'a3'; taglist: pTagItem location 'a0') : ULONG; syscall ReqToolsBase 078;
-FUNCTION rtGetStringA(buffer : pCHAR location 'a1'; maxchars : ULONG location 'd0'; title : PChar location 'a2'; reqinfo :prtReqInfo location 'a3'; taglist : pTagItem location 'a0') : ULONG; syscall ReqToolsBase 072;
+FUNCTION rtGetLongA(VAR longptr : ULONG location 'a1'; title : PAnsiChar location 'a2'; reqinfo : prtReqInfo location 'a3'; taglist: pTagItem location 'a0') : ULONG; syscall ReqToolsBase 078;
+FUNCTION rtGetStringA(buffer : PAnsiChar location 'a1'; maxchars : ULONG location 'd0'; title : PAnsiChar location 'a2'; reqinfo :prtReqInfo location 'a3'; taglist : pTagItem location 'a0') : ULONG; syscall ReqToolsBase 072;
 FUNCTION rtGetVScreenSize(screen : pScreen location 'a0'; VAR widthptr : ULONG location 'a1'; VAR heightptr :ULONG location 'a2') : ULONG; syscall ReqToolsBase 120;
 FUNCTION rtLockWindow(win : pWindow location 'a0') : POINTER; syscall ReqToolsBase 156;
-FUNCTION rtPaletteRequestA(title : PChar location 'a2'; reqinfo : prtReqInfo location 'a3'; taglist : pTagItem location 'a0') :LONGINT; syscall ReqToolsBase 102;
+FUNCTION rtPaletteRequestA(title : PAnsiChar location 'a2'; reqinfo : prtReqInfo location 'a3'; taglist : pTagItem location 'a0') :LONGINT; syscall ReqToolsBase 102;
 FUNCTION rtReqHandlerA(handlerinfo : prtHandlerInfo location 'a1'; sigs : ULONG location 'd0'; taglist : pTagItem location 'a0'): ULONG; syscall ReqToolsBase 108;
-FUNCTION rtScreenModeRequestA(screenmodereq : prtScreenModeRequester location 'a1'; title : PChar location 'a3'; taglist : pTagItem location 'a0') : ULONG; syscall ReqToolsBase 144;
+FUNCTION rtScreenModeRequestA(screenmodereq : prtScreenModeRequester location 'a1'; title : PAnsiChar location 'a3'; taglist : pTagItem location 'a0') : ULONG; syscall ReqToolsBase 144;
 PROCEDURE rtScreenToFrontSafely(screen : pScreen location 'a0'); syscall ReqToolsBase 138;
 PROCEDURE rtSetReqPosition(reqpos : ULONG location 'd0'; newwindow : pNewWindow location 'a0'; screen : pScreen location 'a1'; window : pWindow location 'd2'); syscall ReqToolsBase 126;
 PROCEDURE rtSetWaitPointer(window : pWindow location 'a0'); syscall ReqToolsBase 114;
@@ -632,24 +632,24 @@ PROCEDURE rtUnlockWindow(win : pWindow location 'a0'; winlock : POINTER location
 
 FUNCTION rtAllocRequest(typ : ULONG; const argv : array of PtrUInt) : POINTER;
 FUNCTION rtChangeReqAttr(req : POINTER; const argv : array of PtrUInt) : LONGINT;
-FUNCTION rtEZRequest(bodyfmt : PChar; gadfmt : PChar; reqinfo : prtReqInfo; argarray : POINTER; const argv : array of PtrUInt) : ULONG;
-FUNCTION rtFileRequest(filereq : prtFileRequester; filebuf : PChar; title : PChar; const argv : array of PtrUInt) : POINTER;
-FUNCTION rtFontRequest(fontreq : prtFontRequester; title : PChar; const argv : array of PtrUInt) : ULONG;
-FUNCTION rtGetLong(VAR longptr : ULONG; title : PChar; reqinfo : prtReqInfo; const argv : array of PtrUInt) : ULONG;
-FUNCTION rtGetString(buffer : pCHAR; maxchars : ULONG; title : PChar; reqinfo : prtReqInfo; const argv : array of PtrUInt) : ULONG;
-FUNCTION rtPaletteRequest(title : PChar; reqinfo : prtReqInfo; const argv : array of PtrUInt) : LONGINT;
+FUNCTION rtEZRequest(bodyfmt : PAnsiChar; gadfmt : PAnsiChar; reqinfo : prtReqInfo; argarray : POINTER; const argv : array of PtrUInt) : ULONG;
+FUNCTION rtFileRequest(filereq : prtFileRequester; filebuf : PAnsiChar; title : PAnsiChar; const argv : array of PtrUInt) : POINTER;
+FUNCTION rtFontRequest(fontreq : prtFontRequester; title : PAnsiChar; const argv : array of PtrUInt) : ULONG;
+FUNCTION rtGetLong(VAR longptr : ULONG; title : PAnsiChar; reqinfo : prtReqInfo; const argv : array of PtrUInt) : ULONG;
+FUNCTION rtGetString(buffer : PAnsiChar; maxchars : ULONG; title : PAnsiChar; reqinfo : prtReqInfo; const argv : array of PtrUInt) : ULONG;
+FUNCTION rtPaletteRequest(title : PAnsiChar; reqinfo : prtReqInfo; const argv : array of PtrUInt) : LONGINT;
 FUNCTION rtReqHandler(handlerinfo : prtHandlerInfo; sigs : ULONG; const argv : array of PtrUInt) : ULONG;
-FUNCTION rtScreenModeRequest(screenmodereq : prtScreenModeRequester; title : PChar; const argv : array of PtrUInt) : ULONG;
+FUNCTION rtScreenModeRequest(screenmodereq : prtScreenModeRequester; title : PAnsiChar; const argv : array of PtrUInt) : ULONG;
 
 {overlay functions}
 
-FUNCTION rtEZRequestA(bodyfmt : PChar; const gadfmt : RawByteString; reqinfo : prtReqInfo; argarray : POINTER; taglist : pTagItem) : ULONG;
-FUNCTION rtEZRequestA(const bodyfmt : RawByteString; gadfmt : PChar; reqinfo : prtReqInfo; argarray : POINTER; taglist : pTagItem) : ULONG;
+FUNCTION rtEZRequestA(bodyfmt : PAnsiChar; const gadfmt : RawByteString; reqinfo : prtReqInfo; argarray : POINTER; taglist : pTagItem) : ULONG;
+FUNCTION rtEZRequestA(const bodyfmt : RawByteString; gadfmt : PAnsiChar; reqinfo : prtReqInfo; argarray : POINTER; taglist : pTagItem) : ULONG;
 FUNCTION rtEZRequestA(const bodyfmt : RawByteString; const gadfmt : RawByteString; reqinfo : prtReqInfo; argarray : POINTER; taglist : pTagItem) : ULONG;
-FUNCTION rtFileRequestA(filereq : prtFileRequester; filebuf : PChar; const title : RawByteString; taglist : pTagItem) : POINTER;
+FUNCTION rtFileRequestA(filereq : prtFileRequester; filebuf : PAnsiChar; const title : RawByteString; taglist : pTagItem) : POINTER;
 FUNCTION rtFontRequestA(fontreq : prtFontRequester; const title : RawByteString; taglist : pTagItem) : ULONG;
 FUNCTION rtGetLongA(VAR longptr : ULONG; const title : RawByteString; reqinfo : prtReqInfo; taglist : pTagItem) : ULONG;
-FUNCTION rtGetStringA(buffer : pCHAR; maxchars : ULONG; const title : RawByteString; reqinfo : prtReqInfo; taglist : pTagItem) : ULONG;
+FUNCTION rtGetStringA(buffer : PAnsiChar; maxchars : ULONG; const title : RawByteString; reqinfo : prtReqInfo; taglist : pTagItem) : ULONG;
 FUNCTION rtPaletteRequestA(const title : RawByteString; reqinfo : prtReqInfo; taglist : pTagItem) : LONGINT;
 FUNCTION rtScreenModeRequestA(screenmodereq : prtScreenModeRequester; const title : RawByteString; taglist : pTagItem) : ULONG;
 
@@ -658,62 +658,62 @@ FUNCTION rtScreenModeRequestA(screenmodereq : prtScreenModeRequester; const titl
      For use with fpc 1.0 and above. + overlay
 }
 
-FUNCTION rtEZRequest(bodyfmt : PChar; const gadfmt : RawByteString; reqinfo : prtReqInfo; argarray : POINTER; const argv : array of PtrUInt) : ULONG;
-FUNCTION rtEZRequest(const bodyfmt : RawByteString; gadfmt : PChar; reqinfo : prtReqInfo; argarray : POINTER; const argv : array of PtrUInt) : ULONG;
+FUNCTION rtEZRequest(bodyfmt : PAnsiChar; const gadfmt : RawByteString; reqinfo : prtReqInfo; argarray : POINTER; const argv : array of PtrUInt) : ULONG;
+FUNCTION rtEZRequest(const bodyfmt : RawByteString; gadfmt : PAnsiChar; reqinfo : prtReqInfo; argarray : POINTER; const argv : array of PtrUInt) : ULONG;
 FUNCTION rtEZRequest(const bodyfmt : RawByteString; const gadfmt : RawByteString; reqinfo : prtReqInfo; argarray : POINTER; const argv : array of PtrUInt) : ULONG;
-FUNCTION rtFileRequest(filereq : prtFileRequester; filebuf : PChar; const title : RawByteString; const argv : array of PtrUInt) : POINTER;
+FUNCTION rtFileRequest(filereq : prtFileRequester; filebuf : PAnsiChar; const title : RawByteString; const argv : array of PtrUInt) : POINTER;
 FUNCTION rtFontRequest(fontreq : prtFontRequester; const title : RawByteString; const argv : array of PtrUInt) : ULONG;
 FUNCTION rtGetLong(VAR longptr : ULONG; const title : RawByteString; reqinfo : prtReqInfo; const argv : array of PtrUInt) : ULONG;
-FUNCTION rtGetString(buffer : pCHAR; maxchars : ULONG; const title : RawByteString; reqinfo : prtReqInfo; const argv : array of PtrUInt) : ULONG;
+FUNCTION rtGetString(buffer : PAnsiChar; maxchars : ULONG; const title : RawByteString; reqinfo : prtReqInfo; const argv : array of PtrUInt) : ULONG;
 FUNCTION rtPaletteRequest(const title : RawByteString; reqinfo : prtReqInfo; const argv : array of PtrUInt) : LONGINT;
 FUNCTION rtScreenModeRequest(screenmodereq : prtScreenModeRequester; const title : RawByteString; const argv : array of PtrUInt) : ULONG;
 
 IMPLEMENTATION
 
 
-FUNCTION rtEZRequestA(bodyfmt : PChar; const gadfmt : RawByteString; reqinfo : prtReqInfo; argarray: POINTER; taglist : pTagItem) : ULONG;
+FUNCTION rtEZRequestA(bodyfmt : PAnsiChar; const gadfmt : RawByteString; reqinfo : prtReqInfo; argarray: POINTER; taglist : pTagItem) : ULONG;
 BEGIN
-    rtEZRequestA := rtEZRequestA(bodyfmt,PChar(gadfmt),reqinfo,argarray,taglist);
+    rtEZRequestA := rtEZRequestA(bodyfmt,PAnsiChar(gadfmt),reqinfo,argarray,taglist);
 END;
 
-FUNCTION rtEZRequestA(const bodyfmt : RawByteString; gadfmt : PChar; reqinfo : prtReqInfo; argarray: POINTER; taglist : pTagItem) : ULONG;
+FUNCTION rtEZRequestA(const bodyfmt : RawByteString; gadfmt : PAnsiChar; reqinfo : prtReqInfo; argarray: POINTER; taglist : pTagItem) : ULONG;
 BEGIN
-    rtEZRequestA := rtEZRequestA(PChar(bodyfmt),gadfmt,reqinfo,argarray,taglist);
+    rtEZRequestA := rtEZRequestA(PAnsiChar(bodyfmt),gadfmt,reqinfo,argarray,taglist);
 END;
 
 FUNCTION rtEZRequestA(const bodyfmt : RawByteString; const gadfmt : RawByteString; reqinfo : prtReqInfo; argarray : POINTER; taglist : pTagItem) : ULONG;
 BEGIN
-    rtEZRequestA := rtEZRequestA(PChar(bodyfmt),PChar(gadfmt),reqinfo,argarray,taglist);
+    rtEZRequestA := rtEZRequestA(PAnsiChar(bodyfmt),PAnsiChar(gadfmt),reqinfo,argarray,taglist);
 END;
 
-FUNCTION rtFileRequestA(filereq : prtFileRequester; filebuf : PChar; const title : RawByteString; taglist : pTagItem) : POINTER;
+FUNCTION rtFileRequestA(filereq : prtFileRequester; filebuf : PAnsiChar; const title : RawByteString; taglist : pTagItem) : POINTER;
 BEGIN
-    rtFileRequestA := rtFileRequestA(filereq,filebuf,PChar(title),taglist);
+    rtFileRequestA := rtFileRequestA(filereq,filebuf,PAnsiChar(title),taglist);
 END;
 
 FUNCTION rtFontRequestA(fontreq : prtFontRequester; const title : RawByteString; taglist :pTagItem) : ULONG;
 BEGIN
-    rtFontRequestA := rtFontRequestA(fontreq,PChar(title),taglist);
+    rtFontRequestA := rtFontRequestA(fontreq,PAnsiChar(title),taglist);
 END;
 
 FUNCTION rtGetLongA(VAR longptr : ULONG; const title : RawByteString; reqinfo : prtReqInfo; taglist: pTagItem) : ULONG;
 BEGIN
-    rtGetLongA := rtGetLongA(longptr,PChar(title),reqinfo,taglist);
+    rtGetLongA := rtGetLongA(longptr,PAnsiChar(title),reqinfo,taglist);
 END;
 
-FUNCTION rtGetStringA(buffer : pCHAR; maxchars : ULONG; const title : RawByteString; reqinfo :prtReqInfo; taglist : pTagItem) : ULONG;
+FUNCTION rtGetStringA(buffer : PAnsiChar; maxchars : ULONG; const title : RawByteString; reqinfo :prtReqInfo; taglist : pTagItem) : ULONG;
 BEGIN
-    rtGetStringA := rtGetStringA(buffer,maxchars,PChar(title),reqinfo,taglist);
+    rtGetStringA := rtGetStringA(buffer,maxchars,PAnsiChar(title),reqinfo,taglist);
 END;
 
 FUNCTION rtPaletteRequestA(const title : RawByteString; reqinfo : prtReqInfo; taglist : pTagItem) :LONGINT;
 BEGIN
-    rtPaletteRequestA := rtPaletteRequestA(PChar(title),reqinfo,taglist);
+    rtPaletteRequestA := rtPaletteRequestA(PAnsiChar(title),reqinfo,taglist);
 END;
 
 FUNCTION rtScreenModeRequestA(screenmodereq : prtScreenModeRequester; const title : RawByteString; taglist : pTagItem) : ULONG;
 BEGIN
-    rtScreenModeRequestA := rtScreenModeRequestA(screenmodereq,PChar(title),taglist);
+    rtScreenModeRequestA := rtScreenModeRequestA(screenmodereq,PAnsiChar(title),taglist);
 END;
 
 
@@ -727,32 +727,32 @@ begin
     rtChangeReqAttr := rtChangeReqAttrA(req,@argv);
 end;
 
-FUNCTION rtEZRequest(bodyfmt : PChar; gadfmt : PChar; reqinfo : prtReqInfo; argarray : POINTER; const argv : array of PtrUInt) : ULONG;
+FUNCTION rtEZRequest(bodyfmt : PAnsiChar; gadfmt : PAnsiChar; reqinfo : prtReqInfo; argarray : POINTER; const argv : array of PtrUInt) : ULONG;
 begin
     rtEZRequest := rtEZRequestA(bodyfmt,gadfmt,reqinfo,argarray,@argv);
 end;
 
-FUNCTION rtFileRequest(filereq : prtFileRequester; filebuf : PChar; title : PChar; const argv : array of PtrUInt) : POINTER;
+FUNCTION rtFileRequest(filereq : prtFileRequester; filebuf : PAnsiChar; title : PAnsiChar; const argv : array of PtrUInt) : POINTER;
 begin
     rtFileRequest := rtFileRequestA(filereq,filebuf,title,@argv);
 end;
 
-FUNCTION rtFontRequest(fontreq : prtFontRequester; title : PChar; const argv : array of PtrUInt) : ULONG;
+FUNCTION rtFontRequest(fontreq : prtFontRequester; title : PAnsiChar; const argv : array of PtrUInt) : ULONG;
 begin
     rtFontRequest := rtFontRequestA(fontreq,title,@argv);
 end;
 
-FUNCTION rtGetLong(VAR longptr : ULONG; title : PChar; reqinfo : prtReqInfo; const argv : array of PtrUInt) : ULONG;
+FUNCTION rtGetLong(VAR longptr : ULONG; title : PAnsiChar; reqinfo : prtReqInfo; const argv : array of PtrUInt) : ULONG;
 begin
     rtGetLong := rtGetLongA(longptr,title,reqinfo,@argv);
 end;
 
-FUNCTION rtGetString(buffer : pCHAR; maxchars : ULONG; title : PChar; reqinfo : prtReqInfo; const argv : array of PtrUInt) : ULONG;
+FUNCTION rtGetString(buffer : PAnsiChar; maxchars : ULONG; title : PAnsiChar; reqinfo : prtReqInfo; const argv : array of PtrUInt) : ULONG;
 begin
     rtGetString := rtGetStringA(buffer,maxchars,title,reqinfo,@argv);
 end;
 
-FUNCTION rtPaletteRequest(title : PChar; reqinfo : prtReqInfo; const argv : array of PtrUInt) : LONGINT;
+FUNCTION rtPaletteRequest(title : PAnsiChar; reqinfo : prtReqInfo; const argv : array of PtrUInt) : LONGINT;
 begin
     rtPaletteRequest := rtPaletteRequestA(title,reqinfo,@argv);
 end;
@@ -762,17 +762,17 @@ begin
     rtReqHandler := rtReqHandlerA(handlerinfo,sigs,@argv);
 end;
 
-FUNCTION rtScreenModeRequest(screenmodereq : prtScreenModeRequester; title : PChar; const argv : array of PtrUInt) : ULONG;
+FUNCTION rtScreenModeRequest(screenmodereq : prtScreenModeRequester; title : PAnsiChar; const argv : array of PtrUInt) : ULONG;
 begin
     rtScreenModeRequest := rtScreenModeRequestA(screenmodereq,title,@argv);
 end;
 
-FUNCTION rtEZRequest(bodyfmt : PChar; const gadfmt : RawByteString; reqinfo : prtReqInfo; argarray : POINTER; const argv : array of PtrUInt) : ULONG;
+FUNCTION rtEZRequest(bodyfmt : PAnsiChar; const gadfmt : RawByteString; reqinfo : prtReqInfo; argarray : POINTER; const argv : array of PtrUInt) : ULONG;
 begin
     rtEZRequest := rtEZRequestA(bodyfmt,gadfmt,reqinfo,argarray,@argv);
 end;
 
-FUNCTION rtEZRequest(const bodyfmt : RawByteString; gadfmt : PChar; reqinfo : prtReqInfo; argarray : POINTER; const argv : array of PtrUInt) : ULONG;
+FUNCTION rtEZRequest(const bodyfmt : RawByteString; gadfmt : PAnsiChar; reqinfo : prtReqInfo; argarray : POINTER; const argv : array of PtrUInt) : ULONG;
 begin
     rtEZRequest := rtEZRequestA(bodyfmt,gadfmt,reqinfo,argarray,@argv);
 end;
@@ -782,7 +782,7 @@ begin
     rtEZRequest := rtEZRequestA(bodyfmt,gadfmt,reqinfo,argarray,@argv);
 end;
 
-FUNCTION rtFileRequest(filereq : prtFileRequester; filebuf : PChar; const title : RawByteString; const argv : array of PtrUInt) : POINTER;
+FUNCTION rtFileRequest(filereq : prtFileRequester; filebuf : PAnsiChar; const title : RawByteString; const argv : array of PtrUInt) : POINTER;
 begin
      rtFileRequest :=  rtFileRequestA(filereq,filebuf,title,@argv);
 end;
@@ -797,7 +797,7 @@ begin
      rtGetLong := rtGetLongA(longptr,title,reqinfo,@argv);
 end;
 
-FUNCTION rtGetString(buffer : pCHAR; maxchars : ULONG; const title : RawByteString; reqinfo : prtReqInfo; const argv : array of PtrUInt) : ULONG;
+FUNCTION rtGetString(buffer : PAnsiChar; maxchars : ULONG; const title : RawByteString; reqinfo : prtReqInfo; const argv : array of PtrUInt) : ULONG;
 begin
      rtGetString := rtGetStringA(buffer,maxchars,title,reqinfo,@argv);
 end;
@@ -814,7 +814,7 @@ end;
 
 const
     { Change VERSION and LIBVERSION to proper values }
-    VERSION : string[2] = '0';
+    VERSION : ShortString[2] = '0';
     LIBVERSION : longword = 0;
 
 initialization

+ 50 - 50
packages/amunits/src/otherlibs/triton.pas

@@ -45,7 +45,7 @@ uses exec, intuition, agraphics, utility;
 {* library name and version                                                       *}
 {* ------------------------------------------------------------------------------ *}
 
-CONST   TRITONNAME        : PChar = 'triton.library';
+CONST   TRITONNAME        : PAnsiChar = 'triton.library';
         TRITON10VERSION   = 1;
         TRITON11VERSION   = 2;
         TRITON12VERSION   = 3;
@@ -693,35 +693,35 @@ PROCEDURE TR_DeleteApp(app : pTR_App location 'a1'); syscall TritonBase 102;
 FUNCTION TR_DoMethod(obj : pTROD_Object location 'a0'; messageid : ULONG location 'd0'; data : POINTER location 'a1') : ULONG; syscall TritonBase 216;
 FUNCTION TR_DoMethodClass(obj : pTROD_Object location 'a0'; messageid : ULONG location 'd0'; data : POINTER location 'a1'; trclass : pTR_Class location 'a2') : ULONG; syscall TritonBase 222;
 PROCEDURE TR_DrawFrame(project : pTR_Project location 'a0'; rp : pRastPort location 'a1'; left : WORD location 'd1'; top : WORD location 'd2'; width : WORD location 'd3'; height : WORD location 'd4'; typ : WORD location 'd0'; inverted : BOOLEAN location 'd5'); syscall TritonBase 174;
-FUNCTION TR_EasyRequest(app : pTR_App location 'a1'; bodyfmt : pCHAR location 'a2'; gadfmt : pCHAR location 'a3'; taglist : pTagItem location 'a0') : ULONG; syscall TritonBase 90;
-FUNCTION TR_EasyRequest(app : pTR_App; bodyfmt : pCHAR; gadfmt : String; taglist : pTagItem) : ULONG;
-FUNCTION TR_EasyRequest(app : pTR_App; bodyfmt : String; gadfmt : pCHAR; taglist : pTagItem) : ULONG;
-FUNCTION TR_EasyRequest(app : pTR_App; bodyfmt : String; gadfmt : String; taglist : pTagItem) : ULONG;
-FUNCTION TR_FirstOccurance(ch : BYTE location 'd0'; str : pCHAR location 'a0') : LONGINT; syscall TritonBase 42;
-FUNCTION TR_FirstOccurance(ch : BYTE; str : String) : LONGINT;
+FUNCTION TR_EasyRequest(app : pTR_App location 'a1'; bodyfmt : PAnsiChar location 'a2'; gadfmt : PAnsiChar location 'a3'; taglist : pTagItem location 'a0') : ULONG; syscall TritonBase 90;
+FUNCTION TR_EasyRequest(app : pTR_App; bodyfmt : PAnsiChar; gadfmt : ShortString; taglist : pTagItem) : ULONG;
+FUNCTION TR_EasyRequest(app : pTR_App; bodyfmt : ShortString; gadfmt : PAnsiChar; taglist : pTagItem) : ULONG;
+FUNCTION TR_EasyRequest(app : pTR_App; bodyfmt : ShortString; gadfmt : ShortString; taglist : pTagItem) : ULONG;
+FUNCTION TR_FirstOccurance(ch : BYTE location 'd0'; str : PAnsiChar location 'a0') : LONGINT; syscall TritonBase 42;
+FUNCTION TR_FirstOccurance(ch : BYTE; str : ShortString) : LONGINT;
 FUNCTION TR_FrameBorderHeight(project : pTR_Project location 'a0'; typ : WORD location 'd0') : ULONG; syscall TritonBase 186;
 FUNCTION TR_FrameBorderWidth(project : pTR_Project location 'a0'; typ : WORD location 'd0') : ULONG; syscall TritonBase 180;
 FUNCTION TR_GetAttribute(project : pTR_Project location 'a0'; ID : ULONG location 'd0'; attribute : ULONG location 'd1') : ULONG; syscall TritonBase 66;
-FUNCTION TR_GetErrorString(num : WORD location 'd0') : pCHAR; syscall TritonBase 54;
+FUNCTION TR_GetErrorString(num : WORD location 'd0') : PAnsiChar; syscall TritonBase 54;
 FUNCTION TR_GetLastError(app : pTR_App location 'a1') : WORD; syscall TritonBase 132;
 FUNCTION TR_GetMsg(app : pTR_App location 'a1') : pTR_Message; syscall TritonBase 108;
 FUNCTION TR_GetPen(project : pTR_Project location 'a0'; pentype : ULONG location 'd0'; pendata : ULONG location 'd1') : ULONG; syscall TritonBase 210;
 PROCEDURE TR_LockProject(project : pTR_Project location 'a0'); syscall TritonBase 72;
 FUNCTION TR_LockScreen(project : pTR_Project location 'a0') : pScreen; syscall TritonBase 138;
-FUNCTION TR_NumOccurances(ch : BYTE location 'd0'; str : pCHAR location 'a0') : LONGINT; syscall TritonBase 48;
-FUNCTION TR_NumOccurances(ch : BYTE; str : String) : LONGINT;
+FUNCTION TR_NumOccurances(ch : BYTE location 'd0'; str : PAnsiChar location 'a0') : LONGINT; syscall TritonBase 48;
+FUNCTION TR_NumOccurances(ch : BYTE; str : ShortString) : LONGINT;
 FUNCTION TR_ObtainWindow(project : pTR_Project location 'a0') : pWindow; syscall TritonBase 150;
 FUNCTION TR_OpenProject(app : pTR_App location 'a1'; taglist : pTagItem location 'a0') : pTR_Project; syscall TritonBase 30;
-PROCEDURE TR_PrintText(project : pTR_Project location 'a0'; rp : pRastPort location 'a1'; txt : pCHAR location 'a2'; x : ULONG location 'd1'; y : ULONG location 'd2'; width : ULONG location 'd3'; flags : ULONG location 'd0'); syscall TritonBase 204;
-PROCEDURE TR_PrintText(project : pTR_Project; rp : pRastPort; txt : String; x : ULONG; y : ULONG; width : ULONG; flags : ULONG);
+PROCEDURE TR_PrintText(project : pTR_Project location 'a0'; rp : pRastPort location 'a1'; txt : PAnsiChar location 'a2'; x : ULONG location 'd1'; y : ULONG location 'd2'; width : ULONG location 'd3'; flags : ULONG location 'd0'); syscall TritonBase 204;
+PROCEDURE TR_PrintText(project : pTR_Project; rp : pRastPort; txt : ShortString; x : ULONG; y : ULONG; width : ULONG; flags : ULONG);
 PROCEDURE TR_ReleaseWindow(window : pWindow location 'a0'); syscall TritonBase 156;
 PROCEDURE TR_ReplyMsg(message : pTR_Message location 'a1'); syscall TritonBase 114;
 FUNCTION TR_SendMessage(project : pTR_Project location 'a0'; objectid : ULONG location 'd0'; messageid : ULONG location 'd1'; messagedata : POINTER location 'a1') : ULONG; syscall TritonBase 162;
 PROCEDURE TR_SetAttribute(project : pTR_Project location 'a0'; ID : ULONG location 'd0'; attribute : ULONG location 'd1'; value: ULONG location 'd2'); syscall TritonBase 60;
-FUNCTION TR_TextHeight(project : pTR_Project location 'a0'; txt : pCHAR location 'a2'; flags : ULONG location 'd0') : ULONG; syscall TritonBase 198;
-FUNCTION TR_TextHeight(project : pTR_Project; txt : String; flags : ULONG) : ULONG;
-FUNCTION TR_TextWidth(project : pTR_Project location 'a0'; txt : pCHAR location 'a2'; flags : ULONG location 'd0') : ULONG; syscall TritonBase 192;
-FUNCTION TR_TextWidth(project : pTR_Project; txt : String; flags : ULONG) : ULONG;
+FUNCTION TR_TextHeight(project : pTR_Project location 'a0'; txt : PAnsiChar location 'a2'; flags : ULONG location 'd0') : ULONG; syscall TritonBase 198;
+FUNCTION TR_TextHeight(project : pTR_Project; txt : ShortString; flags : ULONG) : ULONG;
+FUNCTION TR_TextWidth(project : pTR_Project location 'a0'; txt : PAnsiChar location 'a2'; flags : ULONG location 'd0') : ULONG; syscall TritonBase 192;
+FUNCTION TR_TextWidth(project : pTR_Project; txt : ShortString; flags : ULONG) : ULONG;
 PROCEDURE TR_UnlockProject(project : pTR_Project location 'a0'); syscall TritonBase 78;
 PROCEDURE TR_UnlockScreen(screen : pScreen location 'a0'); syscall TritonBase 144;
 FUNCTION TR_Wait(app : pTR_App location 'a1'; otherbits : ULONG location 'd0') : ULONG; syscall TritonBase 120;
@@ -734,10 +734,10 @@ defaultmethod : LONGINT; datasize : longword; const tags : array of PtrUInt) : B
 FUNCTION TR_OpenProjectTags(app : pTR_App; const taglist : array of PtrUInt) : pTR_Project;
 FUNCTION TR_AutoRequestTags(app : pTR_App; lockproject : pTR_Project; const wintags : array of PtrUInt): ULONG;
 FUNCTION TR_CreateAppTags(const apptags : array of PtrUInt) : pTR_App;
-FUNCTION TR_EasyRequestTags(app : pTR_App; bodyfmt : pCHAR; gadfmt : pCHAR; const taglist : array of PtrUInt) : ULONG;
-FUNCTION TR_EasyRequestTags(app : pTR_App; bodyfmt : pCHAR; gadfmt : String; Const taglist : array of PtrUInt) : ULONG;
-FUNCTION TR_EasyRequestTags(app : pTR_App; bodyfmt : String; gadfmt : pCHAR; Const taglist : array of PtrUInt) : ULONG;
-FUNCTION TR_EasyRequestTags(app : pTR_App; bodyfmt : String; gadfmt : String; Const taglist : array of PtrUInt) : ULONG;
+FUNCTION TR_EasyRequestTags(app : pTR_App; bodyfmt : PAnsiChar; gadfmt : PAnsiChar; const taglist : array of PtrUInt) : ULONG;
+FUNCTION TR_EasyRequestTags(app : pTR_App; bodyfmt : PAnsiChar; gadfmt : ShortString; Const taglist : array of PtrUInt) : ULONG;
+FUNCTION TR_EasyRequestTags(app : pTR_App; bodyfmt : ShortString; gadfmt : PAnsiChar; Const taglist : array of PtrUInt) : ULONG;
+FUNCTION TR_EasyRequestTags(app : pTR_App; bodyfmt : ShortString; gadfmt : ShortString; Const taglist : array of PtrUInt) : ULONG;
 
 {  This are a few support functions for triton.
    Could be handy.
@@ -746,17 +746,17 @@ FUNCTION TR_EasyRequestTags(app : pTR_App; bodyfmt : String; gadfmt : String; Co
 procedure TR_Disable(p : pTR_Project; id : Longint);
 procedure TR_Enable(p : pTR_Project; id : Longint);
 function TR_GetCheckBox(p : pTR_Project; id : Longint): boolean;
-function TR_GetSTRPTR(p : pTR_Project; id : Longint): PChar;
-function TR_GetString(p : pTR_Project; id : Longint): String;
+function TR_GetSTRPTR(p : pTR_Project; id : Longint): PAnsiChar;
+function TR_GetString(p : pTR_Project; id : Longint): ShortString;
 function TR_GetValue(p : pTR_Project; gadid : Longint): Longint;
 procedure TR_SetCheckBox(p : pTR_Project; id : Longint; onoff : boolean);
-procedure TR_SetString(p : pTR_Project; id : Longint; txt : String);
-procedure TR_SetString(p : pTR_Project; id : Longint; txt : PChar);
-procedure TR_SetText(p : pTR_Project; id : Longint; txt : string);
-procedure TR_SetText(p : pTR_Project; id : Longint; txt : PChar);
+procedure TR_SetString(p : pTR_Project; id : Longint; txt : ShortString);
+procedure TR_SetString(p : pTR_Project; id : Longint; txt : PAnsiChar);
+procedure TR_SetText(p : pTR_Project; id : Longint; txt : ShortString);
+procedure TR_SetText(p : pTR_Project; id : Longint; txt : PAnsiChar);
 procedure TR_SetValue(p : pTR_Project; id : Longint; value : Longint);
-procedure TR_SetWindowTitle(p : pTR_Project; thetitle : string);
-procedure TR_SetWindowTitle(p : pTR_Project; thetitle : PChar);
+procedure TR_SetWindowTitle(p : pTR_Project; thetitle : ShortString);
+procedure TR_SetWindowTitle(p : pTR_Project; thetitle : PAnsiChar);
 procedure TR_UpdateListView(p : pTR_Project; gadid : Longint; thelist: pList);
 
 IMPLEMENTATION
@@ -783,20 +783,20 @@ begin
     else TR_GetCheckBox := true;
 end;
 
-function TR_GetSTRPTR(p : pTR_Project; id : Longint): PChar;
+function TR_GetSTRPTR(p : pTR_Project; id : Longint): PAnsiChar;
 var
     temp : Longint;
 begin
     temp := TR_GetAttribute(p,id,0);
-    TR_GetSTRPTR := PChar(Pointer(temp));
+    TR_GetSTRPTR := PAnsiChar(Pointer(temp));
 end;
 
-function TR_GetString(p : pTR_Project; id : Longint): String;
+function TR_GetString(p : pTR_Project; id : Longint): ShortString;
 var
     temp : Longint;
 begin
     temp := TR_GetAttribute(p,id,0);
-    TR_GetString := strpas(PChar(Pointer(temp)));
+    TR_GetString := strpas(PAnsiChar(Pointer(temp)));
 end;
 
 function TR_GetValue(p : pTR_Project; gadid : Longint): Longint;
@@ -809,22 +809,22 @@ begin
     TR_SetAttribute(p,id,TRAT_Value,Longint(byte(onoff)));
 end;
 
-procedure TR_SetString(p : pTR_Project; id : Longint; txt : String);
+procedure TR_SetString(p : pTR_Project; id : Longint; txt : ShortString);
 begin
     TR_SetAttribute(p,id,0,Longint(pas2c(txt)));
 end;
 
-procedure TR_SetString(p : pTR_Project; id : Longint; txt : PChar);
+procedure TR_SetString(p : pTR_Project; id : Longint; txt : PAnsiChar);
 begin
     TR_SetAttribute(p,id,0,Longint(txt));
 end;
 
-procedure TR_SetText(p : pTR_Project; id : Longint; txt : string);
+procedure TR_SetText(p : pTR_Project; id : Longint; txt : ShortString);
 begin
     TR_SetAttribute(p,id,TRAT_Text,Longint(pas2c(txt)));
 end;
 
-procedure TR_SetText(p : pTR_Project; id : Longint; txt : PChar);
+procedure TR_SetText(p : pTR_Project; id : Longint; txt : PAnsiChar);
 begin
     TR_SetAttribute(p,id,TRAT_Text,Longint(txt));
 end;
@@ -834,12 +834,12 @@ begin
     TR_SetAttribute(p,id,TRAT_Value,value);
 end;
 
-procedure TR_SetWindowTitle(p : pTR_Project; thetitle : string);
+procedure TR_SetWindowTitle(p : pTR_Project; thetitle : ShortString);
 begin
     TR_SetAttribute(p,0,TRWI_Title,Longint(pas2c(thetitle)));
 end;
 
-procedure TR_SetWindowTitle(p : pTR_Project; thetitle : PChar);
+procedure TR_SetWindowTitle(p : pTR_Project; thetitle : PAnsiChar);
 begin
     TR_SetAttribute(p,0,TRWI_Title,Longint(thetitle));
 end;
@@ -850,46 +850,46 @@ begin
 end;
 
 
-FUNCTION TR_EasyRequest(app : pTR_App; bodyfmt : PChar; gadfmt : String; taglist :
+FUNCTION TR_EasyRequest(app : pTR_App; bodyfmt : PAnsiChar; gadfmt : ShortString; taglist :
 pTagItem) : ULONG;
 begin
     TR_EasyRequest := TR_EasyRequest(app,bodyfmt,pas2c(gadfmt),taglist);
 end;
 
-FUNCTION TR_EasyRequest(app : pTR_App; bodyfmt : String; gadfmt : PChar; taglist :
+FUNCTION TR_EasyRequest(app : pTR_App; bodyfmt : ShortString; gadfmt : PAnsiChar; taglist :
 pTagItem) : ULONG;
 begin
     TR_EasyRequest := TR_EasyRequest(app,pas2c(bodyfmt),gadfmt,taglist);
 end;
 
-FUNCTION TR_EasyRequest(app : pTR_App; bodyfmt : String; gadfmt : String; taglist :
+FUNCTION TR_EasyRequest(app : pTR_App; bodyfmt : ShortString; gadfmt : ShortString; taglist :
 pTagItem) : ULONG;
 begin
     TR_EasyRequest := TR_EasyRequest(app,pas2c(bodyfmt),pas2c(gadfmt),taglist);
 end;
 
-FUNCTION TR_FirstOccurance(ch : BYTE; str : String) : LONGINT;
+FUNCTION TR_FirstOccurance(ch : BYTE; str : ShortString) : LONGINT;
 BEGIN
     TR_FirstOccurance := TR_FirstOccurance(ch, pas2c(str));
 END;
 
-FUNCTION TR_NumOccurances(ch : BYTE; str : String) : LONGINT;
+FUNCTION TR_NumOccurances(ch : BYTE; str : ShortString) : LONGINT;
 BEGIN
     TR_NumOccurances := TR_NumOccurances(ch, pas2c(str));
 END;
 
-PROCEDURE TR_PrintText(project : pTR_Project; rp : pRastPort; txt : String; x : ULONG;
+PROCEDURE TR_PrintText(project : pTR_Project; rp : pRastPort; txt : ShortString; x : ULONG;
 y : ULONG; width : ULONG; flags : ULONG);
 BEGIN
     TR_PrintText(project,rp,pas2c(txt),x,y,width,flags);
 END;
 
-FUNCTION TR_TextHeight(project : pTR_Project; txt : String; flags : ULONG) : ULONG;
+FUNCTION TR_TextHeight(project : pTR_Project; txt : ShortString; flags : ULONG) : ULONG;
 BEGIN
     TR_TextHeight :=  TR_TextHeight(project,pas2c(txt),flags);
 END;
 
-FUNCTION TR_TextWidth(project : pTR_Project; txt : String; flags : ULONG) : ULONG;
+FUNCTION TR_TextWidth(project : pTR_Project; txt : ShortString; flags : ULONG) : ULONG;
 BEGIN
     TR_TextWidth := TR_TextWidth(project,pas2c(txt),flags);
 END;
@@ -905,7 +905,7 @@ begin
     TR_AddClassTags := TR_AddClass(app , d0arg , supertag , defaultmethod , datasize , @tags);
 end;
 
-FUNCTION TR_EasyRequestTags(app : pTR_App; bodyfmt : pCHAR; gadfmt : pCHAR; const taglist : array of PtrUInt) : Ulong;
+FUNCTION TR_EasyRequestTags(app : pTR_App; bodyfmt : PAnsiChar; gadfmt : PAnsiChar; const taglist : array of PtrUInt) : Ulong;
 begin
     TR_EasyRequestTags := TR_EasyRequest(app , bodyfmt , gadfmt , @taglist);
 end;
@@ -925,17 +925,17 @@ begin
     TR_CreateAppTags := TR_CreateApp(@apptags);
 end;
 
-FUNCTION TR_EasyRequestTags(app : pTR_App; bodyfmt : pCHAR; gadfmt : String; Const taglist : array of PtrUInt) : ULONG;
+FUNCTION TR_EasyRequestTags(app : pTR_App; bodyfmt : PAnsiChar; gadfmt : ShortString; Const taglist : array of PtrUInt) : ULONG;
 begin
     TR_EasyRequestTags := TR_EasyRequest(app,bodyfmt,pas2c(gadfmt), @taglist);
 end;
 
-FUNCTION TR_EasyRequestTags(app : pTR_App; bodyfmt : String; gadfmt : pCHAR; Const taglist : array of PtrUInt) : ULONG;
+FUNCTION TR_EasyRequestTags(app : pTR_App; bodyfmt : ShortString; gadfmt : PAnsiChar; Const taglist : array of PtrUInt) : ULONG;
 begin
     TR_EasyRequestTags := TR_EasyRequest(app,pas2c(bodyfmt),gadfmt, @taglist);
 end;
 
-FUNCTION TR_EasyRequestTags(app : pTR_App; bodyfmt : String; gadfmt : String; Const taglist : array of PtrUInt) : ULONG;
+FUNCTION TR_EasyRequestTags(app : pTR_App; bodyfmt : ShortString; gadfmt : ShortString; Const taglist : array of PtrUInt) : ULONG;
 begin
     TR_EasyRequestTags := TR_EasyRequest(app,pas2c(bodyfmt),pas2c(gadfmt), @taglist);
 end;

File diff suppressed because it is too large
+ 213 - 213
packages/amunits/src/otherlibs/tritonmacros.pas


+ 1 - 1
packages/amunits/src/otherlibs/ttengine.pas

@@ -37,7 +37,7 @@ USES Exec,utility,agraphics;
 VAR TTEngineBase : pLibrary = nil;
 
 const
-    TTENGINENAME : PChar = 'ttengine.library';
+    TTENGINENAME : PAnsiChar = 'ttengine.library';
 
 
   { $VER: ttengine.h 6.0 (3.1.2003) (c) by Grzegorz Kraszewski 2002.  }

+ 10 - 10
packages/amunits/src/otherlibs/xadmaster.pas

@@ -29,7 +29,7 @@ INTERFACE
 USES Exec,utility,amigados;
 
 const
-    XADMASTERNAME : PChar = 'xadmaster.library';
+    XADMASTERNAME : PAnsiChar = 'xadmaster.library';
 
 
   {
@@ -1184,10 +1184,10 @@ FUNCTION xadAddDiskEntryA(di : pxadDiskInfo location 'a0'; ai : pxadArchiveInfo
 FUNCTION xadAddFileEntryA(fi : pxadFileInfo location 'a0'; ai : pxadArchiveInfo location 'a1'; CONST tags : pTagItem location 'a2') : LONGINT; syscall xadMasterBase 156;
 FUNCTION xadAllocObjectA(_type : LONGINT location 'd0'; CONST tags : pTagItem location 'a0') : POINTER; syscall xadMasterBase 30;
 FUNCTION xadAllocVec(size : longword location 'd0'; flags : longword location 'd1') : POINTER; syscall xadMasterBase 108;
-FUNCTION xadCalcCRC16(id : longword location 'd0'; init : longword location 'd1'; size : longword location 'd2'; buffer : pCHAR location 'a0') : WORD; syscall xadMasterBase 96;
-FUNCTION xadCalcCRC32(id : longword location 'd0'; init : longword location 'd1'; size : longword location 'd2'; buffer : pCHAR location 'a0') : longword; syscall xadMasterBase 102;
+FUNCTION xadCalcCRC16(id : longword location 'd0'; init : longword location 'd1'; size : longword location 'd2'; buffer : PAnsiChar location 'a0') : WORD; syscall xadMasterBase 96;
+FUNCTION xadCalcCRC32(id : longword location 'd0'; init : longword location 'd1'; size : longword location 'd2'; buffer : PAnsiChar location 'a0') : longword; syscall xadMasterBase 102;
 FUNCTION xadConvertDatesA(CONST tags : pTagItem location 'a0') : LONGINT; syscall xadMasterBase 90;
-FUNCTION xadConvertNameA(charset : longword location 'd0'; CONST tags : pTagItem location 'a0') : pCHAR; syscall xadMasterBase 174;
+FUNCTION xadConvertNameA(charset : longword location 'd0'; CONST tags : pTagItem location 'a0') : PAnsiChar; syscall xadMasterBase 174;
 FUNCTION xadConvertProtectionA(CONST tags : pTagItem location 'a0') : LONGINT; syscall xadMasterBase 126;
 PROCEDURE xadCopyMem(src : POINTER location 'a0'; dest : POINTER location 'a1'; size : longword location 'd0'); syscall xadMasterBase 114;
 FUNCTION xadDiskFileUnArcA(ai : pxadArchiveInfo location 'a0'; CONST tags : pTagItem location 'a1') : LONGINT; syscall xadMasterBase 138;
@@ -1198,8 +1198,8 @@ PROCEDURE xadFreeInfo(ai : pxadArchiveInfo location 'a0'); syscall xadMasterBase
 PROCEDURE xadFreeObjectA(obj : POINTER location 'a0'; CONST tags : pTagItem location 'a1'); syscall xadMasterBase 36;
 FUNCTION xadGetClientInfo : pxadClient; syscall xadMasterBase 78;
 FUNCTION xadGetDiskInfoA(ai : pxadArchiveInfo location 'a0'; CONST tags : pTagItem location 'a1') : LONGINT; syscall xadMasterBase 132;
-FUNCTION xadGetErrorText(errnum : longword location 'd0') : pCHAR; syscall xadMasterBase 72;
-FUNCTION xadGetFilenameA(buffersize : longword location 'd0'; buffer : pCHAR location 'a0'; path : pCHAR location 'a1'; name : pCHAR location 'a2'; CONST tags : pTagItem location 'a3') : LONGINT; syscall xadMasterBase 168;
+FUNCTION xadGetErrorText(errnum : longword location 'd0') : PAnsiChar; syscall xadMasterBase 72;
+FUNCTION xadGetFilenameA(buffersize : longword location 'd0'; buffer : PAnsiChar location 'a0'; path : PAnsiChar location 'a1'; name : PAnsiChar location 'a2'; CONST tags : pTagItem location 'a3') : LONGINT; syscall xadMasterBase 168;
 FUNCTION xadGetHookAccessA(ai : pxadArchiveInfo location 'a0'; CONST tags : pTagItem location 'a1') : LONGINT; syscall xadMasterBase 144;
 FUNCTION xadGetInfoA(ai : pxadArchiveInfo location 'a0'; CONST tags : pTagItem location 'a1') : LONGINT; syscall xadMasterBase 48;
 FUNCTION xadHookAccess(command : longword location 'd0'; data : LONGINT location 'd1'; buffer : POINTER location 'a0'; ai : pxadArchiveInfo location 'a1') : LONGINT; syscall xadMasterBase 84;
@@ -1212,7 +1212,7 @@ FUNCTION xadAddDiskEntry(di : pxadDiskInfo; ai : pxadArchiveInfo; const tags : a
 FUNCTION xadAddFileEntry(fi : pxadFileInfo; ai : pxadArchiveInfo; const tags : array of PtrUInt) : LONGINT;
 FUNCTION xadAllocObject(_type : LONGINT; const tags : array of PtrUInt) : POINTER;
 FUNCTION xadConvertDates(const tags : array of PtrUInt) : LONGINT;
-FUNCTION xadConvertName(charset : longword; const tags : array of PtrUInt) : pCHAR;
+FUNCTION xadConvertName(charset : longword; const tags : array of PtrUInt) : PAnsiChar;
 FUNCTION xadConvertProtection(const tags : array of PtrUInt) : LONGINT;
 FUNCTION xadDiskFileUnArc(ai : pxadArchiveInfo; const tags : array of PtrUInt) : LONGINT;
 FUNCTION xadDiskUnArc(ai : pxadArchiveInfo; const tags : array of PtrUInt) : LONGINT;
@@ -1220,7 +1220,7 @@ FUNCTION xadFileUnArc(ai : pxadArchiveInfo; const tags : array of PtrUInt) : LON
 FUNCTION xadFreeHookAccess(ai : pxadArchiveInfo; const tags : array of PtrUInt) : LONGINT;
 PROCEDURE xadFreeObject(obj : POINTER; const tags : array of PtrUInt);
 FUNCTION xadGetDiskInfo(ai : pxadArchiveInfo; const tags : array of PtrUInt) : LONGINT;
-FUNCTION xadGetFilename(buffersize : longword; buffer : pCHAR; path : pCHAR; name : pCHAR; const tags : array of PtrUInt) : LONGINT;
+FUNCTION xadGetFilename(buffersize : longword; buffer : PAnsiChar; path : PAnsiChar; name : PAnsiChar; const tags : array of PtrUInt) : LONGINT;
 FUNCTION xadGetHookAccess(ai : pxadArchiveInfo; const tags : array of PtrUInt) : LONGINT;
 FUNCTION xadGetInfo(ai : pxadArchiveInfo; const tags : array of PtrUInt) : LONGINT;
 FUNCTION xadHookTagAccess(command : longword; data : LONGINT; buffer : POINTER; ai : pxadArchiveInfo; const tags : array of PtrUInt) : LONGINT;
@@ -1251,7 +1251,7 @@ begin
     xadConvertDates := xadConvertDatesA(@tags);
 end;
 
-FUNCTION xadConvertName(charset : longword; const tags : array of PtrUInt) : pCHAR;
+FUNCTION xadConvertName(charset : longword; const tags : array of PtrUInt) : PAnsiChar;
 begin
     xadConvertName := xadConvertNameA(charset , @tags);
 end;
@@ -1291,7 +1291,7 @@ begin
     xadGetDiskInfo := xadGetDiskInfoA(ai , @tags);
 end;
 
-FUNCTION xadGetFilename(buffersize : longword; buffer : pCHAR; path : pCHAR; name : pCHAR; const tags : array of PtrUInt) : LONGINT;
+FUNCTION xadGetFilename(buffersize : longword; buffer : PAnsiChar; path : PAnsiChar; name : PAnsiChar; const tags : array of PtrUInt) : LONGINT;
 begin
     xadGetFilename := xadGetFilenameA(buffersize , buffer , path , name , @tags);
 end;

+ 3 - 3
packages/amunits/src/otherlibs/zlib.pas

@@ -36,7 +36,7 @@ USES Exec;
 VAR ZLibBase : pLibrary = nil;
 
 const
-    ZLIBNAME : PChar = 'zlib.library';
+    ZLIBNAME : PAnsiChar = 'zlib.library';
 
   { Version 1.0  }
   { Compression strategy  }
@@ -54,9 +54,9 @@ FUNCTION GZ_Close(handle : POINTER location 'a0') : LONGINT; syscall ZLibBase 04
 FUNCTION GZ_CompressMem(srcbuf : POINTER location 'a0'; srclen : longword location 'd0'; destbuf : POINTER location 'a1'; destlen : longword location 'd1'; strategy : longword location 'd2'; level : longword location 'd3'; VAR poutlen : longword location 'a2') : LONGINT; syscall ZLibBase 114;
 FUNCTION GZ_DecompressMem(srcbuf : POINTER location 'a0'; srclen : longword location 'd0'; destbuf : POINTER location 'a1'; destlen : longword location 'd1') : LONGINT; syscall ZLibBase 120;
 FUNCTION GZ_FGetC(handle : POINTER location 'a0') : pLONGINT; syscall ZLibBase 060;
-FUNCTION GZ_FGetS(handle : POINTER location 'a0'; buf : pCHAR location 'a1'; len : longword location 'd0') : pCHAR; syscall ZLibBase 054;
+FUNCTION GZ_FGetS(handle : POINTER location 'a0'; buf : PAnsiChar location 'a1'; len : longword location 'd0') : PAnsiChar; syscall ZLibBase 054;
 FUNCTION GZ_FileLength(handle : POINTER location 'a0') : longword; syscall ZLibBase 138;
-FUNCTION GZ_Open(filename : pCHAR location 'a0'; openmode : longword location 'd0'; strategy : longword location 'd1'; level : longword location 'd2') : POINTER; syscall ZLibBase 030;
+FUNCTION GZ_Open(filename : PAnsiChar location 'a0'; openmode : longword location 'd0'; strategy : longword location 'd1'; level : longword location 'd2') : POINTER; syscall ZLibBase 030;
 FUNCTION GZ_OpenFromFH(fh : LONGINT location 'a0'; openmode : longword location 'd0'; strategy : longword location 'd1'; level : longword location 'd2') : POINTER; syscall ZLibBase 036;
 FUNCTION GZ_Read(handle : POINTER location 'a0'; buf : POINTER location 'a1'; len : longword location 'd0') : LONGINT; syscall ZLibBase 048;
 FUNCTION GZ_Write(handle : POINTER location 'a0'; buf : POINTER location 'a1'; len : longword location 'd0') : LONGINT; syscall ZLibBase 066;

+ 18 - 18
packages/amunits/src/utilunits/amigautils.pas

@@ -30,10 +30,10 @@ interface
 
 uses strings;
 
-function ExtractFilePath(FileName: PChar): PChar;
-function FileType(thefile :  PChar): Longint;
-Function PathAndFile(Path,FName : PChar): PChar;
-FUNCTION PathOf(Name : PChar): PChar;
+function ExtractFilePath(FileName: PAnsiChar): PAnsiChar;
+function FileType(thefile :  PAnsiChar): Longint;
+Function PathAndFile(Path,FName : PAnsiChar): PAnsiChar;
+FUNCTION PathOf(Name : PAnsiChar): PAnsiChar;
 
 Function LongToStr (I : Longint) : String;
 
@@ -58,7 +58,7 @@ Type
         fib_DirEntryType : Longint;
                         { Type of Directory. If < 0, then a plain file.
                           If > 0 a directory }
-        fib_FileName     : Array [0..107] of Char;
+        fib_FileName     : Array [0..107] of AnsiChar;
                         { Null terminated. Max 30 chars used for now }
         fib_Protection   : Longint;
                         { bit mask of protection, rwxd are 3-0. }
@@ -66,22 +66,22 @@ Type
         fib_Size         : Longint;      { Number of bytes in file }
         fib_NumBlocks    : Longint;      { Number of blocks in file }
         fib_Date         : tDateStamp;   { Date file last changed }
-        fib_Comment      : Array [0..79] of Char;
+        fib_Comment      : Array [0..79] of AnsiChar;
                         { Null terminated comment associated with file }
         fib_OwnerUID     : Word;
         fib_OwnerGID     : Word;
-        fib_Reserved     : Array [0..31] of Char;
+        fib_Reserved     : Array [0..31] of AnsiChar;
     end;
 
 {$PACKRECORDS 2}
 
 FUNCTION Examine(lock : LONGINT location 'd1'; fileInfoBlock : pFileInfoBlock location 'd2') : LongBool; syscall _DOSBase 102;
-FUNCTION Lock(name : pCHAR location 'd1'; type_ : LONGINT location 'd2') : LONGINT; syscall _DOSBase 084;
+FUNCTION Lock(name : PAnsiChar location 'd1'; type_ : LONGINT location 'd2') : LONGINT; syscall _DOSBase 084;
 PROCEDURE UnLock(lock : LONGINT location 'd1'); syscall _DOSBase 090;
 
-FUNCTION PCharCopy(s: PChar; thepos , len : Longint): PChar;
+FUNCTION PCharCopy(s: PAnsiChar; thepos , len : Longint): PAnsiChar;
 VAR
-    dummy : PChar;
+    dummy : PAnsiChar;
 BEGIN
     getmem(dummy,len+1);
     dummy := strlcopy(dummy,@s[thepos],len);
@@ -89,7 +89,7 @@ BEGIN
 END;
 
 
-function ExtractFilePath(FileName: PChar): PChar;
+function ExtractFilePath(FileName: PAnsiChar): PAnsiChar;
 var
   I: Longint;
 begin
@@ -98,7 +98,7 @@ begin
   ExtractFilePath := PCharCopy(FileName, 0, I+1);
 end;
 
-function FileType(thefile :  PChar): Longint;
+function FileType(thefile :  PAnsiChar): Longint;
 VAR
    fib  :  pFileInfoBlock;
    mylock : Longint;
@@ -117,18 +117,18 @@ begin
     FileType := mytype
 END;
 
-Function PathAndFile(Path,FName : PChar): PChar;
+Function PathAndFile(Path,FName : PAnsiChar): PAnsiChar;
 var
-    LastChar : CHAR;
-    Temparray : ARRAY [0..255] OF CHAR;
-    Temp     : PChar;
+    LastChar : AnsiChar;
+    Temparray : ARRAY [0..255] OF AnsiChar;
+    Temp     : PAnsiChar;
 BEGIN
     Temp := @Temparray;
     if strlen(Path) > 0 then begin
         strcopy(Temp, Path);
         LastChar := Temp[Pred(strlen(Temp))];
         if (LastChar <> '/') and (LastChar <> ':') then
-            strcat(Temp, PChar('/'#0));
+            strcat(Temp, PAnsiChar('/'#0));
         if strlen(FName) > 0 then
             strcat(Temp,FName);
     end;
@@ -139,7 +139,7 @@ BEGIN
     end;
 end;
 
-FUNCTION PathOf(Name : PChar): PChar;
+FUNCTION PathOf(Name : PAnsiChar): PAnsiChar;
 begin
     PathOf := ExtractFilePath(Name);
 end;

+ 24 - 24
packages/amunits/src/utilunits/consoleio.pas

@@ -45,7 +45,7 @@ TYPE
                      WriteRequest,
                      ReadRequest : pIOStdReq;
                      Window     : pWindow; { not yet used }
-                     Buffer     : Char;
+                     Buffer     : AnsiChar;
                  end;
     pConsoleSet = ^tConsoleSet;
 
@@ -57,18 +57,18 @@ dealing with windows.  They are pulled from the ROM Kernel Manual.
 See ConsoleTest.p for an example of using these routines.
 }
 
-Procedure ConPutChar(Request : pIOStdReq; Character : Char);
-Procedure ConWrite(Request : pIOStdReq; Str : pchar; length : longint);
-Procedure ConPutStr(Request : pIOStdReq; Str : pchar);
-Procedure QueueRead(Request : pIOStdReq; Where : pchar);
+Procedure ConPutChar(Request : pIOStdReq; Character : AnsiChar);
+Procedure ConWrite(Request : pIOStdReq; Str : PAnsiChar; length : longint);
+Procedure ConPutStr(Request : pIOStdReq; Str : PAnsiChar);
+Procedure QueueRead(Request : pIOStdReq; Where : PAnsiChar);
 Function ConGetChar(consolePort : pMsgPort; Request : pIOStdReq;
-                        WhereTo : pchar) : Char;
+                        WhereTo : PAnsiChar) : AnsiChar;
 Procedure CleanSet(con : pConsoleSet);
 Function AttachConsole(w : pWindow) : pConsoleSet;
-Function ReadKey(con : pConsoleSet) : Char;
+Function ReadKey(con : pConsoleSet) : AnsiChar;
 Function KeyPressed(con : pConsoleSet) : Boolean;
-Procedure WriteString(con : pConsoleSet; Str : Pchar);
-Procedure WriteString(con : pConsoleSet; Str : string);
+Procedure WriteString(con : pConsoleSet; Str : PAnsiChar);
+Procedure WriteString(con : pConsoleSet; Str : ShortString);
 Function MaxX(con : pConsoleSet) : smallint;
 Function MaxY(con : pConsoleSet) : smallint;
 Function WhereX(con : pConsoleSet) : smallint;
@@ -81,7 +81,7 @@ Procedure ClrScr(con : pConsoleSet);
 Procedure CursOff(con : pConsoleSet);
 Procedure CursOn(con : pConsoleSet);
 Procedure DelLine(con : pConsoleSet);
-Function LongToStr (I : smallint) : String;
+Function LongToStr (I : smallint) : ShortString;
 Procedure GotoXY(con : pConsoleSet; x,y : smallint);
 Procedure InsLine(con : pConsoleSet);
 Procedure OpenConsoleDevice;
@@ -89,7 +89,7 @@ Procedure CloseConsoleDevice;
 
 implementation
 
-Procedure ConPutChar(Request : pIOStdReq; Character : Char);
+Procedure ConPutChar(Request : pIOStdReq; Character : AnsiChar);
 var
     Error : longint;
 begin
@@ -99,7 +99,7 @@ begin
     Error := DoIO(pIORequest(Request));
 end;
 
-Procedure ConWrite(Request : pIOStdReq; Str : pchar; length : longint);
+Procedure ConWrite(Request : pIOStdReq; Str : PAnsiChar; length : longint);
 var
    Error : longint;
 begin
@@ -109,7 +109,7 @@ begin
     Error := DoIO(pIORequest(Request));
 end;
 
-Procedure ConPutStr(Request : pIOStdReq; Str : pchar);
+Procedure ConPutStr(Request : pIOStdReq; Str : PAnsiChar);
 var
     Error : longint;
 begin
@@ -119,7 +119,7 @@ begin
     Error := DoIO(pIORequest(Request));
 end;
 
-Procedure QueueRead(Request : pIOStdReq; Where : pchar);
+Procedure QueueRead(Request : pIOStdReq; Where : PAnsiChar);
 begin
     Request^.io_Command := CMD_READ;
     Request^.io_Data := Where;
@@ -128,9 +128,9 @@ begin
 end;
 
 Function ConGetChar(consolePort : pMsgPort; Request : pIOStdReq;
-                        WhereTo : pchar) : Char;
+                        WhereTo : PAnsiChar) : AnsiChar;
 var
-    Temp : Char;
+    Temp : AnsiChar;
     TempMsg : pMessage;
 begin
     if GetMsg(consolePort) = Nil then begin
@@ -201,7 +201,7 @@ begin
     AttachConsole := Con;
 end;
 
-Function ReadKey(con : pConsoleSet) : Char;
+Function ReadKey(con : pConsoleSet) : AnsiChar;
 begin
     with con^ do
         ReadKey := ConGetChar(ReadPort, ReadRequest, Addr(Buffer));
@@ -213,14 +213,14 @@ begin
         KeyPressed := CheckIO(pIORequest(ReadRequest)) <> Nil;
 end;
 
-Procedure WriteString(con : pConsoleSet; Str : Pchar);
+Procedure WriteString(con : pConsoleSet; Str : PAnsiChar);
 begin
     ConPutStr(con^.WriteRequest, Str);
 end;
 
-Procedure WriteString(con : pConsoleSet; Str : string);
+Procedure WriteString(con : pConsoleSet; Str : ShortString);
 var
-    temp : string;
+    temp : ShortString;
 begin
     temp := Str;
     temp := temp + #0;
@@ -338,9 +338,9 @@ begin
     WriteString(con, CSI + 'M');
 end;
 
-Function LongToStr (I : smallint) : String;
+Function LongToStr (I : smallint) : ShortString;
 Var
-    S : String;
+    S : ShortString;
 begin
     Str (I,S);
     LongToStr:=S;
@@ -359,9 +359,9 @@ begin
     YRep := LongToStr(y);
     WriteString(con,CSI);
     WriteString(con,(YRep));
-    WriteString(con,string(';'));
+    WriteString(con,ShortString(';'));
     WriteString(con,(XRep));
-    WriteString(con,string('H'));
+    WriteString(con,ShortString('H'));
 end;
 
 

+ 3 - 3
packages/amunits/src/utilunits/deadkeys.pas

@@ -48,13 +48,13 @@ interface
 
 uses exec,intuition,console,inputevent;
 
-function DeadKeyConvert(msg : pIntuiMessage; buffer : pchar;
+function DeadKeyConvert(msg : pIntuiMessage; buffer : PAnsiChar;
                         bufsize : longint; keymap : pointer): longint;
 
 implementation
 
 
-function DeadKeyConvert(msg : pIntuiMessage; buffer : pchar;
+function DeadKeyConvert(msg : pIntuiMessage; buffer : PAnsiChar;
                         bufsize : longint; keymap : pointer): longint;
 
 var
@@ -86,7 +86,7 @@ end;
 
 begin
    ConsoleDevice := nil;
-   OpenDevice(pchar('console.device'#0),-1,Addr(ConsoleRequest),0);
+   OpenDevice(PAnsiChar('console.device'#0),-1,Addr(ConsoleRequest),0);
    ConsoleDevice := ConsoleRequest.io_Device;
    my_exit := ExitProc;
    ExitProc := @CloseConsoleDevice;

+ 26 - 26
packages/amunits/src/utilunits/easyasl.pas

@@ -56,22 +56,22 @@ TYPE
     END;
 
 
-FUNCTION GetFileAsl(title : PChar; VAR path, fname : PChar; thepatt : PChar;win : Pointer): Boolean;
-FUNCTION GetFontAsl(title : PChar;VAR finfo : tFPCFontInfo; win : Pointer): Boolean;
-FUNCTION GetMultiAsl(title : PChar; VAR path : PChar;  VAR Thelist : pList; thepatt : PChar;win : Pointer): Boolean;
-FUNCTION GetPathAsl(title : PChar; VAR path : PChar; win : Pointer): Boolean;
-FUNCTION SaveFileAsl(title : PChar; VAR path, fname : PChar; win : Pointer): Boolean;
+FUNCTION GetFileAsl(title : PAnsiChar; VAR path, fname : PAnsiChar; thepatt : PAnsiChar;win : Pointer): Boolean;
+FUNCTION GetFontAsl(title : PAnsiChar;VAR finfo : tFPCFontInfo; win : Pointer): Boolean;
+FUNCTION GetMultiAsl(title : PAnsiChar; VAR path : PAnsiChar;  VAR Thelist : pList; thepatt : PAnsiChar;win : Pointer): Boolean;
+FUNCTION GetPathAsl(title : PAnsiChar; VAR path : PAnsiChar; win : Pointer): Boolean;
+FUNCTION SaveFileAsl(title : PAnsiChar; VAR path, fname : PAnsiChar; win : Pointer): Boolean;
 
 
-FUNCTION GetFileAsl(title : PChar; VAR path, fname : PChar; thepatt : String;win : Pointer): Boolean;
-FUNCTION GetFileAsl(title : String; VAR path, fname : PChar; thepatt : PChar;win : Pointer): Boolean;
-FUNCTION GetFileAsl(title : String; VAR path, fname : PChar; thepatt : String;win : Pointer): Boolean;
+FUNCTION GetFileAsl(title : PAnsiChar; VAR path, fname : PAnsiChar; thepatt : String;win : Pointer): Boolean;
+FUNCTION GetFileAsl(title : String; VAR path, fname : PAnsiChar; thepatt : PAnsiChar;win : Pointer): Boolean;
+FUNCTION GetFileAsl(title : String; VAR path, fname : PAnsiChar; thepatt : String;win : Pointer): Boolean;
 FUNCTION GetFontAsl(title : String;VAR finfo : tFPCFontInfo; win : Pointer): Boolean;
-FUNCTION GetMultiAsl(title : PChar; VAR path : PChar;  VAR Thelist : pList; thepatt : String;win : Pointer): Boolean;
-FUNCTION GetMultiAsl(title : String; VAR path : PChar;  VAR Thelist : pList; thepatt : PChar;win : Pointer): Boolean;
-FUNCTION GetMultiAsl(title : String; VAR path : PChar;  VAR Thelist : pList; thepatt : String;win : Pointer): Boolean;
-FUNCTION GetPathAsl(title : String; VAR path : PChar; win : Pointer): Boolean;
-FUNCTION SaveFileAsl(title : String; VAR path, fname : PChar; win : Pointer): Boolean;
+FUNCTION GetMultiAsl(title : PAnsiChar; VAR path : PAnsiChar;  VAR Thelist : pList; thepatt : String;win : Pointer): Boolean;
+FUNCTION GetMultiAsl(title : String; VAR path : PAnsiChar;  VAR Thelist : pList; thepatt : PAnsiChar;win : Pointer): Boolean;
+FUNCTION GetMultiAsl(title : String; VAR path : PAnsiChar;  VAR Thelist : pList; thepatt : String;win : Pointer): Boolean;
+FUNCTION GetPathAsl(title : String; VAR path : PAnsiChar; win : Pointer): Boolean;
+FUNCTION SaveFileAsl(title : String; VAR path, fname : PAnsiChar; win : Pointer): Boolean;
 
 
 implementation
@@ -81,7 +81,7 @@ implementation
 
 
 
-FUNCTION GetFileAsl(title : PChar; VAR path, fname : PChar; thepatt : PChar;win : Pointer): Boolean;
+FUNCTION GetFileAsl(title : PAnsiChar; VAR path, fname : PAnsiChar; thepatt : PAnsiChar;win : Pointer): Boolean;
 
 VAR
     fr : pFileRequester;
@@ -155,7 +155,7 @@ BEGIN
     GetFileAsl := result;
 END;
 
-FUNCTION GetFontAsl(title : PChar;VAR finfo : tFPCFontInfo; win : Pointer): Boolean;
+FUNCTION GetFontAsl(title : PAnsiChar;VAR finfo : tFPCFontInfo; win : Pointer): Boolean;
 
 VAR
     fr : pFontRequester;
@@ -264,7 +264,7 @@ BEGIN
     GetFontAsl := result;
 END;
 
-FUNCTION GetMultiAsl(title : PChar; VAR path : PChar;  VAR Thelist : pList; thepatt : PChar;win : Pointer): Boolean;
+FUNCTION GetMultiAsl(title : PAnsiChar; VAR path : PAnsiChar;  VAR Thelist : pList; thepatt : PAnsiChar;win : Pointer): Boolean;
 
 VAR
     fr : pFileRequester;
@@ -337,7 +337,7 @@ BEGIN
         GetMultiAsl := result;
 END;
 
-FUNCTION GetPathAsl(title : PChar; VAR path : PChar; win : Pointer): Boolean;
+FUNCTION GetPathAsl(title : PAnsiChar; VAR path : PAnsiChar; win : Pointer): Boolean;
 
 VAR
     fr : pFileRequester;
@@ -394,7 +394,7 @@ BEGIN
     GetPathAsl := result;
 END;
 
-FUNCTION SaveFileAsl(title : PChar; VAR path, fname : PChar; win : Pointer): Boolean;
+FUNCTION SaveFileAsl(title : PAnsiChar; VAR path, fname : PAnsiChar; win : Pointer): Boolean;
 
 VAR
     fr : pFileRequester;
@@ -459,17 +459,17 @@ BEGIN
 END;
 
 
-FUNCTION GetFileAsl(title : String; VAR path, fname : PChar; thepatt : PChar;win : Pointer): Boolean;
+FUNCTION GetFileAsl(title : String; VAR path, fname : PAnsiChar; thepatt : PAnsiChar;win : Pointer): Boolean;
 begin
     GetFileAsl := GetFileAsl(pas2c(title),path,fname,thepatt,win);
 end;
 
-FUNCTION GetFileAsl(title : String; VAR path, fname : PChar; thepatt : String;win : Pointer): Boolean;
+FUNCTION GetFileAsl(title : String; VAR path, fname : PAnsiChar; thepatt : String;win : Pointer): Boolean;
 begin
     GetFileAsl := GetFileAsl(pas2c(title),path,fname,pas2c(thepatt),win);
 end;
 
-FUNCTION GetFileAsl(title : PChar; VAR path, fname : PChar; thepatt : String;win : Pointer): Boolean;
+FUNCTION GetFileAsl(title : PAnsiChar; VAR path, fname : PAnsiChar; thepatt : String;win : Pointer): Boolean;
 begin
     GetFileAsl := GetFileAsl(title,path,fname,pas2c(thepatt),win);
 end;
@@ -479,27 +479,27 @@ begin
     GetFontAsl := GetFontAsl(pas2c(title),finfo,win);
 end;
 
-FUNCTION GetMultiAsl(title : String; VAR path : PChar;  VAR Thelist : pList; thepatt : PChar;win : Pointer): Boolean;
+FUNCTION GetMultiAsl(title : String; VAR path : PAnsiChar;  VAR Thelist : pList; thepatt : PAnsiChar;win : Pointer): Boolean;
 begin
     GetMultiAsl := GetMultiAsl(pas2c(title),path,TheList,thepatt,win);
 end;
 
-FUNCTION GetMultiAsl(title : String; VAR path : PChar;  VAR Thelist : pList; thepatt : String;win : Pointer): Boolean;
+FUNCTION GetMultiAsl(title : String; VAR path : PAnsiChar;  VAR Thelist : pList; thepatt : String;win : Pointer): Boolean;
 begin
     GetMultiAsl := GetMultiAsl(pas2c(title),path,TheList,pas2c(thepatt),win);
 end;
 
-FUNCTION GetMultiAsl(title : PChar; VAR path : PChar;  VAR Thelist : pList; thepatt : String;win : Pointer): Boolean;
+FUNCTION GetMultiAsl(title : PAnsiChar; VAR path : PAnsiChar;  VAR Thelist : pList; thepatt : String;win : Pointer): Boolean;
 begin
     GetMultiAsl := GetMultiAsl(title,path,TheList,pas2c(thepatt),win);
 end;
 
-FUNCTION GetPathAsl(title : String; VAR path : PChar; win : Pointer): Boolean;
+FUNCTION GetPathAsl(title : String; VAR path : PAnsiChar; win : Pointer): Boolean;
 begin
     GetPathAsl := GetPathAsl(pas2c(title),path,win);
 end;
 
-FUNCTION SaveFileAsl(title : String; VAR path, fname : PChar; win : Pointer): Boolean;
+FUNCTION SaveFileAsl(title : String; VAR path, fname : PAnsiChar; win : Pointer): Boolean;
 begin
     SaveFileAsl := SaveFileAsl(pas2c(title),path,fname,win);
 end;

+ 11 - 11
packages/amunits/src/utilunits/hisoft.pas

@@ -42,15 +42,15 @@ const
 
 procedure MakeMenu(var mnm: tNewMenu;
         nmType: byte;
-        nmLabel: string;
-        nmCommKey: string;
+        nmLabel: ShortString;
+        nmCommKey: ShortString;
         nmFlags: word;
         nmMutualExclude: longint;
         nmUserData: longint);
 
-function ptrtopas(s : pchar): string;
-function FExpandLock( l : BPTR): String;
-Function CSCPAR(rk : pRemember; s : String) : STRPTR;
+function ptrtopas(s : PAnsiChar): ShortString;
+function FExpandLock( l : BPTR): ShortString;
+Function CSCPAR(rk : pRemember; s : ShortString) : STRPTR;
 
 implementation
 
@@ -61,8 +61,8 @@ implementation
  *)
 procedure MakeMenu(var mnm: tNewMenu;
         nmType: byte;
-        nmLabel: string;
-        nmCommKey: string;
+        nmLabel: ShortString;
+        nmCommKey: ShortString;
         nmFlags: word;
         nmMutualExclude: longint;
         nmUserData: longint);
@@ -79,14 +79,14 @@ begin
         mnm.nm_UserData := pointer(nmUserData);
 end;
 
-function ptrtopas(s : pchar): string;
+function ptrtopas(s : PAnsiChar): ShortString;
 begin
    ptrtopas := strpas(s);
 end;
 
-function FExpandLock( l : BPTR): String;
+function FExpandLock( l : BPTR): ShortString;
 var
-   buffer : array[0..255] of char;
+   buffer : array[0..255] of AnsiChar;
 begin
   {$if not defined(AMIGA_V1_2_ONLY)}
    if l <> 0 then begin
@@ -97,7 +97,7 @@ begin
      FExpandLock := '';
 end;
 
-Function CSCPAR(rk : pRemember; s : String) : STRPTR;
+Function CSCPAR(rk : pRemember; s : ShortString) : STRPTR;
 VAR
         p : STRPTR;
 

Some files were not shown because too many files changed in this diff