* PChar -> PAnsiChar

packages/os2units/examples/clktest.pas

@@ -1,11 +1,11 @@
 uses doscalls, clkdll;
 
 Var
-  ID: Array[0..255] of Char;
+  ID: Array[0..255] of AnsiChar;
   NextDate: TDateTime;
 begin
   WriteLn('RC=',ClkQuerySTData(@ID, NextDate));
-  WriteLn(PChar(@ID));
+  WriteLn(PAnsiChar(@ID));
   With NextDate do
     WriteLn(Hours,':',Minutes,':',Seconds);
 end.

packages/os2units/examples/ftptest.pas

@@ -15,10 +15,10 @@ const
  TstText = 'This is a sample test file for FTPTest'#13#10'check it for yourself.';
 
 var
- Hst, Usr, Pwd: string;
+ Hst, Usr, Pwd: shortstring;
  T: text;
  L: longint;
- S: string;
+ S: shortstring;
 
 begin
  if ParamCount < 1 then

packages/os2units/src/clkdll.pas

@@ -69,7 +69,7 @@ Return values:   0 ... ok
                 40 ... Date only
                128 ... failed
 }
-Function ClkQuerySTData(ID: PChar; var NextDate: TDateTime): Cardinal; cdecl;
+Function ClkQuerySTData(ID: PAnsiChar; var NextDate: TDateTime): Cardinal; cdecl;
     external 'clkdll' name 'ClkQuerySTData'; {index 00004}
 
 {
@@ -80,7 +80,7 @@ Return values:   0 ... ok
                 40 ... Date only
                128 ... failed
 }
-Function ClkQueryDSTData(ID: PChar; var NextDate: TDateTime): Cardinal; cdecl;
+Function ClkQueryDSTData(ID: PAnsiChar; var NextDate: TDateTime): Cardinal; cdecl;
     external 'clkdll' name 'ClkQueryDSTData'; {index 00005}
 
 {
@@ -89,7 +89,7 @@ from the actual TZ environment setting.
 Return values:   0 ... ok
                128 ... failed
 }
-Function ClkQueryTimeZone(value: PChar): Cardinal; cdecl;
+Function ClkQueryTimeZone(value: PAnsiChar): Cardinal; cdecl;
     external 'clkdll' name 'ClkQueryTimeZone'; {index 00006}
 
 {
@@ -152,7 +152,7 @@ Return values:   0 ... ok
 }
 Function ClkGetSynchData(var Last, LastSuccess: TDateTime;
                          var LastWasSuccessful: Integer;
-                         LastSuccessfulHost: PChar): Cardinal; cdecl;
+                         LastSuccessfulHost: PAnsiChar): Cardinal; cdecl;
     external 'clkdll' name 'ClkGetSynchData'; {index 00016}
 
 { not documented

packages/os2units/src/hwvideo.pas

@@ -72,7 +72,7 @@ Const
 Type
   THWATTRIBUTE=record
     ulLength: Cardinal;                //size of structure in bytes
-    szAttrDesc: Array[0..64] of Char;  //string, describing attribute
+    szAttrDesc: Array[0..64] of AnsiChar;  //string, describing attribute
     ulAttrType: Cardinal;              //type of attribute, check ATTRTYPE_* const
     ulValueSize: Cardinal;             //size in bytes of each value member
     ulValueCount: Cardinal;            //count of value members

packages/os2units/src/lvm.pas

@@ -125,7 +125,7 @@ Type
   ADDRESS=Pointer;
 
 Type
-  pSTRING=PChar;
+  pSTRING=PAnsiChar;
 
 // 4 bytes
 Type
@@ -224,7 +224,7 @@ type
   _LVM_Interface_Support=record
     Interface_Supported: BOOLEAN;
   case longint of
-      0 : ( Java_Interface_Class : ^char );
+      0 : ( Java_Interface_Class : ^AnsiChar );
       1 : ( VIO_PM_Calls : LVM_OS2_Native_Support );
   end;
   LVM_Interface_Support=_LVM_Interface_Support;
@@ -247,9 +247,9 @@ const
 // The following definitions are used to control and access the various "features" available through the LVM Engine, such as Drive Linking and BBR.
 type
   _Feature_ID_Data=record
-    Name: Array[0..MAX_FEATURE_NAME_LENGTH-1] of char;             // Feature Name, for use in menus and command line parsing.
-    Short_Name: Array[0..MAX_FEATURE_SHORT_NAME_LENGTH-1] of char; // The name/code used to represent this feature during command line parsing.
-    OEM_Info: Array[0..MAX_OEM_INFO_LENGTH-1] of char;             // Name and copyright info. of the manufacturer, i.e. IBM, Vinca, etc.
+    Name: Array[0..MAX_FEATURE_NAME_LENGTH-1] of AnsiChar;             // Feature Name, for use in menus and command line parsing.
+    Short_Name: Array[0..MAX_FEATURE_SHORT_NAME_LENGTH-1] of AnsiChar; // The name/code used to represent this feature during command line parsing.
+    OEM_Info: Array[0..MAX_OEM_INFO_LENGTH-1] of AnsiChar;             // Name and copyright info. of the manufacturer, i.e. IBM, Vinca, etc.
     ID: CARDINAL32;                                        // Numeric Feature ID.
     Major_Version_Number: CARDINAL32;                      // The version number of this feature.
     Minor_Version_Number: CARDINAL32;                      // The version number of this feature.
@@ -298,7 +298,7 @@ Type
     Unusable: BOOLEAN;                          // If TRUE, the drive's MBR is not accessible and the drive can not be partitioned.
     IO_Error: BOOLEAN;                          // If TRUE, then the last I/O operation on this drive failed!
     Is_Big_Floppy: BOOLEAN;                     // If TRUE, then the drive is a PRM formatted as a big floppy (i.e. the old style removable media support).
-    Drive_Name: Array[0..DISK_NAME_SIZE-1] of Char; // User assigned name for this disk drive.
+    Drive_Name: Array[0..DISK_NAME_SIZE-1] of AnsiChar; // User assigned name for this disk drive.
   end;
 
   Partition_Information_Record=record
@@ -347,11 +347,11 @@ Type
                                                     //2 = Available - i.e. not currently assigned to a volume.
     On_Boot_Manager_Menu: BOOLEAN;                  // Set to TRUE if this partition is not part of a Volume yet is on the Boot Manager Menu.
     Reserved: BYTE;                                 // Alignment.
-    Volume_Drive_Letter: char;                      // The drive letter assigned to the volume that this partition is a part of.
-    Drive_Name: Array[0..DISK_NAME_SIZE-1] of char;   // User assigned name for this disk drive.
-    File_System_Name: Array[0..FILESYSTEM_NAME_SIZE-1] of char;// The name of the filesystem in use on this partition, if it is known.
-    Partition_Name: Array[0..PARTITION_NAME_SIZE-1] of char;   // The user assigned name for this partition.
-    Volume_Name: Array[0..VOLUME_NAME_SIZE-1] of char;         // If this partition is part of a volume, then this will be the
+    Volume_Drive_Letter: AnsiChar;                      // The drive letter assigned to the volume that this partition is a part of.
+    Drive_Name: Array[0..DISK_NAME_SIZE-1] of AnsiChar;   // User assigned name for this disk drive.
+    File_System_Name: Array[0..FILESYSTEM_NAME_SIZE-1] of AnsiChar;// The name of the filesystem in use on this partition, if it is known.
+    Partition_Name: Array[0..PARTITION_NAME_SIZE-1] of AnsiChar;   // The user assigned name for this partition.
+    Volume_Name: Array[0..VOLUME_NAME_SIZE-1] of AnsiChar;         // If this partition is part of a volume, then this will be the
                                                              //name of the volume that this partition is a part of.  If this
                                                              //record represents free space, then the Volume_Name will be
                                                              //"FREE SPACE xx", where xx is a unique numeric ID generated by
@@ -424,11 +424,11 @@ type
     Bootable: BOOLEAN;                              // Set to TRUE if this volume appears on the Boot Manager menu, or if it is
 //a compatibility volume and its corresponding partition is the first active
 //primary partition on the first drive.
-    Drive_Letter_Preference: char;               // The drive letter that this volume desires to be.
-    Current_Drive_Letter: char;                  // The drive letter currently used to access this volume.  May be different than
+    Drive_Letter_Preference: AnsiChar;               // The drive letter that this volume desires to be.
+    Current_Drive_Letter: AnsiChar;                  // The drive letter currently used to access this volume.  May be different than
 //Drive_Letter_Preference if there was a conflict ( i.e. Drive_Letter_Preference
 //is already in use by another volume ).
-    Initial_Drive_Letter: char;                  // The drive letter assigned to this volume by the operating system when LVM was started.
+    Initial_Drive_Letter: AnsiChar;                  // The drive letter assigned to this volume by the operating system when LVM was started.
 //This may be different from the Drive_Letter_Preference if there were conflicts, and
 //may be different from the Current_Drive_Letter.  This will be 0x0 if the Volume did
 //not exist when the LVM Engine was opened (i.e. it was created during this LVM session).
@@ -439,8 +439,8 @@ type
 //2 = Startable
 //3 = Installable.
     Reserved_1: BYTE;
-    Volume_Name: Array[0..VOLUME_NAME_SIZE-1] of char;         // The user assigned name for this volume.
-    File_System_Name: Array[0..FILESYSTEM_NAME_SIZE-1] of char;// The name of the filesystem in use on this partition, if it is known.
+    Volume_Name: Array[0..VOLUME_NAME_SIZE-1] of AnsiChar;         // The user assigned name for this volume.
+    File_System_Name: Array[0..FILESYSTEM_NAME_SIZE-1] of AnsiChar;// The name of the filesystem in use on this partition, if it is known.
   end;
 
 // The following structure is used to return the feature information for the installed features, or the features on a volume.
@@ -664,7 +664,7 @@ LVM_StartLog
 
 type
   _LVM_Token=record
-    TokenText: PChar;  // The actual text of the token.
+    TokenText: PAnsiChar;  // The actual text of the token.
     TokenType: Token_Characterizations;  // What the token is thought to be.
     Position: CARDINAL32;   // The position of the first character of the token on the command line.
   end;
@@ -859,7 +859,7 @@ function Commit_Changes(Error_Code: PCARDINAL32): BOOLEAN; external 'lvm' name '
 {$ifdef lvm2}
 type
   TJavaExecProc=procedure(
-    Class_Name: PChar;
+    Class_Name: PAnsiChar;
     InputBuffer: ADDRESS;
     InputBufferSize: CARDINAL32;
     OutputBuffer: PADDRESS;
@@ -1014,7 +1014,7 @@ CARDINAL32 * Error_Code );
 //*                          this record will be filled in by the     */
 //*                          feature if it successfully parses the    */
 //*                          tokens.                                  */
-//*          char ** Error_Message - The address of a pointer to char.*/
+//*          AnsiChar ** Error_Message - The address of a pointer to AnsiChar.*/
 //*                          This will be set to NULL if the feature  */
 //*                          successfully parses the list of tokens,  */
 //*                          or it will be set to point to an error   */
@@ -1065,7 +1065,7 @@ CARDINAL32 * Error_Code );
 {$ifdef lvm2}
 void _System Parse_Feature_Parameters( DLIST                               Tokens,
 LVM_Feature_Specification_Record  * Feature_Data,
-char **                             Error_Message,
+AnsiChar **                             Error_Message,
 CARDINAL32 *                        Error_Code);
 {$endif}
 //*********************************************************************/
