Bladeren bron

* Char -> AnsiChar

Michael VAN CANNEYT 2 jaren geleden
bovenliggende
commit
1852006c61
5 gewijzigde bestanden met toevoegingen van 55 en 55 verwijderingen
  1. 21 21
      rtl/aros/doslibd.inc
  2. 15 15
      rtl/aros/i386/doslibf.inc
  3. 5 5
      rtl/aros/i386/execd.inc
  4. 7 7
      rtl/aros/i386/execf.inc
  5. 7 7
      rtl/aros/system.pp

+ 21 - 21
rtl/aros/doslibd.inc

@@ -76,18 +76,18 @@ type  // Checked OK 04.08.2011 ALB
   TFileInfoBlock = record
     fib_DiskKey     : PtrUInt;
     fib_DirEntryType: LongInt;
-    fib_FileName    : array[0..MAXFILENAMELENGTH - 1] of char;
+    fib_FileName    : array[0..MAXFILENAMELENGTH - 1] of AnsiChar;
     fib_Protection  : LongInt;
     fib_EntryType   : LongInt;
     fib_Size        : LongInt;
     fib_NumBlocks   : LongInt;
     fib_Date        : TDateStamp;
-    fib_Comment     : Array[0..MAXCOMMENTLENGTH - 1] Of char;
+    fib_Comment     : Array[0..MAXCOMMENTLENGTH - 1] Of AnsiChar;
 
     fib_OwnerUID    : Word;
     fib_OwnerGID    : Word;
 
-    fib_Reserved    : array[0..31] of char;
+    fib_Reserved    : array[0..31] of AnsiChar;
   end;
 
 const  // Checked OK 04.08.2011 ALB
@@ -334,7 +334,7 @@ type  // Checked OK 04.08.2011 ALB
     pr_Flags         : LongInt;
     pr_ExitCode      : Pointer;  { Procedure }
     pr_ExitData      : PtrUInt;
-    pr_Arguments     : PChar;
+    pr_Arguments     : PAnsiChar;
     pr_LocalVars     : TMinList;
     pr_ShellPrivate  : DWord;
     pr_CES           : BPTR;    { BPTR }
@@ -510,7 +510,7 @@ type   // Checked OK 04.08.2011 ALB
   PErrorString = ^TErrorString;
   TErrorString = record
     estr_Nums: PLongInt;
-    estr_Strings: PChar;
+    estr_Strings: PAnsiChar;
   end;
 
 type   // Checked OK 04.08.2011 ALB
@@ -600,7 +600,7 @@ type  // Checked OK 04.08.2011 ALB
     seg_Next : PSegment;  // Pointer to next segment.
     seg_UC   : LongInt;
     seg_Seg  : BPTR;   { BPTR }
-    seg_Name : Array[0..3] of char;
+    seg_Name : Array[0..3] of AnsiChar;
     { * seg_Name continues * }
   end;
 
@@ -713,7 +713,7 @@ type  // Checked TODO 04.08.2011 ALB
          end;
        );
     2: ( dol_assign : record
-           dol_AssignName: PChar;
+           dol_AssignName: PAnsiChar;
            dol_List      : PAssignList;
          end;
        );
@@ -813,7 +813,7 @@ type  // Checked OK 04.08.2011 ALB
     an_Lock  : BPTR;
     an_Info  : TFileInfoBlock;
     an_Flags : ShortInt;
-    an_String: array[0..0] of Char;
+    an_String: array[0..0] of AnsiChar;
     { * an_String continues * }
   end;
 
@@ -835,7 +835,7 @@ type  // Checked OK 04.08.2011 ALB
           ap_Reserved:   ShortInt;
           ap_Strlen:     SmallInt;
           ap_Info:       TFileInfoBlock;
-          ap_Buf:        array[0..255] of char;
+          ap_Buf:        array[0..255] of AnsiChar;
           { * an_Buf continues * }
         );
   end;
@@ -1009,14 +1009,14 @@ type  // Checked OK 04.08.2011 ALB
   PExAllData = ^TExAllData;
   TExAllData = record
     ed_Next    : PExAllData;
-    ed_Name    : PChar;
+    ed_Name    : PAnsiChar;
     ed_Type    : LongInt;
     ed_Size    : Cardinal;
     ed_Prot    : Cardinal;
     ed_Days    : Cardinal;
     ed_Mins    : Cardinal;
     ed_Ticks   : Cardinal;
