* Char -> AnsiChar

rtl/os2/dos.pas

@@ -67,7 +67,7 @@ threadvar
 
 {OS/2 specific functions}
 
-function GetEnvPChar (EnvVar: string): PChar;
+function GetEnvPChar (EnvVar: string): PAnsiChar;
 
 function DosErrorModuleName: string;
 (* In case of an error in Dos.Exec returns the name of the module *)
@@ -254,7 +254,7 @@ var
   SR: SearchRec;
   MaxArgsSize: PtrUInt; (* Amount of memory reserved for arguments in bytes. *)
   MaxArgsSizeInc: word;
-  PathZ: array [0..255] of char;
+  PathZ: array [0..255] of AnsiChar;
 
 begin
 {  LastDosExitCode := Exec (Path, ExecRunFlags (ExecFlags), efDefault, ComLine);}
@@ -310,7 +310,7 @@ begin
     Args^ [ArgSize] := 0;
     Inc (ArgSize);
     Args^ [ArgSize] := 0;
-    RC := DosQueryAppType (PChar (Args), ExecAppType);
+    RC := DosQueryAppType (PAnsiChar (Args), ExecAppType);
    end;
 
   if RC <> 0 then
@@ -393,8 +393,8 @@ begin
         Args^ [Length (QName)] := 0;
        end
       else
-       SD.PgmInputs := PChar (@Args^ [Length (QName) + 1]);
-      SD.PgmName := PChar (Args);
+       SD.PgmInputs := PAnsiChar (@Args^ [Length (QName) + 1]);
+      SD.PgmName := PAnsiChar (Args);
       SD.InheritOpt := ssf_InhertOpt_Parent;
       SD.ObjectBuffer := @ObjName [1];
       SD.ObjectBuffLen := SizeOf (ObjName) - 1;
@@ -628,7 +628,7 @@ end;
 
 function envstr (index : longint) : string;
 
-var hp:Pchar;
+var hp:PAnsiChar;
 
 begin
     if (index<=0) or (index>envcount) then
@@ -641,10 +641,10 @@ begin
 end;
 
 
-function GetEnvPChar (EnvVar: string): PChar;
+function GetEnvPChar (EnvVar: string): PAnsiChar;
 (* The assembler version is more than three times as fast as Pascal. *)
 var
- P: PChar;
+ P: PAnsiChar;
 begin
  EnvVar := UpCase (EnvVar);
 {$ASMMODE INTEL}
@@ -715,14 +715,14 @@ var
 {$ifndef FPC_ANSI_TEXTFILEREC}
   R: rawbytestring;
 {$endif not FPC_ANSI_TEXTFILEREC}
-  P: pchar;
+  P: PAnsiChar;
 begin
   Attr := 0;
 {$ifdef FPC_ANSI_TEXTFILEREC}
   P := @FileRec (F).Name;
 {$else FPC_ANSI_TEXTFILEREC}
   R := ToSingleByteFileSystemEncodedFileName (FileRec (F).Name);
-  P := PChar (R);
+  P := PAnsiChar (R);
 {$endif FPC_ANSI_TEXTFILEREC}
   RC := DosQueryPathInfo (P, ilStandard, @PathInfo, SizeOf (PathInfo));
   DosError := integer (RC);
@@ -744,13 +744,13 @@ var
 {$ifndef FPC_ANSI_TEXTFILEREC}
   R: rawbytestring;
 {$endif not FPC_ANSI_TEXTFILEREC}
-  P: pchar;
+  P: PAnsiChar;
 begin
 {$ifdef FPC_ANSI_TEXTFILEREC}
   P := @FileRec (F).Name;
 {$else FPC_ANSI_TEXTFILEREC}
   R := ToSingleByteFileSystemEncodedFileName (FileRec (F).Name);
-  P := PChar (R);
+  P := PAnsiChar (R);
 {$endif FPC_ANSI_TEXTFILEREC}
   RC := DosQueryPathInfo (P, ilStandard, @PathInfo, SizeOf (PathInfo));
   if RC = 0 then

rtl/os2/doscall2.pas

@@ -108,7 +108,7 @@ type
   PCPUUtil = ^TCPUUtil;
 
 