@@ -1296,7 +1296,7 @@ function Get_Partition_Information(Partition_Handle: ADDRESS; Error_Code: PCARDI
 //*                                   a block of free space.          */
 //*          CARDINAL32      Size - The size, in sectors, of the      */
 //*                                 partition to create.              */
-//*          char            Name[] - The name to give to the newly   */
+//*          AnsiChar            Name[] - The name to give to the newly   */
 //*                                   created partition.              */
 //*          Allocation_Algorithm algorithm - If Handle is a drive,   */
 //*                                           then the engine will    */
@@ -1361,7 +1361,7 @@ function Get_Partition_Information(Partition_Handle: ADDRESS; Error_Code: PCARDI
 //*                                                                   */
 //*********************************************************************/
 type
-  TPartitionName=Array[0..PARTITION_NAME_SIZE-1] of char;
+  TPartitionName=Array[0..PARTITION_NAME_SIZE-1] of AnsiChar;
 
 function Create_Partition(Handle: ADDRESS;
 Size: CARDINAL32;
@@ -1577,7 +1577,7 @@ function Get_Volume_Information(Volume_Handle: ADDRESS; Error_Code: PCARDINAL32)
 //*                      partitions.  The partitions are specified by */
 //*                      their corresponding handles.                 */
 //*                                                                   */
-//*   Input: char         Name[] - The name to assign to the newly    */
+//*   Input: AnsiChar         Name[] - The name to assign to the newly    */
 //*                                created volume.                    */
 //*          BOOLEAN      Create_LVM_Volume - If TRUE, then an LVM    */
 //*                                           volume is created,      */
@@ -1587,7 +1587,7 @@ function Get_Volume_Information(Volume_Handle: ADDRESS; Error_Code: PCARDINAL32)
 //*          BOOLEAN      Bootable - If TRUE, the volume will not be  */
 //*                                  created unless OS/2 can be booted*/
 //*                                  from it.                         */
-//*          char         Drive_Letter_Preference - This is the drive */
+//*          AnsiChar         Drive_Letter_Preference - This is the drive */
 //*                                                 letter to use for */
 //*                                                 accessing the     */
 //*                                                 newly created     */
@@ -1636,12 +1636,12 @@ function Get_Volume_Information(Volume_Handle: ADDRESS; Error_Code: PCARDINAL32)
 //*                                                                   */
 //*********************************************************************/
 type
-  TVolumeName=Array[0..VOLUME_NAME_SIZE-1] of char;
+  TVolumeName=Array[0..VOLUME_NAME_SIZE-1] of AnsiChar;
 
 procedure Create_Volume(Name: TVolumeName;
 Create_LVM_Volume: BOOLEAN;
 Bootable: BOOLEAN;
-Drive_Letter_Preference: char;
+Drive_Letter_Preference: AnsiChar;
 FeaturesToUse: CARDINAL32;
 Partition_Count: CARDINAL32;
 Partition_Handles: Array of ADDRESS;
@@ -1656,7 +1656,7 @@ Error_Code: PCARDINAL32
 //*                      partitions.  The partitions are specified by */
 //*                      their corresponding handles.                 */
 //*                                                                   */
-//*   Input: char         Name[] - The name to assign to the newly    */
+//*   Input: AnsiChar         Name[] - The name to assign to the newly    */
 //*                                created volume.                    */
 //*          BOOLEAN      Create_LVM_Volume - If TRUE, then an LVM    */
 //*                                           volume is created,      */
@@ -1666,7 +1666,7 @@ Error_Code: PCARDINAL32
 //*          BOOLEAN      Bootable - If TRUE, the volume will not be  */
 //*                                  created unless OS/2 can be booted*/
 //*                                  from it.                         */
-//*          char         Drive_Letter_Preference - This is the drive */
+//*          AnsiChar         Drive_Letter_Preference - This is the drive */
 //*                                                 letter to use for */
 //*                                                 accessing the     */
 //*                                                 newly created     */
@@ -1723,10 +1723,10 @@ Error_Code: PCARDINAL32
 //*                                                                   */
 //*********************************************************************/
 {$ifdef lvm2}
-void _System Create_Volume2( char                               Name[VOLUME_NAME_SIZE],
+void _System Create_Volume2( AnsiChar                               Name[VOLUME_NAME_SIZE],
 BOOLEAN                            Create_LVM_Volume,
 BOOLEAN                            Bootable,
-char                               Drive_Letter_Preference,
+AnsiChar                               Drive_Letter_Preference,
 CARDINAL32                         Feature_Count,
 LVM_Feature_Specification_Record   FeaturesToUse[],
 CARDINAL32                         Partition_Count,
@@ -1884,7 +1884,7 @@ Error_Code: PCARDINAL32
 //*   Input: ADDRESS Volume_Handle - The handle of the volume which   */
 //*                                  is to have its assigned drive    */
 //*                                  letter changed.                  */
-//*          char  New_Drive_Preference - The new drive letter to     */
+//*          AnsiChar  New_Drive_Preference - The new drive letter to     */
 //*                                       assign to the volume.       */
 //*          CARDINAL32 * Error_Code - The address of a CARDINAL32 in */
 //*                                    in which to store an error code*/
@@ -1912,7 +1912,7 @@ Error_Code: PCARDINAL32
 //*                                                                   */
 //*********************************************************************/
 procedure Assign_Drive_Letter(Volume_Handle: ADDRESS;
-New_Drive_Preference: char;
+New_Drive_Preference: AnsiChar;
 Error_Code: PCARDINAL32
 ); external 'lvm' name 'Assign_Drive_Letter';
 
@@ -2038,7 +2038,7 @@ CARDINAL32 * Error_Code ) ;
 //*                                                                   */
 //*   Input: ADDRESS Handle - The handle of the drive, partition, or  */
 //*                           volume which is to have its name set.   */
-//*          char New_Name[] - The new name for the drive/partition/  */
+//*          AnsiChar New_Name[] - The new name for the drive/partition/  */
 //*                            volume.                                */
 //*          CARDINAL32 * Error_Code - The address of a CARDINAL32 in */
 //*                                    in which to store an error code*/
@@ -2059,7 +2059,7 @@ CARDINAL32 * Error_Code ) ;
 //*                                                                   */
 //*********************************************************************/
 procedure Set_Name(Handle: ADDRESS;
-New_Name: Array of char;
+New_Name: Array of AnsiChar;
 Error_Code: PCARDINAL32
 ); external 'lvm' name 'Set_Name';
 
@@ -3067,7 +3067,7 @@ procedure Rediscover_PRMs(Error_Code: PCARDINAL32); external 'lvm' name 'Redisco
 //*                      a volume really has given the possibilities  */
 //*                      of conflict or a drive preference of '*'.    */
 //*                                                                   */
-//*   Input:  char  IFSM_Drive_Letter : The drive letter for which the*/
+//*   Input:  AnsiChar  IFSM_Drive_Letter : The drive letter for which the*/
 //*                                     OS2LVM data is requested.     */
 //*           CARDINAL32 * Drive_Number : The address of a variable   */
 //*                                       to hold the OS/2 drive      */
@@ -3082,7 +3082,7 @@ procedure Rediscover_PRMs(Error_Code: PCARDINAL32); external 'lvm' name 'Redisco
 //*                                        volume currently assigned  */
 //*                                        to the requested drive     */
 //*                                        letter.                    */
-//*           char * LVM_Drive_Letter : The address of a variable to  */
+//*           AnsiChar * LVM_Drive_Letter : The address of a variable to  */
 //*                                     hold the drive letter that    */
 //*                                     OS2LVM thinks the volume      */
 //*                                     assigned to the requested     */
@@ -3104,10 +3104,10 @@ procedure Rediscover_PRMs(Error_Code: PCARDINAL32); external 'lvm' name 'Redisco
 //*          closed.                                                  */
 //*                                                                   */
 //*********************************************************************/
-function Get_LVM_View(IFSM_Drive_Letter: char;
+function Get_LVM_View(IFSM_Drive_Letter: AnsiChar;
 Drive_Number: PCARDINAL32;
 Partition_LBA: PCARDINAL32;
-LVM_Drive_Letter: Pchar;
+LVM_Drive_Letter: PAnsiChar;
 UnitID: PBYTE): BOOLEAN; external 'lvm' name 'Get_LVM_View';
 
 //*********************************************************************/
@@ -3120,7 +3120,7 @@ UnitID: PBYTE): BOOLEAN; external 'lvm' name 'Get_LVM_View';
 //*                     The data is logged in a binary format for     */
 //*                     compactness and speed.                        */
 //*                                                                   */
-//*   Input: char * Filename - The filename of the file to use as the */
+//*   Input: AnsiChar * Filename - The filename of the file to use as the */
 //*                            log file.                              */
 //*          CARDINAL32 * Error_Code - The address of a CARDINAL32 in */
 //*                                    in which to store an error code*/
@@ -3139,7 +3139,7 @@ UnitID: PBYTE): BOOLEAN; external 'lvm' name 'Get_LVM_View';
 //*   Notes:  None.                                                   */
 //*                                                                   */
 //*********************************************************************/
-procedure Start_Logging(Filename: Pchar; Error_Code: PCARDINAL32); external 'lvm' name 'Start_Logging';
+procedure Start_Logging(Filename: PAnsiChar; Error_Code: PCARDINAL32); external 'lvm' name 'Start_Logging';
 
 //*********************************************************************/
 //*                                                                   */

packages/os2units/src/mci.pas

@@ -371,7 +371,7 @@ Type
     hwndCallback     : hwnd;                   // PM window handle for MCI notify message
     ulConnectorType  : LongInt;                  // Connector type
     ulConnectorIndex : LongInt;                  // Connector index
-    pszAlias         : pChar;                  // Connection device alias
+    pszAlias         : PAnsiChar;                  // Connection device alias
     usToDeviceID     : Integer;                 // Connected to device ID
     usReserved0      : Integer;                 // Reserved field
     ulReserved1      : LongInt;                  // Reserved field
@@ -545,11 +545,11 @@ type mci_connlist=record
       //****************************************************************************/
 type mci_network_default_connection_parms=record
      hwndCallback:HWND;                   // PM window handle for MCI notify message    */
-     szInstallName:ARRAY [0..MAX_DEVICE_NAME] of Char; // Name of section containing default conn.   */
+     szInstallName:ARRAY [0..MAX_DEVICE_NAME] of AnsiChar; // Name of section containing default conn.   */
      ulNumDevices:LongInt;                   // Number of additional devices in connection */
      ulNumPlayConnections:LongInt;           // Number of Play connections                 */
      ulNumRecordConnections:LongInt;         // Number of Record connections               */
-     pDevices:ARRAY [0..MAX_DEVICE_NAME] of ^Char;    // Pointer to array of device names to open   */
+     pDevices:ARRAY [0..MAX_DEVICE_NAME] of ^AnsiChar;    // Pointer to array of device names to open   */
      pPlayConnections:PMCI_CONNLIST;               // Pointer to array of connections to "make"  */
      pRecordConnections:PMCI_CONNLIST;             // Pointer to array of connections to "make"  */
      end;
@@ -569,11 +569,11 @@ CONST
       //********************************************************************/
 type  mci_Default_Connection_Parms = record
     hwndCallback     : hwnd;                   // PM window handle for MCI notify message
-    pszDevice        : pChar;                  // Device name
+    pszDevice        : PAnsiChar;                  // Device name
     ulConnectorType  : LongInt;                  // If specified, ulConnectorIndex is relative
                                                // to the specified connector type
     ulConnectorIndex : LongInt;                  // Connector number
-    pszToDevice      : pChar;                  // Return device name to which the connection exists
+    pszToDevice      : PAnsiChar;                  // Return device name to which the connection exists
     ulToConnectorType: LongInt;                  // Connector type
     ulToConnectorIndex:LongInt;                  // Connector number
   end;
@@ -586,7 +586,7 @@ type  mci_Default_Connection_Parms = record
     hwndCallback     : hwnd;                   // PM window handle for MCI notify message
     hwndNotebook     : hwnd;                   // Hwhd to notebook window
     usDeviceType     : Integer;                 // Device type
-    pszDeviceName    : pChar;                  // Device name
+    pszDeviceName    : PAnsiChar;                  // Device name
   end;
   pmci_DeviceSettings_Parms = ^mci_DeviceSettings_Parms;
 
@@ -614,7 +614,7 @@ const
 type
   mci_Escape_Parms = record
     hwndCallback     : hwnd;                   // PM window handle for MCI notify message
-    pszCommand       : pChar;                  // Command to send to the device
+    pszCommand       : PAnsiChar;                  // Command to send to the device
   end;
   pmci_Escape_Parms = ^mci_Escape_Parms;
 
@@ -981,7 +981,7 @@ type
     ulStructLength              : LongInt;       // Length of Structure in ULONGS.
     usMasterID                  : Integer;      // ID of Master device in Synchrounous groups.
     usReserved1                 : Integer;      // RESERVED
-    pszGroupAlias               : pChar;       // Pointer to Alias Name.
+    pszGroupAlias               : PAnsiChar;       // Pointer to Alias Name.
     ulNumDevices                : LongInt;       // Number of Devices in group.
     paulDeviceID                : PLongInt;      // Array of Device ids in the group.
   end;
@@ -1024,7 +1024,7 @@ CONST
 type
   mci_Info_Parms = record
     hwndCallback      : hwnd;                  // PM window handle for MCI notify message
-    pszReturn         : pChar;                 // Pointer to return buffer
+    pszReturn         : PAnsiChar;                 // Pointer to return buffer
     ulRetSize         : LongInt;                 // Return buffer size
   end;
   pmci_Info_Parms = ^mci_Info_Parms;
@@ -1036,7 +1036,7 @@ type
       //********************************************************************/
   mci_Load_Parms = record
     hwndCallback      : hwnd;                  // PM window handle for MCI notify message
-    pszElementName    : pChar;                 // File name to loads
+    pszElementName    : PAnsiChar;                 // File name to loads
   end;
   pmci_Load_Parms = ^mci_Load_Parms;
 
@@ -1089,9 +1089,9 @@ type
     hwndCallback     : hwnd;                   // PM window handle for MCI notify message
     usDeviceID       : Integer;                 // Device ID returned to user
     usReserved0      : Integer;                 // Reserved
-    pszDeviceType    : pChar;                  // Device name from SYSTEM.INI
-    pszElementName   : pChar;                  // Typically a file name or NULL
-    pszAlias         : pChar;                  // Optional device alias
+    pszDeviceType    : PAnsiChar;                  // Device name from SYSTEM.INI
+    pszElementName   : PAnsiChar;                  // Typically a file name or NULL
+    pszAlias         : PAnsiChar;                  // Optional device alias
   end;
   pmci_Open_Parms = ^mci_Open_Parms;
 
@@ -1102,9 +1102,9 @@ type
     hwndCallback     : hwnd;                   // PM window handle for MCI notify message
     usDeviceID       : Integer;                 // Device ID returned to user
     usReserved0      : Integer;                 // Reserved field
-    pszDeviceType    : pChar;                  // Device name from SYSTEM.INI
-    pszElementName   : pChar;                  // Typically a file name or NULL
-    pszAlias         : pChar;                  // Optional device alias
+    pszDeviceType    : PAnsiChar;                  // Device name from SYSTEM.INI
+    pszElementName   : PAnsiChar;                  // Typically a file name or NULL
+    pszAlias         : PAnsiChar;                  // Optional device alias
     pDevDataPtr      : Pointer;                // Pointer to device data
   end;
   pmci_Amp_Open_Parms = ^mci_Amp_Open_Parms;
@@ -1117,9 +1117,9 @@ type
     hwndCallback     : hwnd;                   // PM window handle for MCI notify message
     usDeviceID       : Integer;                 // Device ID returned to user
     usReserved0      : Integer;                 // Reserved field
-    pszDeviceType    : pChar;                  // Device name from SYSTEM.INI
-    pszElementName   : pChar;                  // Typically a file name or NULL
-    pszAlias         : pChar;                  // Optional device alias
+    pszDeviceType    : PAnsiChar;                  // Device name from SYSTEM.INI
+    pszElementName   : PAnsiChar;                  // Typically a file name or NULL
+    pszAlias         : PAnsiChar;                  // Optional device alias
     hwndParent       : hwnd;                   // Parent window handle
   end;
   pmci_Vid_Open_Parms = ^mci_Vid_Open_Parms;
@@ -1276,7 +1276,7 @@ const
 type
   mci_Save_Parms = record
     hwndCallback                : hwnd;        // PM window handle for MCI notify message
-    pszFileName                 : pChar;       // Filename to save data to
+    pszFileName                 : PAnsiChar;       // Filename to save data to
   end;
   pmci_Save_Parms = ^mci_Save_Parms;
 
@@ -2072,17 +2072,17 @@ CONST
       // parameter structures for the MCI_SYSINFO message                  */
       //********************************************************************/
 TYPE
-  MaxDevNameChar = array [0..Max_Device_Name-1] of CHAR;
-  MaxVerNumChar = array [0..Max_Version_Number-1] of CHAR;
-  MaxProdInfChar = array [0..Max_ProdInfo-1] of CHAR;
-  MaxPddNameChar = array [0..Max_Pdd_Name-1] of CHAR;
+  MaxDevNameChar = array [0..Max_Device_Name-1] of AnsiChar;
+  MaxVerNumChar = array [0..Max_Version_Number-1] of AnsiChar;
+  MaxProdInfChar = array [0..Max_ProdInfo-1] of AnsiChar;
+  MaxPddNameChar = array [0..Max_Pdd_Name-1] of AnsiChar;
   MaxClsShort    = array [0..Max_Classes-1] of integer;
   MaxClsShort2   = array [0..Max_Classes-1,0..Max_Classes-1] of integer;
-  MaxDevParmChar = array [0..Max_Dev_Params-1] of CHAR;
+  MaxDevParmChar = array [0..Max_Dev_Params-1] of AnsiChar;
 
   mci_SysInfo_Parms = record
     hwndDummyCallback        : hwnd;           // NOTIFY not allowed for SYSINFO
-    pszReturn                : pChar;          // Pointer to return buffer
+    pszReturn                : PAnsiChar;          // Pointer to return buffer
     ulRetSize                : LongInt;          // Return buffer size
     ulNumber                 : LongInt;          // Ordinal Number
     usDeviceType             : Integer;         // MCI device type number
@@ -2135,9 +2135,9 @@ type
 
 
   MaxCnctCnct      = array[0..MAX_CONNECTORS-1] of Connect;
-  MaxExtChar2      = array[0..MAX_EXTENSIONS-1,0..MAX_EXTENSION_NAME-1] of CHAR;
-  MaxAliasNameChar = array[0..Max_Alias_Name-1] of Char;
-  MaxTypeBufChar   = array[0..Max_TypeBuffer] of Char;
+  MaxExtChar2      = array[0..MAX_EXTENSIONS-1,0..MAX_EXTENSION_NAME-1] of AnsiChar;
+  MaxAliasNameChar = array[0..Max_Alias_Name-1] of AnsiChar;
+  MaxTypeBufChar   = array[0..Max_TypeBuffer] of AnsiChar;
 
   mci_SysInfo_ConParams = record
     szInstallName            : MaxDevNameChar; // Device install name
@@ -2231,8 +2231,8 @@ type
                                                // the destination of the video image
     usCmdShow                   : Integer;      // Specifies how the window is displayed
     usReserved1                 : Integer;      // Reserved
-    pszText                     : pChar;       // The text to use as the window caption
-    pszAlias                    : pChar;       // The window alias for the display window
+    pszText                     : PAnsiChar;       // The text to use as the window caption
+    pszAlias                    : PAnsiChar;       // The window alias for the display window
   end;
   pmci_Vid_Window_Parms = ^mci_Vid_Window_Parms;
 
@@ -2265,7 +2265,7 @@ type
     ulReserved0                 : LongInt;       // Reserved 0
     ulTVChannel                 : LongInt;       // TV Channel
     lFineTune                   : LongInt;        // Fine tuning adjustments.
-    pszRegion                   : pChar;       // TV Channel Region
+    pszRegion                   : PAnsiChar;       // TV Channel Region
     ulReserved1                 : LongInt;       // Reserved 1
     ulReserved2                 : LongInt;       // Reserved 2
   end;
@@ -2313,10 +2313,10 @@ CONST
 function mciSendCommand(usDeviceID: Integer; usMessage: Integer; ulParam1: LongInt;
          var Param2; usUserParm: Integer): longint; cdecl;
 
-function mciSendString(pszCommandBuf: pChar; pszReturnString: pChar;
+function mciSendString(pszCommandBuf: PAnsiChar; pszReturnString: PAnsiChar;
          wReturnLength: Integer; hwndCallBack: hwnd; usUserParm: Integer): longInt; cdecl;
 
-function mciGetErrorString(ulError: LongInt; pszBuffer: pChar; usLength: Integer): longint; cdecl;
+function mciGetErrorString(ulError: LongInt; pszBuffer: PAnsiChar; usLength: Integer): longint; cdecl;
 
 function mciMakeGroup(var usDeviceGroupID:Integer; usDeviceCount: Integer;
              var ausDeviceList: Integer; ulFlags: LongInt; ulMMTime: LongInt): longint; cdecl;
@@ -2327,7 +2327,7 @@ function mciSetSysValue(iSysValue: Integer; var Value): Boolean; cdecl;
 
 function mciQuerySysValue(iSysValue: Integer;var Value): Boolean; cdecl;
 
-function mciGetDeviceID(pszName: pChar): Longint; cdecl;
+function mciGetDeviceID(pszName: PAnsiChar): Longint; cdecl;
 
 Implementation
 
@@ -2443,17 +2443,17 @@ end;
 
 function tmsf_minute(time: mmTime): Byte;
 begin
-  tmsf_minute := pbyte(pchar(@time)+1)^;
+  tmsf_minute := pbyte(PAnsiChar(@time)+1)^;
 end;
 
 function tmsf_second(time: mmTime): Byte;
 begin
-  tmsf_second := pbyte(pchar(@time)+2)^;
+  tmsf_second := pbyte(PAnsiChar(@time)+2)^;
 end;
 
 function tmsf_frame(time: mmTime): Byte;
 begin
-  tmsf_frame := pbyte(pchar(@time)+3)^;
+  tmsf_frame := pbyte(PAnsiChar(@time)+3)^;
 end;
 
 function msf_minute(time: mmTime): Byte;
@@ -2463,12 +2463,12 @@ end;
 
 function msf_second(time: mmTime): Byte;
 begin
-  msf_second := pbyte(pchar(@time)+1)^;
+  msf_second := pbyte(PAnsiChar(@time)+1)^;
 end;
 
 function msf_frame(time: mmTime): Byte;
 begin
-  msf_frame := pbyte(pchar(@time)+2)^;
+  msf_frame := pbyte(PAnsiChar(@time)+2)^;
 end;
 
 function uLong_lwlb(var ul): Byte;   // Low word low byte
@@ -2478,36 +2478,36 @@ end;
 
 function uLong_lwhb(var ul): Byte;   // Low word high byte
 begin
-  uLong_lwhb := pbyte(pchar(@ul)+1)^;
+  uLong_lwhb := pbyte(PAnsiChar(@ul)+1)^;
 end;
 
 function uLong_hwlb(var ul): Byte;   // High word low byte
 begin
-  uLong_hwlb := pbyte(pchar(@ul)+2)^;
+  uLong_hwlb := pbyte(PAnsiChar(@ul)+2)^;
 end;
 
 function uLong_hwhb(var ul): Byte;   // High word high byte
 begin
-  uLong_hwhb := pbyte(pchar(@ul)+3)^;
+  uLong_hwhb := pbyte(PAnsiChar(@ul)+3)^;
 end;
 
 function uLong_lowd(var ul): Word;   // Low word
 begin
-  uLong_lowd:=pWord(pchar(@ul))^;
+  uLong_lowd:=pWord(PAnsiChar(@ul))^;
 end;
 
 function uLong_hiwd(var ul): Word;   // High word
 begin
-  uLong_hiwd := pWord(pchar(@ul)+Sizeof(Word))^;
+  uLong_hiwd := pWord(PAnsiChar(@ul)+Sizeof(Word))^;
 end;
 
 function mciSendCommand(usDeviceID: Integer; usMessage: Integer; ulParam1: LongInt;
          var Param2; usUserParm: Integer): longint; cdecl; external 'MDM' index 1;
 
-function mciSendString(pszCommandBuf: pChar; pszReturnString: pChar;
+function mciSendString(pszCommandBuf: PAnsiChar; pszReturnString: PAnsiChar;
          wReturnLength: Integer; hwndCallBack: hwnd; usUserParm: Integer): longInt; cdecl; external 'MDM' index 2;
 
-function mciGetErrorString(ulError: LongInt; pszBuffer: pChar; usLength: Integer): longint;  cdecl; external 'MDM' index 3;
+function mciGetErrorString(ulError: LongInt; pszBuffer: PAnsiChar; usLength: Integer): longint;  cdecl; external 'MDM' index 3;
 
 function mciMakeGroup(var usDeviceGroupID:Integer; usDeviceCount: Integer;
              var ausDeviceList: Integer; ulFlags: LongInt; ulMMTime: LongInt): longint; cdecl; external 'MDM' index 12;
@@ -2518,6 +2518,6 @@ function mciSetSysValue(iSysValue: Integer; var Value): Boolean; cdecl; external
 
 function mciQuerySysValue(iSysValue: Integer;var Value): Boolean; cdecl; external 'MDM' index 11;
 
-function mciGetDeviceID(pszName: pChar): Longint; cdecl; external 'MDM' index 16;
+function mciGetDeviceID(pszName: PAnsiChar): Longint; cdecl; external 'MDM' index 16;
 
 End.

packages/os2units/src/mciapi.pas

@@ -63,9 +63,9 @@ hwndViewport is handle of window for displaying video. If none, then default
              window displayed.
 }
 Function mciPlayFile(hwndOwner: Cardinal;               // Ownerwindow
-                     pszFile: PChar;                    // File
+                     pszFile: PAnsiChar;                    // File
                      ulFlags: Cardinal;                 // Flags
-                     pszTitle: PChar;                   // Title
+                     pszTitle: PAnsiChar;                   // Title
                      hwndViewport: Cardinal):           // Viewport Window
                        Cardinal; cdecl;
 
@@ -74,13 +74,13 @@ Function mciPlayResource(hwndOwner: Cardinal;           // Owner Window
                          resType: LongInt;              // Resource Type
                          resID: LongInt;                // Resource ID
                          ulFlags: Cardinal;             // Flags
-                         pszTitle: PChar;               // Title
+                         pszTitle: PAnsiChar;               // Title
                          hwndViewport: Cardinal):       // Viewport Window
                            Cardinal; cdecl;
 
 Function mciRecordAudioFile(hwndOwner: Cardinal;
                             pszFile,
-                            pszTitle: PChar;
+                            pszTitle: PAnsiChar;
                             ulFlags: Cardinal):
                               Cardinal; cdecl;
 
@@ -94,14 +94,14 @@ Const
 
   MMIO_RE_COMPACT          = 1;
 
-Function mmioRemoveElement(pszFileElement: pChar;
+Function mmioRemoveElement(pszFileElement: PAnsiChar;
                            ulFlag: LongInt):
                              Cardinal; cdecl;
 
 Function mmioFindElement(ulCode: LongInt;              // Find Code
-                         pszElement: PChar;            // Element
+                         pszElement: PAnsiChar;            // Element
                          ulElementLen: LongInt;        // Element Buffer Length
-                         pszFile: PChar;
+                         pszFile: PAnsiChar;
                          ulReserved: LongInt):         // Compound File
                            Cardinal; cdecl;
 
@@ -109,15 +109,15 @@ Function mmioFindElement(ulCode: LongInt;              // Find Code
 
 Implementation
 
-Function mciPlayFile(hwndOwner: Cardinal; pszFile: PChar; ulFlags: Cardinal; pszTitle: PChar; hwndViewport: Cardinal): Cardinal; cdecl;
+Function mciPlayFile(hwndOwner: Cardinal; pszFile: PAnsiChar; ulFlags: Cardinal; pszTitle: PAnsiChar; hwndViewport: Cardinal): Cardinal; cdecl;
     external 'MCIAPI' index 10;
-Function mciPlayResource(hwndOwner: Cardinal; hmod: LongInt; resType: LongInt; resID: LongInt; ulFlags: Cardinal; pszTitle: PChar; hwndViewport: Cardinal): Cardinal;  cdecl;
+Function mciPlayResource(hwndOwner: Cardinal; hmod: LongInt; resType: LongInt; resID: LongInt; ulFlags: Cardinal; pszTitle: PAnsiChar; hwndViewport: Cardinal): Cardinal;  cdecl;
     external 'MCIAPI' index 11;
-Function mciRecordAudioFile(hwndOwner: Cardinal; pszFile, pszTitle: PChar; ulFlags: Cardinal): Cardinal; cdecl;
+Function mciRecordAudioFile(hwndOwner: Cardinal; pszFile, pszTitle: PAnsiChar; ulFlags: Cardinal): Cardinal; cdecl;
     external 'MCIAPI' index 12;
-Function mmioRemoveElement(pszFileElement: PChar; ulFlag: LongInt): Cardinal; cdecl;
+Function mmioRemoveElement(pszFileElement: PAnsiChar; ulFlag: LongInt): Cardinal; cdecl;
     external 'MCIAPI' index 16;
-Function mmioFindElement(ulCode: LongInt; pszElement: PChar; ulElementLen: LongInt; pszFile: PChar; ulReserved: LongInt): Cardinal; cdecl;
+Function mmioFindElement(ulCode: LongInt; pszElement: PAnsiChar; ulElementLen: LongInt; pszFile: PAnsiChar; ulReserved: LongInt): Cardinal; cdecl;
     external 'MCIAPI' index 18;
 
 end.

packages/os2units/src/mcidrv.pas

@@ -316,10 +316,10 @@ Type
     pInstance                   : Pointer;     //  pointer to the instance structure allocated
                                                //  initialized by the driver. The MCI driver
                                                // will fill in this parameter.
-    szDevDLLName : Array[0..259] of Char;      // Character string containing the device
+    szDevDLLName : Array[0..259] of AnsiChar;      // Character string containing the device
                                                // specific DLL name to call for the open.
                                                // (ie. ACPA.DLL)
-    pszElementName              : pChar;       //   typically a file name or NULL
+    pszElementName              : PAnsiChar;       //   typically a file name or NULL
     usDevParmLen                : Integer;      // Device parameters data block length.
     pDevParm                    : Pointer;     // Device parameters data block. This data
                                                // block is unique to each type of device.

packages/os2units/src/mmbase.pas

@@ -55,7 +55,7 @@ Uses Os2Def;
 
 Type
         VERSION = WORD;
-        LPSTR = ^Char;
+        LPSTR = ^AnsiChar;
         LPTR = Pointer;
         LPRECT = Pointer;
         HANDLE = HWND;
@@ -69,7 +69,7 @@ type
 
 TYPE
         PFNMCI = ^FNMCI;
-        SZ = Char;              //* ASCIIZ char string type*/
+        SZ = AnsiChar;              //* ASCIIZ AnsiChar string type*/
         MMTIME = LongInt;       //* universal Chinatown time (1/3000 second)*/
         PMMTIME = ^MMTIME;      //* Ptr to MMTIME unit*/
         HMMIO = LongInt;        //* Handle to an MMIO object*/
@@ -895,7 +895,7 @@ TYPE MCI_AUDIO_INIT = RECORD
         sMode:Integer;
         sChannels:Integer;
         lResolution:LongInt;
-        abLoadPath:ARRAY [0..LOAD_PATH] of CHAR;
+        abLoadPath:ARRAY [0..LOAD_PATH] of AnsiChar;
         ulFlags:LongInt;
         ulOperation:LongInt;
         sReturnCode:Integer;
@@ -1184,7 +1184,7 @@ CONST
 
 
 TYPE MCI_AUDIO_LOAD = RECORD
-        pbBuffer:^Char;
+        pbBuffer:^AnsiChar;
         ulSize:LongInt;
         ulFlags:LongInt;
         end;
@@ -1219,14 +1219,14 @@ CONST
 
 TYPE _MCI_AUDIO_IOBUFFER = RECORD
         lSize:LongInt;
-        pHead:^Char;
-        pTail:^Char;
+        pHead:^AnsiChar;
+        pTail:^AnsiChar;
         lCount:LongInt;
         ulPosition:LongInt;
         lDelay:LongInt;
         usRunFlags:Integer;
         usSelInc:Integer;
-        pBuffer:^Char;
+        pBuffer:^AnsiChar;
         end;
 
 TYPE PMCI_AUDIO_IOBUFFER = ^_MCI_AUDIO_IOBUFFER;
@@ -1271,8 +1271,8 @@ TYPE PMCI_AUDIO_HPI = ^MCI_AUDIO_HPI;
 //**************************/
 TYPE AUDIO_UPDATE = RECORD
 
-  iobuf_type:Char;              //* 0 - XMITIO, 1 - RECIO to be updated      */
-  buffer_address:^Char;     //* address to buffer to be added to array   */
+  iobuf_type:AnsiChar;              //* 0 - XMITIO, 1 - RECIO to be updated      */
+  buffer_address:^AnsiChar;     //* address to buffer to be added to array   */
   buffer_length:LongInt;          //* length of buffer to be added             */
   rc:Integer;                    //* return code                              */
   reserved:Pointer;           //* future use                               */
@@ -1439,7 +1439,7 @@ MCI_CD_READLONG_MMTIME       =$00000200;
 TYPE MCI_CD_READLONG_PARMS=RECORD
    dwFrom:WORD;                        //* read from this position   */
    wCount:WORD;                        //* Number of sectors to read */
-   lpstrReturn:^CHAR;                  //* Pointer to return buffer  */
+   lpstrReturn:^AnsiChar;                  //* Pointer to return buffer  */
    dwRetSize:WORD;                     //* Return buffer size        */
    end;
 
@@ -1503,7 +1503,7 @@ TYPE MMPMCD_REC=RECORD
  usEntryVer:INTEGER;                     //* Entry version                 */
  ulCaps1:LONGINT;                        //* Capability flag I             */
  ulCaps2:LONGINT;                        //* Capability flag II            */
- VSDName:ARRAY [0..CDINI_VSD_NAME_SIZE] of CHAR;   //* DLL name for VSD              */
+ VSDName:ARRAY [0..CDINI_VSD_NAME_SIZE] of AnsiChar;   //* DLL name for VSD              */
  ulMinStart:LONGINT;                     //* Min starting addr, 0x00MMSSFF */
  usVolCnt:INTEGER;                       //* volume level counter          */
  ausVolValues:ARRAY [0..VOLUME_CONTROL] of INTEGER;  //* volume control values         */
@@ -1724,7 +1724,7 @@ type UMCHUNKHEADER =record  // umch */
 //***************************************************************************/
    EXTAUDIONAME = record    // umea */
      usTrackNumber:Word;          // Audio track number for this format  */
-     szFileName:Array [0..UMAUDIOFILENAMELENGTH] of Char;
+     szFileName:Array [0..UMAUDIOFILENAMELENGTH] of AnsiChar;
    end;
   PEXTAUDIONAME=^EXTAUDIONAME;  // pumea */
 
@@ -1760,7 +1760,7 @@ type UMCHUNKHEADER =record  // umch */
 //***************************************************************************/
    TITLE =record  // ttl */
            usCountryCode:Word;         // Country code for this title         */
-           szTitle:Array [0..1] of Char;            // Video title null-terminated         */
+           szTitle:Array [0..1] of AnsiChar;            // Video title null-terminated         */
    end;
    PTITLE=^TITLE; // pttl */
 
@@ -1780,7 +1780,7 @@ type UMCHUNKHEADER =record  // umch */
 //***************************************************************************/
    TEXTFRAME =record  // umtf */
            usTrackNumber:Word;         // Text track number                   */
-           szText:Array [0..1] of Char;             // Text null-terminated                */
+           szText:Array [0..1] of AnsiChar;             // Text null-terminated                */
    end;
 
 
@@ -2488,7 +2488,7 @@ CONST
         LINE_OUT_ON =$00000004;
 
 TYPE
-        PSZ = PChar;
+        PSZ = PAnsiChar;
         SHandle = Word;
         HFile = SHandle;
 //        HMTX = Longint;
@@ -2511,8 +2511,8 @@ TYPE _MCI_PORT_LIST = Record   // devid */
 //------------------------------------------------------------------------*/
 
 TYPE _MCI_AMP_INSTANCE = Record
-        szDeviceName:Array [0..128] of char;
-        szDriverName:Array [0..15] of char;
+        szDeviceName:Array [0..128] of AnsiChar;
+        szDriverName:Array [0..15] of AnsiChar;
         hFile:HFile;
         usDeviceID:Integer;
         ulGlobalFile:LongInt;
@@ -2588,7 +2588,7 @@ TYPE _MCI_AMP_INSTANCE = Record
 
 
         pAudioModeData:Pointer;      // ptr to dev. specific resource data */
-        pResourceDLL:Array [0.. 128 ] of Char;
+        pResourceDLL:Array [0.. 128 ] of AnsiChar;
 
         pProdInfo:PSZ;         // pointer to the product name        */
         ulDeviceID:LongInt;        // pointer to the device id.          */
@@ -2635,7 +2635,7 @@ type
     ulReserved        : LongInt;                 // Reserved
     MidiTypeEntry     : array[0..midiPatchNum-1] of MIDITYPEENTRY;
                                                // Array of MIDITYPEENTRYs
-    szPatchAndPercKeyName: array[0..2*MIDIPATCHNUM*MIDINAMESIZE-1] of char;
+    szPatchAndPercKeyName: array[0..2*MIDIPATCHNUM*MIDINAMESIZE-1] of AnsiChar;
                                                // List of 128 Patch Names
                                                // that are null terminated, then a
                                                // list of 128 Percussion key names that
@@ -2680,7 +2680,7 @@ CONST
 
 type
   MidiHeader = record // midi header //
-    chHeaderChunk               : array[0..3] of Char;
+    chHeaderChunk               : array[0..3] of AnsiChar;
     case Boolean of
     true: (
         dwHeaderLength : Dword;
@@ -3000,7 +3000,7 @@ CONST MAX_SPI_NAME = 9;
 // ***************************************************************************/
 TYPE _DCB = RECORD              // dcb  -  Device Control Block                      */
         ulDCBLen : LongInt;     // length of structure                 */
-        szDevName: Array [0..MAX_SPI_NAME] of char;// device driver name                  */
+        szDevName: Array [0..MAX_SPI_NAME] of AnsiChar;// device driver name                  */
         end;
 TYPE PDCB = ^_DCB;
 
@@ -3018,7 +3018,7 @@ TYPE PDCB = ^_DCB;
 
 TYPE E_DCB = RECORD             // e_dcb  -  Extended Device Control Block          */
         ulDCBLen : LongInt;     // length of structure                 */
-        szDevName: Array [0..MAX_SPI_NAME] of char;// device driver name                  */
+        szDevName: Array [0..MAX_SPI_NAME] of AnsiChar;// device driver name                  */
         ulSysFileNum: LongInt;  // file handle number                  */
         end;
 TYPE PE_DCB = ^E_DCB;
@@ -3036,7 +3036,7 @@ TYPE PDCB_AUDIOSH = ^E_DCB;
 // ***************************************************************************/
 TYPE _VSD_DCB = RECORD          // vsd_dcb - VSD Device Control Block            */
         ulDCBLen : Longint;     // length of structure                 */
-        szDevName: Array [0..MAX_SPI_NAME] of char;// device driver name                  */
+        szDevName: Array [0..MAX_SPI_NAME] of AnsiChar;// device driver name                  */
         ulSysFileNum: LongInt;  // file handle number                  */
         hvsd : LongInt;         // Handle to VSD instance              */
         pfnEntryPoint : ^PFN;   // Address of VSD entry point          */
@@ -3122,7 +3122,7 @@ CONST
 TYPE _ACB_CDDA = RECORD         //* acbcdda - CD Assoc. Control Block          */
         ulACBLen : LongInt;     //* length of structure                   */
         ulObjType : LongInt;    //* ACBTYPE_CDDA                          */
-        bCDDrive : Char;        //* CD drive letter                       */
+        bCDDrive : AnsiChar;        //* CD drive letter                       */
         end;
 TYPE PACB_CDDA = ^_ACB_CDDA;    //* Ptr to an ACB  */
 
@@ -3228,7 +3228,7 @@ TYPE PACB_CODECSH = ^_ACB_CODECSH;//* Ptr to associate control block */
 
 Implementation
 
-Function mmioFOURCC(ch0,ch1,ch2,ch3:Char): Cardinal;
+Function mmioFOURCC(ch0,ch1,ch2,ch3:AnsiChar): Cardinal;
 begin
   mmioFOURCC:=Cardinal(ord(ch0)) or (Cardinal(ord(ch1)) shl 8) or
               (Cardinal(ord(ch2)) shl 16) or (Cardinal(ord(ch3)) shl 24);

packages/os2units/src/mmio.pas

@@ -42,7 +42,7 @@ Const
 
 // MS compat defines.
 Type
-  HPSTR = PChar;
+  HPSTR = PAnsiChar;
   Hwnd = LongInt;
   PFourCC = ^FourCC;
   HMMCF = hmmIO;
@@ -73,10 +73,10 @@ Type
     pIOProc           : mmIOProc;              // Function Pointer to IOProc to use
     ulErrorRet        : LongInt;                 // Extended Error return code
     cchBuffer         : LongInt;                  // I/O buff size (if used), Fsize if MEM
-    pchBuffer         : pChar;                 // Start of I/O buff
-    pchNext           : pChar;                 // Next char to read or write in buff
-    pchEndRead        : pChar;                 // Last char in buff can be read + 1
-    pchEndWrite       : pChar;                 // Last char in buff can be written + 1
+    pchBuffer         : PAnsiChar;                 // Start of I/O buff
+    pchNext           : PAnsiChar;                 // Next AnsiChar to read or write in buff
+    pchEndRead        : PAnsiChar;                 // Last AnsiChar in buff can be read + 1
+    pchEndWrite       : PAnsiChar;                 // Last AnsiChar in buff can be written + 1
     lBufOffset        : LongInt;                  // Offset in buff to pchNext
     lDiskOffset       : LongInt;                  // Disk offset in file
     aulInfo           : Array[0..3] of LongInt;  // IOProc specific fields
@@ -180,7 +180,7 @@ Type
     ulIOProcType      : LongInt;                 // Type of IOProc
     ulMediaType       : LongInt;                 // Media Type
     ulFlags           : LongInt;                 // IOProc capability flags
-    szDefaultFormatExt : Array[0..Sizeof(FourCC)] of Char;
+    szDefaultFormatExt : Array[0..Sizeof(FourCC)] of AnsiChar;
                                                // Default extension 4 + null
     ulCodePage        : LongInt;                 // Code Page
     ulLanguage        : LongInt;                 // Language
@@ -316,13 +316,13 @@ Const
 Type
   mmIniFileInfo = record
     fccIOProc         : FourCC;                // IOProc identifier
-    szDLLName         : Array[0..DLLName_Size-1] of Char;  // DLL name string
-    szProcName        : Array[0..ProcName_Size-1] of Char; // Procedure name string
+    szDLLName         : Array[0..DLLName_Size-1] of AnsiChar;  // DLL name string
+    szProcName        : Array[0..ProcName_Size-1] of AnsiChar; // Procedure name string
     ulFlags           : LongInt;                 // Flags for Preload
     ulExtendLen       : LongInt;                 // Length of ext fields
     ulMediaType       : LongInt;                 // Media type
     ulIOProcType      : LongInt;                 // Type of IOProc
-    szDefExt          : Array[0..Max_Extension_Name] of Char;
+    szDefExt          : Array[0..Max_Extension_Name] of AnsiChar;
   end;
   pmmIniFileInfo = ^mmIniFileInfo;
 
@@ -335,14 +335,14 @@ Type
   CodecIniFileInfo = record
     ulStructLen       : LongInt;                 // length of this structure
     fcc               : FourCC;                // File Format ID
-    szDLLName         : Array[0..DLLName_Size-1] of Char;       // DLL name string
-    szProcName        : Array[0..ProcName_Size-1] of Char;      // Procedure name string
+    szDLLName         : Array[0..DLLName_Size-1] of AnsiChar;       // DLL name string
+    szProcName        : Array[0..ProcName_Size-1] of AnsiChar;      // Procedure name string
     ulCompressType    : LongInt;                 // Compression Type
     ulCompressSubType : LongInt;                 // Compression SubType
     ulMediaType       : LongInt;                 // Media type
     ulCapsFlags       : LongInt;                 // capabilities flags
     ulFlags           : LongInt;                 // flags
-    szHWID            : Array[0..Codec_HW_Name_Size-1] of Char; // specific information
+    szHWID            : Array[0..Codec_HW_Name_Size-1] of AnsiChar; // specific information
     ulMaxSrcBufLen    : LongInt;                 // max source buffer length
     ulSyncMethod      : LongInt;                 // Synchronization method
     fccPreferredFormat: LongInt;                 // Preferred output format
@@ -1305,7 +1305,7 @@ TYPE  MMTrackInfo = record
 //TYPE  pMMTrackInfo = ^MMTrackInfo;
 
 //TYPE
-//        PSZ = PChar;
+//        PSZ = PAnsiChar;
 
 TYPE _MMMOVIEHEADER=RECORD   // mmhdr */
    ulStructLen:LongInt;       // length of this structure */
@@ -1394,20 +1394,20 @@ function mmioFlush( mmIO: hmmio; usFlags: Word ): Word; cdecl;
 function mmioGetInfo( mmIO: hmmio; Info: pmmioinfo; usFlags: Word ): Word; cdecl;
 function mmioGetLastError( mmIO: hmmio ): Longint; cdecl;
 function mmioInstallIOProc( fccIOProc: FourCC; pIOProc: pMMIOProc; ulFlags: Longint ): pmmIOProc; cdecl;
-function mmioOpen( pszFileName: pChar; mmIOInfo: pmmioinfo; ulOpenFlags: Longint ): hMMIO; cdecl;
-function mmioRead( mmIO: hmmio; pchBuffer: pChar; cBytes: Longint ): Longint; cdecl;
+function mmioOpen( pszFileName: PAnsiChar; mmIOInfo: pmmioinfo; ulOpenFlags: Longint ): hMMIO; cdecl;
+function mmioRead( mmIO: hmmio; pchBuffer: PAnsiChar; cBytes: Longint ): Longint; cdecl;
 function mmioSeek( mmIO: hmmio; lOffset, lOrigin: Longint ): Longint; cdecl;
 function mmioSendMessage( mmIO: hmmio; usMsg: Word; lParam1, lParam2: Longint ): Longint; cdecl;
-function mmioSetBuffer( mmIO: hmmio; pchBuffer: pChar; cBytes: Longint; usFlags: Word ): Word; cdecl;
+function mmioSetBuffer( mmIO: hmmio; pchBuffer: PAnsiChar; cBytes: Longint; usFlags: Word ): Word; cdecl;
 function mmioSetInfo( mmIO: hmmio; mmIOInfo: pmmioinfo; usFlags: Word ): Word; cdecl;
-function mmioStringToFourCC( pszString: pChar; usFlags: Word ): FourCC; cdecl;
-function mmioWrite( mmIO: hmmio; pchBuffer: pChar; cBytes: Longint ): Longint; cdecl;
+function mmioStringToFourCC( pszString: PAnsiChar; usFlags: Word ): FourCC; cdecl;
+function mmioWrite( mmIO: hmmio; pchBuffer: PAnsiChar; cBytes: Longint ): Longint; cdecl;
 
 //
 // Compound File function prototypes:
 ///
 
-function mmioCFOpen( pszFileName: pChar; CfInfo, IOInfo: pmmcfinfo; ulFlags: Longint ): hMMCF; cdecl;
+function mmioCFOpen( pszFileName: PAnsiChar; CfInfo, IOInfo: pmmcfinfo; ulFlags: Longint ): hMMCF; cdecl;
 function mmioCFClose( mmCf: hmmcf; ulFlags: Longint ): Longint; cdecl;
 function mmioCFGetInfo( mmCf: hmmcf; CfInfo: pmmcfinfo; cBytes: Longint ): Longint; cdecl;
 function mmioCFSetInfo( mmCf: hmmcf; CfInfo: pmmcfinfo; cBytes: Longint ): Longint; cdecl;
@@ -1415,10 +1415,10 @@ function mmioCFFindEntry( mmCf: hmmcf; ctocEntry: mmctocentry; ulFlags: Longint
 function mmioCFAddEntry( mmCf: hmmcf; cTocEntry: mmctocentry; ulFlags: Longint ): Longint; cdecl;
 function mmioCFChangeEntry( mmCf: hmmcf; CTocEntry: pmmctocentry; ulFlags: Longint ): Longint; cdecl;
 function mmioCFDeleteEntry( mmCf: hmmcf; CTocEntry: pmmctocentry; ulFlags: Longint ): Longint; cdecl;
-function mmioCFAddElement( mmCf: hmmcf; pszElementName: pChar; fccType: FourCC;
-  pchBuffer: pChar; cchBytes: LongInt; ulFlags: Longint ): Longint; cdecl;
+function mmioCFAddElement( mmCf: hmmcf; pszElementName: PAnsiChar; fccType: FourCC;
+  pchBuffer: PAnsiChar; cchBytes: LongInt; ulFlags: Longint ): Longint; cdecl;
 
-function mmioCFCopy( mmCfSource: hmmcf; pszDestFileName: pChar; ulFlags: Longint ): Longint; cdecl;
+function mmioCFCopy( mmCfSource: hmmcf; pszDestFileName: PAnsiChar; ulFlags: Longint ): Longint; cdecl;
 //
 // Conversion Utility function prototypes:
 ///
@@ -1430,10 +1430,10 @@ function mmioGetFormats( FormatInfo: pmmformatinfo;
   lNumFormats: LongInt; pFormatInfoList: Pointer; plFormatsRead: pLong;
   ulReserved: Longint; ulFlags: Longint ): Longint; cdecl;
 
-function mmioGetFormatName( FormatInfo: pmmformatinfo; pszFormatName: pChar;
+function mmioGetFormatName( FormatInfo: pmmformatinfo; pszFormatName: PAnsiChar;
   plBytesRead: pLong; ulReserved: Longint; ulFlags: Longint ): Longint; cdecl;
 
-function mmioIdentifyFile( pszFileName: pChar; MMIoInfo: pmmioinfo;
+function mmioIdentifyFile( pszFileName: PAnsiChar; MMIoInfo: pmmioinfo;
   FormatInfo: pmmformatinfo; pfccStorageSystem: pFourCC; ulReserved: Longint;
   ulFlags: Longint ): Longint; cdecl;
 
@@ -1448,16 +1448,16 @@ function mmioSetHeader( mmIO: hmmio; pHeader: Pointer; lHeaderLength: LongInt;
 
 function mmioIniFileHandler( IniFileInfo: pmminifileinfo; ulFlags: Longint ): Longint; cdecl;
 
-function mmioIdentifyStorageSystem( pszFileName: pChar;
+function mmioIdentifyStorageSystem( pszFileName: PAnsiChar;
   MMIoInfo: pmmioinfo; pfccStorageSystem: pFourCC ): Longint; cdecl;
 
-function mmioDetermineSSIOProc( pszFileName: pChar; MMIoInfo: pmmioinfo;
-  pfccStorageSystem: pFourCC; pszParsedRemainder: pChar ): Longint; cdecl;
+function mmioDetermineSSIOProc( pszFileName: PAnsiChar; MMIoInfo: pmmioinfo;
+  pfccStorageSystem: pFourCC; pszParsedRemainder: PAnsiChar ): Longint; cdecl;
 
 function mmioQueryIOProcModuleHandle( IOProc: pMMIOProc;
   IOProcModule: phModule ): Longint; cdecl;
 
-function mmioCFCompact( pszFileName: pChar; ulFlags: Longint ): Longint; cdecl;
+function mmioCFCompact( pszFileName: PAnsiChar; ulFlags: Longint ): Longint; cdecl;
 
 //
 // MMPMMMIO.INI file migration utility
@@ -1472,7 +1472,7 @@ function mmioMigrateIniFile( ulFlags: Longint ): Longint; cdecl;
 function mmioIniFileCODEC( IniFile: pCODECIniFileInfo; ulFlags: Longint ): Longint; cdecl;
 function mmioSet( mmIO: hmmio; ExtendInfo: pmmExtendInfo; ulFlags: Longint): Longint; cdecl;
 function mmioQueryCODECName( IniInfo: pCODECIniFileinfo;
-  pszCODECName: pChar; pulBytesRead: pLongint ): Longint; cdecl;
+  pszCODECName: PAnsiChar; pulBytesRead: pLongint ): Longint; cdecl;
 
 function mmioQueryCODECNameLength( IniInfo: pCODECIniFileinfo;
   pulNameLength: pLongint ): Longint; cdecl;
@@ -1512,10 +1512,10 @@ function mmioGetLastError( mmIO: hmmio ): Longint; cdecl;
 function mmioInstallIOProc( fccIOProc: FourCC; pIOProc: pMMIOProc; ulFlags: Longint ): pmmIOProc; cdecl;
     external LibName index 39;
 
-function mmioOpen( pszFileName: pChar; mmIOInfo: pmmioinfo; ulOpenFlags: Longint ): hMMIO; cdecl;
+function mmioOpen( pszFileName: PAnsiChar; mmIOInfo: pmmioinfo; ulOpenFlags: Longint ): hMMIO; cdecl;
     external LibName index 40;
 
-function mmioRead( mmIO: hmmio; pchBuffer: pChar; cBytes: Longint ): Longint; cdecl;
+function mmioRead( mmIO: hmmio; pchBuffer: PAnsiChar; cBytes: Longint ): Longint; cdecl;
     external LibName index 41;
 
 function mmioSeek( mmIO: hmmio; lOffset, lOrigin: Longint ): Longint; cdecl;
@@ -1524,19 +1524,19 @@ function mmioSeek( mmIO: hmmio; lOffset, lOrigin: Longint ): Longint; cdecl;
 function mmioSendMessage( mmIO: hmmio; usMsg: Word; lParam1, lParam2: Longint ): Longint; cdecl;
     external LibName index 54;
 
-function mmioSetBuffer( mmIO: hmmio; pchBuffer: pChar; cBytes: Longint; usFlags: Word ): Word; cdecl;
+function mmioSetBuffer( mmIO: hmmio; pchBuffer: PAnsiChar; cBytes: Longint; usFlags: Word ): Word; cdecl;
     external LibName index 56;
 
 function mmioSetInfo( mmIO: hmmio; mmIOInfo: pmmioinfo; usFlags: Word ): Word; cdecl;
     external LibName index 53;
 
-function mmioStringToFourCC( pszString: pChar; usFlags: Word ): FourCC; cdecl;
+function mmioStringToFourCC( pszString: PAnsiChar; usFlags: Word ): FourCC; cdecl;
     external LibName index 37;
 
-function mmioWrite( mmIO: hmmio; pchBuffer: pChar; cBytes: Longint ): Longint; cdecl;
+function mmioWrite( mmIO: hmmio; pchBuffer: PAnsiChar; cBytes: Longint ): Longint; cdecl;
     external LibName index 42;
 
-function mmioCFOpen( pszFileName: pChar; CfInfo, IOInfo: pmmcfinfo; ulFlags: Longint ): hMMCF; cdecl;
+function mmioCFOpen( pszFileName: PAnsiChar; CfInfo, IOInfo: pmmcfinfo; ulFlags: Longint ): hMMCF; cdecl;
     external LibName index 57;
 
 function mmioCFClose( mmCf: hmmcf; ulFlags: Longint ): Longint; cdecl;
@@ -1560,11 +1560,11 @@ function mmioCFChangeEntry( mmCf: hmmcf; CTocEntry: pmmctocentry; ulFlags: Longi
 function mmioCFDeleteEntry( mmCf: hmmcf; CTocEntry: pmmctocentry; ulFlags: Longint ): Longint; cdecl;
     external LibName index 60;
 
-function mmioCFAddElement( mmCf: hmmcf; pszElementName: pChar; fccType: FourCC;
-  pchBuffer: pChar; cchBytes: LongInt; ulFlags: Longint ): Longint; cdecl;
+function mmioCFAddElement( mmCf: hmmcf; pszElementName: PAnsiChar; fccType: FourCC;
+  pchBuffer: PAnsiChar; cchBytes: LongInt; ulFlags: Longint ): Longint; cdecl;
     external LibName index 63;
 
-function mmioCFCopy( mmCfSource: hmmcf; pszDestFileName: pChar; ulFlags: Longint ): Longint; cdecl;
+function mmioCFCopy( mmCfSource: hmmcf; pszDestFileName: PAnsiChar; ulFlags: Longint ): Longint; cdecl;
     external LibName index 66;
 
 function mmioQueryFormatCount( FormatInfo: pmmformatinfo;
@@ -1576,11 +1576,11 @@ function mmioGetFormats( FormatInfo: pmmformatinfo;
   ulReserved: Longint; ulFlags: Longint ): Longint; cdecl;
     external LibName index 88;
 
-function mmioGetFormatName( FormatInfo: pmmformatinfo; pszFormatName: pChar;
+function mmioGetFormatName( FormatInfo: pmmformatinfo; pszFormatName: PAnsiChar;
   plBytesRead: pLong; ulReserved: Longint; ulFlags: Longint ): Longint; cdecl;
     external LibName index 93;
 
-function mmioIdentifyFile( pszFileName: pChar; MMIoInfo: pmmioinfo;
+function mmioIdentifyFile( pszFileName: PAnsiChar; MMIoInfo: pmmioinfo;
   FormatInfo: pmmformatinfo; pfccStorageSystem: pFourCC; ulReserved: Longint;
   ulFlags: Longint ): Longint; cdecl;
     external LibName index 92;
@@ -1600,19 +1600,19 @@ function mmioSetHeader( mmIO: hmmio; pHeader: Pointer; lHeaderLength: LongInt;
 function mmioIniFileHandler( IniFileInfo: pmminifileinfo; ulFlags: Longint ): Longint; cdecl;
     external LibName index 98;
 
-function mmioIdentifyStorageSystem( pszFileName: pChar;
+function mmioIdentifyStorageSystem( pszFileName: PAnsiChar;
   MMIoInfo: pmmioinfo; pfccStorageSystem: pFourCC ): Longint; cdecl;
     external LibName index 100;
 
-function mmioDetermineSSIOProc( pszFileName: pChar; MMIoInfo: pmmioinfo;
-  pfccStorageSystem: pFourCC; pszParsedRemainder: pChar ): Longint; cdecl;
+function mmioDetermineSSIOProc( pszFileName: PAnsiChar; MMIoInfo: pmmioinfo;
+  pfccStorageSystem: pFourCC; pszParsedRemainder: PAnsiChar ): Longint; cdecl;
     external LibName index 101;
 
 function mmioQueryIOProcModuleHandle( IOProc: pMMIOProc;
   IOProcModule: phModule ): Longint; cdecl;
     external LibName index 106;
 
-function mmioCFCompact( pszFileName: pChar; ulFlags: Longint ): Longint; cdecl;
+function mmioCFCompact( pszFileName: PAnsiChar; ulFlags: Longint ): Longint; cdecl;
     external LibName index 113;
 
 //--------
@@ -1630,7 +1630,7 @@ function mmioSet( mmIO: hmmio; ExtendInfo: pmmExtendInfo; ulFlags: Longint): Lon
     external LibName index 114;
 
 function mmioQueryCODECName( IniInfo: pCODECIniFileinfo;
-  pszCODECName: pChar; pulBytesRead: pLongint ): Longint; cdecl;
+  pszCODECName: PAnsiChar; pulBytesRead: pLongint ): Longint; cdecl;
     external LibName index 115;
 
 function mmioQueryCODECNameLength( IniInfo: pCODECIniFileinfo;

packages/os2units/src/som.pas

@@ -53,7 +53,7 @@ type
   CORBAObjectType                       = TSOMObject;    (* in SOM, a CORBA object is a SOM object *)
 
   somToken              =Pointer;       (* Uninterpretted value   *)
-  somId                 =^PChar;
+  somId                 =^PAnsiChar;
   somIdPtr              =^somId;
   PsomToken             =^somToken;       (* Uninterpretted value   *)
 
@@ -63,8 +63,8 @@ type
   somDTokenPtr          =^somDToken;
 
 type
-  ImplId                =^PChar;
-  RepositoryId          = PChar;
+  ImplId                =^PAnsiChar;
+  RepositoryId          = PAnsiChar;
   AttributeDef_AttributeMode    = Cardinal;
   OperationDef_OperationMode = Longint;
   ParameterDef_ParameterMode    = Cardinal;
@@ -80,7 +80,7 @@ type
   somClassInfo          =somToken;
 
 
-  Identifier            =PChar;         (* CORBA 7.5.1, p. 129 *)
+  Identifier            =PAnsiChar;         (* CORBA 7.5.1, p. 129 *)
 
   TypeCode              = pointer;
 
@@ -271,7 +271,7 @@ type
   somMethodTabStruct    =record
     classObject         :SOMClassType;
     classInfo           :somClassInfoPtr;
-    className           :PChar;
+    className           :PAnsiChar;
     instanceSize        :Longint;
     dataAlignment       :Longint;
     mtabSize            :Longint;
@@ -462,7 +462,7 @@ type
 (* to specify non-internal data *)
   somNonInternalDataStruct=record
     classData           :somDTokenPtr;
-    basisForDataOffset  :PChar;
+    basisForDataOffset  :PAnsiChar;
   end;
   somNonInternalData_t  =somNonInternalDataStruct;
   somNonInternalData_p  =^somNonInternalData_t;
@@ -573,7 +573,7 @@ type
     ccds                :somCClassDataStructurePtr;
     smt                 :somStaticMethod_p; (* basic "static" methods for mtab *)
     omt                 :somOverrideMethod_p; (* overrides for mtab *)
-    nitReferenceBase    :PChar;
+    nitReferenceBase    :PAnsiChar;
     nit                 :somNonInternalData_p; (* datatokens for instance data *)
     pmt                 :somProcMethods_p; (* Arbitrary ClassData members *)
     vft                 :somVarargsFuncs_p; (* varargs stubs *)
@@ -717,7 +717,7 @@ type
  *  Should return 0 (false) if an error occurs and 1 (true) otherwise.
  *)
 type
-  somTD_SOMOutCharRoutine       =Function(ch:Char):Longint; cdecl;
+  somTD_SOMOutCharRoutine       =Function(ch:AnsiChar):Longint; cdecl;
 
 var
 {$warning support of external vars required}
@@ -755,7 +755,7 @@ Function  somAncestorResolve(obj:TSOMObject;                 (* the object *)
                              mToken:somMToken):{somMethodProc}pointer; cdecl;
   external 'som' name 'somAncestorResolve'; {index 74}
 Function  somResolveByName(obj:TSOMObject;
-                           methodName:PChar):{somMethodProc}pointer; cdecl;
+                           methodName:PAnsiChar):{somMethodProc}pointer; cdecl;
   external 'som' name 'somResolveByName'; {index 61}
 (*------------------------------------------------------------------------------
  * Offset-based data resolution
@@ -814,15 +814,15 @@ Function  somRegisterId(id:somId):Longint; cdecl;
 (* time the string associated with this id has been registered, *)
 (* returns 0 (false) otherwise *)
 
-Function  somIDFromString(aString:PChar):somId; cdecl;
+Function  somIDFromString(aString:PAnsiChar):somId; cdecl;
   external 'som' name 'somIdFromString'; {index 31}
 (* caller is responsible for freeing the returned id with SOMFree *)
 
 // Not found
-//Function  somIdFromStringNoFree(aString:PChar):somId; cdecl;
+//Function  somIdFromStringNoFree(aString:PAnsiChar):somId; cdecl;
 (* call is responsible for *not* freeing the returned id *)
 
-Function  somStringFromId(id:somId):PChar; cdecl;
+Function  somStringFromId(id:somId):PAnsiChar; cdecl;
   external 'som' name 'somStringFromId'; {index 40}
 
 Function  somCompareIds(id1,id2:somId):Longint; cdecl;
@@ -892,7 +892,7 @@ var
  * macro (for statically linked libraries), or during the _somFindClass
  * method (for libraries that are dynamically loaded).
  *)
-Procedure somRegisterClassLibrary(libraryName:PChar;
+Procedure somRegisterClassLibrary(libraryName:PAnsiChar;
                                   libraryInitRun:somMethodProc); cdecl;
   external 'som' name 'somRegisterClassLibrary'; {index 86}
 
@@ -971,11 +971,11 @@ Procedure somConstructClass(classInitRoutine:somTD_ClassInitRoutine;
  * Uses <SOMOutCharRoutine> to output its arguments under control of the ANSI C
  * style format.  Returns the number of characters output.
  *)
-Function  somPrintf(fnt:PChar;buf:pointer):Longint; cdecl;
+Function  somPrintf(fnt:PAnsiChar;buf:pointer):Longint; cdecl;
   external 'som' name 'somPrintf'; {index 35}
 
 // vprint form of somPrintf
-Function  somVPrintf(fnt:PChar;var ap):Longint; cdecl;
+Function  somVPrintf(fnt:PAnsiChar;var ap):Longint; cdecl;
   external 'som' name 'somVprintf'; {index 45}
 
 // Outputs (via somPrintf) blanks to prefix a line at the indicated level
@@ -983,7 +983,7 @@ Procedure somPrefixLevel(level:Longint); cdecl;
   external 'som' name 'somPrefixLevel'; {index 34}
 
 // Combines somPrefixLevel and somPrintf
-Procedure somLPrintf(level:Longint;fmt:PChar;var buf); cdecl;
+Procedure somLPrintf(level:Longint;fmt:PAnsiChar;var buf); cdecl;
   external 'som' name 'somLPrintf'; {index 32}
 
 Function SOMObjectNewClass(majorVersion,minorVersion:Longint):SOMClassType; cdecl;
@@ -998,14 +998,14 @@ Function SOMClassMgrNewClass(majorVersion,minorVersion:Longint):SOMClassType; cd
  * Pointers to routines used to do dynamic code loading and deleting
  *)
 type
-  somTD_SOMLoadModule           =Function({IN}Module:PChar      (* className *);
-                                          {IN}FileName:PChar    (* fileName *);
-                                          {IN}FuncName:PChar    (* functionName *);
+  somTD_SOMLoadModule           =Function({IN}Module:PAnsiChar      (* className *);
+                                          {IN}FileName:PAnsiChar    (* fileName *);
+                                          {IN}FuncName:PAnsiChar    (* functionName *);
                                           {IN}MajorVer:Longint  (* majorVersion *);
                                           {IN}MinorVer:Longint  (* minorVersion *);
                                           {OUT}var ref:somToken (* modHandle *)):Longint; cdecl;
   somTD_SOMDeleteModule         =Function({IN} ref:somToken     (* modHandle *)):Longint; cdecl;
-  somTD_SOMClassInitFuncName    =Function:PChar; cdecl;
+  somTD_SOMClassInitFuncName    =Function:PAnsiChar; cdecl;
 
 var
 {$warning support of external vars required}
@@ -1046,7 +1046,7 @@ var
 
 type
   somTD_SOMError                =Procedure({IN} code:Longint    (* code *);
-                                           {IN} fn:PChar        (* fileName *);
+                                           {IN} fn:PAnsiChar        (* fileName *);
                                            {IN} ln:Longint      (* linenum *)); cdecl;
 
 var
@@ -1098,13 +1098,13 @@ var
  *)
 
 Function  somTestCls(obj:TSOMObject; classObj:SOMClassType;
-                     fileName:PChar; lineNumber:Longint):TSOMObject; cdecl;
+                     fileName:PAnsiChar; lineNumber:Longint):TSOMObject; cdecl;
   external 'som' name 'somTestCls'; {index 42}
-Procedure somTest(condition,severity:Longint;fileName:PChar;
-                  lineNum:Longint;msg:PChar); cdecl;
+Procedure somTest(condition,severity:Longint;fileName:PAnsiChar;
+                  lineNum:Longint;msg:PAnsiChar); cdecl;
   external 'som' name 'somTest'; {index 41}
 Procedure somAssert(condition,ecode:Longint;
-                    fileName:PChar;lineNum:Longint;msg:PChar); cdecl;
+                    fileName:PAnsiChar;lineNum:Longint;msg:PAnsiChar); cdecl;
   external 'som' name 'somAssert'; {index 23}
 
 type
@@ -1119,25 +1119,25 @@ type
   EnvironmentType       = record
     _major              : exception_type;
     exception           : record
-      _exception_name   : PChar;
+      _exception_name   : PAnsiChar;
       _params           : Pointer;
     end;
     _somdAnchor         : pointer;
   end;
 
-Function  somExceptionId(ev:Environment):PChar; cdecl;
+Function  somExceptionId(ev:Environment):PAnsiChar; cdecl;
   external 'som' name 'somExceptionId'; {index 52}
 Function  somExceptionValue(ev:Environment):Pointer; cdecl;
   external 'som' name 'somExceptionValue'; {index 53}
 Procedure somExceptionFree(ev:Environment); cdecl;
   external 'som' name 'somExceptionFree'; {index 54}
-Procedure somSetException(ev:Environment;major:exception_type;exception_name:PChar;params:pointer); cdecl;
+Procedure somSetException(ev:Environment;major:exception_type;exception_name:PAnsiChar;params:pointer); cdecl;
   external 'som' name 'somSetException'; {index 55}
 Function  somGetGlobalEnvironment:Environment; cdecl;
   external 'som' name 'somGetGlobalEnvironment'; {index 58}
 
 (* Exception function names per CORBA 5.19, p.99 *)
-Function  exception_id(ev:Environment):PChar; cdecl;
+Function  exception_id(ev:Environment):PAnsiChar; cdecl;
 Function  exception_value(ev:Environment):Pointer; cdecl;
 Procedure exception_free(ev:Environment); cdecl;
 
@@ -1396,9 +1396,9 @@ var
   SOM_AssertLevel: Longint; //³ 00017 ³ SOM_AssertLevel
 
 // ToDo: Move this to corresponding place
-Procedure somCheckArgs(argc: longint; argv: array of pchar); cdecl;
+Procedure somCheckArgs(argc: longint; argv: array of PAnsiChar); cdecl;
   external 'som' name 'somCheckArgs'; {index 25}
-Procedure somUnregisterClassLibrary (libraryName: PChar); cdecl;
+Procedure somUnregisterClassLibrary (libraryName: PAnsiChar); cdecl;
   external 'som' name 'somUnregisterClassLibrary'; {index 89}
 Function somResolveTerminal(x : SOMClassPtr; mdata: somMToken): somMethodProcPtr; cdecl;
   external 'som' name 'somResolveTerminal'; {index 133}
@@ -1468,7 +1468,7 @@ Function somva_SOMObject_somClassDispatch(somSelf: PSOMObject;
 
 Implementation
 
-Function exception_id(ev:Environment):PChar; cdecl;
+Function exception_id(ev:Environment):PAnsiChar; cdecl;
 begin
   Result := somExceptionId(ev)
 end;

packages/os2units/src/sw.pas

@@ -54,7 +54,7 @@ Const
 
 Type
   TSMBD=record
-    achText: Array[0..MAX_SMBDTEXT + 1] of Char; // Text of the button. eg. "~Cancel"
+    achText: Array[0..MAX_SMBDTEXT + 1] of AnsiChar; // Text of the button. eg. "~Cancel"
     idButton: Cardinal;        // Button ID returned when user chooses
     flStyle: Longint;          // Button style or'ed with internal
   end;
@@ -88,7 +88,7 @@ function WinCreateSecondaryWindow(hwndParent: hwnd; hwndOwner: hwnd;
 
 function WinDefaultSize(Wnd: hwnd): Longbool; cdecl;
 
-function WinInsertDefaultSize(Wnd: hwnd; pszDefaultSize: pChar): Longbool; cdecl;
+function WinInsertDefaultSize(Wnd: hwnd; pszDefaultSize: PAnsiChar): Longbool; cdecl;
 
 function WinQuerySecondaryhwnd(Wnd: hwnd; ulFlag: Cardinal): hwnd; cdecl;
 
@@ -103,7 +103,7 @@ function WinQuerySecondaryhwnd(Wnd: hwnd; ulFlag: Cardinal): hwnd; cdecl;
 //*             PSMBINFO psmbinfo   - pointer to button/icon info        */
 //************************************************************************/
 function WinSecondaryMessageBox(hwndParent: hwnd; hwndOwner: hwnd;
-  pszText: pChar; pszCaption: pChar; idWindow: Cardinal; smb: psmbinfo): Cardinal; cdecl;
+  pszText: PAnsiChar; pszCaption: PAnsiChar; idWindow: Cardinal; smb: psmbinfo): Cardinal; cdecl;
 
 //************************************************************************/
 //* WinDismissSecondaryWindow                                            */
@@ -186,7 +186,7 @@ function WinDefSecondaryWindowProc(Wnd: hwnd; msg: Cardinal;
 Function WinRegisterGraphicButton: Longbool; cdecl;
 
 Const
-  WC_GRAPHICBUTTON=PChar($ffff0040);
+  WC_GRAPHICBUTTON=PAnsiChar($ffff0040);
 
 //************************************************************************/
 //*             GraphicButton Animation/TwoState constants               */
@@ -252,7 +252,7 @@ Const
 type
   TgbtnCdata = packed record
     usReserved: Word;
-    pszText: PChar;
+    pszText: PAnsiChar;
     hmod: Cardinal;
     cBitmaps: Word;
     aidBitmap: Array[0..1] of Word;
@@ -493,14 +493,14 @@ function WinCreateSecondaryWindow(hwndParent: hwnd; hwndOwner: hwnd;
 function WinDefaultSize(Wnd: hwnd): Longbool; cdecl;
     external 'SW' index 11;
 
-function WinInsertDefaultSize(Wnd: hwnd; pszDefaultSize: pChar): Longbool; cdecl;
+function WinInsertDefaultSize(Wnd: hwnd; pszDefaultSize: PAnsiChar): Longbool; cdecl;
     external 'SW' index 12;
 
 function WinQuerySecondaryhwnd(Wnd: hwnd; ulFlag: Cardinal): hwnd; cdecl;
     external 'SW' index 52;
 
 function WinSecondaryMessageBox(hwndParent: hwnd; hwndOwner: hwnd;
-  pszText: pChar; pszCaption: pChar; idWindow: Cardinal; smb: psmbinfo): Cardinal; cdecl;
+  pszText: PAnsiChar; pszCaption: PAnsiChar; idWindow: Cardinal; smb: psmbinfo): Cardinal; cdecl;
     external 'SW' index 5;
 
 function WinDismissSecondaryWindow(hwndDlg: hwnd; ulResult: Cardinal): Longbool; cdecl;

packages/os2units/src/wpstk.pp

@@ -29,7 +29,7 @@ Uses
 const
   wpstkdll='wpstk';
 
-Function WtkQueryVersion(pszBuffer: PChar; ulBuflen: Cardinal): Cardinal; cdecl;
+Function WtkQueryVersion(pszBuffer: PAnsiChar; ulBuflen: Cardinal): Cardinal; cdecl;
   external wpstkdll name 'WtkQueryVersion';
 
 //*** handle types used by EA manager ***************************************/
@@ -45,21 +45,21 @@ Const
   WTK_EAT_ANY=-1;
 
 //*** get size of all values of an EA ***************************************/
-Function WtkQueryEaSize(pszName, pszEaName: PChar; var pulSize: Cardinal): Longint; cdecl;
+Function WtkQueryEaSize(pszName, pszEaName: PAnsiChar; var pulSize: Cardinal): Longint; cdecl;
   external wpstkdll name 'WtkQueryEaSize';
 
 //*** read complete ea into memory and scan it ******************************/
-Function WtkReadEa(pszName: PChar; pszEaName: PChar; P_HEA: PHEA): Longint; cdecl;
+Function WtkReadEa(pszName: PAnsiChar; pszEaName: PAnsiChar; P_HEA: PHEA): Longint; cdecl;
   external wpstkdll name 'WtkReadEa';
 
-Function WtkFindFirstEaValue(_HEA: HEA; var pulEaType: Cardinal; pszValue: PChar; var pulBuflen: Cardinal): Longint; cdecl;
+Function WtkFindFirstEaValue(_HEA: HEA; var pulEaType: Cardinal; pszValue: PAnsiChar; var pulBuflen: Cardinal): Longint; cdecl;
   external wpstkdll name 'WtkFindFirstEaValue';
 
-Function WtkFindNextEaValue(_HEA: HEA; var pulEaType: Cardinal; pszValue: PChar; var pulBuflen: Cardinal): Longint; cdecl;
+Function WtkFindNextEaValue(_HEA: HEA; var pulEaType: Cardinal; pszValue: PAnsiChar; var pulBuflen: Cardinal): Longint; cdecl;
   external wpstkdll name 'WtkFindNextEaValue';
 
 //*** create new EA list in memory ******************************************/
-Function WtkCreateEa(pszName: PChar; pszEaName: PChar; _PHEA: PHEA): Longint; cdecl;
+Function WtkCreateEa(pszName: PAnsiChar; pszEaName: PAnsiChar; _PHEA: PHEA): Longint; cdecl;
   external wpstkdll name 'WtkCreateEa';
 
 //*** append a value ********************************************************/
@@ -75,24 +75,24 @@ Function WtkCloseEa(_HEA: hea): Longint; cdecl;
   external wpstkdll name 'WtkCloseEa';
 
 //*** WtkGetNextFile alike API, does WtkReadEa/WtkFind*EaValue/WtkCloseEa in one API */
-Function WtkGetNextEaValue(pszName, pszEaName: PChar; var pulEaType: Cardinal; PHEA_: PHEA; pszValue: PChar; var pulBuflen: Cardinal): Longint; cdecl;
+Function WtkGetNextEaValue(pszName, pszEaName: PAnsiChar; var pulEaType: Cardinal; PHEA_: PHEA; pszValue: PAnsiChar; var pulBuflen: Cardinal): Longint; cdecl;
   external wpstkdll name 'WtkGetNextEaValue';
 
 //*** read/appendWrite EA in one step ***************************************/
-Function WtkPutEaValue(pszName, pszEaName: PChar; ulMultiType, ulEaType: Cardinal; var pbValue: Byte; ulValuelen: Cardinal; fWriteThru: Longbool; fEA: Byte): Longint; cdecl;
+Function WtkPutEaValue(pszName, pszEaName: PAnsiChar; ulMultiType, ulEaType: Cardinal; var pbValue: Byte; ulValuelen: Cardinal; fWriteThru: Longbool; fEA: Byte): Longint; cdecl;
   external wpstkdll name 'WtkPutEaValue';
 
 //*** simplified APIs to read/write exatcly one string EA********************/
-Function WtkWriteStringEa(pszName, pszEaName, pszEaValue: PChar): Longint; cdecl;
+Function WtkWriteStringEa(pszName, pszEaName, pszEaValue: PAnsiChar): Longint; cdecl;
   external wpstkdll name 'WtkWriteStringEa';
-Function WtkReadStringEa(pszName, pszEaName, pszEaValue: PChar; var pulBuflen: Cardinal): Longint; cdecl;
+Function WtkReadStringEa(pszName, pszEaName, pszEaValue: PAnsiChar; var pulBuflen: Cardinal): Longint; cdecl;
   external wpstkdll name 'WtkReadStringEa';
 
 Const
   WTK_CFGSYS_UPDATE_ADD=0;
   WTK_CFGSYS_UPDATE_DELETE=1;
 
-Function WtkUpdateConfigsys(pszUpdate: PChar; ulUpdateMode: Cardinal; pszBackupExtension: PChar): Longint; cdecl;
+Function WtkUpdateConfigsys(pszUpdate: PAnsiChar; ulUpdateMode: Cardinal; pszBackupExtension: PAnsiChar): Longint; cdecl;
   external wpstkdll name 'WtkUpdateConfigsys';
 
 //* file handle type and structures */
@@ -106,12 +106,12 @@ Type
     // specify all valid comment characters
     // - specify nil to use ';' as default and only comment character
     // - specify '/' to use "//" (c++ style comments)
-    pszCommentChars: PChar;
+    pszCommentChars: PAnsiChar;
     // specify all valid delimiter characters
     // - specify nil to use '=' as default and only delimiter character
     // - when multiple characters are specified, the first will be used
     //   for new entries
-    pszDelimiterChars: PChar;
+    pszDelimiterChars: PAnsiChar;
     // define layout for keys in new files
     // (if keys already exist, the layout of
     //  the last read key is used)
@@ -145,7 +145,7 @@ Const
   WTK_INIT_UPDATE_SOFTDELETEKEYS=$0002;
 
 //* open and close file */
-Function WtkOpenInitProfile(pszName: PChar; var phinit: HINIT; ulOpenMode: Cardinal;
+Function WtkOpenInitProfile(pszName: PAnsiChar; var phinit: HINIT; ulOpenMode: Cardinal;
                           ulUpdateMode: Cardinal; pip: PINITPARMS): Longint; cdecl;
   external wpstkdll name 'WtkOpenInitProfile';
 
@@ -156,19 +156,19 @@ const
   WTK_INIT_CLOSE_DISCARD=0;
   WTK_INIT_CLOSE_UPDATE=1;
 
-Function WtkCloseInitProfileBackup(_hinit: HINIT; fUpdateOriginal: Longbool; pszBackupFile: PChar): Longint; cdecl;
+Function WtkCloseInitProfileBackup(_hinit: HINIT; fUpdateOriginal: Longbool; pszBackupFile: PAnsiChar): Longint; cdecl;
   external wpstkdll name 'WtkCloseInitProfileBackup';
 Function WtkInitProfileModified(_hinit: HINIT): Longbool; cdecl;
   external wpstkdll name 'WtkInitProfileModified';
 
 //* query values */
-Function WtkQueryInitProfileString(_HINIT: hinit; pszSectionName, pszKeyName, pszDefault, pszBuffer: PChar; ulBuflen: Cardinal): Cardinal; cdecl;
+Function WtkQueryInitProfileString(_HINIT: hinit; pszSectionName, pszKeyName, pszDefault, pszBuffer: PAnsiChar; ulBuflen: Cardinal): Cardinal; cdecl;
   external wpstkdll name 'WtkQueryInitProfileString';
-Function WtkQueryInitProfileSize(_HINIT: hinit; pszSectionName, pszKeyName: PChar; var pulDataLen: Cardinal): Longbool; cdecl;
+Function WtkQueryInitProfileSize(_HINIT: hinit; pszSectionName, pszKeyName: PAnsiChar; var pulDataLen: Cardinal): Longbool; cdecl;
   external wpstkdll name 'WtkQueryInitProfileSize';
 
 //* update or delete keys and/or sections */
-Function WtkWriteInitProfileString(_HINIT: hinit; pszSectionName, pszKeyName, pszNewValue: PChar): Longint; cdecl;
+Function WtkWriteInitProfileString(_HINIT: hinit; pszSectionName, pszKeyName, pszNewValue: PAnsiChar): Longint; cdecl;
   external wpstkdll name 'WtkWriteInitProfileString';
 
 //* file handle type and structures */
@@ -195,21 +195,21 @@ Type
   TSYLEVELINFO = record
     cbSize : Cardinal;
     usSysId : Word;
-    szComponentId : array[0..(WTK_SYSLEVEL_MAXLEN_COMPID + 1)-1] of CHAR;
-    szName : array[0..(WTK_SYSLEVEL_MAXLEN_NAME + 1)-1] of CHAR;
+    szComponentId : array[0..(WTK_SYSLEVEL_MAXLEN_COMPID + 1)-1] of AnsiChar;
+    szName : array[0..(WTK_SYSLEVEL_MAXLEN_NAME + 1)-1] of AnsiChar;
     bVersionMajor : BYTE;
     bVersionMinor : BYTE;
     bVersionRefresh : BYTE;
-    szCsdPrefix : array[0..(WTK_SYSLEVEL_MAXLEN_PREFIX + 1)-1] of CHAR;
-    chCsdLanguage : CHAR;
-    szCurrentCsd : array[0..(WTK_SYSLEVEL_MAXLEN_CSDNUM + 1)-1] of CHAR;
-    szPreviousCsd : array[0..(WTK_SYSLEVEL_MAXLEN_CSDNUM + 1)-1] of CHAR;
+    szCsdPrefix : array[0..(WTK_SYSLEVEL_MAXLEN_PREFIX + 1)-1] of AnsiChar;
+    chCsdLanguage : AnsiChar;
+    szCurrentCsd : array[0..(WTK_SYSLEVEL_MAXLEN_CSDNUM + 1)-1] of AnsiChar;
+    szPreviousCsd : array[0..(WTK_SYSLEVEL_MAXLEN_CSDNUM + 1)-1] of AnsiChar;
     usDate : Word;
-    szAppType : array[0..(WTK_SYSLEVEL_MAXLEN_APPTYPE + 1)-1] of CHAR;
+    szAppType : array[0..(WTK_SYSLEVEL_MAXLEN_APPTYPE + 1)-1] of AnsiChar;
   end;
   PSYLEVELINFO = ^TSYLEVELINFO;
 
-Function WtkOpenSyslevel(pszName: PChar; var phsl: HSYSLEVEL): Longint; cdecl;
+Function WtkOpenSyslevel(pszName: PAnsiChar; var phsl: HSYSLEVEL): Longint; cdecl;
   external wpstkdll name 'WtkOpenSyslevel';
 Function WtkCloseSyslevel(hsl: HSYSLEVEL; ulUpdateMode: Cardinal): Longint; cdecl;
   external wpstkdll name 'WtkCloseSyslevel';
@@ -263,7 +263,7 @@ Function WtkInitializeMmf(var phmmf: THMMF; ulMaxBuffer: Cardinal): Longint; cde
   external wpstkdll name 'WtkInitializeMmf';
 Function WtkTerminateMmf(hmmf: THMMF): Longint; cdecl;
   external wpstkdll name 'WtkTerminateMmf';
-Function WtkAllocMmf(hmmf: THMMF; Var ppvdata: Pointer; pszFilename: PChar; ulOpenFlags, ulMaxSize: Cardinal): Longint; cdecl;
+Function WtkAllocMmf(hmmf: THMMF; Var ppvdata: Pointer; pszFilename: PAnsiChar; ulOpenFlags, ulMaxSize: Cardinal): Longint; cdecl;
   external wpstkdll name 'WtkAllocMmf';
 Function WtkFreeMmf(hmmf: THMMF; pvData: Pointer): Longint; cdecl;
   external wpstkdll name 'WtkFreeMmfl';
@@ -329,14 +329,14 @@ Type
 //*** data structures for callback STM_CALLBACK_QUERYVALUEINFO ********/
 //*** Note: on this callback, pvObjectInstance and pvObjectData are NULL ****/
   TCBQUERYVALUEINFO = record
-    pszName : PChar;                     //* out - name of setting                   */
+    pszName : PAnsiChar;                     //* out - name of setting                   */
     ulSettingId : Cardinal;              //* out - id of setting                     */
     ulValueIndex : Cardinal;             //* out - index of subvalue                 */
     ulValueType : Cardinal;              //* #in - type of value - see VALUETYPE_*   */
     usDialogid : Word;                   //*  in - id of dialog containing control   */
     usControlid : Word;                  //*  in - id of control                     */
     pfnwpSubclass : proc;               //*  in - subclass window proc for control  */
-    pszDetailsTitle : PChar;             //*  in - title of folderdetails view       */
+    pszDetailsTitle : PAnsiChar;             //*  in - title of folderdetails view       */
   end;
   PCBQUERYVALUEINFO = ^TCBQUERYVALUEINFO;
 
@@ -346,7 +346,7 @@ Type
 Type
   TCBQUERYTARGETBUF = record
     pvObjectInstance : Pointer; //* out - somSelf of object instance        */
-    pszName : PChar;            //* out - name of setting                   */
+    pszName : PAnsiChar;            //* out - name of setting                   */
     ulSettingId : Cardinal;     //* out - id of setting                     */
     ulValueIndex : Cardinal;    //* out - index of subvalue (only > 0 for multivalue settings)   */
     ulBufMax : Cardinal;        //* #in - len of target buffer              */
@@ -363,7 +363,7 @@ Type
 //*                                                                                     */
 //* type          validation target buffer possible GUI update                          */
 //* ------------- ---------- ------------- -------------------------------              */
-//* STRING        NO         CHAR[]        <all supported> except WC_*SLIDER            */
+//* STRING        NO         AnsiChar[]        <all supported> except WC_*SLIDER            */
 //*                                        - WC_COMBOBOX, WC_SPINBUTTON as listbox      */
 //* INDEX         YES        LONG          <all supported>                              */
 //* ITEM          YES        LONG          selects item with WC_LISTBOX, WC_COMBOBOX,   */
@@ -393,8 +393,8 @@ Type
   TCBVALIDATE = record
     pvObjectInstance : Pointer; //* out - somSelf of object instance        */
     ulSettingId : Cardinal;     //* out - id of setting                     */
-    pszName : PChar;            //* out - name of setting                   */
-    pszValue : PChar;           //* out - name of value to be validated     */
+    pszName : PAnsiChar;            //* out - name of setting                   */
+    pszValue : PAnsiChar;           //* out - name of value to be validated     */
     ulValueIndex : Cardinal;    //* out - index of subvalue                 */
     fResult : Longbool;         //*  in - result of validation              */
   end;                          //* return TRUE if your callback validates, */
@@ -405,7 +405,7 @@ Type
   TCBREPORTCHANGED = record
     pvObjectInstance : Pointer; //* out - somSelf of object instance        */
     ulSettingId : Cardinal;     //* out - id of setting                     */
-    pszName : PChar;            //* out - name of setting                   */
+    pszName : PAnsiChar;            //* out - name of setting                   */
   end;
   PCBREPORTCHANGED = ^TCBREPORTCHANGED;
 
@@ -413,7 +413,7 @@ Type
   TCBQUERYVALUE = record
     pvObjectInstance : Pointer; //* out - somSelf of object instance        */
     ulSettingId : Cardinal;     //* out - id of setting                     */
-    pszName : PChar;            //* out - name of setting                   */
+    pszName : PAnsiChar;            //* out - name of setting                   */
     ulQueryIndex : Cardinal;    //* out - index of query                    */
   end;
   PCBQUERYVALUE = ^TCBQUERYVALUE;
@@ -422,8 +422,8 @@ Type
   TCBQUERYINDEX = record
     pvObjectInstance : Pointer; //* out - somSelf of object instance        */
     ulSettingId : Cardinal;     //* out - id of setting                     */
-    pszName : PChar;            //* out - name of setting                   */
-    pszValue : PChar;           //* out - string value to be translated     */
+    pszName : PAnsiChar;            //* out - name of setting                   */
+    pszValue : PAnsiChar;           //* out - string value to be translated     */
     ulValueIndex : Cardinal;    //* out - index of subvalue                 */
     ulStringIndex : Cardinal;   //*  in - index to be used                  */
   end;                          //* return TRUE if processed, else FALSE    */
@@ -433,10 +433,10 @@ Type
   TCBQUERYSTRING = record
     pvObjectInstance : Pointer;                            // out - somSelf of object instance        */
     ulSettingId : Cardinal;                                // out - id of setting                     */
-    pszName : PChar;                                       // out - name of setting                   */
+    pszName : PAnsiChar;                                       // out - name of setting                   */
     ulStringIndex : Cardinal;                              // out - index to be translated            */
     ulValueIndex : Cardinal;                               // out - index of subvalue                 */
-    szValue : array[0..(_STM_MAX_SETTINGSVALUE)-1] of CHAR;// in - string value to be used      */
+    szValue : array[0..(_STM_MAX_SETTINGSVALUE)-1] of AnsiChar;// in - string value to be used      */
   end;                                                     // return TRUE if processed, else FALSE    */
   PCBQUERYSTRING = ^TCBQUERYSTRING;
 
@@ -453,7 +453,7 @@ Type
   TCBREPORTERROR = record
     pvObjectInstance : Pointer; //* out - somSelf of object instance        */
     ulSettingId : Cardinal;     //* out - id of setting                     */
-    pszName : PChar;            //* out - name of setting                   */
+    pszName : PAnsiChar;            //* out - name of setting                   */
     usDialogid : Word;          //* out - id of dialog                      */
     usControlid : Word;         //* out - id of control                     */
     hwndDialog : HWND;          //* out - handle of dialog                  */
@@ -483,7 +483,7 @@ Function WtkCreateClassSettingsTable(pvObjectClass: Pointer; pfnCallbackValue: P
   external wpstkdll name 'WtkCreateClassSettingsTable';
 Function WtkDestroyClassSettingsTable(hst: HSETTINGTABLE): Longbool; cdecl;
   external wpstkdll name 'WtkDestroyClassSettingsTable';
-Function WtkAddClassSetting(hst: HSETTINGTABLE; ulSettingId: Cardinal; pszSetting: Pchar; ulQueryCount: Cardinal): Longbool; cdecl;
+Function WtkAddClassSetting(hst: HSETTINGTABLE; ulSettingId: Cardinal; pszSetting: PAnsiChar; ulQueryCount: Cardinal): Longbool; cdecl;
   external wpstkdll name 'WtkAddClassSetting';
 Function WtkAddClassDetail(hst: HSETTINGTABLE; ulSettingId: Cardinal): Longbool; cdecl;
   external wpstkdll name 'WtkAddClassDetail';
@@ -497,9 +497,9 @@ Function WtkCreateObjectValueTable(hst: HSETTINGTABLE; pvObjectInstance, pvObjec
   external wpstkdll name 'WtkCreateObjectValueTable';
 Function WtkDestroyObjectValueTable(hvt: HVALUETABLE): Longbool; cdecl;
   external wpstkdll name 'WtkDestroyObjectValueTable';
-Function WtkEvaluateObjectSettings(hvt: HVALUETABLE; pszSetup: PChar): Longbool; cdecl;
+Function WtkEvaluateObjectSettings(hvt: HVALUETABLE; pszSetup: PAnsiChar): Longbool; cdecl;
   external wpstkdll name 'WtkEvaluateObjectSettings';
-Function WtkQueryObjectSettings(hvt: HVALUETABLE; pszBuffer: PChar; var pulMaxlen: Cardinal): Longbool; cdecl;
+Function WtkQueryObjectSettings(hvt: HVALUETABLE; pszBuffer: PAnsiChar; var pulMaxlen: Cardinal): Longbool; cdecl;
   external wpstkdll name 'WtkQueryObjectSettings';
 
 //*** prototypes for providing automatic updates to GUI controls ************/
@@ -535,9 +535,9 @@ Function WtkQueryObjectDetailsData(hvt: HVALUETABLE; var ppDetailsData: Pointer;
   external wpstkdll name 'WtkQueryObjectDetailsData';
 
 //*** prototypes for saving/restoring data in WPS repository ****************/
-Function WtkSaveObjectState(hvt: HVALUETABLE; pszClass: PChar): Longint; cdecl;
+Function WtkSaveObjectState(hvt: HVALUETABLE; pszClass: PAnsiChar): Longint; cdecl;
   external wpstkdll name 'WtkSaveObjectState';
-Function WtkRestoreObjectState(hvt: HVALUETABLE; pszClass: PChar): Longint; cdecl;
+Function WtkRestoreObjectState(hvt: HVALUETABLE; pszClass: PAnsiChar): Longint; cdecl;
   external wpstkdll name 'WtkRestoreObjectState';
 
 //*** prototypes for saving/restoring data in extern ini file ***************/
@@ -545,14 +545,14 @@ Function WtkRestoreObjectState(hvt: HVALUETABLE; pszClass: PChar): Longint; cdec
 //***       a unique place per object instance !!!            ***************/
 //*** NOTE: specify USER or SYSTEM as filename to write to    ***************/
 //***       HINI_USERPROFILE or HINI_SYSTEMPROFILE            ***************/
-Function WtkSaveObjectSettings(hvt: HVALUETABLE; pszFilename, pszApp, pszKey: PChar): Longint; cdecl;
+Function WtkSaveObjectSettings(hvt: HVALUETABLE; pszFilename, pszApp, pszKey: PAnsiChar): Longint; cdecl;
   external wpstkdll name 'WtkSaveObjectSettings';
-Function WtkRestoreObjectSettings(hvt: HVALUETABLE; pszFilename, pszApp, pszKey: PChar): Longint; cdecl;
+Function WtkRestoreObjectSettings(hvt: HVALUETABLE; pszFilename, pszApp, pszKey: PAnsiChar): Longint; cdecl;
   external wpstkdll name 'WtkRestoreObjectSettings';
 
-Function WtkGetTextMessage(var pTable: PChar; cTable: Cardinal;
+Function WtkGetTextMessage(var pTable: PAnsiChar; cTable: Cardinal;
                                    var pbBuffer: Byte; cbBuffer: Cardinal;
-                                   pszMessageName, pszFile: PChar;
+                                   pszMessageName, pszFile: PAnsiChar;
                                    var pcbMsg: Cardinal): Longint; cdecl;
   external wpstkdll name 'WtkGetTextMessage';
 
@@ -571,13 +571,13 @@ Function WtkCalcMemCRC32(pvData: Pointer; ulDatalen: Cardinal; var pulCRC32: Car
   external wpstkdll name 'WtkCalcMemCRC32';
 
 //*** prototypes for calculating CRC of files ****************************/
-Function WtkCalcFileCRC32(pszFilename: PChar; var pulCRC32: Cardinal): Longint; cdecl;
+Function WtkCalcFileCRC32(pszFilename: PAnsiChar; var pulCRC32: Cardinal): Longint; cdecl;
   external wpstkdll name 'WtkCalcFileCRC32';
 
 //*** prototypes for general functions **************************************/
-Function WtkQueryClassIndex(HWND_: hwnd): PChar; cdecl;
+Function WtkQueryClassIndex(HWND_: hwnd): PAnsiChar; cdecl;
   external wpstkdll name 'WtkQueryClassIndex';
-Function WtkIsOfPublicPmClass(HWND_: hwnd; pszClassIndex: PChar; ulPrimaryWindowStyle: Cardinal): Longbool; cdecl;
+Function WtkIsOfPublicPmClass(HWND_: hwnd; pszClassIndex: PAnsiChar; ulPrimaryWindowStyle: Cardinal): Longbool; cdecl;
   external wpstkdll name 'WtkIsOfPublicPmClass';
 
 //*** prototypes for specialized functions for certain window classes *******/
@@ -601,35 +601,35 @@ Const
   PMHERR_USE_EXISTING_ERRORINFO = -(1);
 
 //*** check existance of files & directories ********************************/
-Function WtkFileExists(pszName: PChar): Longbool;
-Function WtkDirExists(pszName: PChar): Longbool;
-Function WtkFileMaskExists(pszFileMask, pszFirstFile: PChar; ulBuflen: Cardinal): Longbool;
-Function WtkIsFile(pszName: PChar): Longbool;      (* equivalent to WtkFileExists *)
-Function WtkIsDirectory(pszName: PChar): Longbool; (* equivalent to WtkDirExists  *)
+Function WtkFileExists(pszName: PAnsiChar): Longbool;
+Function WtkDirExists(pszName: PAnsiChar): Longbool;
+Function WtkFileMaskExists(pszFileMask, pszFirstFile: PAnsiChar; ulBuflen: Cardinal): Longbool;
+Function WtkIsFile(pszName: PAnsiChar): Longbool;      (* equivalent to WtkFileExists *)
+Function WtkIsDirectory(pszName: PAnsiChar): Longbool; (* equivalent to WtkDirExists  *)
 
 //*** get fullname of directory or file *************************************/
-Function WtkQueryFullname(pszName, pszBuffer: PChar; ulBuflen: Cardinal): Longint;
+Function WtkQueryFullname(pszName, pszBuffer: PAnsiChar; ulBuflen: Cardinal): Longint;
 
 //*** extended file handling ************************************************/
-Function WtkDeleteFile(pszName: PChar): Longint;
-Function WtkMoveFile(pszOld, pszNew: PChar): Longint;
+Function WtkDeleteFile(pszName: PAnsiChar): Longint;
+Function WtkMoveFile(pszOld, pszNew: PAnsiChar): Longint;
 
 //*** query disk and directory at one time **********************************/
-Function WtkQueryCurrentDir(ulDiskNum: Cardinal; pszBuffer: PChar; ulBuflen: Cardinal): Longint;
-Function WtkSetCurrentDir(pszDirectory: PChar): Longint;
+Function WtkQueryCurrentDir(ulDiskNum: Cardinal; pszBuffer: PAnsiChar; ulBuflen: Cardinal): Longint;
+Function WtkSetCurrentDir(pszDirectory: PAnsiChar): Longint;
 
 //*** create/delete path ****************************************************/
-Function WtkCreatePath(pszPath: PChar): Longint;
-Function WtkDeletePath(pszPath: PChar): Longint;
+Function WtkCreatePath(pszPath: PAnsiChar): Longint;
+Function WtkDeletePath(pszPath: PAnsiChar): Longint;
 
 //*** easy version of DosFindFirst/DosFindNext ******************************/
-Function WtkGetNextFile(pszFileMask: PChar; phdir: PHDIR;
-                                pszNextFile: PChar; ulBuflen: Cardinal): Longint;
-Function WtkGetNextDirectory(pszFileMask: PChar; phdir: PHDIR;
-                             pszNextDirectory: PChar; ulBuflen: Cardinal): Longint;
+Function WtkGetNextFile(pszFileMask: PAnsiChar; phdir: PHDIR;
+                                pszNextFile: PAnsiChar; ulBuflen: Cardinal): Longint;
+Function WtkGetNextDirectory(pszFileMask: PAnsiChar; phdir: PHDIR;
+                             pszNextDirectory: PAnsiChar; ulBuflen: Cardinal): Longint;
 
 //*** search part of filename ***********************************************/
-Function WtkFilespec(pszName: PChar; ulPart: Cardinal): PChar;
+Function WtkFilespec(pszName: PAnsiChar; ulPart: Cardinal): PAnsiChar;
 
 Const
   WTK_FILESPEC_PATHNAME = 1;
@@ -637,21 +637,21 @@ Const
   WTK_FILESPEC_EXTENSION = 3;
 
 //*** get specific information about file ***********************************/
-Function WtkFileModified(pszName: PChar; pfs3: PFILESTATUS3): Longbool;
-Function WtkQueryFileSize(pszName: PChar): Cardinal;
+Function WtkFileModified(pszName: PAnsiChar; pfs3: PFILESTATUS3): Longbool;
+Function WtkQueryFileSize(pszName: PAnsiChar): Cardinal;
 
 //*** read file into memory  ************************************************/
-Function WtkReadFile(pszName: PChar; ppszBuffer: PPChar; pulBuflen: PCardinal): Longint;
-Function WtkWriteFile(pszName, pszBuffer: PChar; ulBuflen: Cardinal; fAppend: Longbool): Longint;
+Function WtkReadFile(pszName: PAnsiChar; ppszBuffer: PPAnsiChar; pulBuflen: PCardinal): Longint;
+Function WtkWriteFile(pszName, pszBuffer: PAnsiChar; ulBuflen: Cardinal; fAppend: Longbool): Longint;
 
 //*** create tmp file *******************************************************/
-Function WtkCreateTmpFile(pszFileMask, pszBuffer: PChar; ulBuflen: Cardinal): Longint;
+Function WtkCreateTmpFile(pszFileMask, pszBuffer: PAnsiChar; ulBuflen: Cardinal): Longint;
 
 //*** check file contents ***************************************************/
-Function WtkFileIsEmpty(pszName: PChar): Longbool;
+Function WtkFileIsEmpty(pszName: PAnsiChar): Longbool;
 
 //*** prototypes for opening devices ****************************************/
-Function WtkOpenDevice(pszName: PChar; phdevice: PHFILE; ulOpenMode: Cardinal): Longint;
+Function WtkOpenDevice(pszName: PAnsiChar; phdevice: PHFILE; ulOpenMode: Cardinal): Longint;
 
 Const
   WTK_OPENDEVICE_SHARED = $0000;
@@ -661,24 +661,24 @@ Const
   WTK_OPENDEVICE_BLOCKDEVICE = $0004;
 
 //*** prototypes for performing an I/o Control transaction ******************/
-Function WtkDevIOCtl(pszName: PChar; ulOpenMode: Cardinal;
+Function WtkDevIOCtl(pszName: PAnsiChar; ulOpenMode: Cardinal;
                              ulCategory: Cardinal; ulFunction: Cardinal;
                              pvParams: Pointer; pcbParmLen: PCardinal;
                              pvData: Pointer; pcbDataLen: PCardinal): Longint;
 
 //*** prototypes for module information functions ***************************/
-APIRET APIENTRY WtkGetPackageFilename( PFN pfn, PChar pszSubdir, PChar pszFilename,
-                              PChar pszFileext, PChar pszBuffer, ULONG ulBuflen);
-APIRET APIENTRY WtkGetModuleInfo( PFN pfn, PHMODULE phmod, PChar pszBuffer, ULONG ulBuflen);
-APIRET APIENTRY WtkGetModulePath( PFN pfn, PChar pszBuffer, ULONG ulBuflen);
+APIRET APIENTRY WtkGetPackageFilename( PFN pfn, PAnsiChar pszSubdir, PAnsiChar pszFilename,
+                              PAnsiChar pszFileext, PAnsiChar pszBuffer, ULONG ulBuflen);
+APIRET APIENTRY WtkGetModuleInfo( PFN pfn, PHMODULE phmod, PAnsiChar pszBuffer, ULONG ulBuflen);
+APIRET APIENTRY WtkGetModulePath( PFN pfn, PAnsiChar pszBuffer, ULONG ulBuflen);
 HMODULE APIENTRY WtkGetModuleHandle( PFN pfn);
 
-BOOL APIENTRY WtkIsRegularExpressionValid( PChar pszExpression);
-APIRET APIENTRY WtkMatchRegularExpression( PChar pszExpression, PChar pszText,
-                                           PChar pszBuffer, ULONG ulBuflen);
-APIRET APIENTRY WtkSubstRegularExpressionMatch( PChar pszExpression, PChar pszText,
-                                                PChar pszReplacePattern,
-                                                PChar pszBuffer, ULONG ulBuflen);
+BOOL APIENTRY WtkIsRegularExpressionValid( PAnsiChar pszExpression);
+APIRET APIENTRY WtkMatchRegularExpression( PAnsiChar pszExpression, PAnsiChar pszText,
+                                           PAnsiChar pszBuffer, ULONG ulBuflen);
+APIRET APIENTRY WtkSubstRegularExpressionMatch( PAnsiChar pszExpression, PAnsiChar pszText,
+                                                PAnsiChar pszReplacePattern,
+                                                PAnsiChar pszBuffer, ULONG ulBuflen);
 
 //*** prototypes for system configuration functions *************************/
 Function WtkIsWarp4: Longbool; cdecl;
@@ -697,9 +697,9 @@ Function WtkIsOS2: Longbool; cdecl;
 Function WtkIseComStation: Longbool; cdecl;
   external wpstkdll name 'WtkIseComStation';
 
-Function WtkQueryBootDrive: Char; cdecl;
+Function WtkQueryBootDrive: AnsiChar; cdecl;
   external wpstkdll name 'WtkQueryBootDrive';
-Function WtkQuerySysLanguage: PChar; cdecl;
+Function WtkQuerySysLanguage: PAnsiChar; cdecl;
   external wpstkdll name 'WtkQuerySysLanguage';
 
 Function WtkReboot: Cardinal; cdecl;
@@ -734,16 +734,16 @@ Const
   WTK_TIMESTAMP_NLSTIME = 5;
 
 APIRET APIENTRY WtkQueryDateTimeStamp( PDATETIME pdt, ULONG ulStampType,
-                                                                             PChar pszBuffer, ULONG ulBuflen);
+                                                                             PAnsiChar pszBuffer, ULONG ulBuflen);
 APIRET APIENTRY WtkQueryFDateTimeStamp( PFDATE pfdate, PFTIME pftime, ULONG ulStampType,
-                                        PChar pszBuffer, ULONG ulBuflen);
+                                        PAnsiChar pszBuffer, ULONG ulBuflen);
 APIRET APIENTRY WtkQueryCDateTimeStamp( PCDATE pcdate, PCTIME pctime, ULONG ulStampType,
-                                        PChar pszBuffer, ULONG ulBuflen);
+                                        PAnsiChar pszBuffer, ULONG ulBuflen);
 
 //*** prototypes for getting last write time from a file or directory ****/
-APIRET APIENTRY WtkQueryFileDateTime( PDATETIME pdt, PChar pszName);
-APIRET APIENTRY WtkQueryFileFDateTime( PFDATE pfdate, PFTIME pftime, PChar pszName);
-APIRET APIENTRY WtkQueryFileCDateTime( PCDATE pcdate, PCTIME pctime, PChar pszName);
+APIRET APIENTRY WtkQueryFileDateTime( PDATETIME pdt, PAnsiChar pszName);
+APIRET APIENTRY WtkQueryFileFDateTime( PFDATE pfdate, PFTIME pftime, PAnsiChar pszName);
+APIRET APIENTRY WtkQueryFileCDateTime( PCDATE pcdate, PCTIME pctime, PAnsiChar pszName);
 
 
 implementation