-    ed_Comment : PChar;
+    ed_Comment : PAnsiChar;
     ed_OwnerUID: Word;
     ed_OwnerGID: Word;
   end;
@@ -1026,7 +1026,7 @@ type  // Checked OK 04.08.2011 ALB
   TexAllControl = record
     eac_Entries    : Cardinal;
     eac_LastKey    : PtrUInt;  // private
-    eac_MatchString: PChar;
+    eac_MatchString: PAnsiChar;
     eac_MatchFunc  : PHook;
   end;
 
@@ -1144,7 +1144,7 @@ type  // Checked OK 04.08.2011 ALB
   TLocalVar = record
     lv_Node : TNode;
     lv_Flags: Word;
-    lv_Value: PChar;
+    lv_Value: PAnsiChar;
     lv_Len  : Cardinal;
   end;
 
@@ -1153,9 +1153,9 @@ type  // Checked OK 04.08.2011 ALB
   TScanVarsMsg = record
     sv_SVMSize: Cardinal;  // Size of ScanVarsMsg structure
     sv_Flags: Cardinal;    // The flags parameter given to ScanVars()
-    sv_GDir: PChar;        // Directory patch for global variables or empty string "\0" for local variables
-    sv_Name: PChar;        // Name of the variable
-    sv_Var: PChar;         // Pointer to the contents of the variable
+    sv_GDir: PAnsiChar;        // Directory patch for global variables or empty string "\0" for local variables
+    sv_Name: PAnsiChar;        // Name of the variable
+    sv_Var: PAnsiChar;         // Pointer to the contents of the variable
     sv_VarLen: Cardinal;   // Size of the variable
   end;
 
@@ -1192,7 +1192,7 @@ const   // Checked OK 04.08.2011 ALB
 type  // Checked OK 04.08.2011 ALB
   PCSource = ^TCSource;
   TCSource = record
-    CS_Buffer: PChar;
+    CS_Buffer: PAnsiChar;
     CS_Length: LongInt;
     CS_CurChr: LongInt;
   end;
@@ -1202,9 +1202,9 @@ type  // Checked OK 04.08.2011 ALB
   TRDArgs = record
     RDA_Source : TCSource;
     RDA_DAList : PtrUInt;
-    RDA_Buffer : PChar;
+    RDA_Buffer : PAnsiChar;
     RDA_BufSiz : LongInt;
-    RDA_ExtHelp: PChar;
+    RDA_ExtHelp: PAnsiChar;
     RDA_Flags  : LongInt;
   end;
 
@@ -1320,8 +1320,8 @@ const  // Checked OK 04.08.2011 ALB
 type  // Checked OK 04.08.2011 ALB
   PNotifyRequest = ^TNotifyRequest;
   TNotifyRequest = record
-    nr_Name    : PChar;
-    nr_FullName: PChar;
+    nr_Name    : PAnsiChar;
+    nr_FullName: PAnsiChar;
     nr_UserData: PtrUInt;
     nr_Flags   : Cardinal;
     nr_stuff : record

+ 15 - 15
rtl/aros/i386/doslibf.inc

@@ -13,7 +13,7 @@
 
  **********************************************************************}
 
-function Open(name: PChar; accessMode: longint): BPTR; syscall AOS_DOSBase 5;
+function Open(name: PAnsiChar; accessMode: longint): BPTR; syscall AOS_DOSBase 5;
 function dosClose(_file: BPTR): LongBool;  syscall AOS_DOSBase 6;
 function dosRead(_file: BPTR; buffer: Pointer; length: longint): longint; syscall AOS_DOSBase 7;
 function dosWrite(_file: BPTR; buffer: Pointer; length: longint): longint;  syscall AOS_DOSBase 8;
@@ -23,41 +23,41 @@ function dosOutput: BPTR; syscall AOS_DOSBase 10;
 function DosError1: BPTR;  syscall AOS_DOSBase 142;
 {$endif}
 function dosSeek(_file: BPTR; position: longint;offset: longint): longint; syscall AOS_DOSBase 11;