-function DosOpenL (FileName: PChar; var Handle: THandle;
+function DosOpenL (FileName: PAnsiChar; var Handle: THandle;
                         var Action: cardinal; InitSize: int64;
                         Attrib, OpenFlags, FileMode: cardinal;
                                                  EA: pointer): cardinal; cdecl;
@@ -118,7 +118,7 @@ function DosSetFilePtrL (Handle: THandle; Pos: int64; Method: cardinal;
 
 function DosSetFileSizeL (Handle: THandle; Size: int64): cardinal; cdecl;
 
-function DosProtectOpen (FileName: PChar; var Handle: longint;
+function DosProtectOpen (FileName: PAnsiChar; var Handle: longint;
                          var Action: longint; InitSize, Attrib,
                          OpenFlags, OpenMode: longint; ea: PEAOp2;
                               var FileHandleLockID: cardinal): cardinal; cdecl;
@@ -163,7 +163,7 @@ function DosProtectEnumAttribute (const FileName: string; Entry: cardinal;
                                   var Count: cardinal; InfoLevel: cardinal;
                                          FileHandleLockID: cardinal): cardinal;
 
-function DosProtectOpen (FileName: PChar; var Handle: THandle;
+function DosProtectOpen (FileName: PAnsiChar; var Handle: THandle;
                               var Action: cardinal; InitSize, Attrib,
                               OpenFlags, OpenMode: cardinal; ea: PEAOp2;
                               var FileHandleLockID: cardinal): cardinal; cdecl;
@@ -758,7 +758,7 @@ results in an ERROR_ACCESS_DENIED return code.
 The DosProtectxxx functions can be used with a NULL filehandle LockID, if the
 subject filehandle was obtained from DosOpen.
 *)
-function DosProtectOpenL (FileName: PChar; var Handle: THandle;
+function DosProtectOpenL (FileName: PAnsiChar; var Handle: THandle;
                          var Action: cardinal; InitSize: int64; Attrib,
                          OpenFlags, OpenMode: cardinal; EA: PEAOp2;
                               var FileHandleLockID: cardinal): cardinal; cdecl;
@@ -913,7 +913,7 @@ Possible return codes:
  87 ERROR_INVALID_PARAMETER 
 122 ERROR_INSUFFICIENT_BUFER
 *)
-function DosQueryExtLibPath (ExtLibPath: PChar; Flags: cardinal): cardinal;
+function DosQueryExtLibPath (ExtLibPath: PAnsiChar; Flags: cardinal): cardinal;
                                                                          cdecl;
 
 (*
@@ -983,7 +983,7 @@ Possible return codes:
 87 ERROR_INVALID_PARAMETER 
 161 ERROR_BAD_PATHNAME 
 *)
-function DosSetExtLibPath (ExtLibPath: PChar; Flags: cardinal): cardinal;
+function DosSetExtLibPath (ExtLibPath: PAnsiChar; Flags: cardinal): cardinal;
                                                                          cdecl;
 
 (*
@@ -1007,7 +1007,7 @@ Possible return codes:
 487 ERROR_INVALID_ADDRESS
 *)
 function DosQueryModFromEIP (var HMod: THandle; var ObjNum: cardinal;
-                         BuffLen: cardinal; Buff: PChar; var Offset: cardinal;
+                         BuffLen: cardinal; Buff: PAnsiChar; var Offset: cardinal;
                                             Address: PtrUInt): cardinal; cdecl;
 
 
@@ -1048,7 +1048,7 @@ PDUMPSYS, AND PROCDUMP commands. For further information, see PROCDUMP.DOC
 in the OS2\SYSTEM\RAS directory. DDP_ENABLEPROCDUMP and DDP_DISABLEPROCDUMP
 are provided for backwards compatibility only.
 *)
-function DosDumpProcess (Flag: cardinal; Drive: char;
+function DosDumpProcess (Flag: cardinal; Drive: AnsiChar;
                                                PID: cardinal): cardinal; cdecl;
 
 
@@ -1092,7 +1092,7 @@ Possible error codes:
  0 NO_ERROR
 87 ERROR_INVALID_PARAMETER
 *)
-function DosSuppressPopups (Flag: cardinal; Drive: char): cardinal; cdecl;
+function DosSuppressPopups (Flag: cardinal; Drive: AnsiChar): cardinal; cdecl;
 
 
 (*
@@ -1135,7 +1135,7 @@ is not running on a processor with the required features, a return code will
 indicate an attempt to use an unsupported function.
 
 Example code (C):
-  int main (int argc, char *argv[])
+  int main (int argc, AnsiChar *argv[])
   {
      APIRET     rc;
      BYTE       HookBuffer [256];
@@ -1276,7 +1276,7 @@ begin
 end;
 
 
-function DummyDosProtectOpenL (FileName: PChar; var Handle: THandle;
+function DummyDosProtectOpenL (FileName: PAnsiChar; var Handle: THandle;
                          var Action: cardinal; InitSize: int64; Attrib,
                          OpenFlags, OpenMode: cardinal; EA: PEAOp2;
                               var FileHandleLockID: cardinal): cardinal; cdecl;
@@ -1330,7 +1330,7 @@ begin
 end;
 
 
-function DummyDosProtectOpen (FileName: PChar; var Handle: THandle;
+function DummyDosProtectOpen (FileName: PAnsiChar; var Handle: THandle;
                               var Action: cardinal; InitSize, Attrib,
                               OpenFlags, OpenMode: cardinal; ea: PEAOp2;
                               var FileHandleLockID: cardinal): cardinal; cdecl;
@@ -1454,7 +1454,7 @@ begin
 end;
 
 
-function DummyDosQueryExtLibPath (ExtLibPath: PChar;
+function DummyDosQueryExtLibPath (ExtLibPath: PAnsiChar;
                                              Flags: cardinal): cardinal; cdecl;
 begin
   if ExtLibPath <> nil then
@@ -1467,7 +1467,7 @@ begin
 end;
 
 
-function DummyDosSetExtLibPath (ExtLibPath: PChar; Flags: cardinal): cardinal;
+function DummyDosSetExtLibPath (ExtLibPath: PAnsiChar; Flags: cardinal): cardinal;
                                                                          cdecl;
 begin
   DummyDosSetExtLibPath := Error_Not_Enough_Memory;
@@ -1475,7 +1475,7 @@ end;
 
 
 function DummyDosQueryModFromEIP (var HMod: THandle; var ObjNum: cardinal;
-                         BuffLen: cardinal; Buff: PChar; var Offset: cardinal;
+                         BuffLen: cardinal; Buff: PAnsiChar; var Offset: cardinal;
                                             Address: PtrUInt): cardinal; cdecl;
 begin
   DummyDosQueryModFromEIP := Error_Invalid_Parameter;
@@ -1494,7 +1494,7 @@ begin
 end;
 
 
-function DummyDosSuppressPopups (Flag: cardinal; Drive: char): cardinal; cdecl;
+function DummyDosSuppressPopups (Flag: cardinal; Drive: AnsiChar): cardinal; cdecl;
 begin
   DummyDosSuppressPopups := Error_Invalid_Function;
 end;
@@ -1522,7 +1522,7 @@ end;
 
 
 type
-  TDosProtectOpen = function (FileName: PChar; var Handle: THandle;
+  TDosProtectOpen = function (FileName: PAnsiChar; var Handle: THandle;
                               var Action: cardinal; InitSize, Attrib,
                               OpenFlags, OpenMode: cardinal; ea: PEAOp2;
                               var FileHandleLockID: cardinal): cardinal; cdecl;
@@ -1578,7 +1578,7 @@ type
   TDosSetFileLocksL = function (Handle: THandle; var Unlock: TFileLockL;
     var Lock: TFileLockL; Timeout: cardinal; Flags: cardinal): cardinal; cdecl;
 
-  TDosProtectOpenL = function (FileName: PChar; var Handle: THandle;
+  TDosProtectOpenL = function (FileName: PAnsiChar; var Handle: THandle;
                          var Action: cardinal; InitSize: int64; Attrib,
                          OpenFlags, OpenMode: cardinal; EA: PEAOp2;
                               var FileHandleLockID: cardinal): cardinal; cdecl;
@@ -1602,20 +1602,20 @@ type
   TDosSetThreadAffinity = function (var AffinityMask: TMPAffinity): cardinal;
                                                                          cdecl;
 
-  TDosQueryExtLibPath = function (ExtLibPath: PChar;
+  TDosQueryExtLibPath = function (ExtLibPath: PAnsiChar;
                                              Flags: cardinal): cardinal; cdecl;
 
-  TDosSetExtLibPath = function (ExtLibPath: PChar; Flags: cardinal): cardinal;
+  TDosSetExtLibPath = function (ExtLibPath: PAnsiChar; Flags: cardinal): cardinal;
                                                                          cdecl;
 
   TDosQueryModFromEIP = function (var HMod: THandle; var ObjNum: cardinal;
-                         BuffLen: cardinal; Buff: PChar; var Offset: cardinal;
+                         BuffLen: cardinal; Buff: PAnsiChar; var Offset: cardinal;
                                             Address: PtrUInt): cardinal; cdecl;
 
   TDosDumpProcess = function (Flag: cardinal; Drive: cardinal;
                                                PID: cardinal): cardinal; cdecl;
 
-  TDosSuppressPopups = function (Flag: cardinal; Drive: char): cardinal; cdecl;
+  TDosSuppressPopups = function (Flag: cardinal; Drive: AnsiChar): cardinal; cdecl;
 
   TDosPerfSysCall = function (Command, Parm1, Parm2,
                                              Parm3: cardinal): cardinal; cdecl;
@@ -1675,7 +1675,7 @@ const
 
 
 
-function DosOpenL (FileName: PChar; var Handle: THandle;
+function DosOpenL (FileName: PAnsiChar; var Handle: THandle;
                         var Action: cardinal; InitSize: int64;
                         Attrib, OpenFlags, FileMode: cardinal;
                                          EA: pointer): cardinal; cdecl; inline;
@@ -1699,7 +1699,7 @@ begin
 end;
 
 
-function DosProtectOpen (FileName: PChar; var Handle: THandle;
+function DosProtectOpen (FileName: PAnsiChar; var Handle: THandle;
                               var Action: cardinal; InitSize, Attrib,
                               OpenFlags, OpenMode: cardinal; EA: PEAOp2;
                       var FileHandleLockID: cardinal): cardinal; cdecl; inline;
@@ -1804,7 +1804,7 @@ begin
 end;
 
 
-function DosProtectOpen (FileName: PChar; var Handle: longint;
+function DosProtectOpen (FileName: PAnsiChar; var Handle: longint;
                          var Action: longint; InitSize, Attrib,
                          OpenFlags, OpenMode: longint; ea: PEAOp2;
                       var FileHandleLockID: cardinal): cardinal; cdecl; inline;
@@ -1820,7 +1820,7 @@ function DosProtectOpen (const FileName: string; var Handle: longint;
                          OpenFlags, OpenMode: longint; ea: PEAOp2;
                                      var FileHandleLockID: cardinal): cardinal;
 var
-  T: array [0..255] of char;
+  T: array [0..255] of AnsiChar;
 begin
   StrPCopy (@T, FileName);
   DosProtectOpen := Sys_DosProtectOpen (@T, THandle (Handle),
@@ -1834,7 +1834,7 @@ function DosProtectOpen (const FileName: string; var Handle: THandle;
                          OpenFlags, OpenMode: cardinal; ea: PEAOp2;
                                var FileHandleLockID: cardinal): cardinal;
 var
-  T: array [0..255] of char;
+  T: array [0..255] of AnsiChar;
 begin
   StrPCopy (@T, FileName);
   DosProtectOpen := Sys_DosProtectOpen (@T, Handle, Action, InitSize, Attrib,
@@ -1909,7 +1909,7 @@ function DosProtectEnumAttribute (const FileName: string; Entry: cardinal;
                                   var Count: cardinal; InfoLevel: cardinal;
                                          FileHandleLockID: cardinal): cardinal;
 var
-  T: array [0..255] of char;
+  T: array [0..255] of AnsiChar;
 begin
   StrPCopy (@T, FileName);
   DosProtectEnumAttribute := DosProtectEnumAttribute (1, @T, Entry, Buf,
@@ -1942,7 +1942,7 @@ begin
 end;
 
 
-function DosProtectOpenL (FileName: PChar; var Handle: THandle;
+function DosProtectOpenL (FileName: PAnsiChar; var Handle: THandle;
                          var Action: cardinal; InitSize: int64; Attrib,
                          OpenFlags, OpenMode: cardinal; EA: PEAOp2;
                       var FileHandleLockID: cardinal): cardinal; cdecl; inline;
@@ -1997,14 +1997,14 @@ begin
 end;
 
 
-function DosQueryExtLibPath (ExtLibPath: PChar; Flags: cardinal): cardinal;
+function DosQueryExtLibPath (ExtLibPath: PAnsiChar; Flags: cardinal): cardinal;
                                                                  cdecl; inline;
 begin
   DosQueryExtLibPath := Sys_DosQueryExtLibPath (ExtLibPath, Flags);
 end;
 
 
-function DosSetExtLibPath (ExtLibPath: PChar; Flags: cardinal): cardinal;
+function DosSetExtLibPath (ExtLibPath: PAnsiChar; Flags: cardinal): cardinal;
                                                                  cdecl; inline;
 begin
   DosSetExtLibPath := Sys_DosSetExtLibPath (ExtLibPath, Flags);
@@ -2012,7 +2012,7 @@ end;
 
 
 function DosQueryModFromEIP (var HMod: THandle; var ObjNum: cardinal;
-                         BuffLen: cardinal; Buff: PChar; var Offset: cardinal;
+                         BuffLen: cardinal; Buff: PAnsiChar; var Offset: cardinal;
                                     Address: PtrUInt): cardinal; cdecl; inline;
 begin
   DosQueryModFromEIP := Sys_DosQueryModFromEIP (HMod, ObjNum, BuffLen, Buff,
@@ -2020,7 +2020,7 @@ begin
 end;
 
 
-function DosDumpProcess (Flag: cardinal; Drive: char;
+function DosDumpProcess (Flag: cardinal; Drive: AnsiChar;
                                        PID: cardinal): cardinal; cdecl; inline;
 begin
   DosDumpProcess := Sys_DosDumpProcess (Flag, cardinal (Drive), PID);
@@ -2028,7 +2028,7 @@ end;
 
 
 function DosSuppressPopups (Flag: cardinal;
-                                         Drive: char): cardinal; cdecl; inline;
+                                         Drive: AnsiChar): cardinal; cdecl; inline;
 begin
   DosSuppressPopups := Sys_DosSuppressPopups (Flag, Drive);
 end;

rtl/os2/kbdcalls.pas

@@ -190,7 +190,7 @@ type
 {TKbdKeyInfo - record type for character data for KbdCharIn and KbdPeek}
 (*   #pragma pack(2) ??? *)
     TKbdKeyInfo=record
-        chChar:char;    {ASCII character code; the scan code received}
+        chChar:AnsiChar;    {ASCII character code; the scan code received}
                         {from the keyboard is translated to the ASCII}
                         {character code                              }
         case boolean of
@@ -203,9 +203,9 @@ type
                         {specified in milliseconds from the time      }
                         {the system was started                       }
         true:(
-        chScan2:char;   (* should be chScan, fbStatus and bNlsShift,   *)
+        chScan2:AnsiChar;   (* should be chScan, fbStatus and bNlsShift,   *)
         fbStatus2:byte; (* but this construct is unsupported currently *)
-        bNlsShift2:char);
+        bNlsShift2:AnsiChar);
     end;
     PKbdKeyInfo=^TKbdKeyInfo;
     KbdKeyInfo=TKbdKeyInfo; {for better compatibility with other compilers}
@@ -270,7 +270,7 @@ type
         false:(
             CharData:TKbdKeyInfo);
         true:(
-            chChar:char;    {ASCII character code; the scan code received}
+            chChar:AnsiChar;    {ASCII character code; the scan code received}
                             {from the keyboard is translated to the ASCII}
                             {character code                              }
             case boolean of
@@ -297,7 +297,7 @@ type
             true:(
             chScan2,        (* should be chScan, fbStatus and bNlsShift,   *)
             fbStatus2,      (* but this construct is unsupported currently *)
-            bNlsShift2:char));
+            bNlsShift2:AnsiChar));
     end;
     PKbdTrans=^TKbdTrans;
     KbdTrans=TKbdTrans;
@@ -512,17 +512,17 @@ type
         XlateOp:word;   {translate operation specifier;             }
                         {bits 0- 6 - AccentFlags (see Notes 1 and 8)}
                         {bits 7-15 - KeyType (see Note 2)           }
-        Char1:char;
-        Char2:char;
-        Char3:char;
-        Char4:char;
-        Char5:char;
+        Char1:AnsiChar;
+        Char2:AnsiChar;
+        Char3:AnsiChar;
+        Char4:AnsiChar;
+        Char5:AnsiChar;
     end;
     PXLateKeyDef=^TXLateKeyDef;
 
 {record type for character definition in TAccentEntry}
     TKeyCode=record
-        CharCode:char;
+        CharCode:AnsiChar;
         ScanCode:byte;
     end;
 
@@ -1237,7 +1237,7 @@ KR_* constants}
 * There can be only one KbdRegister call outstanding for each session without
   an intervening KbdDeRegister. KbdDeRegister must be issued by the same
   process that issued the KbdRegister.}
-function KbdRegister(ModuleName,ProcName:PChar;FnMask:cardinal):word; cdecl;
+function KbdRegister(ModuleName,ProcName:PAnsiChar;FnMask:cardinal):word; cdecl;
 function KbdRegister(ModuleName,ProcName:string;FnMask:cardinal):word;
 
 {Deregister a keyboard subsystem previously registered within a session - only
@@ -1346,7 +1346,7 @@ default keyboard (0) or a logical keyboard.}
   (focus), or is equal to zero and no other handle has the focus.}
 function KbdStringIn(var CharBuf;var LenInOut:TStringInBuf;WaitFlag:word;
                                                    KbdHandle:word):word; cdecl;
-function KbdStringIn(CharBuf:PChar;LenInOutP:PStringInBuf;WaitFlag:word;
+function KbdStringIn(CharBuf:PAnsiChar;LenInOutP:PStringInBuf;WaitFlag:word;
                                                    KbdHandle:word):word; cdecl;
 
 {Clear the keystroke buffer.}
@@ -1618,7 +1618,7 @@ implementation
 {***************************************************************************}
 
 
-function KbdRegister(ModuleName,ProcName:PChar;FnMask:cardinal):word; cdecl;
+function KbdRegister(ModuleName,ProcName:PAnsiChar;FnMask:cardinal):word; cdecl;
 external 'EMXWRAP' index 208;
 {external 'KBDCALLS' index 8;}
 
@@ -1648,7 +1648,7 @@ function KbdStringIn(var CharBuf;var LenInOut:TStringInBuf;WaitFlag:word;
 external 'EMXWRAP' index 209;
 {external 'KBDCALLS' index 9;}
 
-function KbdStringIn(CharBuf:PChar;LenInOutP:PStringInBuf;WaitFlag:word;
+function KbdStringIn(CharBuf:PAnsiChar;LenInOutP:PStringInBuf;WaitFlag:word;
                                                    KbdHandle:word):word; cdecl;
 external 'EMXWRAP' index 209;
 {external 'KBDCALLS' index 9;}

rtl/os2/moncalls.pas

@@ -137,7 +137,7 @@ function DosMonClose(MonHandle:word):word; cdecl;
 * For a detailed description of this call see the chapter "Character Device
   Monitors" in the IBM Operating System/2 Version 1.2 I/O Subsystems And
   Device Support Volume 1.}
-function DosMonOpen(DevName:PChar;var MonHandle:word):word; cdecl;
+function DosMonOpen(DevName:PAnsiChar;var MonHandle:word):word; cdecl;
 function DosMonOpen(DevName:string;var MonHandle:word):word;
 
 {Wait for a data record, move it from the input buffer of a registered
@@ -234,7 +234,7 @@ function DosMonClose(MonHandle:word):word; cdecl;
 external 'EMXWRAP' index 403;
 {external 'MONCALLS' index 3;}
 
-function DosMonOpen(DevName:PChar;var MonHandle:word):word; cdecl;
+function DosMonOpen(DevName:PAnsiChar;var MonHandle:word):word; cdecl;
 external 'EMXWRAP' index 404;
 {external 'MONCALLS' index 4;}
 

rtl/os2/moucalls.pas

@@ -264,10 +264,10 @@ type
 
 {Register a mouse subsystem within a session.}
 {ModuleName is name of the dynamic link module (the maximum length
-is 8 characters - plus the final #0 character in the PChar version of this
+is 8 characters - plus the final #0 character in the PAnsiChar version of this
 call), ProcName is the dynamic link entry point name of a routine that receives
 control when any of the registered functions are called (the maximum length
-is 32 bytes - plus the final #0 character in the PChar version of this call),
+is 32 bytes - plus the final #0 character in the PAnsiChar version of this call),
 FnMask is a mask of bits, where each bit set to 1 identifies a mouse function
 being registered - see MR_MOU* constants.}
 {Possible return codes:
@@ -345,7 +345,7 @@ being registered - see MR_MOU* constants.}
   MouSetDevStatus             15h
 * A registered mouse sybsystem must leave the stack, on exit, in the exact
   state it was received.}
-function MouRegister(ModuleName,ProcName:PChar;FnMask:cardinal):word; cdecl;
+function MouRegister(ModuleName,ProcName:PAnsiChar;FnMask:cardinal):word; cdecl;
 function MouRegister(ModuleName,ProcName:string;FnMask:cardinal):word;
 
 {Deregister a mouse subsystem previously registered within a session.}
@@ -738,7 +738,7 @@ handle is returned in MouHandle.}
   Base Mouse Subsystem can detect a change in display configurations. This form
   of the MouOpen call is not recommended for applications. Applications should
   either send the name of the pointer draw device driver or nil.}
-function MouOpen(DriverName:PChar;var MouHandle:word):word; cdecl;
+function MouOpen(DriverName:PAnsiChar;var MouHandle:word):word; cdecl;
 function MouOpen(DriverName:string;var MouHandle:word):word;
 
 {Close the mouse device for the current session.}
@@ -863,7 +863,7 @@ device driver must be included in the CONFIG.SYS file at system start-up time.}
   and the offset portion is non-zero, the offset portion identifies the
   power-up display configuration. However, this isn't possible in the current
   implementation (using 32-bit wrap-around function supplied in EMXWRAP.DLL).}
-function MouInitReal(DriverName:PChar):word; cdecl;
+function MouInitReal(DriverName:PAnsiChar):word; cdecl;
 function MouInitReal(DriverName:string):word;
 
 {Synchronize the mouse subsystem with the mouse device driver.}
@@ -907,7 +907,7 @@ implementation
 {***************************************************************************}
 
 
-function MouRegister(ModuleName,ProcName:PChar;FnMask:cardinal):word; cdecl;
+function MouRegister(ModuleName,ProcName:PAnsiChar;FnMask:cardinal):word; cdecl;
 external 'EMXWRAP' index 324;
 {external 'MOUCALLS' index 24;}
 
@@ -993,7 +993,7 @@ function MouSetScaleFact(const Scale:TScaleFact;MouHandle:word):word; cdecl;
 external 'EMXWRAP' index 311;
 {external 'MOUCALLS' index 11;}
 
-function MouOpen(DriverName:PChar;var MouHandle:word):word; cdecl;
+function MouOpen(DriverName:PAnsiChar;var MouHandle:word):word; cdecl;
 external 'EMXWRAP' index 317;
 {external 'MOUCALLS' index 17;}
 
@@ -1034,7 +1034,7 @@ function MouSetDevStatus(var Status:word;MouHandle:word):word; cdecl;
 external 'EMXWRAP' index 326;
 {external 'MOUCALLS' index 26;}
 
-function MouInitReal(DriverName:PChar):word; cdecl;
+function MouInitReal(DriverName:PAnsiChar):word; cdecl;
 external 'EMXWRAP' index 327;
 {external 'MOUCALLS' index 27;}
 

rtl/os2/newexe.pas

@@ -69,7 +69,7 @@ unit NEWEXE;
           ne_cres : word;
           ne_exetyp : byte;
           ne_flagsothers : byte;
-          ne_res : array[0..NERESBYTES-1] of char;
+          ne_res : array[0..NERESBYTES-1] of AnsiChar;
        end;
 
     const
@@ -152,8 +152,8 @@ unit NEWEXE;
 
     type
        rsrc_string = record
-          rs_len : char;
-          rs_string : array[0..1-1] of char;
+          rs_len : AnsiChar;
+          rs_string : array[0..1-1] of AnsiChar;
        end;
 
        rsrc_typeinfo = record

rtl/os2/os2def.pas

@@ -115,29 +115,29 @@ const
 
        NPrectL = ^RectL;
 
-       Str8 = array[0..7] of char;
+       Str8 = array[0..7] of AnsiChar;
 
        PStr8 = ^Str8;
 
        DrivData = record
           cb: longint;
           lVersion: longint;
-          szDeviceName: array[0..31] of char;
-          abGeneralData: array[0..0] of char;
+          szDeviceName: array[0..31] of AnsiChar;
+          abGeneralData: array[0..0] of AnsiChar;
        end;
 
        PDrivData = ^DrivData;
 
        DevOpenStruc = record
-          pszLogAddress: PChar;
-          pszDriverName: PChar;
+          pszLogAddress: PAnsiChar;
+          pszDriverName: PAnsiChar;
           pdriv: PDrivData;
-          pszDataType: PChar;
-          pszComment: PChar;
-          pszQueueProcName: PChar;
-          pszQueueProcParams: PChar;
-          pszSpoolerParams: PChar;
-          pszNetworkParams: PChar;
+          pszDataType: PAnsiChar;
+          pszComment: PAnsiChar;
+          pszQueueProcName: PAnsiChar;
+          pszQueueProcParams: PAnsiChar;
+          pszSpoolerParams: PAnsiChar;
+          pszNetworkParams: PAnsiChar;
        end;
 
        PDevOpenStruc = ^DevOpenStruc;
@@ -147,11 +147,11 @@ const
        PrintDest = record
           cb: cardinal;
           lType: longint;
-          pszToken: PChar;
+          pszToken: PAnsiChar;
           lCount: longint;
           pdopData: PDevOpenData;
           fl: cardinal;
-          pszPrinter: PChar;
+          pszPrinter: PAnsiChar;
        end;
 
        PPrintDest = ^PrintDest;
@@ -160,7 +160,7 @@ const
           usRecordLength: word;
           fsSelection: word;
           lMatch: longint;
-          szFacename: array[0..FaceSize-1] of char;
+          szFacename: array[0..FaceSize-1] of AnsiChar;
           idRegistry: word;
           usCodePage: word;
           lMaxBaselineExt: longint;
@@ -186,8 +186,8 @@ const
        end;
 
        FontMetrics = record
-          szFamilyname: array[0..FaceSize-1] of char;
-          szFacename: array[0..FaceSize-1] of char;
+          szFamilyname: array[0..FaceSize-1] of AnsiChar;
+          szFacename: array[0..FaceSize-1] of AnsiChar;
           idRegistry: word;
           usCodePage: word;
           lEmHeight: longint;
@@ -244,7 +244,7 @@ const
 
       { Null terminated strings are often declared as array[0..0] of byte  }
       { in header files, the following type makes type conversion possible }
-      CharArray = array[0..0] of char;
+      CharArray = array[0..0] of AnsiChar;
 
 {Names beginning with T for compatibility}
         TPointL = PointL;
@@ -3237,7 +3237,7 @@ Type
        ICONINFO=record
           cb: Cardinal;         // size of ICONINFO structure
           fFormat: Cardinal;
-          pszFileName: PChar;   //use when fFormat = ICON_FILE
+          pszFileName: PAnsiChar;   //use when fFormat = ICON_FILE
           hmod: Cardinal;       // use when fFormat = ICON_RESOURCE
           resid: Cardinal;      // use when fFormat = ICON_RESOURCE
           cbIconData: Cardinal; // use when fFormat = ICON_DATA

rtl/os2/pmbitmap.pas

@@ -199,19 +199,19 @@ const   PIP_MF       = 1;
         PIC_PIFTOMET = 0;
         PIC_SSTOFONT = 2;
 
-function PicPrint (ahab: longint; var pszFilename: PChar; lType: longint;
-                                        var pszParams: PChar): Longbool; cdecl;
+function PicPrint (ahab: longint; var pszFilename: PAnsiChar; lType: longint;
+                                        var pszParams: PAnsiChar): Longbool; cdecl;
 
-function PicIchg (ahab: longint; var pszFilename1, pszFilename2: PChar;
+function PicIchg (ahab: longint; var pszFilename1, pszFilename2: PAnsiChar;
                                               lType: longint): Longbool; cdecl;
 
 
 implementation
 
-function PicPrint (ahab: longint; var pszFilename: PChar; lType: longint;
-             var pszParams: PChar): Longbool; cdecl; external 'PMPIC' index 11;
+function PicPrint (ahab: longint; var pszFilename: PAnsiChar; lType: longint;
+             var pszParams: PAnsiChar): Longbool; cdecl; external 'PMPIC' index 11;
 
-function PicIchg (ahab: longint; var pszFilename1, pszFilename2: PChar;
+function PicIchg (ahab: longint; var pszFilename1, pszFilename2: PAnsiChar;
                    lType: longint): Longbool; cdecl; external 'PMPIC' index 12;
 
 end.

rtl/os2/pmdev.pas

@@ -961,17 +961,17 @@ in define line 83 *)
        TPDJPT_TRAYNAME = ^TdjpInputTray;
 
 
-function DevOpenDC(ahab: HAB; lType: Longint; pszToken: PChar; lCount: Longint; var pdopData: DevOpenStruc; hdcComp: cardinal): cardinal; cdecl;
+function DevOpenDC(ahab: HAB; lType: Longint; pszToken: PAnsiChar; lCount: Longint; var pdopData: DevOpenStruc; hdcComp: cardinal): cardinal; cdecl;
 function DevCloseDC(ahdc: cardinal): cardinal; cdecl;
 function DevEscape(ahdc: cardinal; lCode, lInCount: Longint; var pbInData; var plOutCount: Longint; var pbOutData): Longint; cdecl;
 function DevQueryCaps(ahdc: cardinal; lStart, lCount: Longint; var alArray: Longint): Longbool; cdecl;
-function DevQueryDeviceNames(ahab: HAB; pszDriverName: PChar; var pldn: Longint; aDeviceName: Str32; aDeviceDesc: Str64; var pldt: Longint; aDataType: Str16): Longbool; cdecl;
+function DevQueryDeviceNames(ahab: HAB; pszDriverName: PAnsiChar; var pldn: Longint; aDeviceName: Str32; aDeviceDesc: Str64; var pldt: Longint; aDataType: Str16): Longbool; cdecl;
 function DevQueryHardcopyCaps(ahdc: cardinal; lStartForm, lForms: Longint; var phciHcInfo: HCInfo): Longint; cdecl;
-function DevPostDeviceModes(ahab: HAB; var pdrivDriverData: DrivData; pszDriverName, pszDeviceName, pszName: PChar; flOptions: cardinal): Longint; cdecl;
+function DevPostDeviceModes(ahab: HAB; var pdrivDriverData: DrivData; pszDriverName, pszDeviceName, pszName: PAnsiChar; flOptions: cardinal): Longint; cdecl;
 
 implementation
 
-function DevOpenDC(ahab: HAB; lType: Longint; pszToken: PChar; lCount: Longint; var pdopData: DevOpenStruc; hdcComp: cardinal): cardinal; cdecl;
+function DevOpenDC(ahab: HAB; lType: Longint; pszToken: PAnsiChar; lCount: Longint; var pdopData: DevOpenStruc; hdcComp: cardinal): cardinal; cdecl;
     external 'PMGPI' index 610;
 function DevCloseDC(ahdc: cardinal): cardinal; cdecl;
     external 'PMGPI' index 604;
@@ -979,11 +979,11 @@ function DevEscape(ahdc: cardinal; lCode, lInCount: Longint; var pbInData; var p
     external 'PMGPI' index 605;
 function DevQueryCaps(ahdc: cardinal; lStart, lCount: Longint;var alArray: Longint): Longbool; cdecl;
     external 'PMGPI' index 606;
-function DevQueryDeviceNames(ahab: HAB; pszDriverName: PChar; var pldn: Longint; aDeviceName: Str32; aDeviceDesc: Str64; var pldt: Longint; aDataType: Str16): Longbool; cdecl;
+function DevQueryDeviceNames(ahab: HAB; pszDriverName: PAnsiChar; var pldn: Longint; aDeviceName: Str32; aDeviceDesc: Str64; var pldt: Longint; aDataType: Str16): Longbool; cdecl;
     external 'PMGPI' index 607;
 function DevQueryHardcopyCaps(ahdc: cardinal; lStartForm, lForms: Longint; var phciHcInfo: HCInfo): Longint; cdecl;
     external 'PMGPI' index 608;
-function DevPostDeviceModes(ahab: HAB; var pdrivDriverData: DrivData; pszDriverName, pszDeviceName, pszName: PChar; flOptions: cardinal): Longint; cdecl;
+function DevPostDeviceModes(ahab: HAB; var pdrivDriverData: DrivData; pszDriverName, pszDeviceName, pszName: PAnsiChar; flOptions: cardinal): Longint; cdecl;
     external 'PMGPI' index 609;
 
     { was

rtl/os2/pmgpi.pas

@@ -665,7 +665,7 @@ type    SizeL=record
         PFaceNameDesc=^FaceNameDesc;
         TFaceNameDesc=FaceNameDesc;
 
-        FFDescs=array[0..1,0..FaceSize-1] of char;
+        FFDescs=array[0..1,0..FaceSize-1] of AnsiChar;
         PFFDescs=^FFDescs;
         TFFDescs = FFDescs;
 
@@ -735,8 +735,8 @@ type
 
 // form of POINTL with 1 byte offsets instead of longs
   ODPOINT=record          // odpt
-    dx: Char;
-    dy: Char;
+    dx: AnsiChar;
+    dy: AnsiChar;
   end;
 
 // form of SIZEL with shorts instead of longs
@@ -1005,7 +1005,7 @@ const
 type
   ORDER_GBEL=record       // ogbel
     lElementType: Longint;
-    achDesc: Array[0..GBEL_DL-1] of Char;
+    achDesc: Array[0..GBEL_DL-1] of AnsiChar;
   end;
 
 // Begin Image
@@ -1581,7 +1581,7 @@ type
     uchReserved: Byte;
     ptRect: Array[0..2-1] of POINTS;
     cchString: SWPUSHORT;
-    achString: Array[0..1-1] of Char;
+    achString: Array[0..1-1] of AnsiChar;
     adx: Array[0..1-1] of Integer;
   end;
 
@@ -1590,7 +1590,7 @@ type
     uchReserved: Byte;
     ptRect: Array[0..2-1] of POINTL;
     cchString: SWPUSHORT;
-    achString: Array[0..1-1] of Char;
+    achString: Array[0..1-1] of AnsiChar;
     adx: Array[0..1-1] of Longint;
   end;
 
@@ -1599,7 +1599,7 @@ type
     uchReserved: Byte;
     ptRect: Array[0..2-1] of POINTL;
     cchString: SWPUSHORT;
-    achString: Array[0..1-1] of Char;
+    achString: Array[0..1-1] of AnsiChar;
     adx: Array[0..2-1] of Longint;
     tabs: Array[0..1-1] of Longint;
   end;
@@ -1682,10 +1682,10 @@ function GpiDrawFrom(hps : cardinal;lFirstSegment,lLastSegment : longint) : long
 function GpiDrawSegment(hps : cardinal;lSegment : longint) : longbool; cdecl;
 function GpiDrawDynamics(hps : cardinal) : longbool; cdecl;
 function GpiRemoveDynamics(hps : cardinal;lFirstSegid,lLastSegid : longint) : longbool; cdecl;
-function GpiBeginElement(hps : cardinal;lType : longint;pszDesc : pchar) : longbool; cdecl;
+function GpiBeginElement(hps : cardinal;lType : longint;pszDesc : PAnsiChar) : longbool; cdecl;
 function GpiEndElement(hps : cardinal) : longbool; cdecl;
 function GpiLabel(hps : cardinal;lLabel : longint) : longbool; cdecl;
-function GpiElement(hps : cardinal;lType : longint;pszDesc : pchar;lLength : longint;var pbData : BYTE) : longint; cdecl;
+function GpiElement(hps : cardinal;lType : longint;pszDesc : PAnsiChar;lLength : longint;var pbData : BYTE) : longint; cdecl;
 function GpiQueryElement(hps : cardinal;lOff,lMaxLength : longint;var pbData : BYTE) : longint; cdecl;
 function GpiDeleteElement(hps : cardinal) : longbool; cdecl;
 function GpiDeleteElementRange(hps : cardinal;lFirstElement,lLastElement : longint) : longbool; cdecl;
@@ -1695,7 +1695,7 @@ function GpiSetEditMode(hps : cardinal;lMode : longint) : longbool; cdecl;
 function GpiQueryElementPointer(hps : cardinal) : longint; cdecl;
 function GpiSetElementPointer(hps : cardinal;lElement : longint) : longbool; cdecl;
 function GpiOffsetElementPointer(hps : cardinal;loffset : longint) : longbool; cdecl;
-function GpiQueryElementType(hps : cardinal;var plType : longint;lLength : longint;pszData : pchar) : longint; cdecl;
+function GpiQueryElementType(hps : cardinal;var plType : longint;lLength : longint;pszData : PAnsiChar) : longint; cdecl;
 function GpiSetElementPointerAtLabel(hps : cardinal;lLabel : longint) : longbool; cdecl;
 function GpiQuerySegmentTransformMatrix(hps : cardinal;lSegid,lCount : longint;var pmatlfArray : MATRIXLF) : longbool; cdecl;
 function GpiSetSegmentTransformMatrix(hps : cardinal;lSegid,lCount : longint;var pmatlfarray : MATRIXLF;lOptions : longint) : longbool; cdecl;
@@ -1751,8 +1751,8 @@ function GpiSetPattern(hps : cardinal;lPatternSymbol : longint) : longbool; cdec
 function GpiQueryPattern(hps : cardinal) : longint;  cdecl;
 function GpiBeginArea(hps,flOptions : cardinal) : longbool; cdecl;
 function GpiEndArea(hps : cardinal) : longint; cdecl;
-function GpiCharString(hps : cardinal;lCount : longint;pchString : pchar) : longint; cdecl;
-function GpiCharStringAt(hps : cardinal;var pptlPoint : POINTL;lCount : longint;pchString : pchar) : longint; cdecl;
+function GpiCharString(hps : cardinal;lCount : longint;pchString : PAnsiChar) : longint; cdecl;
+function GpiCharStringAt(hps : cardinal;var pptlPoint : POINTL;lCount : longint;pchString : PAnsiChar) : longint; cdecl;
 function GpiSetAttrMode(hps : cardinal;lMode : longint) : longbool; cdecl;
 function GpiQueryAttrMode(hps : cardinal) : longint; cdecl;
 function GpiSetAttrs(hps : cardinal;lPrimType : longint;flAttrMask,flDefMask : cardinal;ppbunAttrs : pointer) : longbool; cdecl;
@@ -1787,9 +1787,9 @@ function GpiSetPatternSet(hps : cardinal;lSet : longint) : longbool; cdecl;
 function GpiQueryPatternSet(hps : cardinal) : longint; cdecl;
 function GpiSetPatternRefPoint(hps : cardinal;var pptlRefPoint : POINTL) : longbool; cdecl;
 function GpiQueryPatternRefPoint(hps : cardinal;var pptlRefPoint : POINTL) : longbool; cdecl;
-function GpiQueryCharStringPos(hps,flOptions : cardinal;lCount : longint;pchString : pchar;var alXincrements : longint;var aptlPositions : POINTL) : longbool; cdecl;
-function GpiQueryCharStringPosAt(hps : cardinal;var pptlStart : POINTL;flOptions : cardinal;lCount : longint;pchString : pchar;var alXincrements : longint;var aptlPositions : POINTL) : longbool; cdecl;
-function GpiQueryTextBox(hps : cardinal;lCount1 : longint;pchString : pchar;lCount2 : longint;var aptlPoints : POINTL) : longbool; cdecl;
+function GpiQueryCharStringPos(hps,flOptions : cardinal;lCount : longint;pchString : PAnsiChar;var alXincrements : longint;var aptlPositions : POINTL) : longbool; cdecl;
+function GpiQueryCharStringPosAt(hps : cardinal;var pptlStart : POINTL;flOptions : cardinal;lCount : longint;pchString : PAnsiChar;var alXincrements : longint;var aptlPositions : POINTL) : longbool; cdecl;
+function GpiQueryTextBox(hps : cardinal;lCount1 : longint;pchString : PAnsiChar;lCount2 : longint;var aptlPoints : POINTL) : longbool; cdecl;
 function GpiQueryDefCharBox(hps : cardinal;var psizlSize : SIZEL) : longbool; cdecl;
 function GpiSetCharSet(hps : cardinal;llcid : longint) : longbool; cdecl;
 function GpiQueryCharSet(hps : cardinal) : longint; cdecl;
@@ -1805,8 +1805,8 @@ function GpiSetCharMode(hps : cardinal;lMode : longint) : longbool; cdecl;
 function GpiQueryCharMode(hps : cardinal) : longint; cdecl;
 function GpiSetTextAlignment(hps : cardinal;lHoriz,lVert : longint) : longbool; cdecl;
 function GpiQueryTextAlignment(hps : cardinal;var plHoriz,plVert : longint) : longbool; cdecl;
-function GpiCharStringPos(hps : cardinal;var prclRect : RECTL;flOptions : cardinal;lCount : longint;pchString : pchar;var alAdx : longint) : longint; cdecl;
-function GpiCharStringPosAt(hps : cardinal;var pptlStart : POINTL;var prclRect : RECTL;flOptions : cardinal;lCount : longint;pchString : pchar;var alAdx : longint) : longint; cdecl;
+function GpiCharStringPos(hps : cardinal;var prclRect : RECTL;flOptions : cardinal;lCount : longint;pchString : PAnsiChar;var alAdx : longint) : longint; cdecl;
+function GpiCharStringPosAt(hps : cardinal;var pptlStart : POINTL;var prclRect : RECTL;flOptions : cardinal;lCount : longint;pchString : PAnsiChar;var alAdx : longint) : longint; cdecl;
 function GpiSetCharExtra(hps : cardinal;Extra : longint) : longbool;  cdecl;
 function GpiSetCharBreakExtra(hps : cardinal;BreakExtra : longint) : longbool; cdecl;
 function GpiQueryCharExtra(hps : cardinal;var Extra : longint) : longbool; cdecl;
@@ -1826,23 +1826,23 @@ function GpiRectVisible(hps : cardinal;var prclRectangle : RECTL) : longint; cde
 function GpiComment(hps : cardinal;lLength : longint;var pbData : BYTE) : longbool; cdecl;
 function GpiCreateLogFont(hps : cardinal;var pName : STR8;lLcid : longint;var pfatAttrs : FATTRS) : longint; cdecl;
 function GpiDeleteSetId(hps : cardinal;lLcid : longint) : longbool; cdecl;
-function GpiLoadFonts(hab : cardinal;pszFilename : pchar) : longbool; cdecl;
-function GpiUnloadFonts(hab : cardinal;pszFilename : pchar) : longbool; cdecl;
-function GpiQueryFonts(hps,flOptions : cardinal;pszFacename : pchar;var plReqFonts : longint;lMetricsLength : longint;var afmMetrics : FONTMETRICS) : longint; cdecl;
+function GpiLoadFonts(hab : cardinal;pszFilename : PAnsiChar) : longbool; cdecl;
+function GpiUnloadFonts(hab : cardinal;pszFilename : PAnsiChar) : longbool; cdecl;
+function GpiQueryFonts(hps,flOptions : cardinal;pszFacename : PAnsiChar;var plReqFonts : longint;lMetricsLength : longint;var afmMetrics : FONTMETRICS) : longint; cdecl;
 function GpiQueryFontMetrics(hps : cardinal;lMetricsLength : longint;var pfmMetrics : FONTMETRICS) : longbool; cdecl;
 function GpiQueryKerningPairs(hps : cardinal;lCount : longint;var akrnprData : KERNINGPAIRS) : longint; cdecl;
 function GpiQueryWidthTable(hps : cardinal;lFirstChar,lCount : longint;var alData : longint) : longbool; cdecl;
 function GpiQueryNumberSetIds(hps : cardinal) : longint; cdecl;
 function GpiQuerySetIds(hps : cardinal;lCount : longint;var alTypes : longint;var aNames : STR8;var allcids : longint) : longbool; cdecl;
-function GpiQueryFaceString(PS : cardinal;FamilyName : pchar;var attrs : FACENAMEDESC;length : longint;CompoundFaceName : pchar) : cardinal; cdecl;
+function GpiQueryFaceString(PS : cardinal;FamilyName : PAnsiChar;var attrs : FACENAMEDESC;length : longint;CompoundFaceName : PAnsiChar) : cardinal; cdecl;
 function GpiQueryLogicalFont(PS : cardinal;lcid : longint;var name : STR8;var attrs : FATTRS;length : longint) : longbool; cdecl;
 function GpiQueryFontAction(anchor,options : cardinal) : cardinal; cdecl;
-function GpiLoadPublicFonts(p1 : cardinal;p2 : pchar):longbool; cdecl;
-function GpiUnloadPublicFonts(p1 : cardinal;p2 : pchar) : longbool; cdecl;
+function GpiLoadPublicFonts(p1 : cardinal;p2 : PAnsiChar):longbool; cdecl;
+function GpiUnloadPublicFonts(p1 : cardinal;p2 : PAnsiChar) : longbool; cdecl;
 function GpiSetCp(hps,ulCodePage : cardinal) : longbool;  cdecl;
 function GpiQueryCp(hps : cardinal) : cardinal; cdecl;
-function GpiQueryFontFileDescriptions(hab : cardinal;pszFilename : pchar;var plCount : longint;var affdescsNames : FFDESCS) : longint;  cdecl;
-function GpiQueryFullFontFileDescs(hab : cardinal;pszFilename : pchar;var plCount : longint;pNames : pointer;var plNamesBuffLength : longint) : longint; cdecl;
+function GpiQueryFontFileDescriptions(hab : cardinal;pszFilename : PAnsiChar;var plCount : longint;var affdescsNames : FFDESCS) : longint;  cdecl;
+function GpiQueryFullFontFileDescs(hab : cardinal;pszFilename : PAnsiChar;var plCount : longint;pNames : pointer;var plNamesBuffLength : longint) : longint; cdecl;
 function GpiBitBlt(hpsTarget,hpsSource : cardinal;lCount : longint;var aptlPoints : POINTL;lRop : longint;flOptions : cardinal) : longint; cdecl;
 function GpiDeleteBitmap(hbm : cardinal) : longbool; cdecl;
 function GpiLoadBitmap(hps,Resource,idBitmap : cardinal;lWidth,lHeight : longint) : cardinal; cdecl;
@@ -1882,11 +1882,11 @@ function GpiIntersectClipRectangle(hps : cardinal;var prclRectangle : RECTL) : l
 function GpiOffsetClipRegion(hps : cardinal;var pptlPoint : POINTL) : longint; cdecl;
 function GpiCopyMetaFile(hmf : cardinal) : cardinal; cdecl;
 function GpiDeleteMetaFile(hmf : cardinal) : longbool; cdecl;
-function GpiLoadMetaFile(hab : cardinal;pszFilename : pchar) : cardinal; cdecl;
-function GpiPlayMetaFile(hps,hmf : cardinal;lCount1 : longint;var alOptarray,plSegCount : longint;lCount2 : longint;pszDesc : pchar) : longint;  cdecl;
+function GpiLoadMetaFile(hab : cardinal;pszFilename : PAnsiChar) : cardinal; cdecl;
+function GpiPlayMetaFile(hps,hmf : cardinal;lCount1 : longint;var alOptarray,plSegCount : longint;lCount2 : longint;pszDesc : PAnsiChar) : longint;  cdecl;
 function GpiQueryMetaFileBits(hmf : cardinal;lOffset,lLength : longint;var pbData : BYTE) : longbool;  cdecl;
 function GpiQueryMetaFileLength(hmf : cardinal) : longint;  cdecl;
-function GpiSaveMetaFile(hmf : cardinal;pszFilename : pchar) : longbool; cdecl;
+function GpiSaveMetaFile(hmf : cardinal;pszFilename : PAnsiChar) : longbool; cdecl;
 function GpiSetMetaFileBits(hmf : cardinal;lOffset,lLength : longint;var pbBuffer : BYTE) : longbool; cdecl;
 function GpiQueryDefArcParams(hps : cardinal;var parcpArcParams : ARCPARAMS) : longbool; cdecl;
 function GpiQueryDefAttrs(hps : cardinal;lPrimType : longint;flAttrMask : cardinal;ppbunAttrs : pointer) : longbool; cdecl;
@@ -1946,10 +1946,10 @@ function GpiDrawFrom(hps : cardinal;lFirstSegment,lLastSegment : longint) : long
 function GpiDrawSegment(hps : cardinal;lSegment : longint) : longbool; cdecl; external 'pmgpi' index 383;
 function GpiDrawDynamics(hps : cardinal) : longbool; cdecl; external 'pmgpi' index 381;
 function GpiRemoveDynamics(hps : cardinal;lFirstSegid,lLastSegid : longint) : longbool; cdecl; external 'pmgpi' index 496;
-function GpiBeginElement(hps : cardinal;lType : longint;pszDesc : pchar) : longbool; cdecl; external 'pmgpi' index 353;
+function GpiBeginElement(hps : cardinal;lType : longint;pszDesc : PAnsiChar) : longbool; cdecl; external 'pmgpi' index 353;
 function GpiEndElement(hps : cardinal) : longbool; cdecl; external 'pmgpi' index 386;
 function GpiLabel(hps : cardinal;lLabel : longint) : longbool; cdecl; external 'pmgpi' index 397;
-function GpiElement(hps : cardinal;lType : longint;pszDesc : pchar;lLength : longint;var pbData : BYTE) : longint; cdecl; external 'pmgpi' index 384;
+function GpiElement(hps : cardinal;lType : longint;pszDesc : PAnsiChar;lLength : longint;var pbData : BYTE) : longint; cdecl; external 'pmgpi' index 384;
 function GpiQueryElement(hps : cardinal;lOff,lMaxLength : longint;var pbData : BYTE) : longint; cdecl; external 'pmgpi' index 449;
 function GpiDeleteElement(hps : cardinal) : longbool; cdecl; external 'pmgpi' index 372;
 function GpiDeleteElementRange(hps : cardinal;lFirstElement,lLastElement : longint) : longbool; cdecl; external 'pmgpi' index 373;
@@ -1959,7 +1959,7 @@ function GpiSetEditMode(hps : cardinal;lMode : longint) : longbool; cdecl; exter
 function GpiQueryElementPointer(hps : cardinal) : longint; cdecl; external 'pmgpi' index 450;
 function GpiSetElementPointer(hps : cardinal;lElement : longint) : longbool; cdecl; external 'pmgpi' index 524;
 function GpiOffsetElementPointer(hps : cardinal;loffset : longint) : longbool; cdecl; external 'pmgpi' index 406;
-function GpiQueryElementType(hps : cardinal;var plType : longint;lLength : longint;pszData : pchar) : longint; cdecl; external 'pmgpi' index 451;
+function GpiQueryElementType(hps : cardinal;var plType : longint;lLength : longint;pszData : PAnsiChar) : longint; cdecl; external 'pmgpi' index 451;
 function GpiSetElementPointerAtLabel(hps : cardinal;lLabel : longint) : longbool; cdecl; external 'pmgpi' index 525;
 function GpiQuerySegmentTransformMatrix(hps : cardinal;lSegid,lCount : longint;var pmatlfArray : MATRIXLF) : longbool; cdecl; external 'pmgpi' index 485;
 function GpiSetSegmentTransformMatrix(hps : cardinal;lSegid,lCount : longint;var pmatlfarray : MATRIXLF;lOptions : longint) : longbool; cdecl; external 'pmgpi' index 549;
@@ -2015,8 +2015,8 @@ function GpiSetPattern(hps : cardinal;lPatternSymbol : longint) : longbool; cdec
 function GpiQueryPattern(hps : cardinal) : longint; cdecl; external 'pmgpi' index 473;
 function GpiBeginArea(hps,flOptions : cardinal) : longbool; cdecl; external 'pmgpi' index 352;
 function GpiEndArea(hps : cardinal) : longint; cdecl; external 'pmgpi' index 385;
-function GpiCharString(hps : cardinal;lCount : longint;pchString : pchar) : longint; cdecl; external 'pmgpi' index 358;
-function GpiCharStringAt(hps : cardinal;var pptlPoint : POINTL;lCount : longint;pchString : pchar) : longint; cdecl; external 'pmgpi' index 359;
+function GpiCharString(hps : cardinal;lCount : longint;pchString : PAnsiChar) : longint; cdecl; external 'pmgpi' index 358;
+function GpiCharStringAt(hps : cardinal;var pptlPoint : POINTL;lCount : longint;pchString : PAnsiChar) : longint; cdecl; external 'pmgpi' index 359;
 function GpiSetAttrMode(hps : cardinal;lMode : longint) : longbool; cdecl; external 'pmgpi' index 503;
 function GpiQueryAttrMode(hps : cardinal) : longint; cdecl; external 'pmgpi' index 423;
 function GpiSetAttrs(hps : cardinal;lPrimType : longint;flAttrMask,flDefMask : cardinal;ppbunAttrs : pointer) : longbool; cdecl; external 'pmgpi' index 588;
@@ -2051,9 +2051,9 @@ function GpiSetPatternSet(hps : cardinal;lSet : longint) : longbool; cdecl; exte
 function GpiQueryPatternSet(hps : cardinal) : longint; cdecl; external 'pmgpi' index 475;
 function GpiSetPatternRefPoint(hps : cardinal;var pptlRefPoint : POINTL) : longbool; cdecl; external 'pmgpi' index 542;
 function GpiQueryPatternRefPoint(hps : cardinal;var pptlRefPoint : POINTL) : longbool; cdecl; external 'pmgpi' index 474;
-function GpiQueryCharStringPos(hps,flOptions : cardinal;lCount : longint;pchString : pchar;var alXincrements : longint;var aptlPositions : POINTL) : longbool; cdecl; external 'pmgpi' index 584;
-function GpiQueryCharStringPosAt(hps : cardinal;var pptlStart : POINTL;flOptions : cardinal;lCount : longint;pchString : pchar;var alXincrements : longint;var aptlPositions : POINTL) : longbool; cdecl; external 'pmgpi' index 585;
-function GpiQueryTextBox(hps : cardinal;lCount1 : longint;pchString : pchar;lCount2 : longint;var aptlPoints : POINTL) : longbool; cdecl; external 'pmgpi' index 489;
+function GpiQueryCharStringPos(hps,flOptions : cardinal;lCount : longint;pchString : PAnsiChar;var alXincrements : longint;var aptlPositions : POINTL) : longbool; cdecl; external 'pmgpi' index 584;
+function GpiQueryCharStringPosAt(hps : cardinal;var pptlStart : POINTL;flOptions : cardinal;lCount : longint;pchString : PAnsiChar;var alXincrements : longint;var aptlPositions : POINTL) : longbool; cdecl; external 'pmgpi' index 585;
+function GpiQueryTextBox(hps : cardinal;lCount1 : longint;pchString : PAnsiChar;lCount2 : longint;var aptlPoints : POINTL) : longbool; cdecl; external 'pmgpi' index 489;
 function GpiQueryDefCharBox(hps : cardinal;var psizlSize : SIZEL) : longbool; cdecl; external 'pmgpi' index 442;
 function GpiSetCharSet(hps : cardinal;llcid : longint) : longbool; cdecl; external 'pmgpi' index 513;
 function GpiQueryCharSet(hps : cardinal) : longint; cdecl; external 'pmgpi' index 433;
@@ -2069,8 +2069,8 @@ function GpiSetCharMode(hps : cardinal;lMode : longint) : longbool; cdecl; exter
 function GpiQueryCharMode(hps : cardinal) : longint; cdecl; external 'pmgpi' index 432;
 function GpiSetTextAlignment(hps : cardinal;lHoriz,lVert : longint) : longbool; cdecl; external 'pmgpi' index 649;
 function GpiQueryTextAlignment(hps : cardinal;var plHoriz,plVert : longint) : longbool; cdecl; external 'pmgpi' index 648;
-function GpiCharStringPos(hps : cardinal;var prclRect : RECTL;flOptions : cardinal;lCount : longint;pchString : pchar;var alAdx : longint) : longint; cdecl; external 'pmgpi' index 580;
-function GpiCharStringPosAt(hps : cardinal;var pptlStart : POINTL;var prclRect : RECTL;flOptions : cardinal;lCount : longint;pchString : pchar;var alAdx : longint) : longint; cdecl; external 'pmgpi' index 581;
+function GpiCharStringPos(hps : cardinal;var prclRect : RECTL;flOptions : cardinal;lCount : longint;pchString : PAnsiChar;var alAdx : longint) : longint; cdecl; external 'pmgpi' index 580;
+function GpiCharStringPosAt(hps : cardinal;var pptlStart : POINTL;var prclRect : RECTL;flOptions : cardinal;lCount : longint;pchString : PAnsiChar;var alAdx : longint) : longint; cdecl; external 'pmgpi' index 581;
 function GpiSetCharExtra(hps : cardinal;Extra : longint) : longbool; cdecl; external 'pmgpi' index 614;
 function GpiSetCharBreakExtra(hps : cardinal;BreakExtra : longint) : longbool; cdecl; external 'pmgpi' index 616;
 function GpiQueryCharExtra(hps : cardinal;var Extra : longint) : longbool; cdecl; external 'pmgpi' index 613;
@@ -2090,23 +2090,23 @@ function GpiRectVisible(hps : cardinal;var prclRectangle : RECTL) : longint; cde
 function GpiComment(hps : cardinal;lLength : longint;var pbData : BYTE) : longbool; cdecl; external 'pmgpi' index 363;
 function GpiCreateLogFont(hps : cardinal;var pName : STR8;lLcid : longint;var pfatAttrs : FATTRS) : longint; cdecl; external 'pmgpi' index 368;
 function GpiDeleteSetId(hps : cardinal;lLcid : longint) : longbool; cdecl; external 'pmgpi' index 378;
-function GpiLoadFonts(hab : cardinal;pszFilename : pchar) : longbool; cdecl; external 'pmgpi' index 400;
-function GpiUnloadFonts(hab : cardinal;pszFilename : pchar) : longbool; cdecl; external 'pmgpi' index 555;
-function GpiQueryFonts(hps,flOptions : cardinal;pszFacename : pchar;var plReqFonts : longint;lMetricsLength : longint;var afmMetrics : FONTMETRICS) : longint; cdecl; external 'pmgpi' index 586;
+function GpiLoadFonts(hab : cardinal;pszFilename : PAnsiChar) : longbool; cdecl; external 'pmgpi' index 400;
+function GpiUnloadFonts(hab : cardinal;pszFilename : PAnsiChar) : longbool; cdecl; external 'pmgpi' index 555;
+function GpiQueryFonts(hps,flOptions : cardinal;pszFacename : PAnsiChar;var plReqFonts : longint;lMetricsLength : longint;var afmMetrics : FONTMETRICS) : longint; cdecl; external 'pmgpi' index 586;
 function GpiQueryFontMetrics(hps : cardinal;lMetricsLength : longint;var pfmMetrics : FONTMETRICS) : longbool; cdecl; external 'pmgpi' index 453;
 function GpiQueryKerningPairs(hps : cardinal;lCount : longint;var akrnprData : KERNINGPAIRS) : longint; cdecl; external 'pmgpi' index 456;
 function GpiQueryWidthTable(hps : cardinal;lFirstChar,lCount : longint;var alData : longint) : longbool; cdecl; external 'pmgpi' index 492;
 function GpiQueryNumberSetIds(hps : cardinal) : longint; cdecl; external 'pmgpi' index 470;
 function GpiQuerySetIds(hps : cardinal;lCount : longint;var alTypes : longint;var aNames : STR8;var allcids : longint) : longbool; cdecl; external 'pmgpi' index 486;
-function GpiQueryFaceString(PS : cardinal;FamilyName : pchar;var attrs : FACENAMEDESC;length : longint;CompoundFaceName : pchar) : cardinal; cdecl; external 'pmgpi' index 575;
+function GpiQueryFaceString(PS : cardinal;FamilyName : PAnsiChar;var attrs : FACENAMEDESC;length : longint;CompoundFaceName : PAnsiChar) : cardinal; cdecl; external 'pmgpi' index 575;
 function GpiQueryLogicalFont(PS : cardinal;lcid : longint;var name : STR8;var attrs : FATTRS;length : longint) : longbool; cdecl; external 'pmgpi' index 574;
 function GpiQueryFontAction(anchor,options : cardinal) : cardinal; cdecl; external 'pmgpi' index 576;
-function GpiLoadPublicFonts(p1 : cardinal;p2 : pchar) : longbool; cdecl; external 'pmgpi' index 622;
-function GpiUnloadPublicFonts(p1 : cardinal;p2 : pchar) : longbool; cdecl; external 'pmgpi' index 623;
+function GpiLoadPublicFonts(p1 : cardinal;p2 : PAnsiChar) : longbool; cdecl; external 'pmgpi' index 622;
+function GpiUnloadPublicFonts(p1 : cardinal;p2 : PAnsiChar) : longbool; cdecl; external 'pmgpi' index 623;
 function GpiSetCp(hps,ulCodePage : cardinal) : longbool; cdecl; external 'pmgpi' index 518;
 function GpiQueryCp(hps : cardinal) : cardinal; cdecl; external 'pmgpi' index 440;
-function GpiQueryFontFileDescriptions(hab : cardinal;pszFilename : pchar;var plCount : longint;var affdescsNames : FFDESCS) : longint; cdecl; external 'pmgpi' index 452;
-function GpiQueryFullFontFileDescs(hab : cardinal;pszFilename : pchar;var plCount : longint;pNames : pointer;var plNamesBuffLength : longint) : longint; cdecl; external 'pmgpi' index 657;
+function GpiQueryFontFileDescriptions(hab : cardinal;pszFilename : PAnsiChar;var plCount : longint;var affdescsNames : FFDESCS) : longint; cdecl; external 'pmgpi' index 452;
+function GpiQueryFullFontFileDescs(hab : cardinal;pszFilename : PAnsiChar;var plCount : longint;pNames : pointer;var plNamesBuffLength : longint) : longint; cdecl; external 'pmgpi' index 657;
 function GpiBitBlt(hpsTarget,hpsSource : cardinal;lCount : longint;var aptlPoints : POINTL;lRop : longint;flOptions : cardinal) : longint; cdecl; external 'pmgpi' index 355;
 function GpiDeleteBitmap(hbm : cardinal) : longbool; cdecl; external 'pmgpi' index 371;
 function GpiLoadBitmap(hps,Resource,idBitmap:cardinal;lWidth,lHeight : longint) : cardinal; cdecl; external 'pmgpi' index 399;
@@ -2146,11 +2146,11 @@ function GpiIntersectClipRectangle(hps : cardinal;var prclRectangle : RECTL) : l
 function GpiOffsetClipRegion(hps : cardinal;var pptlPoint : POINTL) : longint; cdecl; external 'pmgpi' index 405;
 function GpiCopyMetaFile(hmf : cardinal) : cardinal; cdecl; external 'pmgpi' index 365;
 function GpiDeleteMetaFile(hmf : cardinal) : longbool; cdecl; external 'pmgpi' index 375;
-function GpiLoadMetaFile(hab : cardinal;pszFilename : pchar) : cardinal; cdecl; external 'pmgpi' index 401;
-function GpiPlayMetaFile(hps,hmf : cardinal;lCount1 : longint;var alOptarray,plSegCount : longint;lCount2 : longint;pszDesc : pchar) : longint; cdecl; external 'pmgpi' index 411;
+function GpiLoadMetaFile(hab : cardinal;pszFilename : PAnsiChar) : cardinal; cdecl; external 'pmgpi' index 401;
+function GpiPlayMetaFile(hps,hmf : cardinal;lCount1 : longint;var alOptarray,plSegCount : longint;lCount2 : longint;pszDesc : PAnsiChar) : longint; cdecl; external 'pmgpi' index 411;
 function GpiQueryMetaFileBits(hmf : cardinal;lOffset,lLength : longint;var pbData : BYTE) : longbool; cdecl; external 'pmgpi' index 465;
 function GpiQueryMetaFileLength(hmf : cardinal) : longint; cdecl; external 'pmgpi' index 466;
-function GpiSaveMetaFile(hmf : cardinal;pszFilename : pchar) : longbool; cdecl; external 'pmgpi' index 500;
+function GpiSaveMetaFile(hmf : cardinal;pszFilename : PAnsiChar) : longbool; cdecl; external 'pmgpi' index 500;
 function GpiSetMetaFileBits(hmf : cardinal;lOffset,lLength : longint;var pbBuffer : BYTE) : longbool; cdecl; external 'pmgpi' index 536;
 function GpiQueryDefArcParams(hps : cardinal;var parcpArcParams : ARCPARAMS) : longbool; cdecl; external 'pmgpi' index 567;
 function GpiQueryDefAttrs(hps : cardinal;lPrimType : longint;flAttrMask : cardinal;ppbunAttrs : pointer) : longbool; cdecl; external 'pmgpi' index 590;

rtl/os2/pmhelp.pas

@@ -64,15 +64,15 @@ type
    HelpInit=record
      cb: cardinal;
      ulReturnCode: cardinal;
-     pszTutorialName: PChar;
+     pszTutorialName: PAnsiChar;
      phtHelpTable: PHelpTable;
      hmodHelpTableModule: cardinal;
      hmodAccelActionBarModule: cardinal;
      idAccelTable: cardinal;
      idActionBar: cardinal;
-     pszHelpWindowTitle: PChar;
+     pszHelpWindowTitle: PAnsiChar;
      fShowPanelId: cardinal;
-     pszHelpLibraryName: PChar;
+     pszHelpLibraryName: PAnsiChar;
    End;
 
 //************************************************************************/
@@ -437,15 +437,15 @@ function DdfPara(ahddf: HDDF):Longbool; cdecl;
 function DdfSetFormat(ahddf: HDDF; fFormatType: cardinal): Longbool; cdecl;
 function DdfSetTextAlign(ahddf: HDDF; fAlign: cardinal): Longbool; cdecl;
 function DdfSetColor(ahddf: HDDF; fBackColor, fForColor: Longint): Longbool; cdecl;
-function DdfInform(ahddf: HDDF; var pszText: PChar; resInformNumber: cardinal): Longbool; cdecl;
+function DdfInform(ahddf: HDDF; var pszText: PAnsiChar; resInformNumber: cardinal): Longbool; cdecl;
 function DdfSetFontStyle(ahddf: HDDF; fFontStyle: cardinal): Longbool; cdecl;
-function DdfHyperText(ahddf: HDDF; var pszText, pszReference: PChar; fReferenceType: cardinal): Longbool; cdecl;
+function DdfHyperText(ahddf: HDDF; var pszText, pszReference: PAnsiChar; fReferenceType: cardinal): Longbool; cdecl;
 function DdfBeginList(ahddf: HDDF; ulWidthDT, fBreakType, fSpacing: cardinal): Longbool; cdecl;
-function DdfListItem(ahddf: HDDF; var pszTerm, pszDescription: PChar): Longbool; cdecl;
+function DdfListItem(ahddf: HDDF; var pszTerm, pszDescription: PAnsiChar): Longbool; cdecl;
 function DdfEndList(ahddf: HDDF): Longbool; cdecl;
 function DdfMetafile(ahddf: HDDF; ahmf: cardinal; var prclRect: RECTL): Longbool; cdecl;
-function DdfText(ahddf: HDDF; var pszText: PChar): Longbool; cdecl;
-function DdfSetFont(ahddf: HDDF; var pszFaceName: PChar; ulWidth, ulHeight: cardinal): Longbool; cdecl;
+function DdfText(ahddf: HDDF; var pszText: PAnsiChar): Longbool; cdecl;
+function DdfSetFont(ahddf: HDDF; var pszFaceName: PAnsiChar; ulWidth, ulHeight: cardinal): Longbool; cdecl;
 function DdfBitmap(ahddf: HDDF; hbm: HBITMAP; fAlign: cardinal): Longbool; cdecl;
 
 implementation
@@ -475,23 +475,23 @@ function DdfSetTextAlign (ahddf: HDDF; fAlign: cardinal): Longbool; cdecl;
     external HELPMGRDLL index 77;
 function DdfSetColor(ahddf: HDDF; fBackColor, fForColor: Longint): Longbool; cdecl;
     external HELPMGRDLL index 78;
-function DdfInform(ahddf: HDDF; var pszText: PChar; resInformNumber: cardinal): Longbool; cdecl;
+function DdfInform(ahddf: HDDF; var pszText: PAnsiChar; resInformNumber: cardinal): Longbool; cdecl;
     external HELPMGRDLL index 79;
 function DdfSetFontStyle(ahddf: HDDF; fFontStyle: cardinal): Longbool; cdecl;
     external HELPMGRDLL index 80;
-function DdfHyperText(ahddf: HDDF; var pszText, pszReference: PChar; fReferenceType: cardinal): Longbool; cdecl;
+function DdfHyperText(ahddf: HDDF; var pszText, pszReference: PAnsiChar; fReferenceType: cardinal): Longbool; cdecl;
     external HELPMGRDLL index 81;
 function DdfBeginList(ahddf: HDDF; ulWidthDT, fBreakType, fSpacing: cardinal): Longbool; cdecl;
     external HELPMGRDLL index 82;
-function DdfListItem(ahddf: HDDF; var pszTerm, pszDescription: PChar): Longbool; cdecl;
+function DdfListItem(ahddf: HDDF; var pszTerm, pszDescription: PAnsiChar): Longbool; cdecl;
     external HELPMGRDLL index 83;
 function DdfEndList(ahddf: HDDF): Longbool; cdecl;
     external HELPMGRDLL index 84;
 function DdfMetafile(ahddf: HDDF; ahmf: cardinal; var prclRect: RECTL): Longbool; cdecl;
     external HELPMGRDLL index 86;
-function DdfText(ahddf: HDDF; var pszText: PChar): Longbool; cdecl;
+function DdfText(ahddf: HDDF; var pszText: PAnsiChar): Longbool; cdecl;
     external HELPMGRDLL index 85;
-function DdfSetFont(ahddf: HDDF; var pszFaceName: PChar; ulWidth, ulHeight: cardinal): Longbool; cdecl;
+function DdfSetFont(ahddf: HDDF; var pszFaceName: PAnsiChar; ulWidth, ulHeight: cardinal): Longbool; cdecl;
     external HELPMGRDLL index 87;
 function DdfBitmap(ahddf: HDDF; hbm: HBITMAP; fAlign: cardinal): Longbool; cdecl;
     external HELPMGRDLL index 88;

rtl/os2/pmshl.pas

@@ -53,9 +53,9 @@ type
   PPrfProfile=^PrfProfile;
   PrfProfile=record      // prfpro
     cchUserName: Cardinal;
-    pszUserName: PChar;
+    pszUserName: PAnsiChar;
     cchSysName: Cardinal;
-    pszSysName: PChar;
+    pszSysName: PAnsiChar;
   end;
 
 // program list section
@@ -134,12 +134,12 @@ type
   PROGDETAILS=record    // progde
     Length: Cardinal;         // set this to sizeof(PROGDETAILS)
     progt: ProgType;
-    pszTitle: PChar;       // any of the pointers can be NULL
-    pszExecutable: PChar;
-    pszParameters: PChar;
-    pszStartupDir: PChar;
-    pszIcon: PChar;
-    pszEnvironment: PChar; // this is terminated by  /0/0
+    pszTitle: PAnsiChar;       // any of the pointers can be NULL
+    pszExecutable: PAnsiChar;
+    pszParameters: PAnsiChar;
+    pszStartupDir: PAnsiChar;
+    pszIcon: PAnsiChar;
+    pszEnvironment: PAnsiChar; // this is terminated by  /0/0
     swpInitial: SWP;     // this replaces XYWINSIZE
   end;
 
@@ -147,7 +147,7 @@ type
   PROGTITLE=record             // progti
     hprog: HProgram;
     progt: ProgType;
-    pszTitle: PChar;
+    pszTitle: PAnsiChar;
   End;
 
 // Program List API Function Definitions
@@ -212,22 +212,22 @@ Function PrfQueryDefinition(ahini: HINI; hprog: HProgram;
 Function PrfRemoveProgram(ahini: HINI; hprog: HProgram): Longbool; cdecl;
     external 'PMSHAPI' index 104;
 
-Function PrfQueryProgramHandle(ahini: HINI; const pszExe: PChar;
+Function PrfQueryProgramHandle(ahini: HINI; const pszExe: PAnsiChar;
                                aphprogArray: HPROGARRAY; cchBufferMax: Cardinal;
                                var pulCount: Cardinal): Longbool; cdecl;
     external 'PMSHAPI' index 58;
 
-Function PrfCreateGroup(ahini: HINI; const pszTitle: PChar;
+Function PrfCreateGroup(ahini: HINI; const pszTitle: PAnsiChar;
                         chVisibility: Byte): HProgram; cdecl;
     external 'PMSHAPI' index 55;
 
 Function PrfDestroyGroup(ahini: HINI; hprogGroup: HProgram): Longbool; cdecl;
     external 'PMSHAPI' index 106;
 
-Function PrfQueryProgramCategory(ahini: HINI; const pszExe: PChar): PROGCATEGORY; cdecl;
+Function PrfQueryProgramCategory(ahini: HINI; const pszExe: PAnsiChar): PROGCATEGORY; cdecl;
     external 'PMSHAPI' index 59;
 
-Function WinStartApp(hwndNotify: HWND; var pDetails: PROGDETAILS; const pszParams: PChar;
+Function WinStartApp(hwndNotify: HWND; var pDetails: PROGDETAILS; const pszParams: PAnsiChar;
                      Reserved: Pointer; fbOptions: Cardinal): HAPP; cdecl;
     external 'PMSHAPI' index 119;
 
@@ -261,7 +261,7 @@ type
     idSession: Cardinal;
     uchVisibility: Cardinal;
     fbJump: Cardinal;
-    szSwtitle: Array[1..MaxNameL+4] of Char;
+    szSwtitle: Array[1..MaxNameL+4] of AnsiChar;
     bProgType: Cardinal;
   end;
 
@@ -304,7 +304,7 @@ Function WinCreateSwitchEntry(ahab: HAB; var pswctlSwitchData: SWCNTRL): HSWITCH
     external 'PMSHAPI' index 121;
 
 Function WinQuerySessionTitle(ahab: HAB; usSession: Cardinal;
-                              var pszTitle: PChar;
+                              var pszTitle: PAnsiChar;
                               usTitlelen: Cardinal): Cardinal; cdecl;
     external 'PMSHAPI' index 122;
 
@@ -324,7 +324,7 @@ Function WinQueryTaskSizePos(ahab: HAB; usScreenGroup: Cardinal;
                              var pswpPositionData: SWP): Cardinal; cdecl;
     external 'PMSHAPI' index 127;
 
-Function WinQueryTaskTitle(usSession: Cardinal; var pszTitle: PChar;
+Function WinQueryTaskTitle(usSession: Cardinal; var pszTitle: PAnsiChar;
                            usTitlelen: Cardinal): Cardinal; cdecl;
    external 'PMSHAPI' index 128;
 
@@ -333,30 +333,30 @@ Function WinSwitchToProgram(hswitchSwHandle: HSWITCH): Cardinal; cdecl;
 
 // OS2.INI Access functions
 
-Function PrfQueryProfileInt(ahini: HINI; const pszApp, pszKey: PChar;
+Function PrfQueryProfileInt(ahini: HINI; const pszApp, pszKey: PAnsiChar;
                             sDefault: Longint): Longint; cdecl;
     external 'PMSHAPI' index 114;
 
-Function PrfQueryProfileString(ahini: HINI; const pszApp, pszKey, pszDefault: PChar;
+Function PrfQueryProfileString(ahini: HINI; const pszApp, pszKey, pszDefault: PAnsiChar;
                                var pBuffer; cchBufferMax: Cardinal): Cardinal; cdecl;
     external 'PMSHAPI' index 115;
 
-Function PrfWriteProfileString(ahini: HINI; const pszApp, pszKey, pszData: PChar): Longbool; cdecl;
+Function PrfWriteProfileString(ahini: HINI; const pszApp, pszKey, pszData: PAnsiChar): Longbool; cdecl;
     external 'PMSHAPI' index 116;
 
-Function PrfQueryProfileSize(ahini: HINI; const pszApp, pszKey: PChar;
+Function PrfQueryProfileSize(ahini: HINI; const pszApp, pszKey: PAnsiChar;
                              var pulReqLen: Cardinal): Longbool; cdecl;
     external 'PMSHAPI' index 101;
 
-Function PrfQueryProfileData(ahini: HINI; const pszApp, pszKey: PChar; var pBuffer;
+Function PrfQueryProfileData(ahini: HINI; const pszApp, pszKey: PAnsiChar; var pBuffer;
                              var pulBuffLen: Cardinal): Longbool; cdecl;
     external 'PMSHAPI' index 117;
 
-Function PrfWriteProfileData(ahini: HINI; const pszApp, pszKey: PChar; var pData;
+Function PrfWriteProfileData(ahini: HINI; const pszApp, pszKey: PAnsiChar; var pData;
                              cchDataLen: Cardinal): Longbool; cdecl;
     external 'PMSHAPI' index 118;
 
-Function PrfOpenProfile(ahab: HAB;const pszFileName: PChar): HINI; cdecl;
+Function PrfOpenProfile(ahab: HAB;const pszFileName: PAnsiChar): HINI; cdecl;
     external 'PMSHAPI' index 102;
 
 Function PrfCloseProfile(ahini: HINI): Longbool; cdecl;

rtl/os2/pmspl.pas

@@ -46,8 +46,8 @@ type
     PHStd = ^HStd;
 
 { Spooler manager open data }
-    QMOpenData = PChar;
-    PQMOpenData = ^PChar;
+    QMOpenData = PAnsiChar;
+    PQMOpenData = ^PAnsiChar;
 
 { Spooler Queue Processor interface }
 
@@ -66,7 +66,7 @@ type
 { Handle to a spooler queue processor }
     HProc = cardinal;
 
-    PQPOpenData = ^PChar;
+    PQPOpenData = ^PAnsiChar;
 
 const
 { Definition for elements within the PQPOpenData block }
@@ -85,17 +85,17 @@ const
 
 type
     TSQPOpenData = record
-        pszLogAddress: PChar;
-        pszDriverName: PChar;
+        pszLogAddress: PAnsiChar;
+        pszDriverName: PAnsiChar;
         pdriv: PDrivData;
-        pszDataType: PChar;
-        pszComment: PChar;
-        pszProcParams: PChar;
-        pszSpoolParams: PChar;
-        pszNetworkParams: PChar;
-        pszDocName: PChar;
-        pszQueueName: PChar;
-        pszToken: PChar;
+        pszDataType: PAnsiChar;
+        pszComment: PAnsiChar;
+        pszProcParams: PAnsiChar;
+        pszSpoolParams: PAnsiChar;
+        pszNetworkParams: PAnsiChar;
+        pszDocName: PAnsiChar;
+        pszQueueName: PAnsiChar;
+        pszToken: PAnsiChar;
         idJobId: word;
     end;
     PSQPOpenData = ^TSQPOpenData;
@@ -146,7 +146,7 @@ const
 
 type
     TDrivProps = record
-        pszKeyName: PChar;
+        pszKeyName: PAnsiChar;
         cbBuf: cardinal;
         pBuf: pointer;
     end;
@@ -156,17 +156,17 @@ type
 
     TPrJInfo = record
         uJobId: word;
-        szUserName: array [0..UNLen] of char;
-        pad_1: char;
-        szNotifyName: array [0..CNLen] of char;
-        szDataType: array [0..DTLen] of char;
-        pszParms: PChar;
+        szUserName: array [0..UNLen] of AnsiChar;
+        pad_1: AnsiChar;
+        szNotifyName: array [0..CNLen] of AnsiChar;
+        szDataType: array [0..DTLen] of AnsiChar;
+        pszParms: PAnsiChar;
         uPosition: word;
         fsStatus: word;
-        pszStatus: PChar;
+        pszStatus: PAnsiChar;
         ulSubmitted: cardinal;
         ulSize: cardinal;
-        pszComment: PChar;
+        pszComment: PAnsiChar;
     end;
     PPrJInfo = ^TPrJInfo;
     PrJInfo = TPrJInfo;
@@ -175,13 +175,13 @@ type
     TPrJInfo2 = record
         uJobId: word;
         uPriority: word;
-        pszUserName: PChar;
+        pszUserName: PAnsiChar;
         uPosition: word;
         fsStatus: word;
         ulSubmitted: cardinal;
         ulSize: cardinal;
-        pszComment: PChar;
-        pszDocument: PChar;
+        pszComment: PAnsiChar;
+        pszDocument: PAnsiChar;
     end;
     PPrJInfo2 = ^TPrJInfo2;
     PrJInfo2 = TPrJInfo2;
@@ -190,34 +190,34 @@ type
     TPrJInfo3 = record
         uJobId: word;
         uPriority: word;
-        pszUserName: PChar;
+        pszUserName: PAnsiChar;
         uPosition: word;
         fsStatus: word;
         ulSubmitted: cardinal;
         ulSize: cardinal;
-        pszComment: PChar;
-        pszDocument: PChar;
-        pszNotifyName: PChar;
-        pszDataType: PChar;
-        pszParms: PChar;
-        pszStatus: PChar;
-        pszQueue: PChar;
-        pszQProcName: PChar;
-        pszQProcParms: PChar;
-        pszDriverName: PChar;
+        pszComment: PAnsiChar;
+        pszDocument: PAnsiChar;
+        pszNotifyName: PAnsiChar;
+        pszDataType: PAnsiChar;
+        pszParms: PAnsiChar;
+        pszStatus: PAnsiChar;
+        pszQueue: PAnsiChar;
+        pszQProcName: PAnsiChar;
+        pszQProcParms: PAnsiChar;
+        pszDriverName: PAnsiChar;
         pDriverData: PDrivData;
-        pszPrinterName: PChar;
+        pszPrinterName: PAnsiChar;
     end;
     PPrJInfo3 = ^TPrJInfo3;
     PrJInfo3 = TPrJInfo3;
     NPPrJInfo3 = ^TPrJInfo3;
 
     TPrDInfo = record
-        szName: array [0..PDLen] of char;
-        szUserName: array [0..UNLen] of char;
+        szName: array [0..PDLen] of AnsiChar;
+        szUserName: array [0..UNLen] of AnsiChar;
         uJobId: word;
         fsStatus: word;
-        pszStatus: PChar;
+        pszStatus: PAnsiChar;
         time: word;
     end;
     PPrDInfo = ^TPrDInfo;
@@ -225,14 +225,14 @@ type
     NPPrDInfo = ^TPrDInfo;
 
     TPrDInfo3 = record
-        pszPrinterName: PChar;
-        pszUserName: PChar;
-        pszLogAddr: PChar;
+        pszPrinterName: PAnsiChar;
+        pszUserName: PAnsiChar;
+        pszLogAddr: PAnsiChar;
         uJobId: word;
         fsStatus: word;
-        pszStatus: PChar;
-        pszComment: PChar;
-        pszDrivers: PChar;
+        pszStatus: PAnsiChar;
+        pszComment: PAnsiChar;
+        pszDrivers: PAnsiChar;
         time: word;
         usTimeOut: word;
     end;
@@ -241,16 +241,16 @@ type
     NPPrDInfo3 = ^TPrDInfo3;
 
     TPrQInfo = record
-        szName: array [0..QNLen] of char;
-        pad_1: char;
+        szName: array [0..QNLen] of AnsiChar;
+        pad_1: AnsiChar;
         uPriority: word;
         uStartTime: word;
         uUntilTime: word;
-        pszSepFile: PChar;
-        pszPrProc: PChar;
-        pszDestinations: PChar;
-        pszParms: PChar;
-        pszComment: PChar;
+        pszSepFile: PAnsiChar;
+        pszPrProc: PAnsiChar;
+        pszDestinations: PAnsiChar;
+        pszParms: PAnsiChar;
+        pszComment: PAnsiChar;
         fsStatus: word;
         cJobs: word;
     end;
@@ -259,19 +259,19 @@ type
     NPPrQInfo = ^TPrQInfo;
 
     TPrQInfo3 = record
-        pszName: PChar;
+        pszName: PAnsiChar;
         uPriority: word;
         uStartTime: word;
         uUntilTime: word;
         fsType: word;
-        pszSepFile: PChar;
-        pszPrProc: PChar;
-        pszParms: PChar;
-        pszComment: PChar;
+        pszSepFile: PAnsiChar;
+        pszPrProc: PAnsiChar;
+        pszParms: PAnsiChar;
+        pszComment: PAnsiChar;
         fsStatus: word;
         cJobs: word;
-        pszPrinters: PChar;
-        pszDriverName: PChar;
+        pszPrinters: PAnsiChar;
+        pszDriverName: PAnsiChar;
         pDriverData: PDrivData;
     end;
     PPrQInfo3 = ^TPrQInfo3;
@@ -279,22 +279,22 @@ type
     NPPrQInfo3 = ^TPrQInfo3;
 
     TPrQInfo6 = record
-        pszName: PChar;
+        pszName: PAnsiChar;
         uPriority: word;
         uStartTime: word;
         uUntilTime: word;
         fsType: word;
-        pszSepFile: PChar;
-        pszPrProc: PChar;
-        pszParms: PChar;
-        pszComment: PChar;
+        pszSepFile: PAnsiChar;
+        pszPrProc: PAnsiChar;
+        pszParms: PAnsiChar;
+        pszComment: PAnsiChar;
         fsStatus: word;
         cJobs: word;
-        pszPrinters: PChar;
-        pszDriverName: PChar;
+        pszPrinters: PAnsiChar;
+        pszDriverName: PAnsiChar;
         pDriverData: PDrivData;
-        pszRemoteComputerName: PChar;
-        pszRemoteQueueName: PChar;
+        pszRemoteComputerName: PAnsiChar;
+        pszRemoteQueueName: PAnsiChar;
     end;
     PPrQInfo6 = ^TPrQInfo6;
     PrQInfo6 = TPrQInfo6;
@@ -303,9 +303,9 @@ type
 { Structure for DosPrintJobGetId }
     TPrIDInfo = record
         uJobId: word;
-        szComputerName: array [0..CNLen] of char;
-        szQueueName: array [0..QNLen] of char;
-        pad_1: char;
+        szComputerName: array [0..CNLen] of AnsiChar;
+        szQueueName: array [0..QNLen] of AnsiChar;
+        pad_1: AnsiChar;
     end;
     PPrIDInfo = ^TPrIDInfo;
     PrIDInfo = TPrIDInfo;
@@ -313,7 +313,7 @@ type
 
 { Structure for DosPrintDriverEnum }
     TPrDrivInfo = record
-        szDrivName: array [0..Driv_Name_Size+1+Driv_DeviceName_Size] of char;
+        szDrivName: array [0..Driv_Name_Size+1+Driv_DeviceName_Size] of AnsiChar;
     end;
     PPrDrivInfo = ^TPrDrivInfo;
     PrDrivInfo = TPrDrivInfo;
@@ -321,7 +321,7 @@ type
 
 { Structure for DosPrintQProcessorEnum }
     TPrQProcInfo = record
-        szQProcName: array [0..QNLen] of char;
+        szQProcName: array [0..QNLen] of AnsiChar;
     end;
     PPrQProcInfo = ^TPrQProcInfo;
     PrQProcInfo = TPrQProcInfo;
@@ -329,7 +329,7 @@ type
 
 { Structure for DosPrintPortEnum Level 0 }
     TPrPortInfo = record
-        szPortName: array [0..PDLen] of char;
+        szPortName: array [0..PDLen] of AnsiChar;
     end;
     PPrPortInfo = ^TPrPortInfo;
     PrPortInfo = TPrPortInfo;
@@ -337,9 +337,9 @@ type
 
 { Structure for DosPrintPortEnum Level 1 }
     TPrPortInfo1 = record
-        pszPortName : PChar;
-        pszPortDriverName : PChar;
-        pszPortDriverPathName : PChar;
+        pszPortName : PAnsiChar;
+        pszPortDriverName : PAnsiChar;
+        pszPortDriverPathName : PAnsiChar;
     end;
     PPrPortInfo1 = ^TPrPortInfo1;
     PrPortInfo1 = TPrPortInfo1;
@@ -453,10 +453,10 @@ type
 { Structure for SplEnumPrinter }
     TPrinterInfo = record
         fltype: cardinal;
-        pszComputerName: PChar;
-        pszPrintDestinationName: PChar;
-        pszDescription: PChar;
-        pszLocalName: PChar;
+        pszComputerName: PAnsiChar;
+        pszPrintDestinationName: PAnsiChar;
+        pszDescription: PAnsiChar;
+        pszLocalName: PAnsiChar;
     end;
     PrinterInfo = TPrinterInfo;
     PPrinterInfo = ^TPrinterInfo;
@@ -469,22 +469,22 @@ const
     SPL_PR_LOCAL_ONLY     = $00000100; { exclude remote queues }
 
 
-function SplQueryDevice (const pszComputerName, pszPrintDeviceName: PChar;
+function SplQueryDevice (const pszComputerName, pszPrintDeviceName: PAnsiChar;
                         ulLevel: cardinal; var pBuf; cbBuf: cardinal;
                         var pcbNeeded: cardinal): longint; cdecl;
 
-function SplQueryQueue (const pszComputerName, pszQueueName: PChar;
+function SplQueryQueue (const pszComputerName, pszQueueName: PAnsiChar;
                        ulLevel: cardinal; var pBuf; cbBuf: cardinal;
                        var pcbNeeded: cardinal): longint; cdecl;
 
-function SplEnumQueue (const pszComputerName: PChar; ulLevel: cardinal;
+function SplEnumQueue (const pszComputerName: PAnsiChar; ulLevel: cardinal;
       var pBuf; cbBuf: cardinal; var pcReturned, pcTotal, pcbNeeded: cardinal;
                                                 var pReserved): longint; cdecl;
 
-function SplQmOpen (const pszToken: PChar; lCount: longint;
-                                       var pqmdopData: PChar): cardinal; cdecl;
+function SplQmOpen (const pszToken: PAnsiChar; lCount: longint;
+                                       var pqmdopData: PAnsiChar): cardinal; cdecl;
 
-function SplQmStartDoc (ahspl: cardinal; const pszDocName: PChar): longbool;
+function SplQmStartDoc (ahspl: cardinal; const pszDocName: PAnsiChar): longbool;
                                                                          cdecl;
 
 function SplQmWrite (ahspl: cardinal; lCount: longint; var pData): longbool;
@@ -498,11 +498,11 @@ function SplQmAbort(ahspl: cardinal): longbool; cdecl;
 
 function SplQmAbortDoc (ahspl: cardinal): longbool; cdecl;
 
-function SplMessageBox (const pszLogAddr: PChar; fErrInfo, fErrData: cardinal;
-                                             const pszText, pszCaption: PChar;
+function SplMessageBox (const pszLogAddr: PAnsiChar; fErrInfo, fErrData: cardinal;
+                                             const pszText, pszCaption: PAnsiChar;
                                   idWindow, fStyle: cardinal): cardinal; cdecl;
 
-function PrtOpen (const pszDeviceName: PChar; var phDevice: cardinal;
+function PrtOpen (const pszDeviceName: PAnsiChar; var phDevice: cardinal;
                  var pActionTaken: cardinal;cbFileSize,uFileAttr: cardinal;
                  openFlag,openMode,reserved: cardinal): cardinal;
           cdecl;
@@ -532,103 +532,103 @@ function SplStdGetBits (hMetaFile: cardinal; offData, cbData: longint;
 
 function SplStdQueryLength (hMetaFile: cardinal): longint; cdecl;
 
-function SplCreateDevice (const pszComputerName: PChar;ulLevel: cardinal;
+function SplCreateDevice (const pszComputerName: PAnsiChar;ulLevel: cardinal;
                                    var pBuf; cbBuf: cardinal): cardinal; cdecl;
 
-function SplControlDevice (const pszComputerName, pszPortName: PChar;
+function SplControlDevice (const pszComputerName, pszPortName: PAnsiChar;
                                          ulControl: cardinal): cardinal; cdecl;
 
 function SplDeleteDevice (const pszComputerName,
-                                   pszPrintDeviceName: PChar): cardinal; cdecl;
+                                   pszPrintDeviceName: PAnsiChar): cardinal; cdecl;
 
-function SplEnumDevice (const pszComputerName: PChar; ulLevel: cardinal;
+function SplEnumDevice (const pszComputerName: PAnsiChar; ulLevel: cardinal;
       var pBuf; cbBuf: cardinal; var pcReturned, pcTotal, pcbNeeded: cardinal;
                                                var pReserved): cardinal; cdecl;
 
-function SplSetDevice (const pszComputerName, pszPrintDeviceName: PChar;
+function SplSetDevice (const pszComputerName, pszPrintDeviceName: PAnsiChar;
      ulLevel: cardinal; var pBuf; cbBuf, ulParmNum: cardinal): cardinal; cdecl;
 
-function SplReleaseJob (const pszComputerName, pszQueueName: PChar;
+function SplReleaseJob (const pszComputerName, pszQueueName: PAnsiChar;
                                              ulJob: cardinal): cardinal; cdecl;
 
-function SplDeleteJob (const pszComputerName, pszQueueName: PChar;
+function SplDeleteJob (const pszComputerName, pszQueueName: PAnsiChar;
                                              ulJob: cardinal): cardinal; cdecl;
 
-function SplEnumJob (const pszComputerName, pszQueueName: PChar;
+function SplEnumJob (const pszComputerName, pszQueueName: PAnsiChar;
                               ulLevel: cardinal; var pBuf;cbBuf: cardinal;
                                  var pcReturned, pcTotal, pcbNeeded: cardinal;
                                                var pReserved): cardinal; cdecl;
 
-function SplQueryJob (const pszComputerName, pszQueueName: PChar;
+function SplQueryJob (const pszComputerName, pszQueueName: PAnsiChar;
                           ulJob, ulLevel: cardinal; var pBuf; cbBuf: cardinal;
                                      var pcbNeeded: cardinal): cardinal; cdecl;
 
-function SplHoldJob (const pszComputerName, pszQueueName: PChar;
+function SplHoldJob (const pszComputerName, pszQueueName: PAnsiChar;
                                              ulJob: cardinal): cardinal; cdecl;
 
-function SplSetJob (const pszComputerName, pszQueueName: PChar;
+function SplSetJob (const pszComputerName, pszQueueName: PAnsiChar;
                                           ulJob, ulLevel: cardinal; var pBuf;
                                   cbBuf, ulParmNum: cardinal): cardinal; cdecl;
 
-function SplCreateQueue (const pszComputerName: PChar; ulLevel: cardinal;
+function SplCreateQueue (const pszComputerName: PAnsiChar; ulLevel: cardinal;
                                    var pBuf; cbBuf: cardinal): cardinal; cdecl;
 
 function SplReleaseQueue (const pszComputerName,
-                                         pszQueueName: PChar): cardinal; cdecl;
+                                         pszQueueName: PAnsiChar): cardinal; cdecl;
 
-function SplDeleteQueue (const pszComputerName, pszQueueName: PChar): cardinal;
+function SplDeleteQueue (const pszComputerName, pszQueueName: PAnsiChar): cardinal;
                                                                          cdecl;
 
-function SplHoldQueue (const pszComputerName, pszQueueName: PChar): cardinal;
+function SplHoldQueue (const pszComputerName, pszQueueName: PAnsiChar): cardinal;
                                                                          cdecl;
 
-function SplPurgeQueue (const pszComputerName, pszQueueName: PChar): cardinal;
+function SplPurgeQueue (const pszComputerName, pszQueueName: PAnsiChar): cardinal;
                                                                          cdecl;
 
-function SplSetQueue (const pszComputerName, pszQueueName: PChar;
+function SplSetQueue (const pszComputerName, pszQueueName: PAnsiChar;
        ulLevel: cardinal; var pBuf;cbBuf,ulParmNum: cardinal): cardinal; cdecl;
 
-function SplEnumDriver (const pszComputerName: PChar; ulLevel: cardinal;
+function SplEnumDriver (const pszComputerName: PAnsiChar; ulLevel: cardinal;
         var pBuf; cbBuf: cardinal; var pcReturned,pcTotal,pcbNeeded: cardinal;
                                                var pReserved): cardinal; cdecl;
 
-function SplEnumPort (const pszComputerName: PChar; ulLevel: cardinal;
+function SplEnumPort (const pszComputerName: PAnsiChar; ulLevel: cardinal;
       var pBuf; cbBuf: cardinal; var pcReturned, pcTotal, pcbNeeded: cardinal;
                                                var pReserved): cardinal; cdecl;
 
-function SplEnumQueueProcessor (const pszComputerName: PChar;
+function SplEnumQueueProcessor (const pszComputerName: PAnsiChar;
        ulLevel: cardinal; var pBuf; cbBuf: cardinal; var pcReturned, pcTotal,
                           pcbNeeded: cardinal; var pReserved): cardinal; cdecl;
 
-function SplEnumPrinter (const pszComputerName: PChar;
+function SplEnumPrinter (const pszComputerName: PAnsiChar;
          uLevel, fltype: cardinal; var pBuf; cbbuf: cardinal; var pcReturned,
                  pcTotal, pcbNeeded: cardinal; var pReserved): cardinal; cdecl;
 
-function SplCopyJob (const pszSrcComputerName, pszSrcQueueName: PChar;
-         ulSrcJob: cardinal; const pszTrgComputerName, pszTrgQueueName: PChar;
+function SplCopyJob (const pszSrcComputerName, pszSrcQueueName: PAnsiChar;
+         ulSrcJob: cardinal; const pszTrgComputerName, pszTrgQueueName: PAnsiChar;
                                      var pulTrgJob: cardinal): cardinal; cdecl;
 
 
 implementation
 
-function SplQueryDevice (const pszComputerName, pszPrintDeviceName: PChar;
+function SplQueryDevice (const pszComputerName, pszPrintDeviceName: PAnsiChar;
                               ulLevel: cardinal; var pBuf; cbBuf: cardinal;
                                            var pcbNeeded: cardinal): longint;
                                              cdecl; external 'PMSPL' index 381;
 
-function SplQueryQueue (const pszComputerName, pszQueueName: PChar;
+function SplQueryQueue (const pszComputerName, pszQueueName: PAnsiChar;
                               ulLevel: cardinal; var pBuf; cbBuf: cardinal;
                                            var pcbNeeded: cardinal): longint;
                                              cdecl; external 'PMSPL' index 397;
 
-function SplEnumQueue (const pszComputerName: PChar; ulLevel: cardinal;
+function SplEnumQueue (const pszComputerName: PAnsiChar; ulLevel: cardinal;
       var pBuf; cbBuf: cardinal; var pcReturned, pcTotal, pcbNeeded: cardinal;
                     var pReserved): longint; cdecl; external 'PMSPL' index 399;
 
-function SplQmOpen (const pszToken: PChar; lCount: longint;
-           var pqmdopData: PChar): cardinal; cdecl; external 'PMSPL' index 301;
+function SplQmOpen (const pszToken: PAnsiChar; lCount: longint;
+           var pqmdopData: PAnsiChar): cardinal; cdecl; external 'PMSPL' index 301;
 
-function SplQmStartDoc (ahspl: cardinal; const pszDocName: PChar): longbool;
+function SplQmStartDoc (ahspl: cardinal; const pszDocName: PAnsiChar): longbool;
                                              cdecl; external 'PMSPL' index 302;
 
 function SplQmWrite (ahspl: cardinal; lCount: longint; var pData): longbool;
@@ -646,11 +646,11 @@ function SplQmAbort (ahspl: cardinal): longbool;
 function SplQmAbortDoc (ahspl: cardinal): longbool;
                                              cdecl; external 'PMSPL' index 308;
 
-function SplMessageBox (const pszLogAddr: PChar; fErrInfo, fErrData: cardinal;
-      const pszText, pszCaption: PChar; idWindow, fStyle: cardinal): cardinal;
+function SplMessageBox (const pszLogAddr: PAnsiChar; fErrInfo, fErrData: cardinal;
+      const pszText, pszCaption: PAnsiChar; idWindow, fStyle: cardinal): cardinal;
                                              cdecl; external 'PMSPL' index 307;
 
-function PrtOpen (const pszDeviceName: PChar; var phDevice: cardinal;
+function PrtOpen (const pszDeviceName: PAnsiChar; var phDevice: cardinal;
                  var pActionTaken: cardinal; cbFileSize, uFileAttr: cardinal;
                             openFlag, openMode, reserved: cardinal): cardinal;
                                              cdecl; external 'PMSPL' index 370;
@@ -687,82 +687,82 @@ function SplStdGetBits (hMetaFile: cardinal; offData, cbData: longint;
 function SplStdQueryLength (hMetaFile: cardinal): longint;
                                              cdecl; external 'PMSPL' index 356;
 
-function SplCreateDevice (const pszComputerName: PChar; ulLevel: cardinal;
+function SplCreateDevice (const pszComputerName: PAnsiChar; ulLevel: cardinal;
        var pBuf; cbBuf: cardinal): cardinal; cdecl; external 'PMSPL' index 401;
 
-function SplControlDevice (const pszComputerName, pszPortName: PChar;
+function SplControlDevice (const pszComputerName, pszPortName: PAnsiChar;
              ulControl: cardinal): cardinal; cdecl; external 'PMSPL' index 380;
 
 function SplDeleteDevice (const pszComputerName,
-       pszPrintDeviceName: PChar): cardinal; cdecl; external 'PMSPL' index 403;
+       pszPrintDeviceName: PAnsiChar): cardinal; cdecl; external 'PMSPL' index 403;
 
-function SplEnumDevice (const pszComputerName: PChar; ulLevel: cardinal;
+function SplEnumDevice (const pszComputerName: PAnsiChar; ulLevel: cardinal;
         var pBuf; cbBuf: cardinal; var pcReturned,pcTotal,pcbNeeded: cardinal;
                    var pReserved): cardinal; cdecl; external 'PMSPL' index 382;
 
-function SplSetDevice (const pszComputerName, pszPrintDeviceName: PChar;
+function SplSetDevice (const pszComputerName, pszPrintDeviceName: PAnsiChar;
            ulLevel: cardinal; var pBuf; cbBuf, ulParmNum: cardinal): cardinal;
                                              cdecl; external 'PMSPL' index 402;
 
-function SplReleaseJob (const pszComputerName, pszQueueName: PChar;
+function SplReleaseJob (const pszComputerName, pszQueueName: PAnsiChar;
                  ulJob: cardinal): cardinal; cdecl; external 'PMSPL' index 384;
 
-function SplDeleteJob (const pszComputerName, pszQueueName: PChar;
+function SplDeleteJob (const pszComputerName, pszQueueName: PAnsiChar;
                  ulJob: cardinal): cardinal; cdecl; external 'PMSPL' index 386;
 
-function SplEnumJob (const pszComputerName, pszQueueName: PChar;
+function SplEnumJob (const pszComputerName, pszQueueName: PAnsiChar;
                            ulLevel: cardinal; var pBuf; cbBuf: cardinal;
                                  var pcReturned, pcTotal, pcbNeeded: cardinal;
                    var pReserved): cardinal; cdecl; external 'PMSPL' index 392;
 
-function SplQueryJob (const pszComputerName, pszQueueName: PChar;
+function SplQueryJob (const pszComputerName, pszQueueName: PAnsiChar;
                           ulJob, ulLevel: cardinal; var pBuf; cbBuf: cardinal;
          var pcbNeeded: cardinal): cardinal; cdecl; external 'PMSPL' index 390;
 
-function SplHoldJob (const pszComputerName, pszQueueName: PChar;
+function SplHoldJob (const pszComputerName, pszQueueName: PAnsiChar;
                  ulJob: cardinal): cardinal; cdecl; external 'PMSPL' index 385;
 
-function SplSetJob (const pszComputerName, pszQueueName: PChar;
+function SplSetJob (const pszComputerName, pszQueueName: PAnsiChar;
       ulJob, ulLevel: cardinal; var pBuf;cbBuf,ulParmNum: cardinal): cardinal;
                                              cdecl; external 'PMSPL' index 391;
 
-function SplCreateQueue (const pszComputerName: PChar; ulLevel: cardinal;
+function SplCreateQueue (const pszComputerName: PAnsiChar; ulLevel: cardinal;
        var pBuf; cbBuf: cardinal): cardinal; cdecl; external 'PMSPL' index 393;
 
 function SplReleaseQueue (const pszComputerName,
-             pszQueueName: PChar): cardinal; cdecl; external 'PMSPL' index 395;
+             pszQueueName: PAnsiChar): cardinal; cdecl; external 'PMSPL' index 395;
 
-function SplDeleteQueue (const pszComputerName, pszQueueName: PChar): cardinal;
+function SplDeleteQueue (const pszComputerName, pszQueueName: PAnsiChar): cardinal;
                                              cdecl; external 'PMSPL' index 396;
 
-function SplHoldQueue (const pszComputerName, pszQueueName: PChar): cardinal;
+function SplHoldQueue (const pszComputerName, pszQueueName: PAnsiChar): cardinal;
                                              cdecl; external 'PMSPL' index 394;
 
-function SplPurgeQueue (const pszComputerName, pszQueueName: PChar): cardinal;
+function SplPurgeQueue (const pszComputerName, pszQueueName: PAnsiChar): cardinal;
                                              cdecl; external 'PMSPL' index 404;
 
-function SplSetQueue (const pszComputerName, pszQueueName: PChar;
+function SplSetQueue (const pszComputerName, pszQueueName: PAnsiChar;
              ulLevel: cardinal; var pBuf;cbBuf,ulParmNum: cardinal): cardinal;
                                              cdecl; external 'PMSPL' index 398;
 
-function SplEnumDriver (const pszComputerName: PChar; ulLevel: cardinal;
+function SplEnumDriver (const pszComputerName: PAnsiChar; ulLevel: cardinal;
       var pBuf; cbBuf: cardinal; var pcReturned, pcTotal, pcbNeeded: cardinal;
                    var pReserved): cardinal; cdecl; external 'PMSPL' index 406;
 
-function SplEnumPort (const pszComputerName: PChar; ulLevel: cardinal;
+function SplEnumPort (const pszComputerName: PAnsiChar; ulLevel: cardinal;
         var pBuf; cbBuf: cardinal; var pcReturned,pcTotal,pcbNeeded: cardinal;
                    var pReserved): cardinal; cdecl; external 'PMSPL' index 408;
 
-function SplEnumQueueProcessor (const pszComputerName: PChar;ulLevel: cardinal;
+function SplEnumQueueProcessor (const pszComputerName: PAnsiChar;ulLevel: cardinal;
        var pBuf; cbBuf: cardinal; var pcReturned, pcTotal, pcbNeeded: cardinal;
                    var pReserved): cardinal; cdecl; external 'PMSPL' index 407;
 
-function SplEnumPrinter (const pszComputerName: PChar;uLevel, fltype: cardinal;
+function SplEnumPrinter (const pszComputerName: PAnsiChar;uLevel, fltype: cardinal;
        var pBuf; cbbuf: cardinal; var pcReturned, pcTotal, pcbNeeded: cardinal;
                    var pReserved): cardinal; cdecl; external 'PMSPL' index 441;
 
-function SplCopyJob (const pszSrcComputerName, pszSrcQueueName: PChar;
-         ulSrcJob: cardinal; const pszTrgComputerName, pszTrgQueueName: PChar;
+function SplCopyJob (const pszSrcComputerName, pszSrcQueueName: PAnsiChar;
+         ulSrcJob: cardinal; const pszTrgComputerName, pszTrgQueueName: PAnsiChar;
          var pulTrgJob: cardinal): cardinal; cdecl; external 'PMSPL' index 442;
 
 

rtl/os2/pmstddlg.pas

@@ -59,7 +59,7 @@ unit PMStdDlg;
        FDM_ERROR = WM_USER+42;
 
     type
-       APSZ = array [0..0] of PChar;
+       APSZ = array [0..0] of PAnsiChar;
 
        PAPSZ = ^APSZ;
 
@@ -69,15 +69,15 @@ unit PMStdDlg;
           ulUser : cardinal;
           lReturn : longint;
           lSRC : longint;
-          pszTitle : PChar;
-          pszOKButton : PChar;
+          pszTitle : PAnsiChar;
+          pszOKButton : PAnsiChar;
           pfnDlgProc : Pointer;
-          pszIType : PChar;
+          pszIType : PAnsiChar;
           papszITypeList : PAPSZ;
-          pszIDrive : PChar;
+          pszIDrive : PAnsiChar;
           papszIDriveList : PAPSZ;
           hMod : cardinal;
-          szFullFile : array [0..MaxPathLength-1] of char;
+          szFullFile : array [0..MaxPathLength-1] of AnsiChar;
           papszFQFilename : PAPSZ;
           ulFQFCount : cardinal;
           usDlgId : word;
@@ -164,11 +164,11 @@ unit PMStdDlg;
           cbSize : cardinal;
           hpsScreen : HPS;
           hpsPrinter : HPS;
-          pszTitle : PChar;
-          pszPreview : PChar;
-          pszPtSizeList : PChar;
+          pszTitle : PAnsiChar;
+          pszPreview : PAnsiChar;
+          pszPtSizeList : PAnsiChar;
           pfnDlgProc : Pointer;
-          pszFamilyname : PChar;
+          pszFamilyname : PAnsiChar;
           fxPointSize : longint;
           fl : cardinal;
           flFlags : cardinal;
@@ -500,7 +500,7 @@ unit PMStdDlg;
        PRenderFile = ^RenderFile;
 
 
-    function DrgAcceptDroppedFiles(hwnd : HWnd;pszPath : PChar;pszTypes : PChar;ulDefaultOp : cardinal;ulRsvd : cardinal) : Longbool; cdecl;
+    function DrgAcceptDroppedFiles(hwnd : HWnd;pszPath : PAnsiChar;pszTypes : PAnsiChar;ulDefaultOp : cardinal;ulRsvd : cardinal) : Longbool; cdecl;
 
     function DrgAllocDraginfo(cditem : cardinal) : PDragInfo; cdecl;
 
@@ -509,7 +509,7 @@ unit PMStdDlg;
     function DrgDrag(hwndSource : HWnd;pdinfo : PDragInfo;pdimg : PDragImage;cdimg : cardinal;vkTerminate : longint; var pRsvd) : HWnd; cdecl;
 
     type
-       PPSZ = ^PChar;
+       PPSZ = ^PAnsiChar;
 
 
     function DrgDragFiles(hwnd : HWnd;apszFiles : PPSZ;apszTypes : PPSZ;apszTargets : PPSZ;cFiles : cardinal;hptrDrag : cardinal;vkTerm : cardinal;fSourceRender : Longbool;ulRsvd : cardinal) : Longbool; cdecl;
@@ -522,15 +522,15 @@ unit PMStdDlg;
 
     function DrgQueryDragitemPtr(pdinfo : PDragInfo;i : cardinal) : PDragItem; cdecl;
 
-    function DrgQueryNativeRMF(pditem : PDragItem;cbBuffer : cardinal;pBuffer : PChar) : Longbool; cdecl;
+    function DrgQueryNativeRMF(pditem : PDragItem;cbBuffer : cardinal;pBuffer : PAnsiChar) : Longbool; cdecl;
 
     function DrgQueryNativeRMFLen(pditem : PDragItem) : cardinal; cdecl;
 
-    function DrgQueryStrName(hstr : HStr;cbBuffer : cardinal;pBuffer : PChar) : cardinal; cdecl;
+    function DrgQueryStrName(hstr : HStr;cbBuffer : cardinal;pBuffer : PAnsiChar) : cardinal; cdecl;
 
     function DrgQueryStrNameLen(hstr : HStr) : cardinal; cdecl;
 
-    function DrgQueryTrueType(pditem : PDragItem;cbBuffer : cardinal;pBuffer : PChar) : Longbool; cdecl;
+    function DrgQueryTrueType(pditem : PDragItem;cbBuffer : cardinal;pBuffer : PAnsiChar) : Longbool; cdecl;
 
     function DrgQueryTrueTypeLen(pditem : PDragItem) : cardinal; cdecl;
 
@@ -540,11 +540,11 @@ unit PMStdDlg;
 
     function DrgSetDragImage(pdinfo : PDragInfo;pdimg : PDragImage;cdimg : cardinal; var pRsvd) : Longbool; cdecl;
 
-    function DrgVerifyTypeSet(pditem : PDragItem;pszType : PChar;cbMatch : cardinal;pszMatch : PChar) : Longbool; cdecl;
+    function DrgVerifyTypeSet(pditem : PDragItem;pszType : PAnsiChar;cbMatch : cardinal;pszMatch : PAnsiChar) : Longbool; cdecl;
 
     function DrgAccessDraginfo(pdinfo : PDragInfo) : Longbool; cdecl;
 
-    function DrgAddStrHandle(psz : PChar) : HStr; cdecl;
+    function DrgAddStrHandle(psz : PAnsiChar) : HStr; cdecl;
 
     function DrgDeleteDraginfoStrHandles(pdinfo : PDragInfo) : Longbool; cdecl;
 
@@ -562,13 +562,13 @@ unit PMStdDlg;
 
     function DrgSetDragPointer(pdinfo : PDragInfo;hptr : cardinal) : Longbool; cdecl;
 
-    function DrgVerifyNativeRMF(pditem : PDragItem;pszRMF : PChar) : Longbool; cdecl;
+    function DrgVerifyNativeRMF(pditem : PDragItem;pszRMF : PAnsiChar) : Longbool; cdecl;
 
-    function DrgVerifyRMF(pditem : PDragItem;pszMech : PChar;pszFmt : PChar) : Longbool; cdecl;
+    function DrgVerifyRMF(pditem : PDragItem;pszMech : PAnsiChar;pszFmt : PAnsiChar) : Longbool; cdecl;
 
-    function DrgVerifyTrueType(pditem : PDragItem;pszType : PChar) : Longbool; cdecl;
+    function DrgVerifyTrueType(pditem : PDragItem;pszType : PAnsiChar) : Longbool; cdecl;
 
-    function DrgVerifyType(pditem : PDragItem;pszType : PChar) : Longbool; cdecl;
+    function DrgVerifyType(pditem : PDragItem;pszType : PAnsiChar) : Longbool; cdecl;
 
     const
        PMERR_NOFILTERED_ITEMS = $1f02;
@@ -644,15 +644,15 @@ unit PMStdDlg;
           flRecordAttr : cardinal;
           ptlIcon : PointL;
           preccNextRecord : PRecordCore;
-          pszIcon : PChar;
+          pszIcon : PAnsiChar;
           hptrIcon : cardinal;
           hptrMiniIcon : cardinal;
           hbmBitmap : HBitmap;
           hbmMiniBitmap : HBitmap;
           pTreeItemDesc : PTreeItemDesc;
-          pszText : PChar;
-          pszName : PChar;
-          pszTree : PChar;
+          pszText : PAnsiChar;
+          pszName : PAnsiChar;
+          pszTree : PAnsiChar;
        end;
 
        PMiniRecordCore = ^MiniRecordCore;
@@ -662,7 +662,7 @@ unit PMStdDlg;
           flRecordAttr : cardinal;
           ptlIcon : PointL;
           preccNextRecord : PMiniRecordCore;
-          pszIcon : PChar;
+          pszIcon : PAnsiChar;
           hptrIcon : cardinal;
        end;
 
@@ -671,7 +671,7 @@ unit PMStdDlg;
           pSortRecord : Pointer;
           pFieldInfoLast : PFieldInfo;
           pFieldInfoObject : PFieldInfo;
-          pszCnrTitle : PChar;
+          pszCnrTitle : PAnsiChar;
           flWindowAttr : cardinal;
           ptlOrigin : PointL;
           cDelta : cardinal;
@@ -839,7 +839,7 @@ unit PMStdDlg;
 
        SearchString = record
           cb : cardinal;
-          pszSearch : PChar;
+          pszSearch : PAnsiChar;
           fsPrefix : cardinal;
           fsCaseSensitive : cardinal;
           usView : cardinal;
@@ -1073,7 +1073,7 @@ unit PMStdDlg;
        PVSDragInfo = ^VSDragInfo;
 
        VSText = record
-          pszItemText : PChar;
+          pszItemText : PAnsiChar;
           ulBufLen : cardinal;
        end;
 
@@ -1181,7 +1181,7 @@ unit PMStdDlg;
 
     type
        BookText = record
-          pString : PChar;
+          pString : PAnsiChar;
           textLen : cardinal;
        end;
 
@@ -1216,7 +1216,7 @@ unit PMStdDlg;
         external 'PMCTLS' index 2;
     function WinDefFontDlgProc(_hwnd : HWnd;msg : cardinal;mp1 : MParam;mp2 : MParam) : MResult; cdecl;
         external 'PMCTLS' index 3;
-    function DrgAcceptDroppedFiles(hwnd : HWnd;pszPath : PChar;pszTypes : PChar;ulDefaultOp : cardinal;ulRsvd : cardinal) : Longbool; cdecl;
+    function DrgAcceptDroppedFiles(hwnd : HWnd;pszPath : PAnsiChar;pszTypes : PAnsiChar;ulDefaultOp : cardinal;ulRsvd : cardinal) : Longbool; cdecl;
         external 'PMDRAG' index 66;
     function DrgAllocDraginfo(cditem : cardinal) : PDragInfo; cdecl;
         external 'PMDRAG' index 34;
@@ -1234,15 +1234,15 @@ unit PMStdDlg;
         external 'PMDRAG' index 45;
     function DrgQueryDragitemPtr(pdinfo : PDragInfo;i : cardinal) : PDragItem; cdecl;
         external 'PMDRAG' index 46;
-    function DrgQueryNativeRMF(pditem : PDragItem;cbBuffer : cardinal;pBuffer : PCHAR) : Longbool; cdecl;
+    function DrgQueryNativeRMF(pditem : PDragItem;cbBuffer : cardinal;pBuffer : PAnsiChar) : Longbool; cdecl;
         external 'PMDRAG' index 47;
     function DrgQueryNativeRMFLen(pditem : PDragItem) : cardinal; cdecl;
         external 'PMDRAG' index 48;
-    function DrgQueryStrName(hstr : HStr;cbBuffer : cardinal;pBuffer : PChar) : cardinal; cdecl;
+    function DrgQueryStrName(hstr : HStr;cbBuffer : cardinal;pBuffer : PAnsiChar) : cardinal; cdecl;
         external 'PMDRAG' index 49;
     function DrgQueryStrNameLen(hstr : HStr) : cardinal; cdecl;
         external 'PMDRAG' index 50;
-    function DrgQueryTrueType(pditem : PDragItem;cbBuffer : cardinal;pBuffer : PChar) : Longbool; cdecl;
+    function DrgQueryTrueType(pditem : PDragItem;cbBuffer : cardinal;pBuffer : PAnsiChar) : Longbool; cdecl;
         external 'PMDRAG' index 51;
     function DrgQueryTrueTypeLen(pditem : PDragItem) : cardinal; cdecl;
         external 'PMDRAG' index 52;
@@ -1252,11 +1252,11 @@ unit PMStdDlg;
         external 'PMDRAG' index 57;
     function DrgSetDragImage(pdinfo : PDragInfo;pdimg : PDragImage;cdimg : cardinal; var pRsvd) : Longbool; cdecl;
         external 'PMDRAG' index 56;
-    function DrgVerifyTypeSet(pditem : PDragItem;pszType : PChar;cbMatch : cardinal;pszMatch : PChar) : Longbool; cdecl;
+    function DrgVerifyTypeSet(pditem : PDragItem;pszType : PAnsiChar;cbMatch : cardinal;pszMatch : PAnsiChar) : Longbool; cdecl;
         external 'PMDRAG' index 62;
     function DrgAccessDraginfo(pdinfo : PDragInfo) : Longbool; cdecl;
         external 'PMDRAG' index 32;
-    function DrgAddStrHandle(PSZ : PChar) : HStr; cdecl;
+    function DrgAddStrHandle(PSZ : PAnsiChar) : HStr; cdecl;
         external 'PMDRAG' index 33;
     function DrgDeleteDraginfoStrHandles(pdinfo : PDragInfo) : Longbool; cdecl;
         external 'PMDRAG' index 36;
@@ -1274,13 +1274,13 @@ unit PMStdDlg;
         external 'PMDRAG' index 53;
     function DrgSetDragPointer(pdinfo : PDragInfo;hptr : cardinal) : Longbool; cdecl;
         external 'PMDRAG' index 55;
-    function DrgVerifyNativeRMF(pditem : PDragItem;pszRMF : PChar) : Longbool; cdecl;
+    function DrgVerifyNativeRMF(pditem : PDragItem;pszRMF : PAnsiChar) : Longbool; cdecl;
         external 'PMDRAG' index 58;
-    function DrgVerifyRMF(pditem : PDragItem;pszMech : PChar;pszFmt : PChar) : Longbool; cdecl;
+    function DrgVerifyRMF(pditem : PDragItem;pszMech : PAnsiChar;pszFmt : PAnsiChar) : Longbool; cdecl;
         external 'PMDRAG' index 59;
-    function DrgVerifyTrueType(pditem : PDragItem;pszType : PChar) : Longbool; cdecl;
+    function DrgVerifyTrueType(pditem : PDragItem;pszType : PAnsiChar) : Longbool; cdecl;
         external 'PMDRAG' index 60;
-    function DrgVerifyType(pditem : PDragItem;pszType : PChar) : Longbool; cdecl;
+    function DrgVerifyType(pditem : PDragItem;pszType : PAnsiChar) : Longbool; cdecl;
         external 'PMDRAG' index 61;
 
 end.

rtl/os2/pmwin.pas

@@ -62,8 +62,8 @@ const
         y : longint;
         x : longint;
         flStyle : cardinal;
-        pszText : pchar;
-        pszClass : pchar;
+        pszText : PAnsiChar;
+        pszClass : PAnsiChar;
         hwndParent : cardinal;
        end;
        PCREATESTRUCT = ^CREATESTRUCT;
@@ -94,7 +94,7 @@ const
        WNDPARAMS = record
         fsStatus : cardinal;
         cchText : cardinal;
-        pszText : pchar;
+        pszText : PAnsiChar;
         cbPresParams : cardinal;
         pPresParams : pointer;
         cbCtlData : cardinal;
@@ -192,8 +192,8 @@ const
        PCONVCONTEXT = ^CONVCONTEXT;
        DDEINIT = record
         cb : cardinal;
-        pszAppName : pchar;
-        pszTopic : pchar;
+        pszAppName : PAnsiChar;
+        pszTopic : PAnsiChar;
         offConvContext : cardinal;
        end;
        PDDEINIT = ^DDEINIT;
@@ -341,7 +341,7 @@ const
 
 (* Type definitions for WinMessageBox2 *)
   MB2D = record
-    achText: array [0..MaxMB2DText] of char;
+    achText: array [0..MaxMB2DText] of AnsiChar;
     idButtons: cardinal;
     flStyle: cardinal;
   end;
@@ -409,55 +409,55 @@ type
   FOCAMETRICS=record    // foca
     ulIdentity: Cardinal;
     ulSize: Cardinal;
-    szFamilyname: Array[1..32] of Char;
-    szFacename: Array[1..32] of Char;
-    usRegistryId: System.integer;
-    usCodePage: System.integer;
-    yEmHeight: System.integer;
-    yXHeight: System.integer;
-    yMaxAscender: System.integer;
-    yMaxDescender: System.integer;
-    yLowerCaseAscent: System.integer;
-    yLowerCaseDescent: System.integer;
-    yInternalLeading: System.integer;
-    yExternalLeading: System.integer;
-    xAveCharWidth: System.integer;
-    xMaxCharInc: System.integer;
-    xEmInc: System.integer;
-    yMaxBaselineExt: System.integer;
-    sCharSlope: System.integer;
-    sInlineDir: System.integer;
-    sCharRot: System.integer;
+    szFamilyname: Array[1..32] of AnsiChar;
+    szFacename: Array[1..32] of AnsiChar;
+    usRegistryId: Integer;
+    usCodePage: Integer;
+    yEmHeight: Integer;
+    yXHeight: Integer;
+    yMaxAscender: Integer;
+    yMaxDescender: Integer;
+    yLowerCaseAscent: Integer;
+    yLowerCaseDescent: Integer;
+    yInternalLeading: Integer;
+    yExternalLeading: Integer;
+    xAveCharWidth: Integer;
+    xMaxCharInc: Integer;
+    xEmInc: Integer;
+    yMaxBaselineExt: Integer;
+    sCharSlope: Integer;
+    sInlineDir: Integer;
+    sCharRot: Integer;
     usWeightClass: Word;
     usWidthClass: Word;
-    xDeviceRes: System.integer;
-    yDeviceRes: System.integer;
-    usFirstChar: System.integer;
-    usLastChar: System.integer;
-    usDefaultChar: System.integer;
-    usBreakChar: System.integer;
-    usNominalPointSize: System.integer;
-    usMinimumPointSize: System.integer;
-    usMaximumPointSize: System.integer;
-    fsTypeFlags: System.integer;
-    fsDefn: System.integer;
-    fsSelectionFlags: System.integer;
-    fsCapabilities: System.integer;
-    ySubscriptXSize: System.integer;
-    ySubscriptYSize: System.integer;
-    ySubscriptXOffset: System.integer;
-    ySubscriptYOffset: System.integer;
-    ySuperscriptXSize: System.integer;
-    ySuperscriptYSize: System.integer;
-    ySuperscriptXOffset: System.integer;
-    ySuperscriptYOffset: System.integer;
-    yUnderscoreSize: System.integer;
-    yUnderscorePosition: System.integer;
-    yStrikeoutSize: System.integer;
-    yStrikeoutPosition: System.integer;
-    usKerningPairs: System.integer;
-    sFamilyClass: System.integer;
-    pszDeviceNameOffset: PChar;
+    xDeviceRes: Integer;
+    yDeviceRes: Integer;
+    usFirstChar: Integer;
+    usLastChar: Integer;
+    usDefaultChar: Integer;
+    usBreakChar: Integer;
+    usNominalPointSize: Integer;
+    usMinimumPointSize: Integer;
+    usMaximumPointSize: Integer;
+    fsTypeFlags: Integer;
+    fsDefn: Integer;
+    fsSelectionFlags: Integer;
+    fsCapabilities: Integer;
+    ySubscriptXSize: Integer;
+    ySubscriptYSize: Integer;
+    ySubscriptXOffset: Integer;
+    ySubscriptYOffset: Integer;
+    ySuperscriptXSize: Integer;
+    ySuperscriptYSize: Integer;
+    ySuperscriptXOffset: Integer;
+    ySuperscriptYOffset: Integer;
+    yUnderscoreSize: Integer;
+    yUnderscorePosition: Integer;
+    yStrikeoutSize: Integer;
+    yStrikeoutPosition: Integer;
+    usKerningPairs: Integer;
+    sFamilyClass: Integer;
+    pszDeviceNameOffset: PAnsiChar;
   end;
   PFOCAMETRICS=^FOCAMETRICS;
 
@@ -468,25 +468,25 @@ type
   FONTFILEMETRICS=record   // ffm
     ulIdentity: Cardinal;
     ulSize: Cardinal;
-    szFamilyname: Array[0..32-1] of Char;
-    szFacename: Array[0..32-1] of Char;
-    usRegistryId: System.integer;
-    usCodePage: System.integer;
-    yEmHeight: System.integer;
-    yXHeight: System.integer;
-    yMaxAscender: System.integer;
-    yMaxDescender: System.integer;
-    yLowerCaseAscent: System.integer;
-    yLowerCaseDescent: System.integer;
-    yInternalLeading: System.integer;
-    yExternalLeading: System.integer;
-    xAveCharWidth: System.integer;
-    xMaxCharInc: System.integer;
-    xEmInc: System.integer;
-    yMaxBaselineExt: System.integer;
-    sCharSlope: System.integer;
-    sInlineDir: System.integer;
-    sCharRot: System.integer;
+    szFamilyname: Array[0..32-1] of AnsiChar;
+    szFacename: Array[0..32-1] of AnsiChar;
+    usRegistryId: Integer;
+    usCodePage: Integer;
+    yEmHeight: Integer;
+    yXHeight: Integer;
+    yMaxAscender: Integer;
+    yMaxDescender: Integer;
+    yLowerCaseAscent: Integer;
+    yLowerCaseDescent: Integer;
+    yInternalLeading: Integer;
+    yExternalLeading: Integer;
+    xAveCharWidth: Integer;
+    xMaxCharInc: Integer;
+    xEmInc: Integer;
+    yMaxBaselineExt: Integer;
+    sCharSlope: Integer;
+    sInlineDir: Integer;
+    sCharRot: Integer;
     usWeightClass: Word;
     usWidthClass: Word;
     xDeviceRes: System.integer;
@@ -552,7 +552,7 @@ type
   FONTSIGNATURE=record    // fs
     ulIdentity: Cardinal;
     ulSize: Cardinal;
-    achSignature: Array[0..12-1] of Char;
+    achSignature: Array[0..12-1] of AnsiChar;
   end;
   PFONTSIGNATURE=^FONTSIGNATURE;
 
@@ -720,18 +720,18 @@ const
   //* MLM_SEARCH structure
   //*************************************************************************/
 type
-  MLE_SEARCHDATA=record         // search
-    cb: Word;                   // size of search spec structure
-    pchFind: PChar;             // string to search for
-    pchReplace: PChar;          // string to replace with
-    cchFind: System.integer;    // length of pchFindString
-    cchReplace: System.integer; // length of replace string
-    iptStart: IPT;              // point at which to start search
-                                // (negative indicates cursor pt)
-                                // becomes pt where string found
-    iptStop: IPT;               // point at which to stop search
-                                // (negative indicates EOT)
-    cchFound: Word;             // Length of found string at iptStart
+  MLE_SEARCHDATA=record // search
+    cb: Word;             // size of search spec structure
+    pchFind: PAnsiChar;       // string to search for
+    pchReplace: PAnsiChar;    // string to replace with
+    cchFind: Integer;     // length of pchFindString
+    cchReplace: Integer;  // length of replace string
+    iptStart: IPT;        // point at which to start search
+      // (negative indicates cursor pt)
+      // becomes pt where string found
+    iptStop: IPT;         // point at which to stop search
+      // (negative indicates EOT)
+    cchFound: Word;       // Length of found string at iptStart
   end;
   PMLE_SEARCHDATA=^MLE_SEARCHDATA;
 
@@ -3095,7 +3095,7 @@ const
        PMERR_SEG_OVFLOW = $5009;
        PMERR_PIC_DUP_FILENAME = $5010;
 
-    function WinRegisterClass(hab : cardinal;pszClassName : pchar;pfnWndProc : proc;flStyle,cbWindowData : cardinal) : longbool; cdecl;
+    function WinRegisterClass(hab : cardinal;pszClassName : PAnsiChar;pfnWndProc : proc;flStyle,cbWindowData : cardinal) : longbool; cdecl;
     function WinDefWindowProc(hwnd,msg : cardinal;mp1,mp2 : pointer) : pointer; cdecl;
     function WinDestroyWindow(hwnd : cardinal) : longbool; cdecl;
     function WinShowWindow(hwnd : cardinal;fShow : longbool) : longbool;  cdecl;
@@ -3117,15 +3117,15 @@ const
     function WinInitialize(flOptions : cardinal) : cardinal; cdecl;
     function WinTerminate(hab : cardinal) : longbool; cdecl;
     function WinQueryAnchorBlock(hwnd : cardinal) : cardinal; cdecl;
-    function WinCreateWindow(hwndParent : cardinal;pszClass,pszName : pchar;flStyle : cardinal;x,y,cx,cy : longint;hwndOwner,hwndInsertBehind,id : cardinal;pCtlData,pPresParams : pointer) : cardinal; cdecl;
-    function WinCreateWindow(hwndParent : cardinal;pszClass : cardinal;pszName : pchar;flStyle : cardinal;x,y,cx,cy : longint;hwndOwner,hwndInsertBehind,id : cardinal;pCtlData,pPresParams : pointer) : cardinal; cdecl;
-    function WinCreateWCWindow(hwndParent : cardinal;pszClass : cardinal;pszName : pchar;flStyle : cardinal;x,y,cx,cy : longint;hwndOwner,hwndInsertBehind,id : cardinal;pCtlData,pPresParams : pointer) : cardinal; cdecl;
+    function WinCreateWindow(hwndParent : cardinal;pszClass,pszName : PAnsiChar;flStyle : cardinal;x,y,cx,cy : longint;hwndOwner,hwndInsertBehind,id : cardinal;pCtlData,pPresParams : pointer) : cardinal; cdecl;
+    function WinCreateWindow(hwndParent : cardinal;pszClass : cardinal;pszName : PAnsiChar;flStyle : cardinal;x,y,cx,cy : longint;hwndOwner,hwndInsertBehind,id : cardinal;pCtlData,pPresParams : pointer) : cardinal; cdecl;
+    function WinCreateWCWindow(hwndParent : cardinal;pszClass : cardinal;pszName : PAnsiChar;flStyle : cardinal;x,y,cx,cy : longint;hwndOwner,hwndInsertBehind,id : cardinal;pCtlData,pPresParams : pointer) : cardinal; cdecl;
     function WinEnableWindow(hwnd : cardinal;fEnable : longbool) : longbool; cdecl;
     function WinIsWindowEnabled(hwnd : cardinal) : longbool; cdecl;
     function WinEnableWindowUpdate(hwnd : cardinal;fEnable : longbool) : longbool; cdecl;
     function WinIsWindowVisible(hwnd : cardinal) : longbool; cdecl;
-    function WinQueryWindowText(hwnd : cardinal;cchBufferMax : longint;pchBuffer : pchar) : longint; cdecl;
-    function WinSetWindowText(hwnd : cardinal;pszText : pchar) : longbool; cdecl;
+    function WinQueryWindowText(hwnd : cardinal;cchBufferMax : longint;pchBuffer : PAnsiChar) : longint; cdecl;
+    function WinSetWindowText(hwnd : cardinal;pszText : PAnsiChar) : longbool; cdecl;
     function WinQueryWindowTextLength(hwnd : cardinal) : longint; cdecl;
     function WinWindowFromID(hwndParent,id : cardinal) : cardinal; cdecl;
     function WinIsWindow(hab,hwnd : cardinal) : longbool; cdecl;
@@ -3152,17 +3152,17 @@ const
     function WinInvertRect(hps : cardinal;prcl : PRectl) : longbool; cdecl;
     function WinDrawBitmap(hpsDst,hbm : cardinal;var wrcSrc : TRectl;var ptlDst : POINTL;clrFore : longint;clrBack : longint;fl : cardinal) : longbool; cdecl;
     function WinDrawBitmap(hpsDst,hbm : cardinal;pwrcSrc : PRectl;pptlDst : PPOINTL;clrFore : longint;clrBack : longint;fl : cardinal) : longbool; cdecl;
-    function WinDrawText(hps : cardinal;cchText : longint;lpchText : pchar;var rcl : TRectl;clrFore,clrBack : longint;flCmd : cardinal) : longint; cdecl;
-    function WinDrawText(hps : cardinal;cchText : longint;lpchText : pchar;prcl : PRectl;clrFore,clrBack : longint;flCmd : cardinal) : longint; cdecl;
+    function WinDrawText(hps : cardinal;cchText : longint;lpchText : PAnsiChar;var rcl : TRectl;clrFore,clrBack : longint;flCmd : cardinal) : longint; cdecl;
+    function WinDrawText(hps : cardinal;cchText : longint;lpchText : PAnsiChar;prcl : PRectl;clrFore,clrBack : longint;flCmd : cardinal) : longint; cdecl;
     function WinDrawBorder(hps : cardinal;var rcl : TRectl;cx,cy : longint;clrFore,clrBack : longint;flCmd : cardinal) : longbool; cdecl;
     function WinDrawBorder(hps : cardinal;prcl : PRectl;cx,cy : longint;clrFore,clrBack : longint;flCmd : cardinal) : longbool; cdecl;
-    function WinLoadString(hab,hmod,id : cardinal;cchMax : longint;pchBuffer : pchar) : longint; cdecl;
-    function WinLoadMessage(hab,hmod,id : cardinal;cchMax : longint;pchBuffer : pchar) : longint; cdecl;
+    function WinLoadString(hab,hmod,id : cardinal;cchMax : longint;pchBuffer : PAnsiChar) : longint; cdecl;
+    function WinLoadMessage(hab,hmod,id : cardinal;cchMax : longint;pchBuffer : PAnsiChar) : longint; cdecl;
     function WinSetActiveWindow(hwndDesktop,hwnd : cardinal) : longbool; cdecl;
     function WinSubclassWindow(hwnd : cardinal;pfnwp : proc) : proc; cdecl;
-    function WinQueryClassName(hwnd : cardinal;cchMax : longint;pch : pchar) : longint; cdecl;
-    function WinQueryClassInfo(hab : cardinal;pszClassName : pchar;var _ClassInfo : TClassInfo) : longbool; cdecl;
-    function WinQueryClassInfo(hab : cardinal;pszClassName : pchar;_PClassInfo : PClassInfo) : longbool; cdecl;
+    function WinQueryClassName(hwnd : cardinal;cchMax : longint;pch : PAnsiChar) : longint; cdecl;
+    function WinQueryClassInfo(hab : cardinal;pszClassName : PAnsiChar;var _ClassInfo : TClassInfo) : longbool; cdecl;
+    function WinQueryClassInfo(hab : cardinal;pszClassName : PAnsiChar;_PClassInfo : PClassInfo) : longbool; cdecl;
     function WinQueryActiveWindow(hwndDesktop : cardinal) : cardinal; cdecl;
     function WinIsThreadActive(hab : cardinal) : longbool; cdecl;
     function WinQuerySysModalWindow(hwndDesktop : cardinal) : cardinal; cdecl;
@@ -3208,7 +3208,7 @@ const
     function WinPostMsg(hwnd,msg : cardinal;mp1,mp2 : pointer) : longbool; cdecl;
     function WinRegisterUserMsg(hab,msgid : cardinal;datatype1,dir1,datatype2,dir2,datatyper : longint) : longbool; cdecl;
     function WinRegisterUserDatatype(hab : cardinal;datatype,count : longint;var types : longint) : longbool; cdecl;
-    function WinSetMsgMode(hab : cardinal;classname : pchar;control : longint) : longbool; cdecl;
+    function WinSetMsgMode(hab : cardinal;classname : PAnsiChar;control : longint) : longbool; cdecl;
     function WinSetSynchroMode(hab : cardinal;mode : longint) : longbool;  cdecl;
     function WinInSendMsg(hab : cardinal) : longbool; cdecl;
     function WinBroadcastMsg(hwnd,msg : cardinal;mp1,mp2 : pointer;rgf : cardinal) : longbool; cdecl;
@@ -3223,7 +3223,7 @@ const
     function WinWaitMuxWaitSem(hmux,ulTimeout:cardinal;pulUser : PCardinal) : cardinal; cdecl;
     function WinPostQueueMsg(hmq,msg : cardinal;mp1,mp2 : pointer) : longbool; cdecl;
     function WinSetMsgInterest(hwnd,msg_class : cardinal;control : longint) : longbool; cdecl;
-    function WinSetClassMsgInterest(hab : cardinal;pszClassName : pchar;msg_class : cardinal;control : longint) : longbool; cdecl;
+    function WinSetClassMsgInterest(hab : cardinal;pszClassName : PAnsiChar;msg_class : cardinal;control : longint) : longbool; cdecl;
     function WinSetFocus(hwndDesktop,hwndSetFocus : cardinal) : longbool; cdecl;
     function WinFocusChange(hwndDesktop,hwndSetFocus,flFocusChange : cardinal) : longbool; cdecl;
     function WinSetCapture(hwndDesktop,hwnd : cardinal) : longbool; cdecl;
@@ -3243,31 +3243,31 @@ const
     function WinQueryDlgItemShort(hwndDlg,idItem : cardinal;var _Result : System.integer;fSigned : longbool) : longbool; cdecl;
     function WinQueryDlgItemShort(hwndDlg,idItem : cardinal;PResult : System.PInteger;fSigned : longbool) : longbool; cdecl;
     function WinSetDlgItemShort(hwndDlg,idItem : cardinal;usValue : word;fSigned : longbool) : longbool; cdecl;
-    function WinSetDlgItemText(hwndDlg,idItem : cardinal;pszText : pchar) : longbool; cdecl;
-    function WinQueryDlgItemText(hwndDlg,idItem : cardinal;cchBufferMax : longint;pchBuffer : pchar) : cardinal; cdecl;
+    function WinSetDlgItemText(hwndDlg,idItem : cardinal;pszText : PAnsiChar) : longbool; cdecl;
+    function WinQueryDlgItemText(hwndDlg,idItem : cardinal;cchBufferMax : longint;pchBuffer : PAnsiChar) : cardinal; cdecl;
     function WinQueryDlgItemTextLength(hwndDlg,idItem : cardinal) : longint; cdecl;
     function WinDefDlgProc(hwndDlg,msg : cardinal;mp1,mp2 : pointer) : pointer; cdecl;
     function WinAlarm(hwndDesktop,rgfType : cardinal) : longbool; cdecl;
-    function WinMessageBox(hwndParent,hwndOwner : cardinal;pszText,pszCaption : pchar;idWindow,flStyle : cardinal) : cardinal; cdecl;
+    function WinMessageBox(hwndParent,hwndOwner : cardinal;pszText,pszCaption : PAnsiChar;idWindow,flStyle : cardinal) : cardinal; cdecl;
 (*
-    function WinMessageBox2(hwndParent,hwndOwner: cardinal;pszText,pszCaption: PChar; idWindow: cardinal; MBInfo: PMB2Info): cardinal; cdecl;
+    function WinMessageBox2(hwndParent,hwndOwner: cardinal;pszText,pszCaption: PAnsiChar; idWindow: cardinal; MBInfo: PMB2Info): cardinal; cdecl;
 *)
     function WinProcessDlg(hwndDlg : cardinal) : cardinal; cdecl;
     function WinSendDlgItemMsg(hwndDlg,idItem,msg : cardinal;mp1,mp2 : pointer) : pointer; cdecl;
     function WinMapDlgPoints(hwndDlg : cardinal;var prgwptl : TPointL;cwpt : cardinal;fCalcWindowCoords : longbool) : longbool; cdecl;
     function WinMapDlgPoints(hwndDlg : cardinal;prgwptl : PPointL;cwpt : cardinal;fCalcWindowCoords : longbool) : longbool; cdecl;
     function WinEnumDlgItem(hwndDlg,hwnd,code : cardinal) : cardinal; cdecl;
-    function WinSubstituteStrings(hwnd : cardinal;pszSrc : pchar;cchDstMax : longint;pszDst : pchar) : longint; cdecl;
+    function WinSubstituteStrings(hwnd : cardinal;pszSrc : PAnsiChar;cchDstMax : longint;pszDst : PAnsiChar) : longint; cdecl;
     function WinCreateDlg(hwndParent,hwndOwner : cardinal;pfnDlgProc : proc;var dlgt : TDlgTemplate;pCreateParams : pointer) : cardinal; cdecl;
     function WinCreateDlg(hwndParent,hwndOwner : cardinal;pfnDlgProc : proc;pdlgt : PDlgTemplate;pCreateParams : pointer) : cardinal; cdecl;
     function WinLoadMenu(hwndFrame,hmod,idMenu : cardinal) : cardinal; cdecl;
     function WinCreateMenu(hwndParent : cardinal;lpmt : pointer) : cardinal; cdecl;
     function WinPopupMenu(hwndParent,hwndOwner,hwndMenu : cardinal;x,y,idItem : longint;fs : cardinal) : longbool; cdecl;
-    function WinCreateStdWindow(hwndParent,flStyle : cardinal;var flCreateFlags : cardinal;pszClientClass,pszTitle : pchar;styleClient,hmod,idResources : cardinal;var hwndClient : cardinal) : cardinal; cdecl;
-    function WinCreateStdWindow(hwndParent,flStyle : cardinal;pflCreateFlags : PCardinal;pszClientClass,pszTitle : pchar;styleClient,hmod,idResources : cardinal;phwndClient : PCardinal) : cardinal; cdecl;
+    function WinCreateStdWindow(hwndParent,flStyle : cardinal;var flCreateFlags : cardinal;pszClientClass,pszTitle : PAnsiChar;styleClient,hmod,idResources : cardinal;var hwndClient : cardinal) : cardinal; cdecl;
+    function WinCreateStdWindow(hwndParent,flStyle : cardinal;pflCreateFlags : PCardinal;pszClientClass,pszTitle : PAnsiChar;styleClient,hmod,idResources : cardinal;phwndClient : PCardinal) : cardinal; cdecl;
     function WinFlashWindow(hwndFrame : cardinal;fFlash : longbool) : longbool; cdecl;
-    function WinCreateFrameControls(hwndFrame : cardinal;var fcdata : TFrameCData;pszTitle : pchar) : longbool;  cdecl;
-    function WinCreateFrameControls(hwndFrame : cardinal;pfcdata : PFrameCData;pszTitle : pchar) : longbool;  cdecl;
+    function WinCreateFrameControls(hwndFrame : cardinal;var fcdata : TFrameCData;pszTitle : PAnsiChar) : longbool;  cdecl;
+    function WinCreateFrameControls(hwndFrame : cardinal;pfcdata : PFrameCData;pszTitle : PAnsiChar) : longbool;  cdecl;
     function WinCalcFrameRect(hwndFrame : cardinal;var rcl : TRectl;fClient : longbool) : longbool; cdecl;
     function WinCalcFrameRect(hwndFrame : cardinal;prcl : PRectl;fClient : longbool) : longbool; cdecl;
     function WinGetMinPosition(hwnd : cardinal;var _swp : TSWP;var pptl : POINTL) : longbool; cdecl;
@@ -3366,8 +3366,8 @@ const
     function WinReleaseHook(hab,hmq : cardinal;iHook : longint;pfnHook : pointer;hmod : cardinal) : longbool; cdecl;
     function WinCallMsgFilter(hab : cardinal;var _qmsg : TQMsg;msgf : cardinal) : longbool; cdecl;
     function WinCallMsgFilter(hab : cardinal;_pqmsg : PQMsg;msgf : cardinal) : longbool; cdecl;
-    function WinSetClassThunkProc(pszClassname : pchar;pfnThunkProc : pointer) : longbool; cdecl;
-    function WinQueryClassThunkProc(pszClassname : pchar) : pointer; cdecl;
+    function WinSetClassThunkProc(pszClassname : PAnsiChar;pfnThunkProc : pointer) : longbool; cdecl;
+    function WinQueryClassThunkProc(pszClassname : PAnsiChar) : pointer; cdecl;
     function WinSetWindowThunkProc(hwnd : cardinal;pfnThunkProc : pointer) : longbool; cdecl;
     function WinQueryWindowThunkProc(hwnd : cardinal) : pointer; cdecl;
     function WinQueryWindowModel(hwnd : cardinal) : longint; cdecl;
@@ -3375,36 +3375,36 @@ const
     function WinSetCp(hmq,idCodePage : cardinal) : longbool; cdecl;
     function WinQueryCpList(hab,ccpMax : cardinal;var prgcp : cardinal) : cardinal; cdecl;
     function WinQueryCpList(hab,ccpMax : cardinal;prgcp : PCardinal) : cardinal; cdecl;
-    function WinCpTranslateString(hab,cpSrc : cardinal;pszSrc : pchar;cpDst,cchDestMax : cardinal;pchDest : pchar) : longbool; cdecl;
+    function WinCpTranslateString(hab,cpSrc : cardinal;pszSrc : PAnsiChar;cpDst,cchDestMax : cardinal;pchDest : PAnsiChar) : longbool; cdecl;
     function WinCpTranslateChar(hab,cpSrc : cardinal;chSrc : byte;cpDst : cardinal) : byte; cdecl;
-    function WinUpper(hab,idcp,idcc : cardinal;psz : pchar) : cardinal; cdecl;
+    function WinUpper(hab,idcp,idcc : cardinal;psz : PAnsiChar) : cardinal; cdecl;
     function WinUpperChar(hab,idcp,idcc,c : cardinal) : cardinal; cdecl;
-    function WinNextChar(hab,idcp,idcc : cardinal;psz : pchar) : pchar; cdecl;
-    function WinPrevChar(hab,idcp,idcc : cardinal;pszStart,psz : pchar) : pchar; cdecl;
-    function WinCompareStrings(hab,idcp,idcc : cardinal;psz1,psz2 : pchar;reserved : cardinal) : cardinal; cdecl;
+    function WinNextChar(hab,idcp,idcc : cardinal;psz : PAnsiChar) : PAnsiChar; cdecl;
+    function WinPrevChar(hab,idcp,idcc : cardinal;pszStart,psz : PAnsiChar) : PAnsiChar; cdecl;
+    function WinCompareStrings(hab,idcp,idcc : cardinal;psz1,psz2 : PAnsiChar;reserved : cardinal) : cardinal; cdecl;
     function WinCreateAtomTable(cbInitial,cBuckets : cardinal) : cardinal; cdecl;
     function WinDestroyAtomTable(hAtomTbl : cardinal) : cardinal; cdecl;
-    function WinAddAtom(hAtomTbl : cardinal;pszAtomName : pchar) : cardinal; cdecl;
-    function WinFindAtom(hAtomTbl : cardinal;pszAtomName : pchar) : cardinal; cdecl;
+    function WinAddAtom(hAtomTbl : cardinal;pszAtomName : PAnsiChar) : cardinal; cdecl;
+    function WinFindAtom(hAtomTbl : cardinal;pszAtomName : PAnsiChar) : cardinal; cdecl;
     function WinDeleteAtom(hAtomTbl,atom : cardinal) : cardinal; cdecl;
     function WinQueryAtomUsage(hAtomTbl,atom : cardinal) : cardinal; cdecl;
     function WinQueryAtomLength(hAtomTbl,atom : cardinal) : cardinal; cdecl;
-    function WinQueryAtomName(hAtomTbl,atom : cardinal;pchBuffer : pchar;cchBufferMax : cardinal) : cardinal; cdecl;
+    function WinQueryAtomName(hAtomTbl,atom : cardinal;pchBuffer : PAnsiChar;cchBufferMax : cardinal) : cardinal; cdecl;
     function WinGetLastError(hab : cardinal) : cardinal; cdecl;
     function WinGetErrorInfo(hab : cardinal) : PERRINFO; cdecl;
     function WinFreeErrorInfo(var perrinfo : ERRINFO) : longbool; cdecl;
     {DDE Functions}
-    function WinDdeInitiate(hwndClient : cardinal;pszAppName,pszTopicName : pchar;var cctxt : TConvContext) : longbool; cdecl;
-    function WinDdeInitiate(hwndClient : cardinal;pszAppName,pszTopicName : pchar;pcctxt : PConvContext) : longbool; cdecl;
-    function WinDdeRespond(hwndClient,hwndServer : cardinal;pszAppName,pszTopicName : pchar;var cctxt : TConvContext) : pointer; cdecl;
-    function WinDdeRespond(hwndClient,hwndServer : cardinal;pszAppName,pszTopicName : pchar;pcctxt : PConvContext) : pointer; cdecl;
+    function WinDdeInitiate(hwndClient : cardinal;pszAppName,pszTopicName : PAnsiChar;var cctxt : TConvContext) : longbool; cdecl;
+    function WinDdeInitiate(hwndClient : cardinal;pszAppName,pszTopicName : PAnsiChar;pcctxt : PConvContext) : longbool; cdecl;
+    function WinDdeRespond(hwndClient,hwndServer : cardinal;pszAppName,pszTopicName : PAnsiChar;var cctxt : TConvContext) : pointer; cdecl;
+    function WinDdeRespond(hwndClient,hwndServer : cardinal;pszAppName,pszTopicName : PAnsiChar;pcctxt : PConvContext) : pointer; cdecl;
     function WinDdePostMsg(hwndTo,hwndFrom,wm : cardinal;var ddest : TDDEStruct;flOptions : cardinal) : longbool; cdecl;
     function WinDdePostMsg(hwndTo,hwndFrom,wm : cardinal;pddest : PDDEStruct;flOptions : cardinal) : longbool; cdecl;
     {Library related functions}
     function WinDeleteProcedure(hab : cardinal;wndproc : proc) : longbool; cdecl;
     function WinDeleteLibrary(hab,libhandle : cardinal) : longbool; cdecl;
-    function WinLoadProcedure(hab,libhandle : cardinal;procname : pchar) : proc; cdecl;
-    function WinLoadLibrary(hab : cardinal;libname : pchar) : cardinal; cdecl;
+    function WinLoadProcedure(hab,libhandle : cardinal;procname : PAnsiChar) : proc; cdecl;
+    function WinLoadLibrary(hab : cardinal;libname : PAnsiChar) : cardinal; cdecl;
     function WinSetDesktopBkgnd(hwndDesktop : cardinal;var dskNew : TDesktop) : cardinal; cdecl;
     function WinSetDesktopBkgnd(hwndDesktop : cardinal;pdskNew : PDesktop) : cardinal; cdecl;
     function WinQueryDesktopBkgnd(hwndDesktop : cardinal;var dsk : TDesktop) : longbool; cdecl;
@@ -3447,7 +3447,7 @@ Function WinSetErrorInfo(ErrID: ErrorID; Flags: Cardinal; Params: Array of const
 
   implementation
 
-    function WinRegisterClass(hab : cardinal;pszClassName : pchar;pfnWndProc : proc;flStyle,cbWindowData : cardinal) : longbool; cdecl;external 'pmwin' index 926;
+    function WinRegisterClass(hab : cardinal;pszClassName : PAnsiChar;pfnWndProc : proc;flStyle,cbWindowData : cardinal) : longbool; cdecl;external 'pmwin' index 926;
     function WinDefWindowProc(hwnd,msg : cardinal;mp1,mp2 : pointer) : pointer; cdecl;external 'pmwin' index 911;
     function WinDestroyWindow(hwnd : cardinal) : longbool; cdecl;external 'pmwin' index 728;
     function WinShowWindow(hwnd : cardinal;fShow : longbool) : longbool; cdecl;external 'pmwin' index 883;
@@ -3469,15 +3469,15 @@ Function WinSetErrorInfo(ErrID: ErrorID; Flags: Cardinal; Params: Array of const
     function WinInitialize(flOptions : cardinal) : cardinal; cdecl;external 'pmwin' index 763;
     function WinTerminate(hab : cardinal) : longbool; cdecl;external 'pmwin' index 888;
     function WinQueryAnchorBlock(hwnd : cardinal) : cardinal; cdecl;external 'pmwin' index 800;
-    function WinCreateWindow(hwndParent : cardinal;pszClass,pszName : pchar;flStyle : cardinal;x,y,cx,cy : longint;hwndOwner,hwndInsertBehind,id : cardinal;pCtlData,pPresParams : pointer) : cardinal; cdecl;external 'pmwin' index 909;
-    function WinCreateWindow(hwndParent : cardinal;pszClass : cardinal;pszName : pchar;flStyle : cardinal;x,y,cx,cy : longint;hwndOwner,hwndInsertBehind,id : cardinal;pCtlData,pPresParams : pointer) : cardinal; cdecl;external 'pmwin' index 909;
-    function WinCreateWCWindow(hwndParent : cardinal;pszClass : cardinal;pszName : pchar;flStyle : cardinal;x,y,cx,cy : longint;hwndOwner,hwndInsertBehind,id : cardinal;pCtlData,pPresParams : pointer) : cardinal; cdecl;external 'pmwin' index 909;
+    function WinCreateWindow(hwndParent : cardinal;pszClass,pszName : PAnsiChar;flStyle : cardinal;x,y,cx,cy : longint;hwndOwner,hwndInsertBehind,id : cardinal;pCtlData,pPresParams : pointer) : cardinal; cdecl;external 'pmwin' index 909;
+    function WinCreateWindow(hwndParent : cardinal;pszClass : cardinal;pszName : PAnsiChar;flStyle : cardinal;x,y,cx,cy : longint;hwndOwner,hwndInsertBehind,id : cardinal;pCtlData,pPresParams : pointer) : cardinal; cdecl;external 'pmwin' index 909;
+    function WinCreateWCWindow(hwndParent : cardinal;pszClass : cardinal;pszName : PAnsiChar;flStyle : cardinal;x,y,cx,cy : longint;hwndOwner,hwndInsertBehind,id : cardinal;pCtlData,pPresParams : pointer) : cardinal; cdecl;external 'pmwin' index 909;
     function WinEnableWindow(hwnd : cardinal;fEnable : longbool) : longbool; cdecl;external 'pmwin' index 735;
     function WinIsWindowEnabled(hwnd : cardinal) : longbool; cdecl;external 'pmwin' index 773;
     function WinEnableWindowUpdate(hwnd : cardinal;fEnable : longbool) : longbool; cdecl;external 'pmwin' index 736;
     function WinIsWindowVisible(hwnd : cardinal) : longbool; cdecl;external 'pmwin' index 775;
-    function WinQueryWindowText(hwnd : cardinal;cchBufferMax : longint; pchBuffer : pchar) : longint; cdecl;external 'pmwin' index 841;
-    function WinSetWindowText(hwnd : cardinal;pszText : pchar) : longbool; cdecl;external 'pmwin' index 877;
+    function WinQueryWindowText(hwnd : cardinal;cchBufferMax : longint; pchBuffer : PAnsiChar) : longint; cdecl;external 'pmwin' index 841;
+    function WinSetWindowText(hwnd : cardinal;pszText : PAnsiChar) : longbool; cdecl;external 'pmwin' index 877;
     function WinQueryWindowTextLength(hwnd : cardinal) : longint; cdecl;external 'pmwin' index 842;
     function WinWindowFromID(hwndParent,id : cardinal) : cardinal; cdecl;external 'pmwin' index 899;
     function WinIsWindow(hab,hwnd : cardinal) : longbool; cdecl;external 'pmwin' index 772;
@@ -3504,17 +3504,17 @@ Function WinSetErrorInfo(ErrID: ErrorID; Flags: Cardinal; Params: Array of const
     function WinInvertRect(hps : cardinal;prcl : PRectl) : longbool; cdecl;external 'pmwin' index 767;
     function WinDrawBitmap(hpsDst,hbm : cardinal;var wrcSrc : TRectl;var ptlDst : TPointL;clrFore,clrBack : longint;fl : cardinal) : longbool; cdecl;external 'pmwin' index 730;
     function WinDrawBitmap(hpsDst,hbm : cardinal;pwrcSrc : PRectl;pptlDst : PPointL;clrFore,clrBack : longint;fl : cardinal) : longbool; cdecl;external 'pmwin' index 730;
-    function WinDrawText(hps : cardinal;cchText : longint;lpchText : pchar;var rcl : TRectl;clrFore,clrBack : longint;flCmd : cardinal) : longint; cdecl;external 'pmwin' index 913;
-    function WinDrawText(hps : cardinal;cchText : longint;lpchText : pchar;prcl : PRectl;clrFore,clrBack : longint;flCmd : cardinal) : longint; cdecl;external 'pmwin' index 913;
+    function WinDrawText(hps : cardinal;cchText : longint;lpchText : PAnsiChar;var rcl : TRectl;clrFore,clrBack : longint;flCmd : cardinal) : longint; cdecl;external 'pmwin' index 913;
+    function WinDrawText(hps : cardinal;cchText : longint;lpchText : PAnsiChar;prcl : PRectl;clrFore,clrBack : longint;flCmd : cardinal) : longint; cdecl;external 'pmwin' index 913;
     function WinDrawBorder(hps : cardinal;var rcl : TRectl;cx,cy,clrFore,clrBack : longint;flCmd : cardinal) : longbool; cdecl;external 'pmwin' index 731;
     function WinDrawBorder(hps : cardinal;prcl : PRectl;cx,cy,clrFore,clrBack : longint;flCmd : cardinal) : longbool; cdecl;external 'pmwin' index 731;
-    function WinLoadString(hab,hmod,id : cardinal;cchMax : longint;pchBuffer : pchar) : longint; cdecl;external 'pmwin' index 781;
-    function WinLoadMessage(hab,hmod,id : cardinal;cchMax : longint;pchBuffer : pchar) : longint; cdecl;external 'pmwin' index 779;
+    function WinLoadString(hab,hmod,id : cardinal;cchMax : longint;pchBuffer : PAnsiChar) : longint; cdecl;external 'pmwin' index 781;
+    function WinLoadMessage(hab,hmod,id : cardinal;cchMax : longint;pchBuffer : PAnsiChar) : longint; cdecl;external 'pmwin' index 779;
     function WinSetActiveWindow(hwndDesktop,hwnd : cardinal) : longbool; cdecl;external 'pmwin' index 851;
     function WinSubclassWindow(hwnd : cardinal;pfnwp : proc) : proc; cdecl;external 'pmwin' index 929;
-    function WinQueryClassName(hwnd : cardinal;cchMax : longint; pch : pchar) : longint; cdecl;external 'pmwin' index 805;
-    function WinQueryClassInfo(hab : cardinal;pszClassName : pchar;var _ClassInfo : TClassInfo) : longbool; cdecl;external 'pmwin' index 925;
-    function WinQueryClassInfo(hab : cardinal;pszClassName : pchar;_pClassInfo : PClassInfo) : longbool; cdecl;external 'pmwin' index 925;
+    function WinQueryClassName(hwnd : cardinal;cchMax : longint; pch : PAnsiChar) : longint; cdecl;external 'pmwin' index 805;
+    function WinQueryClassInfo(hab : cardinal;pszClassName : PAnsiChar;var _ClassInfo : TClassInfo) : longbool; cdecl;external 'pmwin' index 925;
+    function WinQueryClassInfo(hab : cardinal;pszClassName : PAnsiChar;_pClassInfo : PClassInfo) : longbool; cdecl;external 'pmwin' index 925;
     function WinQueryActiveWindow(hwndDesktop : cardinal) : cardinal; cdecl;external 'pmwin' index 799;
     function WinIsThreadActive(hab : cardinal) : longbool; cdecl;external 'pmwin' index 771;
     function WinQuerySysModalWindow(hwndDesktop : cardinal) : cardinal; cdecl;external 'pmwin' index 827;
@@ -3560,7 +3560,7 @@ Function WinSetErrorInfo(ErrID: ErrorID; Flags: Cardinal; Params: Array of const
     function WinPostMsg(hwnd,msg : cardinal;mp1,mp2 : pointer) : longbool; cdecl;external 'pmwin' index 919;
     function WinRegisterUserMsg(hab,msgid : cardinal;datatype1,dir1,datatype2,dir2,datatyper : longint) : longbool; cdecl;external 'pmwin' index 846;
     function WinRegisterUserDatatype(hab : cardinal;datatype,count : longint;var types : longint) : longbool; cdecl;external 'pmwin' index 845;
-    function WinSetMsgMode(hab : cardinal;classname :pchar;control : longint) : longbool; cdecl;external 'pmwin' index 862;
+    function WinSetMsgMode(hab : cardinal;classname :PAnsiChar;control : longint) : longbool; cdecl;external 'pmwin' index 862;
     function WinSetSynchroMode(hab : cardinal;mode : longint) : longbool; cdecl;external 'pmwin' index 870;
     function WinInSendMsg(hab : cardinal) : longbool; cdecl;external 'pmwin' index 761;
     function WinBroadcastMsg(hwnd,msg : cardinal;mp1,mp2 : pointer;rgf : cardinal) : longbool; cdecl;external 'pmwin' index 901;
@@ -3575,7 +3575,7 @@ Function WinSetErrorInfo(ErrID: ErrorID; Flags: Cardinal; Params: Array of const
     function WinWaitMuxWaitSem(hmux,ulTimeout : cardinal;pulUser : PCardinal) : cardinal; cdecl;external 'pmwin' index 980;
     function WinPostQueueMsg(hmq,msg : cardinal;mp1,mp2 : pointer) : longbool; cdecl;external 'pmwin' index 902;
     function WinSetMsgInterest(hwnd,msg_class : cardinal;control : longint) : longbool; cdecl;external 'pmwin' index 861;
-    function WinSetClassMsgInterest(hab : cardinal;pszClassName : pchar;msg_class : cardinal;control : longint) : longbool; cdecl;external 'pmwin' index 853;
+    function WinSetClassMsgInterest(hab : cardinal;pszClassName : PAnsiChar;msg_class : cardinal;control : longint) : longbool; cdecl;external 'pmwin' index 853;
     function WinSetFocus(hwndDesktop,hwndSetFocus : cardinal) : longbool; cdecl;external 'pmwin' index 860;
     function WinFocusChange(hwndDesktop,hwndSetFocus,flFocusChange : cardinal) : longbool; cdecl;external 'pmwin' index 746;
     function WinSetCapture(hwndDesktop,hwnd : cardinal) : longbool; cdecl;external 'pmwin' index 852;
@@ -3595,31 +3595,31 @@ Function WinSetErrorInfo(ErrID: ErrorID; Flags: Cardinal; Params: Array of const
     function WinQueryDlgItemShort(hwndDlg,idItem : cardinal;var _Result : System.integer;fSigned : longbool) : longbool; cdecl;external 'pmwin' index 814;
     function WinQueryDlgItemShort(hwndDlg,idItem : cardinal;pResult : System.PInteger;fSigned : longbool) : longbool; cdecl;external 'pmwin' index 814;
     function WinSetDlgItemShort(hwndDlg,idItem : cardinal;usValue : word;fSigned : longbool) : longbool; cdecl;external 'pmwin' index 858;
-    function WinSetDlgItemText(hwndDlg,idItem : cardinal;pszText : pchar) : longbool; cdecl;external 'pmwin' index 859;
-    function WinQueryDlgItemText(hwndDlg,idItem : cardinal;cchBufferMax : longint;pchBuffer : pchar) : cardinal; cdecl;external 'pmwin' index 815;
+    function WinSetDlgItemText(hwndDlg,idItem : cardinal;pszText : PAnsiChar) : longbool; cdecl;external 'pmwin' index 859;
+    function WinQueryDlgItemText(hwndDlg,idItem : cardinal;cchBufferMax : longint;pchBuffer : PAnsiChar) : cardinal; cdecl;external 'pmwin' index 815;
     function WinQueryDlgItemTextLength(hwndDlg,idItem : cardinal) : longint; cdecl;external 'pmwin' index 816;
     function WinDefDlgProc(hwndDlg,msg : cardinal;mp1,mp2 : pointer) : pointer; cdecl;external 'pmwin' index 910;
     function WinAlarm(hwndDesktop,rgfType : cardinal) : longbool; cdecl;external 'pmwin' index 701;
-    function WinMessageBox(hwndParent,hwndOwner : cardinal;pszText,pszCaption : pchar;idWindow,flStyle : cardinal) : cardinal; cdecl;external 'pmwin' index 789;
+    function WinMessageBox(hwndParent,hwndOwner : cardinal;pszText,pszCaption : PAnsiChar;idWindow,flStyle : cardinal) : cardinal; cdecl;external 'pmwin' index 789;
 (* Only available in later OS/2 versions probably???
-    function WinMessageBox2(hwndParent,hwndOwner: cardinal;pszText,pszCaption: PChar; idWindow: cardinal; MBInfo: PMB2Info): cardinal; cdecl; external 'pmwin' index 1015;
+    function WinMessageBox2(hwndParent,hwndOwner: cardinal;pszText,pszCaption: PAnsiChar; idWindow: cardinal; MBInfo: PMB2Info): cardinal; cdecl; external 'pmwin' index 1015;
 *)
     function WinProcessDlg(hwndDlg : cardinal) : cardinal; cdecl;external 'pmwin' index 796;
     function WinSendDlgItemMsg(hwndDlg,idItem,msg : cardinal;mp1,mp2 : pointer) : pointer; cdecl;external 'pmwin' index 903;
     function WinMapDlgPoints(hwndDlg : cardinal;var prgwptl : TPointL;cwpt : cardinal;fCalcWindowCoords : longbool) : longbool; cdecl;external 'pmwin' index 787;
     function WinMapDlgPoints(hwndDlg : cardinal;prgwptl : PPointL;cwpt : cardinal;fCalcWindowCoords : longbool) : longbool; cdecl;external 'pmwin' index 787;
     function WinEnumDlgItem(hwndDlg,hwnd,code : cardinal) : cardinal; cdecl;external 'pmwin' index 740;
-    function WinSubstituteStrings(hwnd : cardinal;pszSrc : pchar;cchDstMax : longint;pszDst : pchar) : longint; cdecl;external 'pmwin' index 886;
+    function WinSubstituteStrings(hwnd : cardinal;pszSrc : PAnsiChar;cchDstMax : longint;pszDst : PAnsiChar) : longint; cdecl;external 'pmwin' index 886;
     function WinCreateDlg(hwndParent,hwndOwner : cardinal;pfnDlgProc : proc;var dlgt : TDlgTemplate;pCreateParams : pointer) : cardinal; cdecl;external 'pmwin' index 922;
     function WinCreateDlg(hwndParent,hwndOwner : cardinal;pfnDlgProc : proc;pdlgt : PDlgTemplate;pCreateParams : pointer) : cardinal; cdecl;external 'pmwin' index 922;
     function WinLoadMenu(hwndFrame,hmod,idMenu : cardinal) : cardinal; cdecl;external 'pmwin' index 778;
     function WinCreateMenu(hwndParent : cardinal;lpmt : pointer) : cardinal; cdecl;external 'pmwin' index 907;
     function WinPopupMenu(hwndParent,hwndOwner,hwndMenu : cardinal;x,y,idItem : longint;fs : cardinal) : longbool; cdecl;external 'pmwin' index 937;
-    function WinCreateStdWindow(hwndParent,flStyle : cardinal;var flCreateFlags : cardinal;pszClientClass,pszTitle : pchar;styleClient,hmod,idResources : cardinal;var hwndClient : cardinal) : cardinal; cdecl;external 'pmwin' index 908;
-    function WinCreateStdWindow(hwndParent,flStyle : cardinal;pflCreateFlags : PCardinal;pszClientClass,pszTitle : pchar;styleClient,hmod,idResources : cardinal;phwndClient : PCardinal) : cardinal; cdecl;external 'pmwin' index 908;
+    function WinCreateStdWindow(hwndParent,flStyle : cardinal;var flCreateFlags : cardinal;pszClientClass,pszTitle : PAnsiChar;styleClient,hmod,idResources : cardinal;var hwndClient : cardinal) : cardinal; cdecl;external 'pmwin' index 908;
+    function WinCreateStdWindow(hwndParent,flStyle : cardinal;pflCreateFlags : PCardinal;pszClientClass,pszTitle : PAnsiChar;styleClient,hmod,idResources : cardinal;phwndClient : PCardinal) : cardinal; cdecl;external 'pmwin' index 908;
     function WinFlashWindow(hwndFrame : cardinal;fFlash : longbool) : longbool; cdecl;external 'pmwin' index 745;
-    function WinCreateFrameControls(hwndFrame : cardinal;var fcdata : TFrameCData;pszTitle : pchar) : longbool; cdecl;external 'pmwin' index 906;
-    function WinCreateFrameControls(hwndFrame : cardinal;pfcdata : PFrameCData;pszTitle : pchar) : longbool; cdecl;external 'pmwin' index 906;
+    function WinCreateFrameControls(hwndFrame : cardinal;var fcdata : TFrameCData;pszTitle : PAnsiChar) : longbool; cdecl;external 'pmwin' index 906;
+    function WinCreateFrameControls(hwndFrame : cardinal;pfcdata : PFrameCData;pszTitle : PAnsiChar) : longbool; cdecl;external 'pmwin' index 906;
     function WinCalcFrameRect(hwndFrame : cardinal;var rcl : TRectl;fClient : longbool) : longbool; cdecl;external 'pmwin' index 704;
     function WinCalcFrameRect(hwndFrame : cardinal;prcl : PRectl;fClient : longbool) : longbool; cdecl;external 'pmwin' index 704;
     function WinGetMinPosition(hwnd : cardinal;var _swp : TSWP;var pptl : POINTL) : longbool; cdecl;external 'pmwin' index 755;
@@ -3718,8 +3718,8 @@ Function WinSetErrorInfo(ErrID: ErrorID; Flags: Cardinal; Params: Array of const
     function WinReleaseHook(hab,hmq : cardinal;iHook : longint;pfnHook : pointer;hmod : cardinal) : longbool; cdecl;external 'pmwin' index 927;
     function WinCallMsgFilter(hab : cardinal;var _qmsg : TQMsg;msgf : cardinal) : longbool; cdecl;external 'pmwin' index 905;
     function WinCallMsgFilter(hab : cardinal;_pqmsg : PQMsg;msgf : cardinal) : longbool; cdecl;external 'pmwin' index 905;
-    function WinSetClassThunkProc(pszClassname : pchar;pfnThunkProc : pointer) : longbool; cdecl;external 'pmwin' index 959;
-    function WinQueryClassThunkProc(pszClassname : pchar) : pointer; cdecl;external 'pmwin' index 960;
+    function WinSetClassThunkProc(pszClassname : PAnsiChar;pfnThunkProc : pointer) : longbool; cdecl;external 'pmwin' index 959;
+    function WinQueryClassThunkProc(pszClassname : PAnsiChar) : pointer; cdecl;external 'pmwin' index 960;
     function WinSetWindowThunkProc(hwnd : cardinal;pfnThunkProc : pointer) : longbool; cdecl;external 'pmwin' index 961;
     function WinQueryWindowThunkProc(hwnd : cardinal) : pointer; cdecl;external 'pmwin' index 962;
     function WinQueryWindowModel(hwnd : cardinal) : longint; cdecl;external 'pmwin' index 934;
@@ -3727,34 +3727,34 @@ Function WinSetErrorInfo(ErrID: ErrorID; Flags: Cardinal; Params: Array of const
     function WinSetCp(hmq,idCodePage : cardinal) : longbool; cdecl;external 'pmwin' index 857;
     function WinQueryCpList(hab,ccpMax : cardinal;var prgcp : cardinal) : cardinal; cdecl;external 'pmwin' index 811;
     function WinQueryCpList(hab,ccpMax : cardinal;prgcp : PCardinal) : cardinal; cdecl;external 'pmwin' index 811;
-    function WinCpTranslateString(hab,cpSrc : cardinal;pszSrc : pchar;cpDst,cchDestMax : cardinal;pchDest : pchar) : longbool; cdecl;external 'pmwin' index 712;
+    function WinCpTranslateString(hab,cpSrc : cardinal;pszSrc : PAnsiChar;cpDst,cchDestMax : cardinal;pchDest : PAnsiChar) : longbool; cdecl;external 'pmwin' index 712;
     function WinCpTranslateChar(hab,cpSrc : cardinal;chSrc : byte;cpDst : cardinal) : byte; cdecl;external 'pmwin' index 711;
-    function WinUpper(hab,idcp,idcc : cardinal;psz : pchar) : cardinal; cdecl;external 'pmwin' index 893;
+    function WinUpper(hab,idcp,idcc : cardinal;psz : PAnsiChar) : cardinal; cdecl;external 'pmwin' index 893;
     function WinUpperChar(hab,idcp,idcc,c : cardinal) : cardinal; cdecl;external 'pmwin' index 894;
-    function WinNextChar(hab,idcp,idcc : cardinal;psz : pchar) : pchar; cdecl;external 'pmwin' index 791;
-    function WinPrevChar(hab,idcp,idcc : cardinal;pszStart,psz : pchar) : pchar; cdecl;external 'pmwin' index 795;
-    function WinCompareStrings(hab,idcp,idcc : cardinal;psz1,psz2 : pchar;reserved : cardinal) : cardinal; cdecl;external 'pmwin' index 708;
+    function WinNextChar(hab,idcp,idcc : cardinal;psz : PAnsiChar) : PAnsiChar; cdecl;external 'pmwin' index 791;
+    function WinPrevChar(hab,idcp,idcc : cardinal;pszStart,psz : PAnsiChar) : PAnsiChar; cdecl;external 'pmwin' index 795;
+    function WinCompareStrings(hab,idcp,idcc : cardinal;psz1,psz2 : PAnsiChar;reserved : cardinal) : cardinal; cdecl;external 'pmwin' index 708;
     function WinCreateAtomTable(cbInitial,cBuckets : cardinal) : cardinal; cdecl;external 'pmwin' index 714;
     function WinDestroyAtomTable(hAtomTbl : cardinal) : cardinal; cdecl;external 'pmwin' index 724;
-    function WinAddAtom(hAtomTbl : cardinal;pszAtomName : pchar) : cardinal; cdecl;external 'pmwin' index 700;
-    function WinFindAtom(hAtomTbl : cardinal;pszAtomName : pchar) : cardinal; cdecl;external 'pmwin' index 744;
+    function WinAddAtom(hAtomTbl : cardinal;pszAtomName : PAnsiChar) : cardinal; cdecl;external 'pmwin' index 700;
+    function WinFindAtom(hAtomTbl : cardinal;pszAtomName : PAnsiChar) : cardinal; cdecl;external 'pmwin' index 744;
     function WinDeleteAtom(hAtomTbl,atom : cardinal) : cardinal; cdecl;external 'pmwin' index 721;
     function WinQueryAtomUsage(hAtomTbl,atom : cardinal) : cardinal; cdecl;external 'pmwin' index 803;
     function WinQueryAtomLength(hAtomTbl,atom : cardinal) : cardinal; cdecl;external 'pmwin' index 801;
-    function WinQueryAtomName(hAtomTbl,atom : cardinal;pchBuffer : pchar;cchBufferMax : cardinal) : cardinal; cdecl;external 'pmwin' index 802;
+    function WinQueryAtomName(hAtomTbl,atom : cardinal;pchBuffer : PAnsiChar;cchBufferMax : cardinal) : cardinal; cdecl;external 'pmwin' index 802;
     function WinGetLastError(hab : cardinal) : cardinal; cdecl;external 'pmwin' index 753;
     function WinGetErrorInfo(hab : cardinal) : PERRINFO; cdecl;external 'pmwin' index 751;
     function WinFreeErrorInfo(var perrinfo : ERRINFO) : longbool; cdecl;external 'pmwin' index 748;
-    function WinDdeInitiate(hwndClient : cardinal;pszAppName,pszTopicName : pchar;var cctxt : TConvContext) : longbool; cdecl;external 'pmwin' index 718;
-    function WinDdeInitiate(hwndClient : cardinal;pszAppName,pszTopicName : pchar;pcctxt : PConvContext) : longbool; cdecl;external 'pmwin' index 718;
-    function WinDdeRespond(hwndClient,hwndServer : cardinal;pszAppName,pszTopicName : pchar;var cctxt : TConvContext) : pointer; cdecl;external 'pmwin' index 720;
-    function WinDdeRespond(hwndClient,hwndServer : cardinal;pszAppName,pszTopicName : pchar;pcctxt : PConvContext) : pointer; cdecl;external 'pmwin' index 720;
+    function WinDdeInitiate(hwndClient : cardinal;pszAppName,pszTopicName : PAnsiChar;var cctxt : TConvContext) : longbool; cdecl;external 'pmwin' index 718;
+    function WinDdeInitiate(hwndClient : cardinal;pszAppName,pszTopicName : PAnsiChar;pcctxt : PConvContext) : longbool; cdecl;external 'pmwin' index 718;
+    function WinDdeRespond(hwndClient,hwndServer : cardinal;pszAppName,pszTopicName : PAnsiChar;var cctxt : TConvContext) : pointer; cdecl;external 'pmwin' index 720;
+    function WinDdeRespond(hwndClient,hwndServer : cardinal;pszAppName,pszTopicName : PAnsiChar;pcctxt : PConvContext) : pointer; cdecl;external 'pmwin' index 720;
     function WinDdePostMsg(hwndTo,hwndFrom,wm : cardinal;var ddest : DDEStruct;flOptions : cardinal) : longbool; cdecl;external 'pmwin' index 719;
     function WinDdePostMsg(hwndTo,hwndFrom,wm : cardinal;pddest : PDDEStruct;flOptions : cardinal) : longbool; cdecl;external 'pmwin' index 719;
     function WinDeleteProcedure(hab : cardinal;wndproc : proc) : longbool; cdecl;external 'pmwin' index 987;
     function WinDeleteLibrary(hab,libhandle : cardinal) : longbool; cdecl;external 'pmwin' index 722;
-    function WinLoadProcedure(hab,libhandle : cardinal;procname : pchar) : proc; cdecl;external 'pmwin' index 986;
-    function WinLoadLibrary(hab : cardinal;libname : pchar) : cardinal; cdecl;external 'pmwin' index 777;
+    function WinLoadProcedure(hab,libhandle : cardinal;procname : PAnsiChar) : proc; cdecl;external 'pmwin' index 986;
+    function WinLoadLibrary(hab : cardinal;libname : PAnsiChar) : cardinal; cdecl;external 'pmwin' index 777;
     function WinSetDesktopBkgnd(hwndDesktop : cardinal;var dskNew : TDesktop) : cardinal; cdecl;external 'pmwin' index 935;
     function WinSetDesktopBkgnd(hwndDesktop : cardinal;pdskNew : PDesktop) : cardinal; cdecl;external 'pmwin' index 935;
     function WinQueryDesktopBkgnd(hwndDesktop : cardinal;var dsk : TDesktop) : longbool; cdecl;external 'pmwin' index 936;

rtl/os2/pmwp.pas

@@ -37,7 +37,7 @@ const
   QC_Next                = 1;
   QC_Last                = 2;
 
-  LOCATION_DESKTOP = PChar($FFFF0001); // Current Desktop
+  LOCATION_DESKTOP = PAnsiChar($FFFF0001); // Current Desktop
          // use instead of <WP_DESKTOP>
 
 //*** An object's appearance (icon or bitmap or outline) **************/
@@ -53,21 +53,21 @@ type
   POBJCLASS=^OBJCLASS;
   OBJCLASS=record         // ocls
     pNext: POBJCLASS;     // Null for the last structure..
-    pszClassName: PChar;  // Class name
-    pszModName: PChar;    // Module name
+    pszClassName: PAnsiChar;  // Class name
+    pszModName: PAnsiChar;    // Module name
   end;
 
 //*** Workplace object management functions ***************************/
 
 Function WinRegisterObjectClass(pszClassName,
-                                pszModName: PChar): Longbool; cdecl;
+                                pszModName: PAnsiChar): Longbool; cdecl;
     external 'PMWP' index 200;
 
-Function WinDeRegisterObjectClass(pszClassName: PChar): Longbool; cdecl;
+Function WinDeRegisterObjectClass(pszClassName: PAnsiChar): Longbool; cdecl;
     external 'PMWP' index 201;
 
 Function WinReplaceObjectClass(pszOldClassName,
-                               pszNewClassName: PChar;
+                               pszNewClassName: PAnsiChar;
                                fReplace: Longbool): Longbool; cdecl;
     external 'PMWP' index 219;
 
@@ -78,7 +78,7 @@ Function WinEnumObjectClasses(VAR apObjClass: OBJCLASS;
 Function WinCreateObject(pszClassName,
                          pszTitle,
                          pszSetupString,
-                         pszLocation: PChar;
+                         pszLocation: PAnsiChar;
                          ulFlags: Cardinal): HObject; cdecl;
     external 'PMWP' index 281;
 
@@ -88,13 +88,13 @@ const
   CO_UPDATEIFEXISTS  = 2;
 
 Function WinSetObjectData(aobject: HOBJECT;
-                          pszSetupString: PChar): Longbool; cdecl;
+                          pszSetupString: PAnsiChar): Longbool; cdecl;
     external 'PMWP' index 250;
 
 Function WinDestroyObject(aobject: HOBJECT): Longbool; cdecl;
     external 'PMWP' index 251;
 
-Function WinQueryObject(pszObjectID: PChar): HObject; cdecl;
+Function WinQueryObject(pszObjectID: PAnsiChar): HObject; cdecl;
     external 'PMWP' index 252;
 
 Function WinSaveObject(ahObject: HOBJECT;
@@ -121,12 +121,12 @@ Function WinCreateShadow(hObjectofObject: HOBJECT;
                          ulReserved: Cardinal): HObject; cdecl;
     external 'PMWP' index 289;
 
-Function WinQueryActiveDesktopPathname(pszPathName: PChar;
+Function WinQueryActiveDesktopPathname(pszPathName: PAnsiChar;
                                        ulSize: Cardinal): Longbool; cdecl;
     external 'PMWP' index 262;
 
 Function WinQueryObjectPath(ahobject: HOBJECT;
-                            pszPathName: PChar;
+                            pszPathName: PAnsiChar;
                             ulSize: Cardinal): Longbool; cdecl;
     external 'PMWP' index 263;
 
@@ -155,10 +155,10 @@ type
     usPageStyleFlags: Word;
     usPageInsertFlags: Word;
     usSettingsFlags: Word;
-    pszName: PChar;
+    pszName: PAnsiChar;
     idDefaultHelpPanel: Word;
     usReserved2: Word;
-    pszHelpLibraryName: PChar;
+    pszHelpLibraryName: PAnsiChar;
     pHelpSubtable: ^Word;   // PHELPSUBTABLE when PMHELP.H is included
     hmodHelpSubtable: Cardinal;
     ulPageInsertId: Cardinal;
@@ -173,29 +173,29 @@ const
 type
   ICONPOS=record     // icp
     ptlIcon: POINTL;                    // Location
-    szIdentity: Array[0..1-1] of Char;  // Object identity string
+    szIdentity: Array[0..1-1] of AnsiChar;  // Object identity string
   end;
   PICONPOS=^ICONPOS;
 
 //*********************************************************************/
-Function WinSetFileIcon(pszFileName: PChar;
+Function WinSetFileIcon(pszFileName: PAnsiChar;
                     var pIcon: ICONINFO): Longbool; cdecl;
     external 'PMWP' index 210;
 
 Function WinFreeFileIcon(hptr: Cardinal): Longbool; cdecl;
     external 'PMWP' index 216;
 
-Function WinLoadFileIcon(pszFileName: PChar;
+Function WinLoadFileIcon(pszFileName: PAnsiChar;
                          fPrivate: Longbool): Cardinal; cdecl;
     external 'PMWP' index 209;
 
 Function WinStoreWindowPos(pszAppName,
-                           pszKeyName: PChar;
+                           pszKeyName: PAnsiChar;
                            ahwnd: HWND): Longbool; cdecl;
     external 'PMWP' index 207;
 
 Function WinRestoreWindowPos(pszAppName,
-                             pszKeyName: PChar;
+                             pszKeyName: PAnsiChar;
                              ahwnd: HWND): Longbool; cdecl;
     external 'PMWP' index 208;
 
@@ -221,12 +221,12 @@ WinWaitForShell         PMWP     512 ?
 
 {
 // Not founded indexes
-Function WinSetFileIconN(pszFileName: PChar
+Function WinSetFileIconN(pszFileName: PAnsiChar
                          pIcnInfo: PICONINFO;
                          ulIconIndex: Cardinal): Longbool; cdecl;
     external 'PMWP' index ???;
 
-Function WinLoadFileIconN(pszFileName: PChar;
+Function WinLoadFileIconN(pszFileName: PAnsiChar;
                           fPrivate: Longbool,
                           ulIconIndex: Cardinal): Cardinal; cdecl;
     external 'PMWP' index ???;

rtl/os2/pmwsock.pas

@@ -136,13 +136,13 @@ const
 
 type
   hostent=record
-    h_name: PChar;             // official name of host
-    h_aliases: PPChar;         // alias list
+    h_name: PAnsiChar;             // official name of host
+    h_aliases: PPAnsiChar;         // alias list
     h_addrtype: LongInt;       // host address type
     h_length: LongInt;         // length of address
     case byte of
-       0: (h_addr_list: ppchar); // list of addresses from name server
-       1: (h_addr: ppchar)       // address, for backward compatiblity
+       0: (h_addr_list: PPAnsiChar); // list of addresses from name server
+       1: (h_addr: PPAnsiChar)       // address, for backward compatiblity
   end;
   phostent=^hostent;
   THostEnt = hostent;
@@ -151,8 +151,8 @@ type
 // fits in 32 bits.
 type
   netent=record
-    n_name: PChar;                       // official name of net
-    n_aliases: PPChar;                   // alias list
+    n_name: PAnsiChar;                       // official name of net
+    n_aliases: PPAnsiChar;                   // alias list
     n_addrtype: Longint;                 // net address type
     n_net: Cardinal;                     // network #
   End;
@@ -161,17 +161,17 @@ type
 
 type
   servent=record
-    s_name: PChar;                      // official service name
-    s_aliases: PPChar;                  // alias list
+    s_name: PAnsiChar;                      // official service name
+    s_aliases: PPAnsiChar;                  // alias list
     s_port: LongInt;                    // port #
-    s_proto: PChar;                     // protocol to use
+    s_proto: PAnsiChar;                     // protocol to use
   end;
   TServEnt = servent;
   pservent=^servent;
 
   protoent=record
-    p_name: PChar;                      // official protocol name
-    p_aliases: PPChar;                  // alias list
+    p_name: PAnsiChar;                      // official protocol name
+    p_aliases: PPAnsiChar;                  // alias list
     p_proto: LongInt;                   // protocol #
   end;
   TProtoEnt = protoent;
@@ -295,11 +295,11 @@ Type
       sin_family : SmallInt;                (* 2 byte *)
       sin_port : Word;                   (* 2 byte *)
       sin_addr : TInAddr;                   (* 4 byte *)
-      sin_zero : array[0..8-1] of char;     (* 8 byte *)
+      sin_zero : array[0..8-1] of AnsiChar;     (* 8 byte *)
       );
     1 : ((* equals to sockaddr, size is 16 byte *)
       sa_family : Smallint; (* 2 byte *)
-      sa_data : array[0..14-1] of char;    (* 14 byte *)
+      sa_data : array[0..14-1] of AnsiChar;    (* 14 byte *)
       );
     end;
     TSockAddrIn = sockaddr_in;
@@ -315,13 +315,13 @@ Type
     WSAData=Record
                wVersion:Word;
                wHighVersion:Word;
-               szDescription: array[0..WSADESCRIPTION_LEN] of Char;
-               szSystemStatus: array[0..WSASYS_STATUS_LEN] of Char;
+               szDescription: array[0..WSADESCRIPTION_LEN] of AnsiChar;
+               szSystemStatus: array[0..WSASYS_STATUS_LEN] of AnsiChar;
                iMaxSockets:Word;
                iMaxUdpDg:Word;
                // in OS/2 no such entry
      //          pad1 : SmallInt;              { 2 byte, ofs 394 } { ensure right packaging }
-               lpVendorInfo:PChar;
+               lpVendorInfo:PAnsiChar;
     End;
     PWSADATA=^WSAData;
     LPWSADATA=^WSAData;
@@ -463,7 +463,7 @@ Const
 Type
     sockaddr=Record
         sa_family:Word;                 // address family
-        sa_data:Array[0..13] of char;   // up to 14 bytes of direct address
+        sa_data:Array[0..13] of AnsiChar;   // up to 14 bytes of direct address
     End;
 
 // Structure used by kernel to pass protocol
@@ -742,7 +742,7 @@ Function getsockname(s: TSocket;Var name: sockaddr; Var namelen: LongInt): LongI
 
 Function getsockopt(s: TSocket; level, optname: LongInt;Var optval; Var optlen: LongInt): LongInt; cdecl;
     external 'PMWSock' index 7;
-Function getsockopt(s: TSocket; level: Longint; optname: Longint; optval:pchar;var optlen: Longint): Longint; cdecl;
+Function getsockopt(s: TSocket; level: Longint; optname: Longint; optval:PAnsiChar;var optlen: Longint): Longint; cdecl;
     external 'PMWSock' index 7;
 
 Function htonl(hostlong: Cardinal): Cardinal; cdecl;
@@ -751,12 +751,12 @@ Function htonl(hostlong: Cardinal): Cardinal; cdecl;
 Function htons(hostshort: Word): Word; cdecl;
     external 'PMWSock' index 9;
 
-Function inet_addr(cp: pchar): Cardinal; cdecl;
+Function inet_addr(cp: PAnsiChar): Cardinal; cdecl;
     external 'PMWSock' index 10;
 
-Function inet_ntoa(Var _in: in_addr): PChar; cdecl;
+Function inet_ntoa(Var _in: in_addr): PAnsiChar; cdecl;
     external 'PMWSock' index 11;
-Function inet_ntoa(i: PInAddr): pchar; cdecl;
+Function inet_ntoa(i: PInAddr): PAnsiChar; cdecl;
     external 'PMWSock' index 11;
 
 Function listen(s: TSocket; backlog: LongInt): LongInt; cdecl;
@@ -770,13 +770,13 @@ Function ntohs(netshort: Word): Word; cdecl;
 
 Function recv(s: TSocket;Var Buf; len, flags: LongInt): LongInt; cdecl;
     external 'PMWSock' index 16;
-Function recv(s: TSocket; buf:pchar; len: Longint; flags: Longint): Longint; cdecl;
+Function recv(s: TSocket; buf:PAnsiChar; len: Longint; flags: Longint): Longint; cdecl;
     external 'PMWSock' index 16;
 
-Function recvfrom(s: TSocket; Var Buf: PChar; len, flags:LongInt;
+Function recvfrom(s: TSocket; Var Buf: PAnsiChar; len, flags:LongInt;
                          Var from: sockaddr; Var fromLen: LongInt): LongInt; cdecl;
     external 'PMWSock' index 17;
-Function recvfrom(s: TSocket; buf:pchar; len: Longint; flags: Longint;
+Function recvfrom(s: TSocket; buf:PAnsiChar; len: Longint; flags: Longint;
                          from: PSockAddr; fromlen: Longint): Longint; cdecl;
     external 'PMWSock' index 17;
 Function recvfrom(s: TSocket; var buf; len: Longint; flags: Longint;
@@ -790,18 +790,18 @@ Function select(nfds: Longint; readfds, writefds, exceptfds : PFDSet;
                        timeout: PTimeVal): Longint; cdecl;
     external 'PMWSock' index 18;
 
-Function send(s: TSocket; Const Buf: PChar; len, flags: LongInt): LongInt; cdecl;
+Function send(s: TSocket; Const Buf: PAnsiChar; len, flags: LongInt): LongInt; cdecl;
     external 'PMWSock' index 19;
 
-Function sendto(s: TSocket; Const Buf: PChar; len, flags: LongInt;
+Function sendto(s: TSocket; Const Buf: PAnsiChar; len, flags: LongInt;
                     Const _to: sockaddr; tolen: LongInt): LongInt; cdecl;
     external 'PMWSock' index 20;
-Function sendto(s: TSocket; buf: pchar; len: Longint; flags: Longint;
+Function sendto(s: TSocket; buf: PAnsiChar; len: Longint; flags: Longint;
                     toaddr: PSockAddr; tolen: Longint): Longint; cdecl;
     external 'PMWSock' index 20;
 
 Function setsockopt(s: TSocket; level: Longint; optname: Longint;
-                           optval: pchar; optlen: Longint): Longint; cdecl;
+                           optval: PAnsiChar; optlen: Longint): Longint; cdecl;
     external 'PMWSock' index 21;
 
 Function shutdown(s: TSocket; how: LongInt): LongInt; cdecl;
@@ -812,25 +812,25 @@ Function socket(af, typ, protocol: LongInt): TSocket; cdecl;
 
 // Database function prototypes
 
-Function gethostbyaddr(addr: pchar; len: Longint; t: Longint): PHostEnt; cdecl;
+Function gethostbyaddr(addr: PAnsiChar; len: Longint; t: Longint): PHostEnt; cdecl;
     external 'PMWSock' index 51;
 
-Function gethostbyname(name: pchar): PHostEnt; cdecl;
+Function gethostbyname(name: PAnsiChar): PHostEnt; cdecl;
     external 'PMWSock' index 52;
 
-Function gethostname(name: pchar; namelen: Longint): Longint; cdecl;
+Function gethostname(name: PAnsiChar; namelen: Longint): Longint; cdecl;
     external 'PMWSock' index 57;
 
-Function getservbyport(port: Longint; proto: pchar): PServEnt; cdecl;
+Function getservbyport(port: Longint; proto: PAnsiChar): PServEnt; cdecl;
     external 'PMWSock' index 56;
 
-Function getservbyname(name: pchar; proto: pchar): PServEnt; cdecl;
+Function getservbyname(name: PAnsiChar; proto: PAnsiChar): PServEnt; cdecl;
     external 'PMWSock' index 55;
 
 Function getprotobynumber(proto: LongInt): pprotoent; cdecl;
     external 'PMWSock' index 54;
 
-Function getprotobyname(name: pchar): PProtoEnt; cdecl;
+Function getprotobyname(name: PAnsiChar): PProtoEnt; cdecl;
     external 'PMWSock' index 53;
 
 // Microsoft Windows Extension function prototypes
@@ -860,36 +860,36 @@ Function WSACancelBlockingCall: LongInt; cdecl;
     external 'PMWSock' index 113;
 
 Function WSAAsyncGetServByName(hWnd: HWND; wMsg: Cardinal;
-                                     name: pchar; proto: pchar;
-                                     buf: pchar;
+                                     name: PAnsiChar; proto: PAnsiChar;
+                                     buf: PAnsiChar;
                                      buflen: Longint): Cardinal; cdecl;
     external 'PMWSock' index 107;
 
 Function WSAAsyncGetServByPort(hWnd: HWND; wMsg: Cardinal;
                                       port: Longint;
-                                      proto: pchar; buf: pchar;
+                                      proto: PAnsiChar; buf: PAnsiChar;
                                       buflen: Longint): Cardinal; cdecl;
     external 'PMWSock' index 106;
 
 Function WSAAsyncGetProtoByName(hWnd: HWND; wMsg: Cardinal;
-                                       name: pchar; buf: pchar;
+                                       name: PAnsiChar; buf: PAnsiChar;
                                        buflen: Longint): Cardinal; cdecl;
     external 'PMWSock' index 105;
 
 Function WSAAsyncGetProtoByNumber(hWnd: HWND; wMsg: Cardinal;
                                          number: Longint;
-                                         buf: pchar;
+                                         buf: PAnsiChar;
                                          buflen: Longint): Cardinal; cdecl;
     external 'PMWSock' index 104;
 
 Function WSAAsyncGetHostByName(hWnd: HWND; wMsg: Cardinal;
-                                      name: pchar; buf: pchar;
+                                      name: PAnsiChar; buf: PAnsiChar;
                                       buflen: Longint): Cardinal; cdecl;
     external 'PMWSock' index 103;
 
 Function WSAAsyncGetHostByAddr(hWnd: HWND; wMsg: Cardinal;
-                                      addr: pchar; len: Longint; t: Longint;
-                                      buf: pchar; buflen: Longint): Cardinal; cdecl;
+                                      addr: PAnsiChar; len: Longint; t: Longint;
+                                      buf: PAnsiChar; buflen: Longint): Cardinal; cdecl;
     external 'PMWSock' index 102;
 
 Function WSACancelAsyncRequest(hAsyncTaskHandle: Cardinal): LongInt; cdecl;

rtl/os2/so32dll.pas

@@ -316,7 +316,7 @@ const
 
 type
   ctlname=record
-    ctl_name: PChar;      // subsystem name
+    ctl_name: PAnsiChar;      // subsystem name
     ctl_type: Longint;    // type of name
   end;
 
@@ -407,7 +407,7 @@ struct inetcfg_ctl{
 /* Inetversion */
 struct inetvers_ctl {
          float version;
-         char  versionstr[10];           /* Less than 10 chars in version string */
+         AnsiChar  versionstr[10];           /* Less than 10 chars in version string */
 };
 
 #include <sys/cdefs.h>
@@ -509,11 +509,11 @@ type
 
   // Message header for recvmsg and sendmsg calls
   msghdr = record
-    msg_name:       pChar;     // optional address
+    msg_name:       PAnsiChar;     // optional address
     msg_namelen:    Longint;   // size of address
     msg_iov:        ^iovec;    // scatter/gather array
     msg_iovlen:     Longint;   // # elements in msg_iov (max 1024)
-    msg_control:    pChar;     // ancillary data, see below
+    msg_control:    PAnsiChar;     // ancillary data, see below
     msg_controllen: Longint;   // ancillary data buffer len
     msg_flags:      Longint;   // flags on received message
   end;
@@ -591,11 +591,11 @@ type
 type
   // 4.3-compat message header
   omsghdr = record
-    msg_name:         pChar;   // optional address
+    msg_name:         PAnsiChar;   // optional address
     msg_namelen:      Longint; // size of address
     msg_iov:          ^iovec;  // scatter/gather array
     msg_iovlen:       Longint; // # elements in msg_iov
-    msg_accrights:    pChar;   // access rights sent/received
+    msg_accrights:    PAnsiChar;   // access rights sent/received
     msg_accrightslen: Longint;
   end;
 
@@ -1205,7 +1205,7 @@ function  getinetversion(var version):Longint; cdecl;
 function  sock_errno:Longint; cdecl;
 
 { print last err string + str if not NIL }
-procedure psock_errno(var str:PChar); cdecl;
+procedure psock_errno(var str:PAnsiChar); cdecl;
 
 
 { * sockets creation / close funcs }
@@ -1375,7 +1375,7 @@ function  sock_init:Longint; cdecl; external 'SO32DLL' index 26;
 function  addsockettolist(sock:Longint):Longint; cdecl; external 'SO32DLL' index 27;
 function  removesocketfromlist(sock:Longint):Longint; cdecl; external 'SO32DLL' index 28;
 { entry 29 not used }
-procedure psock_errno(var str:PChar); cdecl; external 'SO32DLL' index 30;
+procedure psock_errno(var str:PAnsiChar); cdecl; external 'SO32DLL' index 30;
 function  getinetversion(var version):Longint; cdecl; external 'SO32DLL' index 31;
 function  select(nfds:Longint;
                  var readfds,writefds,exceptfds:fd_set;
@@ -1425,8 +1425,8 @@ type
 
   { struct for gethostbyname() and gethostbyaddr() }
   hostent = record
-    h_name       :  PChar;       // official name of host
-    h_aliases    :  ^PChar;      // alias list
+    h_name       :  PAnsiChar;       // official name of host
+    h_aliases    :  ^PAnsiChar;      // alias list
     h_addrtype   :  Longint;     // host address type
     h_length     :  Longint;     // length of address
     h_addr_list  :  ^PLongint;   // list of addresses from name server
@@ -1453,8 +1453,8 @@ type
 
   { struct for getprotobyname() and getprotobynumber() }
   protoent = record
-    p_name     :  PChar;         // official protocol name
-    p_aliases  :  ^PChar;        // alias list
+    p_name     :  PAnsiChar;         // official protocol name
+    p_aliases  :  ^PAnsiChar;        // alias list
     p_proto    :  Longint;       // protocol #
   end;
 
@@ -1464,10 +1464,10 @@ type
 
   { struct for getservbyname() and getservbyport() }
   servent = record
-    s_name     :  PChar;         // official service name
-    s_aliases  :  ^PChar;        // alias list
+    s_name     :  PAnsiChar;         // official service name
+    s_aliases  :  ^PAnsiChar;        // alias list
     s_port     :  Longint;       // port # (need ntohl() !!)
-    s_proto    :  PChar;         // protocol to use
+    s_proto    :  PAnsiChar;         // protocol to use
   end;
 
   pservent = ^servent;
@@ -1533,7 +1533,7 @@ type
 * remainder may be interface specific.
 }
   ifreq = record
-     ifr_name           :  array[0..IFNAMSIZ-1] of Char;
+     ifr_name           :  array[0..IFNAMSIZ-1] of AnsiChar;
      case Byte of
      0: (ifr_addr       :  sockaddr);  // address
      1: (ifr_dstaddr    :  sockaddr);  // other end of p-to-p link

rtl/os2/sysdir.inc

@@ -24,7 +24,7 @@ var
     Rc : word;
 begin
   DoDirSeparators(s);
-  Rc := DosCreateDir(pchar(s),nil);
+  Rc := DosCreateDir(PAnsiChar(s),nil);
   if Rc <> 0 then
     begin
       InOutRes := Rc;
@@ -43,7 +43,7 @@ begin
       exit;
     end;
   DoDirSeparators(s);
-  Rc := DosDeleteDir(pchar(s));
+  Rc := DosDeleteDir(PAnsiChar(s));
   if Rc <> 0 then
     begin
       InOutRes := Rc;
@@ -75,7 +75,7 @@ begin
         DoDirSeparators (s);
         if (S [Len] = DirectorySeparator) and (Len <> 3) then
          S [Len] := #0;
-        RC := DosSetCurrentDir (pchar (s));
+        RC := DosSetCurrentDir (PAnsiChar (s));
         if RC <> 0 then
         begin
           InOutRes := RC;
@@ -87,7 +87,7 @@ begin
     DoDirSeparators (s);
     if (Len > 1) and (S [Len] = DirectorySeparator) then
      S [Len] := #0;
-    RC := DosSetCurrentDir (pchar (s));
+    RC := DosSetCurrentDir (PAnsiChar (s));
     if RC <> 0 then
     begin
       InOutRes:= RC;
@@ -101,7 +101,7 @@ end;
 
 procedure do_GetDir (DriveNr: byte; var Dir: RawByteString);
 {Written by Michael Van Canneyt.}
-var sof: Pchar;
+var sof: PAnsiChar;
     i:byte;
     l,l2:cardinal;
     RC: cardinal;
@@ -109,7 +109,7 @@ begin
     setlength(Dir,255);
     Dir [4] := #0;
     { Used in case the specified drive isn't available }
-    sof:=pchar(@dir[4]);
+    sof:=PAnsiChar(@dir[4]);
     { dir[1..3] will contain '[drivenr]:\', but is not }
     { supplied by DOS, so we let dos string start at   }
     { dir[4]                                           }

rtl/os2/sysdl.inc

@@ -16,7 +16,7 @@
 
 threadvar
  DynLibErrNo: cardinal;
- DynLibErrPath: array [0..259] of char;
+ DynLibErrPath: array [0..259] of AnsiChar;
 
 function SysLoadLibraryA (const Name: RawbyteString): TLibHandle;
 var
@@ -44,7 +44,7 @@ var
  P: pointer;
 begin
  DynLibErrPath [0] := #0;
- DynLibErrNo := DosQueryProcAddr (Lib, 0, PChar (ProcName), P);
+ DynLibErrNo := DosQueryProcAddr (Lib, 0, PAnsiChar (ProcName), P);
  if DynLibErrNo = 0 then
   Result := P
  else
@@ -83,17 +83,17 @@ begin
  GetDynLibsError := DynLibErrNo;
 end;
 
-function GetDynLibsErrPath: PChar;
+function GetDynLibsErrPath: PAnsiChar;
 begin
  GetDynLibsErrPath := @DynLibErrPath [0];
 end;
 
-function SysGetDynLibsErrorStr: string;
+function SysGetDynLibsErrorStr: ansistring;
 const
- SysMsgFile: array [0..10] of char = 'OSO001.MSG'#0;
+ SysMsgFile: array [0..10] of AnsiChar = 'OSO001.MSG'#0;
 var
- VarArr: array [1..9] of PChar;
- OutBuf: array [0..999] of char;
+ VarArr: array [1..9] of PAnsiChar;
+ OutBuf: array [0..999] of AnsiChar;
  RetMsgSize: cardinal;
  RC: cardinal;
  I: cardinal;
@@ -111,7 +111,7 @@ begin
     begin
      SetLength (Result, RetMsgSize);
      Move (OutBuf [0], Result [1], RetMsgSize);
-     AErr := ansistring (PChar (@DynlibErrPath [0]));
+     AErr := ansistring (PAnsiChar (@DynlibErrPath [0]));
      if (AErr <> '') and (Pos (AErr, Result) = 0) then
       begin
        if Result [Length (Result)] in [#13, #10, ' '] then

rtl/os2/sysfile.inc

@@ -38,9 +38,9 @@ begin
 {$endif}
 end;
 
-procedure do_erase(p:Pchar; pchangeable: boolean);
+procedure do_erase(p:PAnsiChar; pchangeable: boolean);
 var
-  oldp: pchar;
+  oldp: PAnsiChar;
   RC: cardinal;
 begin
   oldp:=p;
@@ -55,9 +55,9 @@ begin
     freemem(p);
 end;
 
-procedure do_rename(p1,p2:Pchar; p1changeable, p2changeable: boolean);
+procedure do_rename(p1,p2:PAnsiChar; p1changeable, p2changeable: boolean);
 var
-  oldp1, oldp2 : pchar;
+  oldp1, oldp2 : PAnsiChar;
   RC: cardinal;
 begin
   oldp1:=p1;
@@ -220,7 +220,7 @@ begin
     Increase_File_Handle_Count := false;
 end;
 
-procedure do_open(var f;p:pchar;flags:longint; pchangeable: boolean);
+procedure do_open(var f;p:PAnsiChar;flags:longint; pchangeable: boolean);
 {
   filerec and textrec have both handle and mode as the first items so
   they could use the same routine for opening/creating.
@@ -231,7 +231,7 @@ procedure do_open(var f;p:pchar;flags:longint; pchangeable: boolean);
 }
 var
   Action, Attrib, OpenFlags, FM: Cardinal;
-  oldp : pchar;
+  oldp : PAnsiChar;
   RC: cardinal;
 begin
   // close first if opened

rtl/os2/sysos.inc

@@ -77,18 +77,18 @@ procedure DosGetInfoBlocks (PATIB: PPThreadInfoBlock;
                             PAPIB: PPProcessInfoBlock); cdecl;
                             external 'DOSCALLS' index 312;
 
-function DosLoadModule (ObjName: PChar; ObjLen: cardinal; DLLName: PChar;
+function DosLoadModule (ObjName: PAnsiChar; ObjLen: cardinal; DLLName: PAnsiChar;
                                          var Handle: THandle): cardinal; cdecl;
 external 'DOSCALLS' index 318;
 
 function DosFreeModule (Handle: THandle): cardinal; cdecl;
 external 'DOSCALLS' index 322;
 
-function DosQueryModuleHandle (DLLName: PChar; var Handle: THandle): cardinal;
+function DosQueryModuleHandle (DLLName: PAnsiChar; var Handle: THandle): cardinal;
                                                                          cdecl;
 external 'DOSCALLS' index 319;
 
-function DosQueryProcAddr (Handle, Ordinal: cardinal; ProcName: PChar;
+function DosQueryProcAddr (Handle, Ordinal: cardinal; ProcName: PAnsiChar;
                                         var Address: pointer): cardinal; cdecl;
 external 'DOSCALLS' index 321;
 
@@ -96,7 +96,7 @@ function DosSetRelMaxFH (var ReqCount: longint; var CurMaxFH: cardinal):
                                                                cardinal; cdecl;
 external 'DOSCALLS' index 382;
 
-function DosSetCurrentDir (Name:PChar): cardinal; cdecl;
+function DosSetCurrentDir (Name:PAnsiChar): cardinal; cdecl;
 external 'DOSCALLS' index 255;
 
 procedure DosQueryCurrentDisk(var DiskNum:cardinal;var Logical:cardinal); cdecl;
@@ -108,27 +108,27 @@ external 'DOSCALLS' index 220;
 { This is not real prototype, but is close enough }
 { for us (the 2nd parameter is actually a pointer }
 { to a structure).                                }
-function DosCreateDir (Name: PChar; P: pointer): cardinal; cdecl;
+function DosCreateDir (Name: PAnsiChar; P: pointer): cardinal; cdecl;
 external 'DOSCALLS' index 270;
 
-function DosDeleteDir (Name: PChar): cardinal; cdecl;
+function DosDeleteDir (Name: PAnsiChar): cardinal; cdecl;
 external 'DOSCALLS' index 226;
 
 function DosQueryCurrentDir(DiskNum:cardinal;var Buffer;
                             var BufLen:cardinal): cardinal; cdecl;
 external 'DOSCALLS' index 274;
 
-function DosMove(OldFile,NewFile:PChar):cardinal; cdecl;
+function DosMove(OldFile,NewFile:PAnsiChar):cardinal; cdecl;
     external 'DOSCALLS' index 271;
 
-function DosDelete(FileName:PChar):cardinal; cdecl;
+function DosDelete(FileName:PAnsiChar):cardinal; cdecl;
     external 'DOSCALLS' index 259;
 
 procedure DosExit(Action, Result: cardinal); cdecl;
     external 'DOSCALLS' index 234;
 
 // EAs not used in System unit
-function DosOpen(FileName:PChar;var Handle: THandle;var Action:cardinal;
+function DosOpen(FileName:PAnsiChar;var Handle: THandle;var Action:cardinal;
                  InitSize,Attrib,OpenFlags,FileMode:cardinal;
                  EA:Pointer): cardinal; cdecl;
     external 'DOSCALLS' index 273;
@@ -155,7 +155,7 @@ function DosQueryHType(Handle: THandle; var HandType: cardinal;
                                           var Attr: cardinal): cardinal; cdecl;
     external 'DOSCALLS' index 224;
 
-function DosQueryModuleName (Handle: THandle; NameLen: cardinal; Name: PChar):
+function DosQueryModuleName (Handle: THandle; NameLen: cardinal; Name: PAnsiChar):
                                                                cardinal; cdecl;
     external 'DOSCALLS' index 320;
 
@@ -166,7 +166,7 @@ function DosGetDateTime(var Buf:TSysDateTime): cardinal; cdecl;
 {
 Already declared in interface part:
 type
-  TDosOpenL = function (FileName: PChar; var Handle: THandle;
+  TDosOpenL = function (FileName: PAnsiChar; var Handle: THandle;
                         var Action: cardinal; InitSize: int64;
                         Attrib, OpenFlags, FileMode: cardinal;
                                                  EA: pointer): cardinal; cdecl;
@@ -177,7 +177,7 @@ type
   TDosSetFileSizeL = function (Handle: THandle; Size: int64): cardinal; cdecl;
 }
 
-function DummyDosOpenL (FileName: PChar; var Handle: THandle;
+function DummyDosOpenL (FileName: PAnsiChar; var Handle: THandle;
                         var Action: cardinal; InitSize: int64;
                         Attrib, OpenFlags, FileMode: cardinal;
                                                  EA: pointer): cardinal; cdecl;
@@ -376,7 +376,7 @@ external 'DOSCALLS' index 212;
 
 type
   TWinMessageBox = function (Parent, Owner: cardinal;
-         BoxText, BoxTitle: PChar; Identity, Style: cardinal): cardinal; cdecl;
+         BoxText, BoxTitle: PAnsiChar; Identity, Style: cardinal): cardinal; cdecl;
   TWinInitialize = function (Options: cardinal): cardinal; cdecl;
   TWinCreateMsgQueue = function (Handle: cardinal; cmsg: longint): cardinal;
                                                                          cdecl;
@@ -442,11 +442,11 @@ type
  end;
 
 function DosMapCase (Size: cardinal; var Country: TCountryCode;
-                     AString: PChar): cardinal; cdecl;
+                     AString: PAnsiChar): cardinal; cdecl;
 external 'NLS' index 7;
 
 function DosQueryDBCSEnv (Size: cardinal; var Country: TCountryCode;
-                                                  Buf: PChar): cardinal; cdecl;
+                                                  Buf: PAnsiChar): cardinal; cdecl;
 external 'NLS' index 6;
 
 function DosQueryCollate (Size: cardinal; var Country: TCountryCode;
@@ -459,14 +459,14 @@ type
  TCountryInfo = record
   Country, CodePage: cardinal;     {Country and codepage requested.}
   DateFormat: cardinal;            {1=ddmmyy 2=yymmdd 3=mmddyy}
-  CurrencyUnit: array [0..4] of char;
-  ThousandSeparator: char;         {Thousands separator.}
+  CurrencyUnit: array [0..4] of AnsiChar;
+  ThousandSeparator: AnsiChar;         {Thousands separator.}
   Zero1: byte;                     {Always zero.}
-  DecimalSeparator: char;          {Decimals separator,}
+  DecimalSeparator: AnsiChar;          {Decimals separator,}
   Zero2: byte;
-  DateSeparator: char;             {Date separator.}
+  DateSeparator: AnsiChar;             {Date separator.}
   Zero3: byte;
-  TimeSeparator: char;             {Time separator.}
+  TimeSeparator: AnsiChar;             {Time separator.}
   Zero4: byte;
   CurrencyFormat,                  {Bit field:
                                     Bit 0: 0=indicator before value
@@ -479,7 +479,7 @@ type
                                     currency indication.}
   TimeFormat: TTimeFmt;            {12/24 hour.}
   Reserve1: array [0..1] of word;
-  DataSeparator: char;             {Data list separator}
+  DataSeparator: AnsiChar;             {Data list separator}
   Zero5: byte;
   Reserve2: array [0..4] of word;
  end;
@@ -493,11 +493,11 @@ external 'NLS' index 5;
 
 type
  PInsertTable = ^TInsertTable;
- TInsertTable = array [1..9] of PChar;
+ TInsertTable = array [1..9] of PAnsiChar;
 
 function DosTrueGetMessage (MsgSeg: pointer; Table: PInsertTable;
-                            TableSize: cardinal; Buf: PChar;
-                            BufSize, MsgNumber: cardinal; FileName: PChar;
+                            TableSize: cardinal; Buf: PAnsiChar;
+                            BufSize, MsgNumber: cardinal; FileName: PAnsiChar;
                             var MsgSize: cardinal): cardinal; cdecl;
 external 'MSG' index 6;
 
@@ -514,8 +514,8 @@ asm
   dd MagicHeaderEnd
 end;
 
-function DosGetMessage (Table: PInsertTable; TableSize: cardinal; Buf: PChar;
-                        BufSize, MsgNumber: cardinal; FileName: PChar;
+function DosGetMessage (Table: PInsertTable; TableSize: cardinal; Buf: PAnsiChar;
+                        BufSize, MsgNumber: cardinal; FileName: PAnsiChar;
                         var MsgSize: cardinal): cardinal; cdecl; assembler;
                                                                   nostackframe;
 asm

rtl/os2/system.pas

@@ -44,8 +44,8 @@ const
   DriveSeparator = ':';
   ExtensionSeparator = '.';
   PathSeparator = ';';
-  AllowDirectorySeparators : set of char = ['\','/'];
-  AllowDriveSeparators : set of char = [':'];
+  AllowDirectorySeparators : set of AnsiChar = ['\','/'];
+  AllowDriveSeparators : set of AnsiChar = [':'];
 { FileNameCaseSensitive and FileNameCasePreserving are defined separately below!!! }
   MaxExitCode = 65535;
   MaxPathLen = 260;
@@ -83,12 +83,12 @@ const
 var
 { C-compatible arguments and environment }
   argc  : longint;
-  argv  : ppchar;
-  envp  : ppchar;
+  argv  : PPAnsiChar;
+  envp  : PPAnsiChar;
   EnvC: cardinal;
 
 (* Pointer to the block of environment variables - used e.g. in unit Dos. *)
-  Environment: PChar;
+  Environment: PAnsiChar;
 
 
 var
@@ -164,7 +164,7 @@ procedure SetDefaultOS2FileType (FType: ShortString);
 procedure SetDefaultOS2Creator (Creator: ShortString);
 
 type
-  TDosOpenL = function (FileName: PChar; var Handle: THandle;
+  TDosOpenL = function (FileName: PAnsiChar; var Handle: THandle;
                         var Action: cardinal; InitSize: int64;
                         Attrib, OpenFlags, FileMode: cardinal;
                                                  EA: pointer): cardinal; cdecl;
@@ -184,10 +184,10 @@ type
                    CodepageName: PWideChar; const N: cardinal): longint; cdecl;
 
   TUniUConvFromUcs = function (UConv_Object: TUConvObject;
-       var UcsBuf: PWideChar; var UniCharsLeft: longint; var OutBuf: PChar;
+       var UcsBuf: PWideChar; var UniCharsLeft: longint; var OutBuf: PAnsiChar;
          var OutBytesLeft: longint; var NonIdentical: longint): longint; cdecl;
 
-  TUniUConvToUcs = function (UConv_Object: TUConvObject; var InBuf: PChar;
+  TUniUConvToUcs = function (UConv_Object: TUConvObject; var InBuf: PAnsiChar;
    var InBytesLeft: longint; var UcsBuf: PWideChar; var UniCharsLeft: longint;
                                     var NonIdentical: longint): longint; cdecl;
 
@@ -243,7 +243,7 @@ var
 
 function GetDynLibsError: longint;
 
-function GetDynLibsErrPath: PChar;
+function GetDynLibsErrPath: PAnsiChar;
 
 
 
@@ -812,7 +812,7 @@ end {['EAX']};
 
 function paramstr(l:longint):string;
 
-var p:^Pchar;
+var p:^PAnsiChar;
 
 begin
   if (l>=0) and (l<=paramcount) then
@@ -845,7 +845,7 @@ const
   EnvSize: cardinal = 0;
 
 var
-  ErrorBuf: array [0..ErrorBufferLength] of char;
+  ErrorBuf: array [0..ErrorBufferLength] of AnsiChar;
   ErrorLen: longint;
   PMWinHandle: cardinal;
 
@@ -854,7 +854,7 @@ function ErrorWrite (var F: TextRec): integer;
   An error message should always end with #13#10#13#10
 }
 var
-  P: PChar;
+  P: PAnsiChar;
   I: longint;
 begin
   if F.BufPos > 0 then
@@ -881,7 +881,7 @@ begin
      I := 4;
    if (I = 4) then
     begin
-      WinMessageBox (0, 0, @ErrorBuf, PChar ('Error'), 0, MBStyle);
+      WinMessageBox (0, 0, @ErrorBuf, PAnsiChar ('Error'), 0, MBStyle);
       ErrorLen := 0;
     end;
   F.BufPos := 0;
@@ -892,7 +892,7 @@ function ErrorClose (var F: TextRec): integer;
 begin
   if ErrorLen > 0 then
    begin
-     WinMessageBox (0, 0, @ErrorBuf, PChar ('Error'), 0, MBStyle);
+     WinMessageBox (0, 0, @ErrorBuf, PAnsiChar ('Error'), 0, MBStyle);
      ErrorLen := 0;
    end;
   ErrorLen := 0;
@@ -978,7 +978,7 @@ begin
 end;
 
 
-function strcopy(dest,source : pchar) : pchar;assembler;
+function strcopy(dest,source : PAnsiChar) : PAnsiChar;assembler;
 var
   saveeax,saveesi,saveedi : longint;
 asm
@@ -1091,7 +1091,7 @@ end;
 
 procedure InitEnvironment;
 var env_count : longint;
-    cp : pchar;
+    cp : PAnsiChar;
 begin
   env_count:=0;
   cp:=environment;
@@ -1101,7 +1101,7 @@ begin
     while (cp^ <> #0) do inc(longint(cp)); { skip to NUL }
     inc(longint(cp)); { skip to next character }
     end;
-  envp := sysgetmem((env_count+1) * sizeof(pchar));
+  envp := sysgetmem((env_count+1) * sizeof(PAnsiChar));
   envc := env_count;
   if (envp = nil) then exit;
   cp:=environment;
@@ -1132,8 +1132,8 @@ var
   arglen,
   count   : PtrInt;
   argstart,
-  pc,arg  : pchar;
-  quote   : char;
+  pc,arg  : PAnsiChar;
+  quote   : AnsiChar;
   argvlen : PtrInt;
   RC: cardinal;
 
@@ -1159,7 +1159,7 @@ begin
 
   ArgV := SysAllocMem (8 * SizeOf (pointer));
 
-  ArgLen := StrLen (PChar (PIB^.Cmd));
+  ArgLen := StrLen (PAnsiChar (PIB^.Cmd));
   Inc (ArgLen);
 
   RC := DosQueryModuleName (PIB^.Handle, MaxPathLen, CmdLine);
@@ -1178,7 +1178,7 @@ begin
   Count := 1;
 
 (* PC points to leading space after program name on command line *)
-  PC := PChar (PIB^.Cmd) + ArgLen;
+  PC := PAnsiChar (PIB^.Cmd) + ArgLen;
 
 (* ArgLen contains size of command line arguments including leading space. *)
   ArgLen := Succ (StrLen (PC));
@@ -1216,7 +1216,7 @@ begin
             begin
               if quote<>'''' then
                begin
-                 if pchar(pc+1)^<>'"' then
+                 if PAnsiChar(pc+1)^<>'"' then
                   begin
                     if quote='"' then
                      quote:=' '
@@ -1233,7 +1233,7 @@ begin
             begin
               if quote<>'"' then
                begin
-                 if pchar(pc+1)^<>'''' then
+                 if PAnsiChar(pc+1)^<>'''' then
                   begin
                     if quote=''''  then
                      quote:=' '
@@ -1276,7 +1276,7 @@ begin
                begin
                  if quote<>'''' then
                   begin
-                    if pchar(pc+1)^<>'"' then
+                    if PAnsiChar(pc+1)^<>'"' then
                      begin
                        if quote='"' then
                         quote:=' '
@@ -1296,7 +1296,7 @@ begin
                begin
                  if quote<>'"' then
                   begin
-                    if pchar(pc+1)^<>'''' then
+                    if PAnsiChar(pc+1)^<>'''' then
                      begin
                        if quote=''''  then
                         quote:=' '
@@ -1362,7 +1362,7 @@ var
   DW: cardinal;
 
 const
-  DosCallsName: array [0..8] of char = 'DOSCALLS'#0;
+  DosCallsName: array [0..8] of AnsiChar = 'DOSCALLS'#0;
 
 {$IFDEF OS2UNICODE}
   {$I sysucode.inc}

rtl/os2/systhrd.inc

@@ -128,7 +128,7 @@ function DosCreateThread (var TID: cardinal; Address: pointer;
      aParam: pointer; Flags: cardinal; StackSize: cardinal): cardinal; cdecl;
                                                  external 'DOSCALLS' index 311;
 
-function DosCreateMutExSem (Name: PChar; var Handle: THandle; Attr: cardinal;
+function DosCreateMutExSem (Name: PAnsiChar; var Handle: THandle; Attr: cardinal;
               State: cardinal): cardinal; cdecl; external 'DOSCALLS' index 331;
 
 function DosCloseMutExSem (Handle: THandle): cardinal; cdecl;
@@ -165,7 +165,7 @@ function DosSetPriority (Scope, TrClass: cardinal; Delta: longint;
                                            PortID: cardinal): cardinal; cdecl;
                                                  external 'DOSCALLS' index 236;
 
-function DosCreateEventSem (Name: PChar; var Handle: THandle;
+function DosCreateEventSem (Name: PAnsiChar; var Handle: THandle;
                              Attr: cardinal; State: cardinal): cardinal; cdecl;
                                                  external 'DOSCALLS' index 324;
 
@@ -773,7 +773,7 @@ begin
    RC := DosCreateEventSem (nil, PLocalEventRec (Result)^.FHandle,
                                                  Attr, cardinal (InitialState))
   else
-   RC := DosCreateEventSem (PChar (Name2), PLocalEventRec (Result)^.FHandle,
+   RC := DosCreateEventSem (PAnsiChar (Name2), PLocalEventRec (Result)^.FHandle,
                                                 Attr, cardinal (InitialState));
   if RC <> 0 then
    begin

rtl/os2/sysucode.inc

@@ -52,7 +52,7 @@ const
   Uls_Unsupported = $20414;
   Uls_BadAttr = $20415;
   Uls_Version = $20416;
-  UConvName: array [0..5] of char = 'UCONV'#0;
+  UConvName: array [0..5] of AnsiChar = 'UCONV'#0;
   OrdUniCreateUconvObject = 1;
   OrdUniUconvToUcs = 2;
   OrdUniUconvFromUcs = 3;
@@ -65,7 +65,7 @@ const
   OrdUniStrToUcs = 12;
   Ord_UniMalloc = 13;
   Ord_UniFree = 14;
-  LibUniName: array [0..6] of char = 'LIBUNI'#0;
+  LibUniName: array [0..6] of AnsiChar = 'LIBUNI'#0;
   OrdUniQueryXdigit = 1;
   OrdUniQuerySpace = 2;
   OrdUniQueryPrint = 3;
@@ -174,8 +174,8 @@ type
 
 
 var
-  DBCSLeadRanges: array [0..11] of char;
-  CollationSequence: array [char] of char;
+  DBCSLeadRanges: array [0..11] of AnsiChar;
+  CollationSequence: array [AnsiChar] of AnsiChar;
 
 
 const
@@ -191,7 +191,7 @@ const
   (* The following two arrays are initialized on startup in case that *)
   (* Dummy* routines must be used. First for current codepage...      *)
   DBCSLeadRangesEnd: byte = 0;
-  LowerChars: array [char] of char =
+  LowerChars: array [AnsiChar] of AnsiChar =
    (#0, #1, #2, #3, #4, #5, #6, #7, #8, #9, #10, #11, #12, #13, #14, #15, #16,
     #17, #18, #19, #20, #21, #22, #23, #24, #25, #26, #27, #28, #29, #30, #31,
     #32, #33, #34, #35, #36, #37, #38, #39, #40, #41, #42, #43, #44, #45, #46,
@@ -213,7 +213,7 @@ const
     #238, #239, #240, #241, #242, #243, #244, #245, #246, #247, #248, #249,
     #250, #251, #252, #253, #254, #255);
   (* ...and now for ISO 8859-1 aka IBM codepage 819 *)
-  LowerCharsISO88591: array [char] of char =
+  LowerCharsISO88591: array [AnsiChar] of AnsiChar =
    (#0, #1, #2, #3, #4, #5, #6, #7, #8, #9, #10, #11, #12, #13, #14, #15, #16,
     #17, #18, #19, #20, #21, #22, #23, #24, #25, #26, #27, #28, #29, #30, #31,
     #32, #33, #34, #35, #36, #37, #38, #39, #40, #41, #42, #43, #44, #45, #46,
@@ -269,7 +269,7 @@ var
   C: cardinal;
   L: PtrInt;
   I: longint;
-  A: array [0..7] of char;
+  A: array [0..7] of AnsiChar;
   CPN2: UnicodeString;
   RC, RetSize: cardinal;
 begin
@@ -292,9 +292,9 @@ begin
     PCPN := CpName;
     for I := 0 to 7 do
      if I mod 2 = 0 then
-      A [I] := UpCase (PChar (@PCPN [0]) [I])
+      A [I] := UpCase (PAnsiChar (@PCPN [0]) [I])
      else
-      A [I] := PChar (@PCPN [0]) [I];
+      A [I] := PAnsiChar (@PCPN [0]) [I];
     if PQWord (@A)^ <> PQWord (@IBMPrefix)^ then
      begin
       DummyUniCreateUConvObject := Uls_Invalid;
@@ -304,7 +304,7 @@ begin
     PW := PCPN + 4;
     while ((PW + L)^ <> #0) and (L <= SizeOf (S)) do
      begin
-      S [Succ (L)] := char (Ord ((PW + L)^));
+      S [Succ (L)] := AnsiChar (Ord ((PW + L)^));
       Inc (L);
      end;
     if L > SizeOf (S) then
@@ -375,7 +375,7 @@ end;
 
 
 function DummyUniUConvFromUcs (UConv_Object: TUConvObject;
-       var UcsBuf: PWideChar; var UniCharsLeft: longint; var OutBuf: PChar;
+       var UcsBuf: PWideChar; var UniCharsLeft: longint; var OutBuf: PAnsiChar;
          var OutBytesLeft: longint; var NonIdentical: longint): longint; cdecl;
 var
   Dest, Dest2: RawByteString;
@@ -418,7 +418,7 @@ begin
 end;
 
 
-function DummyUniUConvToUcs (UConv_Object: TUConvObject; var InBuf: PChar;
+function DummyUniUConvToUcs (UConv_Object: TUConvObject; var InBuf: PAnsiChar;
    var InBytesLeft: longint; var UcsBuf: PWideChar; var UniCharsLeft: longint;
                                     var NonIdentical: longint): longint; cdecl;
 var
@@ -492,8 +492,8 @@ end;
 
 procedure InitDummyAnsiSupport;
 var
-  C: char;
-  AllChars: array [char] of char;
+  C: AnsiChar;
+  AllChars: array [AnsiChar] of AnsiChar;
   RetSize: cardinal;
 begin
   if DosQueryCollate (SizeOf (CollationSequence), EmptyCC, @CollationSequence,
@@ -507,7 +507,7 @@ begin
     DosMapCase (SizeOf (AllChars), EmptyCC, @AllChars [#0]);
     NoIso88591Support := true;
    end;
-  for C := Low (char) to High (char) do
+  for C := Low (AnsiChar) to High (AnsiChar) do
    if AllChars [C] <> C then
     LowerCharsIso88591 [AllChars [C]] := C;
   if NoIso88591Support then
@@ -516,7 +516,7 @@ begin
    begin
     Move (LowerChars, AllChars, SizeOf (AllChars));
     DosMapCase (SizeOf (AllChars), EmptyCC, @AllChars [#0]);
-    for C := Low (char) to High (char) do
+    for C := Low (AnsiChar) to High (AnsiChar) do
      if AllChars [C] <> C then
       LowerChars [AllChars [C]] := C;
    end;
@@ -526,17 +526,17 @@ end;
 
 procedure ReInitDummyAnsiSupport;
 var
-  C: char;
-  AllChars: array [char] of char;
+  C: AnsiChar;
+  AllChars: array [AnsiChar] of AnsiChar;
   RetSize: cardinal;
 begin
-  for C := Low (char) to High (char) do
+  for C := Low (AnsiChar) to High (AnsiChar) do
    AllChars [C] := C;
   if DosQueryCollate (SizeOf (CollationSequence), EmptyCC, @CollationSequence,
                                                              RetSize) <> 0 then
    Move (AllChars, CollationSequence, SizeOf (CollationSequence));
   DosMapCase (SizeOf (AllChars), EmptyCC, @AllChars [#0]);
-  for C := Low (char) to High (char) do
+  for C := Low (AnsiChar) to High (AnsiChar) do
    if AllChars [C] <> C then
     LowerChars [AllChars [C]] := C;
   InitDBCSLeadRanges;
@@ -545,7 +545,7 @@ end;
 
 function DummyUniToLower (UniCharIn: WideChar): WideChar; cdecl;
 var
-  C: char;
+  C: AnsiChar;
 begin
   C := UniCharIn;
   DummyUniToLower := LowerCharsIso88591 [C];
@@ -554,7 +554,7 @@ end;
 
 function DummyUniToUpper (UniCharIn: WideChar): WideChar; cdecl;
 var
-  C: char;
+  C: AnsiChar;
 begin
   DummyUniToUpper := UniCharIn;
   C := UniCharIn;
@@ -1043,7 +1043,7 @@ var
   OS2CP: cardinal;
   Src2: PUnicodeChar;
   Len2, LenOut, OutOffset, NonIdentical: longint;
-  Dest2: PChar;
+  Dest2: PAnsiChar;
 begin
   OS2CP := RtlCpToOS2CP (CP, CpxAll, UConvObj);
 {  if UniAPI and (UConvObj = nil) then  - OS2Unicode2AnsiMove should be never called if not UniAPI }
@@ -1059,7 +1059,7 @@ begin
   SetCodePage (Dest, CP, false);
   Src2 := Source;
   Len2 := Len;
-  Dest2 := PChar (Dest);
+  Dest2 := PAnsiChar (Dest);
   RCI := Sys_UniUConvFromUcs (UConvObj, Src2, Len2, Dest2, LenOut,
                                                                  NonIdentical);
   repeat
@@ -1082,12 +1082,12 @@ begin
      end;
     Uls_BufferFull:
      begin
-      OutOffset := Dest2 - PChar (Dest);
+      OutOffset := Dest2 - PAnsiChar (Dest);
 (* Use Len2 or Len decreased by difference between Source and Src2? *)
 (* Extend more this time - target is probably a DBCS or UTF-8 *)
       SetLength (Dest, Length (Dest) + Succ (Len2 * 2));
       { string could have been moved }
-      Dest2 := PChar (Dest) + OutOffset;
+      Dest2 := PAnsiChar (Dest) + OutOffset;
       Inc (LenOut, Succ (Len2 * 2));
      end
     else
@@ -1104,13 +1104,13 @@ begin
 end;
 
 
-procedure OS2Ansi2UnicodeMove (Source: PChar; CP: TSystemCodePage;
+procedure OS2Ansi2UnicodeMove (Source: PAnsiChar; CP: TSystemCodePage;
                                         var Dest: UnicodeString; Len: SizeInt);
 var
   RCI: longint;
   UConvObj: TUConvObject;
   OS2CP: cardinal;
-  Src2: PChar;
+  Src2: PAnsiChar;
   Len2, LenOut, OutOffset, NonIdentical: longint;
   Dest2: PWideChar;
 begin
@@ -1301,7 +1301,7 @@ begin
   Result := S;
   UniqueString (Result);
   FillChar (EmptyCC, SizeOf (EmptyCC), 0);
-  RC := DosMapCase (Length (Result), EmptyCC, PChar (Result));
+  RC := DosMapCase (Length (Result), EmptyCC, PAnsiChar (Result));
 { What to do in case of a failure??? }
   if RC <> 0 then
    Result := UpCase (S); { Use a fallback? }
@@ -1312,7 +1312,7 @@ function OS2LowerAnsiString (const S: AnsiString): AnsiString;
 var
   I: PtrUInt;
 
-  function IsDBCSLeadChar (C: char): boolean;
+  function IsDBCSLeadChar (C: AnsiChar): boolean;
   var
     D: byte;
   begin
@@ -1434,7 +1434,7 @@ begin
 end;
 
 
-function OS2StrCompAnsiString (S1, S2: PChar): PtrInt;
+function OS2StrCompAnsiString (S1, S2: PAnsiChar): PtrInt;
 var
   HSA1, HSA2: AnsiString;
   HSU1, HSU2: UnicodeString;
@@ -1488,13 +1488,13 @@ begin
 end;
 
 
-function OS2StrICompAnsiString (S1, S2: PChar): PtrInt;
+function OS2StrICompAnsiString (S1, S2: PAnsiChar): PtrInt;
 begin
   Result := OS2CompareTextAnsiString (AnsiString (S1), AnsiString (S2));
 end;
 
 
-function OS2StrLCompAnsiString (S1, S2: PChar; MaxLen: PtrUInt): PtrInt;
+function OS2StrLCompAnsiString (S1, S2: PAnsiChar; MaxLen: PtrUInt): PtrInt;
 var
   A, B: AnsiString;
 begin
@@ -1508,7 +1508,7 @@ begin
 end;
 
 
-function OS2StrLICompAnsiString (S1, S2: PChar; MaxLen: PtrUInt): PtrInt;
+function OS2StrLICompAnsiString (S1, S2: PAnsiChar; MaxLen: PtrUInt): PtrInt;
 var
   A, B: AnsiString;
 begin
@@ -1525,7 +1525,7 @@ end;
 procedure FPC_RangeError; [external name 'FPC_RANGEERROR'];
 
 
-procedure Ansi2PChar (const S: AnsiString; const OrgP: PChar; out P: Pchar);
+procedure Ansi2PChar (const S: AnsiString; const OrgP: PAnsiChar; out P: PAnsiChar);
 var
   NewLen: SizeUInt;
 begin
@@ -1539,7 +1539,7 @@ begin
 end;
 
 
-function OS2StrUpperAnsiString (Str: PChar): PChar;
+function OS2StrUpperAnsiString (Str: PAnsiChar): PAnsiChar;
 var
   Temp: AnsiString;
 begin
@@ -1548,7 +1548,7 @@ begin
 end;
 
 
-function OS2StrLowerAnsiString (Str: PChar): PChar;
+function OS2StrLowerAnsiString (Str: PAnsiChar): PAnsiChar;
 var
   Temp: AnsiString;
 begin
@@ -1563,10 +1563,10 @@ CWSTRING:
   code point is encountered, all characters part of this invalid code point
   are considered to form one "character" and the next character is
   considered to be the start of a new (possibly also invalid) code point }
-function CharLengthPChar(const Str: PChar): PtrInt;
+function CharLengthPChar(const Str: PAnsiChar): PtrInt;
   var
     nextlen: ptrint;
-    s: pchar;
+    s: PAnsiChar;
 {$ifndef beos}
     mbstate: mbstate_t;
 {$endif not beos}
@@ -1591,7 +1591,7 @@ function CharLengthPChar(const Str: PChar): PtrInt;
   end;
 
 
-function CodePointLength(const Str: PChar; maxlookahead: ptrint): PtrInt;
+function CodePointLength(const Str: PAnsiChar; maxlookahead: ptrint): PtrInt;
   var
     nextlen: ptrint;
 {$ifndef beos}
@@ -1614,7 +1614,7 @@ function CodePointLength(const Str: PChar; maxlookahead: ptrint): PtrInt;
 procedure InitOS2WideStringManager; inline;
 var
   RC: cardinal;
-  ErrName: array [0..MaxPathLen] of char;
+  ErrName: array [0..MaxPathLen] of AnsiChar;
   P: pointer;
 begin
   RC := DosLoadModule (@ErrName [0], SizeOf (ErrName), @UConvName [0],

rtl/os2/sysutils.pp

@@ -88,7 +88,7 @@ begin
 (* DenyReadWrite if sharing not specified. *)
   if (Mode and 112 = 0) or (Mode and 112 > 64) then
    Mode := Mode or doDenyRW;
-  Rc:=Sys_DosOpenL(PChar (SystemFileName), Handle, Action, 0, 0, 1, Mode, nil);
+  Rc:=Sys_DosOpenL(PAnsiChar (SystemFileName), Handle, Action, 0, 0, 1, Mode, nil);
   If Rc=0 then
     FileOpen:=Handle
   else
@@ -122,7 +122,7 @@ begin
   (* Sharing to DenyAll as default in case of values not allowed by OS/2. *)
   if (ShareMode = 0) or (ShareMode > 64) then
    ShareMode := doDenyRW;
-  RC := Sys_DosOpenL (PChar (SystemFileName), Handle, Action, 0, 0, $12,
+  RC := Sys_DosOpenL (PAnsiChar (SystemFileName), Handle, Action, 0, 0, $12,
                                     faCreate or ofReadWrite or ShareMode, nil);
   if RC = 0 then
    FileCreate := Handle
@@ -268,10 +268,10 @@ begin
   Rslt.FindHandle := THandle ($FFFFFFFF);
   Count := 1;
   if FSApi64 then
-   Err := DosFindFirst (PChar (SystemEncodedPath), Rslt.FindHandle,
+   Err := DosFindFirst (PAnsiChar (SystemEncodedPath), Rslt.FindHandle,
             Attr and FindResvdMask, FStat, SizeOf (FStat^), Count, ilStandardL)
   else
-   Err := DosFindFirst (PChar (SystemEncodedPath), Rslt.FindHandle,
+   Err := DosFindFirst (PAnsiChar (SystemEncodedPath), Rslt.FindHandle,
             Attr and FindResvdMask, FStat, SizeOf (FStat^), Count, ilStandard);
   if Err <> 0 then
    OSErrorWatch (Err)
@@ -410,7 +410,7 @@ var
 begin
   SystemFileName:=ToSingleByteFileSystemEncodedFileName(Filename);
   New(FS);
-  RC := DosQueryPathInfo(PChar (SystemFileName), ilStandard, FS, SizeOf(FS^));
+  RC := DosQueryPathInfo(PAnsiChar (SystemFileName), ilStandard, FS, SizeOf(FS^));
   if RC = 0 then
    Result := FS^.AttrFile
   else
@@ -429,11 +429,11 @@ Var
 Begin
   SystemFileName:=ToSingleByteFileSystemEncodedFileName(Filename);
   New(FS);
-  RC := DosQueryPathInfo (PChar (SystemFileName), ilStandard, FS, SizeOf (FS^));
+  RC := DosQueryPathInfo (PAnsiChar (SystemFileName), ilStandard, FS, SizeOf (FS^));
   if RC = 0 then
    begin
     FS^.AttrFile:=Attr;
-    RC := DosSetPathInfo(PChar (SystemFileName), ilStandard, FS, SizeOf(FS^), 0);
+    RC := DosSetPathInfo(PAnsiChar (SystemFileName), ilStandard, FS, SizeOf(FS^), 0);
     if RC <> 0 then
      OSErrorWatch (RC);
    end
@@ -450,7 +450,7 @@ var
   RC: cardinal;
 Begin
   SystemFileName:=ToSingleByteFileSystemEncodedFileName(Filename);
-  RC := DosDelete (PChar (SystemFileName));
+  RC := DosDelete (PAnsiChar (SystemFileName));
   if RC <> 0 then
    begin
     Result := false;
@@ -467,7 +467,7 @@ var
 Begin
   OldSystemFileName:=ToSingleByteFileSystemEncodedFileName(OldName);
   NewSystemFileName:=ToSingleByteFileSystemEncodedFileName(NewName);
-  RC := DosMove (PChar (OldSystemFileName), PChar (NewSystemFileName));
+  RC := DosMove (PAnsiChar (OldSystemFileName), PAnsiChar (NewSystemFileName));
   if RC <> 0 then
    begin
     Result := false;
@@ -708,7 +708,7 @@ begin
     DecimalSeparator := CtryInfo.DecimalSeparator;
     ThousandSeparator := CtryInfo.ThousandSeparator;
     CurrencyFormat := CtryInfo.CurrencyFormat;
-    CurrencyString := PChar (CtryInfo.CurrencyUnit);
+    CurrencyString := PAnsiChar (CtryInfo.CurrencyUnit);
    end
   else
    OSErrorWatch (RC);
@@ -718,9 +718,9 @@ end;
 
 function SysErrorMessage(ErrorCode: Integer): String;
 const
-  SysMsgFile: array [0..10] of char = 'OSO001.MSG'#0;
+  SysMsgFile: array [0..10] of AnsiChar = 'OSO001.MSG'#0;
 var
-  OutBuf: array [0..999] of char;
+  OutBuf: array [0..999] of AnsiChar;
   RetMsgSize: cardinal;
   RC: cardinal;
 begin
@@ -743,10 +743,10 @@ end;
                               OS Utils
 ****************************************************************************}
 
-function GetEnvPChar (EnvVar: shortstring): PChar;
+function GetEnvPChar (EnvVar: shortstring): PAnsiChar;
 (* The assembler version is more than three times as fast as Pascal. *)
 var
- P: PChar;
+ P: PAnsiChar;
 begin
  EnvVar := UpCase (EnvVar);
 {$ASMMODE INTEL}
@@ -845,7 +845,7 @@ var
  E: EOSError;
  CommandLine: RawByteString;
  Args0, Args: DosCalls.PByteArray;
- ObjNameBuf: PChar;
+ ObjNameBuf: PAnsiChar;
  ArgSize: word;
  Res: TResultCodes;
  ObjName: shortstring;
@@ -878,9 +878,9 @@ begin
   CommandLine := ExpandFileName (Path)
  else
   CommandLine := Path;
- SD.PgmName := PChar (CommandLine);
+ SD.PgmName := PAnsiChar (CommandLine);
  if ComLine <> '' then
-  SD.PgmInputs := PChar (ComLine);
+  SD.PgmInputs := PAnsiChar (ComLine);
  if ExecInheritsHandles in Flags then
    SD.InheritOpt := ssf_InhertOpt_Parent;
  Str (GetProcessID, SPID);
@@ -935,7 +935,7 @@ begin
  GetMem (ObjNameBuf, ObjBufSize);
  FillChar (ObjNameBuf^, ObjBufSize, 0);
 
- RC := DosQueryAppType (PChar (Path), ExecAppType);
+ RC := DosQueryAppType (PAnsiChar (Path), ExecAppType);
  if RC <> 0 then
   begin
    OSErrorWatch (RC);
@@ -985,7 +985,7 @@ begin
       end;
      Res.ExitCode := $FFFFFFFF;
      RC := DosExecPgm (ObjNameBuf, ObjBufSize, 0, Args, nil, Res,
-                                                                 PChar (Path));
+                                                                 PAnsiChar (Path));
      if RC <> 0 then
       OSErrorWatch (RC);
      if Args0 <> nil then

rtl/os2/viocalls.pas

@@ -403,13 +403,13 @@ type
         Ext_Data_Addr:pointer);     {Address of an extended-mode data}
         true:(
         fbType2,                (* should be fbType, Color, etc., but this *)
-        Color2:char;            (* construct is unsupported currently      *)
+        Color2:AnsiChar;            (* construct is unsupported currently      *)
         Col2,
         Row2,
         HRes2,
         VRes2:word;
         fmt_ID2,
-        Attrib2:char);
+        Attrib2:AnsiChar);
     end;
     PVioModeInfo=^TVioModeInfo;
     VioModeInfo=TVioModeInfo;
@@ -527,7 +527,7 @@ type
     PVioSetTarget=^TVioSetTarget;
     VioSetTarget=TVioSetTarget;
 
-    TStr8=array[0..7] of char;
+    TStr8=array[0..7] of AnsiChar;
     PStr8=^TStr8;
 
 {font record type for Vio/GpiCreateLogFont}
@@ -535,7 +535,7 @@ type
         usRecordLength:word;
         fsSelection:word;
         lMatch:longint;
-        szFacename:array[0..FACESIZE-1] of char;
+        szFacename:array[0..FACESIZE-1] of AnsiChar;
         idRegistry:word;
         usCodePage:word;
         lMaxBaselineExt:longint;
@@ -564,8 +564,8 @@ type
     PPanose=^TPanose;
 
     TFontMetrics=record
-        szFamilyname:array[0..FACESIZE-1] of char;
-        szFacename:array[0..FACESIZE-1] of char;
+        szFamilyname:array[0..FACESIZE-1] of AnsiChar;
+        szFacename:array[0..FACESIZE-1] of AnsiChar;
         idRegistry:word;
         usCodePage:word;
         lEmHeight:longint;
@@ -621,12 +621,12 @@ type
     FontMetrics=TFontMetrics;
 
 
-function VioRegister(ModuleName,ProcName:PChar;FnMask1,FnMask2:cardinal):word;
+function VioRegister(ModuleName,ProcName:PAnsiChar;FnMask1,FnMask2:cardinal):word;
                                                                          cdecl;
 
 function VioRegister(ModuleName,ProcName:string;FnMask1,FnMask2:cardinal):word;
 
-function VioGlobalReg(ModuleName,ProcName:PChar;FnMask1,FnMask2:cardinal;
+function VioGlobalReg(ModuleName,ProcName:PAnsiChar;FnMask1,FnMask2:cardinal;
                                                       Return:word):word; cdecl;
 
 function VioGlobalReg(ModuleName,ProcName:string;FnMask1,FnMask2:cardinal;
@@ -692,7 +692,7 @@ function VioWrtNCell(var Cell:word;Times,Row,Column,VioHandle:word):word;
 
 function VioWrtNChar(var Ch:byte;Times,Row,Column,VioHandle:word):word; cdecl;
 
-function VioWrtNChar(var Ch:char;Times,Row,Column,VioHandle:word):word; cdecl;
+function VioWrtNChar(var Ch:AnsiChar;Times,Row,Column,VioHandle:word):word; cdecl;
 
 function VioWrtTTY(CharStr:pointer;Len,VioHandle:word):word; cdecl;
 
@@ -766,7 +766,7 @@ function VioGetDeviceCellSize(var Height,Width:integer;VPS:word):word; cdecl;
 function VioGetOrg(var Row,Column:integer;VPS:word):word; cdecl;
 
 function VioQueryFonts(var Remfonts:longint;var fmMetrics:TFontMetrics;
-                MetricsLength:longint;var Fonts:longint;FaceName:PChar;
+                MetricsLength:longint;var Fonts:longint;FaceName:PAnsiChar;
                                       flOptions:cardinal;VPS:word):word; cdecl;
 
 function VioQueryFonts(var Remfonts:longint;var fmMetrics:TFontMetrics;
@@ -816,7 +816,7 @@ implementation
 {***************************************************************************}
 
 
-function VioRegister(ModuleName,ProcName:PChar;FnMask1,FnMask2:cardinal):word;
+function VioRegister(ModuleName,ProcName:PAnsiChar;FnMask1,FnMask2:cardinal):word;
                                                                          cdecl;
 external 'EMXWRAP' index 145;
 {external 'VIOCALLS' index 45;}
@@ -830,7 +830,7 @@ begin
     VioRegister:=VioRegister(@ModuleName[1],@ProcName[1],FnMask1,FnMask2);
 end;
 
-function VioGlobalReg(ModuleName,ProcName:PChar;FnMask1,FnMask2:cardinal;
+function VioGlobalReg(ModuleName,ProcName:PAnsiChar;FnMask1,FnMask2:cardinal;
                                                       Return:word):word; cdecl;
 external 'EMXWRAP' index 170;
 {external 'VIOCALLS' index 70;}
@@ -952,7 +952,7 @@ function VioWrtNChar(var Ch:byte;Times,Row,Column,VioHandle:word):word; cdecl;
 external 'EMXWRAP' index 153;
 {external 'VIOCALLS' index 53;}
 
-function VioWrtNChar(var Ch:char;Times,Row,Column,VioHandle:word):word; cdecl;
+function VioWrtNChar(var Ch:AnsiChar;Times,Row,Column,VioHandle:word):word; cdecl;
 external 'EMXWRAP' index 153;
 {external 'VIOCALLS' index 53;}
 
@@ -1092,7 +1092,7 @@ external 'EMXWRAP' index 159;
 {external 'VIOCALLS' index 59;}
 
 function VioQueryFonts(var Remfonts:longint;var fmMetrics:TFontMetrics;
-                MetricsLength:longint;var Fonts:longint;FaceName:PChar;
+                MetricsLength:longint;var Fonts:longint;FaceName:PAnsiChar;
                                       flOptions:cardinal;VPS:word):word; cdecl;
 external 'EMXWRAP' index 164;
 {external 'VIOCALLS' index 64;}