-function dosDeleteFile(const name: PChar): LongBool; syscall AOS_DOSBase 12;
-function dosRename(const oldName: PChar;newName: PChar): LongInt; syscall AOS_DOSBase 13;
-function Lock(const name: PChar;_type: longint): BPTR; syscall AOS_DOSBase 14;
+function dosDeleteFile(const name: PAnsiChar): LongBool; syscall AOS_DOSBase 12;
+function dosRename(const oldName: PAnsiChar;newName: PAnsiChar): LongInt; syscall AOS_DOSBase 13;
+function Lock(const name: PAnsiChar;_type: longint): BPTR; syscall AOS_DOSBase 14;
 function UnLock(lock: BPTR): LongInt; syscall AOS_DOSBase 15;
 function DupLock(Lock: BPTR): BPTR; syscall AOS_DOSBase 16;
 function Examine(lock: BPTR; fileInfoBlock: PFileInfoBlock): LongInt; syscall AOS_DOSBase 17;
 function Info(lock: BPTR; parameterBlock: PInfoData): LongInt; syscall AOS_DOSBase 19;
-function dosCreateDir(const name: PChar): BPTR; syscall AOS_DOSBase 20;
+function dosCreateDir(const name: PAnsiChar): BPTR; syscall AOS_DOSBase 20;
 function CurrentDir(lock: BPTR): BPTR; syscall AOS_DOSBase 21;
 function IoErr: longint; syscall AOS_DOSBase 22;
 procedure dosExit(ErrCode: longint); syscall AOS_DOSBase 24;
-function SetProtection(const name: PChar; protect: longword): LongInt; syscall AOS_DOSBase 31;
+function SetProtection(const name: PAnsiChar; protect: longword): LongInt; syscall AOS_DOSBase 31;
 function DateStamp(date: PDateStamp): PDateStamp; syscall AOS_DOSBase 32;
 procedure dosDelay(ticks: LongWord); syscall AOS_DOSBase 33;
 function AllocDosObject(Type_: LongWord; const Tags: PTagItem): Pointer; syscall AOS_DOSBase 38;
 procedure FreeDosObject(Type_: LongWord; Ptr: Pointer); syscall AOS_DOSBase 39;
-function SetFileDate(name: PChar; date: PDateStamp): LongBool; syscall AOS_DOSBase 66;
-function NameFromLock(lock: BPTR; buffer: PChar; len: longint): LongBool; syscall AOS_DOSBase 67;
+function SetFileDate(name: PAnsiChar; date: PDateStamp): LongBool; syscall AOS_DOSBase 66;
+function NameFromLock(lock: BPTR; buffer: PAnsiChar; len: longint): LongBool; syscall AOS_DOSBase 67;
 function SetFileSize(fh: BPTR; pos: longint; mode: longint): longint; syscall AOS_DOSBase 76;
 function Cli : pCommandLineInterface; syscall AOS_DOSBase 82;
 function CreateNewProc(const Tags: PTagItem): PProcess; syscall AOS_DOSBase 83;
-function GetArgStr: PChar; syscall AOS_DOSBase 89;
-function GetCurrentDirName(buf: PChar; len: longint): LongBool; syscall AOS_DOSBase 94;
-function GetProgramName(buf: PChar; len: longint): LongBool; syscall AOS_DOSBase 96;
+function GetArgStr: PAnsiChar; syscall AOS_DOSBase 89;
+function GetCurrentDirName(buf: PAnsiChar; len: longint): LongBool; syscall AOS_DOSBase 94;
+function GetProgramName(buf: PAnsiChar; len: longint): LongBool; syscall AOS_DOSBase 96;
 function GetProgramDir: BPTR; syscall AOS_DOSBase 100;
-function SystemTagList(command: PChar; tags: PTagItem): longint; syscall AOS_DOSBase 101;
+function SystemTagList(command: PAnsiChar; tags: PTagItem): longint; syscall AOS_DOSBase 101;
 function LockDosList(flags: longword): PDosList; syscall AOS_DOSBase 109;
 procedure UnLockDosList(flags: longword); syscall AOS_DOSBase 110;
 function NextDosEntry(dlist: PDosList; flags: longword): PDosList; syscall AOS_DOSBase 115;
-function MatchFirst(pat: PChar; anchor: PAnchorPath): longint; syscall AOS_DOSBase 137;
+function MatchFirst(pat: PAnsiChar; anchor: PAnchorPath): longint; syscall AOS_DOSBase 137;
 function MatchNext(anchor: PAnchorPath): longint; syscall AOS_DOSBase 138;
 procedure MatchEnd(anchor: PAnchorPath); syscall AOS_DOSBase 139;
-function GetVar(name: PChar; buffer: PChar; size: longint; flags: longword): longint; syscall AOS_DOSBase 151;
+function GetVar(name: PAnsiChar; buffer: PAnsiChar; size: longint; flags: longword): longint; syscall AOS_DOSBase 151;
 function ExamineFH(Fh: BPTR; Fib: PFileInfoBlock): LongBool; syscall AOS_DOSBase 65;
-function NameFromFH(Fh: BPTR; Buffer: PChar; Length: LongInt): LongBool; syscall AOS_DOSBase 68;
+function NameFromFH(Fh: BPTR; Buffer: PAnsiChar; Length: LongInt): LongBool; syscall AOS_DOSBase 68;
 
 
 {$ifdef AROS_ABIv1}

+ 5 - 5
rtl/aros/i386/execd.inc

@@ -69,9 +69,9 @@ type  // Checked OK 05.08.2011 ALB
 {$ifdef AROS_BINCOMPAT}
     ln_Type: Byte;
     ln_Pri : ShortInt;
-    ln_Name: PChar;
+    ln_Name: PAnsiChar;
 {$else}
-    ln_Name: PChar;
+    ln_Name: PAnsiChar;
     ln_Type: Byte;
     ln_Pri : ShortInt;
 {$endif}
@@ -480,8 +480,8 @@ type
     rt_Version  : Byte;
     rt_Type     : Byte;
     rt_Pri      : Byte;
-    rt_Name     : PChar;
-    rt_IdString : PChar;
+    rt_Name     : PAnsiChar;
+    rt_IdString : PAnsiChar;
     rt_Init     : Pointer;
     { * Only valid when RTF_EXTENDED is set
       * }
@@ -1190,7 +1190,7 @@ type  // Checked OK 05.08.2011 ALB
     lib_PosSize : Word;
     lib_Version : Word;
     lib_Revision: Word;
-    lib_IdString: PChar;
+    lib_IdString: PAnsiChar;
     lib_Sum     : DWord;
     lib_OpenCnt : Word;
   end;

+ 7 - 7
rtl/aros/i386/execf.inc

@@ -20,7 +20,7 @@ procedure Forbid; syscall AOS_ExecBase 22;
 procedure Permit; syscall AOS_ExecBase 23;
 function execAllocMem(byteSize: PtrUInt; requirements: Cardinal): Pointer; syscall LocalExecBase 33;
 procedure execFreeMem(memoryBlock: Pointer; byteSize: PtrUInt); syscall LocalExecBase 35;
-function FindTask(name: PChar): PTask; syscall LocalExecBase 49;
+function FindTask(name: PAnsiChar): PTask; syscall LocalExecBase 49;
 function SetSignal(newSignals: Cardinal; signalSet : Cardinal): Cardinal; syscall LocalExecBase 51;
 function Wait(SignalSet: LongWord): LongWord; syscall AOS_ExecBase 53;
 procedure Signal(Task: PTask; SignalSet: LongWord); syscall AOS_ExecBase 54;
@@ -33,10 +33,10 @@ function GetMsg(port: PMsgPort): PMessage; syscall LocalExecBase 62;
 procedure ReplyMsg(message : pMessage); syscall LocalExecBase 63;
 function WaitPort(port: PMsgPort): PMessage; syscall LocalExecBase 64;
 procedure CloseLibrary(libHandle: PLibrary); syscall LocalExecBase 69;
-function OpenDevice(devName: PChar; numunit: Cardinal; ioRequest: pIORequest; flags: Cardinal): ShortInt; syscall LocalExecBase 74;
+function OpenDevice(devName: PAnsiChar; numunit: Cardinal; ioRequest: pIORequest; flags: Cardinal): ShortInt; syscall LocalExecBase 74;
 procedure CloseDevice(ioRequest: PIORequest); syscall LocalExecBase 75;
 function DoIO(ioRequest: PIORequest): ShortInt; syscall LocalExecBase 76;
-function OpenLibrary(libname: PChar; libver : Cardinal): Pointer; syscall LocalExecBase 92;
+function OpenLibrary(libname: PAnsiChar; libver : Cardinal): Pointer; syscall LocalExecBase 92;
 procedure InitSemaphore(SigSem: PSignalSemaphore); syscall AOS_ExecBase 93;
 procedure ObtainSemaphore(SigSem: PSignalSemaphore); syscall AOS_ExecBase 94;
 procedure ReleaseSemaphore(SigSem: PSignalSemaphore); syscall AOS_ExecBase 95;
@@ -52,10 +52,10 @@ function AllocPooled(poolHeader: Pointer; memSize: PtrUInt): Pointer; syscall Lo
 function FreePooled(poolHeader: Pointer; memory: Pointer; memSize: PtrUInt): Pointer; syscall LocalExecBase 119;
 procedure StackSwap(NewStack: PStackSwapStruct); syscall AOS_ExecBase 122;
 function NewStackSwap(NewStack: PStackSwapStruct; Function_: Pointer; Args: PStackSwapArgs): Pointer; syscall AOS_ExecBase 134;
-procedure RawPutChar(c: Char); syscall AOS_ExecBase 86;
+procedure RawPutChar(c: AnsiChar); syscall AOS_ExecBase 86;
 
-//function RawDoFmt(const formatString : pCHAR;const dataStream : POINTER; putChProc : tPROCEDURE; putChData : POINTER): pointer;
-function RawDoFmt(const formatString : pCHAR;const dataStream : POINTER; putChProc : POINTER; putChData : POINTER): pointer; syscall LocalExecBase 87;
+//function RawDoFmt(const formatString : PAnsiChar;const dataStream : POINTER; putChProc : tPROCEDURE; putChData : POINTER): pointer;
+function RawDoFmt(const formatString : PAnsiChar;const dataStream : POINTER; putChProc : POINTER; putChData : POINTER): pointer; syscall LocalExecBase 87;
 
 // Debugbase
 function DecodeLocation(Addr1: Pointer; Tags: Pointer): Integer; syscall SysDebugBase 7;
@@ -73,7 +73,7 @@ end;
 
 procedure Debug(s: string);
 type
-  TkPrintf = function(Msg: PChar): Integer; cdecl;
+  TkPrintf = function(Msg: PAnsiChar): Integer; cdecl;
 var
   kPrintf: TkPrintf;
   d: string;

+ 7 - 7
rtl/aros/system.pp

@@ -35,8 +35,8 @@ const
   DriveSeparator = ':';
   ExtensionSeparator = '.';
   PathSeparator = ';';
-  AllowDirectorySeparators : set of char = ['\','/'];
-  AllowDriveSeparators : set of char = [':'];
+  AllowDirectorySeparators : set of AnsiChar = ['\','/'];
+  AllowDriveSeparators : set of AnsiChar = [':'];
   maxExitCode = 255;
   MaxPathLen = 256;
   AllFilesMask = '#?';
@@ -68,14 +68,14 @@ var
   ASYS_fileSemaphore: Pointer; { mutex semaphore for filelist access arbitration }
   ASYS_origDir  : PtrInt; { original directory on startup }
   AOS_wbMsg    : Pointer;
-  AOS_ConName  : PChar ='CON:10/30/620/100/FPC Console Output/AUTO/CLOSE/WAIT';
+  AOS_ConName  : PAnsiChar ='CON:10/30/620/100/FPC Console Output/AUTO/CLOSE/WAIT';
   AOS_ConHandle: THandle;
 
   SysDebugBase: Pointer = nil;
 
   argc: LongInt;
-  argv: PPChar;
-  envp: PPChar;
+  argv: PPAnsiChar;
+  envp: PPAnsiChar;
   killed : Boolean = False;
 
 function GetLibAdress(Base: Pointer; Offset: LongInt): Pointer;
@@ -91,7 +91,7 @@ type
     PWBArg = ^TWBArg;
     TWBArg = record
         wa_Lock         : BPTR;      { a lock descriptor }
-        wa_Name         : PChar;       { a string relative to that lock }
+        wa_Name         : PAnsiChar;       { a string relative to that lock }
     end;
 
     WBArgList = array[1..MaxInt] of TWBArg; { Only 1..smNumArgs are valid }
@@ -237,7 +237,7 @@ const
   DL_ModuleName = DL_Dummy + 1;
   DL_SymbolName = DL_Dummy + 7;
 var
-  SymName, ModName: PChar;
+  SymName, ModName: PAnsiChar;
   Tags: array[0..5] of PtrUInt;
   s: AnsiString;
   Res: AnsiString;